15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22
from fetch import greedy_fetch
24
23
import bzrlib.osutils
25
24
import bzrlib.revision
26
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
27
from bzrlib.changeset import Inventory, Diff3Merge
29
from bzrlib.branch import find_branch
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
28
from bzrlib.branch import Branch
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
from bzrlib.errors import NoCommits
31
31
from bzrlib.delta import compare_trees
32
32
from bzrlib.trace import mutter, warning
33
from bzrlib.fetch import greedy_fetch
33
from bzrlib.fetch import greedy_fetch, fetch
34
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
36
43
# comments from abentley on irc: merge happens in two stages, each
37
44
# of which generates a changeset object
46
53
conflict that are not explicitly handled cause an exception and
47
54
terminate the merge.
49
def __init__(self, dir, ignore_zero=False):
50
ExceptionConflictHandler.__init__(self, dir)
56
def __init__(self, ignore_zero=False):
57
ExceptionConflictHandler.__init__(self)
52
59
self.ignore_zero = ignore_zero
107
114
self.add_suffix(this_path, ".THIS")
108
115
self.dump(base_lines, this_path+".BASE")
109
116
self.dump(other_lines, this_path+".OTHER")
110
os.rename(new_file, this_path)
117
rename(new_file, this_path)
111
118
self.conflict("Diff3 conflict encountered in %s" % this_path)
113
120
def new_contents_conflict(self, filename, other_contents):
134
141
def get_tree(treespec, temp_root, label, local_branch=None):
135
142
location, revno = treespec
136
branch = find_branch(location)
143
branch = Branch.open_containing(location)
137
144
if revno is None:
139
146
elif revno == -1:
140
revision = branch.last_patch()
147
revision = branch.last_revision()
142
revision = branch.lookup_revision(revno)
149
revision = branch.get_rev_id(revno)
143
150
return branch, get_revid_tree(branch, revision, temp_root, label,
218
225
return self.cached[id]
228
def build_working_dir(to_dir):
229
"""Build a working directory in an empty directory.
231
to_dir is a directory containing branch metadata but no working files,
232
typically constructed by cloning an existing branch.
234
This is split out as a special idiomatic case of merge. It could
235
eventually be done by just building the tree directly calling into
236
lower-level code (e.g. constructing a changeset).
238
merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
239
check_clean=False, ignore_zero=True)
222
242
def merge(other_revision, base_revision,
223
243
check_clean=True, ignore_zero=False,
235
255
If true, this_dir must have no uncommitted changes before the
237
all available ancestors of other_revision and base_revision are
257
ignore_zero - If true, suppress the "zero conflicts" message when
258
there are no conflicts; should be set when doing something we expect
259
to complete perfectly.
261
All available ancestors of other_revision and base_revision are
238
262
automatically pulled into the branch.
240
from bzrlib.revision import common_ancestor, MultipleRevisionSources
241
from bzrlib.errors import NoSuchRevision
242
264
tempdir = tempfile.mkdtemp(prefix="bzr-")
244
266
if this_dir is None:
246
this_branch = find_branch(this_dir)
247
this_rev_id = this_branch.last_patch()
268
this_branch = Branch.open_containing(this_dir)
269
this_rev_id = this_branch.last_revision()
248
270
if this_rev_id is None:
249
271
raise BzrCommandError("This branch has no commits")
255
277
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
257
279
if other_revision[1] == -1:
258
other_rev_id = other_branch.last_patch()
280
other_rev_id = other_branch.last_revision()
281
if other_rev_id is None:
282
raise NoCommits(other_branch)
259
283
other_basis = other_rev_id
260
284
elif other_revision[1] is not None:
261
other_rev_id = other_branch.lookup_revision(other_revision[1])
285
other_rev_id = other_branch.get_rev_id(other_revision[1])
262
286
other_basis = other_rev_id
264
288
other_rev_id = None
265
other_basis = other_branch.last_patch()
289
other_basis = other_branch.last_revision()
290
if other_basis is None:
291
raise NoCommits(other_branch)
266
292
if base_revision == [None, None]:
267
base_rev_id = common_ancestor(this_rev_id, other_basis,
269
if base_rev_id is None:
294
base_rev_id = common_ancestor(this_rev_id, other_basis,
296
except NoCommonAncestor:
270
297
raise UnrelatedBranches()
271
298
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
275
302
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
276
303
if base_revision[1] == -1:
277
base_rev_id = base_branch.last_patch()
304
base_rev_id = base_branch.last_revision()
278
305
elif base_revision[1] is None:
279
306
base_rev_id = None
281
base_rev_id = base_branch.lookup_revision(base_revision[1])
282
if base_rev_id is not None:
283
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
284
MultipleRevisionSources(this_branch,
287
base_is_ancestor = False
308
base_rev_id = base_branch.get_rev_id(base_revision[1])
309
fetch(from_branch=base_branch, to_branch=this_branch)
310
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
288
312
if file_list is None:
289
313
interesting_ids = None
347
371
inv_changes = merge_flex(this_tree, base_tree, other_tree,
348
372
generate_cset_optimized, get_inventory,
349
MergeConflictHandler(base_tree.root,
350
ignore_zero=ignore_zero),
373
MergeConflictHandler(ignore_zero=ignore_zero),
351
374
merge_factory=merge_factory,
352
375
interesting_ids=interesting_ids)
360
assert path.startswith('./'), "path is %s" % path
383
assert path.startswith('.' + os.sep), "path is %s" % path
362
385
adjust_ids.append((path, id))
363
386
if len(adjust_ids) > 0:
added
removed
bzrlib/merge.py
