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