174
def rem_contents_conflict(self, filename, this_contents, base_contents):
175
base_contents(filename+".BASE", self, False)
176
this_contents(filename+".THIS", self, False)
177
return ReplaceContents(this_contents, None)
179
def rem_contents_conflict(self, filename, this_contents, base_contents):
180
base_contents(filename+".BASE", self, False)
181
this_contents(filename+".THIS", self, False)
182
self.conflict("Other branch deleted locally modified file %s" %
184
return ReplaceContents(this_contents, None)
186
def abs_this_path(self, file_id):
187
"""Return the absolute path for a file_id in the this tree."""
188
return self.this_tree.id2abspath(file_id)
190
def add_missing_parents(self, file_id, tree):
191
"""If some of the parents for file_id are missing, add them."""
192
entry = tree.inventory[file_id]
193
if entry.parent_id not in self.this_tree:
194
return self.create_all_missing(entry.parent_id, tree)
196
return self.abs_this_path(entry.parent_id)
198
def create_all_missing(self, file_id, tree):
199
"""Add contents for a file_id and all its parents to a tree."""
200
entry = tree.inventory[file_id]
201
if entry.parent_id is not None and entry.parent_id not in self.this_tree:
202
abspath = self.create_all_missing(entry.parent_id, tree)
204
abspath = self.abs_this_path(entry.parent_id)
205
entry_path = os.path.join(abspath, entry.name)
206
if not os.path.isdir(entry_path):
207
self.create(file_id, entry_path, tree)
210
def create(self, file_id, path, tree, reverse=False):
211
"""Uses tree data to create a filesystem object for the file_id"""
212
from changeset import get_contents
213
get_contents(tree, file_id)(path, self, reverse)
215
def missing_for_merge(self, file_id, other_path):
216
"""The file_id doesn't exist in THIS, but does in OTHER and BASE"""
217
self.conflict("Other branch modified locally deleted file %s" %
219
parent_dir = self.add_missing_parents(file_id, self.other_tree)
220
stem = os.path.join(parent_dir, os.path.basename(other_path))
221
self.create(file_id, stem+".OTHER", self.other_tree)
222
self.create(file_id, stem+".BASE", self.base_tree)
224
def threeway_contents_conflict(filename, this_contents, base_contents,
226
self.conflict("Three-way conflict merging %s" % filename)
228
130
def finalize(self):
229
if self.conflicts == 0:
230
if not self.ignore_zero:
231
note("All changes applied successfully.")
233
note("%d conflicts encountered." % self.conflicts)
131
if not self.ignore_zero:
132
print "%d conflicts encountered.\n" % self.conflicts
235
def get_tree(treespec, local_branch=None):
134
def get_tree(treespec, temp_root, label, local_branch=None):
236
135
location, revno = treespec
237
branch = Branch.open_containing(location)[0]
136
branch = find_branch(location)
238
137
if revno is None:
240
139
elif revno == -1:
241
revision = branch.last_revision()
140
revision = branch.last_patch()
243
revision = branch.get_rev_id(revno)
245
revision = NULL_REVISION
246
return branch, get_revid_tree(branch, revision, local_branch)
142
revision = branch.lookup_revision(revno)
143
return branch, get_revid_tree(branch, revision, temp_root, label,
248
def get_revid_tree(branch, revision, local_branch):
146
def get_revid_tree(branch, revision, temp_root, label, local_branch):
249
147
if revision is None:
250
148
base_tree = branch.working_tree()
254
152
base_tree = local_branch.revision_tree(revision)
256
154
base_tree = branch.revision_tree(revision)
155
temp_path = os.path.join(temp_root, label)
157
return MergeTree(base_tree, temp_path)
260
160
def file_exists(tree, file_id):
261
161
return tree.has_filename(tree.id2path(file_id))
264
def build_working_dir(to_dir):
265
"""Build a working directory in an empty directory.
267
to_dir is a directory containing branch metadata but no working files,
268
typically constructed by cloning an existing branch.
270
This is split out as a special idiomatic case of merge. It could
271
eventually be done by just building the tree directly calling into
272
lower-level code (e.g. constructing a changeset).
274
# RBC 20051019 is this not just 'export' ?
275
# AB Well, export doesn't take care of inventory...
276
this_branch = Branch.open_containing(to_dir)[0]
277
transform_tree(this_branch.working_tree(), this_branch.basis_tree())
280
def transform_tree(from_tree, to_tree, interesting_ids=None):
281
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
282
interesting_ids=interesting_ids)
164
class MergeTree(object):
165
def __init__(self, tree, tempdir):
166
object.__init__(self)
167
if hasattr(tree, "basedir"):
168
self.root = tree.basedir
172
self.tempdir = tempdir
173
os.mkdir(os.path.join(self.tempdir, "texts"))
177
return self.tree.__iter__()
179
def __contains__(self, file_id):
180
return file_id in self.tree
182
def get_file(self, file_id):
183
return self.tree.get_file(file_id)
185
def get_file_sha1(self, id):
186
return self.tree.get_file_sha1(id)
188
def id2path(self, file_id):
189
return self.tree.id2path(file_id)
191
def has_id(self, file_id):
192
return self.tree.has_id(file_id)
194
def has_or_had_id(self, file_id):
195
if file_id == self.tree.inventory.root.file_id:
197
return self.tree.inventory.has_id(file_id)
199
def has_or_had_id(self, file_id):
200
if file_id == self.tree.inventory.root.file_id:
202
return self.tree.inventory.has_id(file_id)
204
def readonly_path(self, id):
205
if id not in self.tree:
207
if self.root is not None:
208
return self.tree.abspath(self.tree.id2path(id))
210
if self.tree.inventory[id].kind in ("directory", "root_directory"):
212
if not self.cached.has_key(id):
213
path = os.path.join(self.tempdir, "texts", id)
214
outfile = file(path, "wb")
215
outfile.write(self.tree.get_file(id).read())
216
assert(os.path.exists(path))
217
self.cached[id] = path
218
return self.cached[id]
285
222
def merge(other_revision, base_revision,
286
223
check_clean=True, ignore_zero=False,
287
224
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
288
file_list=None, show_base=False, reprocess=False):
289
226
"""Merge changes into a tree.
292
list(path, revno) Base for three-way merge.
293
If [None, None] then a base will be automatically determined.
229
tuple(path, revision) Base for three-way merge.
295
list(path, revno) Other revision for three-way merge.
231
tuple(path, revision) Other revision for three-way merge.
297
233
Directory to merge changes into; '.' by default.
299
235
If true, this_dir must have no uncommitted changes before the
301
ignore_zero - If true, suppress the "zero conflicts" message when
302
there are no conflicts; should be set when doing something we expect
303
to complete perfectly.
304
file_list - If supplied, merge only changes to selected files.
306
All available ancestors of other_revision and base_revision are
237
all available ancestors of other_revision and base_revision are
307
238
automatically pulled into the branch.
309
The revno may be -1 to indicate the last revision on the branch, which is
312
This function is intended for use from the command line; programmatic
313
clients might prefer to call merge_inner(), which has less magic behavior.
317
this_branch = Branch.open_containing(this_dir)[0]
318
if show_base and not merge_type is ApplyMerge3:
319
raise BzrCommandError("Show-base is not supported for this merge"
320
" type. %s" % merge_type)
321
if reprocess and not merge_type is ApplyMerge3:
322
raise BzrCommandError("Reprocess is not supported for this merge"
323
" type. %s" % merge_type)
324
if reprocess and show_base:
325
raise BzrCommandError("Cannot reprocess and show base.")
326
merger = Merger(this_branch)
327
merger.check_basis(check_clean)
328
merger.set_other(other_revision)
329
merger.set_base(base_revision)
330
if merger.base_rev_id == merger.other_rev_id:
331
note('Nothing to do.')
333
merger.backup_files = backup_files
334
merger.merge_type = merge_type
335
merger.set_interesting_files(file_list)
336
merger.show_base = show_base
337
merger.reprocess = reprocess
338
merger.conflict_handler = MergeConflictHandler(merger.this_tree,
341
ignore_zero=ignore_zero)
342
conflicts = merger.do_merge()
346
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
348
merge_type=ApplyMerge3,
349
interesting_ids=None,
353
interesting_files=None):
354
"""Primary interface for merging.
356
typical use is probably
357
'merge_inner(branch, branch.get_revision_tree(other_revision),
358
branch.get_revision_tree(base_revision))'
360
merger = Merger(this_branch, other_tree, base_tree)
361
merger.backup_files = backup_files
362
merger.merge_type = merge_type
363
merger.interesting_ids = interesting_ids
364
if interesting_files:
365
assert not interesting_ids, ('Only supply interesting_ids'
366
' or interesting_files')
367
merger._set_interesting_files(interesting_files)
368
merger.show_base = show_base
369
merger.reprocess = reprocess
370
merger.conflict_handler = MergeConflictHandler(merger.this_tree, base_tree,
372
ignore_zero=ignore_zero)
373
merger.other_rev_id = other_rev_id
374
merger.other_basis = other_rev_id
375
return merger.do_merge()
378
class Merger(object):
379
def __init__(self, this_branch, other_tree=None, base_tree=None):
380
object.__init__(self)
381
self.this_branch = this_branch
382
self.this_basis = this_branch.last_revision()
383
self.this_rev_id = None
384
self.this_tree = this_branch.working_tree()
385
self.this_revision_tree = None
386
self.this_basis_tree = None
387
self.other_tree = other_tree
388
self.base_tree = base_tree
389
self.ignore_zero = False
390
self.backup_files = False
391
self.interesting_ids = None
392
self.show_base = False
393
self.reprocess = False
394
self.conflict_handler = MergeConflictHandler(self.this_tree, base_tree,
397
def revision_tree(self, revision_id):
398
return self.this_branch.revision_tree(revision_id)
400
def ensure_revision_trees(self):
401
if self.this_revision_tree is None:
402
self.this_basis_tree = self.this_branch.revision_tree(
404
if self.this_basis == self.this_rev_id:
405
self.this_revision_tree = self.this_basis_tree
408
if self.other_rev_id is None:
409
other_basis_tree = self.revision_tree(self.other_basis)
410
changes = compare_trees(self.other_tree, other_basis_tree)
411
if changes.has_changed():
412
raise WorkingTreeNotRevision(self.this_tree)
413
other_rev_id = other_basis
414
self.other_tree = other_basis_tree
417
def file_revisions(self, file_id):
418
self.ensure_revision_trees()
419
def get_id(tree, file_id):
420
revision_id = tree.inventory[file_id].revision
421
assert revision_id is not None
423
if self.this_rev_id is None:
424
if self.this_basis_tree.get_file_sha1(file_id) != \
425
self.this_tree.get_file_sha1(file_id):
426
raise WorkingTreeNotRevision(self.this_tree)
428
trees = (self.this_basis_tree, self.other_tree)
429
return [get_id(tree, file_id) for tree in trees]
432
def merge_factory(self, file_id, base, other):
433
if self.merge_type.history_based:
434
if self.show_base is True:
435
raise BzrError("Cannot show base for hisory-based merges")
436
if self.reprocess is True:
437
raise BzrError("Cannot reprocess history-based merges")
439
t_revid, o_revid = self.file_revisions(file_id)
440
weave = self.this_basis_tree.get_weave(file_id)
441
contents_change = self.merge_type(weave, t_revid, o_revid)
443
if self.show_base is True or self.reprocess is True:
444
contents_change = self.merge_type(file_id, base, other,
445
show_base=self.show_base,
446
reprocess=self.reprocess)
448
contents_change = self.merge_type(file_id, base, other)
449
if self.backup_files:
450
contents_change = BackupBeforeChange(contents_change)
451
return contents_change
453
def check_basis(self, check_clean):
454
if self.this_basis is None:
240
from bzrlib.revision import common_ancestor, MultipleRevisionSources
241
from bzrlib.errors import NoSuchRevision
242
tempdir = tempfile.mkdtemp(prefix="bzr-")
246
this_branch = find_branch(this_dir)
247
this_rev_id = this_branch.last_patch()
248
if this_rev_id is None:
455
249
raise BzrCommandError("This branch has no commits")
458
if self.this_basis != self.this_rev_id:
251
changes = compare_trees(this_branch.working_tree(),
252
this_branch.basis_tree(), False)
253
if changes.has_changed():
459
254
raise BzrCommandError("Working tree has uncommitted changes.")
461
def compare_basis(self):
462
changes = compare_trees(self.this_branch.working_tree(),
463
self.this_branch.basis_tree(), False)
464
if not changes.has_changed():
465
self.this_rev_id = self.this_basis
467
def set_interesting_files(self, file_list):
469
self._set_interesting_files(file_list)
470
except NotVersionedError, e:
471
raise BzrCommandError("%s is not a source file in any"
474
def _set_interesting_files(self, file_list):
475
"""Set the list of interesting ids from a list of files."""
476
if file_list is None:
477
self.interesting_ids = None
480
interesting_ids = set()
481
for fname in file_list:
482
path = self.this_tree.relpath(fname)
484
for tree in (self.this_tree, self.base_tree, self.other_tree):
485
file_id = tree.inventory.path2id(path)
486
if file_id is not None:
487
interesting_ids.add(file_id)
490
raise NotVersionedError(path=fname)
491
self.interesting_ids = interesting_ids
493
def set_pending(self):
494
if not self.base_is_ancestor:
496
if self.other_rev_id is None:
498
if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):
500
self.this_branch.working_tree().add_pending_merge(self.other_rev_id)
502
def set_other(self, other_revision):
503
other_branch, self.other_tree = get_tree(other_revision,
255
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
505
257
if other_revision[1] == -1:
506
self.other_rev_id = other_branch.last_revision()
507
if self.other_rev_id is None:
508
raise NoCommits(other_branch)
509
self.other_basis = self.other_rev_id
258
other_rev_id = other_branch.last_patch()
259
other_basis = other_rev_id
510
260
elif other_revision[1] is not None:
511
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
512
self.other_basis = self.other_rev_id
261
other_rev_id = other_branch.lookup_revision(other_revision[1])
262
other_basis = other_rev_id
514
self.other_rev_id = None
515
self.other_basis = other_branch.last_revision()
516
if self.other_basis is None:
517
raise NoCommits(other_branch)
518
fetch(from_branch=other_branch, to_branch=self.this_branch,
519
last_revision=self.other_basis)
521
def set_base(self, base_revision):
522
mutter("doing merge() with no base_revision specified")
265
other_basis = other_branch.last_patch()
523
266
if base_revision == [None, None]:
525
self.base_rev_id = common_ancestor(self.this_basis,
528
except NoCommonAncestor:
267
base_rev_id = common_ancestor(this_rev_id, other_basis,
269
if base_rev_id is None:
529
270
raise UnrelatedBranches()
530
self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,
532
self.base_is_ancestor = True
271
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
273
base_is_ancestor = True
534
base_branch, self.base_tree = get_tree(base_revision)
275
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
535
276
if base_revision[1] == -1:
536
self.base_rev_id = base_branch.last_revision()
277
base_rev_id = base_branch.last_patch()
537
278
elif base_revision[1] is None:
538
self.base_rev_id = None
540
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
541
fetch(from_branch=base_branch, to_branch=self.this_branch)
542
self.base_is_ancestor = is_ancestor(self.this_basis,
547
def get_inventory(tree):
548
return tree.inventory
550
inv_changes = merge_flex(self.this_tree, self.base_tree,
552
generate_changeset, get_inventory,
553
self.conflict_handler,
554
merge_factory=self.merge_factory,
555
interesting_ids=self.interesting_ids)
558
for id, path in inv_changes.iteritems():
563
assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
565
adjust_ids.append((path, id))
566
if len(adjust_ids) > 0:
567
self.this_branch.working_tree().set_inventory(self.regen_inventory(adjust_ids))
568
conflicts = self.conflict_handler.conflicts
569
self.conflict_handler.finalize()
572
def regen_inventory(self, new_entries):
573
old_entries = self.this_branch.working_tree().read_working_inventory()
577
for path, file_id in new_entries:
580
new_entries_map[file_id] = path
582
def id2path(file_id):
583
path = new_entries_map.get(file_id)
586
entry = old_entries[file_id]
587
if entry.parent_id is None:
589
return os.path.join(id2path(entry.parent_id), entry.name)
591
for file_id in old_entries:
592
entry = old_entries[file_id]
593
path = id2path(file_id)
594
new_inventory[file_id] = (path, file_id, entry.parent_id,
596
by_path[path] = file_id
601
for path, file_id in new_entries:
603
del new_inventory[file_id]
606
new_path_list.append((path, file_id))
607
if file_id not in old_entries:
609
# Ensure no file is added before its parent
611
for path, file_id in new_path_list:
615
parent = by_path[os.path.dirname(path)]
616
abspath = os.path.join(self.this_tree.basedir, path)
617
kind = bzrlib.osutils.file_kind(abspath)
618
new_inventory[file_id] = (path, file_id, parent, kind)
619
by_path[path] = file_id
621
# Get a list in insertion order
622
new_inventory_list = new_inventory.values()
623
mutter ("""Inventory regeneration:
624
old length: %i insertions: %i deletions: %i new_length: %i"""\
625
% (len(old_entries), insertions, deletions,
626
len(new_inventory_list)))
627
assert len(new_inventory_list) == len(old_entries) + insertions\
629
new_inventory_list.sort()
630
return new_inventory_list
281
base_rev_id = base_branch.lookup_revision(base_revision[1])
282
if base_rev_id is not None:
283
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
284
MultipleRevisionSources(this_branch,
287
base_is_ancestor = False
288
if file_list is None:
289
interesting_ids = None
291
interesting_ids = set()
292
this_tree = this_branch.working_tree()
293
for fname in file_list:
294
path = this_branch.relpath(fname)
296
for tree in (this_tree, base_tree.tree, other_tree.tree):
297
file_id = tree.inventory.path2id(path)
298
if file_id is not None:
299
interesting_ids.add(file_id)
302
raise BzrCommandError("%s is not a source file in any"
304
merge_inner(this_branch, other_tree, base_tree, tempdir,
305
ignore_zero=ignore_zero, backup_files=backup_files,
306
merge_type=merge_type, interesting_ids=interesting_ids)
307
if base_is_ancestor and other_rev_id is not None\
308
and other_rev_id not in this_branch.revision_history():
309
this_branch.add_pending_merge(other_rev_id)
311
shutil.rmtree(tempdir)
314
def set_interesting(inventory_a, inventory_b, interesting_ids):
315
"""Mark files whose ids are in interesting_ids as interesting
317
for inventory in (inventory_a, inventory_b):
318
for path, source_file in inventory.iteritems():
319
source_file.interesting = source_file.id in interesting_ids
322
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
323
"""Generate a changeset. If interesting_ids is supplied, only changes
324
to those files will be shown. Metadata changes are stripped.
326
cset = generate_changeset(tree_a, tree_b, interesting_ids)
327
for entry in cset.entries.itervalues():
328
entry.metadata_change = None
332
def merge_inner(this_branch, other_tree, base_tree, tempdir,
333
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
334
interesting_ids=None):
336
def merge_factory(file_id, base, other):
337
contents_change = merge_type(file_id, base, other)
339
contents_change = BackupBeforeChange(contents_change)
340
return contents_change
342
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
344
def get_inventory(tree):
345
return tree.tree.inventory
347
inv_changes = merge_flex(this_tree, base_tree, other_tree,
348
generate_cset_optimized, get_inventory,
349
MergeConflictHandler(base_tree.root,
350
ignore_zero=ignore_zero),
351
merge_factory=merge_factory,
352
interesting_ids=interesting_ids)
355
for id, path in inv_changes.iteritems():
360
assert path.startswith('.' + os.sep), "path is %s" % path
362
adjust_ids.append((path, id))
363
if len(adjust_ids) > 0:
364
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
368
def regen_inventory(this_branch, root, new_entries):
369
old_entries = this_branch.read_working_inventory()
373
for path, file_id in new_entries:
376
new_entries_map[file_id] = path
378
def id2path(file_id):
379
path = new_entries_map.get(file_id)
382
entry = old_entries[file_id]
383
if entry.parent_id is None:
385
return os.path.join(id2path(entry.parent_id), entry.name)
387
for file_id in old_entries:
388
entry = old_entries[file_id]
389
path = id2path(file_id)
390
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
391
by_path[path] = file_id
396
for path, file_id in new_entries:
398
del new_inventory[file_id]
401
new_path_list.append((path, file_id))
402
if file_id not in old_entries:
404
# Ensure no file is added before its parent
406
for path, file_id in new_path_list:
410
parent = by_path[os.path.dirname(path)]
411
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
412
new_inventory[file_id] = (path, file_id, parent, kind)
413
by_path[path] = file_id
415
# Get a list in insertion order
416
new_inventory_list = new_inventory.values()
417
mutter ("""Inventory regeneration:
418
old length: %i insertions: %i deletions: %i new_length: %i"""\
419
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
420
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
421
new_inventory_list.sort()
422
return new_inventory_list
632
424
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
633
"diff3": (Diff3Merge, "Merge using external diff3"),
634
'weave': (WeaveMerge, "Weave-based merge")
425
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
