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