1
from 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
14
class UnrelatedBranches(BzrCommandError):
16
msg = "Branches have no common ancestor, and no base revision"\
18
BzrCommandError.__init__(self, msg)
21
class MergeConflictHandler(ExceptionConflictHandler):
22
"""Handle conflicts encountered while merging.
24
This subclasses ExceptionConflictHandler, so that any types of
25
conflict that are not explicitly handled cause an exception and
29
def __init__(self, dir, ignore_zero=False):
30
ExceptionConflictHandler.__init__(self, dir)
32
self.ignore_zero = ignore_zero
34
def copy(self, source, dest):
35
"""Copy the text and mode of a file
36
:param source: The path of the file to copy
37
:param dest: The distination file to create
39
s_file = file(source, "rb")
40
d_file = file(dest, "wb")
43
os.chmod(dest, 0777 & os.stat(source).st_mode)
45
def add_suffix(self, name, suffix, last_new_name=None):
46
"""Rename a file to append a suffix. If the new name exists, the
47
suffix is added repeatedly until a non-existant name is found
49
:param name: The path of the file
50
:param suffix: The suffix to append
51
:param last_new_name: (used for recursive calls) the last name tried
53
if last_new_name is None:
55
new_name = last_new_name+suffix
57
os.rename(name, new_name)
60
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
62
return self.add_suffix(name, suffix, last_new_name=new_name)
64
def conflict(self, text):
69
def merge_conflict(self, new_file, this_path, base_path, other_path):
71
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
72
main file will be a version with diff3 conflicts.
73
:param new_file: Path to the output file with diff3 markers
74
:param this_path: Path to the file text for the THIS tree
75
:param base_path: Path to the file text for the BASE tree
76
:param other_path: Path to the file text for the OTHER tree
78
self.add_suffix(this_path, ".THIS")
79
self.copy(base_path, this_path+".BASE")
80
self.copy(other_path, this_path+".OTHER")
81
os.rename(new_file, this_path)
82
self.conflict("Diff3 conflict encountered in %s" % this_path)
84
def target_exists(self, entry, target, old_path):
85
"""Handle the case when the target file or dir exists"""
86
moved_path = self.add_suffix(target, ".moved")
87
self.conflict("Moved existing %s to %s" % (target, moved_path))
89
def rmdir_non_empty(self, filename):
90
"""Handle the case where the dir to be removed still has contents"""
91
self.conflict("Directory %s not removed because it is not empty"\
96
if not self.ignore_zero:
97
print "%d conflicts encountered.\n" % self.conflicts
99
class SourceFile(object):
100
def __init__(self, path, id, present=None, isdir=None):
103
self.present = present
105
self.interesting = True
108
return "SourceFile(%s, %s)" % (self.path, self.id)
110
def get_tree(treespec, temp_root, label):
111
location, revno = treespec
112
branch = find_branch(location)
114
base_tree = branch.working_tree()
116
base_tree = branch.basis_tree()
118
base_tree = branch.revision_tree(branch.lookup_revision(revno))
119
temp_path = os.path.join(temp_root, label)
121
return branch, MergeTree(base_tree, temp_path)
124
def abspath(tree, file_id):
125
path = tree.inventory.id2path(file_id)
130
def file_exists(tree, file_id):
131
return tree.has_filename(tree.id2path(file_id))
133
def inventory_map(tree):
135
for file_id in tree.inventory:
136
path = abspath(tree, file_id)
137
inventory[path] = SourceFile(path, file_id)
141
class MergeTree(object):
142
def __init__(self, tree, tempdir):
143
object.__init__(self)
144
if hasattr(tree, "basedir"):
145
self.root = tree.basedir
148
self.inventory = inventory_map(tree)
150
self.tempdir = tempdir
151
os.mkdir(os.path.join(self.tempdir, "texts"))
154
def readonly_path(self, id):
155
if id not in self.tree:
157
if self.root is not None:
158
return self.tree.abspath(self.tree.id2path(id))
160
if self.tree.inventory[id].kind in ("directory", "root_directory"):
162
if not self.cached.has_key(id):
163
path = os.path.join(self.tempdir, "texts", id)
164
outfile = file(path, "wb")
165
outfile.write(self.tree.get_file(id).read())
166
assert(os.path.exists(path))
167
self.cached[id] = path
168
return self.cached[id]
172
def merge(other_revision, base_revision,
173
check_clean=True, ignore_zero=False,
174
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
176
"""Merge changes into a tree.
179
Base for three-way merge.
181
Other revision for three-way merge.
183
Directory to merge changes into; '.' by default.
185
If true, this_dir must have no uncommitted changes before the
188
tempdir = tempfile.mkdtemp(prefix="bzr-")
192
this_branch = find_branch(this_dir)
194
changes = compare_trees(this_branch.working_tree(),
195
this_branch.basis_tree(), False)
196
if changes.has_changed():
197
raise BzrCommandError("Working tree has uncommitted changes.")
198
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
199
if base_revision == [None, None]:
200
if other_revision[1] == -1:
203
o_revno = other_revision[1]
204
base_revno = this_branch.common_ancestor(other_branch,
205
other_revno=o_revno)[0]
206
if base_revno is None:
207
raise UnrelatedBranches()
208
base_revision = ['.', base_revno]
209
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
210
if file_list is None:
211
interesting_ids = None
213
interesting_ids = set()
214
this_tree = this_branch.working_tree()
215
for fname in file_list:
216
path = this_branch.relpath(fname)
218
for tree in (this_tree, base_tree.tree, other_tree.tree):
219
file_id = tree.inventory.path2id(path)
220
if file_id is not None:
221
interesting_ids.add(file_id)
224
raise BzrCommandError("%s is not a source file in any"
226
merge_inner(this_branch, other_tree, base_tree, tempdir,
227
ignore_zero=ignore_zero, backup_files=backup_files,
228
merge_type=merge_type, interesting_ids=interesting_ids)
230
shutil.rmtree(tempdir)
233
def set_interesting(inventory_a, inventory_b, interesting_ids):
234
"""Mark files whose ids are in interesting_ids as interesting
236
for inventory in (inventory_a, inventory_b):
237
for path, source_file in inventory.iteritems():
238
source_file.interesting = source_file.id in interesting_ids
241
def set_optimized(tree_a, tree_b, inventory_a, inventory_b):
242
"""Mark files that have changed texts as interesting
244
for file_id in tree_a.tree.inventory:
245
if file_id not in tree_b.tree.inventory:
247
entry_a = tree_a.tree.inventory[file_id]
248
entry_b = tree_b.tree.inventory[file_id]
249
if (entry_a.kind, entry_b.kind) != ("file", "file"):
251
if None in (entry_a.text_id, entry_b.text_id):
253
if entry_a.text_id != entry_b.text_id:
255
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
256
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
259
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
260
interesting_ids=None):
261
"""Generate a changeset, with preprocessing to select interesting files.
262
using the text_id to mark really-changed files.
263
This permits blazing comparisons when text_ids are present. It also
264
disables metadata comparison for files with identical texts.
266
if interesting_ids is None:
267
set_optimized(tree_a, tree_b, inventory_a, inventory_b)
269
set_interesting(inventory_a, inventory_b, interesting_ids)
270
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
271
for entry in cset.entries.itervalues():
272
entry.metadata_change = None
276
def merge_inner(this_branch, other_tree, base_tree, tempdir,
277
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
278
interesting_ids=None):
280
def merge_factory(base_file, other_file):
281
contents_change = merge_type(base_file, other_file)
283
contents_change = BackupBeforeChange(contents_change)
284
return contents_change
286
def generate_cset(tree_a, tree_b, inventory_a, inventory_b):
287
return generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
290
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
292
def get_inventory(tree):
293
return tree.inventory
295
inv_changes = merge_flex(this_tree, base_tree, other_tree,
296
generate_cset, get_inventory,
297
MergeConflictHandler(base_tree.root,
298
ignore_zero=ignore_zero),
299
merge_factory=merge_factory)
302
for id, path in inv_changes.iteritems():
307
assert path.startswith('./')
309
adjust_ids.append((path, id))
310
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
313
def regen_inventory(this_branch, root, new_entries):
314
old_entries = this_branch.read_working_inventory()
317
for file_id in old_entries:
318
entry = old_entries[file_id]
319
path = old_entries.id2path(file_id)
320
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
321
by_path[path] = file_id
326
for path, file_id in new_entries:
328
del new_inventory[file_id]
331
new_path_list.append((path, file_id))
332
if file_id not in old_entries:
334
# Ensure no file is added before its parent
336
for path, file_id in new_path_list:
340
parent = by_path[os.path.dirname(path)]
341
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
342
new_inventory[file_id] = (path, file_id, parent, kind)
343
by_path[path] = file_id
345
# Get a list in insertion order
346
new_inventory_list = new_inventory.values()
347
mutter ("""Inventory regeneration:
348
old length: %i insertions: %i deletions: %i new_length: %i"""\
349
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
350
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
351
new_inventory_list.sort()
352
return new_inventory_list
354
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
355
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
