1
# Copyright (C) 2005 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22
from bzrlib._changeset import generate_changeset, ExceptionConflictHandler
23
from bzrlib._changeset import Inventory, Diff3Merge, ReplaceContents
24
from bzrlib._merge_core import WeaveMerge
25
from bzrlib._merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
from bzrlib.branch import Branch
27
from bzrlib.delta import compare_trees
28
from bzrlib.errors import (BzrCommandError,
36
WorkingTreeNotRevision,
38
from bzrlib.fetch import greedy_fetch, fetch
40
from bzrlib.osutils import rename, pathjoin
41
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
42
from bzrlib.trace import mutter, warning, note
44
# TODO: Report back as changes are merged in
46
# comments from abentley on irc: merge happens in two stages, each
47
# of which generates a changeset object
49
# stage 1: generate OLD->OTHER,
50
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
52
class _MergeConflictHandler(ExceptionConflictHandler):
53
"""Handle conflicts encountered while merging.
55
This subclasses ExceptionConflictHandler, so that any types of
56
conflict that are not explicitly handled cause an exception and
59
def __init__(self, this_tree, base_tree, other_tree, ignore_zero=False):
60
ExceptionConflictHandler.__init__(self)
62
self.ignore_zero = ignore_zero
63
self.this_tree = this_tree
64
self.base_tree = base_tree
65
self.other_tree = other_tree
67
def copy(self, source, dest):
68
"""Copy the text and mode of a file
69
:param source: The path of the file to copy
70
:param dest: The distination file to create
72
s_file = file(source, "rb")
73
d_file = file(dest, "wb")
76
os.chmod(dest, 0777 & os.stat(source).st_mode)
78
def dump(self, lines, dest):
79
"""Copy the text and mode of a file
80
:param source: The path of the file to copy
81
:param dest: The distination file to create
83
d_file = file(dest, "wb")
87
def add_suffix(self, name, suffix, last_new_name=None, fix_inventory=True):
88
"""Rename a file to append a suffix. If the new name exists, the
89
suffix is added repeatedly until a non-existant name is found
91
:param name: The path of the file
92
:param suffix: The suffix to append
93
:param last_new_name: (used for recursive calls) the last name tried
95
if last_new_name is None:
97
new_name = last_new_name+suffix
99
rename(name, new_name)
100
if fix_inventory is True:
102
relpath = self.this_tree.relpath(name)
103
except NotBranchError:
105
if relpath is not None:
106
file_id = self.this_tree.path2id(relpath)
107
if file_id is not None:
108
new_path = self.this_tree.relpath(new_name)
109
rename(new_name, name)
110
self.this_tree.rename_one(relpath, new_path)
111
assert self.this_tree.id2path(file_id) == new_path
113
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
115
return self.add_suffix(name, suffix, last_new_name=new_name,
116
fix_inventory=fix_inventory)
119
def conflict(self, text):
124
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
126
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
127
main file will be a version with diff3 conflicts.
128
:param new_file: Path to the output file with diff3 markers
129
:param this_path: Path to the file text for the THIS tree
130
:param base_path: Path to the file text for the BASE tree
131
:param other_path: Path to the file text for the OTHER tree
133
self.add_suffix(this_path, ".THIS", fix_inventory=False)
134
self.dump(base_lines, this_path+".BASE")
135
self.dump(other_lines, this_path+".OTHER")
136
rename(new_file, this_path)
137
self.conflict("Diff3 conflict encountered in %s" % this_path)
139
def weave_merge_conflict(self, filename, weave, other_i, out_file):
141
Handle weave conflicts by producing a .THIS, and .OTHER. The
142
main file will be a version with diff3-style conflicts.
144
self.add_suffix(filename, ".THIS", fix_inventory=False)
146
self.dump(weave.get_iter(other_i), filename+".OTHER")
147
self.conflict("Text conflict encountered in %s" % filename)
149
def new_contents_conflict(self, filename, other_contents):
150
"""Conflicting contents for newly added file."""
151
other_contents(filename + ".OTHER", self, False)
152
self.conflict("Conflict in newly added file %s" % filename)
155
def target_exists(self, entry, target, old_path):
156
"""Handle the case when the target file or dir exists"""
157
moved_path = self.add_suffix(target, ".moved")
158
self.conflict("Moved existing %s to %s" % (target, moved_path))
160
def rmdir_non_empty(self, filename):
161
"""Handle the case where the dir to be removed still has contents"""
162
self.conflict("Directory %s not removed because it is not empty"\
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)
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):
223
location, revno = treespec
224
branch = Branch.open_containing(location)[0]
228
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):
238
base_tree = branch.bzrdir.open_workingtree()
240
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)
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):
291
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:
364
raise BzrCommandError("This branch has no commits")
367
if self.this_basis != self.this_rev_id:
368
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,
414
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
419
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
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")
433
if base_revision == [None, None]:
435
self.base_rev_id = common_ancestor(self.this_basis,
437
self.this_branch.repository)
438
except NoCommonAncestor:
439
raise UnrelatedBranches()
440
self.base_tree = _get_revid_tree(self.this_branch, self.base_rev_id,
442
self.base_is_ancestor = True
444
base_branch, self.base_tree = _get_tree(base_revision)
445
if base_revision[1] == -1:
446
self.base_rev_id = base_branch.last_revision()
447
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
543
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
544
"diff3": (Diff3Merge, "Merge using external diff3"),
545
'weave': (WeaveMerge, "Weave-based merge")
added
removed
bzrlib/merge.py
