« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- browse files at revision 1185.14.7
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.14.7
- Committer: Aaron Bentley
- Date: 2005-10-04 04:32:32 UTC
- mfrom: (1185.12.6)
- mto: (1185.12.13)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: aaron.bentley@utoronto.ca-20051004043231-40302a149769263b
merged my own changes
- files removed:
- INSTALL
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files renamed:
- bzrlib/conflicts.py => bzrlib/plugins/conflicts.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- files modified:
- .rsyncexclude
- bzr *
- setup.py *
added
removed
bzrlib/merge.py
23
23
import bzrlib.osutils
24
24
import bzrlib.revision
25
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
from bzrlib.merge_core import WeaveMerge
27
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
27
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
29
28
from bzrlib.branch import Branch
30
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
31
from bzrlib.errors import NoCommits, WorkingTreeNotRevision, NotBranchError
30
from bzrlib.errors import NoCommits
32
31
from bzrlib.delta import compare_trees
33
from bzrlib.trace import mutter, warning, note
32
from bzrlib.trace import mutter, warning
34
33
from bzrlib.fetch import greedy_fetch, fetch
35
from bzrlib.revision import is_ancestor, NULL_REVISION
34
from bzrlib.revision import is_ancestor
36
35
from bzrlib.osutils import rename
37
36
from bzrlib.revision import common_ancestor, MultipleRevisionSources
38
37
from bzrlib.errors import NoSuchRevision
39
38
40
# TODO: Report back as changes are merged in
41
42
39
# TODO: build_working_dir can be built on something simpler than merge()
43
40
44
41
# 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.
47
42
48
43
# comments from abentley on irc: merge happens in two stages, each
49
44
# of which generates a changeset object
86
81
for line in lines:
87
82
d_file.write(line)
88
83
89
def add_suffix(self, name, suffix, last_new_name=None, fix_inventory=True):
84
def add_suffix(self, name, suffix, last_new_name=None):
90
85
"""Rename a file to append a suffix. If the new name exists, the
91
86
suffix is added repeatedly until a non-existant name is found
92
87
99
94
new_name = last_new_name+suffix
100
95
try:
101
96
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
97
return new_name
116
98
except OSError, e:
117
99
if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
118
100
raise
119
return self.add_suffix(name, suffix, last_new_name=new_name,
120
fix_inventory=fix_inventory)
121
return new_name
101
return self.add_suffix(name, suffix, last_new_name=new_name)
122
102
123
103
def conflict(self, text):
124
104
warning(text)
134
114
:param base_path: Path to the file text for the BASE tree
135
115
:param other_path: Path to the file text for the OTHER tree
136
116
"""
137
self.add_suffix(this_path, ".THIS", fix_inventory=False)
117
self.add_suffix(this_path, ".THIS")
138
118
self.dump(base_lines, this_path+".BASE")
139
119
self.dump(other_lines, this_path+".OTHER")
140
120
rename(new_file, this_path)
141
121
self.conflict("Diff3 conflict encountered in %s" % this_path)
142
122
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
123
def new_contents_conflict(self, filename, other_contents):
154
124
"""Conflicting contents for newly added file."""
155
other_contents(filename + ".OTHER", self, False)
125
self.copy(other_contents, filename + ".OTHER")
156
126
self.conflict("Conflict in newly added file %s" % filename)
157
127
158
128
170
140
def rem_contents_conflict(self, filename, this_contents, base_contents):
171
141
base_contents(filename+".BASE", self, False)
172
142
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
143
self.conflict("Other branch deleted locally modified file %s" %
179
144
filename)
180
145
return ReplaceContents(this_contents, None)
181
146
182
147
def abs_this_path(self, file_id):
183
148
"""Return the absolute path for a file_id in the this tree."""
184
return self.this_tree.id2abspath(file_id)
149
relpath = self.this_tree.id2path(file_id)
150
return self.this_tree.tree.abspath(relpath)
185
151
186
152
def add_missing_parents(self, file_id, tree):
187
153
"""If some of the parents for file_id are missing, add them."""
188
entry = tree.inventory[file_id]
154
entry = tree.tree.inventory[file_id]
189
155
if entry.parent_id not in self.this_tree:
190
156
return self.create_all_missing(entry.parent_id, tree)
191
157
else:
193
159
194
160
def create_all_missing(self, file_id, tree):
195
161
"""Add contents for a file_id and all its parents to a tree."""
196
entry = tree.inventory[file_id]
162
entry = tree.tree.inventory[file_id]
197
163
if entry.parent_id is not None and entry.parent_id not in self.this_tree:
198
164
abspath = self.create_all_missing(entry.parent_id, tree)
199
165
else:
205
171
206
172
def create(self, file_id, path, tree, reverse=False):
207
173
"""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)
174
from merge_core import get_id_contents
175
get_id_contents(file_id, tree)(path, self, reverse)
210
176
211
177
def missing_for_merge(self, file_id, other_path):
212
178
"""The file_id doesn't exist in THIS, but does in OTHER and BASE"""
217
183
self.create(file_id, stem+".OTHER", self.other_tree)
218
184
self.create(file_id, stem+".BASE", self.base_tree)
219
185
220
def threeway_contents_conflict(filename, this_contents, base_contents,
221
other_contents):
222
self.conflict("Three-way conflict merging %s" % filename)
223
224
186
def finalize(self):
225
187
if not self.ignore_zero:
226
note("%d conflicts encountered.\n" % self.conflicts)
188
print "%d conflicts encountered.\n" % self.conflicts
227
189
228
def get_tree(treespec, local_branch=None):
190
def get_tree(treespec, temp_root, label, local_branch=None):
229
191
location, revno = treespec
230
branch = Branch.open_containing(location)[0]
192
branch = Branch.open_containing(location)
231
193
if revno is None:
232
194
revision = None
233
195
elif revno == -1:
234
196
revision = branch.last_revision()
235
197
else:
236
198
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)
199
return branch, get_revid_tree(branch, revision, temp_root, label,
200
local_branch)
240
201
241
def get_revid_tree(branch, revision, local_branch):
202
def get_revid_tree(branch, revision, temp_root, label, local_branch):
242
203
if revision is None:
243
204
base_tree = branch.working_tree()
244
205
else:
247
208
base_tree = local_branch.revision_tree(revision)
248
209
else:
249
210
base_tree = branch.revision_tree(revision)
250
return base_tree
211
temp_path = os.path.join(temp_root, label)
212
os.mkdir(temp_path)
213
return MergeTree(base_tree, temp_path)
251
214
252
215
253
216
def file_exists(tree, file_id):
254
217
return tree.has_filename(tree.id2path(file_id))
255
218
256
219
220
class MergeTree(object):
221
def __init__(self, tree, tempdir):
222
object.__init__(self)
223
if hasattr(tree, "basedir"):
224
self.root = tree.basedir
225
else:
226
self.root = None
227
self.tree = tree
228
self.tempdir = tempdir
229
os.mkdir(os.path.join(self.tempdir, "texts"))
230
os.mkdir(os.path.join(self.tempdir, "symlinks"))
231
self.cached = {}
232
233
def __iter__(self):
234
return self.tree.__iter__()
235
236
def __contains__(self, file_id):
237
return file_id in self.tree
238
239
def get_file(self, file_id):
240
return self.tree.get_file(file_id)
241
242
def get_file_sha1(self, id):
243
return self.tree.get_file_sha1(id)
244
245
def is_executable(self, id):
246
return self.tree.is_executable(id)
247
248
def id2path(self, file_id):
249
return self.tree.id2path(file_id)
250
251
def has_id(self, file_id):
252
return self.tree.has_id(file_id)
253
254
def has_or_had_id(self, file_id):
255
if file_id == self.tree.inventory.root.file_id:
256
return True
257
return self.tree.inventory.has_id(file_id)
258
259
def has_or_had_id(self, file_id):
260
if file_id == self.tree.inventory.root.file_id:
261
return True
262
return self.tree.inventory.has_id(file_id)
263
264
def readonly_path(self, id):
265
if id not in self.tree:
266
return None
267
if self.root is not None:
268
return self.tree.abspath(self.tree.id2path(id))
269
else:
270
kind = self.tree.inventory[id].kind
271
if kind in ("directory", "root_directory"):
272
return self.tempdir
273
if not self.cached.has_key(id):
274
if kind == "file":
275
path = os.path.join(self.tempdir, "texts", id)
276
outfile = file(path, "wb")
277
outfile.write(self.tree.get_file(id).read())
278
assert(bzrlib.osutils.lexists(path))
279
if self.tree.is_executable(id):
280
os.chmod(path, 0755)
281
else:
282
assert kind == "symlink"
283
path = os.path.join(self.tempdir, "symlinks", id)
284
target = self.tree.get_symlink_target(id)
285
os.symlink(target, path)
286
self.cached[id] = path
287
return self.cached[id]
288
289
257
290
def build_working_dir(to_dir):
258
291
"""Build a working directory in an empty directory.
259
292
264
297
eventually be done by just building the tree directly calling into
265
298
lower-level code (e.g. constructing a changeset).
266
299
"""
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())
300
merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
301
check_clean=False, ignore_zero=True)
271
302
272
def transform_tree(from_tree, to_tree):
273
merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True)
274
303
275
304
def merge(other_revision, base_revision,
276
305
check_clean=True, ignore_zero=False,
277
306
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
278
file_list=None, show_base=False, reprocess=False):
307
file_list=None):
279
308
"""Merge changes into a tree.
280
309
281
310
base_revision
282
list(path, revno) Base for three-way merge.
283
If [None, None] then a base will be automatically determined.
311
tuple(path, revision) Base for three-way merge.
284
312
other_revision
285
list(path, revno) Other revision for three-way merge.
313
tuple(path, revision) Other revision for three-way merge.
286
314
this_dir
287
315
Directory to merge changes into; '.' by default.
288
316
check_clean
291
319
ignore_zero - If true, suppress the "zero conflicts" message when
292
320
there are no conflicts; should be set when doing something we expect
293
321
to complete perfectly.
294
file_list - If supplied, merge only changes to selected files.
295
322
296
323
All available ancestors of other_revision and base_revision are
297
324
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
325
"""
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:
326
tempdir = tempfile.mkdtemp(prefix="bzr-")
327
try:
328
if this_dir is None:
329
this_dir = '.'
330
this_branch = Branch.open_containing(this_dir)
331
this_rev_id = this_branch.last_revision()
332
if this_rev_id is None:
421
333
raise BzrCommandError("This branch has no commits")
422
334
if check_clean:
423
self.compare_basis()
424
if self.this_basis != self.this_rev_id:
335
changes = compare_trees(this_branch.working_tree(),
336
this_branch.basis_tree(), False)
337
if changes.has_changed():
425
338
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)
339
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
340
this_branch)
464
341
if other_revision[1] == -1:
465
self.other_rev_id = other_branch.last_revision()
466
if self.other_rev_id is None:
342
other_rev_id = other_branch.last_revision()
343
if other_rev_id is None:
467
344
raise NoCommits(other_branch)
468
self.other_basis = self.other_rev_id
345
other_basis = other_rev_id
469
346
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
347
other_rev_id = other_branch.get_rev_id(other_revision[1])
348
other_basis = other_rev_id
472
349
else:
473
self.other_rev_id = None
474
self.other_basis = other_branch.last_revision()
475
if self.other_basis is None:
350
other_rev_id = None
351
other_basis = other_branch.last_revision()
352
if other_basis is None:
476
353
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")
482
354
if base_revision == [None, None]:
483
355
try:
484
self.base_rev_id = common_ancestor(self.this_basis,
485
self.other_basis,
486
self.this_branch)
356
base_rev_id = common_ancestor(this_rev_id, other_basis,
357
this_branch)
487
358
except NoCommonAncestor:
488
359
raise UnrelatedBranches()
489
self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,
490
None)
491
self.base_is_ancestor = True
360
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
361
"base", None)
362
base_is_ancestor = True
492
363
else:
493
base_branch, self.base_tree = get_tree(base_revision)
364
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
494
365
if base_revision[1] == -1:
495
self.base_rev_id = base_branch.last_revision()
366
base_rev_id = base_branch.last_revision()
496
367
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
368
base_rev_id = None
369
else:
370
base_rev_id = base_branch.get_rev_id(base_revision[1])
371
fetch(from_branch=base_branch, to_branch=this_branch)
372
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
373
this_branch)
374
if file_list is None:
375
interesting_ids = None
376
else:
377
interesting_ids = set()
378
this_tree = this_branch.working_tree()
379
for fname in file_list:
380
path = this_branch.relpath(fname)
381
found_id = False
382
for tree in (this_tree, base_tree.tree, other_tree.tree):
383
file_id = tree.inventory.path2id(path)
384
if file_id is not None:
385
interesting_ids.add(file_id)
386
found_id = True
387
if not found_id:
388
raise BzrCommandError("%s is not a source file in any"
389
" tree." % fname)
390
merge_inner(this_branch, other_tree, base_tree, tempdir,
391
ignore_zero=ignore_zero, backup_files=backup_files,
392
merge_type=merge_type, interesting_ids=interesting_ids)
393
if base_is_ancestor and other_rev_id is not None\
394
and other_rev_id not in this_branch.revision_history():
395
this_branch.add_pending_merge(other_rev_id)
396
finally:
397
shutil.rmtree(tempdir)
398
399
400
def set_interesting(inventory_a, inventory_b, interesting_ids):
401
"""Mark files whose ids are in interesting_ids as interesting
402
"""
403
for inventory in (inventory_a, inventory_b):
404
for path, source_file in inventory.iteritems():
405
source_file.interesting = source_file.id in interesting_ids
406
407
408
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
409
"""Generate a changeset. If interesting_ids is supplied, only changes
410
to those files will be shown. Metadata changes are stripped.
411
"""
412
cset = generate_changeset(tree_a, tree_b, interesting_ids)
413
for entry in cset.entries.itervalues():
414
entry.metadata_change = None
415
return cset
416
417
418
def merge_inner(this_branch, other_tree, base_tree, tempdir,
419
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
420
interesting_ids=None):
421
422
def merge_factory(file_id, base, other):
423
contents_change = merge_type(file_id, base, other)
424
if backup_files:
425
contents_change = BackupBeforeChange(contents_change)
426
return contents_change
427
428
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
429
430
def get_inventory(tree):
431
return tree.tree.inventory
432
433
inv_changes = merge_flex(this_tree, base_tree, other_tree,
434
generate_cset_optimized, get_inventory,
435
MergeConflictHandler(this_tree, base_tree,
436
other_tree, ignore_zero=ignore_zero),
437
merge_factory=merge_factory,
438
interesting_ids=interesting_ids)
439
440
adjust_ids = []
441
for id, path in inv_changes.iteritems():
442
if path is not None:
443
if path == '.':
444
path = ''
445
else:
446
assert path.startswith('.' + os.sep), "path is %s" % path
447
path = path[2:]
448
adjust_ids.append((path, id))
449
if len(adjust_ids) > 0:
450
this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
451
adjust_ids))
452
453
454
def regen_inventory(this_branch, root, new_entries):
455
old_entries = this_branch.read_working_inventory()
456
new_inventory = {}
457
by_path = {}
458
new_entries_map = {}
459
for path, file_id in new_entries:
460
if path is None:
461
continue
462
new_entries_map[file_id] = path
463
464
def id2path(file_id):
465
path = new_entries_map.get(file_id)
466
if path is not None:
467
return path
468
entry = old_entries[file_id]
469
if entry.parent_id is None:
470
return entry.name
471
return os.path.join(id2path(entry.parent_id), entry.name)
556
472
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
473
for file_id in old_entries:
474
entry = old_entries[file_id]
475
path = id2path(file_id)
476
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
477
by_path[path] = file_id
478
479
deletions = 0
480
insertions = 0
481
new_path_list = []
482
for path, file_id in new_entries:
483
if path is None:
484
del new_inventory[file_id]
485
deletions += 1
486
else:
487
new_path_list.append((path, file_id))
488
if file_id not in old_entries:
489
insertions += 1
490
# Ensure no file is added before its parent
491
new_path_list.sort()
492
for path, file_id in new_path_list:
493
if path == '':
494
parent = None
495
else:
496
parent = by_path[os.path.dirname(path)]
497
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
498
new_inventory[file_id] = (path, file_id, parent, kind)
499
by_path[path] = file_id
579
500
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
501
# Get a list in insertion order
502
new_inventory_list = new_inventory.values()
503
mutter ("""Inventory regeneration:
504
old length: %i insertions: %i deletions: %i new_length: %i"""\
505
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
506
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
507
new_inventory_list.sort()
508
return new_inventory_list
590
509
591
510
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
592
"diff3": (Diff3Merge, "Merge using external diff3"),
593
'weave': (WeaveMerge, "Weave-based merge")
511
"diff3": (Diff3Merge, "Merge using external diff3")
594
512
}
595
513
Loggerhead is a web-based interface for Breezy
Version: 2.0.1