13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
from tempfile import mkdtemp
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23
from bzrlib.branch import Branch
24
from bzrlib.conflicts import ConflictList, Conflict
25
from bzrlib.errors import (BzrCommandError,
35
WorkingTreeNotRevision,
38
from bzrlib.merge3 import Merge3
40
from bzrlib.osutils import rename, pathjoin, rmtree
41
from progress import DummyProgress, ProgressPhase
42
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
43
from bzrlib.textfile import check_text_lines
44
from bzrlib.trace import mutter, warning, note
45
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
46
FinalPaths, create_by_entry, unique_add)
47
from bzrlib.versionedfile import WeaveMerge
20
branch as _mod_branch,
21
conflicts as _mod_conflicts,
30
revision as _mod_revision,
39
from bzrlib.cleanup import OperationWithCleanups
40
from bzrlib.symbol_versioning import (
50
44
# TODO: Report back as changes are merged in
52
def _get_tree(treespec, local_branch=None):
53
from bzrlib import workingtree
54
location, revno = treespec
56
tree = workingtree.WorkingTree.open_containing(location)[0]
57
return tree.branch, tree
58
branch = Branch.open_containing(location)[0]
60
revision = branch.last_revision()
62
revision = branch.get_rev_id(revno)
64
revision = NULL_REVISION
65
return branch, _get_revid_tree(branch, revision, local_branch)
68
def _get_revid_tree(branch, revision, local_branch):
70
base_tree = branch.bzrdir.open_workingtree()
72
if local_branch is not None:
73
if local_branch.base != branch.base:
74
local_branch.fetch(branch, revision)
75
base_tree = local_branch.repository.revision_tree(revision)
77
base_tree = branch.repository.revision_tree(revision)
81
47
def transform_tree(from_tree, to_tree, interesting_ids=None):
82
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
83
interesting_ids=interesting_ids, this_tree=from_tree)
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 ConfigurableFileMerger(AbstractPerFileMerger):
97
"""Merge individual files when configured via a .conf file.
99
This is a base class for concrete custom file merging logic. Concrete
100
classes should implement ``merge_text``.
102
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
104
:ivar affected_files: The configured file paths to merge.
106
:cvar name_prefix: The prefix to use when looking up configuration
107
details. <name_prefix>_merge_files describes the files targeted by the
110
:cvar default_files: The default file paths to merge when no configuration
117
def __init__(self, merger):
118
super(ConfigurableFileMerger, self).__init__(merger)
119
self.affected_files = None
120
self.default_files = self.__class__.default_files or []
121
self.name_prefix = self.__class__.name_prefix
122
if self.name_prefix is None:
123
raise ValueError("name_prefix must be set.")
125
def filename_matches_config(self, params):
126
"""Check whether the file should call the merge hook.
128
<name_prefix>_merge_files configuration variable is a list of files
129
that should use the hook.
131
affected_files = self.affected_files
132
if affected_files is None:
133
config = self.merger.this_branch.get_config()
134
# Until bzr provides a better policy for caching the config, we
135
# just add the part we're interested in to the params to avoid
136
# reading the config files repeatedly (bazaar.conf, location.conf,
138
config_key = self.name_prefix + '_merge_files'
139
affected_files = config.get_user_option_as_list(config_key)
140
if affected_files is None:
141
# If nothing was specified in the config, use the default.
142
affected_files = self.default_files
143
self.affected_files = affected_files
145
filename = self.merger.this_tree.id2path(params.file_id)
146
if filename in affected_files:
150
def merge_contents(self, params):
151
"""Merge the contents of a single file."""
152
# First, check whether this custom merge logic should be used. We
153
# expect most files should not be merged by this handler.
155
# OTHER is a straight winner, rely on default merge.
156
params.winner == 'other' or
157
# THIS and OTHER aren't both files.
158
not params.is_file_merge() or
159
# The filename isn't listed in the 'NAME_merge_files' config
161
not self.filename_matches_config(params)):
162
return 'not_applicable', None
163
return self.merge_text(params)
165
def merge_text(self, params):
166
"""Merge the byte contents of a single file.
168
This is called after checking that the merge should be performed in
169
merge_contents, and it should behave as per
170
``bzrlib.merge.AbstractPerFileMerger.merge_contents``.
172
raise NotImplementedError(self.merge_text)
175
class MergeHookParams(object):
176
"""Object holding parameters passed to merge_file_content hooks.
178
There are some fields hooks can access:
180
:ivar file_id: the file ID of the file being merged
181
:ivar trans_id: the transform ID for the merge of this file
182
:ivar this_kind: kind of file_id in 'this' tree
183
:ivar other_kind: kind of file_id in 'other' tree
184
:ivar winner: one of 'this', 'other', 'conflict'
187
def __init__(self, merger, file_id, trans_id, this_kind, other_kind,
189
self._merger = merger
190
self.file_id = file_id
191
self.trans_id = trans_id
192
self.this_kind = this_kind
193
self.other_kind = other_kind
196
def is_file_merge(self):
197
"""True if this_kind and other_kind are both 'file'."""
198
return self.this_kind == 'file' and self.other_kind == 'file'
200
@decorators.cachedproperty
201
def base_lines(self):
202
"""The lines of the 'base' version of the file."""
203
return self._merger.get_lines(self._merger.base_tree, self.file_id)
205
@decorators.cachedproperty
206
def this_lines(self):
207
"""The lines of the 'this' version of the file."""
208
return self._merger.get_lines(self._merger.this_tree, self.file_id)
210
@decorators.cachedproperty
211
def other_lines(self):
212
"""The lines of the 'other' version of the file."""
213
return self._merger.get_lines(self._merger.other_tree, self.file_id)
86
216
class Merger(object):
87
def __init__(self, this_branch, other_tree=None, base_tree=None,
88
this_tree=None, pb=DummyProgress()):
220
def __init__(self, this_branch, other_tree=None, base_tree=None,
221
this_tree=None, pb=None, change_reporter=None,
222
recurse='down', revision_graph=None):
89
223
object.__init__(self)
90
assert this_tree is not None, "this_tree is required"
91
224
self.this_branch = this_branch
92
self.this_basis = this_branch.last_revision()
225
self.this_basis = _mod_revision.ensure_null(
226
this_branch.last_revision())
93
227
self.this_rev_id = None
94
228
self.this_tree = this_tree
95
229
self.this_revision_tree = None
96
230
self.this_basis_tree = None
97
231
self.other_tree = other_tree
232
self.other_branch = None
98
233
self.base_tree = base_tree
99
234
self.ignore_zero = False
100
235
self.backup_files = False
101
236
self.interesting_ids = None
237
self.interesting_files = None
102
238
self.show_base = False
103
239
self.reprocess = False
241
warnings.warn("pb parameter to Merger() is deprecated and ignored")
108
def revision_tree(self, revision_id):
109
return self.this_branch.repository.revision_tree(revision_id)
243
self.recurse = recurse
244
self.change_reporter = change_reporter
245
self._cached_trees = {}
246
self._revision_graph = revision_graph
247
self._base_is_ancestor = None
248
self._base_is_other_ancestor = None
249
self._is_criss_cross = None
250
self._lca_trees = None
252
def cache_trees_with_revision_ids(self, trees):
253
"""Cache any tree in trees if it has a revision_id."""
254
for maybe_tree in trees:
255
if maybe_tree is None:
258
rev_id = maybe_tree.get_revision_id()
259
except AttributeError:
261
self._cached_trees[rev_id] = maybe_tree
264
def revision_graph(self):
265
if self._revision_graph is None:
266
self._revision_graph = self.this_branch.repository.get_graph()
267
return self._revision_graph
269
def _set_base_is_ancestor(self, value):
270
self._base_is_ancestor = value
272
def _get_base_is_ancestor(self):
273
if self._base_is_ancestor is None:
274
self._base_is_ancestor = self.revision_graph.is_ancestor(
275
self.base_rev_id, self.this_basis)
276
return self._base_is_ancestor
278
base_is_ancestor = property(_get_base_is_ancestor, _set_base_is_ancestor)
280
def _set_base_is_other_ancestor(self, value):
281
self._base_is_other_ancestor = value
283
def _get_base_is_other_ancestor(self):
284
if self._base_is_other_ancestor is None:
285
if self.other_basis is None:
287
self._base_is_other_ancestor = self.revision_graph.is_ancestor(
288
self.base_rev_id, self.other_basis)
289
return self._base_is_other_ancestor
291
base_is_other_ancestor = property(_get_base_is_other_ancestor,
292
_set_base_is_other_ancestor)
295
def from_uncommitted(tree, other_tree, pb=None, base_tree=None):
296
"""Return a Merger for uncommitted changes in other_tree.
298
:param tree: The tree to merge into
299
:param other_tree: The tree to get uncommitted changes from
300
:param pb: A progress indicator
301
:param base_tree: The basis to use for the merge. If unspecified,
302
other_tree.basis_tree() will be used.
304
if base_tree is None:
305
base_tree = other_tree.basis_tree()
306
merger = Merger(tree.branch, other_tree, base_tree, tree, pb)
307
merger.base_rev_id = merger.base_tree.get_revision_id()
308
merger.other_rev_id = None
309
merger.other_basis = merger.base_rev_id
313
def from_mergeable(klass, tree, mergeable, pb):
314
"""Return a Merger for a bundle or merge directive.
316
:param tree: The tree to merge changes into
317
:param mergeable: A merge directive or bundle
318
:param pb: A progress indicator
320
mergeable.install_revisions(tree.branch.repository)
321
base_revision_id, other_revision_id, verified =\
322
mergeable.get_merge_request(tree.branch.repository)
323
revision_graph = tree.branch.repository.get_graph()
324
if base_revision_id is not None:
325
if (base_revision_id != _mod_revision.NULL_REVISION and
326
revision_graph.is_ancestor(
327
base_revision_id, tree.branch.last_revision())):
328
base_revision_id = None
330
trace.warning('Performing cherrypick')
331
merger = klass.from_revision_ids(pb, tree, other_revision_id,
332
base_revision_id, revision_graph=
334
return merger, verified
337
def from_revision_ids(pb, tree, other, base=None, other_branch=None,
338
base_branch=None, revision_graph=None,
340
"""Return a Merger for revision-ids.
342
:param pb: A progress indicator
343
:param tree: The tree to merge changes into
344
:param other: The revision-id to use as OTHER
345
:param base: The revision-id to use as BASE. If not specified, will
347
:param other_branch: A branch containing the other revision-id. If
348
not supplied, tree.branch is used.
349
:param base_branch: A branch containing the base revision-id. If
350
not supplied, other_branch or tree.branch will be used.
351
:param revision_graph: If you have a revision_graph precomputed, pass
352
it in, otherwise it will be created for you.
353
:param tree_branch: The branch associated with tree. If not supplied,
354
tree.branch will be used.
356
if tree_branch is None:
357
tree_branch = tree.branch
358
merger = Merger(tree_branch, this_tree=tree, pb=pb,
359
revision_graph=revision_graph)
360
if other_branch is None:
361
other_branch = tree.branch
362
merger.set_other_revision(other, other_branch)
366
if base_branch is None:
367
base_branch = other_branch
368
merger.set_base_revision(base, base_branch)
371
def revision_tree(self, revision_id, branch=None):
372
if revision_id not in self._cached_trees:
374
branch = self.this_branch
376
tree = self.this_tree.revision_tree(revision_id)
377
except errors.NoSuchRevisionInTree:
378
tree = branch.repository.revision_tree(revision_id)
379
self._cached_trees[revision_id] = tree
380
return self._cached_trees[revision_id]
382
def _get_tree(self, treespec, possible_transports=None):
383
from bzrlib import workingtree
384
location, revno = treespec
386
tree = workingtree.WorkingTree.open_containing(location)[0]
387
return tree.branch, tree
388
branch = _mod_branch.Branch.open_containing(
389
location, possible_transports)[0]
391
revision_id = branch.last_revision()
393
revision_id = branch.get_rev_id(revno)
394
revision_id = _mod_revision.ensure_null(revision_id)
395
return branch, self.revision_tree(revision_id, branch)
397
@deprecated_method(deprecated_in((2, 1, 0)))
111
398
def ensure_revision_trees(self):
112
399
if self.this_revision_tree is None:
113
self.this_basis_tree = self.this_branch.repository.revision_tree(
400
self.this_basis_tree = self.revision_tree(self.this_basis)
115
401
if self.this_basis == self.this_rev_id:
116
402
self.this_revision_tree = self.this_basis_tree
118
404
if self.other_rev_id is None:
119
405
other_basis_tree = self.revision_tree(self.other_basis)
120
changes = other_basis_tree.changes_from(self.other_tree)
121
if changes.has_changed():
122
raise WorkingTreeNotRevision(self.this_tree)
406
if other_basis_tree.has_changes(self.other_tree):
407
raise errors.WorkingTreeNotRevision(self.this_tree)
123
408
other_rev_id = self.other_basis
124
409
self.other_tree = other_basis_tree
411
@deprecated_method(deprecated_in((2, 1, 0)))
126
412
def file_revisions(self, file_id):
127
413
self.ensure_revision_trees()
128
414
def get_id(tree, file_id):
129
415
revision_id = tree.inventory[file_id].revision
130
assert revision_id is not None
131
416
return revision_id
132
417
if self.this_rev_id is None:
133
418
if self.this_basis_tree.get_file_sha1(file_id) != \
134
419
self.this_tree.get_file_sha1(file_id):
135
raise WorkingTreeNotRevision(self.this_tree)
420
raise errors.WorkingTreeNotRevision(self.this_tree)
137
422
trees = (self.this_basis_tree, self.other_tree)
138
423
return [get_id(tree, file_id) for tree in trees]
425
@deprecated_method(deprecated_in((2, 1, 0)))
140
426
def check_basis(self, check_clean, require_commits=True):
141
427
if self.this_basis is None and require_commits is True:
142
raise BzrCommandError("This branch has no commits")
428
raise errors.BzrCommandError(
429
"This branch has no commits."
430
" (perhaps you would prefer 'bzr pull')")
144
432
self.compare_basis()
145
433
if self.this_basis != self.this_rev_id:
146
raise BzrCommandError("Working tree has uncommitted changes.")
434
raise errors.UncommittedChanges(self.this_tree)
436
@deprecated_method(deprecated_in((2, 1, 0)))
148
437
def compare_basis(self):
149
changes = self.this_tree.changes_from(self.this_tree.basis_tree())
150
if not changes.has_changed():
439
basis_tree = self.revision_tree(self.this_tree.last_revision())
440
except errors.NoSuchRevision:
441
basis_tree = self.this_tree.basis_tree()
442
if not self.this_tree.has_changes(basis_tree):
151
443
self.this_rev_id = self.this_basis
153
445
def set_interesting_files(self, file_list):
155
self._set_interesting_files(file_list)
156
except NotVersionedError, e:
157
raise BzrCommandError("%s is not a source file in any"
160
def _set_interesting_files(self, file_list):
161
"""Set the list of interesting ids from a list of files."""
162
if file_list is None:
163
self.interesting_ids = None
166
interesting_ids = set()
167
for path in file_list:
169
for tree in (self.this_tree, self.base_tree, self.other_tree):
170
file_id = tree.inventory.path2id(path)
171
if file_id is not None:
172
interesting_ids.add(file_id)
175
raise NotVersionedError(path=path)
176
self.interesting_ids = interesting_ids
446
self.interesting_files = file_list
178
448
def set_pending(self):
179
if not self.base_is_ancestor:
181
if self.other_rev_id is None:
183
ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
184
if self.other_rev_id in ancestry:
186
self.this_tree.add_parent_tree((self.other_rev_id, self.other_tree))
188
def set_other(self, other_revision):
449
if (not self.base_is_ancestor or not self.base_is_other_ancestor
450
or self.other_rev_id is None):
454
def _add_parent(self):
455
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
456
new_parent_trees = []
457
operation = OperationWithCleanups(self.this_tree.set_parent_trees)
458
for revision_id in new_parents:
460
tree = self.revision_tree(revision_id)
461
except errors.NoSuchRevision:
465
operation.add_cleanup(tree.unlock)
466
new_parent_trees.append((revision_id, tree))
467
operation.run_simple(new_parent_trees, allow_leftmost_as_ghost=True)
469
def set_other(self, other_revision, possible_transports=None):
189
470
"""Set the revision and tree to merge from.
191
472
This sets the other_tree, other_rev_id, other_basis attributes.
193
474
:param other_revision: The [path, revision] list to merge from.
195
other_branch, self.other_tree = _get_tree(other_revision,
476
self.other_branch, self.other_tree = self._get_tree(other_revision,
197
478
if other_revision[1] == -1:
198
self.other_rev_id = other_branch.last_revision()
199
if self.other_rev_id is None:
200
raise NoCommits(other_branch)
479
self.other_rev_id = _mod_revision.ensure_null(
480
self.other_branch.last_revision())
481
if _mod_revision.is_null(self.other_rev_id):
482
raise errors.NoCommits(self.other_branch)
201
483
self.other_basis = self.other_rev_id
202
484
elif other_revision[1] is not None:
203
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
485
self.other_rev_id = self.other_branch.get_rev_id(other_revision[1])
204
486
self.other_basis = self.other_rev_id
206
488
self.other_rev_id = None
207
self.other_basis = other_branch.last_revision()
489
self.other_basis = self.other_branch.last_revision()
208
490
if self.other_basis is None:
209
raise NoCommits(other_branch)
210
if other_branch.base != self.this_branch.base:
211
self.this_branch.fetch(other_branch, last_revision=self.other_basis)
491
raise errors.NoCommits(self.other_branch)
492
if self.other_rev_id is not None:
493
self._cached_trees[self.other_rev_id] = self.other_tree
494
self._maybe_fetch(self.other_branch,self.this_branch, self.other_basis)
496
def set_other_revision(self, revision_id, other_branch):
497
"""Set 'other' based on a branch and revision id
499
:param revision_id: The revision to use for a tree
500
:param other_branch: The branch containing this tree
502
self.other_rev_id = revision_id
503
self.other_branch = other_branch
504
self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id)
505
self.other_tree = self.revision_tree(revision_id)
506
self.other_basis = revision_id
508
def set_base_revision(self, revision_id, branch):
509
"""Set 'base' based on a branch and revision id
511
:param revision_id: The revision to use for a tree
512
:param branch: The branch containing this tree
514
self.base_rev_id = revision_id
515
self.base_branch = branch
516
self._maybe_fetch(branch, self.this_branch, revision_id)
517
self.base_tree = self.revision_tree(revision_id)
519
def _maybe_fetch(self, source, target, revision_id):
520
if not source.repository.has_same_location(target.repository):
521
target.fetch(source, revision_id)
213
523
def find_base(self):
214
self.set_base([None, None])
524
revisions = [_mod_revision.ensure_null(self.this_basis),
525
_mod_revision.ensure_null(self.other_basis)]
526
if _mod_revision.NULL_REVISION in revisions:
527
self.base_rev_id = _mod_revision.NULL_REVISION
528
self.base_tree = self.revision_tree(self.base_rev_id)
529
self._is_criss_cross = False
531
lcas = self.revision_graph.find_lca(revisions[0], revisions[1])
532
self._is_criss_cross = False
534
self.base_rev_id = _mod_revision.NULL_REVISION
536
self.base_rev_id = list(lcas)[0]
537
else: # len(lcas) > 1
539
# find_unique_lca can only handle 2 nodes, so we have to
540
# start back at the beginning. It is a shame to traverse
541
# the graph again, but better than re-implementing
543
self.base_rev_id = self.revision_graph.find_unique_lca(
544
revisions[0], revisions[1])
546
self.base_rev_id = self.revision_graph.find_unique_lca(
548
self._is_criss_cross = True
549
if self.base_rev_id == _mod_revision.NULL_REVISION:
550
raise errors.UnrelatedBranches()
551
if self._is_criss_cross:
552
trace.warning('Warning: criss-cross merge encountered. See bzr'
553
' help criss-cross.')
554
trace.mutter('Criss-cross lcas: %r' % lcas)
555
interesting_revision_ids = [self.base_rev_id]
556
interesting_revision_ids.extend(lcas)
557
interesting_trees = dict((t.get_revision_id(), t)
558
for t in self.this_branch.repository.revision_trees(
559
interesting_revision_ids))
560
self._cached_trees.update(interesting_trees)
561
self.base_tree = interesting_trees.pop(self.base_rev_id)
562
sorted_lca_keys = self.revision_graph.find_merge_order(
564
self._lca_trees = [interesting_trees[key]
565
for key in sorted_lca_keys]
567
self.base_tree = self.revision_tree(self.base_rev_id)
568
self.base_is_ancestor = True
569
self.base_is_other_ancestor = True
570
trace.mutter('Base revid: %r' % self.base_rev_id)
216
572
def set_base(self, base_revision):
217
573
"""Set the base revision to use for the merge.
219
575
:param base_revision: A 2-list containing a path and revision number.
221
mutter("doing merge() with no base_revision specified")
577
trace.mutter("doing merge() with no base_revision specified")
222
578
if base_revision == [None, None]:
224
pb = bzrlib.ui.ui_factory.nested_progress_bar()
226
this_repo = self.this_branch.repository
227
self.base_rev_id = common_ancestor(self.this_basis,
232
except NoCommonAncestor:
233
raise UnrelatedBranches()
234
self.base_tree = _get_revid_tree(self.this_branch, self.base_rev_id,
236
self.base_is_ancestor = True
238
base_branch, self.base_tree = _get_tree(base_revision)
581
base_branch, self.base_tree = self._get_tree(base_revision)
239
582
if base_revision[1] == -1:
240
583
self.base_rev_id = base_branch.last_revision()
241
584
elif base_revision[1] is None:
242
self.base_rev_id = None
585
self.base_rev_id = _mod_revision.NULL_REVISION
244
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
245
if self.this_branch.base != base_branch.base:
246
self.this_branch.fetch(base_branch)
247
self.base_is_ancestor = is_ancestor(self.this_basis,
587
self.base_rev_id = _mod_revision.ensure_null(
588
base_branch.get_rev_id(base_revision[1]))
589
self._maybe_fetch(base_branch, self.this_branch, self.base_rev_id)
252
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
253
'other_tree': self.other_tree,
591
def make_merger(self):
592
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
593
'other_tree': self.other_tree,
254
594
'interesting_ids': self.interesting_ids,
595
'interesting_files': self.interesting_files,
596
'this_branch': self.this_branch,
256
598
if self.merge_type.requires_base:
257
599
kwargs['base_tree'] = self.base_tree
258
600
if self.merge_type.supports_reprocess:
259
601
kwargs['reprocess'] = self.reprocess
260
602
elif self.reprocess:
261
raise BzrError("Conflict reduction is not supported for merge"
262
" type %s." % self.merge_type)
603
raise errors.BzrError(
604
"Conflict reduction is not supported for merge"
605
" type %s." % self.merge_type)
263
606
if self.merge_type.supports_show_base:
264
607
kwargs['show_base'] = self.show_base
265
608
elif self.show_base:
266
raise BzrError("Showing base is not supported for this"
609
raise errors.BzrError("Showing base is not supported for this"
267
610
" merge type. %s" % self.merge_type)
268
merge = self.merge_type(pb=self._pb, **kwargs)
611
if (not getattr(self.merge_type, 'supports_reverse_cherrypick', True)
612
and not self.base_is_other_ancestor):
613
raise errors.CannotReverseCherrypick()
614
if self.merge_type.supports_cherrypick:
615
kwargs['cherrypick'] = (not self.base_is_ancestor or
616
not self.base_is_other_ancestor)
617
if self._is_criss_cross and getattr(self.merge_type,
618
'supports_lca_trees', False):
619
kwargs['lca_trees'] = self._lca_trees
620
return self.merge_type(pb=None,
621
change_reporter=self.change_reporter,
624
def _do_merge_to(self):
625
merge = self.make_merger()
626
if self.other_branch is not None:
627
self.other_branch.update_references(self.this_branch)
629
if self.recurse == 'down':
630
for relpath, file_id in self.this_tree.iter_references():
631
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
632
other_revision = self.other_tree.get_reference_revision(
634
if other_revision == sub_tree.last_revision():
636
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
637
sub_merge.merge_type = self.merge_type
638
other_branch = self.other_branch.reference_parent(file_id, relpath)
639
sub_merge.set_other_revision(other_revision, other_branch)
640
base_revision = self.base_tree.get_reference_revision(file_id)
641
sub_merge.base_tree = \
642
sub_tree.branch.repository.revision_tree(base_revision)
643
sub_merge.base_rev_id = base_revision
648
operation = OperationWithCleanups(self._do_merge_to)
649
self.this_tree.lock_tree_write()
650
operation.add_cleanup(self.this_tree.unlock)
651
if self.base_tree is not None:
652
self.base_tree.lock_read()
653
operation.add_cleanup(self.base_tree.unlock)
654
if self.other_tree is not None:
655
self.other_tree.lock_read()
656
operation.add_cleanup(self.other_tree.unlock)
657
merge = operation.run_simple()
269
658
if len(merge.cooked_conflicts) == 0:
270
if not self.ignore_zero:
271
note("All changes applied successfully.")
659
if not self.ignore_zero and not trace.is_quiet():
660
trace.note("All changes applied successfully.")
273
note("%d conflicts encountered." % len(merge.cooked_conflicts))
662
trace.note("%d conflicts encountered."
663
% len(merge.cooked_conflicts))
275
665
return len(merge.cooked_conflicts)
277
def regen_inventory(self, new_entries):
278
old_entries = self.this_tree.read_working_inventory()
282
for path, file_id in new_entries:
285
new_entries_map[file_id] = path
287
def id2path(file_id):
288
path = new_entries_map.get(file_id)
291
entry = old_entries[file_id]
292
if entry.parent_id is None:
294
return pathjoin(id2path(entry.parent_id), entry.name)
296
for file_id in old_entries:
297
entry = old_entries[file_id]
298
path = id2path(file_id)
299
if file_id in self.base_tree.inventory:
300
executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
302
executable = getattr(entry, 'executable', False)
303
new_inventory[file_id] = (path, file_id, entry.parent_id,
304
entry.kind, executable)
306
by_path[path] = file_id
311
for path, file_id in new_entries:
313
del new_inventory[file_id]
316
new_path_list.append((path, file_id))
317
if file_id not in old_entries:
319
# Ensure no file is added before its parent
321
for path, file_id in new_path_list:
325
parent = by_path[os.path.dirname(path)]
326
abspath = pathjoin(self.this_tree.basedir, path)
327
kind = bzrlib.osutils.file_kind(abspath)
328
if file_id in self.base_tree.inventory:
329
executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
332
new_inventory[file_id] = (path, file_id, parent, kind, executable)
333
by_path[path] = file_id
335
# Get a list in insertion order
336
new_inventory_list = new_inventory.values()
337
mutter ("""Inventory regeneration:
338
old length: %i insertions: %i deletions: %i new_length: %i"""\
339
% (len(old_entries), insertions, deletions,
340
len(new_inventory_list)))
341
assert len(new_inventory_list) == len(old_entries) + insertions\
343
new_inventory_list.sort()
344
return new_inventory_list
668
class _InventoryNoneEntry(object):
669
"""This represents an inventory entry which *isn't there*.
671
It simplifies the merging logic if we always have an InventoryEntry, even
672
if it isn't actually present
679
symlink_target = None
682
_none_entry = _InventoryNoneEntry()
347
685
class Merge3Merger(object):
350
688
supports_reprocess = True
351
689
supports_show_base = True
352
690
history_based = False
691
supports_cherrypick = True
692
supports_reverse_cherrypick = True
693
winner_idx = {"this": 2, "other": 1, "conflict": 1}
694
supports_lca_trees = True
354
def __init__(self, working_tree, this_tree, base_tree, other_tree,
696
def __init__(self, working_tree, this_tree, base_tree, other_tree,
355
697
interesting_ids=None, reprocess=False, show_base=False,
356
pb=DummyProgress(), pp=None):
357
"""Initialize the merger object and perform the merge."""
698
pb=None, pp=None, change_reporter=None,
699
interesting_files=None, do_merge=True,
700
cherrypick=False, lca_trees=None, this_branch=None):
701
"""Initialize the merger object and perform the merge.
703
:param working_tree: The working tree to apply the merge to
704
:param this_tree: The local tree in the merge operation
705
:param base_tree: The common tree in the merge operation
706
:param other_tree: The other tree to merge changes from
707
:param this_branch: The branch associated with this_tree. Defaults to
708
this_tree.branch if not supplied.
709
:param interesting_ids: The file_ids of files that should be
710
participate in the merge. May not be combined with
712
:param: reprocess If True, perform conflict-reduction processing.
713
:param show_base: If True, show the base revision in text conflicts.
714
(incompatible with reprocess)
716
:param pp: A ProgressPhase object
717
:param change_reporter: An object that should report changes made
718
:param interesting_files: The tree-relative paths of files that should
719
participate in the merge. If these paths refer to directories,
720
the contents of those directories will also be included. May not
721
be combined with interesting_ids. If neither interesting_files nor
722
interesting_ids is specified, all files may participate in the
724
:param lca_trees: Can be set to a dictionary of {revision_id:rev_tree}
725
if the ancestry was found to include a criss-cross merge.
726
Otherwise should be None.
358
728
object.__init__(self)
729
if interesting_files is not None and interesting_ids is not None:
731
'specify either interesting_ids or interesting_files')
732
if this_branch is None:
733
this_branch = this_tree.branch
734
self.interesting_ids = interesting_ids
735
self.interesting_files = interesting_files
359
736
self.this_tree = working_tree
360
737
self.base_tree = base_tree
361
738
self.other_tree = other_tree
739
self.this_branch = this_branch
362
740
self._raw_conflicts = []
363
741
self.cooked_conflicts = []
364
742
self.reprocess = reprocess
365
743
self.show_base = show_base
369
self.pp = ProgressPhase("Merge phase", 3, self.pb)
371
if interesting_ids is not None:
372
all_ids = interesting_ids
374
all_ids = set(base_tree)
375
all_ids.update(other_tree)
376
working_tree.lock_write()
377
self.tt = TreeTransform(working_tree, self.pb)
380
child_pb = ui.ui_factory.nested_progress_bar()
382
for num, file_id in enumerate(all_ids):
383
child_pb.update('Preparing file merge', num, len(all_ids))
384
self.merge_names(file_id)
385
file_status = self.merge_contents(file_id)
386
self.merge_executable(file_id, file_status)
391
child_pb = ui.ui_factory.nested_progress_bar()
393
fs_conflicts = resolve_conflicts(self.tt, child_pb)
396
self.cook_conflicts(fs_conflicts)
397
for conflict in self.cooked_conflicts:
400
results = self.tt.apply()
401
self.write_modified(results)
403
working_tree.add_conflicts(self.cooked_conflicts)
404
except UnsupportedOperation:
408
working_tree.unlock()
744
self._lca_trees = lca_trees
745
# Uncommenting this will change the default algorithm to always use
746
# _entries_lca. This can be useful for running the test suite and
747
# making sure we haven't missed any corner cases.
748
# if lca_trees is None:
749
# self._lca_trees = [self.base_tree]
750
self.change_reporter = change_reporter
751
self.cherrypick = cherrypick
755
warnings.warn("pp argument to Merge3Merger is deprecated")
757
warnings.warn("pb argument to Merge3Merger is deprecated")
760
operation = OperationWithCleanups(self._do_merge)
761
self.this_tree.lock_tree_write()
762
operation.add_cleanup(self.this_tree.unlock)
763
self.base_tree.lock_read()
764
operation.add_cleanup(self.base_tree.unlock)
765
self.other_tree.lock_read()
766
operation.add_cleanup(self.other_tree.unlock)
769
def _do_merge(self, operation):
770
self.tt = transform.TreeTransform(self.this_tree, None)
771
operation.add_cleanup(self.tt.finalize)
772
self._compute_transform()
773
results = self.tt.apply(no_conflicts=True)
774
self.write_modified(results)
776
self.this_tree.add_conflicts(self.cooked_conflicts)
777
except errors.UnsupportedOperation:
780
def make_preview_transform(self):
781
operation = OperationWithCleanups(self._make_preview_transform)
782
self.base_tree.lock_read()
783
operation.add_cleanup(self.base_tree.unlock)
784
self.other_tree.lock_read()
785
operation.add_cleanup(self.other_tree.unlock)
786
return operation.run_simple()
788
def _make_preview_transform(self):
789
self.tt = transform.TransformPreview(self.this_tree)
790
self._compute_transform()
793
def _compute_transform(self):
794
if self._lca_trees is None:
795
entries = self._entries3()
796
resolver = self._three_way
798
entries = self._entries_lca()
799
resolver = self._lca_multi_way
800
child_pb = ui.ui_factory.nested_progress_bar()
802
factories = Merger.hooks['merge_file_content']
803
hooks = [factory(self) for factory in factories] + [self]
804
self.active_hooks = [hook for hook in hooks if hook is not None]
805
for num, (file_id, changed, parents3, names3,
806
executable3) in enumerate(entries):
807
child_pb.update('Preparing file merge', num, len(entries))
808
self._merge_names(file_id, parents3, names3, resolver=resolver)
810
file_status = self._do_merge_contents(file_id)
812
file_status = 'unmodified'
813
self._merge_executable(file_id,
814
executable3, file_status, resolver=resolver)
818
child_pb = ui.ui_factory.nested_progress_bar()
820
fs_conflicts = transform.resolve_conflicts(self.tt, child_pb,
821
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
824
if self.change_reporter is not None:
825
from bzrlib import delta
826
delta.report_changes(
827
self.tt.iter_changes(), self.change_reporter)
828
self.cook_conflicts(fs_conflicts)
829
for conflict in self.cooked_conflicts:
830
trace.warning(conflict)
833
"""Gather data about files modified between three trees.
835
Return a list of tuples of file_id, changed, parents3, names3,
836
executable3. changed is a boolean indicating whether the file contents
837
or kind were changed. parents3 is a tuple of parent ids for base,
838
other and this. names3 is a tuple of names for base, other and this.
839
executable3 is a tuple of execute-bit values for base, other and this.
842
iterator = self.other_tree.iter_changes(self.base_tree,
843
include_unchanged=True, specific_files=self.interesting_files,
844
extra_trees=[self.this_tree])
845
this_entries = dict((e.file_id, e) for p, e in
846
self.this_tree.iter_entries_by_dir(
847
self.interesting_ids))
848
for (file_id, paths, changed, versioned, parents, names, kind,
849
executable) in iterator:
850
if (self.interesting_ids is not None and
851
file_id not in self.interesting_ids):
853
entry = this_entries.get(file_id)
854
if entry is not None:
855
this_name = entry.name
856
this_parent = entry.parent_id
857
this_executable = entry.executable
861
this_executable = None
862
parents3 = parents + (this_parent,)
863
names3 = names + (this_name,)
864
executable3 = executable + (this_executable,)
865
result.append((file_id, changed, parents3, names3, executable3))
868
def _entries_lca(self):
869
"""Gather data about files modified between multiple trees.
871
This compares OTHER versus all LCA trees, and for interesting entries,
872
it then compares with THIS and BASE.
874
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
875
:return: [(file_id, changed, parents, names, executable)]
876
file_id Simple file_id of the entry
877
changed Boolean, True if the kind or contents changed
879
parents ((base, [parent_id, in, lcas]), parent_id_other,
881
names ((base, [name, in, lcas]), name_in_other, name_in_this)
882
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
884
if self.interesting_files is not None:
885
lookup_trees = [self.this_tree, self.base_tree]
886
lookup_trees.extend(self._lca_trees)
887
# I think we should include the lca trees as well
888
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
891
interesting_ids = self.interesting_ids
893
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
895
base_inventory = self.base_tree.inventory
896
this_inventory = self.this_tree.inventory
897
for path, file_id, other_ie, lca_values in walker.iter_all():
898
# Is this modified at all from any of the other trees?
900
other_ie = _none_entry
901
if interesting_ids is not None and file_id not in interesting_ids:
904
# If other_revision is found in any of the lcas, that means this
905
# node is uninteresting. This is because when merging, if there are
906
# multiple heads(), we have to create a new node. So if we didn't,
907
# we know that the ancestry is linear, and that OTHER did not
909
# See doc/developers/lca_merge_resolution.txt for details
910
other_revision = other_ie.revision
911
if other_revision is not None:
912
# We can't use this shortcut when other_revision is None,
913
# because it may be None because things are WorkingTrees, and
914
# not because it is *actually* None.
915
is_unmodified = False
916
for lca_path, ie in lca_values:
917
if ie is not None and ie.revision == other_revision:
924
for lca_path, lca_ie in lca_values:
926
lca_entries.append(_none_entry)
928
lca_entries.append(lca_ie)
930
if file_id in base_inventory:
931
base_ie = base_inventory[file_id]
933
base_ie = _none_entry
935
if file_id in this_inventory:
936
this_ie = this_inventory[file_id]
938
this_ie = _none_entry
944
for lca_ie in lca_entries:
945
lca_kinds.append(lca_ie.kind)
946
lca_parent_ids.append(lca_ie.parent_id)
947
lca_names.append(lca_ie.name)
948
lca_executable.append(lca_ie.executable)
950
kind_winner = self._lca_multi_way(
951
(base_ie.kind, lca_kinds),
952
other_ie.kind, this_ie.kind)
953
parent_id_winner = self._lca_multi_way(
954
(base_ie.parent_id, lca_parent_ids),
955
other_ie.parent_id, this_ie.parent_id)
956
name_winner = self._lca_multi_way(
957
(base_ie.name, lca_names),
958
other_ie.name, this_ie.name)
960
content_changed = True
961
if kind_winner == 'this':
962
# No kind change in OTHER, see if there are *any* changes
963
if other_ie.kind == 'directory':
964
if parent_id_winner == 'this' and name_winner == 'this':
965
# No change for this directory in OTHER, skip
967
content_changed = False
968
elif other_ie.kind is None or other_ie.kind == 'file':
969
def get_sha1(ie, tree):
970
if ie.kind != 'file':
972
return tree.get_file_sha1(file_id)
973
base_sha1 = get_sha1(base_ie, self.base_tree)
974
lca_sha1s = [get_sha1(ie, tree) for ie, tree
975
in zip(lca_entries, self._lca_trees)]
976
this_sha1 = get_sha1(this_ie, self.this_tree)
977
other_sha1 = get_sha1(other_ie, self.other_tree)
978
sha1_winner = self._lca_multi_way(
979
(base_sha1, lca_sha1s), other_sha1, this_sha1,
980
allow_overriding_lca=False)
981
exec_winner = self._lca_multi_way(
982
(base_ie.executable, lca_executable),
983
other_ie.executable, this_ie.executable)
984
if (parent_id_winner == 'this' and name_winner == 'this'
985
and sha1_winner == 'this' and exec_winner == 'this'):
986
# No kind, parent, name, exec, or content change for
987
# OTHER, so this node is not considered interesting
989
if sha1_winner == 'this':
990
content_changed = False
991
elif other_ie.kind == 'symlink':
992
def get_target(ie, tree):
993
if ie.kind != 'symlink':
995
return tree.get_symlink_target(file_id)
996
base_target = get_target(base_ie, self.base_tree)
997
lca_targets = [get_target(ie, tree) for ie, tree
998
in zip(lca_entries, self._lca_trees)]
999
this_target = get_target(this_ie, self.this_tree)
1000
other_target = get_target(other_ie, self.other_tree)
1001
target_winner = self._lca_multi_way(
1002
(base_target, lca_targets),
1003
other_target, this_target)
1004
if (parent_id_winner == 'this' and name_winner == 'this'
1005
and target_winner == 'this'):
1006
# No kind, parent, name, or symlink target change
1009
if target_winner == 'this':
1010
content_changed = False
1011
elif other_ie.kind == 'tree-reference':
1012
# The 'changed' information seems to be handled at a higher
1013
# level. At least, _entries3 returns False for content
1014
# changed, even when at a new revision_id.
1015
content_changed = False
1016
if (parent_id_winner == 'this' and name_winner == 'this'):
1017
# Nothing interesting
1020
raise AssertionError('unhandled kind: %s' % other_ie.kind)
1022
# If we have gotten this far, that means something has changed
1023
result.append((file_id, content_changed,
1024
((base_ie.parent_id, lca_parent_ids),
1025
other_ie.parent_id, this_ie.parent_id),
1026
((base_ie.name, lca_names),
1027
other_ie.name, this_ie.name),
1028
((base_ie.executable, lca_executable),
1029
other_ie.executable, this_ie.executable)
1036
self.tt.final_kind(self.tt.root)
1037
except errors.NoSuchFile:
1038
self.tt.cancel_deletion(self.tt.root)
1039
if self.tt.final_file_id(self.tt.root) is None:
1040
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
1042
other_root_file_id = self.other_tree.get_root_id()
1043
if other_root_file_id is None:
1045
other_root = self.tt.trans_id_file_id(other_root_file_id)
1046
if other_root == self.tt.root:
1048
if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1049
# the other tree's root is a non-root in the current tree (as when
1050
# a previously unrelated branch is merged into another)
1053
self.tt.final_kind(other_root)
1054
other_root_is_present = True
1055
except errors.NoSuchFile:
1056
# other_root doesn't have a physical representation. We still need
1057
# to move any references to the actual root of the tree.
1058
other_root_is_present = False
1059
# 'other_tree.inventory.root' is not present in this tree. We are
1060
# calling adjust_path for children which *want* to be present with a
1061
# correct place to go.
1062
for thing, child in self.other_tree.inventory.root.children.iteritems():
1063
trans_id = self.tt.trans_id_file_id(child.file_id)
1064
if not other_root_is_present:
1065
# FIXME: Make final_kind returns None instead of raising
1066
# NoSuchFile to avoid the ugly construct below -- vila 20100402
1068
self.tt.final_kind(trans_id)
1069
# The item exist in the final tree and has a defined place
1072
except errors.NoSuchFile, e:
1074
# Move the item into the root
1075
self.tt.adjust_path(self.tt.final_name(trans_id),
1076
self.tt.root, trans_id)
1077
if other_root_is_present:
1078
self.tt.cancel_creation(other_root)
1079
self.tt.cancel_versioning(other_root)
411
1081
def write_modified(self, results):
412
1082
modified_hashes = {}
537
1285
return kind, contents
539
def contents_conflict():
540
trans_id = self.tt.trans_id_file_id(file_id)
541
name = self.tt.final_name(trans_id)
542
parent_id = self.tt.final_parent(trans_id)
543
if file_id in self.this_tree.inventory:
544
self.tt.unversion_file(trans_id)
545
self.tt.delete_contents(trans_id)
546
file_group = self._dump_conflicts(name, parent_id, file_id,
548
self._raw_conflicts.append(('contents conflict', file_group))
550
1287
# See SPOT run. run, SPOT, run.
551
1288
# So we're not QUITE repeating ourselves; we do tricky things with
553
1290
base_pair = contents_pair(self.base_tree)
554
1291
other_pair = contents_pair(self.other_tree)
555
if base_pair == other_pair:
556
# OTHER introduced no changes
558
this_pair = contents_pair(self.this_tree)
559
if this_pair == other_pair:
560
# THIS and OTHER introduced the same changes
563
trans_id = self.tt.trans_id_file_id(file_id)
564
if this_pair == base_pair:
565
# only OTHER introduced changes
566
if file_id in self.this_tree:
567
# Remove any existing contents
568
self.tt.delete_contents(trans_id)
569
if file_id in self.other_tree:
570
# OTHER changed the file
571
create_by_entry(self.tt,
572
self.other_tree.inventory[file_id],
573
self.other_tree, trans_id)
574
if file_id not in self.this_tree.inventory:
575
self.tt.version_file(file_id, trans_id)
577
elif file_id in self.this_tree.inventory:
578
# OTHER deleted the file
579
self.tt.unversion_file(trans_id)
581
#BOTH THIS and OTHER introduced changes; scalar conflict
582
elif this_pair[0] == "file" and other_pair[0] == "file":
583
# THIS and OTHER are both files, so text merge. Either
584
# BASE is a file, or both converted to files, so at least we
585
# have agreement that output should be a file.
587
self.text_merge(file_id, trans_id)
589
return contents_conflict()
590
if file_id not in self.this_tree.inventory:
591
self.tt.version_file(file_id, trans_id)
593
self.tt.tree_kind(trans_id)
594
self.tt.delete_contents(trans_id)
599
# Scalar conflict, can't text merge. Dump conflicts
600
return contents_conflict()
1293
this_pair = contents_pair(self.this_tree)
1294
lca_pairs = [contents_pair(tree) for tree in self._lca_trees]
1295
winner = self._lca_multi_way((base_pair, lca_pairs), other_pair,
1296
this_pair, allow_overriding_lca=False)
1298
if base_pair == other_pair:
1301
# We delayed evaluating this_pair as long as we can to avoid
1302
# unnecessary sha1 calculation
1303
this_pair = contents_pair(self.this_tree)
1304
winner = self._three_way(base_pair, other_pair, this_pair)
1305
if winner == 'this':
1306
# No interesting changes introduced by OTHER
1308
# We have a hypothetical conflict, but if we have files, then we
1309
# can try to merge the content
1310
trans_id = self.tt.trans_id_file_id(file_id)
1311
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1312
other_pair[0], winner)
1313
hooks = self.active_hooks
1314
hook_status = 'not_applicable'
1316
hook_status, lines = hook.merge_contents(params)
1317
if hook_status != 'not_applicable':
1318
# Don't try any more hooks, this one applies.
1321
if hook_status == 'not_applicable':
1322
# This is a contents conflict, because none of the available
1323
# functions could merge it.
1325
name = self.tt.final_name(trans_id)
1326
parent_id = self.tt.final_parent(trans_id)
1327
if self.this_tree.has_id(file_id):
1328
self.tt.unversion_file(trans_id)
1329
file_group = self._dump_conflicts(name, parent_id, file_id,
1331
self._raw_conflicts.append(('contents conflict', file_group))
1332
elif hook_status == 'success':
1333
self.tt.create_file(lines, trans_id)
1334
elif hook_status == 'conflicted':
1335
# XXX: perhaps the hook should be able to provide
1336
# the BASE/THIS/OTHER files?
1337
self.tt.create_file(lines, trans_id)
1338
self._raw_conflicts.append(('text conflict', trans_id))
1339
name = self.tt.final_name(trans_id)
1340
parent_id = self.tt.final_parent(trans_id)
1341
self._dump_conflicts(name, parent_id, file_id)
1342
elif hook_status == 'delete':
1343
self.tt.unversion_file(trans_id)
1345
elif hook_status == 'done':
1346
# The hook function did whatever it needs to do directly, no
1347
# further action needed here.
1350
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1351
if not self.this_tree.has_id(file_id) and result == "modified":
1352
self.tt.version_file(file_id, trans_id)
1353
# The merge has been performed, so the old contents should not be
1356
self.tt.delete_contents(trans_id)
1357
except errors.NoSuchFile:
1361
def _default_other_winner_merge(self, merge_hook_params):
1362
"""Replace this contents with other."""
1363
file_id = merge_hook_params.file_id
1364
trans_id = merge_hook_params.trans_id
1365
file_in_this = self.this_tree.has_id(file_id)
1366
if self.other_tree.has_id(file_id):
1367
# OTHER changed the file
1369
if wt.supports_content_filtering():
1370
# We get the path from the working tree if it exists.
1371
# That fails though when OTHER is adding a file, so
1372
# we fall back to the other tree to find the path if
1373
# it doesn't exist locally.
1375
filter_tree_path = wt.id2path(file_id)
1376
except errors.NoSuchId:
1377
filter_tree_path = self.other_tree.id2path(file_id)
1379
# Skip the id2path lookup for older formats
1380
filter_tree_path = None
1381
transform.create_from_tree(self.tt, trans_id,
1382
self.other_tree, file_id,
1383
filter_tree_path=filter_tree_path)
1386
# OTHER deleted the file
1387
return 'delete', None
1389
raise AssertionError(
1390
'winner is OTHER, but file_id %r not in THIS or OTHER tree'
1393
def merge_contents(self, merge_hook_params):
1394
"""Fallback merge logic after user installed hooks."""
1395
# This function is used in merge hooks as the fallback instance.
1396
# Perhaps making this function and the functions it calls be a
1397
# a separate class would be better.
1398
if merge_hook_params.winner == 'other':
1399
# OTHER is a straight winner, so replace this contents with other
1400
return self._default_other_winner_merge(merge_hook_params)
1401
elif merge_hook_params.is_file_merge():
1402
# THIS and OTHER are both files, so text merge. Either
1403
# BASE is a file, or both converted to files, so at least we
1404
# have agreement that output should be a file.
1406
self.text_merge(merge_hook_params.file_id,
1407
merge_hook_params.trans_id)
1408
except errors.BinaryFile:
1409
return 'not_applicable', None
1412
return 'not_applicable', None
602
1414
def get_lines(self, tree, file_id):
603
1415
"""Return the lines in a file, or an empty list."""
1416
if tree.has_id(file_id):
605
1417
return tree.get_file(file_id).readlines()
745
1588
if path.endswith(suffix):
746
1589
path = path[:-len(suffix)]
748
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
749
self.cooked_conflicts.append(c)
750
if conflict_type == 'text conflict':
1591
c = _mod_conflicts.Conflict.factory(conflict_type,
1592
path=path, file_id=file_id)
1593
elif conflict_type == 'text conflict':
751
1594
trans_id = conflict[1]
752
1595
path = fp.get_path(trans_id)
753
1596
file_id = self.tt.final_file_id(trans_id)
754
c = Conflict.factory(conflict_type, path=path, file_id=file_id)
755
self.cooked_conflicts.append(c)
757
for trans_id, conflicts in name_conflicts.iteritems():
759
this_parent, other_parent = conflicts['parent conflict']
760
assert this_parent != other_parent
762
this_parent = other_parent = \
763
self.tt.final_file_id(self.tt.final_parent(trans_id))
765
this_name, other_name = conflicts['name conflict']
766
assert this_name != other_name
768
this_name = other_name = self.tt.final_name(trans_id)
769
other_path = fp.get_path(trans_id)
770
if this_parent is not None:
772
fp.get_path(self.tt.trans_id_file_id(this_parent))
773
this_path = pathjoin(this_parent_path, this_name)
1597
c = _mod_conflicts.Conflict.factory(conflict_type,
1598
path=path, file_id=file_id)
775
this_path = "<deleted>"
776
file_id = self.tt.final_file_id(trans_id)
777
c = Conflict.factory('path conflict', path=this_path,
778
conflict_path=other_path, file_id=file_id)
1600
raise AssertionError('bad conflict type: %r' % (conflict,))
779
1601
self.cooked_conflicts.append(c)
780
self.cooked_conflicts.sort(key=Conflict.sort_key)
1602
self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
783
1605
class WeaveMerger(Merge3Merger):
784
1606
"""Three-way tree merger, text weave merger."""
785
1607
supports_reprocess = True
786
1608
supports_show_base = False
788
def __init__(self, working_tree, this_tree, base_tree, other_tree,
789
interesting_ids=None, pb=DummyProgress(), pp=None,
791
self.this_revision_tree = self._get_revision_tree(this_tree)
792
self.other_revision_tree = self._get_revision_tree(other_tree)
793
super(WeaveMerger, self).__init__(working_tree, this_tree,
794
base_tree, other_tree,
795
interesting_ids=interesting_ids,
796
pb=pb, pp=pp, reprocess=reprocess)
798
def _get_revision_tree(self, tree):
799
"""Return a revision tree related to this tree.
800
If the tree is a WorkingTree, the basis will be returned.
802
if getattr(tree, 'get_weave', False) is False:
803
# If we have a WorkingTree, try using the basis
804
return tree.branch.basis_tree()
808
def _check_file(self, file_id):
809
"""Check that the revision tree's version of the file matches."""
810
for tree, rt in ((self.this_tree, self.this_revision_tree),
811
(self.other_tree, self.other_revision_tree)):
814
if tree.get_file_sha1(file_id) != rt.get_file_sha1(file_id):
815
raise WorkingTreeNotRevision(self.this_tree)
1609
supports_reverse_cherrypick = False
1610
history_based = True
1612
def _generate_merge_plan(self, file_id, base):
1613
return self.this_tree.plan_file_merge(file_id, self.other_tree,
817
1616
def _merged_lines(self, file_id):
818
1617
"""Generate the merged lines.
819
1618
There is no distinction between lines that are meant to contain <<<<<<<
822
weave = self.this_revision_tree.get_weave(file_id)
823
this_revision_id = self.this_revision_tree.inventory[file_id].revision
824
other_revision_id = \
825
self.other_revision_tree.inventory[file_id].revision
826
wm = WeaveMerge(weave, this_revision_id, other_revision_id,
827
'<<<<<<< TREE\n', '>>>>>>> MERGE-SOURCE\n')
828
return wm.merge_lines(self.reprocess)
1622
base = self.base_tree
1625
plan = self._generate_merge_plan(file_id, base)
1626
if 'merge' in debug.debug_flags:
1628
trans_id = self.tt.trans_id_file_id(file_id)
1629
name = self.tt.final_name(trans_id) + '.plan'
1630
contents = ('%11s|%s' % l for l in plan)
1631
self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
1632
textmerge = versionedfile.PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1633
'>>>>>>> MERGE-SOURCE\n')
1634
lines, conflicts = textmerge.merge_lines(self.reprocess)
1636
base_lines = textmerge.base_from_plan()
1639
return lines, base_lines
830
1641
def text_merge(self, file_id, trans_id):
831
1642
"""Perform a (weave) text merge for a given file and file-id.
832
1643
If conflicts are encountered, .THIS and .OTHER files will be emitted,
833
1644
and a conflict will be noted.
835
self._check_file(file_id)
836
lines, conflicts = self._merged_lines(file_id)
1646
lines, base_lines = self._merged_lines(file_id)
837
1647
lines = list(lines)
838
# Note we're checking whether the OUTPUT is binary in this case,
1648
# Note we're checking whether the OUTPUT is binary in this case,
839
1649
# because we don't want to get into weave merge guts.
840
check_text_lines(lines)
1650
textfile.check_text_lines(lines)
841
1651
self.tt.create_file(lines, trans_id)
1652
if base_lines is not None:
843
1654
self._raw_conflicts.append(('text conflict', trans_id))
844
1655
name = self.tt.final_name(trans_id)
845
1656
parent_id = self.tt.final_parent(trans_id)
846
file_group = self._dump_conflicts(name, parent_id, file_id,
1657
file_group = self._dump_conflicts(name, parent_id, file_id,
1659
base_lines=base_lines)
848
1660
file_group.append(trans_id)
1663
class LCAMerger(WeaveMerger):
1665
def _generate_merge_plan(self, file_id, base):
1666
return self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
851
1669
class Diff3Merger(Merge3Merger):
852
1670
"""Three-way merger using external diff3 for text merging"""
854
1672
def dump_file(self, temp_dir, name, tree, file_id):
855
out_path = pathjoin(temp_dir, name)
1673
out_path = osutils.pathjoin(temp_dir, name)
856
1674
out_file = open(out_path, "wb")
858
1676
in_file = tree.get_file(file_id)
886
1704
name = self.tt.final_name(trans_id)
887
1705
parent_id = self.tt.final_parent(trans_id)
888
1706
self._dump_conflicts(name, parent_id, file_id)
889
self._raw_conflicts.append(('text conflict', trans_id))
1707
self._raw_conflicts.append(('text conflict', trans_id))
1709
osutils.rmtree(temp_dir)
894
1712
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
896
merge_type=Merge3Merger,
897
interesting_ids=None,
1714
merge_type=Merge3Merger,
1715
interesting_ids=None,
900
1718
other_rev_id=None,
901
1719
interesting_files=None,
904
"""Primary interface for merging.
1722
change_reporter=None):
1723
"""Primary interface for merging.
906
typical use is probably
1725
typical use is probably
907
1726
'merge_inner(branch, branch.get_revision_tree(other_revision),
908
1727
branch.get_revision_tree(base_revision))'
910
1729
if this_tree is None:
911
warnings.warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
912
"bzrlib version 0.8.",
915
this_tree = this_branch.bzrdir.open_workingtree()
916
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1730
raise errors.BzrError("bzrlib.merge.merge_inner requires a this_tree "
1731
"parameter as of bzrlib version 0.8.")
1732
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1733
pb=pb, change_reporter=change_reporter)
918
1734
merger.backup_files = backup_files
919
1735
merger.merge_type = merge_type
920
1736
merger.interesting_ids = interesting_ids
921
1737
merger.ignore_zero = ignore_zero
922
1738
if interesting_files:
923
assert not interesting_ids, ('Only supply interesting_ids'
924
' or interesting_files')
925
merger._set_interesting_files(interesting_files)
1740
raise ValueError('Only supply interesting_ids'
1741
' or interesting_files')
1742
merger.interesting_files = interesting_files
926
1743
merger.show_base = show_base
927
1744
merger.reprocess = reprocess
928
1745
merger.other_rev_id = other_rev_id
929
1746
merger.other_basis = other_rev_id
1747
get_revision_id = getattr(base_tree, 'get_revision_id', None)
1748
if get_revision_id is None:
1749
get_revision_id = base_tree.last_revision
1750
merger.cache_trees_with_revision_ids([other_tree, base_tree, this_tree])
1751
merger.set_base_revision(get_revision_id(), this_branch)
930
1752
return merger.do_merge()
933
merge_types = { "merge3": (Merge3Merger, "Native diff3-style merge"),
934
"diff3": (Diff3Merger, "Merge using external diff3"),
935
'weave': (WeaveMerger, "Weave-based merge")
939
def merge_type_help():
940
templ = '%s%%7s: %%s' % (' '*12)
941
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
942
return '\n'.join(lines)
1754
def get_merge_type_registry():
1755
"""Merge type registry is in bzrlib.option to avoid circular imports.
1757
This method provides a sanctioned way to retrieve it.
1759
from bzrlib import option
1760
return option._merge_type_registry
1763
def _plan_annotate_merge(annotated_a, annotated_b, ancestors_a, ancestors_b):
1764
def status_a(revision, text):
1765
if revision in ancestors_b:
1766
return 'killed-b', text
1768
return 'new-a', text
1770
def status_b(revision, text):
1771
if revision in ancestors_a:
1772
return 'killed-a', text
1774
return 'new-b', text
1776
plain_a = [t for (a, t) in annotated_a]
1777
plain_b = [t for (a, t) in annotated_b]
1778
matcher = patiencediff.PatienceSequenceMatcher(None, plain_a, plain_b)
1779
blocks = matcher.get_matching_blocks()
1782
for ai, bi, l in blocks:
1783
# process all mismatched sections
1784
# (last mismatched section is handled because blocks always
1785
# includes a 0-length last block)
1786
for revision, text in annotated_a[a_cur:ai]:
1787
yield status_a(revision, text)
1788
for revision, text in annotated_b[b_cur:bi]:
1789
yield status_b(revision, text)
1790
# and now the matched section
1793
for text_a in plain_a[ai:a_cur]:
1794
yield "unchanged", text_a
1797
class _PlanMergeBase(object):
1799
def __init__(self, a_rev, b_rev, vf, key_prefix):
1802
:param a_rev: Revision-id of one revision to merge
1803
:param b_rev: Revision-id of the other revision to merge
1804
:param vf: A VersionedFiles containing both revisions
1805
:param key_prefix: A prefix for accessing keys in vf, typically
1811
self._last_lines = None
1812
self._last_lines_revision_id = None
1813
self._cached_matching_blocks = {}
1814
self._key_prefix = key_prefix
1815
self._precache_tip_lines()
1817
def _precache_tip_lines(self):
1818
lines = self.get_lines([self.a_rev, self.b_rev])
1819
self.lines_a = lines[self.a_rev]
1820
self.lines_b = lines[self.b_rev]
1822
def get_lines(self, revisions):
1823
"""Get lines for revisions from the backing VersionedFiles.
1825
:raises RevisionNotPresent: on absent texts.
1827
keys = [(self._key_prefix + (rev,)) for rev in revisions]
1829
for record in self.vf.get_record_stream(keys, 'unordered', True):
1830
if record.storage_kind == 'absent':
1831
raise errors.RevisionNotPresent(record.key, self.vf)
1832
result[record.key[-1]] = osutils.chunks_to_lines(
1833
record.get_bytes_as('chunked'))
1836
def plan_merge(self):
1837
"""Generate a 'plan' for merging the two revisions.
1839
This involves comparing their texts and determining the cause of
1840
differences. If text A has a line and text B does not, then either the
1841
line was added to text A, or it was deleted from B. Once the causes
1842
are combined, they are written out in the format described in
1843
VersionedFile.plan_merge
1845
blocks = self._get_matching_blocks(self.a_rev, self.b_rev)
1846
unique_a, unique_b = self._unique_lines(blocks)
1847
new_a, killed_b = self._determine_status(self.a_rev, unique_a)
1848
new_b, killed_a = self._determine_status(self.b_rev, unique_b)
1849
return self._iter_plan(blocks, new_a, killed_b, new_b, killed_a)
1851
def _iter_plan(self, blocks, new_a, killed_b, new_b, killed_a):
1854
for i, j, n in blocks:
1855
for a_index in range(last_i, i):
1856
if a_index in new_a:
1857
if a_index in killed_b:
1858
yield 'conflicted-a', self.lines_a[a_index]
1860
yield 'new-a', self.lines_a[a_index]
1862
yield 'killed-b', self.lines_a[a_index]
1863
for b_index in range(last_j, j):
1864
if b_index in new_b:
1865
if b_index in killed_a:
1866
yield 'conflicted-b', self.lines_b[b_index]
1868
yield 'new-b', self.lines_b[b_index]
1870
yield 'killed-a', self.lines_b[b_index]
1871
# handle common lines
1872
for a_index in range(i, i+n):
1873
yield 'unchanged', self.lines_a[a_index]
1877
def _get_matching_blocks(self, left_revision, right_revision):
1878
"""Return a description of which sections of two revisions match.
1880
See SequenceMatcher.get_matching_blocks
1882
cached = self._cached_matching_blocks.get((left_revision,
1884
if cached is not None:
1886
if self._last_lines_revision_id == left_revision:
1887
left_lines = self._last_lines
1888
right_lines = self.get_lines([right_revision])[right_revision]
1890
lines = self.get_lines([left_revision, right_revision])
1891
left_lines = lines[left_revision]
1892
right_lines = lines[right_revision]
1893
self._last_lines = right_lines
1894
self._last_lines_revision_id = right_revision
1895
matcher = patiencediff.PatienceSequenceMatcher(None, left_lines,
1897
return matcher.get_matching_blocks()
1899
def _unique_lines(self, matching_blocks):
1900
"""Analyse matching_blocks to determine which lines are unique
1902
:return: a tuple of (unique_left, unique_right), where the values are
1903
sets of line numbers of unique lines.
1909
for i, j, n in matching_blocks:
1910
unique_left.extend(range(last_i, i))
1911
unique_right.extend(range(last_j, j))
1914
return unique_left, unique_right
1917
def _subtract_plans(old_plan, new_plan):
1918
"""Remove changes from new_plan that came from old_plan.
1920
It is assumed that the difference between the old_plan and new_plan
1921
is their choice of 'b' text.
1923
All lines from new_plan that differ from old_plan are emitted
1924
verbatim. All lines from new_plan that match old_plan but are
1925
not about the 'b' revision are emitted verbatim.
1927
Lines that match and are about the 'b' revision are the lines we
1928
don't want, so we convert 'killed-b' -> 'unchanged', and 'new-b'
1929
is skipped entirely.
1931
matcher = patiencediff.PatienceSequenceMatcher(None, old_plan,
1934
for i, j, n in matcher.get_matching_blocks():
1935
for jj in range(last_j, j):
1937
for jj in range(j, j+n):
1938
plan_line = new_plan[jj]
1939
if plan_line[0] == 'new-b':
1941
elif plan_line[0] == 'killed-b':
1942
yield 'unchanged', plan_line[1]
1948
class _PlanMerge(_PlanMergeBase):
1949
"""Plan an annotate merge using on-the-fly annotation"""
1951
def __init__(self, a_rev, b_rev, vf, key_prefix):
1952
super(_PlanMerge, self).__init__(a_rev, b_rev, vf, key_prefix)
1953
self.a_key = self._key_prefix + (self.a_rev,)
1954
self.b_key = self._key_prefix + (self.b_rev,)
1955
self.graph = _mod_graph.Graph(self.vf)
1956
heads = self.graph.heads((self.a_key, self.b_key))
1958
# one side dominates, so we can just return its values, yay for
1960
# Ideally we would know that before we get this far
1961
self._head_key = heads.pop()
1962
if self._head_key == self.a_key:
1966
trace.mutter('found dominating revision for %s\n%s > %s', self.vf,
1967
self._head_key[-1], other)
1970
self._head_key = None
1973
def _precache_tip_lines(self):
1974
# Turn this into a no-op, because we will do this later
1977
def _find_recursive_lcas(self):
1978
"""Find all the ancestors back to a unique lca"""
1979
cur_ancestors = (self.a_key, self.b_key)
1980
# graph.find_lca(uncommon, keys) now returns plain NULL_REVISION,
1981
# rather than a key tuple. We will just map that directly to no common
1985
next_lcas = self.graph.find_lca(*cur_ancestors)
1986
# Map a plain NULL_REVISION to a simple no-ancestors
1987
if next_lcas == set([_mod_revision.NULL_REVISION]):
1989
# Order the lca's based on when they were merged into the tip
1990
# While the actual merge portion of weave merge uses a set() of
1991
# active revisions, the order of insertion *does* effect the
1992
# implicit ordering of the texts.
1993
for rev_key in cur_ancestors:
1994
ordered_parents = tuple(self.graph.find_merge_order(rev_key,
1996
parent_map[rev_key] = ordered_parents
1997
if len(next_lcas) == 0:
1999
elif len(next_lcas) == 1:
2000
parent_map[list(next_lcas)[0]] = ()
2002
elif len(next_lcas) > 2:
2003
# More than 2 lca's, fall back to grabbing all nodes between
2004
# this and the unique lca.
2005
trace.mutter('More than 2 LCAs, falling back to all nodes for:'
2007
self.a_key, self.b_key, cur_ancestors)
2008
cur_lcas = next_lcas
2009
while len(cur_lcas) > 1:
2010
cur_lcas = self.graph.find_lca(*cur_lcas)
2011
if len(cur_lcas) == 0:
2012
# No common base to find, use the full ancestry
2015
unique_lca = list(cur_lcas)[0]
2016
if unique_lca == _mod_revision.NULL_REVISION:
2017
# find_lca will return a plain 'NULL_REVISION' rather
2018
# than a key tuple when there is no common ancestor, we
2019
# prefer to just use None, because it doesn't confuse
2020
# _get_interesting_texts()
2022
parent_map.update(self._find_unique_parents(next_lcas,
2025
cur_ancestors = next_lcas
2028
def _find_unique_parents(self, tip_keys, base_key):
2029
"""Find ancestors of tip that aren't ancestors of base.
2031
:param tip_keys: Nodes that are interesting
2032
:param base_key: Cull all ancestors of this node
2033
:return: The parent map for all revisions between tip_keys and
2034
base_key. base_key will be included. References to nodes outside of
2035
the ancestor set will also be removed.
2037
# TODO: this would be simpler if find_unique_ancestors took a list
2038
# instead of a single tip, internally it supports it, but it
2039
# isn't a "backwards compatible" api change.
2040
if base_key is None:
2041
parent_map = dict(self.graph.iter_ancestry(tip_keys))
2042
# We remove NULL_REVISION because it isn't a proper tuple key, and
2043
# thus confuses things like _get_interesting_texts, and our logic
2044
# to add the texts into the memory weave.
2045
if _mod_revision.NULL_REVISION in parent_map:
2046
parent_map.pop(_mod_revision.NULL_REVISION)
2049
for tip in tip_keys:
2051
self.graph.find_unique_ancestors(tip, [base_key]))
2052
parent_map = self.graph.get_parent_map(interesting)
2053
parent_map[base_key] = ()
2054
culled_parent_map, child_map, tails = self._remove_external_references(
2056
# Remove all the tails but base_key
2057
if base_key is not None:
2058
tails.remove(base_key)
2059
self._prune_tails(culled_parent_map, child_map, tails)
2060
# Now remove all the uninteresting 'linear' regions
2061
simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
2065
def _remove_external_references(parent_map):
2066
"""Remove references that go outside of the parent map.
2068
:param parent_map: Something returned from Graph.get_parent_map(keys)
2069
:return: (filtered_parent_map, child_map, tails)
2070
filtered_parent_map is parent_map without external references
2071
child_map is the {parent_key: [child_keys]} mapping
2072
tails is a list of nodes that do not have any parents in the map
2074
# TODO: The basic effect of this function seems more generic than
2075
# _PlanMerge. But the specific details of building a child_map,
2076
# and computing tails seems very specific to _PlanMerge.
2077
# Still, should this be in Graph land?
2078
filtered_parent_map = {}
2081
for key, parent_keys in parent_map.iteritems():
2082
culled_parent_keys = [p for p in parent_keys if p in parent_map]
2083
if not culled_parent_keys:
2085
for parent_key in culled_parent_keys:
2086
child_map.setdefault(parent_key, []).append(key)
2087
# TODO: Do we want to do this, it adds overhead for every node,
2088
# just to say that the node has no children
2089
child_map.setdefault(key, [])
2090
filtered_parent_map[key] = culled_parent_keys
2091
return filtered_parent_map, child_map, tails
2094
def _prune_tails(parent_map, child_map, tails_to_remove):
2095
"""Remove tails from the parent map.
2097
This will remove the supplied revisions until no more children have 0
2100
:param parent_map: A dict of {child: [parents]}, this dictionary will
2101
be modified in place.
2102
:param tails_to_remove: A list of tips that should be removed,
2103
this list will be consumed
2104
:param child_map: The reverse dict of parent_map ({parent: [children]})
2105
this dict will be modified
2106
:return: None, parent_map will be modified in place.
2108
while tails_to_remove:
2109
next = tails_to_remove.pop()
2110
parent_map.pop(next)
2111
children = child_map.pop(next)
2112
for child in children:
2113
child_parents = parent_map[child]
2114
child_parents.remove(next)
2115
if len(child_parents) == 0:
2116
tails_to_remove.append(child)
2118
def _get_interesting_texts(self, parent_map):
2119
"""Return a dict of texts we are interested in.
2121
Note that the input is in key tuples, but the output is in plain
2124
:param parent_map: The output from _find_recursive_lcas
2125
:return: A dict of {'revision_id':lines} as returned by
2126
_PlanMergeBase.get_lines()
2128
all_revision_keys = set(parent_map)
2129
all_revision_keys.add(self.a_key)
2130
all_revision_keys.add(self.b_key)
2132
# Everything else is in 'keys' but get_lines is in 'revision_ids'
2133
all_texts = self.get_lines([k[-1] for k in all_revision_keys])
2136
def _build_weave(self):
2137
from bzrlib import weave
2138
self._weave = weave.Weave(weave_name='in_memory_weave',
2139
allow_reserved=True)
2140
parent_map = self._find_recursive_lcas()
2142
all_texts = self._get_interesting_texts(parent_map)
2144
# Note: Unfortunately, the order given by topo_sort will effect the
2145
# ordering resolution in the output. Specifically, if you add A then B,
2146
# then in the output text A lines will show up before B lines. And, of
2147
# course, topo_sort doesn't guarantee any real ordering.
2148
# So we use merge_sort, and add a fake node on the tip.
2149
# This ensures that left-hand parents will always be inserted into the
2150
# weave before right-hand parents.
2151
tip_key = self._key_prefix + (_mod_revision.CURRENT_REVISION,)
2152
parent_map[tip_key] = (self.a_key, self.b_key)
2154
for seq_num, key, depth, eom in reversed(tsort.merge_sort(parent_map,
2158
# for key in tsort.topo_sort(parent_map):
2159
parent_keys = parent_map[key]
2160
revision_id = key[-1]
2161
parent_ids = [k[-1] for k in parent_keys]
2162
self._weave.add_lines(revision_id, parent_ids,
2163
all_texts[revision_id])
2165
def plan_merge(self):
2166
"""Generate a 'plan' for merging the two revisions.
2168
This involves comparing their texts and determining the cause of
2169
differences. If text A has a line and text B does not, then either the
2170
line was added to text A, or it was deleted from B. Once the causes
2171
are combined, they are written out in the format described in
2172
VersionedFile.plan_merge
2174
if self._head_key is not None: # There was a single head
2175
if self._head_key == self.a_key:
2178
if self._head_key != self.b_key:
2179
raise AssertionError('There was an invalid head: %s != %s'
2180
% (self.b_key, self._head_key))
2182
head_rev = self._head_key[-1]
2183
lines = self.get_lines([head_rev])[head_rev]
2184
return ((plan, line) for line in lines)
2185
return self._weave.plan_merge(self.a_rev, self.b_rev)
2188
class _PlanLCAMerge(_PlanMergeBase):
2190
This merge algorithm differs from _PlanMerge in that:
2191
1. comparisons are done against LCAs only
2192
2. cases where a contested line is new versus one LCA but old versus
2193
another are marked as conflicts, by emitting the line as conflicted-a
2196
This is faster, and hopefully produces more useful output.
2199
def __init__(self, a_rev, b_rev, vf, key_prefix, graph):
2200
_PlanMergeBase.__init__(self, a_rev, b_rev, vf, key_prefix)
2201
lcas = graph.find_lca(key_prefix + (a_rev,), key_prefix + (b_rev,))
2204
if lca == _mod_revision.NULL_REVISION:
2207
self.lcas.add(lca[-1])
2208
for lca in self.lcas:
2209
if _mod_revision.is_null(lca):
2212
lca_lines = self.get_lines([lca])[lca]
2213
matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_a,
2215
blocks = list(matcher.get_matching_blocks())
2216
self._cached_matching_blocks[(a_rev, lca)] = blocks
2217
matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_b,
2219
blocks = list(matcher.get_matching_blocks())
2220
self._cached_matching_blocks[(b_rev, lca)] = blocks
2222
def _determine_status(self, revision_id, unique_line_numbers):
2223
"""Determines the status unique lines versus all lcas.
2225
Basically, determines why the line is unique to this revision.
2227
A line may be determined new, killed, or both.
2229
If a line is determined new, that means it was not present in at least
2230
one LCA, and is not present in the other merge revision.
2232
If a line is determined killed, that means the line was present in
2235
If a line is killed and new, this indicates that the two merge
2236
revisions contain differing conflict resolutions.
2237
:param revision_id: The id of the revision in which the lines are
2239
:param unique_line_numbers: The line numbers of unique lines.
2240
:return a tuple of (new_this, killed_other):
2244
unique_line_numbers = set(unique_line_numbers)
2245
for lca in self.lcas:
2246
blocks = self._get_matching_blocks(revision_id, lca)
2247
unique_vs_lca, _ignored = self._unique_lines(blocks)
2248
new.update(unique_line_numbers.intersection(unique_vs_lca))
2249
killed.update(unique_line_numbers.difference(unique_vs_lca))
added
removed
bzrlib/merge.py
