166
def rem_contents_conflict(self, filename, this_contents, base_contents):
167
base_contents(filename+".BASE", self)
168
this_contents(filename+".THIS", self)
169
self.conflict("Other branch deleted locally modified file %s" %
171
return ReplaceContents(this_contents, None)
173
def abs_this_path(self, file_id):
174
"""Return the absolute path for a file_id in the this tree."""
175
return self.this_tree.id2abspath(file_id)
177
def add_missing_parents(self, file_id, tree):
178
"""If some of the parents for file_id are missing, add them."""
179
entry = tree.inventory[file_id]
180
if entry.parent_id not in self.this_tree:
181
return self.create_all_missing(entry.parent_id, tree)
183
return self.abs_this_path(entry.parent_id)
185
def create_all_missing(self, file_id, tree):
186
"""Add contents for a file_id and all its parents to a tree."""
187
entry = tree.inventory[file_id]
188
if entry.parent_id is not None and entry.parent_id not in self.this_tree:
189
abspath = self.create_all_missing(entry.parent_id, tree)
191
abspath = self.abs_this_path(entry.parent_id)
192
entry_path = pathjoin(abspath, entry.name)
193
if not os.path.isdir(entry_path):
194
self.create(file_id, entry_path, tree)
197
def create(self, file_id, path, tree):
198
"""Uses tree data to create a filesystem object for the file_id"""
199
from bzrlib._changeset import get_contents
200
get_contents(tree, file_id)(path, self)
202
def missing_for_merge(self, file_id, other_path):
203
"""The file_id doesn't exist in THIS, but does in OTHER and BASE"""
204
self.conflict("Other branch modified locally deleted file %s" %
206
parent_dir = self.add_missing_parents(file_id, self.other_tree)
207
stem = pathjoin(parent_dir, os.path.basename(other_path))
208
self.create(file_id, stem+".OTHER", self.other_tree)
209
self.create(file_id, stem+".BASE", self.base_tree)
211
def threeway_contents_conflict(filename, this_contents, base_contents,
213
self.conflict("Three-way conflict merging %s" % filename)
215
130
def finalize(self):
216
if self.conflicts == 0:
217
if not self.ignore_zero:
218
note("All changes applied successfully.")
220
note("%d conflicts encountered." % self.conflicts)
222
def _get_tree(treespec, local_branch=None):
131
if not self.ignore_zero:
132
print "%d conflicts encountered.\n" % self.conflicts
134
def get_tree(treespec, temp_root, label, local_branch=None):
223
135
location, revno = treespec
224
branch = Branch.open_containing(location)[0]
136
branch = find_branch(location)
225
137
if revno is None:
227
139
elif revno == -1:
228
140
revision = branch.last_revision()
230
revision = branch.get_rev_id(revno)
232
revision = NULL_REVISION
233
return branch, _get_revid_tree(branch, revision, local_branch)
236
def _get_revid_tree(branch, revision, local_branch):
142
revision = branch.lookup_revision(revno)
143
return branch, get_revid_tree(branch, revision, temp_root, label,
146
def get_revid_tree(branch, revision, temp_root, label, local_branch):
237
147
if revision is None:
238
base_tree = branch.bzrdir.open_workingtree()
148
base_tree = branch.working_tree()
240
150
if local_branch is not None:
241
if local_branch.base != branch.base:
242
greedy_fetch(local_branch, branch, revision)
243
base_tree = local_branch.repository.revision_tree(revision)
151
greedy_fetch(local_branch, branch, revision)
152
base_tree = local_branch.revision_tree(revision)
245
base_tree = branch.repository.revision_tree(revision)
249
def transform_tree(from_tree, to_tree, interesting_ids=None):
250
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
251
interesting_ids=interesting_ids)
254
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
256
merge_type=ApplyMerge3,
257
interesting_ids=None,
261
interesting_files=None,
263
"""Primary interface for merging.
265
typical use is probably
266
'merge_inner(branch, branch.get_revision_tree(other_revision),
267
branch.get_revision_tree(base_revision))'
269
if this_tree is None:
270
this_tree = this_branch.bzrdir.open_workingtree()
271
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree)
272
merger.backup_files = backup_files
273
merger.merge_type = merge_type
274
merger.interesting_ids = interesting_ids
275
if interesting_files:
276
assert not interesting_ids, ('Only supply interesting_ids'
277
' or interesting_files')
278
merger._set_interesting_files(interesting_files)
279
merger.show_base = show_base
280
merger.reprocess = reprocess
281
merger.conflict_handler = _MergeConflictHandler(merger.this_tree,
282
base_tree, other_tree,
283
ignore_zero=ignore_zero)
284
merger.other_rev_id = other_rev_id
285
merger.other_basis = other_rev_id
286
return merger.do_merge()
289
class Merger(object):
290
def __init__(self, this_branch, other_tree=None, base_tree=None, this_tree=None):
154
base_tree = branch.revision_tree(revision)
155
temp_path = os.path.join(temp_root, label)
157
return MergeTree(base_tree, temp_path)
160
def file_exists(tree, file_id):
161
return tree.has_filename(tree.id2path(file_id))
164
class MergeTree(object):
165
def __init__(self, tree, tempdir):
291
166
object.__init__(self)
292
assert this_tree is not None, "this_tree is required"
293
self.this_branch = this_branch
294
self.this_basis = this_branch.last_revision()
295
self.this_rev_id = None
296
self.this_tree = this_tree
297
self.this_revision_tree = None
298
self.this_basis_tree = None
299
self.other_tree = other_tree
300
self.base_tree = base_tree
301
self.ignore_zero = False
302
self.backup_files = False
303
self.interesting_ids = None
304
self.show_base = False
305
self.reprocess = False
306
self.conflict_handler = _MergeConflictHandler(self.this_tree,
307
base_tree, other_tree)
309
def revision_tree(self, revision_id):
310
return self.this_branch.repository.revision_tree(revision_id)
312
def ensure_revision_trees(self):
313
if self.this_revision_tree is None:
314
self.this_basis_tree = self.this_branch.repository.revision_tree(
316
if self.this_basis == self.this_rev_id:
317
self.this_revision_tree = self.this_basis_tree
319
if self.other_rev_id is None:
320
other_basis_tree = self.revision_tree(self.other_basis)
321
changes = compare_trees(self.other_tree, other_basis_tree)
322
if changes.has_changed():
323
raise WorkingTreeNotRevision(self.this_tree)
324
other_rev_id = other_basis
325
self.other_tree = other_basis_tree
327
def file_revisions(self, file_id):
328
self.ensure_revision_trees()
329
def get_id(tree, file_id):
330
revision_id = tree.inventory[file_id].revision
331
assert revision_id is not None
333
if self.this_rev_id is None:
334
if self.this_basis_tree.get_file_sha1(file_id) != \
335
self.this_tree.get_file_sha1(file_id):
336
raise WorkingTreeNotRevision(self.this_tree)
338
trees = (self.this_basis_tree, self.other_tree)
339
return [get_id(tree, file_id) for tree in trees]
341
def merge_factory(self, file_id, base, other):
342
if self.merge_type.history_based:
343
if self.show_base is True:
344
raise BzrError("Cannot show base for hisory-based merges")
345
if self.reprocess is True:
346
raise BzrError("Cannot reprocess history-based merges")
348
t_revid, o_revid = self.file_revisions(file_id)
349
weave = self.this_basis_tree.get_weave(file_id)
350
contents_change = self.merge_type(weave, t_revid, o_revid)
352
if self.show_base is True or self.reprocess is True:
353
contents_change = self.merge_type(file_id, base, other,
354
show_base=self.show_base,
355
reprocess=self.reprocess)
357
contents_change = self.merge_type(file_id, base, other)
358
if self.backup_files:
359
contents_change = BackupBeforeChange(contents_change)
360
return contents_change
362
def check_basis(self, check_clean):
363
if self.this_basis is None:
167
if hasattr(tree, "basedir"):
168
self.root = tree.basedir
172
self.tempdir = tempdir
173
os.mkdir(os.path.join(self.tempdir, "texts"))
177
return self.tree.__iter__()
179
def __contains__(self, file_id):
180
return file_id in self.tree
182
def get_file(self, file_id):
183
return self.tree.get_file(file_id)
185
def get_file_sha1(self, id):
186
return self.tree.get_file_sha1(id)
188
def id2path(self, file_id):
189
return self.tree.id2path(file_id)
191
def has_id(self, file_id):
192
return self.tree.has_id(file_id)
194
def has_or_had_id(self, file_id):
195
if file_id == self.tree.inventory.root.file_id:
197
return self.tree.inventory.has_id(file_id)
199
def has_or_had_id(self, file_id):
200
if file_id == self.tree.inventory.root.file_id:
202
return self.tree.inventory.has_id(file_id)
204
def readonly_path(self, id):
205
if id not in self.tree:
207
if self.root is not None:
208
return self.tree.abspath(self.tree.id2path(id))
210
if self.tree.inventory[id].kind in ("directory", "root_directory"):
212
if not self.cached.has_key(id):
213
path = os.path.join(self.tempdir, "texts", id)
214
outfile = file(path, "wb")
215
outfile.write(self.tree.get_file(id).read())
216
assert(os.path.exists(path))
217
self.cached[id] = path
218
return self.cached[id]
222
def merge(other_revision, base_revision,
223
check_clean=True, ignore_zero=False,
224
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
226
"""Merge changes into a tree.
229
tuple(path, revision) Base for three-way merge.
231
tuple(path, revision) Other revision for three-way merge.
233
Directory to merge changes into; '.' by default.
235
If true, this_dir must have no uncommitted changes before the
237
all available ancestors of other_revision and base_revision are
238
automatically pulled into the branch.
240
from bzrlib.revision import common_ancestor, MultipleRevisionSources
241
from bzrlib.errors import NoSuchRevision
242
tempdir = tempfile.mkdtemp(prefix="bzr-")
246
this_branch = find_branch(this_dir)
247
this_rev_id = this_branch.last_revision()
248
if this_rev_id is None:
364
249
raise BzrCommandError("This branch has no commits")
367
if self.this_basis != self.this_rev_id:
251
changes = compare_trees(this_branch.working_tree(),
252
this_branch.basis_tree(), False)
253
if changes.has_changed():
368
254
raise BzrCommandError("Working tree has uncommitted changes.")
370
def compare_basis(self):
371
changes = compare_trees(self.this_tree,
372
self.this_tree.basis_tree(), False)
373
if not changes.has_changed():
374
self.this_rev_id = self.this_basis
376
def set_interesting_files(self, file_list):
378
self._set_interesting_files(file_list)
379
except NotVersionedError, e:
380
raise BzrCommandError("%s is not a source file in any"
383
def _set_interesting_files(self, file_list):
384
"""Set the list of interesting ids from a list of files."""
385
if file_list is None:
386
self.interesting_ids = None
389
interesting_ids = set()
390
for path in file_list:
392
for tree in (self.this_tree, self.base_tree, self.other_tree):
393
file_id = tree.inventory.path2id(path)
394
if file_id is not None:
395
interesting_ids.add(file_id)
398
raise NotVersionedError(path=path)
399
self.interesting_ids = interesting_ids
401
def set_pending(self):
402
if not self.base_is_ancestor:
404
if self.other_rev_id is None:
406
ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
407
if self.other_rev_id in ancestry:
409
self.this_tree.add_pending_merge(self.other_rev_id)
411
def set_other(self, other_revision):
412
other_branch, self.other_tree = _get_tree(other_revision,
255
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
414
257
if other_revision[1] == -1:
415
self.other_rev_id = other_branch.last_revision()
416
if self.other_rev_id is None:
417
raise NoCommits(other_branch)
418
self.other_basis = self.other_rev_id
258
other_rev_id = other_branch.last_revision()
259
other_basis = other_rev_id
419
260
elif other_revision[1] is not None:
420
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
421
self.other_basis = self.other_rev_id
261
other_rev_id = other_branch.lookup_revision(other_revision[1])
262
other_basis = other_rev_id
423
self.other_rev_id = None
424
self.other_basis = other_branch.last_revision()
425
if self.other_basis is None:
426
raise NoCommits(other_branch)
427
if other_branch.base != self.this_branch.base:
428
fetch(from_branch=other_branch, to_branch=self.this_branch,
429
last_revision=self.other_basis)
431
def set_base(self, base_revision):
432
mutter("doing merge() with no base_revision specified")
265
other_basis = other_branch.last_revision()
433
266
if base_revision == [None, None]:
435
self.base_rev_id = common_ancestor(self.this_basis,
437
self.this_branch.repository)
438
except NoCommonAncestor:
267
base_rev_id = common_ancestor(this_rev_id, other_basis,
269
if base_rev_id is None:
439
270
raise UnrelatedBranches()
440
self.base_tree = _get_revid_tree(self.this_branch, self.base_rev_id,
442
self.base_is_ancestor = True
271
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
273
base_is_ancestor = True
444
base_branch, self.base_tree = _get_tree(base_revision)
275
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
445
276
if base_revision[1] == -1:
446
self.base_rev_id = base_branch.last_revision()
277
base_rev_id = base_branch.last_revision()
447
278
elif base_revision[1] is None:
448
self.base_rev_id = None
450
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
451
fetch(from_branch=base_branch, to_branch=self.this_branch)
452
self.base_is_ancestor = is_ancestor(self.this_basis,
457
def get_inventory(tree):
458
return tree.inventory
460
inv_changes = merge_flex(self.this_tree, self.base_tree,
462
generate_changeset, get_inventory,
463
self.conflict_handler,
464
merge_factory=self.merge_factory,
465
interesting_ids=self.interesting_ids)
468
for id, path in inv_changes.iteritems():
473
assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
475
adjust_ids.append((path, id))
476
if len(adjust_ids) > 0:
477
self.this_tree.set_inventory(self.regen_inventory(adjust_ids))
478
conflicts = self.conflict_handler.conflicts
479
self.conflict_handler.finalize()
482
def regen_inventory(self, new_entries):
483
old_entries = self.this_tree.read_working_inventory()
487
for path, file_id in new_entries:
490
new_entries_map[file_id] = path
492
def id2path(file_id):
493
path = new_entries_map.get(file_id)
496
entry = old_entries[file_id]
497
if entry.parent_id is None:
499
return pathjoin(id2path(entry.parent_id), entry.name)
501
for file_id in old_entries:
502
entry = old_entries[file_id]
503
path = id2path(file_id)
504
new_inventory[file_id] = (path, file_id, entry.parent_id,
506
by_path[path] = file_id
511
for path, file_id in new_entries:
513
del new_inventory[file_id]
516
new_path_list.append((path, file_id))
517
if file_id not in old_entries:
519
# Ensure no file is added before its parent
521
for path, file_id in new_path_list:
525
parent = by_path[os.path.dirname(path)]
526
abspath = pathjoin(self.this_tree.basedir, path)
527
kind = bzrlib.osutils.file_kind(abspath)
528
new_inventory[file_id] = (path, file_id, parent, kind)
529
by_path[path] = file_id
531
# Get a list in insertion order
532
new_inventory_list = new_inventory.values()
533
mutter ("""Inventory regeneration:
534
old length: %i insertions: %i deletions: %i new_length: %i"""\
535
% (len(old_entries), insertions, deletions,
536
len(new_inventory_list)))
537
assert len(new_inventory_list) == len(old_entries) + insertions\
539
new_inventory_list.sort()
540
return new_inventory_list
281
base_rev_id = base_branch.lookup_revision(base_revision[1])
282
if base_rev_id is not None:
283
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
284
MultipleRevisionSources(this_branch,
287
base_is_ancestor = False
288
if file_list is None:
289
interesting_ids = None
291
interesting_ids = set()
292
this_tree = this_branch.working_tree()
293
for fname in file_list:
294
path = this_branch.relpath(fname)
296
for tree in (this_tree, base_tree.tree, other_tree.tree):
297
file_id = tree.inventory.path2id(path)
298
if file_id is not None:
299
interesting_ids.add(file_id)
302
raise BzrCommandError("%s is not a source file in any"
304
merge_inner(this_branch, other_tree, base_tree, tempdir,
305
ignore_zero=ignore_zero, backup_files=backup_files,
306
merge_type=merge_type, interesting_ids=interesting_ids)
307
if base_is_ancestor and other_rev_id is not None\
308
and other_rev_id not in this_branch.revision_history():
309
this_branch.add_pending_merge(other_rev_id)
311
shutil.rmtree(tempdir)
314
def set_interesting(inventory_a, inventory_b, interesting_ids):
315
"""Mark files whose ids are in interesting_ids as interesting
317
for inventory in (inventory_a, inventory_b):
318
for path, source_file in inventory.iteritems():
319
source_file.interesting = source_file.id in interesting_ids
322
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
323
"""Generate a changeset. If interesting_ids is supplied, only changes
324
to those files will be shown. Metadata changes are stripped.
326
cset = generate_changeset(tree_a, tree_b, interesting_ids)
327
for entry in cset.entries.itervalues():
328
entry.metadata_change = None
332
def merge_inner(this_branch, other_tree, base_tree, tempdir,
333
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
334
interesting_ids=None):
336
def merge_factory(file_id, base, other):
337
contents_change = merge_type(file_id, base, other)
339
contents_change = BackupBeforeChange(contents_change)
340
return contents_change
342
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
344
def get_inventory(tree):
345
return tree.tree.inventory
347
inv_changes = merge_flex(this_tree, base_tree, other_tree,
348
generate_cset_optimized, get_inventory,
349
MergeConflictHandler(base_tree.root,
350
ignore_zero=ignore_zero),
351
merge_factory=merge_factory,
352
interesting_ids=interesting_ids)
355
for id, path in inv_changes.iteritems():
360
assert path.startswith('./'), "path is %s" % path
362
adjust_ids.append((path, id))
363
if len(adjust_ids) > 0:
364
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
368
def regen_inventory(this_branch, root, new_entries):
369
old_entries = this_branch.read_working_inventory()
373
for path, file_id in new_entries:
376
new_entries_map[file_id] = path
378
def id2path(file_id):
379
path = new_entries_map.get(file_id)
382
entry = old_entries[file_id]
383
if entry.parent_id is None:
385
return os.path.join(id2path(entry.parent_id), entry.name)
387
for file_id in old_entries:
388
entry = old_entries[file_id]
389
path = id2path(file_id)
390
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
391
by_path[path] = file_id
396
for path, file_id in new_entries:
398
del new_inventory[file_id]
401
new_path_list.append((path, file_id))
402
if file_id not in old_entries:
404
# Ensure no file is added before its parent
406
for path, file_id in new_path_list:
410
parent = by_path[os.path.dirname(path)]
411
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
412
new_inventory[file_id] = (path, file_id, parent, kind)
413
by_path[path] = file_id
415
# Get a list in insertion order
416
new_inventory_list = new_inventory.values()
417
mutter ("""Inventory regeneration:
418
old length: %i insertions: %i deletions: %i new_length: %i"""\
419
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
420
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
421
new_inventory_list.sort()
422
return new_inventory_list
543
424
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
544
"diff3": (Diff3Merge, "Merge using external diff3"),
545
'weave': (WeaveMerge, "Weave-based merge")
425
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
