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