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
24
import bzrlib.revision
1
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
3
from bzrlib.changeset import Inventory, Diff3Merge
4
from bzrlib import find_branch
6
from bzrlib.errors import BzrCommandError
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
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, 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
15
43
# comments from abentley on irc: merge happens in two stages, each
16
44
# of which generates a changeset object
32
53
conflict that are not explicitly handled cause an exception and
33
54
terminate the merge.
35
def __init__(self, dir, ignore_zero=False):
36
ExceptionConflictHandler.__init__(self, dir)
56
def __init__(self, this_tree, base_tree, other_tree, ignore_zero=False):
57
ExceptionConflictHandler.__init__(self)
38
59
self.ignore_zero = ignore_zero
60
self.this_tree = this_tree
61
self.base_tree = base_tree
62
self.other_tree = other_tree
40
64
def copy(self, source, dest):
41
65
"""Copy the text and mode of a file
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)
116
186
def finalize(self):
117
187
if not self.ignore_zero:
118
188
print "%d conflicts encountered.\n" % self.conflicts
120
def get_tree(treespec, temp_root, label):
190
def get_tree(treespec, temp_root, label, local_branch=None):
121
191
location, revno = treespec
122
branch = find_branch(location)
192
branch = Branch.open_containing(location)
123
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):
124
204
base_tree = branch.working_tree()
126
base_tree = branch.basis_tree()
128
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)
129
211
temp_path = os.path.join(temp_root, label)
130
212
os.mkdir(temp_path)
131
return branch, MergeTree(base_tree, temp_path)
213
return MergeTree(base_tree, temp_path)
134
216
def file_exists(tree, file_id):
182
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)
186
291
def merge(other_revision, base_revision,
187
292
check_clean=True, ignore_zero=False,
190
295
"""Merge changes into a tree.
193
Base for three-way merge.
298
tuple(path, revision) Base for three-way merge.
195
Other revision for three-way merge.
300
tuple(path, revision) Other revision for three-way merge.
197
302
Directory to merge changes into; '.' by default.
199
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.
202
313
tempdir = tempfile.mkdtemp(prefix="bzr-")
204
315
if this_dir is None:
206
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")
208
322
changes = compare_trees(this_branch.working_tree(),
209
323
this_branch.basis_tree(), False)
210
324
if changes.has_changed():
211
325
raise BzrCommandError("Working tree has uncommitted changes.")
212
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)
213
341
if base_revision == [None, None]:
214
if other_revision[1] == -1:
217
o_revno = other_revision[1]
218
base_revno = this_branch.common_ancestor(other_branch,
219
other_revno=o_revno)[0]
220
if base_revno is None:
343
base_rev_id = common_ancestor(this_rev_id, other_basis,
345
except NoCommonAncestor:
221
346
raise UnrelatedBranches()
222
base_revision = ['.', base_revno]
223
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,
224
361
if file_list is None:
225
362
interesting_ids = None
added
removed
bzrlib/merge.py
