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