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