1
from merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory, Diff3Merge
4
from bzrlib import find_branch
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.delta import compare_trees
8
from trace import mutter, warning
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
14
class UnrelatedBranches(BzrCommandError):
16
msg = "Branches have no common ancestor, and no base revision"\
18
BzrCommandError.__init__(self, msg)
24
import bzrlib.revision
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
27
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
28
from bzrlib.branch import Branch
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
from bzrlib.errors import NoCommits
31
from bzrlib.delta import compare_trees
32
from bzrlib.trace import mutter, warning
33
from bzrlib.fetch import greedy_fetch, fetch
34
from bzrlib.revision import is_ancestor
35
from bzrlib.osutils import rename
36
from bzrlib.revision import common_ancestor, MultipleRevisionSources
37
from bzrlib.errors import NoSuchRevision
39
# TODO: build_working_dir can be built on something simpler than merge()
41
# FIXME: merge() parameters seem oriented towards the command line
43
# comments from abentley on irc: merge happens in two stages, each
44
# of which generates a changeset object
46
# stage 1: generate OLD->OTHER,
47
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
21
49
class MergeConflictHandler(ExceptionConflictHandler):
22
"""Handle conflicts encountered while merging"""
23
def __init__(self, dir, ignore_zero=False):
24
ExceptionConflictHandler.__init__(self, dir)
50
"""Handle conflicts encountered while merging.
52
This subclasses ExceptionConflictHandler, so that any types of
53
conflict that are not explicitly handled cause an exception and
56
def __init__(self, this_tree, base_tree, other_tree, ignore_zero=False):
57
ExceptionConflictHandler.__init__(self)
26
59
self.ignore_zero = ignore_zero
60
self.this_tree = this_tree
61
self.base_tree = base_tree
62
self.other_tree = other_tree
28
64
def copy(self, source, dest):
29
65
"""Copy the text and mode of a file
70
115
:param other_path: Path to the file text for the OTHER tree
72
117
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)
118
self.dump(base_lines, this_path+".BASE")
119
self.dump(other_lines, this_path+".OTHER")
120
rename(new_file, this_path)
76
121
self.conflict("Diff3 conflict encountered in %s" % this_path)
123
def new_contents_conflict(self, filename, other_contents):
124
"""Conflicting contents for newly added file."""
125
self.copy(other_contents, filename + ".OTHER")
126
self.conflict("Conflict in newly added file %s" % filename)
78
129
def target_exists(self, entry, target, old_path):
79
130
"""Handle the case when the target file or dir exists"""
80
131
moved_path = self.add_suffix(target, ".moved")
140
def rem_contents_conflict(self, filename, this_contents, base_contents):
141
base_contents(filename+".BASE", self, False)
142
this_contents(filename+".THIS", self, False)
143
self.conflict("Other branch deleted locally modified file %s" %
145
return ReplaceContents(this_contents, None)
147
def abs_this_path(self, file_id):
148
"""Return the absolute path for a file_id in the this tree."""
149
relpath = self.this_tree.id2path(file_id)
150
return self.this_tree.tree.abspath(relpath)
152
def add_missing_parents(self, file_id, tree):
153
"""If some of the parents for file_id are missing, add them."""
154
entry = tree.tree.inventory[file_id]
155
if entry.parent_id not in self.this_tree:
156
return self.create_all_missing(entry.parent_id, tree)
158
return self.abs_this_path(entry.parent_id)
160
def create_all_missing(self, file_id, tree):
161
"""Add contents for a file_id and all its parents to a tree."""
162
entry = tree.tree.inventory[file_id]
163
if entry.parent_id is not None and entry.parent_id not in self.this_tree:
164
abspath = self.create_all_missing(entry.parent_id, tree)
166
abspath = self.abs_this_path(entry.parent_id)
167
entry_path = os.path.join(abspath, entry.name)
168
if not os.path.isdir(entry_path):
169
self.create(file_id, entry_path, tree)
172
def create(self, file_id, path, tree, reverse=False):
173
"""Uses tree data to create a filesystem object for the file_id"""
174
from merge_core import get_id_contents
175
get_id_contents(file_id, tree)(path, self, reverse)
177
def missing_for_merge(self, file_id, other_path):
178
"""The file_id doesn't exist in THIS, but does in OTHER and BASE"""
179
self.conflict("Other branch modified locally deleted file %s" %
181
parent_dir = self.add_missing_parents(file_id, self.other_tree)
182
stem = os.path.join(parent_dir, os.path.basename(other_path))
183
self.create(file_id, stem+".OTHER", self.other_tree)
184
self.create(file_id, stem+".BASE", self.base_tree)
89
186
def finalize(self):
90
187
if not self.ignore_zero:
91
188
print "%d conflicts encountered.\n" % self.conflicts
93
class SourceFile(object):
94
def __init__(self, path, id, present=None, isdir=None):
97
self.present = present
99
self.interesting = True
102
return "SourceFile(%s, %s)" % (self.path, self.id)
104
def get_tree(treespec, temp_root, label):
190
def get_tree(treespec, temp_root, label, local_branch=None):
105
191
location, revno = treespec
106
branch = find_branch(location)
192
branch = Branch.open_containing(location)
107
193
if revno is None:
196
revision = branch.last_revision()
198
revision = branch.get_rev_id(revno)
199
return branch, get_revid_tree(branch, revision, temp_root, label,
202
def get_revid_tree(branch, revision, temp_root, label, local_branch):
108
204
base_tree = branch.working_tree()
110
base_tree = branch.basis_tree()
112
base_tree = branch.revision_tree(branch.lookup_revision(revno))
206
if local_branch is not None:
207
greedy_fetch(local_branch, branch, revision)
208
base_tree = local_branch.revision_tree(revision)
210
base_tree = branch.revision_tree(revision)
113
211
temp_path = os.path.join(temp_root, label)
114
212
os.mkdir(temp_path)
115
return branch, MergeTree(base_tree, temp_path)
118
def abspath(tree, file_id):
119
path = tree.inventory.id2path(file_id)
213
return MergeTree(base_tree, temp_path)
124
216
def file_exists(tree, file_id):
125
217
return tree.has_filename(tree.id2path(file_id))
127
def inventory_map(tree):
129
for file_id in tree.inventory:
130
path = abspath(tree, file_id)
131
inventory[path] = SourceFile(path, file_id)
135
220
class MergeTree(object):
136
221
def __init__(self, tree, tempdir):
139
224
self.root = tree.basedir
142
self.inventory = inventory_map(tree)
144
228
self.tempdir = tempdir
145
229
os.mkdir(os.path.join(self.tempdir, "texts"))
233
return self.tree.__iter__()
235
def __contains__(self, file_id):
236
return file_id in self.tree
238
def get_file(self, file_id):
239
return self.tree.get_file(file_id)
241
def get_file_sha1(self, id):
242
return self.tree.get_file_sha1(id)
244
def id2path(self, file_id):
245
return self.tree.id2path(file_id)
247
def has_id(self, file_id):
248
return self.tree.has_id(file_id)
250
def has_or_had_id(self, file_id):
251
if file_id == self.tree.inventory.root.file_id:
253
return self.tree.inventory.has_id(file_id)
255
def has_or_had_id(self, file_id):
256
if file_id == self.tree.inventory.root.file_id:
258
return self.tree.inventory.has_id(file_id)
148
260
def readonly_path(self, id):
149
261
if id not in self.tree:
162
274
return self.cached[id]
277
def build_working_dir(to_dir):
278
"""Build a working directory in an empty directory.
280
to_dir is a directory containing branch metadata but no working files,
281
typically constructed by cloning an existing branch.
283
This is split out as a special idiomatic case of merge. It could
284
eventually be done by just building the tree directly calling into
285
lower-level code (e.g. constructing a changeset).
287
merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
288
check_clean=False, ignore_zero=True)
166
291
def merge(other_revision, base_revision,
167
292
check_clean=True, ignore_zero=False,
170
295
"""Merge changes into a tree.
173
Base for three-way merge.
298
tuple(path, revision) Base for three-way merge.
175
Other revision for three-way merge.
300
tuple(path, revision) Other revision for three-way merge.
177
302
Directory to merge changes into; '.' by default.
179
304
If true, this_dir must have no uncommitted changes before the
306
ignore_zero - If true, suppress the "zero conflicts" message when
307
there are no conflicts; should be set when doing something we expect
308
to complete perfectly.
310
All available ancestors of other_revision and base_revision are
311
automatically pulled into the branch.
182
313
tempdir = tempfile.mkdtemp(prefix="bzr-")
184
315
if this_dir is None:
186
this_branch = find_branch(this_dir)
317
this_branch = Branch.open_containing(this_dir)
318
this_rev_id = this_branch.last_revision()
319
if this_rev_id is None:
320
raise BzrCommandError("This branch has no commits")
188
322
changes = compare_trees(this_branch.working_tree(),
189
323
this_branch.basis_tree(), False)
190
324
if changes.has_changed():
191
325
raise BzrCommandError("Working tree has uncommitted changes.")
192
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
326
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
328
if other_revision[1] == -1:
329
other_rev_id = other_branch.last_revision()
330
if other_rev_id is None:
331
raise NoCommits(other_branch)
332
other_basis = other_rev_id
333
elif other_revision[1] is not None:
334
other_rev_id = other_branch.get_rev_id(other_revision[1])
335
other_basis = other_rev_id
338
other_basis = other_branch.last_revision()
339
if other_basis is None:
340
raise NoCommits(other_branch)
193
341
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:
343
base_rev_id = common_ancestor(this_rev_id, other_basis,
345
except NoCommonAncestor:
201
346
raise UnrelatedBranches()
202
base_revision = ['.', base_revno]
203
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
347
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
349
base_is_ancestor = True
351
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
352
if base_revision[1] == -1:
353
base_rev_id = base_branch.last_revision()
354
elif base_revision[1] is None:
357
base_rev_id = base_branch.get_rev_id(base_revision[1])
358
fetch(from_branch=base_branch, to_branch=this_branch)
359
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
204
361
if file_list is None:
205
362
interesting_ids = None
232
392
source_file.interesting = source_file.id in interesting_ids
235
def set_optimized(tree_a, tree_b, inventory_a, inventory_b):
236
"""Mark files that have changed texts as interesting
238
for file_id in tree_a.tree.inventory:
239
if file_id not in tree_b.tree.inventory:
241
entry_a = tree_a.tree.inventory[file_id]
242
entry_b = tree_b.tree.inventory[file_id]
243
if (entry_a.kind, entry_b.kind) != ("file", "file"):
245
if None in (entry_a.text_id, entry_b.text_id):
247
if entry_a.text_id != entry_b.text_id:
249
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
250
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
253
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
254
interesting_ids=None):
255
"""Generate a changeset, with preprocessing to select interesting files.
256
using the text_id to mark really-changed files.
257
This permits blazing comparisons when text_ids are present. It also
258
disables metadata comparison for files with identical texts.
395
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
396
"""Generate a changeset. If interesting_ids is supplied, only changes
397
to those files will be shown. Metadata changes are stripped.
260
if interesting_ids is None:
261
set_optimized(tree_a, tree_b, inventory_a, inventory_b)
263
set_interesting(inventory_a, inventory_b, interesting_ids)
264
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
399
cset = generate_changeset(tree_a, tree_b, interesting_ids)
265
400
for entry in cset.entries.itervalues():
266
401
entry.metadata_change = None
271
406
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
272
407
interesting_ids=None):
274
def merge_factory(base_file, other_file):
275
contents_change = merge_type(base_file, other_file)
409
def merge_factory(file_id, base, other):
410
contents_change = merge_type(file_id, base, other)
277
412
contents_change = BackupBeforeChange(contents_change)
278
413
return contents_change
280
def generate_cset(tree_a, tree_b, inventory_a, inventory_b):
281
return generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
284
415
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
286
417
def get_inventory(tree):
287
return tree.inventory
418
return tree.tree.inventory
289
420
inv_changes = merge_flex(this_tree, base_tree, other_tree,
290
generate_cset, get_inventory,
291
MergeConflictHandler(base_tree.root,
292
ignore_zero=ignore_zero),
293
merge_factory=merge_factory)
421
generate_cset_optimized, get_inventory,
422
MergeConflictHandler(this_tree, base_tree,
423
other_tree, ignore_zero=ignore_zero),
424
merge_factory=merge_factory,
425
interesting_ids=interesting_ids)
296
428
for id, path in inv_changes.iteritems():
301
assert path.startswith('./')
433
assert path.startswith('.' + os.sep), "path is %s" % path
303
435
adjust_ids.append((path, id))
304
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
436
if len(adjust_ids) > 0:
437
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
307
441
def regen_inventory(this_branch, root, new_entries):
308
442
old_entries = this_branch.read_working_inventory()
309
443
new_inventory = {}
446
for path, file_id in new_entries:
449
new_entries_map[file_id] = path
451
def id2path(file_id):
452
path = new_entries_map.get(file_id)
455
entry = old_entries[file_id]
456
if entry.parent_id is None:
458
return os.path.join(id2path(entry.parent_id), entry.name)
311
460
for file_id in old_entries:
312
461
entry = old_entries[file_id]
313
path = old_entries.id2path(file_id)
462
path = id2path(file_id)
314
463
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
315
464
by_path[path] = file_id
added
removed
bzrlib/merge.py
