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