« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- browse files at revision 1185.33.36
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.33.36
- Committer: Martin Pool
- Date: 2005-11-22 04:30:14 UTC
- mto: (1508.1.15) (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1510.
- Revision ID: mbp@sourcefrog.net-20051122043014-6df209fd93033b59
Exclude more files from dumb-rsync upload
- files added:
- INSTALL
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files removed:
- bzrlib/mdiff.py
- files renamed:
- bzr-man.py => bzr_man.py
- bzrlib/selftest/plugins.py => bzrlib/selftest/testplugins.py
- files modified:
- .bzrignore
- bzr *
- 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
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
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
from bzrlib.errors import NoCommits
30
from bzrlib.errors import (BzrCommandError,
31
UnrelatedBranches,
32
NoCommonAncestor,
33
NoCommits,
34
WorkingTreeNotRevision,
35
NotBranchError,
36
NotVersionedError,
37
BzrError)
31
38
from bzrlib.delta import compare_trees
32
from bzrlib.trace import mutter, warning
39
from bzrlib.trace import mutter, warning, note
33
40
from bzrlib.fetch import greedy_fetch, fetch
34
from bzrlib.revision import is_ancestor
41
from bzrlib.revision import is_ancestor, NULL_REVISION
35
42
from bzrlib.osutils import rename
36
43
from bzrlib.revision import common_ancestor, MultipleRevisionSources
37
44
from bzrlib.errors import NoSuchRevision
38
45
46
# TODO: Report back as changes are merged in
47
39
48
# TODO: build_working_dir can be built on something simpler than merge()
40
49
41
50
# FIXME: merge() parameters seem oriented towards the command line
51
# NOTABUG: merge is a helper for commandline functions. merge_inner is the
52
# the core functionality.
42
53
43
54
# comments from abentley on irc: merge happens in two stages, each
44
55
# of which generates a changeset object
81
92
for line in lines:
82
93
d_file.write(line)
83
94
84
def add_suffix(self, name, suffix, last_new_name=None):
95
def add_suffix(self, name, suffix, last_new_name=None, fix_inventory=True):
85
96
"""Rename a file to append a suffix. If the new name exists, the
86
97
suffix is added repeatedly until a non-existant name is found
87
98
94
105
new_name = last_new_name+suffix
95
106
try:
96
107
rename(name, new_name)
97
return new_name
108
if fix_inventory is True:
109
try:
110
relpath = self.this_tree.relpath(name)
111
except NotBranchError:
112
relpath = None
113
if relpath is not None:
114
file_id = self.this_tree.path2id(relpath)
115
if file_id is not None:
116
new_path = self.this_tree.relpath(new_name)
117
rename(new_name, name)
118
self.this_tree.branch.rename_one(relpath, new_path)
119
assert self.this_tree.id2path(file_id) == relpath
120
self.this_tree._inventory = self.this_tree.read_working_inventory()
121
assert self.this_tree.id2path(file_id) == new_path
98
122
except OSError, e:
99
123
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
100
124
raise
101
return self.add_suffix(name, suffix, last_new_name=new_name)
125
return self.add_suffix(name, suffix, last_new_name=new_name,
126
fix_inventory=fix_inventory)
127
return new_name
102
128
103
129
def conflict(self, text):
104
130
warning(text)
114
140
:param base_path: Path to the file text for the BASE tree
115
141
:param other_path: Path to the file text for the OTHER tree
116
142
"""
117
self.add_suffix(this_path, ".THIS")
143
self.add_suffix(this_path, ".THIS", fix_inventory=False)
118
144
self.dump(base_lines, this_path+".BASE")
119
145
self.dump(other_lines, this_path+".OTHER")
120
146
rename(new_file, this_path)
121
147
self.conflict("Diff3 conflict encountered in %s" % this_path)
122
148
149
def weave_merge_conflict(self, filename, weave, other_i, out_file):
150
"""
151
Handle weave conflicts by producing a .THIS, and .OTHER. The
152
main file will be a version with diff3-style conflicts.
153
"""
154
self.add_suffix(filename, ".THIS", fix_inventory=False)
155
out_file.commit()
156
self.dump(weave.get_iter(other_i), filename+".OTHER")
157
self.conflict("Text conflict encountered in %s" % filename)
158
123
159
def new_contents_conflict(self, filename, other_contents):
124
160
"""Conflicting contents for newly added file."""
125
self.copy(other_contents, filename + ".OTHER")
161
other_contents(filename + ".OTHER", self, False)
126
162
self.conflict("Conflict in newly added file %s" % filename)
127
163
128
164
140
176
def rem_contents_conflict(self, filename, this_contents, base_contents):
141
177
base_contents(filename+".BASE", self, False)
142
178
this_contents(filename+".THIS", self, False)
179
return ReplaceContents(this_contents, None)
180
181
def rem_contents_conflict(self, filename, this_contents, base_contents):
182
base_contents(filename+".BASE", self, False)
183
this_contents(filename+".THIS", self, False)
143
184
self.conflict("Other branch deleted locally modified file %s" %
144
185
filename)
145
186
return ReplaceContents(this_contents, None)
146
187
147
188
def abs_this_path(self, file_id):
148
189
"""Return the absolute path for a file_id in the this tree."""
149
relpath = self.this_tree.id2path(file_id)
150
return self.this_tree.tree.abspath(relpath)
190
return self.this_tree.id2abspath(file_id)
151
191
152
192
def add_missing_parents(self, file_id, tree):
153
193
"""If some of the parents for file_id are missing, add them."""
154
entry = tree.tree.inventory[file_id]
194
entry = tree.inventory[file_id]
155
195
if entry.parent_id not in self.this_tree:
156
196
return self.create_all_missing(entry.parent_id, tree)
157
197
else:
159
199
160
200
def create_all_missing(self, file_id, tree):
161
201
"""Add contents for a file_id and all its parents to a tree."""
162
entry = tree.tree.inventory[file_id]
202
entry = tree.inventory[file_id]
163
203
if entry.parent_id is not None and entry.parent_id not in self.this_tree:
164
204
abspath = self.create_all_missing(entry.parent_id, tree)
165
205
else:
171
211
172
212
def create(self, file_id, path, tree, reverse=False):
173
213
"""Uses tree data to create a filesystem object for the file_id"""
174
from merge_core import get_id_contents
175
get_id_contents(file_id, tree)(path, self, reverse)
214
from changeset import get_contents
215
get_contents(tree, file_id)(path, self, reverse)
176
216
177
217
def missing_for_merge(self, file_id, other_path):
178
218
"""The file_id doesn't exist in THIS, but does in OTHER and BASE"""
183
223
self.create(file_id, stem+".OTHER", self.other_tree)
184
224
self.create(file_id, stem+".BASE", self.base_tree)
185
225
226
def threeway_contents_conflict(filename, this_contents, base_contents,
227
other_contents):
228
self.conflict("Three-way conflict merging %s" % filename)
229
186
230
def finalize(self):
187
231
if not self.ignore_zero:
188
print "%d conflicts encountered.\n" % self.conflicts
232
note("%d conflicts encountered.\n", self.conflicts)
189
233
190
def get_tree(treespec, temp_root, label, local_branch=None):
234
def get_tree(treespec, local_branch=None):
191
235
location, revno = treespec
192
branch = Branch.open_containing(location)
236
branch = Branch.open_containing(location)[0]
193
237
if revno is None:
194
238
revision = None
195
239
elif revno == -1:
196
240
revision = branch.last_revision()
197
241
else:
198
242
revision = branch.get_rev_id(revno)
199
return branch, get_revid_tree(branch, revision, temp_root, label,
200
local_branch)
243
if revision is None:
244
revision = NULL_REVISION
245
return branch, get_revid_tree(branch, revision, local_branch)
201
246
202
def get_revid_tree(branch, revision, temp_root, label, local_branch):
247
def get_revid_tree(branch, revision, local_branch):
203
248
if revision is None:
204
249
base_tree = branch.working_tree()
205
250
else:
208
253
base_tree = local_branch.revision_tree(revision)
209
254
else:
210
255
base_tree = branch.revision_tree(revision)
211
temp_path = os.path.join(temp_root, label)
212
os.mkdir(temp_path)
213
return MergeTree(base_tree, temp_path)
256
return base_tree
214
257
215
258
216
259
def file_exists(tree, file_id):
217
260
return tree.has_filename(tree.id2path(file_id))
218
261
219
262
220
class MergeTree(object):
221
def __init__(self, tree, tempdir):
222
object.__init__(self)
223
if hasattr(tree, "basedir"):
224
self.root = tree.basedir
225
else:
226
self.root = None
227
self.tree = tree
228
self.tempdir = tempdir
229
os.mkdir(os.path.join(self.tempdir, "texts"))
230
os.mkdir(os.path.join(self.tempdir, "symlinks"))
231
self.cached = {}
232
233
def __iter__(self):
234
return self.tree.__iter__()
235
236
def __contains__(self, file_id):
237
return file_id in self.tree
238
239
def get_file(self, file_id):
240
return self.tree.get_file(file_id)
241
242
def get_file_sha1(self, id):
243
return self.tree.get_file_sha1(id)
244
245
def is_executable(self, id):
246
return self.tree.is_executable(id)
247
248
def id2path(self, file_id):
249
return self.tree.id2path(file_id)
250
251
def has_id(self, file_id):
252
return self.tree.has_id(file_id)
253
254
def has_or_had_id(self, file_id):
255
if file_id == self.tree.inventory.root.file_id:
256
return True
257
return self.tree.inventory.has_id(file_id)
258
259
def has_or_had_id(self, file_id):
260
if file_id == self.tree.inventory.root.file_id:
261
return True
262
return self.tree.inventory.has_id(file_id)
263
264
def readonly_path(self, id):
265
if id not in self.tree:
266
return None
267
if self.root is not None:
268
return self.tree.abspath(self.tree.id2path(id))
269
else:
270
kind = self.tree.inventory[id].kind
271
if kind in ("directory", "root_directory"):
272
return self.tempdir
273
if not self.cached.has_key(id):
274
if kind == "file":
275
path = os.path.join(self.tempdir, "texts", id)
276
outfile = file(path, "wb")
277
outfile.write(self.tree.get_file(id).read())
278
assert(bzrlib.osutils.lexists(path))
279
if self.tree.is_executable(id):
280
os.chmod(path, 0755)
281
else:
282
assert kind == "symlink"
283
path = os.path.join(self.tempdir, "symlinks", id)
284
target = self.tree.get_symlink_target(id)
285
os.symlink(target, path)
286
self.cached[id] = path
287
return self.cached[id]
288
289
290
263
def build_working_dir(to_dir):
291
264
"""Build a working directory in an empty directory.
292
265
297
270
eventually be done by just building the tree directly calling into
298
271
lower-level code (e.g. constructing a changeset).
299
272
"""
300
merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
301
check_clean=False, ignore_zero=True)
273
# RBC 20051019 is this not just 'export' ?
274
# AB Well, export doesn't take care of inventory...
275
this_branch = Branch.open_containing(to_dir)[0]
276
transform_tree(this_branch.working_tree(), this_branch.basis_tree())
277
278
279
def transform_tree(from_tree, to_tree, interesting_ids=None):
280
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
281
interesting_ids=interesting_ids)
302
282
303
283
304
284
def merge(other_revision, base_revision,
305
285
check_clean=True, ignore_zero=False,
306
286
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
307
file_list=None):
287
file_list=None, show_base=False, reprocess=False):
308
288
"""Merge changes into a tree.
309
289
310
290
base_revision
311
tuple(path, revision) Base for three-way merge.
291
list(path, revno) Base for three-way merge.
292
If [None, None] then a base will be automatically determined.
312
293
other_revision
313
tuple(path, revision) Other revision for three-way merge.
294
list(path, revno) Other revision for three-way merge.
314
295
this_dir
315
296
Directory to merge changes into; '.' by default.
316
297
check_clean
319
300
ignore_zero - If true, suppress the "zero conflicts" message when
320
301
there are no conflicts; should be set when doing something we expect
321
302
to complete perfectly.
303
file_list - If supplied, merge only changes to selected files.
322
304
323
305
All available ancestors of other_revision and base_revision are
324
306
automatically pulled into the branch.
307
308
The revno may be -1 to indicate the last revision on the branch, which is
309
the typical case.
310
311
This function is intended for use from the command line; programmatic
312
clients might prefer to call merge_inner(), which has less magic behavior.
325
313
"""
326
tempdir = tempfile.mkdtemp(prefix="bzr-")
327
try:
328
if this_dir is None:
329
this_dir = '.'
330
this_branch = Branch.open_containing(this_dir)
331
this_rev_id = this_branch.last_revision()
332
if this_rev_id is None:
314
if this_dir is None:
315
this_dir = '.'
316
this_branch = Branch.open_containing(this_dir)[0]
317
if show_base and not merge_type is ApplyMerge3:
318
raise BzrCommandError("Show-base is not supported for this merge"
319
" type. %s" % merge_type)
320
if reprocess and not merge_type is ApplyMerge3:
321
raise BzrCommandError("Reprocess is not supported for this merge"
322
" type. %s" % merge_type)
323
if reprocess and show_base:
324
raise BzrCommandError("Cannot reprocess and show base.")
325
merger = Merger(this_branch)
326
merger.check_basis(check_clean)
327
merger.set_other(other_revision)
328
merger.set_base(base_revision)
329
if merger.base_rev_id == merger.other_rev_id:
330
note('Nothing to do.')
331
return 0
332
merger.backup_files = backup_files
333
merger.merge_type = merge_type
334
merger.set_interesting_files(file_list)
335
merger.show_base = show_base
336
merger.reprocess = reprocess
337
merger.conflict_handler = MergeConflictHandler(merger.this_tree,
338
merger.base_tree,
339
merger.other_tree,
340
ignore_zero=ignore_zero)
341
conflicts = merger.do_merge()
342
merger.set_pending()
343
return conflicts
344
345
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
346
backup_files=False,
347
merge_type=ApplyMerge3,
348
interesting_ids=None,
349
show_base=False,
350
reprocess=False,
351
other_rev_id=None,
352
interesting_files=None):
353
"""Primary interface for merging.
354
355
typical use is probably
356
'merge_inner(branch, branch.get_revision_tree(other_revision),
357
branch.get_revision_tree(base_revision))'
358
"""
359
merger = Merger(this_branch, other_tree, base_tree)
360
merger.backup_files = backup_files
361
merger.merge_type = merge_type
362
merger.interesting_ids = interesting_ids
363
if interesting_files:
364
assert not interesting_ids, ('Only supply interesting_ids'
365
' or interesting_files')
366
merger._set_interesting_files(interesting_files)
367
merger.show_base = show_base
368
merger.reprocess = reprocess
369
merger.conflict_handler = MergeConflictHandler(merger.this_tree, base_tree,
370
other_tree,
371
ignore_zero=ignore_zero)
372
merger.other_rev_id = other_rev_id
373
merger.other_basis = other_rev_id
374
return merger.do_merge()
375
376
377
class Merger(object):
378
def __init__(self, this_branch, other_tree=None, base_tree=None):
379
object.__init__(self)
380
self.this_branch = this_branch
381
self.this_basis = this_branch.last_revision()
382
self.this_rev_id = None
383
self.this_tree = this_branch.working_tree()
384
self.this_revision_tree = None
385
self.this_basis_tree = None
386
self.other_tree = other_tree
387
self.base_tree = base_tree
388
self.ignore_zero = False
389
self.backup_files = False
390
self.interesting_ids = None
391
self.show_base = False
392
self.reprocess = False
393
self.conflict_handler = MergeConflictHandler(self.this_tree, base_tree,
394
other_tree)
395
396
def revision_tree(self, revision_id):
397
return self.this_branch.revision_tree(revision_id)
398
399
def ensure_revision_trees(self):
400
if self.this_revision_tree is None:
401
self.this_basis_tree = self.this_branch.revision_tree(
402
self.this_basis)
403
if self.this_basis == self.this_rev_id:
404
self.this_revision_tree = self.this_basis_tree
405
406
407
if self.other_rev_id is None:
408
other_basis_tree = self.revision_tree(self.other_basis)
409
changes = compare_trees(self.other_tree, other_basis_tree)
410
if changes.has_changed():
411
raise WorkingTreeNotRevision(self.this_tree)
412
other_rev_id = other_basis
413
self.other_tree = other_basis_tree
414
415
416
def file_revisions(self, file_id):
417
self.ensure_revision_trees()
418
def get_id(tree, file_id):
419
revision_id = tree.inventory[file_id].revision
420
assert revision_id is not None
421
return revision_id
422
if self.this_rev_id is None:
423
if self.this_basis_tree.get_file_sha1(file_id) != \
424
self.this_tree.get_file_sha1(file_id):
425
raise WorkingTreeNotRevision(self.this_tree)
426
427
trees = (self.this_basis_tree, self.other_tree)
428
return [get_id(tree, file_id) for tree in trees]
429
430
431
def merge_factory(self, file_id, base, other):
432
if self.merge_type.history_based:
433
if self.show_base is True:
434
raise BzrError("Cannot show base for hisory-based merges")
435
if self.reprocess is True:
436
raise BzrError("Cannot reprocess history-based merges")
437
438
t_revid, o_revid = self.file_revisions(file_id)
439
weave = self.this_basis_tree.get_weave(file_id)
440
contents_change = self.merge_type(weave, t_revid, o_revid)
441
else:
442
if self.show_base is True or self.reprocess is True:
443
contents_change = self.merge_type(file_id, base, other,
444
show_base=self.show_base,
445
reprocess=self.reprocess)
446
else:
447
contents_change = self.merge_type(file_id, base, other)
448
if self.backup_files:
449
contents_change = BackupBeforeChange(contents_change)
450
return contents_change
451
452
def check_basis(self, check_clean):
453
if self.this_basis is None:
333
454
raise BzrCommandError("This branch has no commits")
334
455
if check_clean:
335
changes = compare_trees(this_branch.working_tree(),
336
this_branch.basis_tree(), False)
337
if changes.has_changed():
456
self.compare_basis()
457
if self.this_basis != self.this_rev_id:
338
458
raise BzrCommandError("Working tree has uncommitted changes.")
339
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
340
this_branch)
459
460
def compare_basis(self):
461
changes = compare_trees(self.this_branch.working_tree(),
462
self.this_branch.basis_tree(), False)
463
if not changes.has_changed():
464
self.this_rev_id = self.this_basis
465
466
def set_interesting_files(self, file_list):
467
try:
468
self._set_interesting_files(file_list)
469
except NotVersionedError, e:
470
raise BzrCommandError("%s is not a source file in any"
471
" tree." % e.path)
472
473
def _set_interesting_files(self, file_list):
474
"""Set the list of interesting ids from a list of files."""
475
if file_list is None:
476
self.interesting_ids = None
477
return
478
479
interesting_ids = set()
480
for fname in file_list:
481
path = self.this_tree.relpath(fname)
482
found_id = False
483
for tree in (self.this_tree, self.base_tree, self.other_tree):
484
file_id = tree.inventory.path2id(path)
485
if file_id is not None:
486
interesting_ids.add(file_id)
487
found_id = True
488
if not found_id:
489
raise NotVersionedError(path=fname)
490
self.interesting_ids = interesting_ids
491
492
def set_pending(self):
493
if not self.base_is_ancestor:
494
return
495
if self.other_rev_id is None:
496
return
497
if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):
498
return
499
self.this_branch.working_tree().add_pending_merge(self.other_rev_id)
500
501
def set_other(self, other_revision):
502
other_branch, self.other_tree = get_tree(other_revision,
503
self.this_branch)
341
504
if other_revision[1] == -1:
342
other_rev_id = other_branch.last_revision()
343
if other_rev_id is None:
505
self.other_rev_id = other_branch.last_revision()
506
if self.other_rev_id is None:
344
507
raise NoCommits(other_branch)
345
other_basis = other_rev_id
508
self.other_basis = self.other_rev_id
346
509
elif other_revision[1] is not None:
347
other_rev_id = other_branch.get_rev_id(other_revision[1])
348
other_basis = other_rev_id
510
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
511
self.other_basis = self.other_rev_id
349
512
else:
350
other_rev_id = None
351
other_basis = other_branch.last_revision()
352
if other_basis is None:
513
self.other_rev_id = None
514
self.other_basis = other_branch.last_revision()
515
if self.other_basis is None:
353
516
raise NoCommits(other_branch)
517
fetch(from_branch=other_branch, to_branch=self.this_branch,
518
last_revision=self.other_basis)
519
520
def set_base(self, base_revision):
521
mutter("doing merge() with no base_revision specified")
354
522
if base_revision == [None, None]:
355
523
try:
356
base_rev_id = common_ancestor(this_rev_id, other_basis,
357
this_branch)
524
self.base_rev_id = common_ancestor(self.this_basis,
525
self.other_basis,
526
self.this_branch)
358
527
except NoCommonAncestor:
359
528
raise UnrelatedBranches()
360
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
361
"base", None)
362
base_is_ancestor = True
529
self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,
530
None)
531
self.base_is_ancestor = True
363
532
else:
364
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
533
base_branch, self.base_tree = get_tree(base_revision)
365
534
if base_revision[1] == -1:
366
base_rev_id = base_branch.last_revision()
535
self.base_rev_id = base_branch.last_revision()
367
536
elif base_revision[1] is None:
368
base_rev_id = None
369
else:
370
base_rev_id = base_branch.get_rev_id(base_revision[1])
371
fetch(from_branch=base_branch, to_branch=this_branch)
372
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
373
this_branch)
374
if file_list is None:
375
interesting_ids = None
376
else:
377
interesting_ids = set()
378
this_tree = this_branch.working_tree()
379
for fname in file_list:
380
path = this_branch.relpath(fname)
381
found_id = False
382
for tree in (this_tree, base_tree.tree, other_tree.tree):
383
file_id = tree.inventory.path2id(path)
384
if file_id is not None:
385
interesting_ids.add(file_id)
386
found_id = True
387
if not found_id:
388
raise BzrCommandError("%s is not a source file in any"
389
" tree." % fname)
390
merge_inner(this_branch, other_tree, base_tree, tempdir,
391
ignore_zero=ignore_zero, backup_files=backup_files,
392
merge_type=merge_type, interesting_ids=interesting_ids)
393
if base_is_ancestor and other_rev_id is not None\
394
and other_rev_id not in this_branch.revision_history():
395
this_branch.add_pending_merge(other_rev_id)
396
finally:
397
shutil.rmtree(tempdir)
398
399
400
def set_interesting(inventory_a, inventory_b, interesting_ids):
401
"""Mark files whose ids are in interesting_ids as interesting
402
"""
403
for inventory in (inventory_a, inventory_b):
404
for path, source_file in inventory.iteritems():
405
source_file.interesting = source_file.id in interesting_ids
406
407
408
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
409
"""Generate a changeset. If interesting_ids is supplied, only changes
410
to those files will be shown. Metadata changes are stripped.
411
"""
412
cset = generate_changeset(tree_a, tree_b, interesting_ids)
413
for entry in cset.entries.itervalues():
414
entry.metadata_change = None
415
return cset
416
417
418
def merge_inner(this_branch, other_tree, base_tree, tempdir,
419
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
420
interesting_ids=None):
421
422
def merge_factory(file_id, base, other):
423
contents_change = merge_type(file_id, base, other)
424
if backup_files:
425
contents_change = BackupBeforeChange(contents_change)
426
return contents_change
427
428
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
429
430
def get_inventory(tree):
431
return tree.tree.inventory
432
433
inv_changes = merge_flex(this_tree, base_tree, other_tree,
434
generate_cset_optimized, get_inventory,
435
MergeConflictHandler(this_tree, base_tree,
436
other_tree, ignore_zero=ignore_zero),
437
merge_factory=merge_factory,
438
interesting_ids=interesting_ids)
439
440
adjust_ids = []
441
for id, path in inv_changes.iteritems():
442
if path is not None:
443
if path == '.':
444
path = ''
445
else:
446
assert path.startswith('.' + os.sep), "path is %s" % path
447
path = path[2:]
448
adjust_ids.append((path, id))
449
if len(adjust_ids) > 0:
450
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
451
adjust_ids))
452
453
454
def regen_inventory(this_branch, root, new_entries):
455
old_entries = this_branch.read_working_inventory()
456
new_inventory = {}
457
by_path = {}
458
new_entries_map = {}
459
for path, file_id in new_entries:
460
if path is None:
461
continue
462
new_entries_map[file_id] = path
463
464
def id2path(file_id):
465
path = new_entries_map.get(file_id)
466
if path is not None:
467
return path
468
entry = old_entries[file_id]
469
if entry.parent_id is None:
470
return entry.name
471
return os.path.join(id2path(entry.parent_id), entry.name)
472
473
for file_id in old_entries:
474
entry = old_entries[file_id]
475
path = id2path(file_id)
476
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
477
by_path[path] = file_id
478
479
deletions = 0
480
insertions = 0
481
new_path_list = []
482
for path, file_id in new_entries:
483
if path is None:
484
del new_inventory[file_id]
485
deletions += 1
486
else:
487
new_path_list.append((path, file_id))
488
if file_id not in old_entries:
489
insertions += 1
490
# Ensure no file is added before its parent
491
new_path_list.sort()
492
for path, file_id in new_path_list:
493
if path == '':
494
parent = None
495
else:
496
parent = by_path[os.path.dirname(path)]
497
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
498
new_inventory[file_id] = (path, file_id, parent, kind)
499
by_path[path] = file_id
500
501
# Get a list in insertion order
502
new_inventory_list = new_inventory.values()
503
mutter ("""Inventory regeneration:
504
old length: %i insertions: %i deletions: %i new_length: %i"""\
505
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
506
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
507
new_inventory_list.sort()
508
return new_inventory_list
537
self.base_rev_id = None
538
else:
539
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
540
fetch(from_branch=base_branch, to_branch=self.this_branch)
541
self.base_is_ancestor = is_ancestor(self.this_basis,
542
self.base_rev_id,
543
self.this_branch)
544
545
def do_merge(self):
546
def get_inventory(tree):
547
return tree.inventory
548
549
inv_changes = merge_flex(self.this_tree, self.base_tree,
550
self.other_tree,
551
generate_changeset, get_inventory,
552
self.conflict_handler,
553
merge_factory=self.merge_factory,
554
interesting_ids=self.interesting_ids)
555
556
adjust_ids = []
557
for id, path in inv_changes.iteritems():
558
if path is not None:
559
if path == '.':
560
path = ''
561
else:
562
assert path.startswith('.' + os.sep), "path is %s" % path
563
path = path[2:]
564
adjust_ids.append((path, id))
565
if len(adjust_ids) > 0:
566
self.this_branch.working_tree().set_inventory(self.regen_inventory(adjust_ids))
567
conflicts = self.conflict_handler.conflicts
568
self.conflict_handler.finalize()
569
return conflicts
570
571
def regen_inventory(self, new_entries):
572
old_entries = self.this_branch.working_tree().read_working_inventory()
573
new_inventory = {}
574
by_path = {}
575
new_entries_map = {}
576
for path, file_id in new_entries:
577
if path is None:
578
continue
579
new_entries_map[file_id] = path
580
581
def id2path(file_id):
582
path = new_entries_map.get(file_id)
583
if path is not None:
584
return path
585
entry = old_entries[file_id]
586
if entry.parent_id is None:
587
return entry.name
588
return os.path.join(id2path(entry.parent_id), entry.name)
589
590
for file_id in old_entries:
591
entry = old_entries[file_id]
592
path = id2path(file_id)
593
new_inventory[file_id] = (path, file_id, entry.parent_id,
594
entry.kind)
595
by_path[path] = file_id
596
597
deletions = 0
598
insertions = 0
599
new_path_list = []
600
for path, file_id in new_entries:
601
if path is None:
602
del new_inventory[file_id]
603
deletions += 1
604
else:
605
new_path_list.append((path, file_id))
606
if file_id not in old_entries:
607
insertions += 1
608
# Ensure no file is added before its parent
609
new_path_list.sort()
610
for path, file_id in new_path_list:
611
if path == '':
612
parent = None
613
else:
614
parent = by_path[os.path.dirname(path)]
615
abspath = os.path.join(self.this_tree.basedir, path)
616
kind = bzrlib.osutils.file_kind(abspath)
617
new_inventory[file_id] = (path, file_id, parent, kind)
618
by_path[path] = file_id
619
620
# Get a list in insertion order
621
new_inventory_list = new_inventory.values()
622
mutter ("""Inventory regeneration:
623
old length: %i insertions: %i deletions: %i new_length: %i"""\
624
% (len(old_entries), insertions, deletions,
625
len(new_inventory_list)))
626
assert len(new_inventory_list) == len(old_entries) + insertions\
627
- deletions
628
new_inventory_list.sort()
629
return new_inventory_list
509
630
510
631
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
511
"diff3": (Diff3Merge, "Merge using external diff3")
632
"diff3": (Diff3Merge, "Merge using external diff3"),
633
'weave': (WeaveMerge, "Weave-based merge")
512
634
}
513
635
Loggerhead is a web-based interface for Breezy
Version: 2.0.1