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
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.delta import compare_trees
8
from trace import mutter, warning
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
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
40
def copy(self, source, dest):
41
"""Copy the text and mode of a file
42
:param source: The path of the file to copy
43
:param dest: The distination file to create
45
s_file = file(source, "rb")
46
d_file = file(dest, "wb")
49
os.chmod(dest, 0777 & os.stat(source).st_mode)
51
def dump(self, lines, dest):
52
"""Copy the text and mode of a file
53
:param source: The path of the file to copy
54
:param dest: The distination file to create
56
d_file = file(dest, "wb")
60
def add_suffix(self, name, suffix, last_new_name=None):
61
"""Rename a file to append a suffix. If the new name exists, the
62
suffix is added repeatedly until a non-existant name is found
64
:param name: The path of the file
65
:param suffix: The suffix to append
66
:param last_new_name: (used for recursive calls) the last name tried
68
if last_new_name is None:
70
new_name = last_new_name+suffix
72
os.rename(name, new_name)
75
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
77
return self.add_suffix(name, suffix, last_new_name=new_name)
79
def conflict(self, text):
84
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
86
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
87
main file will be a version with diff3 conflicts.
88
:param new_file: Path to the output file with diff3 markers
89
:param this_path: Path to the file text for the THIS tree
90
:param base_path: Path to the file text for the BASE tree
91
:param other_path: Path to the file text for the OTHER tree
93
self.add_suffix(this_path, ".THIS")
94
self.dump(base_lines, this_path+".BASE")
95
self.dump(other_lines, this_path+".OTHER")
96
os.rename(new_file, this_path)
97
self.conflict("Diff3 conflict encountered in %s" % this_path)
99
def new_contents_conflict(self, filename, other_contents):
100
"""Conflicting contents for newly added file."""
101
self.copy(other_contents, filename + ".OTHER")
102
self.conflict("Conflict in newly added file %s" % filename)
105
def target_exists(self, entry, target, old_path):
106
"""Handle the case when the target file or dir exists"""
107
moved_path = self.add_suffix(target, ".moved")
108
self.conflict("Moved existing %s to %s" % (target, moved_path))
110
def rmdir_non_empty(self, filename):
111
"""Handle the case where the dir to be removed still has contents"""
112
self.conflict("Directory %s not removed because it is not empty"\
117
if not self.ignore_zero:
118
print "%d conflicts encountered.\n" % self.conflicts
120
def get_tree(treespec, temp_root, label):
121
location, revno = treespec
122
branch = find_branch(location)
124
base_tree = branch.working_tree()
126
base_tree = branch.basis_tree()
128
base_tree = branch.revision_tree(branch.lookup_revision(revno))
129
temp_path = os.path.join(temp_root, label)
131
return branch, MergeTree(base_tree, temp_path)
134
def file_exists(tree, file_id):
135
return tree.has_filename(tree.id2path(file_id))
138
class MergeTree(object):
139
def __init__(self, tree, tempdir):
140
object.__init__(self)
141
if hasattr(tree, "basedir"):
142
self.root = tree.basedir
146
self.tempdir = tempdir
147
os.mkdir(os.path.join(self.tempdir, "texts"))
151
return self.tree.__iter__()
153
def __contains__(self, file_id):
154
return file_id in self.tree
156
def get_file(self, file_id):
157
return self.tree.get_file(file_id)
159
def get_file_sha1(self, id):
160
return self.tree.get_file_sha1(id)
162
def id2path(self, file_id):
163
return self.tree.id2path(file_id)
165
def has_id(self, file_id):
166
return self.tree.has_id(file_id)
168
def has_or_had_id(self, file_id):
169
if file_id == self.tree.inventory.root.file_id:
171
return self.tree.inventory.has_id(file_id)
173
def readonly_path(self, id):
174
if id not in self.tree:
176
if self.root is not None:
177
return self.tree.abspath(self.tree.id2path(id))
179
if self.tree.inventory[id].kind in ("directory", "root_directory"):
181
if not self.cached.has_key(id):
182
path = os.path.join(self.tempdir, "texts", id)
183
outfile = file(path, "wb")
184
outfile.write(self.tree.get_file(id).read())
185
assert(os.path.exists(path))
186
self.cached[id] = path
187
return self.cached[id]
191
def merge(other_revision, base_revision,
192
check_clean=True, ignore_zero=False,
193
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
195
"""Merge changes into a tree.
198
Base for three-way merge.
200
Other revision for three-way merge.
202
Directory to merge changes into; '.' by default.
204
If true, this_dir must have no uncommitted changes before the
207
tempdir = tempfile.mkdtemp(prefix="bzr-")
211
this_branch = find_branch(this_dir)
213
changes = compare_trees(this_branch.working_tree(),
214
this_branch.basis_tree(), False)
215
if changes.has_changed():
216
raise BzrCommandError("Working tree has uncommitted changes.")
217
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
218
if base_revision == [None, None]:
219
if other_revision[1] == -1:
222
o_revno = other_revision[1]
223
base_revno = this_branch.common_ancestor(other_branch,
224
other_revno=o_revno)[0]
225
if base_revno is None:
226
raise UnrelatedBranches()
227
base_revision = ['.', base_revno]
228
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
229
if file_list is None:
230
interesting_ids = None
232
interesting_ids = set()
233
this_tree = this_branch.working_tree()
234
for fname in file_list:
235
path = this_branch.relpath(fname)
237
for tree in (this_tree, base_tree.tree, other_tree.tree):
238
file_id = tree.inventory.path2id(path)
239
if file_id is not None:
240
interesting_ids.add(file_id)
243
raise BzrCommandError("%s is not a source file in any"
245
merge_inner(this_branch, other_tree, base_tree, tempdir,
246
ignore_zero=ignore_zero, backup_files=backup_files,
247
merge_type=merge_type, interesting_ids=interesting_ids)
249
shutil.rmtree(tempdir)
252
def set_interesting(inventory_a, inventory_b, interesting_ids):
253
"""Mark files whose ids are in interesting_ids as interesting
255
for inventory in (inventory_a, inventory_b):
256
for path, source_file in inventory.iteritems():
257
source_file.interesting = source_file.id in interesting_ids
260
def generate_cset_optimized(tree_a, tree_b, 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.
264
cset = generate_changeset(tree_a, tree_b, interesting_ids)
265
for entry in cset.entries.itervalues():
266
entry.metadata_change = None
270
def merge_inner(this_branch, other_tree, base_tree, tempdir,
271
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
272
interesting_ids=None):
274
def merge_factory(file_id, base, other):
275
contents_change = merge_type(file_id, base, other)
277
contents_change = BackupBeforeChange(contents_change)
278
return contents_change
280
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
282
def get_inventory(tree):
283
return tree.tree.inventory
285
inv_changes = merge_flex(this_tree, base_tree, other_tree,
286
generate_cset_optimized, get_inventory,
287
MergeConflictHandler(base_tree.root,
288
ignore_zero=ignore_zero),
289
merge_factory=merge_factory,
290
interesting_ids=interesting_ids)
293
for id, path in inv_changes.iteritems():
298
assert path.startswith('./'), "path is %s" % path
300
adjust_ids.append((path, id))
301
if len(adjust_ids) > 0:
302
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
306
def regen_inventory(this_branch, root, new_entries):
307
old_entries = this_branch.read_working_inventory()
311
for path, file_id in new_entries:
314
new_entries_map[file_id] = path
316
def id2path(file_id):
317
path = new_entries_map.get(file_id)
320
entry = old_entries[file_id]
321
if entry.parent_id is None:
323
return os.path.join(id2path(entry.parent_id), entry.name)
325
for file_id in old_entries:
326
entry = old_entries[file_id]
327
path = id2path(file_id)
328
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
329
by_path[path] = file_id
334
for path, file_id in new_entries:
336
del new_inventory[file_id]
339
new_path_list.append((path, file_id))
340
if file_id not in old_entries:
342
# Ensure no file is added before its parent
344
for path, file_id in new_path_list:
348
parent = by_path[os.path.dirname(path)]
349
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
350
new_inventory[file_id] = (path, file_id, parent, kind)
351
by_path[path] = file_id
353
# Get a list in insertion order
354
new_inventory_list = new_inventory.values()
355
mutter ("""Inventory regeneration:
356
old length: %i insertions: %i deletions: %i new_length: %i"""\
357
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
358
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
359
new_inventory_list.sort()
360
return new_inventory_list
362
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
363
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
