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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from itertools import chain
19
23
from bzrlib import (
20
branch as _mod_branch,
21
conflicts as _mod_conflicts,
25
26
graph as _mod_graph,
30
30
revision as _mod_revision,
39
from bzrlib.cleanup import OperationWithCleanups
40
from bzrlib.symbol_versioning import (
33
from bzrlib.branch import Branch
34
from bzrlib.conflicts import ConflictList, Conflict
35
from bzrlib.errors import (BzrCommandError,
45
WorkingTreeNotRevision,
48
from bzrlib.graph import Graph
49
from bzrlib.merge3 import Merge3
50
from bzrlib.osutils import rename, pathjoin
51
from progress import DummyProgress, ProgressPhase
52
from bzrlib.revision import (NULL_REVISION, ensure_null)
53
from bzrlib.textfile import check_text_lines
54
from bzrlib.trace import mutter, warning, note, is_quiet
55
from bzrlib.transform import (TransformPreview, TreeTransform,
56
resolve_conflicts, cook_conflicts,
57
conflict_pass, FinalPaths, create_by_entry,
58
unique_add, ROOT_PARENT)
59
from bzrlib.versionedfile import PlanWeaveMerge
44
62
# TODO: Report back as changes are merged in
47
65
def transform_tree(from_tree, to_tree, interesting_ids=None):
48
from_tree.lock_tree_write()
49
operation = OperationWithCleanups(merge_inner)
50
operation.add_cleanup(from_tree.unlock)
51
operation.run_simple(from_tree.branch, to_tree, from_tree,
52
ignore_zero=True, interesting_ids=interesting_ids, this_tree=from_tree)
55
class MergeHooks(hooks.Hooks):
58
hooks.Hooks.__init__(self)
59
self.create_hook(hooks.HookPoint('merge_file_content',
60
"Called with a bzrlib.merge.Merger object to create a per file "
61
"merge object when starting a merge. "
62
"Should return either None or a subclass of "
63
"``bzrlib.merge.AbstractPerFileMerger``. "
64
"Such objects will then be called per file "
65
"that needs to be merged (including when one "
66
"side has deleted the file and the other has changed it). "
67
"See the AbstractPerFileMerger API docs for details on how it is "
72
class AbstractPerFileMerger(object):
73
"""PerFileMerger objects are used by plugins extending merge for bzrlib.
75
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
77
:ivar merger: The Merge3Merger performing the merge.
80
def __init__(self, merger):
81
"""Create a PerFileMerger for use with merger."""
84
def merge_contents(self, merge_params):
85
"""Attempt to merge the contents of a single file.
87
:param merge_params: A bzrlib.merge.MergeHookParams
88
:return : A tuple of (status, chunks), where status is one of
89
'not_applicable', 'success', 'conflicted', or 'delete'. If status
90
is 'success' or 'conflicted', then chunks should be an iterable of
91
strings for the new file contents.
93
return ('not applicable', None)
96
class PerFileMerger(AbstractPerFileMerger):
97
"""Merge individual files when self.file_matches returns True.
99
This class is intended to be subclassed. The file_matches and
100
merge_matching methods should be overridden with concrete implementations.
103
def file_matches(self, params):
104
"""Return True if merge_matching should be called on this file.
106
Only called with merges of plain files with no clear winner.
108
Subclasses must override this.
110
raise NotImplementedError(self.file_matches)
112
def get_filename(self, params, tree):
113
"""Lookup the filename (i.e. basename, not path), given a Tree (e.g.
114
self.merger.this_tree) and a MergeHookParams.
116
return osutils.basename(tree.id2path(params.file_id))
118
def get_filepath(self, params, tree):
119
"""Calculate the path to the file in a tree.
121
:param params: A MergeHookParams describing the file to merge
122
:param tree: a Tree, e.g. self.merger.this_tree.
124
return tree.id2path(params.file_id)
126
def merge_contents(self, params):
127
"""Merge the contents of a single file."""
128
# Check whether this custom merge logic should be used.
130
# OTHER is a straight winner, rely on default merge.
131
params.winner == 'other' or
132
# THIS and OTHER aren't both files.
133
not params.is_file_merge() or
134
# The filename doesn't match *.xml
135
not self.file_matches(params)):
136
return 'not_applicable', None
137
return self.merge_matching(params)
139
def merge_matching(self, params):
140
"""Merge the contents of a single file that has matched the criteria
141
in PerFileMerger.merge_contents (is a conflict, is a file,
142
self.file_matches is True).
144
Subclasses must override this.
146
raise NotImplementedError(self.merge_matching)
149
class ConfigurableFileMerger(PerFileMerger):
150
"""Merge individual files when configured via a .conf file.
152
This is a base class for concrete custom file merging logic. Concrete
153
classes should implement ``merge_text``.
155
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
157
:ivar affected_files: The configured file paths to merge.
159
:cvar name_prefix: The prefix to use when looking up configuration
160
details. <name_prefix>_merge_files describes the files targeted by the
163
:cvar default_files: The default file paths to merge when no configuration
170
def __init__(self, merger):
171
super(ConfigurableFileMerger, self).__init__(merger)
172
self.affected_files = None
173
self.default_files = self.__class__.default_files or []
174
self.name_prefix = self.__class__.name_prefix
175
if self.name_prefix is None:
176
raise ValueError("name_prefix must be set.")
178
def file_matches(self, params):
179
"""Check whether the file should call the merge hook.
181
<name_prefix>_merge_files configuration variable is a list of files
182
that should use the hook.
184
affected_files = self.affected_files
185
if affected_files is None:
186
config = self.merger.this_branch.get_config()
187
# Until bzr provides a better policy for caching the config, we
188
# just add the part we're interested in to the params to avoid
189
# reading the config files repeatedly (bazaar.conf, location.conf,
191
config_key = self.name_prefix + '_merge_files'
192
affected_files = config.get_user_option_as_list(config_key)
193
if affected_files is None:
194
# If nothing was specified in the config, use the default.
195
affected_files = self.default_files
196
self.affected_files = affected_files
198
filepath = self.get_filepath(params, self.merger.this_tree)
199
if filepath in affected_files:
203
def merge_matching(self, params):
204
return self.merge_text(params)
206
def merge_text(self, params):
207
"""Merge the byte contents of a single file.
209
This is called after checking that the merge should be performed in
210
merge_contents, and it should behave as per
211
``bzrlib.merge.AbstractPerFileMerger.merge_contents``.
213
raise NotImplementedError(self.merge_text)
216
class MergeHookParams(object):
217
"""Object holding parameters passed to merge_file_content hooks.
219
There are some fields hooks can access:
221
:ivar file_id: the file ID of the file being merged
222
:ivar trans_id: the transform ID for the merge of this file
223
:ivar this_kind: kind of file_id in 'this' tree
224
:ivar other_kind: kind of file_id in 'other' tree
225
:ivar winner: one of 'this', 'other', 'conflict'
228
def __init__(self, merger, file_id, trans_id, this_kind, other_kind,
230
self._merger = merger
231
self.file_id = file_id
232
self.trans_id = trans_id
233
self.this_kind = this_kind
234
self.other_kind = other_kind
237
def is_file_merge(self):
238
"""True if this_kind and other_kind are both 'file'."""
239
return self.this_kind == 'file' and self.other_kind == 'file'
241
@decorators.cachedproperty
242
def base_lines(self):
243
"""The lines of the 'base' version of the file."""
244
return self._merger.get_lines(self._merger.base_tree, self.file_id)
246
@decorators.cachedproperty
247
def this_lines(self):
248
"""The lines of the 'this' version of the file."""
249
return self._merger.get_lines(self._merger.this_tree, self.file_id)
251
@decorators.cachedproperty
252
def other_lines(self):
253
"""The lines of the 'other' version of the file."""
254
return self._merger.get_lines(self._merger.other_tree, self.file_id)
66
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
67
interesting_ids=interesting_ids, this_tree=from_tree)
257
70
class Merger(object):
261
71
def __init__(self, this_branch, other_tree=None, base_tree=None,
262
this_tree=None, pb=None, change_reporter=None,
72
this_tree=None, pb=DummyProgress(), change_reporter=None,
263
73
recurse='down', revision_graph=None):
264
74
object.__init__(self)
265
75
self.this_branch = this_branch
458
244
if self.this_rev_id is None:
459
245
if self.this_basis_tree.get_file_sha1(file_id) != \
460
246
self.this_tree.get_file_sha1(file_id):
461
raise errors.WorkingTreeNotRevision(self.this_tree)
247
raise WorkingTreeNotRevision(self.this_tree)
463
249
trees = (self.this_basis_tree, self.other_tree)
464
250
return [get_id(tree, file_id) for tree in trees]
466
@deprecated_method(deprecated_in((2, 1, 0)))
467
252
def check_basis(self, check_clean, require_commits=True):
468
253
if self.this_basis is None and require_commits is True:
469
raise errors.BzrCommandError(
470
"This branch has no commits."
471
" (perhaps you would prefer 'bzr pull')")
254
raise BzrCommandError("This branch has no commits."
255
" (perhaps you would prefer 'bzr pull')")
473
257
self.compare_basis()
474
258
if self.this_basis != self.this_rev_id:
475
259
raise errors.UncommittedChanges(self.this_tree)
477
@deprecated_method(deprecated_in((2, 1, 0)))
478
261
def compare_basis(self):
480
263
basis_tree = self.revision_tree(self.this_tree.last_revision())
481
264
except errors.NoSuchRevision:
482
265
basis_tree = self.this_tree.basis_tree()
483
if not self.this_tree.has_changes(basis_tree):
266
changes = self.this_tree.changes_from(basis_tree)
267
if not changes.has_changed():
484
268
self.this_rev_id = self.this_basis
486
270
def set_interesting_files(self, file_list):
487
271
self.interesting_files = file_list
489
273
def set_pending(self):
490
if (not self.base_is_ancestor or not self.base_is_other_ancestor
491
or self.other_rev_id is None):
274
if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
493
276
self._add_parent()
495
278
def _add_parent(self):
496
279
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
497
280
new_parent_trees = []
498
operation = OperationWithCleanups(self.this_tree.set_parent_trees)
499
281
for revision_id in new_parents:
501
283
tree = self.revision_tree(revision_id)
562
349
target.fetch(source, revision_id)
564
351
def find_base(self):
565
revisions = [_mod_revision.ensure_null(self.this_basis),
566
_mod_revision.ensure_null(self.other_basis)]
567
if _mod_revision.NULL_REVISION in revisions:
568
self.base_rev_id = _mod_revision.NULL_REVISION
569
self.base_tree = self.revision_tree(self.base_rev_id)
570
self._is_criss_cross = False
352
revisions = [ensure_null(self.this_basis),
353
ensure_null(self.other_basis)]
354
if NULL_REVISION in revisions:
355
self.base_rev_id = NULL_REVISION
572
lcas = self.revision_graph.find_lca(revisions[0], revisions[1])
573
self._is_criss_cross = False
575
self.base_rev_id = _mod_revision.NULL_REVISION
577
self.base_rev_id = list(lcas)[0]
578
else: # len(lcas) > 1
580
# find_unique_lca can only handle 2 nodes, so we have to
581
# start back at the beginning. It is a shame to traverse
582
# the graph again, but better than re-implementing
584
self.base_rev_id = self.revision_graph.find_unique_lca(
585
revisions[0], revisions[1])
587
self.base_rev_id = self.revision_graph.find_unique_lca(
589
self._is_criss_cross = True
590
if self.base_rev_id == _mod_revision.NULL_REVISION:
591
raise errors.UnrelatedBranches()
592
if self._is_criss_cross:
593
trace.warning('Warning: criss-cross merge encountered. See bzr'
594
' help criss-cross.')
595
trace.mutter('Criss-cross lcas: %r' % lcas)
596
interesting_revision_ids = [self.base_rev_id]
597
interesting_revision_ids.extend(lcas)
598
interesting_trees = dict((t.get_revision_id(), t)
599
for t in self.this_branch.repository.revision_trees(
600
interesting_revision_ids))
601
self._cached_trees.update(interesting_trees)
602
self.base_tree = interesting_trees.pop(self.base_rev_id)
603
sorted_lca_keys = self.revision_graph.find_merge_order(
605
self._lca_trees = [interesting_trees[key]
606
for key in sorted_lca_keys]
608
self.base_tree = self.revision_tree(self.base_rev_id)
357
self.base_rev_id, steps = self.revision_graph.find_unique_lca(
358
revisions[0], revisions[1], count_steps=True)
359
if self.base_rev_id == NULL_REVISION:
360
raise UnrelatedBranches()
362
warning('Warning: criss-cross merge encountered. See bzr'
363
' help criss-cross.')
364
self.base_tree = self.revision_tree(self.base_rev_id)
609
365
self.base_is_ancestor = True
610
366
self.base_is_other_ancestor = True
611
trace.mutter('Base revid: %r' % self.base_rev_id)
613
368
def set_base(self, base_revision):
614
369
"""Set the base revision to use for the merge.
616
371
:param base_revision: A 2-list containing a path and revision number.
618
trace.mutter("doing merge() with no base_revision specified")
373
mutter("doing merge() with no base_revision specified")
619
374
if base_revision == [None, None]:
634
389
'other_tree': self.other_tree,
635
390
'interesting_ids': self.interesting_ids,
636
391
'interesting_files': self.interesting_files,
637
'this_branch': self.this_branch,
638
393
'do_merge': False}
639
394
if self.merge_type.requires_base:
640
395
kwargs['base_tree'] = self.base_tree
641
396
if self.merge_type.supports_reprocess:
642
397
kwargs['reprocess'] = self.reprocess
643
398
elif self.reprocess:
644
raise errors.BzrError(
645
"Conflict reduction is not supported for merge"
646
" type %s." % self.merge_type)
399
raise BzrError("Conflict reduction is not supported for merge"
400
" type %s." % self.merge_type)
647
401
if self.merge_type.supports_show_base:
648
402
kwargs['show_base'] = self.show_base
649
403
elif self.show_base:
650
raise errors.BzrError("Showing base is not supported for this"
651
" merge type. %s" % self.merge_type)
404
raise BzrError("Showing base is not supported for this"
405
" merge type. %s" % self.merge_type)
652
406
if (not getattr(self.merge_type, 'supports_reverse_cherrypick', True)
653
407
and not self.base_is_other_ancestor):
654
408
raise errors.CannotReverseCherrypick()
655
409
if self.merge_type.supports_cherrypick:
656
410
kwargs['cherrypick'] = (not self.base_is_ancestor or
657
411
not self.base_is_other_ancestor)
658
if self._is_criss_cross and getattr(self.merge_type,
659
'supports_lca_trees', False):
660
kwargs['lca_trees'] = self._lca_trees
661
return self.merge_type(pb=None,
412
return self.merge_type(pb=self._pb,
662
413
change_reporter=self.change_reporter,
665
def _do_merge_to(self):
666
merge = self.make_merger()
667
if self.other_branch is not None:
668
self.other_branch.update_references(self.this_branch)
416
def _do_merge_to(self, merge):
670
418
if self.recurse == 'down':
671
419
for relpath, file_id in self.this_tree.iter_references():
732
469
supports_cherrypick = True
733
470
supports_reverse_cherrypick = True
734
471
winner_idx = {"this": 2, "other": 1, "conflict": 1}
735
supports_lca_trees = True
737
def __init__(self, working_tree, this_tree, base_tree, other_tree,
473
def __init__(self, working_tree, this_tree, base_tree, other_tree,
738
474
interesting_ids=None, reprocess=False, show_base=False,
739
pb=None, pp=None, change_reporter=None,
475
pb=DummyProgress(), pp=None, change_reporter=None,
740
476
interesting_files=None, do_merge=True,
741
cherrypick=False, lca_trees=None, this_branch=None):
742
478
"""Initialize the merger object and perform the merge.
744
480
:param working_tree: The working tree to apply the merge to
745
481
:param this_tree: The local tree in the merge operation
746
482
:param base_tree: The common tree in the merge operation
747
:param other_tree: The other tree to merge changes from
748
:param this_branch: The branch associated with this_tree. Defaults to
749
this_tree.branch if not supplied.
483
:param other_tree: The other other tree to merge changes from
750
484
:param interesting_ids: The file_ids of files that should be
751
485
participate in the merge. May not be combined with
752
486
interesting_files.
753
487
:param: reprocess If True, perform conflict-reduction processing.
754
488
:param show_base: If True, show the base revision in text conflicts.
755
489
(incompatible with reprocess)
490
:param pb: A Progress bar
757
491
:param pp: A ProgressPhase object
758
492
:param change_reporter: An object that should report changes made
759
493
:param interesting_files: The tree-relative paths of files that should
762
496
be combined with interesting_ids. If neither interesting_files nor
763
497
interesting_ids is specified, all files may participate in the
765
:param lca_trees: Can be set to a dictionary of {revision_id:rev_tree}
766
if the ancestry was found to include a criss-cross merge.
767
Otherwise should be None.
769
500
object.__init__(self)
770
501
if interesting_files is not None and interesting_ids is not None:
771
502
raise ValueError(
772
503
'specify either interesting_ids or interesting_files')
773
if this_branch is None:
774
this_branch = this_tree.branch
775
504
self.interesting_ids = interesting_ids
776
505
self.interesting_files = interesting_files
777
506
self.this_tree = working_tree
778
507
self.base_tree = base_tree
779
508
self.other_tree = other_tree
780
self.this_branch = this_branch
781
509
self._raw_conflicts = []
782
510
self.cooked_conflicts = []
783
511
self.reprocess = reprocess
784
512
self.show_base = show_base
785
self._lca_trees = lca_trees
786
# Uncommenting this will change the default algorithm to always use
787
# _entries_lca. This can be useful for running the test suite and
788
# making sure we haven't missed any corner cases.
789
# if lca_trees is None:
790
# self._lca_trees = [self.base_tree]
791
515
self.change_reporter = change_reporter
792
516
self.cherrypick = cherrypick
518
self.pp = ProgressPhase("Merge phase", 3, self.pb)
796
warnings.warn("pp argument to Merge3Merger is deprecated")
798
warnings.warn("pb argument to Merge3Merger is deprecated")
800
522
def do_merge(self):
801
operation = OperationWithCleanups(self._do_merge)
802
523
self.this_tree.lock_tree_write()
803
operation.add_cleanup(self.this_tree.unlock)
804
524
self.base_tree.lock_read()
805
operation.add_cleanup(self.base_tree.unlock)
806
525
self.other_tree.lock_read()
807
operation.add_cleanup(self.other_tree.unlock)
810
def _do_merge(self, operation):
811
self.tt = transform.TreeTransform(self.this_tree, None)
812
operation.add_cleanup(self.tt.finalize)
813
self._compute_transform()
814
results = self.tt.apply(no_conflicts=True)
815
self.write_modified(results)
526
self.tt = TreeTransform(self.this_tree, self.pb)
817
self.this_tree.add_conflicts(self.cooked_conflicts)
818
except errors.UnsupportedOperation:
529
self._compute_transform()
531
results = self.tt.apply(no_conflicts=True)
532
self.write_modified(results)
534
self.this_tree.add_conflicts(self.cooked_conflicts)
535
except UnsupportedOperation:
539
self.other_tree.unlock()
540
self.base_tree.unlock()
541
self.this_tree.unlock()
821
544
def make_preview_transform(self):
822
operation = OperationWithCleanups(self._make_preview_transform)
823
545
self.base_tree.lock_read()
824
operation.add_cleanup(self.base_tree.unlock)
825
546
self.other_tree.lock_read()
826
operation.add_cleanup(self.other_tree.unlock)
827
return operation.run_simple()
829
def _make_preview_transform(self):
830
self.tt = transform.TransformPreview(self.this_tree)
831
self._compute_transform()
547
self.tt = TransformPreview(self.this_tree)
550
self._compute_transform()
553
self.other_tree.unlock()
554
self.base_tree.unlock()
834
558
def _compute_transform(self):
835
if self._lca_trees is None:
836
entries = self._entries3()
837
resolver = self._three_way
839
entries = self._entries_lca()
840
resolver = self._lca_multi_way
559
entries = self._entries3()
841
560
child_pb = ui.ui_factory.nested_progress_bar()
843
factories = Merger.hooks['merge_file_content']
844
hooks = [factory(self) for factory in factories] + [self]
845
self.active_hooks = [hook for hook in hooks if hook is not None]
846
562
for num, (file_id, changed, parents3, names3,
847
563
executable3) in enumerate(entries):
848
564
child_pb.update('Preparing file merge', num, len(entries))
849
self._merge_names(file_id, parents3, names3, resolver=resolver)
565
self._merge_names(file_id, parents3, names3)
851
file_status = self._do_merge_contents(file_id)
567
file_status = self.merge_contents(file_id)
853
569
file_status = 'unmodified'
854
570
self._merge_executable(file_id,
855
executable3, file_status, resolver=resolver)
571
executable3, file_status)
857
573
child_pb.finished()
859
576
child_pb = ui.ui_factory.nested_progress_bar()
861
fs_conflicts = transform.resolve_conflicts(self.tt, child_pb,
862
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
578
fs_conflicts = resolve_conflicts(self.tt, child_pb,
579
lambda t, c: conflict_pass(t, c, self.other_tree))
864
581
child_pb.finished()
865
582
if self.change_reporter is not None:
906
620
result.append((file_id, changed, parents3, names3, executable3))
909
def _entries_lca(self):
910
"""Gather data about files modified between multiple trees.
912
This compares OTHER versus all LCA trees, and for interesting entries,
913
it then compares with THIS and BASE.
915
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
916
:return: [(file_id, changed, parents, names, executable)]
917
file_id Simple file_id of the entry
918
changed Boolean, True if the kind or contents changed
920
parents ((base, [parent_id, in, lcas]), parent_id_other,
922
names ((base, [name, in, lcas]), name_in_other, name_in_this)
923
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
925
if self.interesting_files is not None:
926
lookup_trees = [self.this_tree, self.base_tree]
927
lookup_trees.extend(self._lca_trees)
928
# I think we should include the lca trees as well
929
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
932
interesting_ids = self.interesting_ids
934
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
936
base_inventory = self.base_tree.inventory
937
this_inventory = self.this_tree.inventory
938
for path, file_id, other_ie, lca_values in walker.iter_all():
939
# Is this modified at all from any of the other trees?
941
other_ie = _none_entry
942
if interesting_ids is not None and file_id not in interesting_ids:
945
# If other_revision is found in any of the lcas, that means this
946
# node is uninteresting. This is because when merging, if there are
947
# multiple heads(), we have to create a new node. So if we didn't,
948
# we know that the ancestry is linear, and that OTHER did not
950
# See doc/developers/lca_merge_resolution.txt for details
951
other_revision = other_ie.revision
952
if other_revision is not None:
953
# We can't use this shortcut when other_revision is None,
954
# because it may be None because things are WorkingTrees, and
955
# not because it is *actually* None.
956
is_unmodified = False
957
for lca_path, ie in lca_values:
958
if ie is not None and ie.revision == other_revision:
965
for lca_path, lca_ie in lca_values:
967
lca_entries.append(_none_entry)
969
lca_entries.append(lca_ie)
971
if file_id in base_inventory:
972
base_ie = base_inventory[file_id]
974
base_ie = _none_entry
976
if file_id in this_inventory:
977
this_ie = this_inventory[file_id]
979
this_ie = _none_entry
985
for lca_ie in lca_entries:
986
lca_kinds.append(lca_ie.kind)
987
lca_parent_ids.append(lca_ie.parent_id)
988
lca_names.append(lca_ie.name)
989
lca_executable.append(lca_ie.executable)
991
kind_winner = self._lca_multi_way(
992
(base_ie.kind, lca_kinds),
993
other_ie.kind, this_ie.kind)
994
parent_id_winner = self._lca_multi_way(
995
(base_ie.parent_id, lca_parent_ids),
996
other_ie.parent_id, this_ie.parent_id)
997
name_winner = self._lca_multi_way(
998
(base_ie.name, lca_names),
999
other_ie.name, this_ie.name)
1001
content_changed = True
1002
if kind_winner == 'this':
1003
# No kind change in OTHER, see if there are *any* changes
1004
if other_ie.kind == 'directory':
1005
if parent_id_winner == 'this' and name_winner == 'this':
1006
# No change for this directory in OTHER, skip
1008
content_changed = False
1009
elif other_ie.kind is None or other_ie.kind == 'file':
1010
def get_sha1(ie, tree):
1011
if ie.kind != 'file':
1013
return tree.get_file_sha1(file_id)
1014
base_sha1 = get_sha1(base_ie, self.base_tree)
1015
lca_sha1s = [get_sha1(ie, tree) for ie, tree
1016
in zip(lca_entries, self._lca_trees)]
1017
this_sha1 = get_sha1(this_ie, self.this_tree)
1018
other_sha1 = get_sha1(other_ie, self.other_tree)
1019
sha1_winner = self._lca_multi_way(
1020
(base_sha1, lca_sha1s), other_sha1, this_sha1,
1021
allow_overriding_lca=False)
1022
exec_winner = self._lca_multi_way(
1023
(base_ie.executable, lca_executable),
1024
other_ie.executable, this_ie.executable)
1025
if (parent_id_winner == 'this' and name_winner == 'this'
1026
and sha1_winner == 'this' and exec_winner == 'this'):
1027
# No kind, parent, name, exec, or content change for
1028
# OTHER, so this node is not considered interesting
1030
if sha1_winner == 'this':
1031
content_changed = False
1032
elif other_ie.kind == 'symlink':
1033
def get_target(ie, tree):
1034
if ie.kind != 'symlink':
1036
return tree.get_symlink_target(file_id)
1037
base_target = get_target(base_ie, self.base_tree)
1038
lca_targets = [get_target(ie, tree) for ie, tree
1039
in zip(lca_entries, self._lca_trees)]
1040
this_target = get_target(this_ie, self.this_tree)
1041
other_target = get_target(other_ie, self.other_tree)
1042
target_winner = self._lca_multi_way(
1043
(base_target, lca_targets),
1044
other_target, this_target)
1045
if (parent_id_winner == 'this' and name_winner == 'this'
1046
and target_winner == 'this'):
1047
# No kind, parent, name, or symlink target change
1050
if target_winner == 'this':
1051
content_changed = False
1052
elif other_ie.kind == 'tree-reference':
1053
# The 'changed' information seems to be handled at a higher
1054
# level. At least, _entries3 returns False for content
1055
# changed, even when at a new revision_id.
1056
content_changed = False
1057
if (parent_id_winner == 'this' and name_winner == 'this'):
1058
# Nothing interesting
1061
raise AssertionError('unhandled kind: %s' % other_ie.kind)
1063
# If we have gotten this far, that means something has changed
1064
result.append((file_id, content_changed,
1065
((base_ie.parent_id, lca_parent_ids),
1066
other_ie.parent_id, this_ie.parent_id),
1067
((base_ie.name, lca_names),
1068
other_ie.name, this_ie.name),
1069
((base_ie.executable, lca_executable),
1070
other_ie.executable, this_ie.executable)
1075
623
def fix_root(self):
1077
625
self.tt.final_kind(self.tt.root)
1078
except errors.NoSuchFile:
1079
627
self.tt.cancel_deletion(self.tt.root)
1080
628
if self.tt.final_file_id(self.tt.root) is None:
1081
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
629
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
631
if self.other_tree.inventory.root is None:
1083
633
other_root_file_id = self.other_tree.get_root_id()
1084
if other_root_file_id is None:
1086
634
other_root = self.tt.trans_id_file_id(other_root_file_id)
1087
635
if other_root == self.tt.root:
638
self.tt.final_kind(other_root)
1089
641
if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1090
# the other tree's root is a non-root in the current tree (as when
1091
# a previously unrelated branch is merged into another)
642
# the other tree's root is a non-root in the current tree
1094
self.tt.final_kind(other_root)
1095
other_root_is_present = True
1096
except errors.NoSuchFile:
1097
# other_root doesn't have a physical representation. We still need
1098
# to move any references to the actual root of the tree.
1099
other_root_is_present = False
1100
# 'other_tree.inventory.root' is not present in this tree. We are
1101
# calling adjust_path for children which *want* to be present with a
1102
# correct place to go.
1103
for thing, child in self.other_tree.inventory.root.children.iteritems():
644
self.reparent_children(self.other_tree.inventory.root, self.tt.root)
645
self.tt.cancel_creation(other_root)
646
self.tt.cancel_versioning(other_root)
648
def reparent_children(self, ie, target):
649
for thing, child in ie.children.iteritems():
1104
650
trans_id = self.tt.trans_id_file_id(child.file_id)
1105
if not other_root_is_present:
1106
# FIXME: Make final_kind returns None instead of raising
1107
# NoSuchFile to avoid the ugly construct below -- vila 20100402
1109
self.tt.final_kind(trans_id)
1110
# The item exist in the final tree and has a defined place
1113
except errors.NoSuchFile, e:
1115
# Move the item into the root
1116
self.tt.adjust_path(self.tt.final_name(trans_id),
1117
self.tt.root, trans_id)
1118
if other_root_is_present:
1119
self.tt.cancel_creation(other_root)
1120
self.tt.cancel_versioning(other_root)
651
self.tt.adjust_path(self.tt.final_name(trans_id), target, trans_id)
1122
653
def write_modified(self, results):
1123
654
modified_hashes = {}
1165
696
def kind(tree, file_id):
1166
697
"""Determine the kind of a file-id (used as a key method)."""
1167
if not tree.has_id(file_id):
698
if file_id not in tree:
1169
700
return tree.kind(file_id)
1172
703
def _three_way(base, other, this):
704
#if base == other, either they all agree, or only THIS has changed.
1173
705
if base == other:
1174
# if 'base == other', either they all agree, or only 'this' has
1177
707
elif this not in (base, other):
1178
# 'this' is neither 'base' nor 'other', so both sides changed
1179
708
return 'conflict'
709
# "Ambiguous clean merge" -- both sides have made the same change.
1180
710
elif this == other:
1181
# "Ambiguous clean merge" -- both sides have made the same change.
712
# this == base: only other has changed.
1184
# this == base: only other has changed.
1188
def _lca_multi_way(bases, other, this, allow_overriding_lca=True):
1189
"""Consider LCAs when determining whether a change has occurred.
1191
If LCAS are all identical, this is the same as a _three_way comparison.
1193
:param bases: value in (BASE, [LCAS])
1194
:param other: value in OTHER
1195
:param this: value in THIS
1196
:param allow_overriding_lca: If there is more than one unique lca
1197
value, allow OTHER to override THIS if it has a new value, and
1198
THIS only has an lca value, or vice versa. This is appropriate for
1199
truly scalar values, not as much for non-scalars.
1200
:return: 'this', 'other', or 'conflict' depending on whether an entry
1203
# See doc/developers/lca_tree_merging.txt for details about this
1206
# Either Ambiguously clean, or nothing was actually changed. We
1209
base_val, lca_vals = bases
1210
# Remove 'base_val' from the lca_vals, because it is not interesting
1211
filtered_lca_vals = [lca_val for lca_val in lca_vals
1212
if lca_val != base_val]
1213
if len(filtered_lca_vals) == 0:
1214
return Merge3Merger._three_way(base_val, other, this)
1216
unique_lca_vals = set(filtered_lca_vals)
1217
if len(unique_lca_vals) == 1:
1218
return Merge3Merger._three_way(unique_lca_vals.pop(), other, this)
1220
if allow_overriding_lca:
1221
if other in unique_lca_vals:
1222
if this in unique_lca_vals:
1223
# Each side picked a different lca, conflict
1226
# This has a value which supersedes both lca values, and
1227
# other only has an lca value
1229
elif this in unique_lca_vals:
1230
# OTHER has a value which supersedes both lca values, and this
1231
# only has an lca value
1234
# At this point, the lcas disagree, and the tip disagree
1238
@deprecated_method(deprecated_in((2, 2, 0)))
1239
717
def scalar_three_way(this_tree, base_tree, other_tree, file_id, key):
1240
718
"""Do a three-way test on a scalar.
1241
719
Return "this", "other" or "conflict", depending whether a value wins.
1291
768
parent_id_winner = "other"
1292
769
if name_winner == "this" and parent_id_winner == "this":
1294
if name_winner == 'conflict' or parent_id_winner == 'conflict':
1295
# Creating helpers (.OTHER or .THIS) here cause problems down the
1296
# road if a ContentConflict needs to be created so we should not do
1298
trans_id = self.tt.trans_id_file_id(file_id)
1299
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1300
this_parent, this_name,
1301
other_parent, other_name))
771
if name_winner == "conflict":
772
trans_id = self.tt.trans_id_file_id(file_id)
773
self._raw_conflicts.append(('name conflict', trans_id,
774
this_name, other_name))
775
if parent_id_winner == "conflict":
776
trans_id = self.tt.trans_id_file_id(file_id)
777
self._raw_conflicts.append(('parent conflict', trans_id,
778
this_parent, other_parent))
1302
779
if other_name is None:
1303
# it doesn't matter whether the result was 'other' or
780
# it doesn't matter whether the result was 'other' or
1304
781
# 'conflict'-- if there's no 'other', we leave it alone.
783
# if we get here, name_winner and parent_winner are set to safe values.
784
trans_id = self.tt.trans_id_file_id(file_id)
1306
785
parent_id = parents[self.winner_idx[parent_id_winner]]
1307
786
if parent_id is not None:
1308
# if we get here, name_winner and parent_winner are set to safe
787
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1310
788
self.tt.adjust_path(names[self.winner_idx[name_winner]],
1311
self.tt.trans_id_file_id(parent_id),
1312
self.tt.trans_id_file_id(file_id))
789
parent_trans_id, trans_id)
1314
def _do_merge_contents(self, file_id):
1315
"""Performs a merge on file_id contents."""
791
def merge_contents(self, file_id):
792
"""Performa a merge on file_id contents."""
1316
793
def contents_pair(tree):
1317
794
if file_id not in tree:
1318
795
return (None, None)
1326
803
return kind, contents
805
def contents_conflict():
806
trans_id = self.tt.trans_id_file_id(file_id)
807
name = self.tt.final_name(trans_id)
808
parent_id = self.tt.final_parent(trans_id)
809
if file_id in self.this_tree.inventory:
810
self.tt.unversion_file(trans_id)
811
if file_id in self.this_tree:
812
self.tt.delete_contents(trans_id)
813
file_group = self._dump_conflicts(name, parent_id, file_id,
815
self._raw_conflicts.append(('contents conflict', file_group))
1328
817
# See SPOT run. run, SPOT, run.
1329
818
# So we're not QUITE repeating ourselves; we do tricky things with
1331
820
base_pair = contents_pair(self.base_tree)
1332
821
other_pair = contents_pair(self.other_tree)
1334
this_pair = contents_pair(self.this_tree)
1335
lca_pairs = [contents_pair(tree) for tree in self._lca_trees]
1336
winner = self._lca_multi_way((base_pair, lca_pairs), other_pair,
1337
this_pair, allow_overriding_lca=False)
1339
if base_pair == other_pair:
1342
# We delayed evaluating this_pair as long as we can to avoid
1343
# unnecessary sha1 calculation
1344
this_pair = contents_pair(self.this_tree)
1345
winner = self._three_way(base_pair, other_pair, this_pair)
1346
if winner == 'this':
1347
# No interesting changes introduced by OTHER
1349
# We have a hypothetical conflict, but if we have files, then we
1350
# can try to merge the content
1351
trans_id = self.tt.trans_id_file_id(file_id)
1352
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1353
other_pair[0], winner)
1354
hooks = self.active_hooks
1355
hook_status = 'not_applicable'
1357
hook_status, lines = hook.merge_contents(params)
1358
if hook_status != 'not_applicable':
1359
# Don't try any more hooks, this one applies.
1362
if hook_status == 'not_applicable':
1363
# This is a contents conflict, because none of the available
1364
# functions could merge it.
1366
name = self.tt.final_name(trans_id)
1367
parent_id = self.tt.final_parent(trans_id)
1368
if self.this_tree.has_id(file_id):
1369
self.tt.unversion_file(trans_id)
1370
file_group = self._dump_conflicts(name, parent_id, file_id,
1372
self._raw_conflicts.append(('contents conflict', file_group))
1373
elif hook_status == 'success':
1374
self.tt.create_file(lines, trans_id)
1375
elif hook_status == 'conflicted':
1376
# XXX: perhaps the hook should be able to provide
1377
# the BASE/THIS/OTHER files?
1378
self.tt.create_file(lines, trans_id)
1379
self._raw_conflicts.append(('text conflict', trans_id))
1380
name = self.tt.final_name(trans_id)
1381
parent_id = self.tt.final_parent(trans_id)
1382
self._dump_conflicts(name, parent_id, file_id)
1383
elif hook_status == 'delete':
1384
self.tt.unversion_file(trans_id)
1386
elif hook_status == 'done':
1387
# The hook function did whatever it needs to do directly, no
1388
# further action needed here.
1391
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1392
if not self.this_tree.has_id(file_id) and result == "modified":
1393
self.tt.version_file(file_id, trans_id)
1394
# The merge has been performed, so the old contents should not be
1397
self.tt.delete_contents(trans_id)
1398
except errors.NoSuchFile:
1402
def _default_other_winner_merge(self, merge_hook_params):
1403
"""Replace this contents with other."""
1404
file_id = merge_hook_params.file_id
1405
trans_id = merge_hook_params.trans_id
1406
file_in_this = self.this_tree.has_id(file_id)
1407
if self.other_tree.has_id(file_id):
1408
# OTHER changed the file
1410
if wt.supports_content_filtering():
1411
# We get the path from the working tree if it exists.
1412
# That fails though when OTHER is adding a file, so
1413
# we fall back to the other tree to find the path if
1414
# it doesn't exist locally.
1416
filter_tree_path = wt.id2path(file_id)
1417
except errors.NoSuchId:
1418
filter_tree_path = self.other_tree.id2path(file_id)
1420
# Skip the id2path lookup for older formats
1421
filter_tree_path = None
1422
transform.create_from_tree(self.tt, trans_id,
1423
self.other_tree, file_id,
1424
filter_tree_path=filter_tree_path)
1427
# OTHER deleted the file
1428
return 'delete', None
1430
raise AssertionError(
1431
'winner is OTHER, but file_id %r not in THIS or OTHER tree'
1434
def merge_contents(self, merge_hook_params):
1435
"""Fallback merge logic after user installed hooks."""
1436
# This function is used in merge hooks as the fallback instance.
1437
# Perhaps making this function and the functions it calls be a
1438
# a separate class would be better.
1439
if merge_hook_params.winner == 'other':
1440
# OTHER is a straight winner, so replace this contents with other
1441
return self._default_other_winner_merge(merge_hook_params)
1442
elif merge_hook_params.is_file_merge():
1443
# THIS and OTHER are both files, so text merge. Either
1444
# BASE is a file, or both converted to files, so at least we
1445
# have agreement that output should be a file.
1447
self.text_merge(merge_hook_params.file_id,
1448
merge_hook_params.trans_id)
1449
except errors.BinaryFile:
1450
return 'not_applicable', None
1453
return 'not_applicable', None
822
if base_pair == other_pair:
823
# OTHER introduced no changes
825
this_pair = contents_pair(self.this_tree)
826
if this_pair == other_pair:
827
# THIS and OTHER introduced the same changes
830
trans_id = self.tt.trans_id_file_id(file_id)
831
if this_pair == base_pair:
832
# only OTHER introduced changes
833
if file_id in self.this_tree:
834
# Remove any existing contents
835
self.tt.delete_contents(trans_id)
836
if file_id in self.other_tree:
837
# OTHER changed the file
838
create_by_entry(self.tt,
839
self.other_tree.inventory[file_id],
840
self.other_tree, trans_id)
841
if file_id not in self.this_tree.inventory:
842
self.tt.version_file(file_id, trans_id)
844
elif file_id in self.this_tree.inventory:
845
# OTHER deleted the file
846
self.tt.unversion_file(trans_id)
848
#BOTH THIS and OTHER introduced changes; scalar conflict
849
elif this_pair[0] == "file" and other_pair[0] == "file":
850
# THIS and OTHER are both files, so text merge. Either
851
# BASE is a file, or both converted to files, so at least we
852
# have agreement that output should be a file.
854
self.text_merge(file_id, trans_id)
856
return contents_conflict()
857
if file_id not in self.this_tree.inventory:
858
self.tt.version_file(file_id, trans_id)
860
self.tt.tree_kind(trans_id)
861
self.tt.delete_contents(trans_id)
866
# Scalar conflict, can't text merge. Dump conflicts
867
return contents_conflict()
1455
869
def get_lines(self, tree, file_id):
1456
870
"""Return the lines in a file, or an empty list."""
1457
if tree.has_id(file_id):
1458
872
return tree.get_file(file_id).readlines()
1511
925
determined automatically. If set_version is true, the .OTHER, .THIS
1512
926
or .BASE (in that order) will be created as versioned files.
1514
data = [('OTHER', self.other_tree, other_lines),
928
data = [('OTHER', self.other_tree, other_lines),
1515
929
('THIS', self.this_tree, this_lines)]
1517
931
data.append(('BASE', self.base_tree, base_lines))
1519
# We need to use the actual path in the working tree of the file here,
1520
# ignoring the conflict suffixes
1522
if wt.supports_content_filtering():
1524
filter_tree_path = wt.id2path(file_id)
1525
except errors.NoSuchId:
1526
# file has been deleted
1527
filter_tree_path = None
1529
# Skip the id2path lookup for older formats
1530
filter_tree_path = None
1532
932
versioned = False
1534
934
for suffix, tree, lines in data:
1535
if tree.has_id(file_id):
1536
936
trans_id = self._conflict_file(name, parent_id, tree, file_id,
1537
suffix, lines, filter_tree_path)
1538
938
file_group.append(trans_id)
1539
939
if set_version and not versioned:
1540
940
self.tt.version_file(file_id, trans_id)
1541
941
versioned = True
1542
942
return file_group
1544
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1545
lines=None, filter_tree_path=None):
944
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1546
946
"""Emit a single conflict file."""
1547
947
name = name + '.' + suffix
1548
948
trans_id = self.tt.create_path(name, parent_id)
1549
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
949
entry = tree.inventory[file_id]
950
create_by_entry(self.tt, entry, tree, trans_id, lines)
1553
953
def merge_executable(self, file_id, file_status):
1554
954
"""Perform a merge on the execute bit."""
1555
955
executable = [self.executable(t, file_id) for t in (self.base_tree,
1556
956
self.other_tree, self.this_tree)]
1557
self._merge_executable(file_id, executable, file_status,
1558
resolver=self._three_way)
957
self._merge_executable(file_id, executable, file_status)
1560
def _merge_executable(self, file_id, executable, file_status,
959
def _merge_executable(self, file_id, executable, file_status):
1562
960
"""Perform a merge on the execute bit."""
1563
961
base_executable, other_executable, this_executable = executable
1564
962
if file_status == "deleted":
1566
winner = resolver(*executable)
964
winner = self._three_way(*executable)
1567
965
if winner == "conflict":
1568
966
# There must be a None in here, if we have a conflict, but we
1569
967
# need executability since file status was not deleted.
1629
1015
if path.endswith(suffix):
1630
1016
path = path[:-len(suffix)]
1632
c = _mod_conflicts.Conflict.factory(conflict_type,
1633
path=path, file_id=file_id)
1634
elif conflict_type == 'text conflict':
1018
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
1019
self.cooked_conflicts.append(c)
1020
if conflict_type == 'text conflict':
1635
1021
trans_id = conflict[1]
1636
1022
path = fp.get_path(trans_id)
1637
1023
file_id = self.tt.final_file_id(trans_id)
1638
c = _mod_conflicts.Conflict.factory(conflict_type,
1639
path=path, file_id=file_id)
1024
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
1025
self.cooked_conflicts.append(c)
1027
for trans_id, conflicts in name_conflicts.iteritems():
1029
this_parent, other_parent = conflicts['parent conflict']
1030
if this_parent == other_parent:
1031
raise AssertionError()
1033
this_parent = other_parent = \
1034
self.tt.final_file_id(self.tt.final_parent(trans_id))
1036
this_name, other_name = conflicts['name conflict']
1037
if this_name == other_name:
1038
raise AssertionError()
1040
this_name = other_name = self.tt.final_name(trans_id)
1041
other_path = fp.get_path(trans_id)
1042
if this_parent is not None and this_name is not None:
1043
this_parent_path = \
1044
fp.get_path(self.tt.trans_id_file_id(this_parent))
1045
this_path = pathjoin(this_parent_path, this_name)
1641
raise AssertionError('bad conflict type: %r' % (conflict,))
1047
this_path = "<deleted>"
1048
file_id = self.tt.final_file_id(trans_id)
1049
c = Conflict.factory('path conflict', path=this_path,
1050
conflict_path=other_path, file_id=file_id)
1642
1051
self.cooked_conflicts.append(c)
1643
self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
1052
self.cooked_conflicts.sort(key=Conflict.sort_key)
1646
1055
class WeaveMerger(Merge3Merger):
1650
1059
supports_reverse_cherrypick = False
1651
1060
history_based = True
1653
def _generate_merge_plan(self, file_id, base):
1654
return self.this_tree.plan_file_merge(file_id, self.other_tree,
1062
def _merged_lines(self, file_id):
1063
"""Generate the merged lines.
1064
There is no distinction between lines that are meant to contain <<<<<<<
1068
base = self.base_tree
1071
plan = self.this_tree.plan_file_merge(file_id, self.other_tree,
1657
def _merged_lines(self, file_id):
1658
"""Generate the merged lines.
1659
There is no distinction between lines that are meant to contain <<<<<<<
1663
base = self.base_tree
1666
plan = self._generate_merge_plan(file_id, base)
1667
1073
if 'merge' in debug.debug_flags:
1668
1074
plan = list(plan)
1669
1075
trans_id = self.tt.trans_id_file_id(file_id)
1670
1076
name = self.tt.final_name(trans_id) + '.plan'
1671
contents = ('%11s|%s' % l for l in plan)
1077
contents = ('%10s|%s' % l for l in plan)
1672
1078
self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
1673
textmerge = versionedfile.PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1674
'>>>>>>> MERGE-SOURCE\n')
1675
lines, conflicts = textmerge.merge_lines(self.reprocess)
1677
base_lines = textmerge.base_from_plan()
1680
return lines, base_lines
1079
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1080
'>>>>>>> MERGE-SOURCE\n')
1081
return textmerge.merge_lines(self.reprocess)
1682
1083
def text_merge(self, file_id, trans_id):
1683
1084
"""Perform a (weave) text merge for a given file and file-id.
1684
1085
If conflicts are encountered, .THIS and .OTHER files will be emitted,
1685
1086
and a conflict will be noted.
1687
lines, base_lines = self._merged_lines(file_id)
1088
lines, conflicts = self._merged_lines(file_id)
1688
1089
lines = list(lines)
1689
# Note we're checking whether the OUTPUT is binary in this case,
1090
# Note we're checking whether the OUTPUT is binary in this case,
1690
1091
# because we don't want to get into weave merge guts.
1691
textfile.check_text_lines(lines)
1092
check_text_lines(lines)
1692
1093
self.tt.create_file(lines, trans_id)
1693
if base_lines is not None:
1695
1095
self._raw_conflicts.append(('text conflict', trans_id))
1696
1096
name = self.tt.final_name(trans_id)
1697
1097
parent_id = self.tt.final_parent(trans_id)
1698
file_group = self._dump_conflicts(name, parent_id, file_id,
1700
base_lines=base_lines)
1098
file_group = self._dump_conflicts(name, parent_id, file_id,
1701
1100
file_group.append(trans_id)
1704
1103
class LCAMerger(WeaveMerger):
1706
def _generate_merge_plan(self, file_id, base):
1707
return self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1105
def _merged_lines(self, file_id):
1106
"""Generate the merged lines.
1107
There is no distinction between lines that are meant to contain <<<<<<<
1111
base = self.base_tree
1114
plan = self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1116
if 'merge' in debug.debug_flags:
1118
trans_id = self.tt.trans_id_file_id(file_id)
1119
name = self.tt.final_name(trans_id) + '.plan'
1120
contents = ('%10s|%s' % l for l in plan)
1121
self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
1122
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1123
'>>>>>>> MERGE-SOURCE\n')
1124
return textmerge.merge_lines(self.reprocess)
1710
1127
class Diff3Merger(Merge3Merger):
1711
1128
"""Three-way merger using external diff3 for text merging"""
1713
1130
def dump_file(self, temp_dir, name, tree, file_id):
1714
out_path = osutils.pathjoin(temp_dir, name)
1131
out_path = pathjoin(temp_dir, name)
1715
1132
out_file = open(out_path, "wb")
1717
1134
in_file = tree.get_file(file_id)
added
removed
bzrlib/merge.py
