← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-05-17 06:56:16 UTC
  • Revision ID: mbp@sourcefrog.net-20050517065616-6f23381d6184a8aa
- add space for un-merged patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
1
from merge_core import merge_flex
2
2
from changeset import generate_changeset, ExceptionConflictHandler
3
3
from changeset import Inventory
4
 
from bzrlib import find_branch
 
4
from bzrlib import Branch
5
5
import bzrlib.osutils
6
 
from bzrlib.errors import BzrCommandError
7
 
from bzrlib.diff import compare_trees
8
 
from trace import mutter, warning
 
6
from trace import mutter
9
7
import os.path
10
8
import tempfile
11
9
import shutil
12
10
import errno
13
11
 
14
 
class UnrelatedBranches(BzrCommandError):
15
 
    def __init__(self):
16
 
        msg = "Branches have no common ancestor, and no base revision"\
17
 
            " specified."
18
 
        BzrCommandError.__init__(self, msg)
19
 
 
20
 
 
21
12
class MergeConflictHandler(ExceptionConflictHandler):
22
13
    """Handle conflicts encountered while merging"""
23
 
    def __init__(self, dir, ignore_zero=False):
24
 
        ExceptionConflictHandler.__init__(self, dir)
25
 
        self.conflicts = 0
26
 
        self.ignore_zero = ignore_zero
27
 
 
28
14
    def copy(self, source, dest):
29
15
        """Copy the text and mode of a file
30
16
        :param source: The path of the file to copy
49
35
        new_name = last_new_name+suffix
50
36
        try:
51
37
            os.rename(name, new_name)
52
 
            return new_name
53
38
        except OSError, e:
54
39
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
55
40
                raise
56
 
            return self.add_suffix(name, suffix, last_new_name=new_name)
57
 
 
58
 
    def conflict(self, text):
59
 
        warning(text)
60
 
        self.conflicts += 1
61
 
        
 
41
            self.add_suffix(name, suffix, last_new_name=new_name)
62
42
 
63
43
    def merge_conflict(self, new_file, this_path, base_path, other_path):
64
44
        """
73
53
        self.copy(base_path, this_path+".BASE")
74
54
        self.copy(other_path, this_path+".OTHER")
75
55
        os.rename(new_file, this_path)
76
 
        self.conflict("Diff3 conflict encountered in %s" % this_path)
77
56
 
78
57
    def target_exists(self, entry, target, old_path):
79
58
        """Handle the case when the target file or dir exists"""
80
 
        moved_path = self.add_suffix(target, ".moved")
81
 
        self.conflict("Moved existing %s to %s" % (target, moved_path))
82
 
 
83
 
    def finalize(self):
84
 
        if not self.ignore_zero:
85
 
            print "%d conflicts encountered.\n" % self.conflicts
 
59
        self.add_suffix(target, ".moved")
86
60
            
87
 
class SourceFile(object):
 
61
class SourceFile:
88
62
    def __init__(self, path, id, present=None, isdir=None):
89
63
        self.path = path
90
64
        self.id = id
96
70
        return "SourceFile(%s, %s)" % (self.path, self.id)
97
71
 
98
72
def get_tree(treespec, temp_root, label):
99
 
    location, revno = treespec
100
 
    branch = find_branch(location)
 
73
    dir, revno = treespec
 
74
    branch = Branch(dir)
101
75
    if revno is None:
102
76
        base_tree = branch.working_tree()
103
77
    elif revno == -1:
106
80
        base_tree = branch.revision_tree(branch.lookup_revision(revno))
107
81
    temp_path = os.path.join(temp_root, label)
108
82
    os.mkdir(temp_path)
109
 
    return branch, MergeTree(base_tree, temp_path)
 
83
    return MergeTree(base_tree, temp_path)
110
84
 
111
85
 
112
86
def abspath(tree, file_id):
155
129
                self.cached[id] = path
156
130
            return self.cached[id]
157
131
 
158
 
 
159
 
 
160
 
def merge(other_revision, base_revision,
161
 
          check_clean=True, ignore_zero=False,
162
 
          this_dir=None):
163
 
    """Merge changes into a tree.
164
 
 
165
 
    base_revision
166
 
        Base for three-way merge.
167
 
    other_revision
168
 
        Other revision for three-way merge.
169
 
    this_dir
170
 
        Directory to merge changes into; '.' by default.
171
 
    check_clean
172
 
        If true, this_dir must have no uncommitted changes before the
173
 
        merge begins.
174
 
    """
 
132
def merge(other_revision, base_revision):
175
133
    tempdir = tempfile.mkdtemp(prefix="bzr-")
176
134
    try:
177
 
        if this_dir is None:
178
 
            this_dir = '.'
179
 
        this_branch = find_branch(this_dir)
180
 
        if check_clean:
181
 
            changes = compare_trees(this_branch.working_tree(), 
182
 
                                    this_branch.basis_tree(), False)
183
 
            if changes.has_changed():
184
 
                raise BzrCommandError("Working tree has uncommitted changes.")
185
 
        other_branch, other_tree = get_tree(other_revision, tempdir, "other")
186
 
        if base_revision == [None, None]:
187
 
            if other_revision[1] == -1:
188
 
                o_revno = None
189
 
            else:
190
 
                o_revno = other_revision[1]
191
 
            base_revno = this_branch.common_ancestor(other_branch, 
192
 
                                                     other_revno=o_revno)[0]
193
 
            if base_revno is None:
194
 
                raise UnrelatedBranches()
195
 
            base_revision = ['.', base_revno]
196
 
        base_branch, base_tree = get_tree(base_revision, tempdir, "base")
197
 
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
198
 
                    ignore_zero=ignore_zero)
 
135
        this_branch = Branch('.') 
 
136
        other_tree = get_tree(other_revision, tempdir, "other")
 
137
        base_tree = get_tree(base_revision, tempdir, "base")
 
138
        merge_inner(this_branch, other_tree, base_tree, tempdir)
199
139
    finally:
200
140
        shutil.rmtree(tempdir)
201
141
 
224
164
    return cset
225
165
 
226
166
 
227
 
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
228
 
                ignore_zero=False):
229
 
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
 
167
def merge_inner(this_branch, other_tree, base_tree, tempdir):
 
168
    this_tree = get_tree(('.', None), tempdir, "this")
230
169
 
231
170
    def get_inventory(tree):
232
171
        return tree.inventory
233
172
 
234
173
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
235
174
                             generate_cset_optimized, get_inventory,
236
 
                             MergeConflictHandler(base_tree.root,
237
 
                                                  ignore_zero=ignore_zero))
 
175
                             MergeConflictHandler(base_tree.root))
238
176
 
239
177
    adjust_ids = []
240
178
    for id, path in inv_changes.iteritems():