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