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 fetch import greedy_fetch
25
import bzrlib.revision
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
from bzrlib.changeset import Inventory, Diff3Merge
29
from bzrlib.branch import find_branch
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
31
from bzrlib.delta import compare_trees
32
from bzrlib.trace import mutter, warning
33
from bzrlib.fetch import greedy_fetch
34
from bzrlib.revision import is_ancestor
36
# comments from abentley on irc: merge happens in two stages, each
37
# of which generates a changeset object
39
# stage 1: generate OLD->OTHER,
40
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
42
class MergeConflictHandler(ExceptionConflictHandler):
43
"""Handle conflicts encountered while merging.
45
This subclasses ExceptionConflictHandler, so that any types of
46
conflict that are not explicitly handled cause an exception and
49
def __init__(self, dir, ignore_zero=False):
50
ExceptionConflictHandler.__init__(self, dir)
52
self.ignore_zero = ignore_zero
54
def copy(self, source, dest):
55
"""Copy the text and mode of a file
56
:param source: The path of the file to copy
57
:param dest: The distination file to create
59
s_file = file(source, "rb")
60
d_file = file(dest, "wb")
63
os.chmod(dest, 0777 & os.stat(source).st_mode)
65
def dump(self, lines, dest):
66
"""Copy the text and mode of a file
67
:param source: The path of the file to copy
68
:param dest: The distination file to create
70
d_file = file(dest, "wb")
74
def add_suffix(self, name, suffix, last_new_name=None):
75
"""Rename a file to append a suffix. If the new name exists, the
76
suffix is added repeatedly until a non-existant name is found
78
:param name: The path of the file
79
:param suffix: The suffix to append
80
:param last_new_name: (used for recursive calls) the last name tried
82
if last_new_name is None:
84
new_name = last_new_name+suffix
86
os.rename(name, new_name)
89
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
91
return self.add_suffix(name, suffix, last_new_name=new_name)
93
def conflict(self, text):
98
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
100
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
101
main file will be a version with diff3 conflicts.
102
:param new_file: Path to the output file with diff3 markers
103
:param this_path: Path to the file text for the THIS tree
104
:param base_path: Path to the file text for the BASE tree
105
:param other_path: Path to the file text for the OTHER tree
107
self.add_suffix(this_path, ".THIS")
108
self.dump(base_lines, this_path+".BASE")
109
self.dump(other_lines, this_path+".OTHER")
110
os.rename(new_file, this_path)
111
self.conflict("Diff3 conflict encountered in %s" % this_path)
113
def new_contents_conflict(self, filename, other_contents):
114
"""Conflicting contents for newly added file."""
115
self.copy(other_contents, filename + ".OTHER")
116
self.conflict("Conflict in newly added file %s" % filename)
119
def target_exists(self, entry, target, old_path):
120
"""Handle the case when the target file or dir exists"""
121
moved_path = self.add_suffix(target, ".moved")
122
self.conflict("Moved existing %s to %s" % (target, moved_path))
124
def rmdir_non_empty(self, filename):
125
"""Handle the case where the dir to be removed still has contents"""
126
self.conflict("Directory %s not removed because it is not empty"\
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):
135
location, revno = treespec
136
branch = find_branch(location)
140
revision = branch.last_patch()
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):
148
base_tree = branch.working_tree()
150
if local_branch is not None:
151
greedy_fetch(local_branch, branch, revision)
152
base_tree = local_branch.revision_tree(revision)
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):
166
object.__init__(self)
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 readonly_path(self, id):
200
if id not in self.tree:
202
if self.root is not None:
203
return self.tree.abspath(self.tree.id2path(id))
205
if self.tree.inventory[id].kind in ("directory", "root_directory"):
207
if not self.cached.has_key(id):
208
path = os.path.join(self.tempdir, "texts", id)
209
outfile = file(path, "wb")
210
outfile.write(self.tree.get_file(id).read())
211
assert(os.path.exists(path))
212
self.cached[id] = path
213
return self.cached[id]
217
def merge(other_revision, base_revision,
218
check_clean=True, ignore_zero=False,
219
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
221
"""Merge changes into a tree.
224
tuple(path, revision) Base for three-way merge.
226
tuple(path, revision) Other revision for three-way merge.
228
Directory to merge changes into; '.' by default.
230
If true, this_dir must have no uncommitted changes before the
232
all available ancestors of other_revision and base_revision are
233
automatically pulled into the branch.
235
from bzrlib.revision import common_ancestor, MultipleRevisionSources
236
from bzrlib.errors import NoSuchRevision
237
tempdir = tempfile.mkdtemp(prefix="bzr-")
241
this_branch = find_branch(this_dir)
242
this_rev_id = this_branch.last_patch()
243
if this_rev_id is None:
244
raise BzrCommandError("This branch has no commits")
246
changes = compare_trees(this_branch.working_tree(),
247
this_branch.basis_tree(), False)
248
if changes.has_changed():
249
raise BzrCommandError("Working tree has uncommitted changes.")
250
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
252
if other_revision[1] == -1:
253
other_rev_id = other_branch.last_patch()
254
other_basis = other_rev_id
255
elif other_revision[1] is not None:
256
other_rev_id = other_branch.lookup_revision(other_revision[1])
257
other_basis = other_rev_id
260
other_basis = other_branch.last_patch()
261
if base_revision == [None, None]:
262
base_rev_id = common_ancestor(this_rev_id, other_basis,
264
if base_rev_id is None:
265
raise UnrelatedBranches()
266
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
268
base_is_ancestor = True
270
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
271
if base_revision[1] == -1:
272
base_rev_id = base_branch.last_patch()
273
elif base_revision[1] is None:
276
base_rev_id = base_branch.lookup_revision(base_revision[1])
277
if base_rev_id is not None:
278
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
279
MultipleRevisionSources(this_branch,
282
base_is_ancestor = False
283
if file_list is None:
284
interesting_ids = None
286
interesting_ids = set()
287
this_tree = this_branch.working_tree()
288
for fname in file_list:
289
path = this_branch.relpath(fname)
291
for tree in (this_tree, base_tree.tree, other_tree.tree):
292
file_id = tree.inventory.path2id(path)
293
if file_id is not None:
294
interesting_ids.add(file_id)
297
raise BzrCommandError("%s is not a source file in any"
299
merge_inner(this_branch, other_tree, base_tree, tempdir,
300
ignore_zero=ignore_zero, backup_files=backup_files,
301
merge_type=merge_type, interesting_ids=interesting_ids)
302
if base_is_ancestor and other_rev_id is not None:
303
this_branch.add_pending_merge(other_rev_id)
305
shutil.rmtree(tempdir)
308
def set_interesting(inventory_a, inventory_b, interesting_ids):
309
"""Mark files whose ids are in interesting_ids as interesting
311
for inventory in (inventory_a, inventory_b):
312
for path, source_file in inventory.iteritems():
313
source_file.interesting = source_file.id in interesting_ids
316
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
317
"""Generate a changeset. If interesting_ids is supplied, only changes
318
to those files will be shown. Metadata changes are stripped.
320
cset = generate_changeset(tree_a, tree_b, interesting_ids)
321
for entry in cset.entries.itervalues():
322
entry.metadata_change = None
326
def merge_inner(this_branch, other_tree, base_tree, tempdir,
327
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
328
interesting_ids=None):
330
def merge_factory(file_id, base, other):
331
contents_change = merge_type(file_id, base, other)
333
contents_change = BackupBeforeChange(contents_change)
334
return contents_change
336
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
338
def get_inventory(tree):
339
return tree.tree.inventory
341
inv_changes = merge_flex(this_tree, base_tree, other_tree,
342
generate_cset_optimized, get_inventory,
343
MergeConflictHandler(base_tree.root,
344
ignore_zero=ignore_zero),
345
merge_factory=merge_factory,
346
interesting_ids=interesting_ids)
349
for id, path in inv_changes.iteritems():
354
assert path.startswith('./'), "path is %s" % path
356
adjust_ids.append((path, id))
357
if len(adjust_ids) > 0:
358
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
362
def regen_inventory(this_branch, root, new_entries):
363
old_entries = this_branch.read_working_inventory()
367
for path, file_id in new_entries:
370
new_entries_map[file_id] = path
372
def id2path(file_id):
373
path = new_entries_map.get(file_id)
376
entry = old_entries[file_id]
377
if entry.parent_id is None:
379
return os.path.join(id2path(entry.parent_id), entry.name)
381
for file_id in old_entries:
382
entry = old_entries[file_id]
383
path = id2path(file_id)
384
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
385
by_path[path] = file_id
390
for path, file_id in new_entries:
392
del new_inventory[file_id]
395
new_path_list.append((path, file_id))
396
if file_id not in old_entries:
398
# Ensure no file is added before its parent
400
for path, file_id in new_path_list:
404
parent = by_path[os.path.dirname(path)]
405
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
406
new_inventory[file_id] = (path, file_id, parent, kind)
407
by_path[path] = file_id
409
# Get a list in insertion order
410
new_inventory_list = new_inventory.values()
411
mutter ("""Inventory regeneration:
412
old length: %i insertions: %i deletions: %i new_length: %i"""\
413
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
414
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
415
new_inventory_list.sort()
416
return new_inventory_list
418
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
419
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
