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