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 (
34
from bzrlib.branch import Branch
35
from bzrlib.conflicts import ConflictList, Conflict
36
from bzrlib.errors import (BzrCommandError,
46
WorkingTreeNotRevision,
49
from bzrlib.graph import Graph
50
from bzrlib.merge3 import Merge3
51
from bzrlib.osutils import rename, pathjoin
52
from progress import DummyProgress, ProgressPhase
53
from bzrlib.revision import (NULL_REVISION, ensure_null)
54
from bzrlib.textfile import check_text_lines
55
from bzrlib.trace import mutter, warning, note, is_quiet
56
from bzrlib.transform import (TransformPreview, TreeTransform,
57
resolve_conflicts, cook_conflicts,
58
conflict_pass, FinalPaths, create_by_entry,
59
unique_add, ROOT_PARENT)
60
from bzrlib.versionedfile import PlanWeaveMerge
44
63
# TODO: Report back as changes are merged in
47
66
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)
67
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
68
interesting_ids=interesting_ids, this_tree=from_tree)
257
71
class Merger(object):
261
72
def __init__(self, this_branch, other_tree=None, base_tree=None,
262
this_tree=None, pb=None, change_reporter=None,
73
this_tree=None, pb=DummyProgress(), change_reporter=None,
263
74
recurse='down', revision_graph=None):
264
75
object.__init__(self)
265
76
self.this_branch = this_branch
458
247
if self.this_rev_id is None:
459
248
if self.this_basis_tree.get_file_sha1(file_id) != \
460
249
self.this_tree.get_file_sha1(file_id):
461
raise errors.WorkingTreeNotRevision(self.this_tree)
250
raise WorkingTreeNotRevision(self.this_tree)
463
252
trees = (self.this_basis_tree, self.other_tree)
464
253
return [get_id(tree, file_id) for tree in trees]
466
@deprecated_method(deprecated_in((2, 1, 0)))
467
255
def check_basis(self, check_clean, require_commits=True):
468
256
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')")
257
raise BzrCommandError("This branch has no commits."
258
" (perhaps you would prefer 'bzr pull')")
473
260
self.compare_basis()
474
261
if self.this_basis != self.this_rev_id:
475
262
raise errors.UncommittedChanges(self.this_tree)
477
@deprecated_method(deprecated_in((2, 1, 0)))
478
264
def compare_basis(self):
480
266
basis_tree = self.revision_tree(self.this_tree.last_revision())
481
267
except errors.NoSuchRevision:
482
268
basis_tree = self.this_tree.basis_tree()
483
if not self.this_tree.has_changes(basis_tree):
269
changes = self.this_tree.changes_from(basis_tree)
270
if not changes.has_changed():
484
271
self.this_rev_id = self.this_basis
486
273
def set_interesting_files(self, file_list):
487
274
self.interesting_files = file_list
489
276
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):
277
if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
493
279
self._add_parent()
495
281
def _add_parent(self):
496
282
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
497
283
new_parent_trees = []
498
operation = OperationWithCleanups(self.this_tree.set_parent_trees)
499
284
for revision_id in new_parents:
501
286
tree = self.revision_tree(revision_id)
658
434
if self._is_criss_cross and getattr(self.merge_type,
659
435
'supports_lca_trees', False):
660
436
kwargs['lca_trees'] = self._lca_trees
661
return self.merge_type(pb=None,
437
return self.merge_type(pb=self._pb,
662
438
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)
670
if self.recurse == 'down':
671
for relpath, file_id in self.this_tree.iter_references():
672
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
673
other_revision = self.other_tree.get_reference_revision(
675
if other_revision == sub_tree.last_revision():
677
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
678
sub_merge.merge_type = self.merge_type
679
other_branch = self.other_branch.reference_parent(file_id, relpath)
680
sub_merge.set_other_revision(other_revision, other_branch)
681
base_revision = self.base_tree.get_reference_revision(file_id)
682
sub_merge.base_tree = \
683
sub_tree.branch.repository.revision_tree(base_revision)
684
sub_merge.base_rev_id = base_revision
688
441
def do_merge(self):
689
operation = OperationWithCleanups(self._do_merge_to)
690
442
self.this_tree.lock_tree_write()
691
operation.add_cleanup(self.this_tree.unlock)
692
443
if self.base_tree is not None:
693
444
self.base_tree.lock_read()
694
operation.add_cleanup(self.base_tree.unlock)
695
445
if self.other_tree is not None:
696
446
self.other_tree.lock_read()
697
operation.add_cleanup(self.other_tree.unlock)
698
merge = operation.run_simple()
448
merge = self.make_merger()
450
if self.recurse == 'down':
451
for relpath, file_id in self.this_tree.iter_references():
452
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
453
other_revision = self.other_tree.get_reference_revision(
455
if other_revision == sub_tree.last_revision():
457
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
458
sub_merge.merge_type = self.merge_type
459
other_branch = self.other_branch.reference_parent(file_id, relpath)
460
sub_merge.set_other_revision(other_revision, other_branch)
461
base_revision = self.base_tree.get_reference_revision(file_id)
462
sub_merge.base_tree = \
463
sub_tree.branch.repository.revision_tree(base_revision)
464
sub_merge.base_rev_id = base_revision
468
if self.other_tree is not None:
469
self.other_tree.unlock()
470
if self.base_tree is not None:
471
self.base_tree.unlock()
472
self.this_tree.unlock()
699
473
if len(merge.cooked_conflicts) == 0:
700
if not self.ignore_zero and not trace.is_quiet():
701
trace.note("All changes applied successfully.")
474
if not self.ignore_zero and not is_quiet():
475
note("All changes applied successfully.")
703
trace.note("%d conflicts encountered."
704
% len(merge.cooked_conflicts))
477
note("%d conflicts encountered." % len(merge.cooked_conflicts))
706
479
return len(merge.cooked_conflicts)
709
class _InventoryNoneEntry(object):
710
"""This represents an inventory entry which *isn't there*.
712
It simplifies the merging logic if we always have an InventoryEntry, even
713
if it isn't actually present
720
symlink_target = None
723
_none_entry = _InventoryNoneEntry()
726
482
class Merge3Merger(object):
727
483
"""Three-way merger that uses the merge3 text merger"""
728
484
requires_base = True
734
490
winner_idx = {"this": 2, "other": 1, "conflict": 1}
735
491
supports_lca_trees = True
737
def __init__(self, working_tree, this_tree, base_tree, other_tree,
493
def __init__(self, working_tree, this_tree, base_tree, other_tree,
738
494
interesting_ids=None, reprocess=False, show_base=False,
739
pb=None, pp=None, change_reporter=None,
495
pb=DummyProgress(), pp=None, change_reporter=None,
740
496
interesting_files=None, do_merge=True,
741
cherrypick=False, lca_trees=None, this_branch=None):
497
cherrypick=False, lca_trees=None):
742
498
"""Initialize the merger object and perform the merge.
744
500
:param working_tree: The working tree to apply the merge to
745
501
:param this_tree: The local tree in the merge operation
746
502
: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.
503
:param other_tree: The other other tree to merge changes from
750
504
:param interesting_ids: The file_ids of files that should be
751
505
participate in the merge. May not be combined with
752
506
interesting_files.
753
507
:param: reprocess If True, perform conflict-reduction processing.
754
508
:param show_base: If True, show the base revision in text conflicts.
755
509
(incompatible with reprocess)
510
:param pb: A Progress bar
757
511
:param pp: A ProgressPhase object
758
512
:param change_reporter: An object that should report changes made
759
513
:param interesting_files: The tree-relative paths of files that should
770
524
if interesting_files is not None and interesting_ids is not None:
771
525
raise ValueError(
772
526
'specify either interesting_ids or interesting_files')
773
if this_branch is None:
774
this_branch = this_tree.branch
775
527
self.interesting_ids = interesting_ids
776
528
self.interesting_files = interesting_files
777
529
self.this_tree = working_tree
778
530
self.base_tree = base_tree
779
531
self.other_tree = other_tree
780
self.this_branch = this_branch
781
532
self._raw_conflicts = []
782
533
self.cooked_conflicts = []
783
534
self.reprocess = reprocess
784
535
self.show_base = show_base
785
536
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
539
self.change_reporter = change_reporter
792
540
self.cherrypick = cherrypick
542
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
546
def do_merge(self):
801
operation = OperationWithCleanups(self._do_merge)
802
547
self.this_tree.lock_tree_write()
803
operation.add_cleanup(self.this_tree.unlock)
804
548
self.base_tree.lock_read()
805
operation.add_cleanup(self.base_tree.unlock)
806
549
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)
550
self.tt = TreeTransform(self.this_tree, self.pb)
817
self.this_tree.add_conflicts(self.cooked_conflicts)
818
except errors.UnsupportedOperation:
553
self._compute_transform()
555
results = self.tt.apply(no_conflicts=True)
556
self.write_modified(results)
558
self.this_tree.add_conflicts(self.cooked_conflicts)
559
except UnsupportedOperation:
563
self.other_tree.unlock()
564
self.base_tree.unlock()
565
self.this_tree.unlock()
821
568
def make_preview_transform(self):
822
operation = OperationWithCleanups(self._make_preview_transform)
823
569
self.base_tree.lock_read()
824
operation.add_cleanup(self.base_tree.unlock)
825
570
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()
571
self.tt = TransformPreview(self.this_tree)
574
self._compute_transform()
577
self.other_tree.unlock()
578
self.base_tree.unlock()
834
582
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
583
entries = self._entries3()
841
584
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
586
for num, (file_id, changed, parents3, names3,
847
587
executable3) in enumerate(entries):
848
588
child_pb.update('Preparing file merge', num, len(entries))
849
self._merge_names(file_id, parents3, names3, resolver=resolver)
589
self._merge_names(file_id, parents3, names3)
851
file_status = self._do_merge_contents(file_id)
591
file_status = self.merge_contents(file_id)
853
593
file_status = 'unmodified'
854
594
self._merge_executable(file_id,
855
executable3, file_status, resolver=resolver)
595
executable3, file_status)
857
597
child_pb.finished()
859
600
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))
602
fs_conflicts = resolve_conflicts(self.tt, child_pb,
603
lambda t, c: conflict_pass(t, c, self.other_tree))
864
605
child_pb.finished()
865
606
if self.change_reporter is not None:
938
669
for path, file_id, other_ie, lca_values in walker.iter_all():
939
670
# Is this modified at all from any of the other trees?
940
671
if other_ie is None:
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)
672
last_rev = other_kind = other_parent_id = other_name = None
673
other_executable = None
675
last_rev = other_ie.revision
676
other_kind = other_ie.kind
677
other_parent_id = other_ie.parent_id
678
other_name = other_ie.name
679
other_executable = other_ie.executable
681
# I believe we can actually change this to see if last_rev is
682
# identical to *any* of the lca values.
683
for lca_path, ie in lca_values:
684
if ((ie is None and other_ie is not None)
685
or ie.revision != last_rev):
687
else: # Identical in all trees
690
parent_id_changed = False
692
for lca_path, ie in lca_values:
693
if ie is None and other_ie is not None:
694
kind_changed = parent_id_changed = name_changed = True
696
if ie.kind != other_kind:
698
if ie.parent_id != other_parent_id:
699
parent_id_changed = True
700
if ie.name != other_name:
703
if (not kind_changed and not parent_id_changed
704
and not name_changed and other_kind == 'directory'):
705
# Even though last-modified has changed, the actual attributes
706
# of this entry hasn't changed, so skip it.
971
709
if file_id in base_inventory:
972
base_ie = base_inventory[file_id]
710
base_ie = self.base_tree.inventory[file_id]
711
base_parent_id = base_ie.parent_id
712
base_name = base_ie.name
713
base_executable = base_ie.executable
974
base_ie = _none_entry
715
base_parent_id = base_name = base_executable = None
976
716
if file_id in this_inventory:
977
717
this_ie = this_inventory[file_id]
718
this_parent_id = this_ie.parent_id
719
this_name = this_ie.name
720
this_executable = this_ie.executable
979
this_ie = _none_entry
722
this_parent_id = this_name = this_executable = None
982
724
lca_parent_ids = []
984
726
lca_executable = []
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
727
for path, ie in lca_values:
729
lca_parent_ids.append(None)
730
lca_names.append(None)
731
lca_executable.append(None)
1061
raise AssertionError('unhandled kind: %s' % other_ie.kind)
733
lca_parent_ids.append(ie.parent_id)
734
lca_names.append(ie.name)
735
lca_executable.append(ie.executable)
1063
737
# 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)
738
result.append((file_id, True,
739
((base_parent_id, lca_parent_ids),
740
other_parent_id, this_parent_id),
741
((base_name, lca_names),
742
other_name, this_name),
743
((base_executable, lca_executable),
744
other_executable, this_executable)
1075
749
def fix_root(self):
1077
751
self.tt.final_kind(self.tt.root)
1078
except errors.NoSuchFile:
1079
753
self.tt.cancel_deletion(self.tt.root)
1080
754
if self.tt.final_file_id(self.tt.root) is None:
1081
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
755
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
757
if self.other_tree.inventory.root is None:
1083
759
other_root_file_id = self.other_tree.get_root_id()
1084
if other_root_file_id is None:
1086
760
other_root = self.tt.trans_id_file_id(other_root_file_id)
1087
761
if other_root == self.tt.root:
1089
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)
1094
764
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():
767
self.reparent_children(self.other_tree.inventory.root, self.tt.root)
768
self.tt.cancel_creation(other_root)
769
self.tt.cancel_versioning(other_root)
771
def reparent_children(self, ie, target):
772
for thing, child in ie.children.iteritems():
1104
773
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)
774
self.tt.adjust_path(self.tt.final_name(trans_id), target, trans_id)
1122
776
def write_modified(self, results):
1123
777
modified_hashes = {}
1165
819
def kind(tree, file_id):
1166
820
"""Determine the kind of a file-id (used as a key method)."""
1167
if not tree.has_id(file_id):
821
if file_id not in tree:
1169
823
return tree.kind(file_id)
1172
826
def _three_way(base, other, this):
827
#if base == other, either they all agree, or only THIS has changed.
1173
828
if base == other:
1174
# if 'base == other', either they all agree, or only 'this' has
1177
830
elif this not in (base, other):
1178
# 'this' is neither 'base' nor 'other', so both sides changed
1179
831
return 'conflict'
832
# "Ambiguous clean merge" -- both sides have made the same change.
1180
833
elif this == other:
1181
# "Ambiguous clean merge" -- both sides have made the same change.
835
# 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
840
def scalar_three_way(this_tree, base_tree, other_tree, file_id, key):
1240
841
"""Do a three-way test on a scalar.
1241
842
Return "this", "other" or "conflict", depending whether a value wins.
1291
891
parent_id_winner = "other"
1292
892
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))
894
if name_winner == "conflict":
895
trans_id = self.tt.trans_id_file_id(file_id)
896
self._raw_conflicts.append(('name conflict', trans_id,
897
this_name, other_name))
898
if parent_id_winner == "conflict":
899
trans_id = self.tt.trans_id_file_id(file_id)
900
self._raw_conflicts.append(('parent conflict', trans_id,
901
this_parent, other_parent))
1302
902
if other_name is None:
1303
# it doesn't matter whether the result was 'other' or
903
# it doesn't matter whether the result was 'other' or
1304
904
# 'conflict'-- if there's no 'other', we leave it alone.
906
# if we get here, name_winner and parent_winner are set to safe values.
907
trans_id = self.tt.trans_id_file_id(file_id)
1306
908
parent_id = parents[self.winner_idx[parent_id_winner]]
1307
909
if parent_id is not None:
1308
# if we get here, name_winner and parent_winner are set to safe
910
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1310
911
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))
912
parent_trans_id, trans_id)
1314
def _do_merge_contents(self, file_id):
1315
"""Performs a merge on file_id contents."""
914
def merge_contents(self, file_id):
915
"""Performa a merge on file_id contents."""
1316
916
def contents_pair(tree):
1317
917
if file_id not in tree:
1318
918
return (None, None)
1326
926
return kind, contents
928
def contents_conflict():
929
trans_id = self.tt.trans_id_file_id(file_id)
930
name = self.tt.final_name(trans_id)
931
parent_id = self.tt.final_parent(trans_id)
932
if file_id in self.this_tree.inventory:
933
self.tt.unversion_file(trans_id)
934
if file_id in self.this_tree:
935
self.tt.delete_contents(trans_id)
936
file_group = self._dump_conflicts(name, parent_id, file_id,
938
self._raw_conflicts.append(('contents conflict', file_group))
1328
940
# See SPOT run. run, SPOT, run.
1329
941
# So we're not QUITE repeating ourselves; we do tricky things with
1331
943
base_pair = contents_pair(self.base_tree)
1332
944
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
945
if base_pair == other_pair:
946
# OTHER introduced no changes
948
this_pair = contents_pair(self.this_tree)
949
if this_pair == other_pair:
950
# THIS and OTHER introduced the same changes
953
trans_id = self.tt.trans_id_file_id(file_id)
954
if this_pair == base_pair:
955
# only OTHER introduced changes
956
if file_id in self.this_tree:
957
# Remove any existing contents
958
self.tt.delete_contents(trans_id)
959
if file_id in self.other_tree:
960
# OTHER changed the file
961
create_by_entry(self.tt,
962
self.other_tree.inventory[file_id],
963
self.other_tree, trans_id)
964
if file_id not in self.this_tree.inventory:
965
self.tt.version_file(file_id, trans_id)
967
elif file_id in self.this_tree.inventory:
968
# OTHER deleted the file
969
self.tt.unversion_file(trans_id)
971
#BOTH THIS and OTHER introduced changes; scalar conflict
972
elif this_pair[0] == "file" and other_pair[0] == "file":
973
# THIS and OTHER are both files, so text merge. Either
974
# BASE is a file, or both converted to files, so at least we
975
# have agreement that output should be a file.
977
self.text_merge(file_id, trans_id)
979
return contents_conflict()
980
if file_id not in self.this_tree.inventory:
981
self.tt.version_file(file_id, trans_id)
983
self.tt.tree_kind(trans_id)
984
self.tt.delete_contents(trans_id)
989
# Scalar conflict, can't text merge. Dump conflicts
990
return contents_conflict()
1455
992
def get_lines(self, tree, file_id):
1456
993
"""Return the lines in a file, or an empty list."""
1457
if tree.has_id(file_id):
1458
995
return tree.get_file(file_id).readlines()
1511
1048
determined automatically. If set_version is true, the .OTHER, .THIS
1512
1049
or .BASE (in that order) will be created as versioned files.
1514
data = [('OTHER', self.other_tree, other_lines),
1051
data = [('OTHER', self.other_tree, other_lines),
1515
1052
('THIS', self.this_tree, this_lines)]
1516
1053
if not no_base:
1517
1054
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
1055
versioned = False
1533
1056
file_group = []
1534
1057
for suffix, tree, lines in data:
1535
if tree.has_id(file_id):
1536
1059
trans_id = self._conflict_file(name, parent_id, tree, file_id,
1537
suffix, lines, filter_tree_path)
1538
1061
file_group.append(trans_id)
1539
1062
if set_version and not versioned:
1540
1063
self.tt.version_file(file_id, trans_id)
1541
1064
versioned = True
1542
1065
return file_group
1544
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1545
lines=None, filter_tree_path=None):
1067
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1546
1069
"""Emit a single conflict file."""
1547
1070
name = name + '.' + suffix
1548
1071
trans_id = self.tt.create_path(name, parent_id)
1549
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
1072
entry = tree.inventory[file_id]
1073
create_by_entry(self.tt, entry, tree, trans_id, lines)
1551
1074
return trans_id
1553
1076
def merge_executable(self, file_id, file_status):
1554
1077
"""Perform a merge on the execute bit."""
1555
1078
executable = [self.executable(t, file_id) for t in (self.base_tree,
1556
1079
self.other_tree, self.this_tree)]
1557
self._merge_executable(file_id, executable, file_status,
1558
resolver=self._three_way)
1080
self._merge_executable(file_id, executable, file_status)
1560
def _merge_executable(self, file_id, executable, file_status,
1082
def _merge_executable(self, file_id, executable, file_status):
1562
1083
"""Perform a merge on the execute bit."""
1563
1084
base_executable, other_executable, this_executable = executable
1564
1085
if file_status == "deleted":
1566
winner = resolver(*executable)
1087
winner = self._three_way(*executable)
1567
1088
if winner == "conflict":
1568
1089
# There must be a None in here, if we have a conflict, but we
1569
1090
# need executability since file status was not deleted.
1629
1138
if path.endswith(suffix):
1630
1139
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':
1141
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
1142
self.cooked_conflicts.append(c)
1143
if conflict_type == 'text conflict':
1635
1144
trans_id = conflict[1]
1636
1145
path = fp.get_path(trans_id)
1637
1146
file_id = self.tt.final_file_id(trans_id)
1638
c = _mod_conflicts.Conflict.factory(conflict_type,
1639
path=path, file_id=file_id)
1147
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
1148
self.cooked_conflicts.append(c)
1150
for trans_id, conflicts in name_conflicts.iteritems():
1152
this_parent, other_parent = conflicts['parent conflict']
1153
if this_parent == other_parent:
1154
raise AssertionError()
1156
this_parent = other_parent = \
1157
self.tt.final_file_id(self.tt.final_parent(trans_id))
1159
this_name, other_name = conflicts['name conflict']
1160
if this_name == other_name:
1161
raise AssertionError()
1163
this_name = other_name = self.tt.final_name(trans_id)
1164
other_path = fp.get_path(trans_id)
1165
if this_parent is not None and this_name is not None:
1166
this_parent_path = \
1167
fp.get_path(self.tt.trans_id_file_id(this_parent))
1168
this_path = pathjoin(this_parent_path, this_name)
1641
raise AssertionError('bad conflict type: %r' % (conflict,))
1170
this_path = "<deleted>"
1171
file_id = self.tt.final_file_id(trans_id)
1172
c = Conflict.factory('path conflict', path=this_path,
1173
conflict_path=other_path, file_id=file_id)
1642
1174
self.cooked_conflicts.append(c)
1643
self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
1175
self.cooked_conflicts.sort(key=Conflict.sort_key)
1646
1178
class WeaveMerger(Merge3Merger):
1650
1182
supports_reverse_cherrypick = False
1651
1183
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,
1185
def _merged_lines(self, file_id):
1186
"""Generate the merged lines.
1187
There is no distinction between lines that are meant to contain <<<<<<<
1191
base = self.base_tree
1194
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
1196
if 'merge' in debug.debug_flags:
1668
1197
plan = list(plan)
1669
1198
trans_id = self.tt.trans_id_file_id(file_id)
1670
1199
name = self.tt.final_name(trans_id) + '.plan'
1671
contents = ('%11s|%s' % l for l in plan)
1200
contents = ('%10s|%s' % l for l in plan)
1672
1201
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
1202
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1203
'>>>>>>> MERGE-SOURCE\n')
1204
return textmerge.merge_lines(self.reprocess)
1682
1206
def text_merge(self, file_id, trans_id):
1683
1207
"""Perform a (weave) text merge for a given file and file-id.
1684
1208
If conflicts are encountered, .THIS and .OTHER files will be emitted,
1685
1209
and a conflict will be noted.
1687
lines, base_lines = self._merged_lines(file_id)
1211
lines, conflicts = self._merged_lines(file_id)
1688
1212
lines = list(lines)
1689
# Note we're checking whether the OUTPUT is binary in this case,
1213
# Note we're checking whether the OUTPUT is binary in this case,
1690
1214
# because we don't want to get into weave merge guts.
1691
textfile.check_text_lines(lines)
1215
check_text_lines(lines)
1692
1216
self.tt.create_file(lines, trans_id)
1693
if base_lines is not None:
1695
1218
self._raw_conflicts.append(('text conflict', trans_id))
1696
1219
name = self.tt.final_name(trans_id)
1697
1220
parent_id = self.tt.final_parent(trans_id)
1698
file_group = self._dump_conflicts(name, parent_id, file_id,
1700
base_lines=base_lines)
1221
file_group = self._dump_conflicts(name, parent_id, file_id,
1701
1223
file_group.append(trans_id)
1704
1226
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,
1228
def _merged_lines(self, file_id):
1229
"""Generate the merged lines.
1230
There is no distinction between lines that are meant to contain <<<<<<<
1234
base = self.base_tree
1237
plan = self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1239
if 'merge' in debug.debug_flags:
1241
trans_id = self.tt.trans_id_file_id(file_id)
1242
name = self.tt.final_name(trans_id) + '.plan'
1243
contents = ('%10s|%s' % l for l in plan)
1244
self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
1245
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1246
'>>>>>>> MERGE-SOURCE\n')
1247
return textmerge.merge_lines(self.reprocess)
1710
1250
class Diff3Merger(Merge3Merger):
1711
1251
"""Three-way merger using external diff3 for text merging"""
1713
1253
def dump_file(self, temp_dir, name, tree, file_id):
1714
out_path = osutils.pathjoin(temp_dir, name)
1254
out_path = pathjoin(temp_dir, name)
1715
1255
out_file = open(out_path, "wb")
1717
1257
in_file = tree.get_file(file_id)
added
removed
bzrlib/merge.py
