« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- browse files at revision 1092.1.39
- compare with another revision
- download diff
- download tarball
- view history from revision 1092.1.39
- Committer: Robert Collins
- Date: 2005-08-25 12:46:42 UTC
- mfrom: (1116)
- mto: (974.1.50) (1185.1.10) (1092.3.1)
- mto: This revision was merged to the branch mainline in revision 1139.
- Revision ID: robertc@robertcollins.net-20050825124642-45ed1cd74db10370
merge from mpool
- files added:
- bzrlib/meta_store.py
- files removed:
- INSTALL
- bzrlib/store
- bzrlib/transport
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files renamed:
- contrib/newinventory.py => bzrlib/newinventory.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- bzrlib/store/__init__.py => bzrlib/store.py
- bzrlib/upgrade.py => tools/history2weaves.py
- bzrlib/selftest/test_weave.py => tools/testweave.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/merge.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
import os
18
import os.path
19
19
import tempfile
20
20
import shutil
21
21
import errno
22
from fetch import greedy_fetch
22
23
23
24
import bzrlib.osutils
24
25
import bzrlib.revision
25
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
from bzrlib.merge_core import WeaveMerge
27
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
29
from bzrlib.branch import Branch
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
31
from bzrlib.errors import NoCommits, WorkingTreeNotRevision, NotBranchError
28
from bzrlib.changeset import Inventory, Diff3Merge
29
from bzrlib.branch import find_branch
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
32
31
from bzrlib.delta import compare_trees
33
from bzrlib.trace import mutter, warning, note
34
from bzrlib.fetch import greedy_fetch, fetch
35
from bzrlib.revision import is_ancestor, NULL_REVISION
36
from bzrlib.osutils import rename
37
from bzrlib.revision import common_ancestor, MultipleRevisionSources
38
from bzrlib.errors import NoSuchRevision
39
40
# TODO: Report back as changes are merged in
41
42
# TODO: build_working_dir can be built on something simpler than merge()
43
44
# FIXME: merge() parameters seem oriented towards the command line
45
# NOTABUG: merge is a helper for commandline functions. merge_inner is the
46
# the core functionality.
32
from bzrlib.trace import mutter, warning
33
from bzrlib.fetch import greedy_fetch
34
from bzrlib.revision import is_ancestor
47
35
48
36
# comments from abentley on irc: merge happens in two stages, each
49
37
# of which generates a changeset object
58
46
conflict that are not explicitly handled cause an exception and
59
47
terminate the merge.
60
48
"""
61
def __init__(self, this_tree, base_tree, other_tree, ignore_zero=False):
62
ExceptionConflictHandler.__init__(self)
49
def __init__(self, dir, ignore_zero=False):
50
ExceptionConflictHandler.__init__(self, dir)
63
51
self.conflicts = 0
64
52
self.ignore_zero = ignore_zero
65
self.this_tree = this_tree
66
self.base_tree = base_tree
67
self.other_tree = other_tree
68
53
69
54
def copy(self, source, dest):
70
55
"""Copy the text and mode of a file
86
71
for line in lines:
87
72
d_file.write(line)
88
73
89
def add_suffix(self, name, suffix, last_new_name=None, fix_inventory=True):
74
def add_suffix(self, name, suffix, last_new_name=None):
90
75
"""Rename a file to append a suffix. If the new name exists, the
91
76
suffix is added repeatedly until a non-existant name is found
92
77
98
83
last_new_name = name
99
84
new_name = last_new_name+suffix
100
85
try:
101
rename(name, new_name)
102
if fix_inventory is True:
103
try:
104
relpath = self.this_tree.relpath(name)
105
except NotBranchError:
106
relpath = None
107
if relpath is not None:
108
file_id = self.this_tree.path2id(relpath)
109
if file_id is not None:
110
new_path = self.this_tree.relpath(new_name)
111
rename(new_name, name)
112
self.this_tree.branch.rename_one(relpath, new_path)
113
assert self.this_tree.id2path(file_id) == relpath
114
self.this_tree._inventory = self.this_tree.branch.inventory
115
assert self.this_tree.id2path(file_id) == new_path
86
os.rename(name, new_name)
87
return new_name
116
88
except OSError, e:
117
89
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
118
90
raise
119
return self.add_suffix(name, suffix, last_new_name=new_name,
120
fix_inventory=fix_inventory)
121
return new_name
91
return self.add_suffix(name, suffix, last_new_name=new_name)
122
92
123
93
def conflict(self, text):
124
94
warning(text)
134
104
:param base_path: Path to the file text for the BASE tree
135
105
:param other_path: Path to the file text for the OTHER tree
136
106
"""
137
self.add_suffix(this_path, ".THIS", fix_inventory=False)
107
self.add_suffix(this_path, ".THIS")
138
108
self.dump(base_lines, this_path+".BASE")
139
109
self.dump(other_lines, this_path+".OTHER")
140
rename(new_file, this_path)
110
os.rename(new_file, this_path)
141
111
self.conflict("Diff3 conflict encountered in %s" % this_path)
142
112
143
def weave_merge_conflict(self, filename, weave, other_i, out_file):
144
"""
145
Handle weave conflicts by producing a .THIS, and .OTHER. The
146
main file will be a version with diff3-style conflicts.
147
"""
148
self.add_suffix(filename, ".THIS")
149
out_file.commit()
150
self.dump(weave.get_iter(other_i), filename+".OTHER")
151
self.conflict("Text conflict encountered in %s" % filename)
152
153
113
def new_contents_conflict(self, filename, other_contents):
154
114
"""Conflicting contents for newly added file."""
155
other_contents(filename + ".OTHER", self, False)
115
self.copy(other_contents, filename + ".OTHER")
156
116
self.conflict("Conflict in newly added file %s" % filename)
157
117
158
118
167
127
% filename)
168
128
return "skip"
169
129
170
def rem_contents_conflict(self, filename, this_contents, base_contents):
171
base_contents(filename+".BASE", self, False)
172
this_contents(filename+".THIS", self, False)
173
return ReplaceContents(this_contents, None)
174
175
def rem_contents_conflict(self, filename, this_contents, base_contents):
176
base_contents(filename+".BASE", self, False)
177
this_contents(filename+".THIS", self, False)
178
self.conflict("Other branch deleted locally modified file %s" %
179
filename)
180
return ReplaceContents(this_contents, None)
181
182
def abs_this_path(self, file_id):
183
"""Return the absolute path for a file_id in the this tree."""
184
return self.this_tree.id2abspath(file_id)
185
186
def add_missing_parents(self, file_id, tree):
187
"""If some of the parents for file_id are missing, add them."""
188
entry = tree.inventory[file_id]
189
if entry.parent_id not in self.this_tree:
190
return self.create_all_missing(entry.parent_id, tree)
191
else:
192
return self.abs_this_path(entry.parent_id)
193
194
def create_all_missing(self, file_id, tree):
195
"""Add contents for a file_id and all its parents to a tree."""
196
entry = tree.inventory[file_id]
197
if entry.parent_id is not None and entry.parent_id not in self.this_tree:
198
abspath = self.create_all_missing(entry.parent_id, tree)
199
else:
200
abspath = self.abs_this_path(entry.parent_id)
201
entry_path = os.path.join(abspath, entry.name)
202
if not os.path.isdir(entry_path):
203
self.create(file_id, entry_path, tree)
204
return entry_path
205
206
def create(self, file_id, path, tree, reverse=False):
207
"""Uses tree data to create a filesystem object for the file_id"""
208
from changeset import get_contents
209
get_contents(tree, file_id)(path, self, reverse)
210
211
def missing_for_merge(self, file_id, other_path):
212
"""The file_id doesn't exist in THIS, but does in OTHER and BASE"""
213
self.conflict("Other branch modified locally deleted file %s" %
214
other_path)
215
parent_dir = self.add_missing_parents(file_id, self.other_tree)
216
stem = os.path.join(parent_dir, os.path.basename(other_path))
217
self.create(file_id, stem+".OTHER", self.other_tree)
218
self.create(file_id, stem+".BASE", self.base_tree)
219
220
def threeway_contents_conflict(filename, this_contents, base_contents,
221
other_contents):
222
self.conflict("Three-way conflict merging %s" % filename)
223
224
130
def finalize(self):
225
131
if not self.ignore_zero:
226
note("%d conflicts encountered.\n" % self.conflicts)
132
print "%d conflicts encountered.\n" % self.conflicts
227
133
228
def get_tree(treespec, local_branch=None):
134
def get_tree(treespec, temp_root, label, local_branch=None):
229
135
location, revno = treespec
230
branch = Branch.open_containing(location)[0]
136
branch = find_branch(location)
231
137
if revno is None:
232
138
revision = None
233
139
elif revno == -1:
234
revision = branch.last_revision()
140
revision = branch.last_patch()
235
141
else:
236
revision = branch.get_rev_id(revno)
237
if revision is None:
238
revision = NULL_REVISION
239
return branch, get_revid_tree(branch, revision, local_branch)
142
revision = branch.lookup_revision(revno)
143
return branch, get_revid_tree(branch, revision, temp_root, label,
144
local_branch)
240
145
241
def get_revid_tree(branch, revision, local_branch):
146
def get_revid_tree(branch, revision, temp_root, label, local_branch):
242
147
if revision is None:
243
148
base_tree = branch.working_tree()
244
149
else:
247
152
base_tree = local_branch.revision_tree(revision)
248
153
else:
249
154
base_tree = branch.revision_tree(revision)
250
return base_tree
155
temp_path = os.path.join(temp_root, label)
156
os.mkdir(temp_path)
157
return MergeTree(base_tree, temp_path)
251
158
252
159
253
160
def file_exists(tree, file_id):
254
161
return tree.has_filename(tree.id2path(file_id))
255
162
256
163
257
def build_working_dir(to_dir):
258
"""Build a working directory in an empty directory.
259
260
to_dir is a directory containing branch metadata but no working files,
261
typically constructed by cloning an existing branch.
262
263
This is split out as a special idiomatic case of merge. It could
264
eventually be done by just building the tree directly calling into
265
lower-level code (e.g. constructing a changeset).
266
"""
267
# RBC 20051019 is this not just 'export' ?
268
# Well, export doesn't take care of inventory...
269
this_branch = Branch.open_containing(to_dir)[0]
270
transform_tree(this_branch.working_tree(), this_branch.basis_tree())
271
272
def transform_tree(from_tree, to_tree):
273
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True)
164
class MergeTree(object):
165
def __init__(self, tree, tempdir):
166
object.__init__(self)
167
if hasattr(tree, "basedir"):
168
self.root = tree.basedir
169
else:
170
self.root = None
171
self.tree = tree
172
self.tempdir = tempdir
173
os.mkdir(os.path.join(self.tempdir, "texts"))
174
self.cached = {}
175
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
def readonly_path(self, id):
200
if id not in self.tree:
201
return None
202
if self.root is not None:
203
return self.tree.abspath(self.tree.id2path(id))
204
else:
205
if self.tree.inventory[id].kind in ("directory", "root_directory"):
206
return self.tempdir
207
if not self.cached.has_key(id):
208
path = os.path.join(self.tempdir, "texts", id)
209
outfile = file(path, "wb")
210
outfile.write(self.tree.get_file(id).read())
211
assert(os.path.exists(path))
212
self.cached[id] = path
213
return self.cached[id]
214
215
274
216
275
217
def merge(other_revision, base_revision,
276
218
check_clean=True, ignore_zero=False,
277
219
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
278
file_list=None, show_base=False, reprocess=False):
220
file_list=None):
279
221
"""Merge changes into a tree.
280
222
281
223
base_revision
282
list(path, revno) Base for three-way merge.
283
If [None, None] then a base will be automatically determined.
224
tuple(path, revision) Base for three-way merge.
284
225
other_revision
285
list(path, revno) Other revision for three-way merge.
226
tuple(path, revision) Other revision for three-way merge.
286
227
this_dir
287
228
Directory to merge changes into; '.' by default.
288
229
check_clean
289
230
If true, this_dir must have no uncommitted changes before the
290
231
merge begins.
291
ignore_zero - If true, suppress the "zero conflicts" message when
292
there are no conflicts; should be set when doing something we expect
293
to complete perfectly.
294
file_list - If supplied, merge only changes to selected files.
295
296
All available ancestors of other_revision and base_revision are
232
all available ancestors of other_revision and base_revision are
297
233
automatically pulled into the branch.
298
299
The revno may be -1 to indicate the last revision on the branch, which is
300
the typical case.
301
302
This function is intended for use from the command line; programmatic
303
clients might prefer to call merge_inner(), which has less magic behavior.
304
234
"""
305
if this_dir is None:
306
this_dir = '.'
307
this_branch = Branch.open_containing(this_dir)[0]
308
if show_base and not merge_type is ApplyMerge3:
309
raise BzrCommandError("Show-base is not supported for this merge"
310
" type. %s" % merge_type)
311
if reprocess and not merge_type is ApplyMerge3:
312
raise BzrCommandError("Reprocess is not supported for this merge"
313
" type. %s" % merge_type)
314
if reprocess and show_base:
315
raise BzrCommandError("Cannot reprocess and show base.")
316
merger = Merger(this_branch)
317
merger.check_basis(check_clean)
318
merger.set_other(other_revision)
319
merger.set_base(base_revision)
320
merger.backup_files = backup_files
321
merger.merge_type = merge_type
322
merger.set_interesting_files(file_list)
323
merger.show_base = show_base
324
merger.reprocess = reprocess
325
merger.conflict_handler = MergeConflictHandler(merger.this_tree,
326
merger.base_tree,
327
merger.other_tree,
328
ignore_zero=ignore_zero)
329
conflicts = merger.do_merge()
330
merger.set_pending()
331
return conflicts
332
333
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
334
backup_files=False, merge_type=ApplyMerge3,
335
interesting_ids=None, show_base=False, reprocess=False):
336
"""Primary interface for merging.
337
338
typical use is probably
339
'merge_inner(branch, branch.get_revision_tree(other_revision),
340
branch.get_revision_tree(base_revision))'
341
"""
342
merger = Merger(this_branch, other_tree, base_tree)
343
merger.backup_files = False
344
merger.merge_type = ApplyMerge3
345
merger.interesting_ids = interesting_ids
346
merger.show_base = show_base
347
merger.reprocess = reprocess
348
merger.conflict_handler = MergeConflictHandler(merger.this_tree, base_tree,
349
other_tree,
350
ignore_zero=ignore_zero)
351
return merger.do_merge()
352
353
354
class Merger(object):
355
def __init__(self, this_branch, other_tree=None, base_tree=None):
356
object.__init__(self)
357
self.this_branch = this_branch
358
self.this_basis = this_branch.last_revision()
359
self.this_rev_id = None
360
self.this_tree = this_branch.working_tree()
361
self.this_revision_tree = None
362
self.other_tree = other_tree
363
self.base_tree = base_tree
364
self.ignore_zero = False
365
self.backup_files = False
366
self.interesting_ids = None
367
self.show_base = False
368
self.reprocess = False
369
self.conflict_handler = MergeConflictHandler(self.this_tree, base_tree,
370
other_tree)
371
372
def revision_tree(self, revision_id):
373
return self.this_branch.revision_tree(revision_id)
374
375
def ensure_revision_trees(self):
376
if self.this_revision_tree is None:
377
if self.this_rev_id is None:
378
self.compare_basis()
379
if self.this_rev_id is None:
380
raise WorkingTreeNotRevision(self.this_tree)
381
self.this_revision_tree = self.this_branch.revision_tree(
382
self.this_rev_id)
383
384
if self.other_rev_id is None:
385
other_basis_tree = self.revision_tree(self.other_basis)
386
changes = compare_trees(self.other_tree, other_basis_tree)
387
if changes.has_changed():
388
raise WorkingTreeNotRevision(self.this_tree)
389
other_rev_id = other_basis
390
self.other_tree = other_basis_tree
391
392
393
def file_revisions(self, file_id):
394
self.ensure_revision_trees()
395
def get_id(tree, file_id):
396
revision_id = tree.inventory[file_id].revision
397
assert revision_id is not None
398
return revision_id
399
trees = (self.this_revision_tree, self.other_tree)
400
return [get_id(tree, file_id) for tree in trees]
401
402
403
def merge_factory(self, file_id, base, other):
404
if self.merge_type.history_based:
405
t_revid, o_revid = self.file_revisions(file_id)
406
weave = self.this_revision_tree.get_weave(file_id)
407
contents_change = self.merge_type(weave, t_revid, o_revid)
408
else:
409
if self.show_base is True or self.reprocess is True:
410
contents_change = self.merge_type(file_id, base, other,
411
show_base=self.show_base,
412
reprocess=self.reprocess)
413
else:
414
contents_change = self.merge_type(file_id, base, other)
415
if self.backup_files:
416
contents_change = BackupBeforeChange(contents_change)
417
return contents_change
418
419
def check_basis(self, check_clean):
420
if self.this_basis is None:
235
from bzrlib.revision import common_ancestor, MultipleRevisionSources
236
from bzrlib.errors import NoSuchRevision
237
tempdir = tempfile.mkdtemp(prefix="bzr-")
238
try:
239
if this_dir is None:
240
this_dir = '.'
241
this_branch = find_branch(this_dir)
242
this_rev_id = this_branch.last_patch()
243
if this_rev_id is None:
421
244
raise BzrCommandError("This branch has no commits")
422
245
if check_clean:
423
self.compare_basis()
424
if self.this_basis != self.this_rev_id:
246
changes = compare_trees(this_branch.working_tree(),
247
this_branch.basis_tree(), False)
248
if changes.has_changed():
425
249
raise BzrCommandError("Working tree has uncommitted changes.")
426
427
def compare_basis(self):
428
changes = compare_trees(self.this_branch.working_tree(),
429
self.this_branch.basis_tree(), False)
430
if not changes.has_changed():
431
self.this_rev_id = self.this_basis
432
433
def set_interesting_files(self, file_list):
434
if file_list is None:
435
self.interesting_ids = None
436
return
437
438
interesting_ids = set()
439
for fname in file_list:
440
path = self.this_tree.relpath(fname)
441
found_id = False
442
for tree in (self.this_tree, self.base_tree, self.other_tree):
443
file_id = tree.inventory.path2id(path)
444
if file_id is not None:
445
interesting_ids.add(file_id)
446
found_id = True
447
if not found_id:
448
raise BzrCommandError("%s is not a source file in any"
449
" tree." % fname)
450
self.interesting_ids = interesting_ids
451
452
def set_pending(self):
453
if not self.base_is_ancestor:
454
return
455
if self.other_rev_id is None:
456
return
457
if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):
458
return
459
self.this_branch.add_pending_merge(self.other_rev_id)
460
461
def set_other(self, other_revision):
462
other_branch, self.other_tree = get_tree(other_revision,
463
self.this_branch)
250
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
251
this_branch)
464
252
if other_revision[1] == -1:
465
self.other_rev_id = other_branch.last_revision()
466
if self.other_rev_id is None:
467
raise NoCommits(other_branch)
468
self.other_basis = self.other_rev_id
253
other_rev_id = other_branch.last_patch()
254
other_basis = other_rev_id
469
255
elif other_revision[1] is not None:
470
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
471
self.other_basis = self.other_rev_id
256
other_rev_id = other_branch.lookup_revision(other_revision[1])
257
other_basis = other_rev_id
472
258
else:
473
self.other_rev_id = None
474
self.other_basis = other_branch.last_revision()
475
if self.other_basis is None:
476
raise NoCommits(other_branch)
477
fetch(from_branch=other_branch, to_branch=self.this_branch,
478
last_revision=self.other_basis)
479
480
def set_base(self, base_revision):
481
mutter("doing merge() with no base_revision specified")
259
other_rev_id = None
260
other_basis = other_branch.last_patch()
482
261
if base_revision == [None, None]:
262
if other_revision[1] == -1:
263
o_revno = None
264
else:
265
o_revno = other_revision[1]
266
raise UnrelatedBranches()
483
267
try:
484
self.base_rev_id = common_ancestor(self.this_basis,
485
self.other_basis,
486
self.this_branch)
487
except NoCommonAncestor:
488
raise UnrelatedBranches()
489
self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,
490
None)
491
self.base_is_ancestor = True
268
base_revision = this_branch.get_revision(base_rev_id)
269
base_branch = this_branch
270
except NoSuchRevision:
271
base_branch = other_branch
272
base_tree = get_revid_tree(base_branch, base_rev_id, tempdir,
273
"base")
274
base_is_ancestor = True
492
275
else:
493
base_branch, self.base_tree = get_tree(base_revision)
494
276
if base_revision[1] == -1:
495
self.base_rev_id = base_branch.last_revision()
277
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
278
base_rev_id = base_branch.last_patch()
496
279
elif base_revision[1] is None:
497
self.base_rev_id = None
498
else:
499
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
500
fetch(from_branch=base_branch, to_branch=self.this_branch)
501
self.base_is_ancestor = is_ancestor(self.this_basis,
502
self.base_rev_id,
503
self.this_branch)
504
505
def do_merge(self):
506
def get_inventory(tree):
507
return tree.inventory
508
509
inv_changes = merge_flex(self.this_tree, self.base_tree,
510
self.other_tree,
511
generate_changeset, get_inventory,
512
self.conflict_handler,
513
merge_factory=self.merge_factory,
514
interesting_ids=self.interesting_ids)
515
516
adjust_ids = []
517
for id, path in inv_changes.iteritems():
518
if path is not None:
519
if path == '.':
520
path = ''
521
else:
522
assert path.startswith('.' + os.sep), "path is %s" % path
523
path = path[2:]
524
adjust_ids.append((path, id))
525
if len(adjust_ids) > 0:
526
self.this_branch.set_inventory(self.regen_inventory(adjust_ids))
527
conflicts = self.conflict_handler.conflicts
528
self.conflict_handler.finalize()
529
return conflicts
530
531
def regen_inventory(self, new_entries):
532
old_entries = self.this_branch.read_working_inventory()
533
new_inventory = {}
534
by_path = {}
535
new_entries_map = {}
536
for path, file_id in new_entries:
537
if path is None:
538
continue
539
new_entries_map[file_id] = path
540
541
def id2path(file_id):
542
path = new_entries_map.get(file_id)
543
if path is not None:
544
return path
545
entry = old_entries[file_id]
546
if entry.parent_id is None:
547
return entry.name
548
return os.path.join(id2path(entry.parent_id), entry.name)
549
550
for file_id in old_entries:
551
entry = old_entries[file_id]
552
path = id2path(file_id)
553
new_inventory[file_id] = (path, file_id, entry.parent_id,
554
entry.kind)
555
by_path[path] = file_id
280
base_revno, base_rev_id = this_branch.common_ancestor(other_branch)
281
base_branch, base_tree = get_tree((base_revision[0], "revid:%s" % base_rev_id), tempdir, "base")
282
else:
283
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
284
base_rev_id = base_branch.lookup_revision(base_revision[1])
285
if base_rev_id is not None:
286
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
287
MultipleRevisionSources(this_branch,
288
base_branch))
289
else:
290
base_is_ancestor = False
291
if file_list is None:
292
interesting_ids = None
293
else:
294
interesting_ids = set()
295
this_tree = this_branch.working_tree()
296
for fname in file_list:
297
path = this_branch.relpath(fname)
298
found_id = False
299
for tree in (this_tree, base_tree.tree, other_tree.tree):
300
file_id = tree.inventory.path2id(path)
301
if file_id is not None:
302
interesting_ids.add(file_id)
303
found_id = True
304
if not found_id:
305
raise BzrCommandError("%s is not a source file in any"
306
" tree." % fname)
307
merge_inner(this_branch, other_tree, base_tree, tempdir,
308
ignore_zero=ignore_zero, backup_files=backup_files,
309
merge_type=merge_type, interesting_ids=interesting_ids)
310
if base_is_ancestor and other_rev_id is not None:
311
this_branch.add_pending_merge(other_rev_id)
312
finally:
313
shutil.rmtree(tempdir)
314
315
316
def set_interesting(inventory_a, inventory_b, interesting_ids):
317
"""Mark files whose ids are in interesting_ids as interesting
318
"""
319
for inventory in (inventory_a, inventory_b):
320
for path, source_file in inventory.iteritems():
321
source_file.interesting = source_file.id in interesting_ids
322
323
324
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
325
"""Generate a changeset. If interesting_ids is supplied, only changes
326
to those files will be shown. Metadata changes are stripped.
327
"""
328
cset = generate_changeset(tree_a, tree_b, interesting_ids)
329
for entry in cset.entries.itervalues():
330
entry.metadata_change = None
331
return cset
332
333
334
def merge_inner(this_branch, other_tree, base_tree, tempdir,
335
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
336
interesting_ids=None):
337
338
def merge_factory(file_id, base, other):
339
contents_change = merge_type(file_id, base, other)
340
if backup_files:
341
contents_change = BackupBeforeChange(contents_change)
342
return contents_change
343
344
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
345
346
def get_inventory(tree):
347
return tree.tree.inventory
348
349
inv_changes = merge_flex(this_tree, base_tree, other_tree,
350
generate_cset_optimized, get_inventory,
351
MergeConflictHandler(base_tree.root,
352
ignore_zero=ignore_zero),
353
merge_factory=merge_factory,
354
interesting_ids=interesting_ids)
355
356
adjust_ids = []
357
for id, path in inv_changes.iteritems():
358
if path is not None:
359
if path == '.':
360
path = ''
361
else:
362
assert path.startswith('./'), "path is %s" % path
363
path = path[2:]
364
adjust_ids.append((path, id))
365
if len(adjust_ids) > 0:
366
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
367
adjust_ids))
368
369
370
def regen_inventory(this_branch, root, new_entries):
371
old_entries = this_branch.read_working_inventory()
372
new_inventory = {}
373
by_path = {}
374
new_entries_map = {}
375
for path, file_id in new_entries:
376
if path is None:
377
continue
378
new_entries_map[file_id] = path
379
380
def id2path(file_id):
381
path = new_entries_map.get(file_id)
382
if path is not None:
383
return path
384
entry = old_entries[file_id]
385
if entry.parent_id is None:
386
return entry.name
387
return os.path.join(id2path(entry.parent_id), entry.name)
556
388
557
deletions = 0
558
insertions = 0
559
new_path_list = []
560
for path, file_id in new_entries:
561
if path is None:
562
del new_inventory[file_id]
563
deletions += 1
564
else:
565
new_path_list.append((path, file_id))
566
if file_id not in old_entries:
567
insertions += 1
568
# Ensure no file is added before its parent
569
new_path_list.sort()
570
for path, file_id in new_path_list:
571
if path == '':
572
parent = None
573
else:
574
parent = by_path[os.path.dirname(path)]
575
abspath = os.path.join(self.this_tree.basedir, path)
576
kind = bzrlib.osutils.file_kind(abspath)
577
new_inventory[file_id] = (path, file_id, parent, kind)
578
by_path[path] = file_id
389
for file_id in old_entries:
390
entry = old_entries[file_id]
391
path = id2path(file_id)
392
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
393
by_path[path] = file_id
394
395
deletions = 0
396
insertions = 0
397
new_path_list = []
398
for path, file_id in new_entries:
399
if path is None:
400
del new_inventory[file_id]
401
deletions += 1
402
else:
403
new_path_list.append((path, file_id))
404
if file_id not in old_entries:
405
insertions += 1
406
# Ensure no file is added before its parent
407
new_path_list.sort()
408
for path, file_id in new_path_list:
409
if path == '':
410
parent = None
411
else:
412
parent = by_path[os.path.dirname(path)]
413
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
414
new_inventory[file_id] = (path, file_id, parent, kind)
415
by_path[path] = file_id
579
416
580
# Get a list in insertion order
581
new_inventory_list = new_inventory.values()
582
mutter ("""Inventory regeneration:
583
old length: %i insertions: %i deletions: %i new_length: %i"""\
584
% (len(old_entries), insertions, deletions,
585
len(new_inventory_list)))
586
assert len(new_inventory_list) == len(old_entries) + insertions\
587
- deletions
588
new_inventory_list.sort()
589
return new_inventory_list
417
# Get a list in insertion order
418
new_inventory_list = new_inventory.values()
419
mutter ("""Inventory regeneration:
420
old length: %i insertions: %i deletions: %i new_length: %i"""\
421
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
422
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
423
new_inventory_list.sort()
424
return new_inventory_list
590
425
591
426
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
592
"diff3": (Diff3Merge, "Merge using external diff3"),
593
'weave': (WeaveMerge, "Weave-based merge")
427
"diff3": (Diff3Merge, "Merge using external diff3")
594
428
}
595
429
Loggerhead is a web-based interface for Breezy
Version: 2.0.1