1
from merge_core import merge_flex
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory, Diff3Merge
4
from merge_core import ApplyMerge3
5
from bzrlib import find_branch
7
from bzrlib.errors import BzrCommandError
8
from bzrlib.diff import compare_trees
9
from trace import mutter, warning
15
class UnrelatedBranches(BzrCommandError):
17
msg = "Branches have no common ancestor, and no base revision"\
19
BzrCommandError.__init__(self, msg)
22
class MergeConflictHandler(ExceptionConflictHandler):
23
"""Handle conflicts encountered while merging"""
24
def __init__(self, dir, ignore_zero=False):
25
ExceptionConflictHandler.__init__(self, dir)
27
self.ignore_zero = ignore_zero
29
def copy(self, source, dest):
30
"""Copy the text and mode of a file
31
:param source: The path of the file to copy
32
:param dest: The distination file to create
34
s_file = file(source, "rb")
35
d_file = file(dest, "wb")
38
os.chmod(dest, 0777 & os.stat(source).st_mode)
40
def add_suffix(self, name, suffix, last_new_name=None):
41
"""Rename a file to append a suffix. If the new name exists, the
42
suffix is added repeatedly until a non-existant name is found
44
:param name: The path of the file
45
:param suffix: The suffix to append
46
:param last_new_name: (used for recursive calls) the last name tried
48
if last_new_name is None:
50
new_name = last_new_name+suffix
52
os.rename(name, new_name)
55
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
57
return self.add_suffix(name, suffix, last_new_name=new_name)
59
def conflict(self, text):
64
def merge_conflict(self, new_file, this_path, base_path, other_path):
66
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
67
main file will be a version with diff3 conflicts.
68
:param new_file: Path to the output file with diff3 markers
69
:param this_path: Path to the file text for the THIS tree
70
:param base_path: Path to the file text for the BASE tree
71
:param other_path: Path to the file text for the OTHER tree
73
self.add_suffix(this_path, ".THIS")
74
self.copy(base_path, this_path+".BASE")
75
self.copy(other_path, this_path+".OTHER")
76
os.rename(new_file, this_path)
77
self.conflict("Diff3 conflict encountered in %s" % this_path)
79
def target_exists(self, entry, target, old_path):
80
"""Handle the case when the target file or dir exists"""
81
moved_path = self.add_suffix(target, ".moved")
82
self.conflict("Moved existing %s to %s" % (target, moved_path))
84
def rmdir_non_empty(self, filename):
85
"""Handle the case where the dir to be removed still has contents"""
86
self.conflict("Directory %s not removed because it is not empty"\
91
if not self.ignore_zero:
92
print "%d conflicts encountered.\n" % self.conflicts
94
class SourceFile(object):
95
def __init__(self, path, id, present=None, isdir=None):
98
self.present = present
100
self.interesting = True
103
return "SourceFile(%s, %s)" % (self.path, self.id)
105
def get_tree(treespec, temp_root, label):
106
location, revno = treespec
107
branch = find_branch(location)
109
base_tree = branch.working_tree()
111
base_tree = branch.basis_tree()
113
base_tree = branch.revision_tree(branch.lookup_revision(revno))
114
temp_path = os.path.join(temp_root, label)
116
return branch, MergeTree(base_tree, temp_path)
119
def abspath(tree, file_id):
120
path = tree.inventory.id2path(file_id)
125
def file_exists(tree, file_id):
126
return tree.has_filename(tree.id2path(file_id))
128
def inventory_map(tree):
130
for file_id in tree.inventory:
131
path = abspath(tree, file_id)
132
inventory[path] = SourceFile(path, file_id)
136
class MergeTree(object):
137
def __init__(self, tree, tempdir):
138
object.__init__(self)
139
if hasattr(tree, "basedir"):
140
self.root = tree.basedir
143
self.inventory = inventory_map(tree)
145
self.tempdir = tempdir
146
os.mkdir(os.path.join(self.tempdir, "texts"))
149
def readonly_path(self, id):
150
if id not in self.tree:
152
if self.root is not None:
153
return self.tree.abspath(self.tree.id2path(id))
155
if self.tree.inventory[id].kind in ("directory", "root_directory"):
157
if not self.cached.has_key(id):
158
path = os.path.join(self.tempdir, "texts", id)
159
outfile = file(path, "wb")
160
outfile.write(self.tree.get_file(id).read())
161
assert(os.path.exists(path))
162
self.cached[id] = path
163
return self.cached[id]
167
def merge(other_revision, base_revision,
168
check_clean=True, ignore_zero=False,
170
"""Merge changes into a tree.
173
Base for three-way merge.
175
Other revision for three-way merge.
177
Directory to merge changes into; '.' by default.
179
If true, this_dir must have no uncommitted changes before the
182
tempdir = tempfile.mkdtemp(prefix="bzr-")
186
this_branch = find_branch(this_dir)
188
changes = compare_trees(this_branch.working_tree(),
189
this_branch.basis_tree(), False)
190
if changes.has_changed():
191
raise BzrCommandError("Working tree has uncommitted changes.")
192
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
193
if base_revision == [None, None]:
194
if other_revision[1] == -1:
197
o_revno = other_revision[1]
198
base_revno = this_branch.common_ancestor(other_branch,
199
other_revno=o_revno)[0]
200
if base_revno is None:
201
raise UnrelatedBranches()
202
base_revision = ['.', base_revno]
203
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
204
merge_inner(this_branch, other_tree, base_tree, tempdir,
205
ignore_zero=ignore_zero)
207
shutil.rmtree(tempdir)
210
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
211
"""Generate a changeset, using the text_id to mark really-changed files.
212
This permits blazing comparisons when text_ids are present. It also
213
disables metadata comparison for files with identical texts.
215
for file_id in tree_a.tree.inventory:
216
if file_id not in tree_b.tree.inventory:
218
entry_a = tree_a.tree.inventory[file_id]
219
entry_b = tree_b.tree.inventory[file_id]
220
if (entry_a.kind, entry_b.kind) != ("file", "file"):
222
if None in (entry_a.text_id, entry_b.text_id):
224
if entry_a.text_id != entry_b.text_id:
226
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
227
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
228
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
229
for entry in cset.entries.itervalues():
230
entry.metadata_change = None
234
def merge_inner(this_branch, other_tree, base_tree, tempdir,
235
ignore_zero=False, merge_type="diff3"):
236
merge_types = {"merge3": ApplyMerge3,
239
def merge_factory(base_file, other_file):
240
return merge_types[merge_type](base_file, other_file)
242
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
244
def get_inventory(tree):
245
return tree.inventory
247
inv_changes = merge_flex(this_tree, base_tree, other_tree,
248
generate_cset_optimized, get_inventory,
249
MergeConflictHandler(base_tree.root,
250
ignore_zero=ignore_zero),
251
merge_factory=merge_factory)
254
for id, path in inv_changes.iteritems():
259
assert path.startswith('./')
261
adjust_ids.append((path, id))
262
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
265
def regen_inventory(this_branch, root, new_entries):
266
old_entries = this_branch.read_working_inventory()
269
for file_id in old_entries:
270
entry = old_entries[file_id]
271
path = old_entries.id2path(file_id)
272
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
273
by_path[path] = file_id
278
for path, file_id in new_entries:
280
del new_inventory[file_id]
283
new_path_list.append((path, file_id))
284
if file_id not in old_entries:
286
# Ensure no file is added before its parent
288
for path, file_id in new_path_list:
292
parent = by_path[os.path.dirname(path)]
293
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
294
new_inventory[file_id] = (path, file_id, parent, kind)
295
by_path[path] = file_id
297
# Get a list in insertion order
298
new_inventory_list = new_inventory.values()
299
mutter ("""Inventory regeneration:
300
old length: %i insertions: %i deletions: %i new_length: %i"""\
301
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
302
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
303
new_inventory_list.sort()
304
return new_inventory_list
added
removed
bzrlib/merge.py
