1
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
3
from bzrlib.changeset import Inventory, Diff3Merge
4
from bzrlib import find_branch
1
from merge_core import merge_flex
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory
4
from bzrlib import Branch
5
5
import bzrlib.osutils
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.delta import compare_trees
8
from trace import mutter, warning
6
from trace import mutter
15
# comments from abentley on irc: merge happens in two stages, each
16
# of which generates a changeset object
18
# stage 1: generate OLD->OTHER,
19
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
21
class UnrelatedBranches(BzrCommandError):
23
msg = "Branches have no common ancestor, and no base revision"\
25
BzrCommandError.__init__(self, msg)
28
12
class MergeConflictHandler(ExceptionConflictHandler):
29
"""Handle conflicts encountered while merging.
31
This subclasses ExceptionConflictHandler, so that any types of
32
conflict that are not explicitly handled cause an exception and
35
def __init__(self, dir, ignore_zero=False):
36
ExceptionConflictHandler.__init__(self, dir)
38
self.ignore_zero = ignore_zero
13
"""Handle conflicts encountered while merging"""
40
14
def copy(self, source, dest):
41
15
"""Copy the text and mode of a file
42
16
:param source: The path of the file to copy
85
53
self.copy(base_path, this_path+".BASE")
86
54
self.copy(other_path, this_path+".OTHER")
87
55
os.rename(new_file, this_path)
88
self.conflict("Diff3 conflict encountered in %s" % this_path)
90
def new_contents_conflict(self, filename, other_contents):
91
"""Conflicting contents for newly added file."""
92
self.copy(other_contents, filename + ".OTHER")
93
self.conflict("Conflict in newly added file %s" % filename)
96
57
def target_exists(self, entry, target, old_path):
97
58
"""Handle the case when the target file or dir exists"""
98
moved_path = self.add_suffix(target, ".moved")
99
self.conflict("Moved existing %s to %s" % (target, moved_path))
101
def rmdir_non_empty(self, filename):
102
"""Handle the case where the dir to be removed still has contents"""
103
self.conflict("Directory %s not removed because it is not empty"\
108
if not self.ignore_zero:
109
print "%d conflicts encountered.\n" % self.conflicts
59
self.add_suffix(target, ".moved")
111
class SourceFile(object):
112
62
def __init__(self, path, id, present=None, isdir=None):
185
129
self.cached[id] = path
186
130
return self.cached[id]
190
def merge(other_revision, base_revision,
191
check_clean=True, ignore_zero=False,
192
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
194
"""Merge changes into a tree.
197
Base for three-way merge.
199
Other revision for three-way merge.
201
Directory to merge changes into; '.' by default.
203
If true, this_dir must have no uncommitted changes before the
132
def merge(other_revision, base_revision):
206
133
tempdir = tempfile.mkdtemp(prefix="bzr-")
210
this_branch = find_branch(this_dir)
212
changes = compare_trees(this_branch.working_tree(),
213
this_branch.basis_tree(), False)
214
if changes.has_changed():
215
raise BzrCommandError("Working tree has uncommitted changes.")
216
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
217
if base_revision == [None, None]:
218
if other_revision[1] == -1:
221
o_revno = other_revision[1]
222
base_revno = this_branch.common_ancestor(other_branch,
223
other_revno=o_revno)[0]
224
if base_revno is None:
225
raise UnrelatedBranches()
226
base_revision = ['.', base_revno]
227
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
228
if file_list is None:
229
interesting_ids = None
231
interesting_ids = set()
232
this_tree = this_branch.working_tree()
233
for fname in file_list:
234
path = this_branch.relpath(fname)
236
for tree in (this_tree, base_tree.tree, other_tree.tree):
237
file_id = tree.inventory.path2id(path)
238
if file_id is not None:
239
interesting_ids.add(file_id)
242
raise BzrCommandError("%s is not a source file in any"
244
merge_inner(this_branch, other_tree, base_tree, tempdir,
245
ignore_zero=ignore_zero, backup_files=backup_files,
246
merge_type=merge_type, interesting_ids=interesting_ids)
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)
248
140
shutil.rmtree(tempdir)
251
def set_interesting(inventory_a, inventory_b, interesting_ids):
252
"""Mark files whose ids are in interesting_ids as interesting
254
for inventory in (inventory_a, inventory_b):
255
for path, source_file in inventory.iteritems():
256
source_file.interesting = source_file.id in interesting_ids
259
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
260
interesting_ids=None):
261
"""Generate a changeset. If interesting_ids is supplied, only changes
262
to those files will be shown. Metadata changes are stripped.
143
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
144
"""Generate a changeset, using the text_id to mark really-changed files.
145
This permits blazing comparisons when text_ids are present. It also
146
disables metadata comparison for files with identical texts.
264
if interesting_ids is not None:
265
set_interesting(inventory_a, inventory_b, interesting_ids)
148
for file_id in tree_a.tree.inventory:
149
if file_id not in tree_b.tree.inventory:
151
entry_a = tree_a.tree.inventory[file_id]
152
entry_b = tree_b.tree.inventory[file_id]
153
if (entry_a.kind, entry_b.kind) != ("file", "file"):
155
if None in (entry_a.text_id, entry_b.text_id):
157
if entry_a.text_id != entry_b.text_id:
159
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
160
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
266
161
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
267
162
for entry in cset.entries.itervalues():
268
163
entry.metadata_change = None
272
def merge_inner(this_branch, other_tree, base_tree, tempdir,
273
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
274
interesting_ids=None):
276
def merge_factory(base_file, other_file):
277
contents_change = merge_type(base_file, other_file)
279
contents_change = BackupBeforeChange(contents_change)
280
return contents_change
282
def generate_cset(tree_a, tree_b, inventory_a, inventory_b):
283
return generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
286
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")
288
170
def get_inventory(tree):
289
171
return tree.inventory
291
173
inv_changes = merge_flex(this_tree, base_tree, other_tree,
292
generate_cset, get_inventory,
293
MergeConflictHandler(base_tree.root,
294
ignore_zero=ignore_zero),
295
merge_factory=merge_factory)
174
generate_cset_optimized, get_inventory,
175
MergeConflictHandler(base_tree.root))
298
178
for id, path in inv_changes.iteritems():
added
removed
bzrlib/merge.py
