71
88
class Merger(object):
72
89
def __init__(self, this_branch, other_tree=None, base_tree=None,
73
this_tree=None, pb=DummyProgress(), change_reporter=None,
74
recurse='down', revision_graph=None):
90
this_tree=None, pb=DummyProgress()):
75
91
object.__init__(self)
92
assert this_tree is not None, "this_tree is required"
76
93
self.this_branch = this_branch
77
self.this_basis = _mod_revision.ensure_null(
78
this_branch.last_revision())
94
self.this_basis = this_branch.last_revision()
79
95
self.this_rev_id = None
80
96
self.this_tree = this_tree
81
97
self.this_revision_tree = None
82
98
self.this_basis_tree = None
83
99
self.other_tree = other_tree
84
self.other_branch = None
85
100
self.base_tree = base_tree
86
101
self.ignore_zero = False
87
102
self.backup_files = False
88
103
self.interesting_ids = None
89
self.interesting_files = None
90
104
self.show_base = False
91
105
self.reprocess = False
94
self.recurse = recurse
95
self.change_reporter = change_reporter
96
self._cached_trees = {}
97
self._revision_graph = revision_graph
98
self._base_is_ancestor = None
99
self._base_is_other_ancestor = None
100
self._is_criss_cross = None
101
self._lca_trees = None
104
def revision_graph(self):
105
if self._revision_graph is None:
106
self._revision_graph = self.this_branch.repository.get_graph()
107
return self._revision_graph
109
def _set_base_is_ancestor(self, value):
110
self._base_is_ancestor = value
112
def _get_base_is_ancestor(self):
113
if self._base_is_ancestor is None:
114
self._base_is_ancestor = self.revision_graph.is_ancestor(
115
self.base_rev_id, self.this_basis)
116
return self._base_is_ancestor
118
base_is_ancestor = property(_get_base_is_ancestor, _set_base_is_ancestor)
120
def _set_base_is_other_ancestor(self, value):
121
self._base_is_other_ancestor = value
123
def _get_base_is_other_ancestor(self):
124
if self._base_is_other_ancestor is None:
125
if self.other_basis is None:
127
self._base_is_other_ancestor = self.revision_graph.is_ancestor(
128
self.base_rev_id, self.other_basis)
129
return self._base_is_other_ancestor
131
base_is_other_ancestor = property(_get_base_is_other_ancestor,
132
_set_base_is_other_ancestor)
135
def from_uncommitted(tree, other_tree, pb, base_tree=None):
136
"""Return a Merger for uncommitted changes in other_tree.
138
:param tree: The tree to merge into
139
:param other_tree: The tree to get uncommitted changes from
140
:param pb: A progress indicator
141
:param base_tree: The basis to use for the merge. If unspecified,
142
other_tree.basis_tree() will be used.
144
if base_tree is None:
145
base_tree = other_tree.basis_tree()
146
merger = Merger(tree.branch, other_tree, base_tree, tree, pb)
147
merger.base_rev_id = merger.base_tree.get_revision_id()
148
merger.other_rev_id = None
149
merger.other_basis = merger.base_rev_id
153
def from_mergeable(klass, tree, mergeable, pb):
154
"""Return a Merger for a bundle or merge directive.
156
:param tree: The tree to merge changes into
157
:param mergeable: A merge directive or bundle
158
:param pb: A progress indicator
160
mergeable.install_revisions(tree.branch.repository)
161
base_revision_id, other_revision_id, verified =\
162
mergeable.get_merge_request(tree.branch.repository)
163
revision_graph = tree.branch.repository.get_graph()
164
if base_revision_id is not None:
165
if (base_revision_id != _mod_revision.NULL_REVISION and
166
revision_graph.is_ancestor(
167
base_revision_id, tree.branch.last_revision())):
168
base_revision_id = None
170
warning('Performing cherrypick')
171
merger = klass.from_revision_ids(pb, tree, other_revision_id,
172
base_revision_id, revision_graph=
174
return merger, verified
177
def from_revision_ids(pb, tree, other, base=None, other_branch=None,
178
base_branch=None, revision_graph=None,
180
"""Return a Merger for revision-ids.
182
:param pb: A progress indicator
183
:param tree: The tree to merge changes into
184
:param other: The revision-id to use as OTHER
185
:param base: The revision-id to use as BASE. If not specified, will
187
:param other_branch: A branch containing the other revision-id. If
188
not supplied, tree.branch is used.
189
:param base_branch: A branch containing the base revision-id. If
190
not supplied, other_branch or tree.branch will be used.
191
:param revision_graph: If you have a revision_graph precomputed, pass
192
it in, otherwise it will be created for you.
193
:param tree_branch: The branch associated with tree. If not supplied,
194
tree.branch will be used.
196
if tree_branch is None:
197
tree_branch = tree.branch
198
merger = Merger(tree_branch, this_tree=tree, pb=pb,
199
revision_graph=revision_graph)
200
if other_branch is None:
201
other_branch = tree.branch
202
merger.set_other_revision(other, other_branch)
206
if base_branch is None:
207
base_branch = other_branch
208
merger.set_base_revision(base, base_branch)
211
def revision_tree(self, revision_id, branch=None):
212
if revision_id not in self._cached_trees:
214
branch = self.this_branch
216
tree = self.this_tree.revision_tree(revision_id)
217
except errors.NoSuchRevisionInTree:
218
tree = branch.repository.revision_tree(revision_id)
219
self._cached_trees[revision_id] = tree
220
return self._cached_trees[revision_id]
222
def _get_tree(self, treespec, possible_transports=None):
223
from bzrlib import workingtree
224
location, revno = treespec
226
tree = workingtree.WorkingTree.open_containing(location)[0]
227
return tree.branch, tree
228
branch = Branch.open_containing(location, possible_transports)[0]
230
revision_id = branch.last_revision()
232
revision_id = branch.get_rev_id(revno)
233
revision_id = ensure_null(revision_id)
234
return branch, self.revision_tree(revision_id, branch)
109
def revision_tree(self, revision_id):
110
return self.this_branch.repository.revision_tree(revision_id)
236
112
def ensure_revision_trees(self):
237
113
if self.this_revision_tree is None:
238
self.this_basis_tree = self.revision_tree(self.this_basis)
114
self.this_basis_tree = self.this_branch.repository.revision_tree(
239
116
if self.this_basis == self.this_rev_id:
240
117
self.this_revision_tree = self.this_basis_tree
268
146
self.compare_basis()
269
147
if self.this_basis != self.this_rev_id:
270
raise errors.UncommittedChanges(self.this_tree)
148
raise BzrCommandError("Working tree has uncommitted changes.")
272
150
def compare_basis(self):
274
basis_tree = self.revision_tree(self.this_tree.last_revision())
275
except errors.NoSuchRevision:
276
basis_tree = self.this_tree.basis_tree()
277
changes = self.this_tree.changes_from(basis_tree)
151
changes = self.this_tree.changes_from(self.this_tree.basis_tree())
278
152
if not changes.has_changed():
279
153
self.this_rev_id = self.this_basis
281
155
def set_interesting_files(self, file_list):
282
self.interesting_files = file_list
157
self._set_interesting_files(file_list)
158
except NotVersionedError, e:
159
raise BzrCommandError("%s is not a source file in any"
162
def _set_interesting_files(self, file_list):
163
"""Set the list of interesting ids from a list of files."""
164
if file_list is None:
165
self.interesting_ids = None
168
interesting_ids = set()
169
for path in file_list:
171
for tree in (self.this_tree, self.base_tree, self.other_tree):
172
file_id = tree.inventory.path2id(path)
173
if file_id is not None:
174
interesting_ids.add(file_id)
177
raise NotVersionedError(path=path)
178
self.interesting_ids = interesting_ids
284
180
def set_pending(self):
285
if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
289
def _add_parent(self):
290
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
291
new_parent_trees = []
292
for revision_id in new_parents:
294
tree = self.revision_tree(revision_id)
295
except errors.NoSuchRevision:
299
new_parent_trees.append((revision_id, tree))
301
self.this_tree.set_parent_trees(new_parent_trees,
302
allow_leftmost_as_ghost=True)
304
for _revision_id, tree in new_parent_trees:
308
def set_other(self, other_revision, possible_transports=None):
181
if not self.base_is_ancestor:
183
if self.other_rev_id is None:
185
ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
186
if self.other_rev_id in ancestry:
188
self.this_tree.add_parent_tree((self.other_rev_id, self.other_tree))
190
def set_other(self, other_revision):
309
191
"""Set the revision and tree to merge from.
311
193
This sets the other_tree, other_rev_id, other_basis attributes.
313
195
:param other_revision: The [path, revision] list to merge from.
315
self.other_branch, self.other_tree = self._get_tree(other_revision,
197
other_branch, self.other_tree = _get_tree(other_revision,
317
199
if other_revision[1] == -1:
318
self.other_rev_id = _mod_revision.ensure_null(
319
self.other_branch.last_revision())
320
if _mod_revision.is_null(self.other_rev_id):
321
raise NoCommits(self.other_branch)
200
self.other_rev_id = other_branch.last_revision()
201
if self.other_rev_id is None:
202
raise NoCommits(other_branch)
322
203
self.other_basis = self.other_rev_id
323
204
elif other_revision[1] is not None:
324
self.other_rev_id = self.other_branch.get_rev_id(other_revision[1])
205
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
325
206
self.other_basis = self.other_rev_id
327
208
self.other_rev_id = None
328
self.other_basis = self.other_branch.last_revision()
209
self.other_basis = other_branch.last_revision()
329
210
if self.other_basis is None:
330
raise NoCommits(self.other_branch)
331
if self.other_rev_id is not None:
332
self._cached_trees[self.other_rev_id] = self.other_tree
333
self._maybe_fetch(self.other_branch,self.this_branch, self.other_basis)
335
def set_other_revision(self, revision_id, other_branch):
336
"""Set 'other' based on a branch and revision id
338
:param revision_id: The revision to use for a tree
339
:param other_branch: The branch containing this tree
341
self.other_rev_id = revision_id
342
self.other_branch = other_branch
343
self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id)
344
self.other_tree = self.revision_tree(revision_id)
345
self.other_basis = revision_id
347
def set_base_revision(self, revision_id, branch):
348
"""Set 'base' based on a branch and revision id
350
:param revision_id: The revision to use for a tree
351
:param branch: The branch containing this tree
353
self.base_rev_id = revision_id
354
self.base_branch = branch
355
self._maybe_fetch(branch, self.this_branch, revision_id)
356
self.base_tree = self.revision_tree(revision_id)
358
def _maybe_fetch(self, source, target, revision_id):
359
if not source.repository.has_same_location(target.repository):
360
target.fetch(source, revision_id)
211
raise NoCommits(other_branch)
212
if other_branch.base != self.this_branch.base:
213
self.this_branch.fetch(other_branch, last_revision=self.other_basis)
362
215
def find_base(self):
363
revisions = [ensure_null(self.this_basis),
364
ensure_null(self.other_basis)]
365
if NULL_REVISION in revisions:
366
self.base_rev_id = NULL_REVISION
367
self.base_tree = self.revision_tree(self.base_rev_id)
368
self._is_criss_cross = False
370
lcas = self.revision_graph.find_lca(revisions[0], revisions[1])
371
self._is_criss_cross = False
373
self.base_rev_id = NULL_REVISION
375
self.base_rev_id = list(lcas)[0]
376
else: # len(lcas) > 1
378
# find_unique_lca can only handle 2 nodes, so we have to
379
# start back at the beginning. It is a shame to traverse
380
# the graph again, but better than re-implementing
382
self.base_rev_id = self.revision_graph.find_unique_lca(
383
revisions[0], revisions[1])
385
self.base_rev_id = self.revision_graph.find_unique_lca(
387
self._is_criss_cross = True
388
if self.base_rev_id == NULL_REVISION:
389
raise UnrelatedBranches()
390
if self._is_criss_cross:
391
warning('Warning: criss-cross merge encountered. See bzr'
392
' help criss-cross.')
393
mutter('Criss-cross lcas: %r' % lcas)
394
interesting_revision_ids = [self.base_rev_id]
395
interesting_revision_ids.extend(lcas)
396
interesting_trees = dict((t.get_revision_id(), t)
397
for t in self.this_branch.repository.revision_trees(
398
interesting_revision_ids))
399
self._cached_trees.update(interesting_trees)
400
self.base_tree = interesting_trees.pop(self.base_rev_id)
401
sorted_lca_keys = self.revision_graph.find_merge_order(
403
self._lca_trees = [interesting_trees[key]
404
for key in sorted_lca_keys]
406
self.base_tree = self.revision_tree(self.base_rev_id)
407
self.base_is_ancestor = True
408
self.base_is_other_ancestor = True
409
mutter('Base revid: %r' % self.base_rev_id)
216
self.set_base([None, None])
411
218
def set_base(self, base_revision):
412
219
"""Set the base revision to use for the merge.
445
266
kwargs['show_base'] = self.show_base
446
267
elif self.show_base:
447
268
raise BzrError("Showing base is not supported for this"
448
" merge type. %s" % self.merge_type)
449
if (not getattr(self.merge_type, 'supports_reverse_cherrypick', True)
450
and not self.base_is_other_ancestor):
451
raise errors.CannotReverseCherrypick()
452
if self.merge_type.supports_cherrypick:
453
kwargs['cherrypick'] = (not self.base_is_ancestor or
454
not self.base_is_other_ancestor)
455
if self._is_criss_cross and getattr(self.merge_type,
456
'supports_lca_trees', False):
457
kwargs['lca_trees'] = self._lca_trees
458
return self.merge_type(pb=self._pb,
459
change_reporter=self.change_reporter,
462
def _do_merge_to(self, merge):
464
if self.recurse == 'down':
465
for relpath, file_id in self.this_tree.iter_references():
466
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
467
other_revision = self.other_tree.get_reference_revision(
469
if other_revision == sub_tree.last_revision():
471
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
472
sub_merge.merge_type = self.merge_type
473
other_branch = self.other_branch.reference_parent(file_id, relpath)
474
sub_merge.set_other_revision(other_revision, other_branch)
475
base_revision = self.base_tree.get_reference_revision(file_id)
476
sub_merge.base_tree = \
477
sub_tree.branch.repository.revision_tree(base_revision)
478
sub_merge.base_rev_id = base_revision
269
" merge type. %s" % self.merge_type)
482
270
self.this_tree.lock_tree_write()
271
if self.base_tree is not None:
272
self.base_tree.lock_read()
273
if self.other_tree is not None:
274
self.other_tree.lock_read()
276
merge = self.merge_type(pb=self._pb, **kwargs)
278
if self.other_tree is not None:
279
self.other_tree.unlock()
484
280
if self.base_tree is not None:
485
self.base_tree.lock_read()
487
if self.other_tree is not None:
488
self.other_tree.lock_read()
490
merge = self.make_merger()
491
self._do_merge_to(merge)
493
if self.other_tree is not None:
494
self.other_tree.unlock()
496
if self.base_tree is not None:
497
self.base_tree.unlock()
281
self.base_tree.unlock()
499
282
self.this_tree.unlock()
500
283
if len(merge.cooked_conflicts) == 0:
501
if not self.ignore_zero and not is_quiet():
284
if not self.ignore_zero:
502
285
note("All changes applied successfully.")
504
287
note("%d conflicts encountered." % len(merge.cooked_conflicts))
506
289
return len(merge.cooked_conflicts)
509
class _InventoryNoneEntry(object):
510
"""This represents an inventory entry which *isn't there*.
512
It simplifies the merging logic if we always have an InventoryEntry, even
513
if it isn't actually present
520
symlink_target = None
523
_none_entry = _InventoryNoneEntry()
291
def regen_inventory(self, new_entries):
292
old_entries = self.this_tree.read_working_inventory()
296
for path, file_id in new_entries:
299
new_entries_map[file_id] = path
301
def id2path(file_id):
302
path = new_entries_map.get(file_id)
305
entry = old_entries[file_id]
306
if entry.parent_id is None:
308
return pathjoin(id2path(entry.parent_id), entry.name)
310
for file_id in old_entries:
311
entry = old_entries[file_id]
312
path = id2path(file_id)
313
if file_id in self.base_tree.inventory:
314
executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
316
executable = getattr(entry, 'executable', False)
317
new_inventory[file_id] = (path, file_id, entry.parent_id,
318
entry.kind, executable)
320
by_path[path] = file_id
325
for path, file_id in new_entries:
327
del new_inventory[file_id]
330
new_path_list.append((path, file_id))
331
if file_id not in old_entries:
333
# Ensure no file is added before its parent
335
for path, file_id in new_path_list:
339
parent = by_path[os.path.dirname(path)]
340
abspath = pathjoin(self.this_tree.basedir, path)
341
kind = osutils.file_kind(abspath)
342
if file_id in self.base_tree.inventory:
343
executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
346
new_inventory[file_id] = (path, file_id, parent, kind, executable)
347
by_path[path] = file_id
349
# Get a list in insertion order
350
new_inventory_list = new_inventory.values()
351
mutter ("""Inventory regeneration:
352
old length: %i insertions: %i deletions: %i new_length: %i"""\
353
% (len(old_entries), insertions, deletions,
354
len(new_inventory_list)))
355
assert len(new_inventory_list) == len(old_entries) + insertions\
357
new_inventory_list.sort()
358
return new_inventory_list
526
361
class Merge3Merger(object):
577
377
self.cooked_conflicts = []
578
378
self.reprocess = reprocess
579
379
self.show_base = show_base
580
self._lca_trees = lca_trees
581
# Uncommenting this will change the default algorithm to always use
582
# _entries_lca. This can be useful for running the test suite and
583
# making sure we haven't missed any corner cases.
584
# if lca_trees is None:
585
# self._lca_trees = [self.base_tree]
588
self.change_reporter = change_reporter
589
self.cherrypick = cherrypick
590
382
if self.pp is None:
591
383
self.pp = ProgressPhase("Merge phase", 3, self.pb)
596
self.this_tree.lock_tree_write()
597
self.base_tree.lock_read()
598
self.other_tree.lock_read()
599
self.tt = TreeTransform(self.this_tree, self.pb)
385
if interesting_ids is not None:
386
all_ids = interesting_ids
388
all_ids = set(base_tree)
389
all_ids.update(other_tree)
390
working_tree.lock_tree_write()
391
self.tt = TreeTransform(working_tree, self.pb)
601
393
self.pp.next_phase()
602
self._compute_transform()
604
results = self.tt.apply(no_conflicts=True)
394
child_pb = ui.ui_factory.nested_progress_bar()
396
for num, file_id in enumerate(all_ids):
397
child_pb.update('Preparing file merge', num, len(all_ids))
398
self.merge_names(file_id)
399
file_status = self.merge_contents(file_id)
400
self.merge_executable(file_id, file_status)
405
child_pb = ui.ui_factory.nested_progress_bar()
407
fs_conflicts = resolve_conflicts(self.tt, child_pb)
410
self.cook_conflicts(fs_conflicts)
411
for conflict in self.cooked_conflicts:
414
results = self.tt.apply()
605
415
self.write_modified(results)
607
self.this_tree.add_conflicts(self.cooked_conflicts)
417
working_tree.add_conflicts(self.cooked_conflicts)
608
418
except UnsupportedOperation:
611
421
self.tt.finalize()
612
self.other_tree.unlock()
613
self.base_tree.unlock()
614
self.this_tree.unlock()
617
def make_preview_transform(self):
618
self.base_tree.lock_read()
619
self.other_tree.lock_read()
620
self.tt = TransformPreview(self.this_tree)
623
self._compute_transform()
626
self.other_tree.unlock()
627
self.base_tree.unlock()
631
def _compute_transform(self):
632
if self._lca_trees is None:
633
entries = self._entries3()
634
resolver = self._three_way
636
entries = self._entries_lca()
637
resolver = self._lca_multi_way
638
child_pb = ui.ui_factory.nested_progress_bar()
640
for num, (file_id, changed, parents3, names3,
641
executable3) in enumerate(entries):
642
child_pb.update('Preparing file merge', num, len(entries))
643
self._merge_names(file_id, parents3, names3, resolver=resolver)
645
file_status = self.merge_contents(file_id)
647
file_status = 'unmodified'
648
self._merge_executable(file_id,
649
executable3, file_status, resolver=resolver)
654
child_pb = ui.ui_factory.nested_progress_bar()
656
fs_conflicts = resolve_conflicts(self.tt, child_pb,
657
lambda t, c: conflict_pass(t, c, self.other_tree))
660
if self.change_reporter is not None:
661
from bzrlib import delta
662
delta.report_changes(
663
self.tt.iter_changes(), self.change_reporter)
664
self.cook_conflicts(fs_conflicts)
665
for conflict in self.cooked_conflicts:
669
"""Gather data about files modified between three trees.
671
Return a list of tuples of file_id, changed, parents3, names3,
672
executable3. changed is a boolean indicating whether the file contents
673
or kind were changed. parents3 is a tuple of parent ids for base,
674
other and this. names3 is a tuple of names for base, other and this.
675
executable3 is a tuple of execute-bit values for base, other and this.
678
iterator = self.other_tree.iter_changes(self.base_tree,
679
include_unchanged=True, specific_files=self.interesting_files,
680
extra_trees=[self.this_tree])
681
this_entries = dict((e.file_id, e) for p, e in
682
self.this_tree.iter_entries_by_dir(
683
self.interesting_ids))
684
for (file_id, paths, changed, versioned, parents, names, kind,
685
executable) in iterator:
686
if (self.interesting_ids is not None and
687
file_id not in self.interesting_ids):
689
entry = this_entries.get(file_id)
690
if entry is not None:
691
this_name = entry.name
692
this_parent = entry.parent_id
693
this_executable = entry.executable
697
this_executable = None
698
parents3 = parents + (this_parent,)
699
names3 = names + (this_name,)
700
executable3 = executable + (this_executable,)
701
result.append((file_id, changed, parents3, names3, executable3))
704
def _entries_lca(self):
705
"""Gather data about files modified between multiple trees.
707
This compares OTHER versus all LCA trees, and for interesting entries,
708
it then compares with THIS and BASE.
710
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
711
:return: [(file_id, changed, parents, names, executable)]
712
file_id Simple file_id of the entry
713
changed Boolean, True if the kind or contents changed
715
parents ((base, [parent_id, in, lcas]), parent_id_other,
717
names ((base, [name, in, lcas]), name_in_other, name_in_this)
718
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
720
if self.interesting_files is not None:
721
lookup_trees = [self.this_tree, self.base_tree]
722
lookup_trees.extend(self._lca_trees)
723
# I think we should include the lca trees as well
724
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
727
interesting_ids = self.interesting_ids
729
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
731
base_inventory = self.base_tree.inventory
732
this_inventory = self.this_tree.inventory
733
for path, file_id, other_ie, lca_values in walker.iter_all():
734
# Is this modified at all from any of the other trees?
736
other_ie = _none_entry
737
if interesting_ids is not None and file_id not in interesting_ids:
740
# If other_revision is found in any of the lcas, that means this
741
# node is uninteresting. This is because when merging, if there are
742
# multiple heads(), we have to create a new node. So if we didn't,
743
# we know that the ancestry is linear, and that OTHER did not
745
# See doc/developers/lca_merge_resolution.txt for details
746
other_revision = other_ie.revision
747
if other_revision is not None:
748
# We can't use this shortcut when other_revision is None,
749
# because it may be None because things are WorkingTrees, and
750
# not because it is *actually* None.
751
is_unmodified = False
752
for lca_path, ie in lca_values:
753
if ie is not None and ie.revision == other_revision:
760
for lca_path, lca_ie in lca_values:
762
lca_entries.append(_none_entry)
764
lca_entries.append(lca_ie)
766
if file_id in base_inventory:
767
base_ie = base_inventory[file_id]
769
base_ie = _none_entry
771
if file_id in this_inventory:
772
this_ie = this_inventory[file_id]
774
this_ie = _none_entry
780
for lca_ie in lca_entries:
781
lca_kinds.append(lca_ie.kind)
782
lca_parent_ids.append(lca_ie.parent_id)
783
lca_names.append(lca_ie.name)
784
lca_executable.append(lca_ie.executable)
786
kind_winner = self._lca_multi_way(
787
(base_ie.kind, lca_kinds),
788
other_ie.kind, this_ie.kind)
789
parent_id_winner = self._lca_multi_way(
790
(base_ie.parent_id, lca_parent_ids),
791
other_ie.parent_id, this_ie.parent_id)
792
name_winner = self._lca_multi_way(
793
(base_ie.name, lca_names),
794
other_ie.name, this_ie.name)
796
content_changed = True
797
if kind_winner == 'this':
798
# No kind change in OTHER, see if there are *any* changes
799
if other_ie.kind == 'directory':
800
if parent_id_winner == 'this' and name_winner == 'this':
801
# No change for this directory in OTHER, skip
803
content_changed = False
804
elif other_ie.kind is None or other_ie.kind == 'file':
805
def get_sha1(ie, tree):
806
if ie.kind != 'file':
808
return tree.get_file_sha1(file_id)
809
base_sha1 = get_sha1(base_ie, self.base_tree)
810
lca_sha1s = [get_sha1(ie, tree) for ie, tree
811
in zip(lca_entries, self._lca_trees)]
812
this_sha1 = get_sha1(this_ie, self.this_tree)
813
other_sha1 = get_sha1(other_ie, self.other_tree)
814
sha1_winner = self._lca_multi_way(
815
(base_sha1, lca_sha1s), other_sha1, this_sha1,
816
allow_overriding_lca=False)
817
exec_winner = self._lca_multi_way(
818
(base_ie.executable, lca_executable),
819
other_ie.executable, this_ie.executable)
820
if (parent_id_winner == 'this' and name_winner == 'this'
821
and sha1_winner == 'this' and exec_winner == 'this'):
822
# No kind, parent, name, exec, or content change for
823
# OTHER, so this node is not considered interesting
825
if sha1_winner == 'this':
826
content_changed = False
827
elif other_ie.kind == 'symlink':
828
def get_target(ie, tree):
829
if ie.kind != 'symlink':
831
return tree.get_symlink_target(file_id)
832
base_target = get_target(base_ie, self.base_tree)
833
lca_targets = [get_target(ie, tree) for ie, tree
834
in zip(lca_entries, self._lca_trees)]
835
this_target = get_target(this_ie, self.this_tree)
836
other_target = get_target(other_ie, self.other_tree)
837
target_winner = self._lca_multi_way(
838
(base_target, lca_targets),
839
other_target, this_target)
840
if (parent_id_winner == 'this' and name_winner == 'this'
841
and target_winner == 'this'):
842
# No kind, parent, name, or symlink target change
845
if target_winner == 'this':
846
content_changed = False
847
elif other_ie.kind == 'tree-reference':
848
# The 'changed' information seems to be handled at a higher
849
# level. At least, _entries3 returns False for content
850
# changed, even when at a new revision_id.
851
content_changed = False
852
if (parent_id_winner == 'this' and name_winner == 'this'):
853
# Nothing interesting
856
raise AssertionError('unhandled kind: %s' % other_ie.kind)
857
# XXX: We need to handle kind == 'symlink'
859
# If we have gotten this far, that means something has changed
860
result.append((file_id, content_changed,
861
((base_ie.parent_id, lca_parent_ids),
862
other_ie.parent_id, this_ie.parent_id),
863
((base_ie.name, lca_names),
864
other_ie.name, this_ie.name),
865
((base_ie.executable, lca_executable),
866
other_ie.executable, this_ie.executable)
422
working_tree.unlock()
871
425
def fix_root(self):
1494
951
branch.get_revision_tree(base_revision))'
1496
953
if this_tree is None:
1497
raise BzrError("bzrlib.merge.merge_inner requires a this_tree "
1498
"parameter as of bzrlib version 0.8.")
954
warnings.warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
955
"bzrlib version 0.8.",
958
this_tree = this_branch.bzrdir.open_workingtree()
1499
959
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1500
pb=pb, change_reporter=change_reporter)
1501
961
merger.backup_files = backup_files
1502
962
merger.merge_type = merge_type
1503
963
merger.interesting_ids = interesting_ids
1504
964
merger.ignore_zero = ignore_zero
1505
965
if interesting_files:
1507
raise ValueError('Only supply interesting_ids'
1508
' or interesting_files')
1509
merger.interesting_files = interesting_files
966
assert not interesting_ids, ('Only supply interesting_ids'
967
' or interesting_files')
968
merger._set_interesting_files(interesting_files)
1510
969
merger.show_base = show_base
1511
970
merger.reprocess = reprocess
1512
971
merger.other_rev_id = other_rev_id
1513
972
merger.other_basis = other_rev_id
1514
get_revision_id = getattr(base_tree, 'get_revision_id', None)
1515
if get_revision_id is None:
1516
get_revision_id = base_tree.last_revision
1517
merger.set_base_revision(get_revision_id(), this_branch)
1518
973
return merger.do_merge()
1520
def get_merge_type_registry():
1521
"""Merge type registry is in bzrlib.option to avoid circular imports.
1523
This method provides a sanctioned way to retrieve it.
1525
from bzrlib import option
1526
return option._merge_type_registry
1529
def _plan_annotate_merge(annotated_a, annotated_b, ancestors_a, ancestors_b):
1530
def status_a(revision, text):
1531
if revision in ancestors_b:
1532
return 'killed-b', text
1534
return 'new-a', text
1536
def status_b(revision, text):
1537
if revision in ancestors_a:
1538
return 'killed-a', text
1540
return 'new-b', text
1542
plain_a = [t for (a, t) in annotated_a]
1543
plain_b = [t for (a, t) in annotated_b]
1544
matcher = patiencediff.PatienceSequenceMatcher(None, plain_a, plain_b)
1545
blocks = matcher.get_matching_blocks()
1548
for ai, bi, l in blocks:
1549
# process all mismatched sections
1550
# (last mismatched section is handled because blocks always
1551
# includes a 0-length last block)
1552
for revision, text in annotated_a[a_cur:ai]:
1553
yield status_a(revision, text)
1554
for revision, text in annotated_b[b_cur:bi]:
1555
yield status_b(revision, text)
1556
# and now the matched section
1559
for text_a in plain_a[ai:a_cur]:
1560
yield "unchanged", text_a
1563
class _PlanMergeBase(object):
1565
def __init__(self, a_rev, b_rev, vf, key_prefix):
1568
:param a_rev: Revision-id of one revision to merge
1569
:param b_rev: Revision-id of the other revision to merge
1570
:param vf: A VersionedFiles containing both revisions
1571
:param key_prefix: A prefix for accessing keys in vf, typically
1577
self._last_lines = None
1578
self._last_lines_revision_id = None
1579
self._cached_matching_blocks = {}
1580
self._key_prefix = key_prefix
1581
self._precache_tip_lines()
1583
def _precache_tip_lines(self):
1584
lines = self.get_lines([self.a_rev, self.b_rev])
1585
self.lines_a = lines[self.a_rev]
1586
self.lines_b = lines[self.b_rev]
1588
def get_lines(self, revisions):
1589
"""Get lines for revisions from the backing VersionedFiles.
1591
:raises RevisionNotPresent: on absent texts.
1593
keys = [(self._key_prefix + (rev,)) for rev in revisions]
1595
for record in self.vf.get_record_stream(keys, 'unordered', True):
1596
if record.storage_kind == 'absent':
1597
raise errors.RevisionNotPresent(record.key, self.vf)
1598
result[record.key[-1]] = osutils.chunks_to_lines(
1599
record.get_bytes_as('chunked'))
1602
def plan_merge(self):
1603
"""Generate a 'plan' for merging the two revisions.
1605
This involves comparing their texts and determining the cause of
1606
differences. If text A has a line and text B does not, then either the
1607
line was added to text A, or it was deleted from B. Once the causes
1608
are combined, they are written out in the format described in
1609
VersionedFile.plan_merge
1611
blocks = self._get_matching_blocks(self.a_rev, self.b_rev)
1612
unique_a, unique_b = self._unique_lines(blocks)
1613
new_a, killed_b = self._determine_status(self.a_rev, unique_a)
1614
new_b, killed_a = self._determine_status(self.b_rev, unique_b)
1615
return self._iter_plan(blocks, new_a, killed_b, new_b, killed_a)
1617
def _iter_plan(self, blocks, new_a, killed_b, new_b, killed_a):
1620
for i, j, n in blocks:
1621
for a_index in range(last_i, i):
1622
if a_index in new_a:
1623
if a_index in killed_b:
1624
yield 'conflicted-a', self.lines_a[a_index]
1626
yield 'new-a', self.lines_a[a_index]
1628
yield 'killed-b', self.lines_a[a_index]
1629
for b_index in range(last_j, j):
1630
if b_index in new_b:
1631
if b_index in killed_a:
1632
yield 'conflicted-b', self.lines_b[b_index]
1634
yield 'new-b', self.lines_b[b_index]
1636
yield 'killed-a', self.lines_b[b_index]
1637
# handle common lines
1638
for a_index in range(i, i+n):
1639
yield 'unchanged', self.lines_a[a_index]
1643
def _get_matching_blocks(self, left_revision, right_revision):
1644
"""Return a description of which sections of two revisions match.
1646
See SequenceMatcher.get_matching_blocks
1648
cached = self._cached_matching_blocks.get((left_revision,
1650
if cached is not None:
1652
if self._last_lines_revision_id == left_revision:
1653
left_lines = self._last_lines
1654
right_lines = self.get_lines([right_revision])[right_revision]
1656
lines = self.get_lines([left_revision, right_revision])
1657
left_lines = lines[left_revision]
1658
right_lines = lines[right_revision]
1659
self._last_lines = right_lines
1660
self._last_lines_revision_id = right_revision
1661
matcher = patiencediff.PatienceSequenceMatcher(None, left_lines,
1663
return matcher.get_matching_blocks()
1665
def _unique_lines(self, matching_blocks):
1666
"""Analyse matching_blocks to determine which lines are unique
1668
:return: a tuple of (unique_left, unique_right), where the values are
1669
sets of line numbers of unique lines.
1675
for i, j, n in matching_blocks:
1676
unique_left.extend(range(last_i, i))
1677
unique_right.extend(range(last_j, j))
1680
return unique_left, unique_right
1683
def _subtract_plans(old_plan, new_plan):
1684
"""Remove changes from new_plan that came from old_plan.
1686
It is assumed that the difference between the old_plan and new_plan
1687
is their choice of 'b' text.
1689
All lines from new_plan that differ from old_plan are emitted
1690
verbatim. All lines from new_plan that match old_plan but are
1691
not about the 'b' revision are emitted verbatim.
1693
Lines that match and are about the 'b' revision are the lines we
1694
don't want, so we convert 'killed-b' -> 'unchanged', and 'new-b'
1695
is skipped entirely.
1697
matcher = patiencediff.PatienceSequenceMatcher(None, old_plan,
1700
for i, j, n in matcher.get_matching_blocks():
1701
for jj in range(last_j, j):
1703
for jj in range(j, j+n):
1704
plan_line = new_plan[jj]
1705
if plan_line[0] == 'new-b':
1707
elif plan_line[0] == 'killed-b':
1708
yield 'unchanged', plan_line[1]
1714
class _PlanMerge(_PlanMergeBase):
1715
"""Plan an annotate merge using on-the-fly annotation"""
1717
def __init__(self, a_rev, b_rev, vf, key_prefix):
1718
super(_PlanMerge, self).__init__(a_rev, b_rev, vf, key_prefix)
1719
self.a_key = self._key_prefix + (self.a_rev,)
1720
self.b_key = self._key_prefix + (self.b_rev,)
1721
self.graph = Graph(self.vf)
1722
heads = self.graph.heads((self.a_key, self.b_key))
1724
# one side dominates, so we can just return its values, yay for
1726
# Ideally we would know that before we get this far
1727
self._head_key = heads.pop()
1728
if self._head_key == self.a_key:
1732
mutter('found dominating revision for %s\n%s > %s', self.vf,
1733
self._head_key[-1], other)
1736
self._head_key = None
1739
def _precache_tip_lines(self):
1740
# Turn this into a no-op, because we will do this later
1743
def _find_recursive_lcas(self):
1744
"""Find all the ancestors back to a unique lca"""
1745
cur_ancestors = (self.a_key, self.b_key)
1746
# graph.find_lca(uncommon, keys) now returns plain NULL_REVISION,
1747
# rather than a key tuple. We will just map that directly to no common
1751
next_lcas = self.graph.find_lca(*cur_ancestors)
1752
# Map a plain NULL_REVISION to a simple no-ancestors
1753
if next_lcas == set([NULL_REVISION]):
1755
# Order the lca's based on when they were merged into the tip
1756
# While the actual merge portion of weave merge uses a set() of
1757
# active revisions, the order of insertion *does* effect the
1758
# implicit ordering of the texts.
1759
for rev_key in cur_ancestors:
1760
ordered_parents = tuple(self.graph.find_merge_order(rev_key,
1762
parent_map[rev_key] = ordered_parents
1763
if len(next_lcas) == 0:
1765
elif len(next_lcas) == 1:
1766
parent_map[list(next_lcas)[0]] = ()
1768
elif len(next_lcas) > 2:
1769
# More than 2 lca's, fall back to grabbing all nodes between
1770
# this and the unique lca.
1771
mutter('More than 2 LCAs, falling back to all nodes for:'
1772
' %s, %s\n=> %s', self.a_key, self.b_key, cur_ancestors)
1773
cur_lcas = next_lcas
1774
while len(cur_lcas) > 1:
1775
cur_lcas = self.graph.find_lca(*cur_lcas)
1776
if len(cur_lcas) == 0:
1777
# No common base to find, use the full ancestry
1780
unique_lca = list(cur_lcas)[0]
1781
if unique_lca == NULL_REVISION:
1782
# find_lca will return a plain 'NULL_REVISION' rather
1783
# than a key tuple when there is no common ancestor, we
1784
# prefer to just use None, because it doesn't confuse
1785
# _get_interesting_texts()
1787
parent_map.update(self._find_unique_parents(next_lcas,
1790
cur_ancestors = next_lcas
1793
def _find_unique_parents(self, tip_keys, base_key):
1794
"""Find ancestors of tip that aren't ancestors of base.
1796
:param tip_keys: Nodes that are interesting
1797
:param base_key: Cull all ancestors of this node
1798
:return: The parent map for all revisions between tip_keys and
1799
base_key. base_key will be included. References to nodes outside of
1800
the ancestor set will also be removed.
1802
# TODO: this would be simpler if find_unique_ancestors took a list
1803
# instead of a single tip, internally it supports it, but it
1804
# isn't a "backwards compatible" api change.
1805
if base_key is None:
1806
parent_map = dict(self.graph.iter_ancestry(tip_keys))
1807
# We remove NULL_REVISION because it isn't a proper tuple key, and
1808
# thus confuses things like _get_interesting_texts, and our logic
1809
# to add the texts into the memory weave.
1810
if NULL_REVISION in parent_map:
1811
parent_map.pop(NULL_REVISION)
1814
for tip in tip_keys:
1816
self.graph.find_unique_ancestors(tip, [base_key]))
1817
parent_map = self.graph.get_parent_map(interesting)
1818
parent_map[base_key] = ()
1819
culled_parent_map, child_map, tails = self._remove_external_references(
1821
# Remove all the tails but base_key
1822
if base_key is not None:
1823
tails.remove(base_key)
1824
self._prune_tails(culled_parent_map, child_map, tails)
1825
# Now remove all the uninteresting 'linear' regions
1826
simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
1830
def _remove_external_references(parent_map):
1831
"""Remove references that go outside of the parent map.
1833
:param parent_map: Something returned from Graph.get_parent_map(keys)
1834
:return: (filtered_parent_map, child_map, tails)
1835
filtered_parent_map is parent_map without external references
1836
child_map is the {parent_key: [child_keys]} mapping
1837
tails is a list of nodes that do not have any parents in the map
1839
# TODO: The basic effect of this function seems more generic than
1840
# _PlanMerge. But the specific details of building a child_map,
1841
# and computing tails seems very specific to _PlanMerge.
1842
# Still, should this be in Graph land?
1843
filtered_parent_map = {}
1846
for key, parent_keys in parent_map.iteritems():
1847
culled_parent_keys = [p for p in parent_keys if p in parent_map]
1848
if not culled_parent_keys:
1850
for parent_key in culled_parent_keys:
1851
child_map.setdefault(parent_key, []).append(key)
1852
# TODO: Do we want to do this, it adds overhead for every node,
1853
# just to say that the node has no children
1854
child_map.setdefault(key, [])
1855
filtered_parent_map[key] = culled_parent_keys
1856
return filtered_parent_map, child_map, tails
1859
def _prune_tails(parent_map, child_map, tails_to_remove):
1860
"""Remove tails from the parent map.
1862
This will remove the supplied revisions until no more children have 0
1865
:param parent_map: A dict of {child: [parents]}, this dictionary will
1866
be modified in place.
1867
:param tails_to_remove: A list of tips that should be removed,
1868
this list will be consumed
1869
:param child_map: The reverse dict of parent_map ({parent: [children]})
1870
this dict will be modified
1871
:return: None, parent_map will be modified in place.
1873
while tails_to_remove:
1874
next = tails_to_remove.pop()
1875
parent_map.pop(next)
1876
children = child_map.pop(next)
1877
for child in children:
1878
child_parents = parent_map[child]
1879
child_parents.remove(next)
1880
if len(child_parents) == 0:
1881
tails_to_remove.append(child)
1883
def _get_interesting_texts(self, parent_map):
1884
"""Return a dict of texts we are interested in.
1886
Note that the input is in key tuples, but the output is in plain
1889
:param parent_map: The output from _find_recursive_lcas
1890
:return: A dict of {'revision_id':lines} as returned by
1891
_PlanMergeBase.get_lines()
1893
all_revision_keys = set(parent_map)
1894
all_revision_keys.add(self.a_key)
1895
all_revision_keys.add(self.b_key)
1897
# Everything else is in 'keys' but get_lines is in 'revision_ids'
1898
all_texts = self.get_lines([k[-1] for k in all_revision_keys])
1901
def _build_weave(self):
1902
from bzrlib import weave
1903
self._weave = weave.Weave(weave_name='in_memory_weave',
1904
allow_reserved=True)
1905
parent_map = self._find_recursive_lcas()
1907
all_texts = self._get_interesting_texts(parent_map)
1909
# Note: Unfortunately, the order given by topo_sort will effect the
1910
# ordering resolution in the output. Specifically, if you add A then B,
1911
# then in the output text A lines will show up before B lines. And, of
1912
# course, topo_sort doesn't guarantee any real ordering.
1913
# So we use merge_sort, and add a fake node on the tip.
1914
# This ensures that left-hand parents will always be inserted into the
1915
# weave before right-hand parents.
1916
tip_key = self._key_prefix + (_mod_revision.CURRENT_REVISION,)
1917
parent_map[tip_key] = (self.a_key, self.b_key)
1919
for seq_num, key, depth, eom in reversed(tsort.merge_sort(parent_map,
1923
# for key in tsort.topo_sort(parent_map):
1924
parent_keys = parent_map[key]
1925
revision_id = key[-1]
1926
parent_ids = [k[-1] for k in parent_keys]
1927
self._weave.add_lines(revision_id, parent_ids,
1928
all_texts[revision_id])
1930
def plan_merge(self):
1931
"""Generate a 'plan' for merging the two revisions.
1933
This involves comparing their texts and determining the cause of
1934
differences. If text A has a line and text B does not, then either the
1935
line was added to text A, or it was deleted from B. Once the causes
1936
are combined, they are written out in the format described in
1937
VersionedFile.plan_merge
1939
if self._head_key is not None: # There was a single head
1940
if self._head_key == self.a_key:
1943
if self._head_key != self.b_key:
1944
raise AssertionError('There was an invalid head: %s != %s'
1945
% (self.b_key, self._head_key))
1947
head_rev = self._head_key[-1]
1948
lines = self.get_lines([head_rev])[head_rev]
1949
return ((plan, line) for line in lines)
1950
return self._weave.plan_merge(self.a_rev, self.b_rev)
1953
class _PlanLCAMerge(_PlanMergeBase):
1955
This merge algorithm differs from _PlanMerge in that:
1956
1. comparisons are done against LCAs only
1957
2. cases where a contested line is new versus one LCA but old versus
1958
another are marked as conflicts, by emitting the line as conflicted-a
1961
This is faster, and hopefully produces more useful output.
1964
def __init__(self, a_rev, b_rev, vf, key_prefix, graph):
1965
_PlanMergeBase.__init__(self, a_rev, b_rev, vf, key_prefix)
1966
lcas = graph.find_lca(key_prefix + (a_rev,), key_prefix + (b_rev,))
1969
if lca == NULL_REVISION:
1972
self.lcas.add(lca[-1])
1973
for lca in self.lcas:
1974
if _mod_revision.is_null(lca):
1977
lca_lines = self.get_lines([lca])[lca]
1978
matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_a,
1980
blocks = list(matcher.get_matching_blocks())
1981
self._cached_matching_blocks[(a_rev, lca)] = blocks
1982
matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_b,
1984
blocks = list(matcher.get_matching_blocks())
1985
self._cached_matching_blocks[(b_rev, lca)] = blocks
1987
def _determine_status(self, revision_id, unique_line_numbers):
1988
"""Determines the status unique lines versus all lcas.
1990
Basically, determines why the line is unique to this revision.
1992
A line may be determined new, killed, or both.
1994
If a line is determined new, that means it was not present in at least
1995
one LCA, and is not present in the other merge revision.
1997
If a line is determined killed, that means the line was present in
2000
If a line is killed and new, this indicates that the two merge
2001
revisions contain differing conflict resolutions.
2002
:param revision_id: The id of the revision in which the lines are
2004
:param unique_line_numbers: The line numbers of unique lines.
2005
:return a tuple of (new_this, killed_other):
2009
unique_line_numbers = set(unique_line_numbers)
2010
for lca in self.lcas:
2011
blocks = self._get_matching_blocks(revision_id, lca)
2012
unique_vs_lca, _ignored = self._unique_lines(blocks)
2013
new.update(unique_line_numbers.intersection(unique_vs_lca))
2014
killed.update(unique_line_numbers.difference(unique_vs_lca))
976
merge_types = { "merge3": (Merge3Merger, "Native diff3-style merge"),
977
"diff3": (Diff3Merger, "Merge using external diff3"),
978
'weave': (WeaveMerger, "Weave-based merge")
982
def merge_type_help():
983
templ = '%s%%7s: %%s' % (' '*12)
984
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
985
return '\n'.join(lines)
added
removed
bzrlib/merge.py
