44
38
from bzrlib.merge3 import Merge3
45
from bzrlib.osutils import rename, pathjoin
40
from bzrlib.osutils import rename, pathjoin, rmtree
46
41
from progress import DummyProgress, ProgressPhase
47
from bzrlib.revision import (is_ancestor, NULL_REVISION, ensure_null)
42
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
48
43
from bzrlib.textfile import check_text_lines
49
44
from bzrlib.trace import mutter, warning, note
50
45
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
51
conflict_pass, FinalPaths, create_by_entry,
52
unique_add, ROOT_PARENT)
53
from bzrlib.versionedfile import PlanWeaveMerge
46
FinalPaths, create_by_entry, unique_add)
47
from bzrlib.versionedfile import WeaveMerge
54
48
from bzrlib import ui
56
50
# 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)
59
81
def transform_tree(from_tree, to_tree, interesting_ids=None):
60
82
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
64
86
class Merger(object):
65
def __init__(self, this_branch, other_tree=None, base_tree=None,
66
this_tree=None, pb=DummyProgress(), change_reporter=None,
87
def __init__(self, this_branch, other_tree=None, base_tree=None,
88
this_tree=None, pb=DummyProgress()):
68
89
object.__init__(self)
69
90
assert this_tree is not None, "this_tree is required"
70
91
self.this_branch = this_branch
71
self.this_basis = _mod_revision.ensure_null(
72
this_branch.last_revision())
92
self.this_basis = this_branch.last_revision()
73
93
self.this_rev_id = None
74
94
self.this_tree = this_tree
75
95
self.this_revision_tree = None
76
96
self.this_basis_tree = None
77
97
self.other_tree = other_tree
78
self.other_branch = None
79
98
self.base_tree = base_tree
80
99
self.ignore_zero = False
81
100
self.backup_files = False
82
101
self.interesting_ids = None
83
self.interesting_files = None
84
102
self.show_base = False
85
103
self.reprocess = False
88
self.recurse = recurse
89
self.change_reporter = change_reporter
90
self._cached_trees = {}
93
def from_uncommitted(tree, other_tree, pb):
94
"""Return a Merger for uncommitted changes in other_tree.
96
:param tree: The tree to merge into
97
:param other_tree: The tree to get uncommitted changes from
98
:param pb: A progress indicator
100
merger = Merger(tree.branch, other_tree, other_tree.basis_tree(), tree,
102
merger.base_rev_id = merger.base_tree.get_revision_id()
103
merger.other_rev_id = None
107
def from_mergeable(klass, tree, mergeable, pb):
108
"""Return a Merger for a bundle or merge directive.
110
:param tree: The tree to merge changes into
111
:param mergeable: A merge directive or bundle
112
:param pb: A progress indicator
114
mergeable.install_revisions(tree.branch.repository)
115
base_revision_id, other_revision_id, verified =\
116
mergeable.get_merge_request(tree.branch.repository)
117
if (base_revision_id != _mod_revision.NULL_REVISION and
118
tree.branch.repository.get_graph().is_ancestor(
119
base_revision_id, tree.branch.last_revision())):
120
base_revision_id = None
121
merger = klass.from_revision_ids(pb, tree, other_revision_id,
123
return merger, verified
126
def from_revision_ids(pb, this, other, base=None, other_branch=None,
128
"""Return a Merger for revision-ids.
130
:param tree: The tree to merge changes into
131
:param other: The revision-id to use as OTHER
132
:param base: The revision-id to use as BASE. If not specified, will
134
:param other_branch: A branch containing the other revision-id. If
135
not supplied, this.branch is used.
136
:param base_branch: A branch containing the base revision-id. If
137
not supplied, other_branch or this.branch will be used.
138
:param pb: A progress indicator
140
merger = Merger(this.branch, this_tree=this, pb=pb)
141
if other_branch is None:
142
other_branch = this.branch
143
merger.set_other_revision(other, other_branch)
147
if base_branch is None:
148
base_branch = other_branch
149
merger.set_base_revision(base, base_branch)
152
def revision_tree(self, revision_id, branch=None):
153
if revision_id not in self._cached_trees:
155
branch = self.this_branch
157
tree = self.this_tree.revision_tree(revision_id)
158
except errors.NoSuchRevisionInTree:
159
tree = branch.repository.revision_tree(revision_id)
160
self._cached_trees[revision_id] = tree
161
return self._cached_trees[revision_id]
163
def _get_tree(self, treespec, possible_transports=None):
164
from bzrlib import workingtree
165
location, revno = treespec
167
tree = workingtree.WorkingTree.open_containing(location)[0]
168
return tree.branch, tree
169
branch = Branch.open_containing(location, possible_transports)[0]
171
revision_id = branch.last_revision()
173
revision_id = branch.get_rev_id(revno)
174
revision_id = ensure_null(revision_id)
175
return branch, self.revision_tree(revision_id, branch)
108
def revision_tree(self, revision_id):
109
return self.this_branch.repository.revision_tree(revision_id)
177
111
def ensure_revision_trees(self):
178
112
if self.this_revision_tree is None:
179
self.this_basis_tree = self.revision_tree(self.this_basis)
113
self.this_basis_tree = self.this_branch.repository.revision_tree(
180
115
if self.this_basis == self.this_rev_id:
181
116
self.this_revision_tree = self.this_basis_tree
205
140
def check_basis(self, check_clean, require_commits=True):
206
141
if self.this_basis is None and require_commits is True:
207
raise BzrCommandError("This branch has no commits."
208
" (perhaps you would prefer 'bzr pull')")
142
raise BzrCommandError("This branch has no commits")
210
144
self.compare_basis()
211
145
if self.this_basis != self.this_rev_id:
212
raise errors.UncommittedChanges(self.this_tree)
146
raise BzrCommandError("Working tree has uncommitted changes.")
214
148
def compare_basis(self):
216
basis_tree = self.revision_tree(self.this_tree.last_revision())
217
except errors.RevisionNotPresent:
218
basis_tree = self.this_tree.basis_tree()
219
changes = self.this_tree.changes_from(basis_tree)
149
changes = self.this_tree.changes_from(self.this_tree.basis_tree())
220
150
if not changes.has_changed():
221
151
self.this_rev_id = self.this_basis
223
153
def set_interesting_files(self, file_list):
224
self.interesting_files = 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
226
178
def set_pending(self):
227
if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
231
def _add_parent(self):
232
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
233
new_parent_trees = []
234
for revision_id in new_parents:
236
tree = self.revision_tree(revision_id)
237
except errors.RevisionNotPresent:
241
new_parent_trees.append((revision_id, tree))
243
self.this_tree.set_parent_trees(new_parent_trees,
244
allow_leftmost_as_ghost=True)
246
for _revision_id, tree in new_parent_trees:
250
def set_other(self, other_revision, possible_transports=None):
251
"""Set the revision and tree to merge from.
253
This sets the other_tree, other_rev_id, other_basis attributes.
255
:param other_revision: The [path, revision] list to merge from.
257
self.other_branch, self.other_tree = self._get_tree(other_revision,
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_pending_merge(self.other_rev_id)
188
def set_other(self, other_revision):
189
other_branch, self.other_tree = _get_tree(other_revision,
259
191
if other_revision[1] == -1:
260
self.other_rev_id = _mod_revision.ensure_null(
261
self.other_branch.last_revision())
262
if _mod_revision.is_null(self.other_rev_id):
263
raise NoCommits(self.other_branch)
192
self.other_rev_id = other_branch.last_revision()
193
if self.other_rev_id is None:
194
raise NoCommits(other_branch)
264
195
self.other_basis = self.other_rev_id
265
196
elif other_revision[1] is not None:
266
self.other_rev_id = self.other_branch.get_rev_id(other_revision[1])
197
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
267
198
self.other_basis = self.other_rev_id
269
200
self.other_rev_id = None
270
self.other_basis = self.other_branch.last_revision()
201
self.other_basis = other_branch.last_revision()
271
202
if self.other_basis is None:
272
raise NoCommits(self.other_branch)
273
if self.other_rev_id is not None:
274
self._cached_trees[self.other_rev_id] = self.other_tree
275
self._maybe_fetch(self.other_branch,self.this_branch, self.other_basis)
277
def set_other_revision(self, revision_id, other_branch):
278
"""Set 'other' based on a branch and revision id
280
:param revision_id: The revision to use for a tree
281
:param other_branch: The branch containing this tree
283
self.other_rev_id = revision_id
284
self.other_branch = other_branch
285
self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id)
286
self.other_tree = self.revision_tree(revision_id)
287
self.other_basis = revision_id
289
def set_base_revision(self, revision_id, branch):
290
"""Set 'base' based on a branch and revision id
292
:param revision_id: The revision to use for a tree
293
:param branch: The branch containing this tree
295
self.base_rev_id = revision_id
296
self.base_branch = branch
297
self._maybe_fetch(branch, self.this_branch, revision_id)
298
self.base_tree = self.revision_tree(revision_id)
299
self.base_is_ancestor = is_ancestor(self.this_basis,
302
self.base_is_other_ancestor = is_ancestor(self.other_basis,
306
def _maybe_fetch(self, source, target, revision_id):
307
if not source.repository.has_same_location(target.repository):
308
target.fetch(source, revision_id)
203
raise NoCommits(other_branch)
204
if other_branch.base != self.this_branch.base:
205
self.this_branch.fetch(other_branch, last_revision=self.other_basis)
310
207
def find_base(self):
311
this_repo = self.this_branch.repository
312
graph = this_repo.get_graph()
313
revisions = [ensure_null(self.this_basis),
314
ensure_null(self.other_basis)]
315
if NULL_REVISION in revisions:
316
self.base_rev_id = NULL_REVISION
318
self.base_rev_id = graph.find_unique_lca(*revisions)
319
if self.base_rev_id == NULL_REVISION:
320
raise UnrelatedBranches()
321
self.base_tree = self.revision_tree(self.base_rev_id)
322
self.base_is_ancestor = True
323
self.base_is_other_ancestor = True
208
self.set_base([None, None])
325
210
def set_base(self, base_revision):
326
"""Set the base revision to use for the merge.
328
:param base_revision: A 2-list containing a path and revision number.
330
211
mutter("doing merge() with no base_revision specified")
331
212
if base_revision == [None, None]:
214
pb = bzrlib.ui.ui_factory.nested_progress_bar()
216
this_repo = self.this_branch.repository
217
self.base_rev_id = common_ancestor(self.this_basis,
222
except NoCommonAncestor:
223
raise UnrelatedBranches()
224
self.base_tree = _get_revid_tree(self.this_branch, self.base_rev_id,
226
self.base_is_ancestor = True
334
base_branch, self.base_tree = self._get_tree(base_revision)
228
base_branch, self.base_tree = _get_tree(base_revision)
335
229
if base_revision[1] == -1:
336
230
self.base_rev_id = base_branch.last_revision()
337
231
elif base_revision[1] is None:
338
self.base_rev_id = _mod_revision.NULL_REVISION
232
self.base_rev_id = None
340
self.base_rev_id = _mod_revision.ensure_null(
341
base_branch.get_rev_id(base_revision[1]))
342
self._maybe_fetch(base_branch, self.this_branch, self.base_rev_id)
234
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
235
if self.this_branch.base != base_branch.base:
236
self.this_branch.fetch(base_branch)
343
237
self.base_is_ancestor = is_ancestor(self.this_basis,
344
238
self.base_rev_id,
345
239
self.this_branch)
346
self.base_is_other_ancestor = is_ancestor(self.other_basis,
350
241
def do_merge(self):
351
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
352
'other_tree': self.other_tree,
242
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
243
'other_tree': self.other_tree,
353
244
'interesting_ids': self.interesting_ids,
354
'interesting_files': self.interesting_files,
356
246
if self.merge_type.requires_base:
357
247
kwargs['base_tree'] = self.base_tree
406
265
return len(merge.cooked_conflicts)
267
def regen_inventory(self, new_entries):
268
old_entries = self.this_tree.read_working_inventory()
272
for path, file_id in new_entries:
275
new_entries_map[file_id] = path
277
def id2path(file_id):
278
path = new_entries_map.get(file_id)
281
entry = old_entries[file_id]
282
if entry.parent_id is None:
284
return pathjoin(id2path(entry.parent_id), entry.name)
286
for file_id in old_entries:
287
entry = old_entries[file_id]
288
path = id2path(file_id)
289
if file_id in self.base_tree.inventory:
290
executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
292
executable = getattr(entry, 'executable', False)
293
new_inventory[file_id] = (path, file_id, entry.parent_id,
294
entry.kind, executable)
296
by_path[path] = file_id
301
for path, file_id in new_entries:
303
del new_inventory[file_id]
306
new_path_list.append((path, file_id))
307
if file_id not in old_entries:
309
# Ensure no file is added before its parent
311
for path, file_id in new_path_list:
315
parent = by_path[os.path.dirname(path)]
316
abspath = pathjoin(self.this_tree.basedir, path)
317
kind = bzrlib.osutils.file_kind(abspath)
318
if file_id in self.base_tree.inventory:
319
executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
322
new_inventory[file_id] = (path, file_id, parent, kind, executable)
323
by_path[path] = file_id
325
# Get a list in insertion order
326
new_inventory_list = new_inventory.values()
327
mutter ("""Inventory regeneration:
328
old length: %i insertions: %i deletions: %i new_length: %i"""\
329
% (len(old_entries), insertions, deletions,
330
len(new_inventory_list)))
331
assert len(new_inventory_list) == len(old_entries) + insertions\
333
new_inventory_list.sort()
334
return new_inventory_list
409
337
class Merge3Merger(object):
410
338
"""Three-way merger that uses the merge3 text merger"""
412
340
supports_reprocess = True
413
341
supports_show_base = True
414
342
history_based = False
415
winner_idx = {"this": 2, "other": 1, "conflict": 1}
417
344
def __init__(self, working_tree, this_tree, base_tree, other_tree,
418
345
interesting_ids=None, reprocess=False, show_base=False,
419
pb=DummyProgress(), pp=None, change_reporter=None,
420
interesting_files=None):
421
"""Initialize the merger object and perform the merge.
423
:param working_tree: The working tree to apply the merge to
424
:param this_tree: The local tree in the merge operation
425
:param base_tree: The common tree in the merge operation
426
:param other_tree: The other other tree to merge changes from
427
:param interesting_ids: The file_ids of files that should be
428
participate in the merge. May not be combined with
430
:param: reprocess If True, perform conflict-reduction processing.
431
:param show_base: If True, show the base revision in text conflicts.
432
(incompatible with reprocess)
433
:param pb: A Progress bar
434
:param pp: A ProgressPhase object
435
:param change_reporter: An object that should report changes made
436
:param interesting_files: The tree-relative paths of files that should
437
participate in the merge. If these paths refer to directories,
438
the contents of those directories will also be included. May not
439
be combined with interesting_ids. If neither interesting_files nor
440
interesting_ids is specified, all files may participate in the
346
pb=DummyProgress(), pp=None):
347
"""Initialize the merger object and perform the merge."""
443
348
object.__init__(self)
444
if interesting_files is not None:
445
assert interesting_ids is None
446
self.interesting_ids = interesting_ids
447
self.interesting_files = interesting_files
448
349
self.this_tree = working_tree
449
self.this_tree.lock_tree_write()
450
350
self.base_tree = base_tree
451
self.base_tree.lock_read()
452
351
self.other_tree = other_tree
453
self.other_tree.lock_read()
454
352
self._raw_conflicts = []
455
353
self.cooked_conflicts = []
456
354
self.reprocess = reprocess
457
355
self.show_base = show_base
460
self.change_reporter = change_reporter
461
358
if self.pp is None:
462
359
self.pp = ProgressPhase("Merge phase", 3, self.pb)
361
if interesting_ids is not None:
362
all_ids = interesting_ids
364
all_ids = set(base_tree)
365
all_ids.update(other_tree)
366
working_tree.lock_write()
464
367
self.tt = TreeTransform(working_tree, self.pb)
466
369
self.pp.next_phase()
467
entries = self._entries3()
468
370
child_pb = ui.ui_factory.nested_progress_bar()
470
for num, (file_id, changed, parents3, names3,
471
executable3) in enumerate(entries):
472
child_pb.update('Preparing file merge', num, len(entries))
473
self._merge_names(file_id, parents3, names3)
475
file_status = self.merge_contents(file_id)
477
file_status = 'unmodified'
478
self._merge_executable(file_id,
479
executable3, file_status)
372
for num, file_id in enumerate(all_ids):
373
child_pb.update('Preparing file merge', num, len(all_ids))
374
self.merge_names(file_id)
375
file_status = self.merge_contents(file_id)
376
self.merge_executable(file_id, file_status)
481
378
child_pb.finished()
483
380
self.pp.next_phase()
484
381
child_pb = ui.ui_factory.nested_progress_bar()
486
fs_conflicts = resolve_conflicts(self.tt, child_pb,
487
lambda t, c: conflict_pass(t, c, self.other_tree))
383
fs_conflicts = resolve_conflicts(self.tt, child_pb)
489
385
child_pb.finished()
490
if change_reporter is not None:
491
from bzrlib import delta
492
delta.report_changes(self.tt._iter_changes(), change_reporter)
493
386
self.cook_conflicts(fs_conflicts)
494
387
for conflict in self.cooked_conflicts:
495
388
warning(conflict)
496
389
self.pp.next_phase()
497
results = self.tt.apply(no_conflicts=True)
390
results = self.tt.apply()
498
391
self.write_modified(results)
500
393
working_tree.add_conflicts(self.cooked_conflicts)
504
397
self.tt.finalize()
505
self.other_tree.unlock()
506
self.base_tree.unlock()
507
self.this_tree.unlock()
398
working_tree.unlock()
511
"""Gather data about files modified between three trees.
513
Return a list of tuples of file_id, changed, parents3, names3,
514
executable3. changed is a boolean indicating whether the file contents
515
or kind were changed. parents3 is a tuple of parent ids for base,
516
other and this. names3 is a tuple of names for base, other and this.
517
executable3 is a tuple of execute-bit values for base, other and this.
520
iterator = self.other_tree._iter_changes(self.base_tree,
521
include_unchanged=True, specific_files=self.interesting_files,
522
extra_trees=[self.this_tree])
523
for (file_id, paths, changed, versioned, parents, names, kind,
524
executable) in iterator:
525
if (self.interesting_ids is not None and
526
file_id not in self.interesting_ids):
528
if file_id in self.this_tree.inventory:
529
entry = self.this_tree.inventory[file_id]
530
this_name = entry.name
531
this_parent = entry.parent_id
532
this_executable = entry.executable
536
this_executable = None
537
parents3 = parents + (this_parent,)
538
names3 = names + (this_name,)
539
executable3 = executable + (this_executable,)
540
result.append((file_id, changed, parents3, names3, executable3))
545
self.tt.final_kind(self.tt.root)
547
self.tt.cancel_deletion(self.tt.root)
548
if self.tt.final_file_id(self.tt.root) is None:
549
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
551
if self.other_tree.inventory.root is None:
553
other_root_file_id = self.other_tree.inventory.root.file_id
554
other_root = self.tt.trans_id_file_id(other_root_file_id)
555
if other_root == self.tt.root:
558
self.tt.final_kind(other_root)
561
self.reparent_children(self.other_tree.inventory.root, self.tt.root)
562
self.tt.cancel_creation(other_root)
563
self.tt.cancel_versioning(other_root)
565
def reparent_children(self, ie, target):
566
for thing, child in ie.children.iteritems():
567
trans_id = self.tt.trans_id_file_id(child.file_id)
568
self.tt.adjust_path(self.tt.final_name(trans_id), target, trans_id)
570
401
def write_modified(self, results):
571
402
modified_hashes = {}
572
403
for path in results.modified_paths:
689
492
if name_winner == "conflict":
690
493
trans_id = self.tt.trans_id_file_id(file_id)
691
494
self._raw_conflicts.append(('name conflict', trans_id,
692
this_name, other_name))
495
self.name(this_entry, file_id),
496
self.name(other_entry, file_id)))
693
497
if parent_id_winner == "conflict":
694
498
trans_id = self.tt.trans_id_file_id(file_id)
695
499
self._raw_conflicts.append(('parent conflict', trans_id,
696
this_parent, other_parent))
697
if other_name is None:
500
self.parent(this_entry, file_id),
501
self.parent(other_entry, file_id)))
502
if other_entry is None:
698
503
# it doesn't matter whether the result was 'other' or
699
504
# 'conflict'-- if there's no 'other', we leave it alone.
701
506
# if we get here, name_winner and parent_winner are set to safe values.
507
winner_entry = {"this": this_entry, "other": other_entry,
508
"conflict": other_entry}
702
509
trans_id = self.tt.trans_id_file_id(file_id)
703
parent_id = parents[self.winner_idx[parent_id_winner]]
704
if parent_id is not None:
705
parent_trans_id = self.tt.trans_id_file_id(parent_id)
706
self.tt.adjust_path(names[self.winner_idx[name_winner]],
707
parent_trans_id, trans_id)
510
parent_id = winner_entry[parent_id_winner].parent_id
511
parent_trans_id = self.tt.trans_id_file_id(parent_id)
512
self.tt.adjust_path(winner_entry[name_winner].name, parent_trans_id,
709
515
def merge_contents(self, file_id):
710
516
"""Performa a merge on file_id contents."""
978
778
def __init__(self, working_tree, this_tree, base_tree, other_tree,
979
779
interesting_ids=None, pb=DummyProgress(), pp=None,
980
reprocess=False, change_reporter=None,
981
interesting_files=None):
781
self.this_revision_tree = self._get_revision_tree(this_tree)
782
self.other_revision_tree = self._get_revision_tree(other_tree)
982
783
super(WeaveMerger, self).__init__(working_tree, this_tree,
983
784
base_tree, other_tree,
984
785
interesting_ids=interesting_ids,
985
pb=pb, pp=pp, reprocess=reprocess,
986
change_reporter=change_reporter)
786
pb=pb, pp=pp, reprocess=reprocess)
788
def _get_revision_tree(self, tree):
789
"""Return a revision tree related to this tree.
790
If the tree is a WorkingTree, the basis will be returned.
792
if getattr(tree, 'get_weave', False) is False:
793
# If we have a WorkingTree, try using the basis
794
return tree.branch.basis_tree()
798
def _check_file(self, file_id):
799
"""Check that the revision tree's version of the file matches."""
800
for tree, rt in ((self.this_tree, self.this_revision_tree),
801
(self.other_tree, self.other_revision_tree)):
804
if tree.get_file_sha1(file_id) != rt.get_file_sha1(file_id):
805
raise WorkingTreeNotRevision(self.this_tree)
988
807
def _merged_lines(self, file_id):
989
808
"""Generate the merged lines.
990
809
There is no distinction between lines that are meant to contain <<<<<<<
993
plan = self.this_tree.plan_file_merge(file_id, self.other_tree)
994
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
995
'>>>>>>> MERGE-SOURCE\n')
996
return textmerge.merge_lines(self.reprocess)
812
weave = self.this_revision_tree.get_weave(file_id)
813
this_revision_id = self.this_revision_tree.inventory[file_id].revision
814
other_revision_id = \
815
self.other_revision_tree.inventory[file_id].revision
816
wm = WeaveMerge(weave, this_revision_id, other_revision_id,
817
'<<<<<<< TREE\n', '>>>>>>> MERGE-SOURCE\n')
818
return wm.merge_lines(self.reprocess)
998
820
def text_merge(self, file_id, trans_id):
999
821
"""Perform a (weave) text merge for a given file and file-id.
1000
822
If conflicts are encountered, .THIS and .OTHER files will be emitted,
1001
823
and a conflict will be noted.
825
self._check_file(file_id)
1003
826
lines, conflicts = self._merged_lines(file_id)
1004
827
lines = list(lines)
1005
828
# Note we're checking whether the OUTPUT is binary in this case,
1087
912
if interesting_files:
1088
913
assert not interesting_ids, ('Only supply interesting_ids'
1089
914
' or interesting_files')
1090
merger.interesting_files = interesting_files
1091
merger.show_base = show_base
915
merger._set_interesting_files(interesting_files)
916
merger.show_base = show_base
1092
917
merger.reprocess = reprocess
1093
918
merger.other_rev_id = other_rev_id
1094
919
merger.other_basis = other_rev_id
1095
920
return merger.do_merge()
1097
def get_merge_type_registry():
1098
"""Merge type registry is in bzrlib.option to avoid circular imports.
1100
This method provides a sanctioned way to retrieve it.
1102
from bzrlib import option
1103
return option._merge_type_registry
1106
def _plan_annotate_merge(annotated_a, annotated_b, ancestors_a, ancestors_b):
1107
def status_a(revision, text):
1108
if revision in ancestors_b:
1109
return 'killed-b', text
1111
return 'new-a', text
1113
def status_b(revision, text):
1114
if revision in ancestors_a:
1115
return 'killed-a', text
1117
return 'new-b', text
1119
plain_a = [t for (a, t) in annotated_a]
1120
plain_b = [t for (a, t) in annotated_b]
1121
matcher = patiencediff.PatienceSequenceMatcher(None, plain_a, plain_b)
1122
blocks = matcher.get_matching_blocks()
1125
for ai, bi, l in blocks:
1126
# process all mismatched sections
1127
# (last mismatched section is handled because blocks always
1128
# includes a 0-length last block)
1129
for revision, text in annotated_a[a_cur:ai]:
1130
yield status_a(revision, text)
1131
for revision, text in annotated_b[b_cur:bi]:
1132
yield status_b(revision, text)
1134
# and now the matched section
1137
for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]):
1138
assert text_a == text_b
1139
yield "unchanged", text_a
923
merge_types = { "merge3": (Merge3Merger, "Native diff3-style merge"),
924
"diff3": (Diff3Merger, "Merge using external diff3"),
925
'weave': (WeaveMerger, "Weave-based merge")
929
def merge_type_help():
930
templ = '%s%%7s: %%s' % (' '*12)
931
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
932
return '\n'.join(lines)
added
removed
bzrlib/merge.py
