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