1
from merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
1
from merge_core import merge_flex
2
2
from changeset import generate_changeset, ExceptionConflictHandler
3
from changeset import Inventory, Diff3Merge
3
from changeset import Inventory
4
4
from bzrlib import find_branch
5
5
import bzrlib.osutils
6
6
from bzrlib.errors import BzrCommandError
7
from bzrlib.delta import compare_trees
7
from bzrlib.diff import compare_trees
8
8
from trace import mutter, warning
80
80
moved_path = self.add_suffix(target, ".moved")
81
81
self.conflict("Moved existing %s to %s" % (target, moved_path))
83
def rmdir_non_empty(self, filename):
84
"""Handle the case where the dir to be removed still has contents"""
85
self.conflict("Directory %s not removed because it is not empty"\
89
83
def finalize(self):
90
84
if not self.ignore_zero:
91
85
print "%d conflicts encountered.\n" % self.conflicts
127
121
def inventory_map(tree):
129
123
for file_id in tree.inventory:
124
if not file_exists(tree, file_id):
130
126
path = abspath(tree, file_id)
131
127
inventory[path] = SourceFile(path, file_id)
161
155
self.cached[id] = path
162
156
return self.cached[id]
166
def merge(other_revision, base_revision,
167
check_clean=True, ignore_zero=False,
168
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
170
"""Merge changes into a tree.
173
Base for three-way merge.
175
Other revision for three-way merge.
177
Directory to merge changes into; '.' by default.
179
If true, this_dir must have no uncommitted changes before the
158
def merge(other_revision, base_revision, no_changes=True, ignore_zero=False):
182
159
tempdir = tempfile.mkdtemp(prefix="bzr-")
186
this_branch = find_branch(this_dir)
161
this_branch = find_branch('.')
188
163
changes = compare_trees(this_branch.working_tree(),
189
164
this_branch.basis_tree(), False)
190
165
if changes.has_changed():
201
176
raise UnrelatedBranches()
202
177
base_revision = ['.', base_revno]
203
178
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
204
if file_list is None:
205
interesting_ids = None
207
interesting_ids = set()
208
this_tree = this_branch.working_tree()
209
for fname in file_list:
210
path = this_branch.relpath(fname)
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)
218
raise BzrCommandError("%s is not a source file in any"
220
179
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)
180
ignore_zero=ignore_zero)
224
182
shutil.rmtree(tempdir)
227
def set_interesting(inventory_a, inventory_b, interesting_ids):
228
"""Mark files whose ids are in interesting_ids as interesting
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
235
def set_optimized(tree_a, tree_b, inventory_a, inventory_b):
236
"""Mark files that have changed texts as interesting
185
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
186
"""Generate a changeset, using the text_id to mark really-changed files.
187
This permits blazing comparisons when text_ids are present. It also
188
disables metadata comparison for files with identical texts.
238
190
for file_id in tree_a.tree.inventory:
239
191
if file_id not in tree_b.tree.inventory:
249
201
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
250
202
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
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.
260
if interesting_ids is None:
261
set_optimized(tree_a, tree_b, inventory_a, inventory_b)
263
set_interesting(inventory_a, inventory_b, interesting_ids)
264
203
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
265
204
for entry in cset.entries.itervalues():
266
205
entry.metadata_change = None
270
209
def merge_inner(this_branch, other_tree, base_tree, tempdir,
271
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
272
interesting_ids=None):
274
def merge_factory(base_file, other_file):
275
contents_change = merge_type(base_file, other_file)
277
contents_change = BackupBeforeChange(contents_change)
278
return contents_change
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,
284
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
211
this_tree = get_tree(('.', None), tempdir, "this")[1]
286
213
def get_inventory(tree):
287
214
return tree.inventory
289
216
inv_changes = merge_flex(this_tree, base_tree, other_tree,
290
generate_cset, get_inventory,
217
generate_cset_optimized, get_inventory,
291
218
MergeConflictHandler(base_tree.root,
292
ignore_zero=ignore_zero),
293
merge_factory=merge_factory)
219
ignore_zero=ignore_zero))
296
222
for id, path in inv_changes.iteritems():
344
270
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
345
271
new_inventory_list.sort()
346
272
return new_inventory_list
348
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
349
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
