« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- browse files at revision 736
- compare with another revision
- download diff
- download tarball
- view history from revision 736
- Committer: Martin Pool
- Date: 2005-06-22 06:37:43 UTC
- Revision ID: mbp@sourcefrog.net-20050622063743-e395f04c4db8977f
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files renamed:
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/merge.py
1
# Copyright (C) 2005 Canonical Ltd
2
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.
7
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.
12
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
16
17
1
from merge_core import merge_flex
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory
4
from bzrlib import find_branch
5
import bzrlib.osutils
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.diff import compare_trees
8
from trace import mutter, warning
18
9
import os.path
19
10
import tempfile
20
11
import shutil
21
12
import errno
22
from fetch import greedy_fetch
23
24
import bzrlib.osutils
25
import bzrlib.revision
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
from bzrlib.changeset import Inventory, Diff3Merge
29
from bzrlib.branch import find_branch
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
31
from bzrlib.delta import compare_trees
32
from bzrlib.trace import mutter, warning
33
from bzrlib.fetch import greedy_fetch
34
from bzrlib.revision import is_ancestor
35
36
# comments from abentley on irc: merge happens in two stages, each
37
# of which generates a changeset object
38
39
# stage 1: generate OLD->OTHER,
40
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
13
14
class UnrelatedBranches(BzrCommandError):
15
def __init__(self):
16
msg = "Branches have no common ancestor, and no base revision"\
17
" specified."
18
BzrCommandError.__init__(self, msg)
19
41
20
42
21
class MergeConflictHandler(ExceptionConflictHandler):
43
"""Handle conflicts encountered while merging.
44
45
This subclasses ExceptionConflictHandler, so that any types of
46
conflict that are not explicitly handled cause an exception and
47
terminate the merge.
48
"""
22
"""Handle conflicts encountered while merging"""
49
23
def __init__(self, dir, ignore_zero=False):
50
24
ExceptionConflictHandler.__init__(self, dir)
51
25
self.conflicts = 0
62
36
d_file.write(line)
63
37
os.chmod(dest, 0777 & os.stat(source).st_mode)
64
38
65
def dump(self, lines, dest):
66
"""Copy the text and mode of a file
67
:param source: The path of the file to copy
68
:param dest: The distination file to create
69
"""
70
d_file = file(dest, "wb")
71
for line in lines:
72
d_file.write(line)
73
74
39
def add_suffix(self, name, suffix, last_new_name=None):
75
40
"""Rename a file to append a suffix. If the new name exists, the
76
41
suffix is added repeatedly until a non-existant name is found
95
60
self.conflicts += 1
96
61
97
62
98
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
63
def merge_conflict(self, new_file, this_path, base_path, other_path):
99
64
"""
100
65
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
101
66
main file will be a version with diff3 conflicts.
105
70
:param other_path: Path to the file text for the OTHER tree
106
71
"""
107
72
self.add_suffix(this_path, ".THIS")
108
self.dump(base_lines, this_path+".BASE")
109
self.dump(other_lines, this_path+".OTHER")
73
self.copy(base_path, this_path+".BASE")
74
self.copy(other_path, this_path+".OTHER")
110
75
os.rename(new_file, this_path)
111
76
self.conflict("Diff3 conflict encountered in %s" % this_path)
112
77
113
def new_contents_conflict(self, filename, other_contents):
114
"""Conflicting contents for newly added file."""
115
self.copy(other_contents, filename + ".OTHER")
116
self.conflict("Conflict in newly added file %s" % filename)
117
118
119
78
def target_exists(self, entry, target, old_path):
120
79
"""Handle the case when the target file or dir exists"""
121
80
moved_path = self.add_suffix(target, ".moved")
122
81
self.conflict("Moved existing %s to %s" % (target, moved_path))
123
82
124
def rmdir_non_empty(self, filename):
125
"""Handle the case where the dir to be removed still has contents"""
126
self.conflict("Directory %s not removed because it is not empty"\
127
% filename)
128
return "skip"
129
130
83
def finalize(self):
131
84
if not self.ignore_zero:
132
85
print "%d conflicts encountered.\n" % self.conflicts
133
86
134
def get_tree(treespec, temp_root, label, local_branch=None):
87
class SourceFile(object):
88
def __init__(self, path, id, present=None, isdir=None):
89
self.path = path
90
self.id = id
91
self.present = present
92
self.isdir = isdir
93
self.interesting = True
94
95
def __repr__(self):
96
return "SourceFile(%s, %s)" % (self.path, self.id)
97
98
def get_tree(treespec, temp_root, label):
135
99
location, revno = treespec
136
100
branch = find_branch(location)
137
101
if revno is None:
138
revision = None
102
base_tree = branch.working_tree()
139
103
elif revno == -1:
140
revision = branch.last_patch()
141
else:
142
revision = branch.lookup_revision(revno)
143
return branch, get_revid_tree(branch, revision, temp_root, label,
144
local_branch)
145
146
def get_revid_tree(branch, revision, temp_root, label, local_branch):
147
if revision is None:
148
base_tree = branch.working_tree()
149
else:
150
if local_branch is not None:
151
greedy_fetch(local_branch, branch, revision)
152
base_tree = local_branch.revision_tree(revision)
153
else:
154
base_tree = branch.revision_tree(revision)
104
base_tree = branch.basis_tree()
105
else:
106
base_tree = branch.revision_tree(branch.lookup_revision(revno))
155
107
temp_path = os.path.join(temp_root, label)
156
108
os.mkdir(temp_path)
157
return MergeTree(base_tree, temp_path)
158
109
return branch, MergeTree(base_tree, temp_path)
110
111
112
def abspath(tree, file_id):
113
path = tree.inventory.id2path(file_id)
114
if path == "":
115
return "./."
116
return "./" + path
159
117
160
118
def file_exists(tree, file_id):
161
119
return tree.has_filename(tree.id2path(file_id))
162
120
121
def inventory_map(tree):
122
inventory = {}
123
for file_id in tree.inventory:
124
if not file_exists(tree, file_id):
125
continue
126
path = abspath(tree, file_id)
127
inventory[path] = SourceFile(path, file_id)
128
return inventory
129
163
130
164
131
class MergeTree(object):
165
132
def __init__(self, tree, tempdir):
168
135
self.root = tree.basedir
169
136
else:
170
137
self.root = None
138
self.inventory = inventory_map(tree)
171
139
self.tree = tree
172
140
self.tempdir = tempdir
173
141
os.mkdir(os.path.join(self.tempdir, "texts"))
174
142
self.cached = {}
175
143
176
def __iter__(self):
177
return self.tree.__iter__()
178
179
def __contains__(self, file_id):
180
return file_id in self.tree
181
182
def get_file(self, file_id):
183
return self.tree.get_file(file_id)
184
185
def get_file_sha1(self, id):
186
return self.tree.get_file_sha1(id)
187
188
def id2path(self, file_id):
189
return self.tree.id2path(file_id)
190
191
def has_id(self, file_id):
192
return self.tree.has_id(file_id)
193
194
def has_or_had_id(self, file_id):
195
if file_id == self.tree.inventory.root.file_id:
196
return True
197
return self.tree.inventory.has_id(file_id)
198
199
144
def readonly_path(self, id):
200
if id not in self.tree:
201
return None
202
145
if self.root is not None:
203
146
return self.tree.abspath(self.tree.id2path(id))
204
147
else:
216
159
217
160
def merge(other_revision, base_revision,
218
161
check_clean=True, ignore_zero=False,
219
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
220
file_list=None):
162
this_dir=None):
221
163
"""Merge changes into a tree.
222
164
223
165
base_revision
224
tuple(path, revision) Base for three-way merge.
166
Base for three-way merge.
225
167
other_revision
226
tuple(path, revision) Other revision for three-way merge.
168
Other revision for three-way merge.
227
169
this_dir
228
170
Directory to merge changes into; '.' by default.
229
171
check_clean
230
172
If true, this_dir must have no uncommitted changes before the
231
173
merge begins.
232
all available ancestors of other_revision and base_revision are
233
automatically pulled into the branch.
234
174
"""
235
from bzrlib.revision import common_ancestor, MultipleRevisionSources
236
from bzrlib.errors import NoSuchRevision
237
175
tempdir = tempfile.mkdtemp(prefix="bzr-")
238
176
try:
239
177
if this_dir is None:
240
178
this_dir = '.'
241
179
this_branch = find_branch(this_dir)
242
this_rev_id = this_branch.last_patch()
243
if this_rev_id is None:
244
raise BzrCommandError("This branch has no commits")
245
180
if check_clean:
246
181
changes = compare_trees(this_branch.working_tree(),
247
182
this_branch.basis_tree(), False)
248
183
if changes.has_changed():
249
184
raise BzrCommandError("Working tree has uncommitted changes.")
250
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
251
this_branch)
252
if other_revision[1] == -1:
253
other_rev_id = other_branch.last_patch()
254
other_basis = other_rev_id
255
elif other_revision[1] is not None:
256
other_rev_id = other_branch.lookup_revision(other_revision[1])
257
other_basis = other_rev_id
258
else:
259
other_rev_id = None
260
other_basis = other_branch.last_patch()
185
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
261
186
if base_revision == [None, None]:
262
base_rev_id = common_ancestor(this_rev_id, other_basis,
263
this_branch)
264
if base_rev_id is None:
187
if other_revision[1] == -1:
188
o_revno = None
189
else:
190
o_revno = other_revision[1]
191
base_revno = this_branch.common_ancestor(other_branch,
192
other_revno=o_revno)[0]
193
if base_revno is None:
265
194
raise UnrelatedBranches()
266
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
267
"base", None)
268
base_is_ancestor = True
269
else:
270
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
271
if base_revision[1] == -1:
272
base_rev_id = base_branch.last_patch()
273
elif base_revision[1] is None:
274
base_rev_id = None
275
else:
276
base_rev_id = base_branch.lookup_revision(base_revision[1])
277
if base_rev_id is not None:
278
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
279
MultipleRevisionSources(this_branch,
280
base_branch))
281
else:
282
base_is_ancestor = False
283
if file_list is None:
284
interesting_ids = None
285
else:
286
interesting_ids = set()
287
this_tree = this_branch.working_tree()
288
for fname in file_list:
289
path = this_branch.relpath(fname)
290
found_id = False
291
for tree in (this_tree, base_tree.tree, other_tree.tree):
292
file_id = tree.inventory.path2id(path)
293
if file_id is not None:
294
interesting_ids.add(file_id)
295
found_id = True
296
if not found_id:
297
raise BzrCommandError("%s is not a source file in any"
298
" tree." % fname)
195
base_revision = ['.', base_revno]
196
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
299
197
merge_inner(this_branch, other_tree, base_tree, tempdir,
300
ignore_zero=ignore_zero, backup_files=backup_files,
301
merge_type=merge_type, interesting_ids=interesting_ids)
302
if base_is_ancestor and other_rev_id is not None:
303
this_branch.add_pending_merge(other_rev_id)
198
ignore_zero=ignore_zero)
304
199
finally:
305
200
shutil.rmtree(tempdir)
306
201
307
202
308
def set_interesting(inventory_a, inventory_b, interesting_ids):
309
"""Mark files whose ids are in interesting_ids as interesting
310
"""
311
for inventory in (inventory_a, inventory_b):
312
for path, source_file in inventory.iteritems():
313
source_file.interesting = source_file.id in interesting_ids
314
315
316
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
317
"""Generate a changeset. If interesting_ids is supplied, only changes
318
to those files will be shown. Metadata changes are stripped.
203
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
204
"""Generate a changeset, using the text_id to mark really-changed files.
205
This permits blazing comparisons when text_ids are present. It also
206
disables metadata comparison for files with identical texts.
319
207
"""
320
cset = generate_changeset(tree_a, tree_b, interesting_ids)
208
for file_id in tree_a.tree.inventory:
209
if file_id not in tree_b.tree.inventory:
210
continue
211
entry_a = tree_a.tree.inventory[file_id]
212
entry_b = tree_b.tree.inventory[file_id]
213
if (entry_a.kind, entry_b.kind) != ("file", "file"):
214
continue
215
if None in (entry_a.text_id, entry_b.text_id):
216
continue
217
if entry_a.text_id != entry_b.text_id:
218
continue
219
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
220
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
221
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
321
222
for entry in cset.entries.itervalues():
322
223
entry.metadata_change = None
323
224
return cset
324
225
325
226
326
227
def merge_inner(this_branch, other_tree, base_tree, tempdir,
327
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
328
interesting_ids=None):
329
330
def merge_factory(file_id, base, other):
331
contents_change = merge_type(file_id, base, other)
332
if backup_files:
333
contents_change = BackupBeforeChange(contents_change)
334
return contents_change
335
228
ignore_zero=False):
336
229
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
337
230
338
231
def get_inventory(tree):
339
return tree.tree.inventory
232
return tree.inventory
340
233
341
234
inv_changes = merge_flex(this_tree, base_tree, other_tree,
342
235
generate_cset_optimized, get_inventory,
343
236
MergeConflictHandler(base_tree.root,
344
ignore_zero=ignore_zero),
345
merge_factory=merge_factory,
346
interesting_ids=interesting_ids)
237
ignore_zero=ignore_zero))
347
238
348
239
adjust_ids = []
349
240
for id, path in inv_changes.iteritems():
351
242
if path == '.':
352
243
path = ''
353
244
else:
354
assert path.startswith('./'), "path is %s" % path
245
assert path.startswith('./')
355
246
path = path[2:]
356
247
adjust_ids.append((path, id))
357
if len(adjust_ids) > 0:
358
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
359
adjust_ids))
248
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
360
249
361
250
362
251
def regen_inventory(this_branch, root, new_entries):
363
252
old_entries = this_branch.read_working_inventory()
364
253
new_inventory = {}
365
254
by_path = {}
366
new_entries_map = {}
367
for path, file_id in new_entries:
368
if path is None:
369
continue
370
new_entries_map[file_id] = path
371
372
def id2path(file_id):
373
path = new_entries_map.get(file_id)
374
if path is not None:
375
return path
376
entry = old_entries[file_id]
377
if entry.parent_id is None:
378
return entry.name
379
return os.path.join(id2path(entry.parent_id), entry.name)
380
381
255
for file_id in old_entries:
382
256
entry = old_entries[file_id]
383
path = id2path(file_id)
257
path = old_entries.id2path(file_id)
384
258
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
385
259
by_path[path] = file_id
386
260
414
288
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
415
289
new_inventory_list.sort()
416
290
return new_inventory_list
417
418
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
419
"diff3": (Diff3Merge, "Merge using external diff3")
420
}
421
Loggerhead is a web-based interface for Breezy
Version: 2.0.1