1
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
3
from bzrlib.changeset import Inventory, Diff3Merge
4
from bzrlib import find_branch
1
from merge_core import merge_flex
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory
4
from bzrlib import Branch
5
5
import bzrlib.osutils
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.delta import compare_trees
8
from trace import mutter, warning
6
from trace import mutter
13
from fetch import greedy_fetch
16
# comments from abentley on irc: merge happens in two stages, each
17
# of which generates a changeset object
19
# stage 1: generate OLD->OTHER,
20
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
22
class UnrelatedBranches(BzrCommandError):
24
msg = "Branches have no common ancestor, and no base revision"\
26
BzrCommandError.__init__(self, msg)
29
12
class MergeConflictHandler(ExceptionConflictHandler):
30
"""Handle conflicts encountered while merging.
32
This subclasses ExceptionConflictHandler, so that any types of
33
conflict that are not explicitly handled cause an exception and
36
def __init__(self, dir, ignore_zero=False):
37
ExceptionConflictHandler.__init__(self, dir)
39
self.ignore_zero = ignore_zero
13
"""Handle conflicts encountered while merging"""
41
14
def copy(self, source, dest):
42
15
"""Copy the text and mode of a file
43
16
:param source: The path of the file to copy
92
50
:param other_path: Path to the file text for the OTHER tree
94
52
self.add_suffix(this_path, ".THIS")
95
self.dump(base_lines, this_path+".BASE")
96
self.dump(other_lines, this_path+".OTHER")
53
self.copy(base_path, this_path+".BASE")
54
self.copy(other_path, this_path+".OTHER")
97
55
os.rename(new_file, this_path)
98
self.conflict("Diff3 conflict encountered in %s" % this_path)
100
def new_contents_conflict(self, filename, other_contents):
101
"""Conflicting contents for newly added file."""
102
self.copy(other_contents, filename + ".OTHER")
103
self.conflict("Conflict in newly added file %s" % filename)
106
57
def target_exists(self, entry, target, old_path):
107
58
"""Handle the case when the target file or dir exists"""
108
moved_path = self.add_suffix(target, ".moved")
109
self.conflict("Moved existing %s to %s" % (target, moved_path))
111
def rmdir_non_empty(self, filename):
112
"""Handle the case where the dir to be removed still has contents"""
113
self.conflict("Directory %s not removed because it is not empty"\
118
if not self.ignore_zero:
119
print "%d conflicts encountered.\n" % self.conflicts
59
self.add_suffix(target, ".moved")
121
def get_tree(treespec, temp_root, label, local_branch=None):
122
location, revno = treespec
123
branch = find_branch(location)
62
def __init__(self, path, id, present=None, isdir=None):
65
self.present = present
67
self.interesting = True
70
return "SourceFile(%s, %s)" % (self.path, self.id)
72
def get_tree(treespec, temp_root, label):
125
76
base_tree = branch.working_tree()
78
base_tree = branch.basis_tree()
128
revision = branch.last_patch()
130
revision = branch.lookup_revision(revno)
131
if local_branch is not None:
132
if revision is not None:
133
greedy_fetch(local_branch, branch, revision)
134
base_tree = local_branch.revision_tree(revision)
136
base_tree = branch.revision_tree(revision)
80
base_tree = branch.revision_tree(branch.lookup_revision(revno))
137
81
temp_path = os.path.join(temp_root, label)
138
82
os.mkdir(temp_path)
139
return branch, MergeTree(base_tree, temp_path)
83
return MergeTree(base_tree, temp_path)
86
def abspath(tree, file_id):
87
path = tree.inventory.id2path(file_id)
142
92
def file_exists(tree, file_id):
143
93
return tree.has_filename(tree.id2path(file_id))
95
def inventory_map(tree):
97
for file_id in tree.inventory:
98
if not file_exists(tree, file_id):
100
path = abspath(tree, file_id)
101
inventory[path] = SourceFile(path, file_id)
146
105
class MergeTree(object):
147
106
def __init__(self, tree, tempdir):
189
129
self.cached[id] = path
190
130
return self.cached[id]
194
def merge(other_revision, base_revision,
195
check_clean=True, ignore_zero=False,
196
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
198
"""Merge changes into a tree.
201
Base for three-way merge.
203
Other revision for three-way merge.
205
Directory to merge changes into; '.' by default.
207
If true, this_dir must have no uncommitted changes before the
209
all available ancestors of other_revision and base_revision are
210
automatically pulled into the branch.
132
def merge(other_revision, base_revision):
212
133
tempdir = tempfile.mkdtemp(prefix="bzr-")
216
this_branch = find_branch(this_dir)
218
changes = compare_trees(this_branch.working_tree(),
219
this_branch.basis_tree(), False)
220
if changes.has_changed():
221
raise BzrCommandError("Working tree has uncommitted changes.")
222
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
224
if base_revision == [None, None]:
225
if other_revision[1] == -1:
228
o_revno = other_revision[1]
229
base_revno = this_branch.common_ancestor(other_branch,
230
other_revno=o_revno)[0]
231
if base_revno is None:
232
raise UnrelatedBranches()
233
base_revision = ['.', base_revno]
234
base_branch, base_tree = get_tree(base_revision, tempdir, "base",
236
if file_list is None:
237
interesting_ids = None
239
interesting_ids = set()
240
this_tree = this_branch.working_tree()
241
for fname in file_list:
242
path = this_branch.relpath(fname)
244
for tree in (this_tree, base_tree.tree, other_tree.tree):
245
file_id = tree.inventory.path2id(path)
246
if file_id is not None:
247
interesting_ids.add(file_id)
250
raise BzrCommandError("%s is not a source file in any"
252
merge_inner(this_branch, other_tree, base_tree, tempdir,
253
ignore_zero=ignore_zero, backup_files=backup_files,
254
merge_type=merge_type, interesting_ids=interesting_ids)
135
this_branch = Branch('.')
136
other_tree = get_tree(other_revision, tempdir, "other")
137
base_tree = get_tree(base_revision, tempdir, "base")
138
merge_inner(this_branch, other_tree, base_tree, tempdir)
256
140
shutil.rmtree(tempdir)
259
def set_interesting(inventory_a, inventory_b, interesting_ids):
260
"""Mark files whose ids are in interesting_ids as interesting
262
for inventory in (inventory_a, inventory_b):
263
for path, source_file in inventory.iteritems():
264
source_file.interesting = source_file.id in interesting_ids
267
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
268
"""Generate a changeset. If interesting_ids is supplied, only changes
269
to those files will be shown. Metadata changes are stripped.
143
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
144
"""Generate a changeset, using the text_id to mark really-changed files.
145
This permits blazing comparisons when text_ids are present. It also
146
disables metadata comparison for files with identical texts.
271
cset = generate_changeset(tree_a, tree_b, interesting_ids)
148
for file_id in tree_a.tree.inventory:
149
if file_id not in tree_b.tree.inventory:
151
entry_a = tree_a.tree.inventory[file_id]
152
entry_b = tree_b.tree.inventory[file_id]
153
if (entry_a.kind, entry_b.kind) != ("file", "file"):
155
if None in (entry_a.text_id, entry_b.text_id):
157
if entry_a.text_id != entry_b.text_id:
159
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
160
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
161
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
272
162
for entry in cset.entries.itervalues():
273
163
entry.metadata_change = None
277
def merge_inner(this_branch, other_tree, base_tree, tempdir,
278
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
279
interesting_ids=None):
281
def merge_factory(file_id, base, other):
282
contents_change = merge_type(file_id, base, other)
284
contents_change = BackupBeforeChange(contents_change)
285
return contents_change
287
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
167
def merge_inner(this_branch, other_tree, base_tree, tempdir):
168
this_tree = get_tree(('.', None), tempdir, "this")
289
170
def get_inventory(tree):
290
return tree.tree.inventory
171
return tree.inventory
292
173
inv_changes = merge_flex(this_tree, base_tree, other_tree,
293
174
generate_cset_optimized, get_inventory,
294
MergeConflictHandler(base_tree.root,
295
ignore_zero=ignore_zero),
296
merge_factory=merge_factory,
297
interesting_ids=interesting_ids)
175
MergeConflictHandler(base_tree.root))
300
178
for id, path in inv_changes.iteritems():
305
assert path.startswith('./'), "path is %s" % path
183
assert path.startswith('./')
307
185
adjust_ids.append((path, id))
308
if len(adjust_ids) > 0:
309
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
186
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
313
189
def regen_inventory(this_branch, root, new_entries):
314
190
old_entries = this_branch.read_working_inventory()
315
191
new_inventory = {}
318
for path, file_id in new_entries:
321
new_entries_map[file_id] = path
323
def id2path(file_id):
324
path = new_entries_map.get(file_id)
327
entry = old_entries[file_id]
328
if entry.parent_id is None:
330
return os.path.join(id2path(entry.parent_id), entry.name)
332
193
for file_id in old_entries:
333
194
entry = old_entries[file_id]
334
path = id2path(file_id)
195
path = old_entries.id2path(file_id)
335
196
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
336
197
by_path[path] = file_id
added
removed
bzrlib/merge.py
