13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
from bzrlib.lazy_import import lazy_import
20
lazy_import(globals(), """
22
21
from bzrlib import (
22
branch as _mod_branch,
23
conflicts as _mod_conflicts,
27
30
revision as _mod_revision,
29
from bzrlib.branch import Branch
30
from bzrlib.conflicts import ConflictList, Conflict
31
from bzrlib.errors import (BzrCommandError,
41
WorkingTreeNotRevision,
44
from bzrlib.merge3 import Merge3
45
from bzrlib.osutils import rename, pathjoin
46
from progress import DummyProgress, ProgressPhase
47
from bzrlib.revision import (is_ancestor, NULL_REVISION, ensure_null)
48
from bzrlib.textfile import check_text_lines
49
from bzrlib.trace import mutter, warning, note
50
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
51
conflict_pass, FinalPaths, create_by_entry,
52
unique_add, ROOT_PARENT)
53
from bzrlib.versionedfile import PlanWeaveMerge
40
from bzrlib.cleanup import OperationWithCleanups
47
from bzrlib.symbol_versioning import (
56
51
# TODO: Report back as changes are merged in
59
54
def transform_tree(from_tree, to_tree, interesting_ids=None):
60
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
61
interesting_ids=interesting_ids, this_tree=from_tree)
55
from_tree.lock_tree_write()
56
operation = OperationWithCleanups(merge_inner)
57
operation.add_cleanup(from_tree.unlock)
58
operation.run_simple(from_tree.branch, to_tree, from_tree,
59
ignore_zero=True, interesting_ids=interesting_ids, this_tree=from_tree)
62
class MergeHooks(hooks.Hooks):
65
hooks.Hooks.__init__(self)
66
self.create_hook(hooks.HookPoint('merge_file_content',
67
"Called with a bzrlib.merge.Merger object to create a per file "
68
"merge object when starting a merge. "
69
"Should return either None or a subclass of "
70
"``bzrlib.merge.AbstractPerFileMerger``. "
71
"Such objects will then be called per file "
72
"that needs to be merged (including when one "
73
"side has deleted the file and the other has changed it). "
74
"See the AbstractPerFileMerger API docs for details on how it is "
79
class AbstractPerFileMerger(object):
80
"""PerFileMerger objects are used by plugins extending merge for bzrlib.
82
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
84
:ivar merger: The Merge3Merger performing the merge.
87
def __init__(self, merger):
88
"""Create a PerFileMerger for use with merger."""
91
def merge_contents(self, merge_params):
92
"""Attempt to merge the contents of a single file.
94
:param merge_params: A bzrlib.merge.MergeHookParams
95
:return : A tuple of (status, chunks), where status is one of
96
'not_applicable', 'success', 'conflicted', or 'delete'. If status
97
is 'success' or 'conflicted', then chunks should be an iterable of
98
strings for the new file contents.
100
return ('not applicable', None)
103
class PerFileMerger(AbstractPerFileMerger):
104
"""Merge individual files when self.file_matches returns True.
106
This class is intended to be subclassed. The file_matches and
107
merge_matching methods should be overridden with concrete implementations.
110
def file_matches(self, params):
111
"""Return True if merge_matching should be called on this file.
113
Only called with merges of plain files with no clear winner.
115
Subclasses must override this.
117
raise NotImplementedError(self.file_matches)
119
def get_filename(self, params, tree):
120
"""Lookup the filename (i.e. basename, not path), given a Tree (e.g.
121
self.merger.this_tree) and a MergeHookParams.
123
return osutils.basename(tree.id2path(params.file_id))
125
def get_filepath(self, params, tree):
126
"""Calculate the path to the file in a tree.
128
:param params: A MergeHookParams describing the file to merge
129
:param tree: a Tree, e.g. self.merger.this_tree.
131
return tree.id2path(params.file_id)
133
def merge_contents(self, params):
134
"""Merge the contents of a single file."""
135
# Check whether this custom merge logic should be used.
137
# OTHER is a straight winner, rely on default merge.
138
params.winner == 'other' or
139
# THIS and OTHER aren't both files.
140
not params.is_file_merge() or
141
# The filename doesn't match *.xml
142
not self.file_matches(params)):
143
return 'not_applicable', None
144
return self.merge_matching(params)
146
def merge_matching(self, params):
147
"""Merge the contents of a single file that has matched the criteria
148
in PerFileMerger.merge_contents (is a conflict, is a file,
149
self.file_matches is True).
151
Subclasses must override this.
153
raise NotImplementedError(self.merge_matching)
156
class ConfigurableFileMerger(PerFileMerger):
157
"""Merge individual files when configured via a .conf file.
159
This is a base class for concrete custom file merging logic. Concrete
160
classes should implement ``merge_text``.
162
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
164
:ivar affected_files: The configured file paths to merge.
166
:cvar name_prefix: The prefix to use when looking up configuration
167
details. <name_prefix>_merge_files describes the files targeted by the
170
:cvar default_files: The default file paths to merge when no configuration
177
def __init__(self, merger):
178
super(ConfigurableFileMerger, self).__init__(merger)
179
self.affected_files = None
180
self.default_files = self.__class__.default_files or []
181
self.name_prefix = self.__class__.name_prefix
182
if self.name_prefix is None:
183
raise ValueError("name_prefix must be set.")
185
def file_matches(self, params):
186
"""Check whether the file should call the merge hook.
188
<name_prefix>_merge_files configuration variable is a list of files
189
that should use the hook.
191
affected_files = self.affected_files
192
if affected_files is None:
193
config = self.merger.this_branch.get_config()
194
# Until bzr provides a better policy for caching the config, we
195
# just add the part we're interested in to the params to avoid
196
# reading the config files repeatedly (bazaar.conf, location.conf,
198
config_key = self.name_prefix + '_merge_files'
199
affected_files = config.get_user_option_as_list(config_key)
200
if affected_files is None:
201
# If nothing was specified in the config, use the default.
202
affected_files = self.default_files
203
self.affected_files = affected_files
205
filepath = self.get_filepath(params, self.merger.this_tree)
206
if filepath in affected_files:
210
def merge_matching(self, params):
211
return self.merge_text(params)
213
def merge_text(self, params):
214
"""Merge the byte contents of a single file.
216
This is called after checking that the merge should be performed in
217
merge_contents, and it should behave as per
218
``bzrlib.merge.AbstractPerFileMerger.merge_contents``.
220
raise NotImplementedError(self.merge_text)
223
class MergeHookParams(object):
224
"""Object holding parameters passed to merge_file_content hooks.
226
There are some fields hooks can access:
228
:ivar file_id: the file ID of the file being merged
229
:ivar trans_id: the transform ID for the merge of this file
230
:ivar this_kind: kind of file_id in 'this' tree
231
:ivar other_kind: kind of file_id in 'other' tree
232
:ivar winner: one of 'this', 'other', 'conflict'
235
def __init__(self, merger, file_id, trans_id, this_kind, other_kind,
237
self._merger = merger
238
self.file_id = file_id
239
self.trans_id = trans_id
240
self.this_kind = this_kind
241
self.other_kind = other_kind
244
def is_file_merge(self):
245
"""True if this_kind and other_kind are both 'file'."""
246
return self.this_kind == 'file' and self.other_kind == 'file'
248
@decorators.cachedproperty
249
def base_lines(self):
250
"""The lines of the 'base' version of the file."""
251
return self._merger.get_lines(self._merger.base_tree, self.file_id)
253
@decorators.cachedproperty
254
def this_lines(self):
255
"""The lines of the 'this' version of the file."""
256
return self._merger.get_lines(self._merger.this_tree, self.file_id)
258
@decorators.cachedproperty
259
def other_lines(self):
260
"""The lines of the 'other' version of the file."""
261
return self._merger.get_lines(self._merger.other_tree, self.file_id)
64
264
class Merger(object):
65
268
def __init__(self, this_branch, other_tree=None, base_tree=None,
66
this_tree=None, pb=DummyProgress(), change_reporter=None,
269
this_tree=None, pb=None, change_reporter=None,
270
recurse='down', revision_graph=None):
68
271
object.__init__(self)
69
assert this_tree is not None, "this_tree is required"
70
272
self.this_branch = this_branch
71
273
self.this_basis = _mod_revision.ensure_null(
72
274
this_branch.last_revision())
183
451
if self.other_rev_id is None:
184
452
other_basis_tree = self.revision_tree(self.other_basis)
185
changes = other_basis_tree.changes_from(self.other_tree)
186
if changes.has_changed():
187
raise WorkingTreeNotRevision(self.this_tree)
453
if other_basis_tree.has_changes(self.other_tree):
454
raise errors.WorkingTreeNotRevision(self.this_tree)
188
455
other_rev_id = self.other_basis
189
456
self.other_tree = other_basis_tree
458
@deprecated_method(deprecated_in((2, 1, 0)))
191
459
def file_revisions(self, file_id):
192
460
self.ensure_revision_trees()
193
461
def get_id(tree, file_id):
194
462
revision_id = tree.inventory[file_id].revision
195
assert revision_id is not None
196
463
return revision_id
197
464
if self.this_rev_id is None:
198
465
if self.this_basis_tree.get_file_sha1(file_id) != \
199
466
self.this_tree.get_file_sha1(file_id):
200
raise WorkingTreeNotRevision(self.this_tree)
467
raise errors.WorkingTreeNotRevision(self.this_tree)
202
469
trees = (self.this_basis_tree, self.other_tree)
203
470
return [get_id(tree, file_id) for tree in trees]
472
@deprecated_method(deprecated_in((2, 1, 0)))
205
473
def check_basis(self, check_clean, require_commits=True):
206
474
if self.this_basis is None and require_commits is True:
207
raise BzrCommandError("This branch has no commits."
208
" (perhaps you would prefer 'bzr pull')")
475
raise errors.BzrCommandError(
476
"This branch has no commits."
477
" (perhaps you would prefer 'bzr pull')")
210
479
self.compare_basis()
211
480
if self.this_basis != self.this_rev_id:
212
raise BzrCommandError("Working tree has uncommitted changes.")
481
raise errors.UncommittedChanges(self.this_tree)
483
@deprecated_method(deprecated_in((2, 1, 0)))
214
484
def compare_basis(self):
216
486
basis_tree = self.revision_tree(self.this_tree.last_revision())
217
except errors.RevisionNotPresent:
487
except errors.NoSuchRevision:
218
488
basis_tree = self.this_tree.basis_tree()
219
changes = self.this_tree.changes_from(basis_tree)
220
if not changes.has_changed():
489
if not self.this_tree.has_changes(basis_tree):
221
490
self.this_rev_id = self.this_basis
223
492
def set_interesting_files(self, file_list):
224
493
self.interesting_files = file_list
226
495
def set_pending(self):
227
if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
496
if (not self.base_is_ancestor or not self.base_is_other_ancestor
497
or self.other_rev_id is None):
229
499
self._add_parent()
231
501
def _add_parent(self):
232
502
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
233
503
new_parent_trees = []
504
operation = OperationWithCleanups(self.this_tree.set_parent_trees)
234
505
for revision_id in new_parents:
236
507
tree = self.revision_tree(revision_id)
237
except errors.RevisionNotPresent:
508
except errors.NoSuchRevision:
512
operation.add_cleanup(tree.unlock)
241
513
new_parent_trees.append((revision_id, tree))
243
self.this_tree.set_parent_trees(new_parent_trees,
244
allow_leftmost_as_ghost=True)
246
for _revision_id, tree in new_parent_trees:
514
operation.run_simple(new_parent_trees, allow_leftmost_as_ghost=True)
250
516
def set_other(self, other_revision, possible_transports=None):
251
517
"""Set the revision and tree to merge from.
340
634
self.base_rev_id = _mod_revision.ensure_null(
341
635
base_branch.get_rev_id(base_revision[1]))
342
636
self._maybe_fetch(base_branch, self.this_branch, self.base_rev_id)
343
self.base_is_ancestor = is_ancestor(self.this_basis,
346
self.base_is_other_ancestor = is_ancestor(self.other_basis,
638
def make_merger(self):
351
639
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
352
640
'other_tree': self.other_tree,
353
641
'interesting_ids': self.interesting_ids,
354
642
'interesting_files': self.interesting_files,
643
'this_branch': self.this_branch,
356
645
if self.merge_type.requires_base:
357
646
kwargs['base_tree'] = self.base_tree
358
647
if self.merge_type.supports_reprocess:
359
648
kwargs['reprocess'] = self.reprocess
360
649
elif self.reprocess:
361
raise BzrError("Conflict reduction is not supported for merge"
362
" type %s." % self.merge_type)
650
raise errors.BzrError(
651
"Conflict reduction is not supported for merge"
652
" type %s." % self.merge_type)
363
653
if self.merge_type.supports_show_base:
364
654
kwargs['show_base'] = self.show_base
365
655
elif self.show_base:
366
raise BzrError("Showing base is not supported for this"
656
raise errors.BzrError("Showing base is not supported for this"
367
657
" merge type. %s" % self.merge_type)
658
if (not getattr(self.merge_type, 'supports_reverse_cherrypick', True)
659
and not self.base_is_other_ancestor):
660
raise errors.CannotReverseCherrypick()
661
if self.merge_type.supports_cherrypick:
662
kwargs['cherrypick'] = (not self.base_is_ancestor or
663
not self.base_is_other_ancestor)
664
if self._is_criss_cross and getattr(self.merge_type,
665
'supports_lca_trees', False):
666
kwargs['lca_trees'] = self._lca_trees
667
return self.merge_type(pb=None,
668
change_reporter=self.change_reporter,
671
def _do_merge_to(self):
672
merge = self.make_merger()
673
if self.other_branch is not None:
674
self.other_branch.update_references(self.this_branch)
676
if self.recurse == 'down':
677
for relpath, file_id in self.this_tree.iter_references():
678
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
679
other_revision = self.other_tree.get_reference_revision(
681
if other_revision == sub_tree.last_revision():
683
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
684
sub_merge.merge_type = self.merge_type
685
other_branch = self.other_branch.reference_parent(file_id, relpath)
686
sub_merge.set_other_revision(other_revision, other_branch)
687
base_revision = self.base_tree.get_reference_revision(file_id)
688
sub_merge.base_tree = \
689
sub_tree.branch.repository.revision_tree(base_revision)
690
sub_merge.base_rev_id = base_revision
695
operation = OperationWithCleanups(self._do_merge_to)
368
696
self.this_tree.lock_tree_write()
697
operation.add_cleanup(self.this_tree.unlock)
369
698
if self.base_tree is not None:
370
699
self.base_tree.lock_read()
700
operation.add_cleanup(self.base_tree.unlock)
371
701
if self.other_tree is not None:
372
702
self.other_tree.lock_read()
374
merge = self.merge_type(pb=self._pb,
375
change_reporter=self.change_reporter,
377
if self.recurse == 'down':
378
for path, file_id in self.this_tree.iter_references():
379
sub_tree = self.this_tree.get_nested_tree(file_id, path)
380
other_revision = self.other_tree.get_reference_revision(
382
if other_revision == sub_tree.last_revision():
384
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
385
sub_merge.merge_type = self.merge_type
386
relpath = self.this_tree.relpath(path)
387
other_branch = self.other_branch.reference_parent(file_id, relpath)
388
sub_merge.set_other_revision(other_revision, other_branch)
389
base_revision = self.base_tree.get_reference_revision(file_id)
390
sub_merge.base_tree = \
391
sub_tree.branch.repository.revision_tree(base_revision)
395
if self.other_tree is not None:
396
self.other_tree.unlock()
397
if self.base_tree is not None:
398
self.base_tree.unlock()
399
self.this_tree.unlock()
703
operation.add_cleanup(self.other_tree.unlock)
704
merge = operation.run_simple()
400
705
if len(merge.cooked_conflicts) == 0:
401
if not self.ignore_zero:
402
note("All changes applied successfully.")
706
if not self.ignore_zero and not trace.is_quiet():
707
trace.note("All changes applied successfully.")
404
note("%d conflicts encountered." % len(merge.cooked_conflicts))
709
trace.note("%d conflicts encountered."
710
% len(merge.cooked_conflicts))
406
712
return len(merge.cooked_conflicts)
715
class _InventoryNoneEntry(object):
716
"""This represents an inventory entry which *isn't there*.
718
It simplifies the merging logic if we always have an InventoryEntry, even
719
if it isn't actually present
726
symlink_target = None
729
_none_entry = _InventoryNoneEntry()
409
732
class Merge3Merger(object):
410
733
"""Three-way merger that uses the merge3 text merger"""
411
734
requires_base = True
412
735
supports_reprocess = True
413
736
supports_show_base = True
414
737
history_based = False
738
supports_cherrypick = True
739
supports_reverse_cherrypick = True
415
740
winner_idx = {"this": 2, "other": 1, "conflict": 1}
741
supports_lca_trees = True
417
def __init__(self, working_tree, this_tree, base_tree, other_tree,
743
def __init__(self, working_tree, this_tree, base_tree, other_tree,
418
744
interesting_ids=None, reprocess=False, show_base=False,
419
pb=DummyProgress(), pp=None, change_reporter=None,
420
interesting_files=None):
745
pb=None, pp=None, change_reporter=None,
746
interesting_files=None, do_merge=True,
747
cherrypick=False, lca_trees=None, this_branch=None):
421
748
"""Initialize the merger object and perform the merge.
423
750
:param working_tree: The working tree to apply the merge to
424
751
:param this_tree: The local tree in the merge operation
425
752
:param base_tree: The common tree in the merge operation
426
:param other_tree: The other other tree to merge changes from
753
:param other_tree: The other tree to merge changes from
754
:param this_branch: The branch associated with this_tree. Defaults to
755
this_tree.branch if not supplied.
427
756
:param interesting_ids: The file_ids of files that should be
428
757
participate in the merge. May not be combined with
429
758
interesting_files.
430
759
:param: reprocess If True, perform conflict-reduction processing.
431
760
:param show_base: If True, show the base revision in text conflicts.
432
761
(incompatible with reprocess)
433
:param pb: A Progress bar
434
763
:param pp: A ProgressPhase object
435
764
:param change_reporter: An object that should report changes made
436
765
:param interesting_files: The tree-relative paths of files that should
439
768
be combined with interesting_ids. If neither interesting_files nor
440
769
interesting_ids is specified, all files may participate in the
771
:param lca_trees: Can be set to a dictionary of {revision_id:rev_tree}
772
if the ancestry was found to include a criss-cross merge.
773
Otherwise should be None.
443
775
object.__init__(self)
444
if interesting_files is not None:
445
assert interesting_ids is None
776
if interesting_files is not None and interesting_ids is not None:
778
'specify either interesting_ids or interesting_files')
779
if this_branch is None:
780
this_branch = this_tree.branch
446
781
self.interesting_ids = interesting_ids
447
782
self.interesting_files = interesting_files
448
783
self.this_tree = working_tree
449
self.this_tree.lock_tree_write()
450
784
self.base_tree = base_tree
451
self.base_tree.lock_read()
452
785
self.other_tree = other_tree
453
self.other_tree.lock_read()
786
self.this_branch = this_branch
454
787
self._raw_conflicts = []
455
788
self.cooked_conflicts = []
456
789
self.reprocess = reprocess
457
790
self.show_base = show_base
791
self._lca_trees = lca_trees
792
# Uncommenting this will change the default algorithm to always use
793
# _entries_lca. This can be useful for running the test suite and
794
# making sure we haven't missed any corner cases.
795
# if lca_trees is None:
796
# self._lca_trees = [self.base_tree]
460
797
self.change_reporter = change_reporter
462
self.pp = ProgressPhase("Merge phase", 3, self.pb)
464
self.tt = TreeTransform(working_tree, self.pb)
798
self.cherrypick = cherrypick
802
warnings.warn("pp argument to Merge3Merger is deprecated")
804
warnings.warn("pb argument to Merge3Merger is deprecated")
807
operation = OperationWithCleanups(self._do_merge)
808
self.this_tree.lock_tree_write()
809
operation.add_cleanup(self.this_tree.unlock)
810
self.base_tree.lock_read()
811
operation.add_cleanup(self.base_tree.unlock)
812
self.other_tree.lock_read()
813
operation.add_cleanup(self.other_tree.unlock)
816
def _do_merge(self, operation):
817
self.tt = transform.TreeTransform(self.this_tree, None)
818
operation.add_cleanup(self.tt.finalize)
819
self._compute_transform()
820
results = self.tt.apply(no_conflicts=True)
821
self.write_modified(results)
823
self.this_tree.add_conflicts(self.cooked_conflicts)
824
except errors.UnsupportedOperation:
827
def make_preview_transform(self):
828
operation = OperationWithCleanups(self._make_preview_transform)
829
self.base_tree.lock_read()
830
operation.add_cleanup(self.base_tree.unlock)
831
self.other_tree.lock_read()
832
operation.add_cleanup(self.other_tree.unlock)
833
return operation.run_simple()
835
def _make_preview_transform(self):
836
self.tt = transform.TransformPreview(self.this_tree)
837
self._compute_transform()
840
def _compute_transform(self):
841
if self._lca_trees is None:
467
842
entries = self._entries3()
468
child_pb = ui.ui_factory.nested_progress_bar()
470
for num, (file_id, changed, parents3, names3,
471
executable3) in enumerate(entries):
472
child_pb.update('Preparing file merge', num, len(entries))
473
self._merge_names(file_id, parents3, names3)
475
file_status = self.merge_contents(file_id)
477
file_status = 'unmodified'
478
self._merge_executable(file_id,
479
executable3, file_status)
484
child_pb = ui.ui_factory.nested_progress_bar()
486
fs_conflicts = resolve_conflicts(self.tt, child_pb,
487
lambda t, c: conflict_pass(t, c, self.other_tree))
490
if change_reporter is not None:
491
from bzrlib import delta
492
delta.report_changes(self.tt._iter_changes(), change_reporter)
493
self.cook_conflicts(fs_conflicts)
494
for conflict in self.cooked_conflicts:
497
results = self.tt.apply(no_conflicts=True)
498
self.write_modified(results)
500
working_tree.add_conflicts(self.cooked_conflicts)
501
except UnsupportedOperation:
505
self.other_tree.unlock()
506
self.base_tree.unlock()
507
self.this_tree.unlock()
843
resolver = self._three_way
845
entries = self._entries_lca()
846
resolver = self._lca_multi_way
847
child_pb = ui.ui_factory.nested_progress_bar()
849
factories = Merger.hooks['merge_file_content']
850
hooks = [factory(self) for factory in factories] + [self]
851
self.active_hooks = [hook for hook in hooks if hook is not None]
852
for num, (file_id, changed, parents3, names3,
853
executable3) in enumerate(entries):
854
child_pb.update('Preparing file merge', num, len(entries))
855
self._merge_names(file_id, parents3, names3, resolver=resolver)
857
file_status = self._do_merge_contents(file_id)
859
file_status = 'unmodified'
860
self._merge_executable(file_id,
861
executable3, file_status, resolver=resolver)
865
self._finish_computing_transform()
867
def _finish_computing_transform(self):
868
"""Finalize the transform and report the changes.
870
This is the second half of _compute_transform.
872
child_pb = ui.ui_factory.nested_progress_bar()
874
fs_conflicts = transform.resolve_conflicts(self.tt, child_pb,
875
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
878
if self.change_reporter is not None:
879
from bzrlib import delta
880
delta.report_changes(
881
self.tt.iter_changes(), self.change_reporter)
882
self.cook_conflicts(fs_conflicts)
883
for conflict in self.cooked_conflicts:
884
trace.warning(conflict)
510
886
def _entries3(self):
511
887
"""Gather data about files modified between three trees.
540
919
result.append((file_id, changed, parents3, names3, executable3))
922
def _entries_lca(self):
923
"""Gather data about files modified between multiple trees.
925
This compares OTHER versus all LCA trees, and for interesting entries,
926
it then compares with THIS and BASE.
928
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
929
:return: [(file_id, changed, parents, names, executable)]
930
file_id Simple file_id of the entry
931
changed Boolean, True if the kind or contents changed
933
parents ((base, [parent_id, in, lcas]), parent_id_other,
935
names ((base, [name, in, lcas]), name_in_other, name_in_this)
936
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
938
if self.interesting_files is not None:
939
lookup_trees = [self.this_tree, self.base_tree]
940
lookup_trees.extend(self._lca_trees)
941
# I think we should include the lca trees as well
942
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
945
interesting_ids = self.interesting_ids
947
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
949
base_inventory = self.base_tree.inventory
950
this_inventory = self.this_tree.inventory
951
for path, file_id, other_ie, lca_values in walker.iter_all():
952
# Is this modified at all from any of the other trees?
954
other_ie = _none_entry
955
if interesting_ids is not None and file_id not in interesting_ids:
958
# If other_revision is found in any of the lcas, that means this
959
# node is uninteresting. This is because when merging, if there are
960
# multiple heads(), we have to create a new node. So if we didn't,
961
# we know that the ancestry is linear, and that OTHER did not
963
# See doc/developers/lca_merge_resolution.txt for details
964
other_revision = other_ie.revision
965
if other_revision is not None:
966
# We can't use this shortcut when other_revision is None,
967
# because it may be None because things are WorkingTrees, and
968
# not because it is *actually* None.
969
is_unmodified = False
970
for lca_path, ie in lca_values:
971
if ie is not None and ie.revision == other_revision:
978
for lca_path, lca_ie in lca_values:
980
lca_entries.append(_none_entry)
982
lca_entries.append(lca_ie)
984
if file_id in base_inventory:
985
base_ie = base_inventory[file_id]
987
base_ie = _none_entry
989
if file_id in this_inventory:
990
this_ie = this_inventory[file_id]
992
this_ie = _none_entry
998
for lca_ie in lca_entries:
999
lca_kinds.append(lca_ie.kind)
1000
lca_parent_ids.append(lca_ie.parent_id)
1001
lca_names.append(lca_ie.name)
1002
lca_executable.append(lca_ie.executable)
1004
kind_winner = self._lca_multi_way(
1005
(base_ie.kind, lca_kinds),
1006
other_ie.kind, this_ie.kind)
1007
parent_id_winner = self._lca_multi_way(
1008
(base_ie.parent_id, lca_parent_ids),
1009
other_ie.parent_id, this_ie.parent_id)
1010
name_winner = self._lca_multi_way(
1011
(base_ie.name, lca_names),
1012
other_ie.name, this_ie.name)
1014
content_changed = True
1015
if kind_winner == 'this':
1016
# No kind change in OTHER, see if there are *any* changes
1017
if other_ie.kind == 'directory':
1018
if parent_id_winner == 'this' and name_winner == 'this':
1019
# No change for this directory in OTHER, skip
1021
content_changed = False
1022
elif other_ie.kind is None or other_ie.kind == 'file':
1023
def get_sha1(ie, tree):
1024
if ie.kind != 'file':
1026
return tree.get_file_sha1(file_id)
1027
base_sha1 = get_sha1(base_ie, self.base_tree)
1028
lca_sha1s = [get_sha1(ie, tree) for ie, tree
1029
in zip(lca_entries, self._lca_trees)]
1030
this_sha1 = get_sha1(this_ie, self.this_tree)
1031
other_sha1 = get_sha1(other_ie, self.other_tree)
1032
sha1_winner = self._lca_multi_way(
1033
(base_sha1, lca_sha1s), other_sha1, this_sha1,
1034
allow_overriding_lca=False)
1035
exec_winner = self._lca_multi_way(
1036
(base_ie.executable, lca_executable),
1037
other_ie.executable, this_ie.executable)
1038
if (parent_id_winner == 'this' and name_winner == 'this'
1039
and sha1_winner == 'this' and exec_winner == 'this'):
1040
# No kind, parent, name, exec, or content change for
1041
# OTHER, so this node is not considered interesting
1043
if sha1_winner == 'this':
1044
content_changed = False
1045
elif other_ie.kind == 'symlink':
1046
def get_target(ie, tree):
1047
if ie.kind != 'symlink':
1049
return tree.get_symlink_target(file_id)
1050
base_target = get_target(base_ie, self.base_tree)
1051
lca_targets = [get_target(ie, tree) for ie, tree
1052
in zip(lca_entries, self._lca_trees)]
1053
this_target = get_target(this_ie, self.this_tree)
1054
other_target = get_target(other_ie, self.other_tree)
1055
target_winner = self._lca_multi_way(
1056
(base_target, lca_targets),
1057
other_target, this_target)
1058
if (parent_id_winner == 'this' and name_winner == 'this'
1059
and target_winner == 'this'):
1060
# No kind, parent, name, or symlink target change
1063
if target_winner == 'this':
1064
content_changed = False
1065
elif other_ie.kind == 'tree-reference':
1066
# The 'changed' information seems to be handled at a higher
1067
# level. At least, _entries3 returns False for content
1068
# changed, even when at a new revision_id.
1069
content_changed = False
1070
if (parent_id_winner == 'this' and name_winner == 'this'):
1071
# Nothing interesting
1074
raise AssertionError('unhandled kind: %s' % other_ie.kind)
1076
# If we have gotten this far, that means something has changed
1077
result.append((file_id, content_changed,
1078
((base_ie.parent_id, lca_parent_ids),
1079
other_ie.parent_id, this_ie.parent_id),
1080
((base_ie.name, lca_names),
1081
other_ie.name, this_ie.name),
1082
((base_ie.executable, lca_executable),
1083
other_ie.executable, this_ie.executable)
543
1087
def fix_root(self):
545
self.tt.final_kind(self.tt.root)
1088
if self.tt.final_kind(self.tt.root) is None:
547
1089
self.tt.cancel_deletion(self.tt.root)
548
1090
if self.tt.final_file_id(self.tt.root) is None:
549
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
1091
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
551
if self.other_tree.inventory.root is None:
1093
other_root_file_id = self.other_tree.get_root_id()
1094
if other_root_file_id is None:
553
other_root_file_id = self.other_tree.inventory.root.file_id
554
1096
other_root = self.tt.trans_id_file_id(other_root_file_id)
555
1097
if other_root == self.tt.root:
558
self.tt.final_kind(other_root)
1099
if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1100
# the other tree's root is a non-root in the current tree (as when
1101
# a previously unrelated branch is merged into another)
561
self.reparent_children(self.other_tree.inventory.root, self.tt.root)
562
self.tt.cancel_creation(other_root)
563
self.tt.cancel_versioning(other_root)
565
def reparent_children(self, ie, target):
566
for thing, child in ie.children.iteritems():
1103
if self.tt.final_kind(other_root) is not None:
1104
other_root_is_present = True
1106
# other_root doesn't have a physical representation. We still need
1107
# to move any references to the actual root of the tree.
1108
other_root_is_present = False
1109
# 'other_tree.inventory.root' is not present in this tree. We are
1110
# calling adjust_path for children which *want* to be present with a
1111
# correct place to go.
1112
for thing, child in self.other_tree.inventory.root.children.iteritems():
567
1113
trans_id = self.tt.trans_id_file_id(child.file_id)
568
self.tt.adjust_path(self.tt.final_name(trans_id), target, trans_id)
1114
if not other_root_is_present:
1115
if self.tt.final_kind(trans_id) is not None:
1116
# The item exist in the final tree and has a defined place
1119
# Move the item into the root
1120
self.tt.adjust_path(self.tt.final_name(trans_id),
1121
self.tt.root, trans_id)
1122
if other_root_is_present:
1123
self.tt.cancel_creation(other_root)
1124
self.tt.cancel_versioning(other_root)
570
1126
def write_modified(self, results):
571
1127
modified_hashes = {}
721
1330
return kind, contents
723
def contents_conflict():
724
trans_id = self.tt.trans_id_file_id(file_id)
725
name = self.tt.final_name(trans_id)
726
parent_id = self.tt.final_parent(trans_id)
727
if file_id in self.this_tree.inventory:
728
self.tt.unversion_file(trans_id)
729
if file_id in self.this_tree:
730
self.tt.delete_contents(trans_id)
731
file_group = self._dump_conflicts(name, parent_id, file_id,
733
self._raw_conflicts.append(('contents conflict', file_group))
735
1332
# See SPOT run. run, SPOT, run.
736
1333
# So we're not QUITE repeating ourselves; we do tricky things with
738
1335
base_pair = contents_pair(self.base_tree)
739
1336
other_pair = contents_pair(self.other_tree)
740
if base_pair == other_pair:
741
# OTHER introduced no changes
743
this_pair = contents_pair(self.this_tree)
744
if this_pair == other_pair:
745
# THIS and OTHER introduced the same changes
748
trans_id = self.tt.trans_id_file_id(file_id)
749
if this_pair == base_pair:
750
# only OTHER introduced changes
751
if file_id in self.this_tree:
752
# Remove any existing contents
753
self.tt.delete_contents(trans_id)
754
if file_id in self.other_tree:
755
# OTHER changed the file
756
create_by_entry(self.tt,
757
self.other_tree.inventory[file_id],
758
self.other_tree, trans_id)
759
if file_id not in self.this_tree.inventory:
760
self.tt.version_file(file_id, trans_id)
762
elif file_id in self.this_tree.inventory:
763
# OTHER deleted the file
764
self.tt.unversion_file(trans_id)
766
#BOTH THIS and OTHER introduced changes; scalar conflict
767
elif this_pair[0] == "file" and other_pair[0] == "file":
768
# THIS and OTHER are both files, so text merge. Either
769
# BASE is a file, or both converted to files, so at least we
770
# have agreement that output should be a file.
772
self.text_merge(file_id, trans_id)
774
return contents_conflict()
775
if file_id not in self.this_tree.inventory:
776
self.tt.version_file(file_id, trans_id)
778
self.tt.tree_kind(trans_id)
779
self.tt.delete_contents(trans_id)
784
# Scalar conflict, can't text merge. Dump conflicts
785
return contents_conflict()
1338
this_pair = contents_pair(self.this_tree)
1339
lca_pairs = [contents_pair(tree) for tree in self._lca_trees]
1340
winner = self._lca_multi_way((base_pair, lca_pairs), other_pair,
1341
this_pair, allow_overriding_lca=False)
1343
if base_pair == other_pair:
1346
# We delayed evaluating this_pair as long as we can to avoid
1347
# unnecessary sha1 calculation
1348
this_pair = contents_pair(self.this_tree)
1349
winner = self._three_way(base_pair, other_pair, this_pair)
1350
if winner == 'this':
1351
# No interesting changes introduced by OTHER
1353
# We have a hypothetical conflict, but if we have files, then we
1354
# can try to merge the content
1355
trans_id = self.tt.trans_id_file_id(file_id)
1356
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1357
other_pair[0], winner)
1358
hooks = self.active_hooks
1359
hook_status = 'not_applicable'
1361
hook_status, lines = hook.merge_contents(params)
1362
if hook_status != 'not_applicable':
1363
# Don't try any more hooks, this one applies.
1366
if hook_status == 'not_applicable':
1367
# This is a contents conflict, because none of the available
1368
# functions could merge it.
1370
name = self.tt.final_name(trans_id)
1371
parent_id = self.tt.final_parent(trans_id)
1372
if self.this_tree.has_id(file_id):
1373
self.tt.unversion_file(trans_id)
1374
file_group = self._dump_conflicts(name, parent_id, file_id,
1376
self._raw_conflicts.append(('contents conflict', file_group))
1377
elif hook_status == 'success':
1378
self.tt.create_file(lines, trans_id)
1379
elif hook_status == 'conflicted':
1380
# XXX: perhaps the hook should be able to provide
1381
# the BASE/THIS/OTHER files?
1382
self.tt.create_file(lines, trans_id)
1383
self._raw_conflicts.append(('text conflict', trans_id))
1384
name = self.tt.final_name(trans_id)
1385
parent_id = self.tt.final_parent(trans_id)
1386
self._dump_conflicts(name, parent_id, file_id)
1387
elif hook_status == 'delete':
1388
self.tt.unversion_file(trans_id)
1390
elif hook_status == 'done':
1391
# The hook function did whatever it needs to do directly, no
1392
# further action needed here.
1395
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1396
if not self.this_tree.has_id(file_id) and result == "modified":
1397
self.tt.version_file(file_id, trans_id)
1398
# The merge has been performed, so the old contents should not be
1400
self.tt.delete_contents(trans_id)
1403
def _default_other_winner_merge(self, merge_hook_params):
1404
"""Replace this contents with other."""
1405
file_id = merge_hook_params.file_id
1406
trans_id = merge_hook_params.trans_id
1407
file_in_this = self.this_tree.has_id(file_id)
1408
if self.other_tree.has_id(file_id):
1409
# OTHER changed the file
1411
if wt.supports_content_filtering():
1412
# We get the path from the working tree if it exists.
1413
# That fails though when OTHER is adding a file, so
1414
# we fall back to the other tree to find the path if
1415
# it doesn't exist locally.
1417
filter_tree_path = wt.id2path(file_id)
1418
except errors.NoSuchId:
1419
filter_tree_path = self.other_tree.id2path(file_id)
1421
# Skip the id2path lookup for older formats
1422
filter_tree_path = None
1423
transform.create_from_tree(self.tt, trans_id,
1424
self.other_tree, file_id,
1425
filter_tree_path=filter_tree_path)
1428
# OTHER deleted the file
1429
return 'delete', None
1431
raise AssertionError(
1432
'winner is OTHER, but file_id %r not in THIS or OTHER tree'
1435
def merge_contents(self, merge_hook_params):
1436
"""Fallback merge logic after user installed hooks."""
1437
# This function is used in merge hooks as the fallback instance.
1438
# Perhaps making this function and the functions it calls be a
1439
# a separate class would be better.
1440
if merge_hook_params.winner == 'other':
1441
# OTHER is a straight winner, so replace this contents with other
1442
return self._default_other_winner_merge(merge_hook_params)
1443
elif merge_hook_params.is_file_merge():
1444
# THIS and OTHER are both files, so text merge. Either
1445
# BASE is a file, or both converted to files, so at least we
1446
# have agreement that output should be a file.
1448
self.text_merge(merge_hook_params.file_id,
1449
merge_hook_params.trans_id)
1450
except errors.BinaryFile:
1451
return 'not_applicable', None
1454
return 'not_applicable', None
787
1456
def get_lines(self, tree, file_id):
788
1457
"""Return the lines in a file, or an empty list."""
790
return tree.get_file(file_id).readlines()
1458
if tree.has_id(file_id):
1459
return tree.get_file_lines(file_id)
842
1512
determined automatically. If set_version is true, the .OTHER, .THIS
843
1513
or .BASE (in that order) will be created as versioned files.
845
data = [('OTHER', self.other_tree, other_lines),
1515
data = [('OTHER', self.other_tree, other_lines),
846
1516
('THIS', self.this_tree, this_lines)]
848
1518
data.append(('BASE', self.base_tree, base_lines))
1520
# We need to use the actual path in the working tree of the file here,
1521
# ignoring the conflict suffixes
1523
if wt.supports_content_filtering():
1525
filter_tree_path = wt.id2path(file_id)
1526
except errors.NoSuchId:
1527
# file has been deleted
1528
filter_tree_path = None
1530
# Skip the id2path lookup for older formats
1531
filter_tree_path = None
849
1533
versioned = False
851
1535
for suffix, tree, lines in data:
1536
if tree.has_id(file_id):
853
1537
trans_id = self._conflict_file(name, parent_id, tree, file_id,
1538
suffix, lines, filter_tree_path)
855
1539
file_group.append(trans_id)
856
1540
if set_version and not versioned:
857
1541
self.tt.version_file(file_id, trans_id)
858
1542
versioned = True
859
1543
return file_group
861
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1545
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1546
lines=None, filter_tree_path=None):
863
1547
"""Emit a single conflict file."""
864
1548
name = name + '.' + suffix
865
1549
trans_id = self.tt.create_path(name, parent_id)
866
entry = tree.inventory[file_id]
867
create_by_entry(self.tt, entry, tree, trans_id, lines)
1550
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
870
1554
def merge_executable(self, file_id, file_status):
871
1555
"""Perform a merge on the execute bit."""
872
1556
executable = [self.executable(t, file_id) for t in (self.base_tree,
873
1557
self.other_tree, self.this_tree)]
874
self._merge_executable(file_id, executable, file_status)
1558
self._merge_executable(file_id, executable, file_status,
1559
resolver=self._three_way)
876
def _merge_executable(self, file_id, executable, file_status):
1561
def _merge_executable(self, file_id, executable, file_status,
877
1563
"""Perform a merge on the execute bit."""
878
1564
base_executable, other_executable, this_executable = executable
879
1565
if file_status == "deleted":
881
trans_id = self.tt.trans_id_file_id(file_id)
883
if self.tt.final_kind(trans_id) != "file":
887
winner = self._three_way(*executable)
1567
winner = resolver(*executable)
888
1568
if winner == "conflict":
889
1569
# There must be a None in here, if we have a conflict, but we
890
1570
# need executability since file status was not deleted.
935
1627
if path.endswith(suffix):
936
1628
path = path[:-len(suffix)]
938
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
939
self.cooked_conflicts.append(c)
940
if conflict_type == 'text conflict':
1630
c = _mod_conflicts.Conflict.factory(conflict_type,
1631
path=path, file_id=file_id)
1632
elif conflict_type == 'text conflict':
941
1633
trans_id = conflict[1]
942
1634
path = fp.get_path(trans_id)
943
1635
file_id = self.tt.final_file_id(trans_id)
944
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
945
self.cooked_conflicts.append(c)
947
for trans_id, conflicts in name_conflicts.iteritems():
949
this_parent, other_parent = conflicts['parent conflict']
950
assert this_parent != other_parent
952
this_parent = other_parent = \
953
self.tt.final_file_id(self.tt.final_parent(trans_id))
955
this_name, other_name = conflicts['name conflict']
956
assert this_name != other_name
958
this_name = other_name = self.tt.final_name(trans_id)
959
other_path = fp.get_path(trans_id)
960
if this_parent is not None and this_name is not None:
962
fp.get_path(self.tt.trans_id_file_id(this_parent))
963
this_path = pathjoin(this_parent_path, this_name)
1636
c = _mod_conflicts.Conflict.factory(conflict_type,
1637
path=path, file_id=file_id)
965
this_path = "<deleted>"
966
file_id = self.tt.final_file_id(trans_id)
967
c = Conflict.factory('path conflict', path=this_path,
968
conflict_path=other_path, file_id=file_id)
1639
raise AssertionError('bad conflict type: %r' % (conflict,))
969
1640
self.cooked_conflicts.append(c)
970
self.cooked_conflicts.sort(key=Conflict.sort_key)
1641
self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
973
1644
class WeaveMerger(Merge3Merger):
974
1645
"""Three-way tree merger, text weave merger."""
975
1646
supports_reprocess = True
976
1647
supports_show_base = False
1648
supports_reverse_cherrypick = False
1649
history_based = True
978
def __init__(self, working_tree, this_tree, base_tree, other_tree,
979
interesting_ids=None, pb=DummyProgress(), pp=None,
980
reprocess=False, change_reporter=None,
981
interesting_files=None):
982
super(WeaveMerger, self).__init__(working_tree, this_tree,
983
base_tree, other_tree,
984
interesting_ids=interesting_ids,
985
pb=pb, pp=pp, reprocess=reprocess,
986
change_reporter=change_reporter)
1651
def _generate_merge_plan(self, file_id, base):
1652
return self.this_tree.plan_file_merge(file_id, self.other_tree,
988
1655
def _merged_lines(self, file_id):
989
1656
"""Generate the merged lines.
990
1657
There is no distinction between lines that are meant to contain <<<<<<<
993
plan = self.this_tree.plan_file_merge(file_id, self.other_tree)
994
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
995
'>>>>>>> MERGE-SOURCE\n')
996
return textmerge.merge_lines(self.reprocess)
1661
base = self.base_tree
1664
plan = self._generate_merge_plan(file_id, base)
1665
if 'merge' in debug.debug_flags:
1667
trans_id = self.tt.trans_id_file_id(file_id)
1668
name = self.tt.final_name(trans_id) + '.plan'
1669
contents = ('%11s|%s' % l for l in plan)
1670
self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
1671
textmerge = versionedfile.PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1672
'>>>>>>> MERGE-SOURCE\n')
1673
lines, conflicts = textmerge.merge_lines(self.reprocess)
1675
base_lines = textmerge.base_from_plan()
1678
return lines, base_lines
998
1680
def text_merge(self, file_id, trans_id):
999
1681
"""Perform a (weave) text merge for a given file and file-id.
1000
1682
If conflicts are encountered, .THIS and .OTHER files will be emitted,
1001
1683
and a conflict will be noted.
1003
lines, conflicts = self._merged_lines(file_id)
1685
lines, base_lines = self._merged_lines(file_id)
1004
1686
lines = list(lines)
1005
# Note we're checking whether the OUTPUT is binary in this case,
1687
# Note we're checking whether the OUTPUT is binary in this case,
1006
1688
# because we don't want to get into weave merge guts.
1007
check_text_lines(lines)
1689
textfile.check_text_lines(lines)
1008
1690
self.tt.create_file(lines, trans_id)
1691
if base_lines is not None:
1010
1693
self._raw_conflicts.append(('text conflict', trans_id))
1011
1694
name = self.tt.final_name(trans_id)
1012
1695
parent_id = self.tt.final_parent(trans_id)
1013
file_group = self._dump_conflicts(name, parent_id, file_id,
1696
file_group = self._dump_conflicts(name, parent_id, file_id,
1698
base_lines=base_lines)
1015
1699
file_group.append(trans_id)
1702
class LCAMerger(WeaveMerger):
1704
def _generate_merge_plan(self, file_id, base):
1705
return self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1018
1708
class Diff3Merger(Merge3Merger):
1019
1709
"""Three-way merger using external diff3 for text merging"""
1021
1711
def dump_file(self, temp_dir, name, tree, file_id):
1022
out_path = pathjoin(temp_dir, name)
1712
out_path = osutils.pathjoin(temp_dir, name)
1023
1713
out_file = open(out_path, "wb")
1025
1715
in_file = tree.get_file(file_id)
1058
1748
osutils.rmtree(temp_dir)
1751
class PathNotInTree(errors.BzrError):
1753
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1755
def __init__(self, path, tree):
1756
errors.BzrError.__init__(self, path=path, tree=tree)
1759
class MergeIntoMerger(Merger):
1760
"""Merger that understands other_tree will be merged into a subdir.
1762
This also changes the Merger api so that it uses real Branch, revision_id,
1763
and RevisonTree objects, rather than using revision specs.
1766
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1767
source_subpath, other_rev_id=None):
1768
"""Create a new MergeIntoMerger object.
1770
source_subpath in other_tree will be effectively copied to
1771
target_subdir in this_tree.
1773
:param this_tree: The tree that we will be merging into.
1774
:param other_branch: The Branch we will be merging from.
1775
:param other_tree: The RevisionTree object we want to merge.
1776
:param target_subdir: The relative path where we want to merge
1777
other_tree into this_tree
1778
:param source_subpath: The relative path specifying the subtree of
1779
other_tree to merge into this_tree.
1781
# It is assumed that we are merging a tree that is not in our current
1782
# ancestry, which means we are using the "EmptyTree" as our basis.
1783
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1784
_mod_revision.NULL_REVISION)
1785
super(MergeIntoMerger, self).__init__(
1786
this_branch=this_tree.branch,
1787
this_tree=this_tree,
1788
other_tree=other_tree,
1789
base_tree=null_ancestor_tree,
1791
self._target_subdir = target_subdir
1792
self._source_subpath = source_subpath
1793
self.other_branch = other_branch
1794
if other_rev_id is None:
1795
other_rev_id = other_tree.get_revision_id()
1796
self.other_rev_id = self.other_basis = other_rev_id
1797
self.base_is_ancestor = True
1798
self.backup_files = True
1799
self.merge_type = Merge3Merger
1800
self.show_base = False
1801
self.reprocess = False
1802
self.interesting_ids = None
1803
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1804
target_subdir=self._target_subdir,
1805
source_subpath=self._source_subpath)
1806
if self._source_subpath != '':
1807
# If this isn't a partial merge make sure the revisions will be
1809
self._maybe_fetch(self.other_branch, self.this_branch,
1812
def set_pending(self):
1813
if self._source_subpath != '':
1815
Merger.set_pending(self)
1818
class _MergeTypeParameterizer(object):
1819
"""Wrap a merge-type class to provide extra parameters.
1821
This is hack used by MergeIntoMerger to pass some extra parameters to its
1822
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1823
the 'merge_type' member. It is difficult override do_merge without
1824
re-writing the whole thing, so instead we create a wrapper which will pass
1825
the extra parameters.
1828
def __init__(self, merge_type, **kwargs):
1829
self._extra_kwargs = kwargs
1830
self._merge_type = merge_type
1832
def __call__(self, *args, **kwargs):
1833
kwargs.update(self._extra_kwargs)
1834
return self._merge_type(*args, **kwargs)
1836
def __getattr__(self, name):
1837
return getattr(self._merge_type, name)
1840
class MergeIntoMergeType(Merge3Merger):
1841
"""Merger that incorporates a tree (or part of a tree) into another."""
1843
def __init__(self, *args, **kwargs):
1844
"""Initialize the merger object.
1846
:param args: See Merge3Merger.__init__'s args.
1847
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1848
source_subpath and target_subdir.
1849
:keyword source_subpath: The relative path specifying the subtree of
1850
other_tree to merge into this_tree.
1851
:keyword target_subdir: The relative path where we want to merge
1852
other_tree into this_tree
1854
# All of the interesting work happens during Merge3Merger.__init__(),
1855
# so we have have to hack in to get our extra parameters set.
1856
self._source_subpath = kwargs.pop('source_subpath')
1857
self._target_subdir = kwargs.pop('target_subdir')
1858
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1860
def _compute_transform(self):
1861
child_pb = ui.ui_factory.nested_progress_bar()
1863
entries = self._entries_to_incorporate()
1864
entries = list(entries)
1865
for num, (entry, parent_id) in enumerate(entries):
1866
child_pb.update('Preparing file merge', num, len(entries))
1867
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1868
trans_id = transform.new_by_entry(self.tt, entry,
1869
parent_trans_id, self.other_tree)
1872
self._finish_computing_transform()
1874
def _entries_to_incorporate(self):
1875
"""Yields pairs of (inventory_entry, new_parent)."""
1876
other_inv = self.other_tree.inventory
1877
subdir_id = other_inv.path2id(self._source_subpath)
1878
if subdir_id is None:
1879
# XXX: The error would be clearer if it gave the URL of the source
1880
# branch, but we don't have a reference to that here.
1881
raise PathNotInTree(self._source_subpath, "Source tree")
1882
subdir = other_inv[subdir_id]
1883
parent_in_target = osutils.dirname(self._target_subdir)
1884
target_id = self.this_tree.inventory.path2id(parent_in_target)
1885
if target_id is None:
1886
raise PathNotInTree(self._target_subdir, "Target tree")
1887
name_in_target = osutils.basename(self._target_subdir)
1888
merge_into_root = subdir.copy()
1889
merge_into_root.name = name_in_target
1890
if merge_into_root.file_id in self.this_tree.inventory:
1891
# Give the root a new file-id.
1892
# This can happen fairly easily if the directory we are
1893
# incorporating is the root, and both trees have 'TREE_ROOT' as
1894
# their root_id. Users will expect this to Just Work, so we
1895
# change the file-id here.
1896
# Non-root file-ids could potentially conflict too. That's really
1897
# an edge case, so we don't do anything special for those. We let
1898
# them cause conflicts.
1899
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1900
yield (merge_into_root, target_id)
1901
if subdir.kind != 'directory':
1902
# No children, so we are done.
1904
for ignored_path, entry in other_inv.iter_entries_by_dir(subdir_id):
1905
parent_id = entry.parent_id
1906
if parent_id == subdir.file_id:
1907
# The root's parent ID has changed, so make sure children of
1908
# the root refer to the new ID.
1909
parent_id = merge_into_root.file_id
1910
yield (entry, parent_id)
1061
1913
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1062
1914
backup_files=False,
1063
1915
merge_type=Merge3Merger,
1130
1989
yield status_a(revision, text)
1131
1990
for revision, text in annotated_b[b_cur:bi]:
1132
1991
yield status_b(revision, text)
1134
1992
# and now the matched section
1137
for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]):
1138
assert text_a == text_b
1995
for text_a in plain_a[ai:a_cur]:
1139
1996
yield "unchanged", text_a
1999
class _PlanMergeBase(object):
2001
def __init__(self, a_rev, b_rev, vf, key_prefix):
2004
:param a_rev: Revision-id of one revision to merge
2005
:param b_rev: Revision-id of the other revision to merge
2006
:param vf: A VersionedFiles containing both revisions
2007
:param key_prefix: A prefix for accessing keys in vf, typically
2013
self._last_lines = None
2014
self._last_lines_revision_id = None
2015
self._cached_matching_blocks = {}
2016
self._key_prefix = key_prefix
2017
self._precache_tip_lines()
2019
def _precache_tip_lines(self):
2020
lines = self.get_lines([self.a_rev, self.b_rev])
2021
self.lines_a = lines[self.a_rev]
2022
self.lines_b = lines[self.b_rev]
2024
def get_lines(self, revisions):
2025
"""Get lines for revisions from the backing VersionedFiles.
2027
:raises RevisionNotPresent: on absent texts.
2029
keys = [(self._key_prefix + (rev,)) for rev in revisions]
2031
for record in self.vf.get_record_stream(keys, 'unordered', True):
2032
if record.storage_kind == 'absent':
2033
raise errors.RevisionNotPresent(record.key, self.vf)
2034
result[record.key[-1]] = osutils.chunks_to_lines(
2035
record.get_bytes_as('chunked'))
2038
def plan_merge(self):
2039
"""Generate a 'plan' for merging the two revisions.
2041
This involves comparing their texts and determining the cause of
2042
differences. If text A has a line and text B does not, then either the
2043
line was added to text A, or it was deleted from B. Once the causes
2044
are combined, they are written out in the format described in
2045
VersionedFile.plan_merge
2047
blocks = self._get_matching_blocks(self.a_rev, self.b_rev)
2048
unique_a, unique_b = self._unique_lines(blocks)
2049
new_a, killed_b = self._determine_status(self.a_rev, unique_a)
2050
new_b, killed_a = self._determine_status(self.b_rev, unique_b)
2051
return self._iter_plan(blocks, new_a, killed_b, new_b, killed_a)
2053
def _iter_plan(self, blocks, new_a, killed_b, new_b, killed_a):
2056
for i, j, n in blocks:
2057
for a_index in range(last_i, i):
2058
if a_index in new_a:
2059
if a_index in killed_b:
2060
yield 'conflicted-a', self.lines_a[a_index]
2062
yield 'new-a', self.lines_a[a_index]
2064
yield 'killed-b', self.lines_a[a_index]
2065
for b_index in range(last_j, j):
2066
if b_index in new_b:
2067
if b_index in killed_a:
2068
yield 'conflicted-b', self.lines_b[b_index]
2070
yield 'new-b', self.lines_b[b_index]
2072
yield 'killed-a', self.lines_b[b_index]
2073
# handle common lines
2074
for a_index in range(i, i+n):
2075
yield 'unchanged', self.lines_a[a_index]
2079
def _get_matching_blocks(self, left_revision, right_revision):
2080
"""Return a description of which sections of two revisions match.
2082
See SequenceMatcher.get_matching_blocks
2084
cached = self._cached_matching_blocks.get((left_revision,
2086
if cached is not None:
2088
if self._last_lines_revision_id == left_revision:
2089
left_lines = self._last_lines
2090
right_lines = self.get_lines([right_revision])[right_revision]
2092
lines = self.get_lines([left_revision, right_revision])
2093
left_lines = lines[left_revision]
2094
right_lines = lines[right_revision]
2095
self._last_lines = right_lines
2096
self._last_lines_revision_id = right_revision
2097
matcher = patiencediff.PatienceSequenceMatcher(None, left_lines,
2099
return matcher.get_matching_blocks()
2101
def _unique_lines(self, matching_blocks):
2102
"""Analyse matching_blocks to determine which lines are unique
2104
:return: a tuple of (unique_left, unique_right), where the values are
2105
sets of line numbers of unique lines.
2111
for i, j, n in matching_blocks:
2112
unique_left.extend(range(last_i, i))
2113
unique_right.extend(range(last_j, j))
2116
return unique_left, unique_right
2119
def _subtract_plans(old_plan, new_plan):
2120
"""Remove changes from new_plan that came from old_plan.
2122
It is assumed that the difference between the old_plan and new_plan
2123
is their choice of 'b' text.
2125
All lines from new_plan that differ from old_plan are emitted
2126
verbatim. All lines from new_plan that match old_plan but are
2127
not about the 'b' revision are emitted verbatim.
2129
Lines that match and are about the 'b' revision are the lines we
2130
don't want, so we convert 'killed-b' -> 'unchanged', and 'new-b'
2131
is skipped entirely.
2133
matcher = patiencediff.PatienceSequenceMatcher(None, old_plan,
2136
for i, j, n in matcher.get_matching_blocks():
2137
for jj in range(last_j, j):
2139
for jj in range(j, j+n):
2140
plan_line = new_plan[jj]
2141
if plan_line[0] == 'new-b':
2143
elif plan_line[0] == 'killed-b':
2144
yield 'unchanged', plan_line[1]
2150
class _PlanMerge(_PlanMergeBase):
2151
"""Plan an annotate merge using on-the-fly annotation"""
2153
def __init__(self, a_rev, b_rev, vf, key_prefix):
2154
super(_PlanMerge, self).__init__(a_rev, b_rev, vf, key_prefix)
2155
self.a_key = self._key_prefix + (self.a_rev,)
2156
self.b_key = self._key_prefix + (self.b_rev,)
2157
self.graph = _mod_graph.Graph(self.vf)
2158
heads = self.graph.heads((self.a_key, self.b_key))
2160
# one side dominates, so we can just return its values, yay for
2162
# Ideally we would know that before we get this far
2163
self._head_key = heads.pop()
2164
if self._head_key == self.a_key:
2168
trace.mutter('found dominating revision for %s\n%s > %s', self.vf,
2169
self._head_key[-1], other)
2172
self._head_key = None
2175
def _precache_tip_lines(self):
2176
# Turn this into a no-op, because we will do this later
2179
def _find_recursive_lcas(self):
2180
"""Find all the ancestors back to a unique lca"""
2181
cur_ancestors = (self.a_key, self.b_key)
2182
# graph.find_lca(uncommon, keys) now returns plain NULL_REVISION,
2183
# rather than a key tuple. We will just map that directly to no common
2187
next_lcas = self.graph.find_lca(*cur_ancestors)
2188
# Map a plain NULL_REVISION to a simple no-ancestors
2189
if next_lcas == set([_mod_revision.NULL_REVISION]):
2191
# Order the lca's based on when they were merged into the tip
2192
# While the actual merge portion of weave merge uses a set() of
2193
# active revisions, the order of insertion *does* effect the
2194
# implicit ordering of the texts.
2195
for rev_key in cur_ancestors:
2196
ordered_parents = tuple(self.graph.find_merge_order(rev_key,
2198
parent_map[rev_key] = ordered_parents
2199
if len(next_lcas) == 0:
2201
elif len(next_lcas) == 1:
2202
parent_map[list(next_lcas)[0]] = ()
2204
elif len(next_lcas) > 2:
2205
# More than 2 lca's, fall back to grabbing all nodes between
2206
# this and the unique lca.
2207
trace.mutter('More than 2 LCAs, falling back to all nodes for:'
2209
self.a_key, self.b_key, cur_ancestors)
2210
cur_lcas = next_lcas
2211
while len(cur_lcas) > 1:
2212
cur_lcas = self.graph.find_lca(*cur_lcas)
2213
if len(cur_lcas) == 0:
2214
# No common base to find, use the full ancestry
2217
unique_lca = list(cur_lcas)[0]
2218
if unique_lca == _mod_revision.NULL_REVISION:
2219
# find_lca will return a plain 'NULL_REVISION' rather
2220
# than a key tuple when there is no common ancestor, we
2221
# prefer to just use None, because it doesn't confuse
2222
# _get_interesting_texts()
2224
parent_map.update(self._find_unique_parents(next_lcas,
2227
cur_ancestors = next_lcas
2230
def _find_unique_parents(self, tip_keys, base_key):
2231
"""Find ancestors of tip that aren't ancestors of base.
2233
:param tip_keys: Nodes that are interesting
2234
:param base_key: Cull all ancestors of this node
2235
:return: The parent map for all revisions between tip_keys and
2236
base_key. base_key will be included. References to nodes outside of
2237
the ancestor set will also be removed.
2239
# TODO: this would be simpler if find_unique_ancestors took a list
2240
# instead of a single tip, internally it supports it, but it
2241
# isn't a "backwards compatible" api change.
2242
if base_key is None:
2243
parent_map = dict(self.graph.iter_ancestry(tip_keys))
2244
# We remove NULL_REVISION because it isn't a proper tuple key, and
2245
# thus confuses things like _get_interesting_texts, and our logic
2246
# to add the texts into the memory weave.
2247
if _mod_revision.NULL_REVISION in parent_map:
2248
parent_map.pop(_mod_revision.NULL_REVISION)
2251
for tip in tip_keys:
2253
self.graph.find_unique_ancestors(tip, [base_key]))
2254
parent_map = self.graph.get_parent_map(interesting)
2255
parent_map[base_key] = ()
2256
culled_parent_map, child_map, tails = self._remove_external_references(
2258
# Remove all the tails but base_key
2259
if base_key is not None:
2260
tails.remove(base_key)
2261
self._prune_tails(culled_parent_map, child_map, tails)
2262
# Now remove all the uninteresting 'linear' regions
2263
simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
2267
def _remove_external_references(parent_map):
2268
"""Remove references that go outside of the parent map.
2270
:param parent_map: Something returned from Graph.get_parent_map(keys)
2271
:return: (filtered_parent_map, child_map, tails)
2272
filtered_parent_map is parent_map without external references
2273
child_map is the {parent_key: [child_keys]} mapping
2274
tails is a list of nodes that do not have any parents in the map
2276
# TODO: The basic effect of this function seems more generic than
2277
# _PlanMerge. But the specific details of building a child_map,
2278
# and computing tails seems very specific to _PlanMerge.
2279
# Still, should this be in Graph land?
2280
filtered_parent_map = {}
2283
for key, parent_keys in parent_map.iteritems():
2284
culled_parent_keys = [p for p in parent_keys if p in parent_map]
2285
if not culled_parent_keys:
2287
for parent_key in culled_parent_keys:
2288
child_map.setdefault(parent_key, []).append(key)
2289
# TODO: Do we want to do this, it adds overhead for every node,
2290
# just to say that the node has no children
2291
child_map.setdefault(key, [])
2292
filtered_parent_map[key] = culled_parent_keys
2293
return filtered_parent_map, child_map, tails
2296
def _prune_tails(parent_map, child_map, tails_to_remove):
2297
"""Remove tails from the parent map.
2299
This will remove the supplied revisions until no more children have 0
2302
:param parent_map: A dict of {child: [parents]}, this dictionary will
2303
be modified in place.
2304
:param tails_to_remove: A list of tips that should be removed,
2305
this list will be consumed
2306
:param child_map: The reverse dict of parent_map ({parent: [children]})
2307
this dict will be modified
2308
:return: None, parent_map will be modified in place.
2310
while tails_to_remove:
2311
next = tails_to_remove.pop()
2312
parent_map.pop(next)
2313
children = child_map.pop(next)
2314
for child in children:
2315
child_parents = parent_map[child]
2316
child_parents.remove(next)
2317
if len(child_parents) == 0:
2318
tails_to_remove.append(child)
2320
def _get_interesting_texts(self, parent_map):
2321
"""Return a dict of texts we are interested in.
2323
Note that the input is in key tuples, but the output is in plain
2326
:param parent_map: The output from _find_recursive_lcas
2327
:return: A dict of {'revision_id':lines} as returned by
2328
_PlanMergeBase.get_lines()
2330
all_revision_keys = set(parent_map)
2331
all_revision_keys.add(self.a_key)
2332
all_revision_keys.add(self.b_key)
2334
# Everything else is in 'keys' but get_lines is in 'revision_ids'
2335
all_texts = self.get_lines([k[-1] for k in all_revision_keys])
2338
def _build_weave(self):
2339
from bzrlib import weave
2340
self._weave = weave.Weave(weave_name='in_memory_weave',
2341
allow_reserved=True)
2342
parent_map = self._find_recursive_lcas()
2344
all_texts = self._get_interesting_texts(parent_map)
2346
# Note: Unfortunately, the order given by topo_sort will effect the
2347
# ordering resolution in the output. Specifically, if you add A then B,
2348
# then in the output text A lines will show up before B lines. And, of
2349
# course, topo_sort doesn't guarantee any real ordering.
2350
# So we use merge_sort, and add a fake node on the tip.
2351
# This ensures that left-hand parents will always be inserted into the
2352
# weave before right-hand parents.
2353
tip_key = self._key_prefix + (_mod_revision.CURRENT_REVISION,)
2354
parent_map[tip_key] = (self.a_key, self.b_key)
2356
for seq_num, key, depth, eom in reversed(tsort.merge_sort(parent_map,
2360
# for key in tsort.topo_sort(parent_map):
2361
parent_keys = parent_map[key]
2362
revision_id = key[-1]
2363
parent_ids = [k[-1] for k in parent_keys]
2364
self._weave.add_lines(revision_id, parent_ids,
2365
all_texts[revision_id])
2367
def plan_merge(self):
2368
"""Generate a 'plan' for merging the two revisions.
2370
This involves comparing their texts and determining the cause of
2371
differences. If text A has a line and text B does not, then either the
2372
line was added to text A, or it was deleted from B. Once the causes
2373
are combined, they are written out in the format described in
2374
VersionedFile.plan_merge
2376
if self._head_key is not None: # There was a single head
2377
if self._head_key == self.a_key:
2380
if self._head_key != self.b_key:
2381
raise AssertionError('There was an invalid head: %s != %s'
2382
% (self.b_key, self._head_key))
2384
head_rev = self._head_key[-1]
2385
lines = self.get_lines([head_rev])[head_rev]
2386
return ((plan, line) for line in lines)
2387
return self._weave.plan_merge(self.a_rev, self.b_rev)
2390
class _PlanLCAMerge(_PlanMergeBase):
2392
This merge algorithm differs from _PlanMerge in that:
2393
1. comparisons are done against LCAs only
2394
2. cases where a contested line is new versus one LCA but old versus
2395
another are marked as conflicts, by emitting the line as conflicted-a
2398
This is faster, and hopefully produces more useful output.
2401
def __init__(self, a_rev, b_rev, vf, key_prefix, graph):
2402
_PlanMergeBase.__init__(self, a_rev, b_rev, vf, key_prefix)
2403
lcas = graph.find_lca(key_prefix + (a_rev,), key_prefix + (b_rev,))
2406
if lca == _mod_revision.NULL_REVISION:
2409
self.lcas.add(lca[-1])
2410
for lca in self.lcas:
2411
if _mod_revision.is_null(lca):
2414
lca_lines = self.get_lines([lca])[lca]
2415
matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_a,
2417
blocks = list(matcher.get_matching_blocks())
2418
self._cached_matching_blocks[(a_rev, lca)] = blocks
2419
matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_b,
2421
blocks = list(matcher.get_matching_blocks())
2422
self._cached_matching_blocks[(b_rev, lca)] = blocks
2424
def _determine_status(self, revision_id, unique_line_numbers):
2425
"""Determines the status unique lines versus all lcas.
2427
Basically, determines why the line is unique to this revision.
2429
A line may be determined new, killed, or both.
2431
If a line is determined new, that means it was not present in at least
2432
one LCA, and is not present in the other merge revision.
2434
If a line is determined killed, that means the line was present in
2437
If a line is killed and new, this indicates that the two merge
2438
revisions contain differing conflict resolutions.
2439
:param revision_id: The id of the revision in which the lines are
2441
:param unique_line_numbers: The line numbers of unique lines.
2442
:return a tuple of (new_this, killed_other):
2446
unique_line_numbers = set(unique_line_numbers)
2447
for lca in self.lcas:
2448
blocks = self._get_matching_blocks(revision_id, lca)
2449
unique_vs_lca, _ignored = self._unique_lines(blocks)
2450
new.update(unique_line_numbers.intersection(unique_vs_lca))
2451
killed.update(unique_line_numbers.difference(unique_vs_lca))
added
removed
bzrlib/merge.py
