« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- browse files at revision 1488
- compare with another revision
- compare with revision 3508.1.2
- download diff
- download tarball
- view history from revision 1488
- Committer: Robert Collins
- Date: 2005-10-27 19:45:18 UTC
- mfrom: (1185.16.130)
- Revision ID: robertc@robertcollins.net-20051027194518-58afabc9ab280bb0
Merge from Martin
- files added:
- bzrlib/selftest/stub_sftp.py
- files modified:
- Makefile
added
removed
bzrlib/merge.py
23
23
import bzrlib.osutils
24
24
import bzrlib.revision
25
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
from bzrlib.merge_core import WeaveMerge
26
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
27
28
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
28
29
from bzrlib.branch import Branch
29
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
from bzrlib.errors import NoCommits
31
from bzrlib.errors import NoCommits, WorkingTreeNotRevision, NotBranchError
31
32
from bzrlib.delta import compare_trees
32
33
from bzrlib.trace import mutter, warning, note
33
34
from bzrlib.fetch import greedy_fetch, fetch
34
from bzrlib.revision import is_ancestor
35
from bzrlib.revision import is_ancestor, NULL_REVISION
35
36
from bzrlib.osutils import rename
36
37
from bzrlib.revision import common_ancestor, MultipleRevisionSources
37
38
from bzrlib.errors import NoSuchRevision
38
39
40
# TODO: Report back as changes are merged in
41
39
42
# TODO: build_working_dir can be built on something simpler than merge()
40
43
41
44
# FIXME: merge() parameters seem oriented towards the command line
83
86
for line in lines:
84
87
d_file.write(line)
85
88
86
def add_suffix(self, name, suffix, last_new_name=None):
89
def add_suffix(self, name, suffix, last_new_name=None, fix_inventory=True):
87
90
"""Rename a file to append a suffix. If the new name exists, the
88
91
suffix is added repeatedly until a non-existant name is found
89
92
96
99
new_name = last_new_name+suffix
97
100
try:
98
101
rename(name, new_name)
99
return new_name
102
if fix_inventory is True:
103
try:
104
relpath = self.this_tree.relpath(name)
105
except NotBranchError:
106
relpath = None
107
if relpath is not None:
108
file_id = self.this_tree.path2id(relpath)
109
if file_id is not None:
110
new_path = self.this_tree.relpath(new_name)
111
rename(new_name, name)
112
self.this_tree.branch.rename_one(relpath, new_path)
113
assert self.this_tree.id2path(file_id) == relpath
114
self.this_tree._inventory = self.this_tree.branch.inventory
115
assert self.this_tree.id2path(file_id) == new_path
100
116
except OSError, e:
101
117
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
102
118
raise
103
return self.add_suffix(name, suffix, last_new_name=new_name)
119
return self.add_suffix(name, suffix, last_new_name=new_name,
120
fix_inventory=fix_inventory)
121
return new_name
104
122
105
123
def conflict(self, text):
106
124
warning(text)
116
134
:param base_path: Path to the file text for the BASE tree
117
135
:param other_path: Path to the file text for the OTHER tree
118
136
"""
119
self.add_suffix(this_path, ".THIS")
137
self.add_suffix(this_path, ".THIS", fix_inventory=False)
120
138
self.dump(base_lines, this_path+".BASE")
121
139
self.dump(other_lines, this_path+".OTHER")
122
140
rename(new_file, this_path)
123
141
self.conflict("Diff3 conflict encountered in %s" % this_path)
124
142
143
def weave_merge_conflict(self, filename, weave, other_i, out_file):
144
"""
145
Handle weave conflicts by producing a .THIS, and .OTHER. The
146
main file will be a version with diff3-style conflicts.
147
"""
148
self.add_suffix(filename, ".THIS")
149
out_file.commit()
150
self.dump(weave.get_iter(other_i), filename+".OTHER")
151
self.conflict("Text conflict encountered in %s" % filename)
152
125
153
def new_contents_conflict(self, filename, other_contents):
126
154
"""Conflicting contents for newly added file."""
127
155
other_contents(filename + ".OTHER", self, False)
206
234
revision = branch.last_revision()
207
235
else:
208
236
revision = branch.get_rev_id(revno)
237
if revision is None:
238
revision = NULL_REVISION
209
239
return branch, get_revid_tree(branch, revision, local_branch)
210
240
211
241
def get_revid_tree(branch, revision, local_branch):
235
265
lower-level code (e.g. constructing a changeset).
236
266
"""
237
267
# RBC 20051019 is this not just 'export' ?
238
merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
239
check_clean=False, ignore_zero=True)
268
# Well, export doesn't take care of inventory...
269
this_branch = Branch.open_containing(to_dir)[0]
270
transform_tree(this_branch.working_tree(), this_branch.basis_tree())
240
271
272
def transform_tree(from_tree, to_tree):
273
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True)
241
274
242
275
def merge(other_revision, base_revision,
243
276
check_clean=True, ignore_zero=False,
246
279
"""Merge changes into a tree.
247
280
248
281
base_revision
249
tuple(path, revision) Base for three-way merge.
282
list(path, revno) Base for three-way merge.
283
If [None, None] then a base will be automatically determined.
250
284
other_revision
251
tuple(path, revision) Other revision for three-way merge.
285
list(path, revno) Other revision for three-way merge.
252
286
this_dir
253
287
Directory to merge changes into; '.' by default.
254
288
check_clean
257
291
ignore_zero - If true, suppress the "zero conflicts" message when
258
292
there are no conflicts; should be set when doing something we expect
259
293
to complete perfectly.
294
file_list - If supplied, merge only changes to selected files.
260
295
261
296
All available ancestors of other_revision and base_revision are
262
297
automatically pulled into the branch.
298
299
The revno may be -1 to indicate the last revision on the branch, which is
300
the typical case.
301
302
This function is intended for use from the command line; programmatic
303
clients might prefer to call merge_inner(), which has less magic behavior.
263
304
"""
264
305
if this_dir is None:
265
306
this_dir = '.'
266
307
this_branch = Branch.open_containing(this_dir)[0]
267
this_rev_id = this_branch.last_revision()
268
if this_rev_id is None:
269
raise BzrCommandError("This branch has no commits")
270
if check_clean:
271
changes = compare_trees(this_branch.working_tree(),
272
this_branch.basis_tree(), False)
273
if changes.has_changed():
274
raise BzrCommandError("Working tree has uncommitted changes.")
275
other_branch, other_tree = get_tree(other_revision, this_branch)
276
if other_revision[1] == -1:
277
other_rev_id = other_branch.last_revision()
278
if other_rev_id is None:
279
raise NoCommits(other_branch)
280
other_basis = other_rev_id
281
elif other_revision[1] is not None:
282
other_rev_id = other_branch.get_rev_id(other_revision[1])
283
other_basis = other_rev_id
284
else:
285
other_rev_id = None
286
other_basis = other_branch.last_revision()
287
if other_basis is None:
288
raise NoCommits(other_branch)
289
if base_revision == [None, None]:
290
try:
291
base_rev_id = common_ancestor(this_rev_id, other_basis,
292
this_branch)
293
except NoCommonAncestor:
294
raise UnrelatedBranches()
295
base_tree = get_revid_tree(this_branch, base_rev_id, None)
296
base_is_ancestor = True
297
else:
298
base_branch, base_tree = get_tree(base_revision)
299
if base_revision[1] == -1:
300
base_rev_id = base_branch.last_revision()
301
elif base_revision[1] is None:
302
base_rev_id = None
308
if show_base and not merge_type is ApplyMerge3:
309
raise BzrCommandError("Show-base is not supported for this merge"
310
" type. %s" % merge_type)
311
merger = Merger(this_branch)
312
merger.check_basis(check_clean)
313
merger.set_other(other_revision)
314
merger.set_base(base_revision)
315
merger.backup_files = backup_files
316
merger.merge_type = merge_type
317
merger.set_interesting_files(file_list)
318
merger.show_base = show_base
319
merger.conflict_handler = MergeConflictHandler(merger.this_tree,
320
merger.base_tree,
321
merger.other_tree,
322
ignore_zero=ignore_zero)
323
conflicts = merger.do_merge()
324
merger.set_pending()
325
return conflicts
326
327
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
328
backup_files=False, merge_type=ApplyMerge3,
329
interesting_ids=None, show_base=False):
330
"""Primary interface for merging.
331
332
typical use is probably
333
'merge_inner(branch, branch.get_revision_tree(other_revision),
334
branch.get_revision_tree(base_revision))'
335
"""
336
merger = Merger(this_branch, other_tree, base_tree)
337
merger.backup_files = False
338
merger.merge_type = ApplyMerge3
339
merger.interesting_ids = interesting_ids
340
merger.show_base = show_base
341
merger.conflict_handler = MergeConflictHandler(merger.this_tree, base_tree,
342
other_tree,
343
ignore_zero=ignore_zero)
344
return merger.do_merge()
345
346
347
class Merger(object):
348
def __init__(self, this_branch, other_tree=None, base_tree=None):
349
object.__init__(self)
350
self.this_branch = this_branch
351
self.this_basis = this_branch.last_revision()
352
self.this_rev_id = None
353
self.this_tree = this_branch.working_tree()
354
self.this_revision_tree = None
355
self.other_tree = other_tree
356
self.base_tree = base_tree
357
self.ignore_zero = False
358
self.backup_files = False
359
self.interesting_ids = None
360
self.show_base = False
361
self.conflict_handler = MergeConflictHandler(self.this_tree, base_tree,
362
other_tree)
363
364
def revision_tree(self, revision_id):
365
return self.this_branch.revision_tree(revision_id)
366
367
def ensure_revision_trees(self):
368
if self.this_revision_tree is None:
369
if self.this_rev_id is None:
370
self.compare_basis()
371
if self.this_rev_id is None:
372
raise WorkingTreeNotRevision(self.this_tree)
373
self.this_revision_tree = self.this_branch.revision_tree(
374
self.this_rev_id)
375
376
if self.other_rev_id is None:
377
other_basis_tree = self.revision_tree(self.other_basis)
378
changes = compare_trees(self.other_tree, other_basis_tree)
379
if changes.has_changed():
380
raise WorkingTreeNotRevision(self.this_tree)
381
other_rev_id = other_basis
382
self.other_tree = other_basis_tree
383
384
385
def file_revisions(self, file_id):
386
self.ensure_revision_trees()
387
def get_id(tree, file_id):
388
revision_id = tree.inventory[file_id].revision
389
assert revision_id is not None
390
return revision_id
391
trees = (self.this_revision_tree, self.other_tree)
392
return [get_id(tree, file_id) for tree in trees]
393
394
395
def merge_factory(self, file_id, base, other):
396
if self.merge_type.history_based:
397
t_revid, o_revid = self.file_revisions(file_id)
398
weave = self.this_revision_tree.get_weave(file_id)
399
contents_change = self.merge_type(weave, t_revid, o_revid)
303
400
else:
304
base_rev_id = base_branch.get_rev_id(base_revision[1])
305
fetch(from_branch=base_branch, to_branch=this_branch)
306
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
307
this_branch)
308
if file_list is None:
309
interesting_ids = None
310
else:
401
if self.show_base is True:
402
contents_change = self.merge_type(file_id, base, other,
403
show_base=True)
404
else:
405
contents_change = self.merge_type(file_id, base, other)
406
if self.backup_files:
407
contents_change = BackupBeforeChange(contents_change)
408
return contents_change
409
410
def check_basis(self, check_clean):
411
if self.this_basis is None:
412
raise BzrCommandError("This branch has no commits")
413
if check_clean:
414
self.compare_basis()
415
if self.this_basis != self.this_rev_id:
416
raise BzrCommandError("Working tree has uncommitted changes.")
417
418
def compare_basis(self):
419
changes = compare_trees(self.this_branch.working_tree(),
420
self.this_branch.basis_tree(), False)
421
if not changes.has_changed():
422
self.this_rev_id = self.this_basis
423
424
def set_interesting_files(self, file_list):
425
if file_list is None:
426
self.interesting_ids = None
427
return
428
311
429
interesting_ids = set()
312
this_tree = this_branch.working_tree()
313
430
for fname in file_list:
314
path = this_tree.relpath(fname)
431
path = self.this_tree.relpath(fname)
315
432
found_id = False
316
for tree in (this_tree, base_tree, other_tree):
433
for tree in (self.this_tree, self.base_tree, self.other_tree):
317
434
file_id = tree.inventory.path2id(path)
318
435
if file_id is not None:
319
436
interesting_ids.add(file_id)
321
438
if not found_id:
322
439
raise BzrCommandError("%s is not a source file in any"
323
440
" tree." % fname)
324
conflicts = merge_inner(this_branch, other_tree, base_tree, tempdir=None,
325
ignore_zero=ignore_zero,
326
backup_files=backup_files,
327
merge_type=merge_type,
328
interesting_ids=interesting_ids,
329
show_base=show_base)
330
if base_is_ancestor and other_rev_id is not None\
331
and other_rev_id not in this_branch.revision_history():
332
this_branch.add_pending_merge(other_rev_id)
333
return conflicts
334
335
336
def set_interesting(inventory_a, inventory_b, interesting_ids):
337
"""Mark files whose ids are in interesting_ids as interesting
338
"""
339
for inventory in (inventory_a, inventory_b):
340
for path, source_file in inventory.iteritems():
341
source_file.interesting = source_file.id in interesting_ids
342
343
344
def merge_inner(this_branch, other_tree, base_tree, tempdir=None,
345
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
346
interesting_ids=None, show_base=False):
347
"""Primary interface for merging.
348
349
typical use is probably
350
'merge_inner(branch, branch.get_revision_tree(other_revision),
351
branch.get_revision_tree(base_revision))'
352
"""
353
if tempdir is None:
354
_tempdir = tempfile.mkdtemp(prefix="bzr-")
355
else:
356
_tempdir = tempdir
357
try:
358
return _merge_inner(this_branch, other_tree, base_tree, _tempdir,
359
ignore_zero, merge_type, backup_files,
360
interesting_ids,
361
show_base=show_base)
362
finally:
363
if tempdir is None:
364
shutil.rmtree(_tempdir)
365
366
367
def _merge_inner(this_branch, other_tree, base_tree, user_tempdir,
368
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
369
interesting_ids=None, show_base=False):
370
def merge_factory(file_id, base, other):
371
if show_base is True:
372
contents_change = merge_type(file_id, base, other, show_base=True)
373
else:
374
contents_change = merge_type(file_id, base, other)
375
if backup_files:
376
contents_change = BackupBeforeChange(contents_change)
377
return contents_change
378
379
this_tree = get_tree((this_branch.base, None))[1]
380
381
def get_inventory(tree):
382
return tree.inventory
383
384
conflict_handler = MergeConflictHandler(this_tree, base_tree, other_tree,
385
ignore_zero=ignore_zero)
386
inv_changes = merge_flex(this_tree, base_tree, other_tree,
387
generate_changeset, get_inventory,
388
conflict_handler,
389
merge_factory=merge_factory,
390
interesting_ids=interesting_ids)
391
392
adjust_ids = []
393
for id, path in inv_changes.iteritems():
394
if path is not None:
395
if path == '.':
396
path = ''
441
self.interesting_ids = interesting_ids
442
443
def set_pending(self):
444
if not self.base_is_ancestor:
445
return
446
if self.other_rev_id is None:
447
return
448
if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):
449
return
450
self.this_branch.add_pending_merge(self.other_rev_id)
451
452
def set_other(self, other_revision):
453
other_branch, self.other_tree = get_tree(other_revision,
454
self.this_branch)
455
if other_revision[1] == -1:
456
self.other_rev_id = other_branch.last_revision()
457
if self.other_rev_id is None:
458
raise NoCommits(other_branch)
459
self.other_basis = self.other_rev_id
460
elif other_revision[1] is not None:
461
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
462
self.other_basis = self.other_rev_id
463
else:
464
self.other_rev_id = None
465
self.other_basis = other_branch.last_revision()
466
if self.other_basis is None:
467
raise NoCommits(other_branch)
468
fetch(from_branch=other_branch, to_branch=self.this_branch,
469
last_revision=self.other_basis)
470
471
def set_base(self, base_revision):
472
mutter("doing merge() with no base_revision specified")
473
if base_revision == [None, None]:
474
try:
475
self.base_rev_id = common_ancestor(self.this_basis,
476
self.other_basis,
477
self.this_branch)
478
except NoCommonAncestor:
479
raise UnrelatedBranches()
480
self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,
481
None)
482
self.base_is_ancestor = True
483
else:
484
base_branch, self.base_tree = get_tree(base_revision)
485
if base_revision[1] == -1:
486
self.base_rev_id = base_branch.last_revision()
487
elif base_revision[1] is None:
488
self.base_rev_id = None
397
489
else:
398
assert path.startswith('.' + os.sep), "path is %s" % path
399
path = path[2:]
400
adjust_ids.append((path, id))
401
if len(adjust_ids) > 0:
402
this_branch.set_inventory(regen_inventory(this_branch,
403
this_tree.basedir,
404
adjust_ids))
405
conflicts = conflict_handler.conflicts
406
conflict_handler.finalize()
407
return conflicts
408
409
410
def regen_inventory(this_branch, root, new_entries):
411
old_entries = this_branch.read_working_inventory()
412
new_inventory = {}
413
by_path = {}
414
new_entries_map = {}
415
for path, file_id in new_entries:
416
if path is None:
417
continue
418
new_entries_map[file_id] = path
419
420
def id2path(file_id):
421
path = new_entries_map.get(file_id)
422
if path is not None:
423
return path
424
entry = old_entries[file_id]
425
if entry.parent_id is None:
426
return entry.name
427
return os.path.join(id2path(entry.parent_id), entry.name)
490
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
491
fetch(from_branch=base_branch, to_branch=self.this_branch)
492
self.base_is_ancestor = is_ancestor(self.this_basis,
493
self.base_rev_id,
494
self.this_branch)
495
496
def do_merge(self):
497
def get_inventory(tree):
498
return tree.inventory
499
500
inv_changes = merge_flex(self.this_tree, self.base_tree,
501
self.other_tree,
502
generate_changeset, get_inventory,
503
self.conflict_handler,
504
merge_factory=self.merge_factory,
505
interesting_ids=self.interesting_ids)
506
507
adjust_ids = []
508
for id, path in inv_changes.iteritems():
509
if path is not None:
510
if path == '.':
511
path = ''
512
else:
513
assert path.startswith('.' + os.sep), "path is %s" % path
514
path = path[2:]
515
adjust_ids.append((path, id))
516
if len(adjust_ids) > 0:
517
self.this_branch.set_inventory(self.regen_inventory(adjust_ids))
518
conflicts = self.conflict_handler.conflicts
519
self.conflict_handler.finalize()
520
return conflicts
521
522
def regen_inventory(self, new_entries):
523
old_entries = self.this_branch.read_working_inventory()
524
new_inventory = {}
525
by_path = {}
526
new_entries_map = {}
527
for path, file_id in new_entries:
528
if path is None:
529
continue
530
new_entries_map[file_id] = path
531
532
def id2path(file_id):
533
path = new_entries_map.get(file_id)
534
if path is not None:
535
return path
536
entry = old_entries[file_id]
537
if entry.parent_id is None:
538
return entry.name
539
return os.path.join(id2path(entry.parent_id), entry.name)
540
541
for file_id in old_entries:
542
entry = old_entries[file_id]
543
path = id2path(file_id)
544
new_inventory[file_id] = (path, file_id, entry.parent_id,
545
entry.kind)
546
by_path[path] = file_id
428
547
429
for file_id in old_entries:
430
entry = old_entries[file_id]
431
path = id2path(file_id)
432
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
433
by_path[path] = file_id
434
435
deletions = 0
436
insertions = 0
437
new_path_list = []
438
for path, file_id in new_entries:
439
if path is None:
440
del new_inventory[file_id]
441
deletions += 1
442
else:
443
new_path_list.append((path, file_id))
444
if file_id not in old_entries:
445
insertions += 1
446
# Ensure no file is added before its parent
447
new_path_list.sort()
448
for path, file_id in new_path_list:
449
if path == '':
450
parent = None
451
else:
452
parent = by_path[os.path.dirname(path)]
453
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
454
new_inventory[file_id] = (path, file_id, parent, kind)
455
by_path[path] = file_id
548
deletions = 0
549
insertions = 0
550
new_path_list = []
551
for path, file_id in new_entries:
552
if path is None:
553
del new_inventory[file_id]
554
deletions += 1
555
else:
556
new_path_list.append((path, file_id))
557
if file_id not in old_entries:
558
insertions += 1
559
# Ensure no file is added before its parent
560
new_path_list.sort()
561
for path, file_id in new_path_list:
562
if path == '':
563
parent = None
564
else:
565
parent = by_path[os.path.dirname(path)]
566
abspath = os.path.join(self.this_tree.basedir, path)
567
kind = bzrlib.osutils.file_kind(abspath)
568
new_inventory[file_id] = (path, file_id, parent, kind)
569
by_path[path] = file_id
456
570
457
# Get a list in insertion order
458
new_inventory_list = new_inventory.values()
459
mutter ("""Inventory regeneration:
460
old length: %i insertions: %i deletions: %i new_length: %i"""\
461
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
462
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
463
new_inventory_list.sort()
464
return new_inventory_list
571
# Get a list in insertion order
572
new_inventory_list = new_inventory.values()
573
mutter ("""Inventory regeneration:
574
old length: %i insertions: %i deletions: %i new_length: %i"""\
575
% (len(old_entries), insertions, deletions,
576
len(new_inventory_list)))
577
assert len(new_inventory_list) == len(old_entries) + insertions\
578
- deletions
579
new_inventory_list.sort()
580
return new_inventory_list
465
581
466
582
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
467
"diff3": (Diff3Merge, "Merge using external diff3")
583
"diff3": (Diff3Merge, "Merge using external diff3"),
584
'weave': (WeaveMerge, "Weave-based merge")
468
585
}
469
586
Loggerhead is a web-based interface for Breezy
Version: 2.0.1