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
22
from fetch import greedy_fetch
25
import bzrlib.revision
1
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
3
28
from bzrlib.changeset import Inventory, Diff3Merge
4
from bzrlib import find_branch
6
from bzrlib.errors import BzrCommandError
29
from bzrlib.branch import find_branch
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
7
31
from bzrlib.delta import compare_trees
8
from trace import mutter, warning
32
from bzrlib.trace import mutter, warning
33
from bzrlib.fetch import greedy_fetch
34
from bzrlib.revision import is_ancestor
15
36
# comments from abentley on irc: merge happens in two stages, each
16
37
# of which generates a changeset object
18
39
# stage 1: generate OLD->OTHER,
19
40
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
21
class UnrelatedBranches(BzrCommandError):
23
msg = "Branches have no common ancestor, and no base revision"\
25
BzrCommandError.__init__(self, msg)
28
42
class MergeConflictHandler(ExceptionConflictHandler):
29
43
"""Handle conflicts encountered while merging.
117
131
if not self.ignore_zero:
118
132
print "%d conflicts encountered.\n" % self.conflicts
120
def get_tree(treespec, temp_root, label):
134
def get_tree(treespec, temp_root, label, local_branch=None):
121
135
location, revno = treespec
122
136
branch = find_branch(location)
123
137
if revno is None:
140
revision = branch.last_patch()
142
revision = branch.lookup_revision(revno)
143
return branch, get_revid_tree(branch, revision, temp_root, label,
146
def get_revid_tree(branch, revision, temp_root, label, local_branch):
124
148
base_tree = branch.working_tree()
126
base_tree = branch.basis_tree()
128
base_tree = branch.revision_tree(branch.lookup_revision(revno))
150
if local_branch is not None:
151
greedy_fetch(local_branch, branch, revision)
152
base_tree = local_branch.revision_tree(revision)
154
base_tree = branch.revision_tree(revision)
129
155
temp_path = os.path.join(temp_root, label)
130
156
os.mkdir(temp_path)
131
return branch, MergeTree(base_tree, temp_path)
157
return MergeTree(base_tree, temp_path)
134
160
def file_exists(tree, file_id):
195
226
"""Merge changes into a tree.
198
Base for three-way merge.
229
tuple(path, revision) Base for three-way merge.
200
Other revision for three-way merge.
231
tuple(path, revision) Other revision for three-way merge.
202
233
Directory to merge changes into; '.' by default.
204
235
If true, this_dir must have no uncommitted changes before the
237
all available ancestors of other_revision and base_revision are
238
automatically pulled into the branch.
240
from bzrlib.revision import common_ancestor, MultipleRevisionSources
241
from bzrlib.errors import NoSuchRevision
207
242
tempdir = tempfile.mkdtemp(prefix="bzr-")
209
244
if this_dir is None:
211
246
this_branch = find_branch(this_dir)
247
this_rev_id = this_branch.last_patch()
248
if this_rev_id is None:
249
raise BzrCommandError("This branch has no commits")
213
251
changes = compare_trees(this_branch.working_tree(),
214
252
this_branch.basis_tree(), False)
215
253
if changes.has_changed():
216
254
raise BzrCommandError("Working tree has uncommitted changes.")
217
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
255
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
257
if other_revision[1] == -1:
258
other_rev_id = other_branch.last_patch()
259
other_basis = other_rev_id
260
elif other_revision[1] is not None:
261
other_rev_id = other_branch.lookup_revision(other_revision[1])
262
other_basis = other_rev_id
265
other_basis = other_branch.last_patch()
218
266
if base_revision == [None, None]:
219
if other_revision[1] == -1:
222
o_revno = other_revision[1]
223
base_revno = this_branch.common_ancestor(other_branch,
224
other_revno=o_revno)[0]
225
if base_revno is None:
267
base_rev_id = common_ancestor(this_rev_id, other_basis,
269
if base_rev_id is None:
226
270
raise UnrelatedBranches()
227
base_revision = ['.', base_revno]
228
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
271
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
273
base_is_ancestor = True
275
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
276
if base_revision[1] == -1:
277
base_rev_id = base_branch.last_patch()
278
elif base_revision[1] is 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
229
288
if file_list is None:
230
289
interesting_ids = None
245
304
merge_inner(this_branch, other_tree, base_tree, tempdir,
246
305
ignore_zero=ignore_zero, backup_files=backup_files,
247
306
merge_type=merge_type, interesting_ids=interesting_ids)
307
if base_is_ancestor and other_rev_id is not None\
308
and other_rev_id not in this_branch.revision_history():
309
this_branch.add_pending_merge(other_rev_id)
249
311
shutil.rmtree(tempdir)
added
removed
bzrlib/merge.py
