1
from merge_core import merge_flex
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory
4
from bzrlib import find_branch
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.diff import compare_trees
8
from trace import mutter, warning
14
class UnrelatedBranches(BzrCommandError):
16
msg = "Branches have no common ancestor, and no base revision"\
18
BzrCommandError.__init__(self, msg)
21
class MergeConflictHandler(ExceptionConflictHandler):
22
"""Handle conflicts encountered while merging"""
23
def __init__(self, dir, ignore_zero=False):
24
ExceptionConflictHandler.__init__(self, dir)
26
self.ignore_zero = ignore_zero
28
def copy(self, source, dest):
29
"""Copy the text and mode of a file
30
:param source: The path of the file to copy
31
:param dest: The distination file to create
33
s_file = file(source, "rb")
34
d_file = file(dest, "wb")
37
os.chmod(dest, 0777 & os.stat(source).st_mode)
39
def add_suffix(self, name, suffix, last_new_name=None):
40
"""Rename a file to append a suffix. If the new name exists, the
41
suffix is added repeatedly until a non-existant name is found
43
:param name: The path of the file
44
:param suffix: The suffix to append
45
:param last_new_name: (used for recursive calls) the last name tried
47
if last_new_name is None:
49
new_name = last_new_name+suffix
51
os.rename(name, new_name)
54
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
56
return self.add_suffix(name, suffix, last_new_name=new_name)
58
def conflict(self, text):
63
def merge_conflict(self, new_file, this_path, base_path, other_path):
65
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
66
main file will be a version with diff3 conflicts.
67
:param new_file: Path to the output file with diff3 markers
68
:param this_path: Path to the file text for the THIS tree
69
:param base_path: Path to the file text for the BASE tree
70
:param other_path: Path to the file text for the OTHER tree
72
self.add_suffix(this_path, ".THIS")
73
self.copy(base_path, this_path+".BASE")
74
self.copy(other_path, this_path+".OTHER")
75
os.rename(new_file, this_path)
76
self.conflict("Diff3 conflict encountered in %s" % this_path)
78
def target_exists(self, entry, target, old_path):
79
"""Handle the case when the target file or dir exists"""
80
moved_path = self.add_suffix(target, ".moved")
81
self.conflict("Moved existing %s to %s" % (target, moved_path))
84
if not self.ignore_zero:
85
print "%d conflicts encountered.\n" % self.conflicts
87
class SourceFile(object):
88
def __init__(self, path, id, present=None, isdir=None):
91
self.present = present
93
self.interesting = True
96
return "SourceFile(%s, %s)" % (self.path, self.id)
98
def get_tree(treespec, temp_root, label):
99
location, revno = treespec
100
branch = find_branch(location)
102
base_tree = branch.working_tree()
104
base_tree = branch.basis_tree()
106
base_tree = branch.revision_tree(branch.lookup_revision(revno))
107
temp_path = os.path.join(temp_root, label)
109
return branch, MergeTree(base_tree, temp_path)
112
def abspath(tree, file_id):
113
path = tree.inventory.id2path(file_id)
118
def file_exists(tree, file_id):
119
return tree.has_filename(tree.id2path(file_id))
121
def inventory_map(tree):
123
for file_id in tree.inventory:
124
if not file_exists(tree, file_id):
126
path = abspath(tree, file_id)
127
inventory[path] = SourceFile(path, file_id)
131
class MergeTree(object):
132
def __init__(self, tree, tempdir):
133
object.__init__(self)
134
if hasattr(tree, "basedir"):
135
self.root = tree.basedir
138
self.inventory = inventory_map(tree)
140
self.tempdir = tempdir
141
os.mkdir(os.path.join(self.tempdir, "texts"))
144
def readonly_path(self, id):
145
if self.root is not None:
146
return self.tree.abspath(self.tree.id2path(id))
148
if self.tree.inventory[id].kind in ("directory", "root_directory"):
150
if not self.cached.has_key(id):
151
path = os.path.join(self.tempdir, "texts", id)
152
outfile = file(path, "wb")
153
outfile.write(self.tree.get_file(id).read())
154
assert(os.path.exists(path))
155
self.cached[id] = path
156
return self.cached[id]
158
def merge(other_revision, base_revision, no_changes=True, ignore_zero=False):
159
tempdir = tempfile.mkdtemp(prefix="bzr-")
161
this_branch = find_branch('.')
163
changes = compare_trees(this_branch.working_tree(),
164
this_branch.basis_tree(), False)
165
if changes.has_changed():
166
raise BzrCommandError("Working tree has uncommitted changes.")
167
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
168
if base_revision == [None, None]:
169
if other_revision[1] == -1:
172
o_revno = other_revision[1]
173
base_revno = this_branch.common_ancestor(other_branch,
174
other_revno=o_revno)[0]
175
if base_revno is None:
176
raise UnrelatedBranches()
177
base_revision = ['.', base_revno]
178
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
179
merge_inner(this_branch, other_tree, base_tree, tempdir,
180
ignore_zero=ignore_zero)
182
shutil.rmtree(tempdir)
185
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
186
"""Generate a changeset, using the text_id to mark really-changed files.
187
This permits blazing comparisons when text_ids are present. It also
188
disables metadata comparison for files with identical texts.
190
for file_id in tree_a.tree.inventory:
191
if file_id not in tree_b.tree.inventory:
193
entry_a = tree_a.tree.inventory[file_id]
194
entry_b = tree_b.tree.inventory[file_id]
195
if (entry_a.kind, entry_b.kind) != ("file", "file"):
197
if None in (entry_a.text_id, entry_b.text_id):
199
if entry_a.text_id != entry_b.text_id:
201
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
202
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
203
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
204
for entry in cset.entries.itervalues():
205
entry.metadata_change = None
209
def merge_inner(this_branch, other_tree, base_tree, tempdir,
211
this_tree = get_tree(('.', None), tempdir, "this")[1]
213
def get_inventory(tree):
214
return tree.inventory
216
inv_changes = merge_flex(this_tree, base_tree, other_tree,
217
generate_cset_optimized, get_inventory,
218
MergeConflictHandler(base_tree.root,
219
ignore_zero=ignore_zero))
222
for id, path in inv_changes.iteritems():
227
assert path.startswith('./')
229
adjust_ids.append((path, id))
230
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
233
def regen_inventory(this_branch, root, new_entries):
234
old_entries = this_branch.read_working_inventory()
237
for file_id in old_entries:
238
entry = old_entries[file_id]
239
path = old_entries.id2path(file_id)
240
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
241
by_path[path] = file_id
246
for path, file_id in new_entries:
248
del new_inventory[file_id]
251
new_path_list.append((path, file_id))
252
if file_id not in old_entries:
254
# Ensure no file is added before its parent
256
for path, file_id in new_path_list:
260
parent = by_path[os.path.dirname(path)]
261
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
262
new_inventory[file_id] = (path, file_id, parent, kind)
263
by_path[path] = file_id
265
# Get a list in insertion order
266
new_inventory_list = new_inventory.values()
267
mutter ("""Inventory regeneration:
268
old length: %i insertions: %i deletions: %i new_length: %i"""\
269
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
270
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
271
new_inventory_list.sort()
272
return new_inventory_list
added
removed
bzrlib/merge.py
