/brz/remove-bazaar

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

  • Committer: Aaron Bentley
  • Date: 2005-07-27 16:44:44 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050727164443-b5aa44851803207b
Added unit tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
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
3
from changeset import Inventory, Diff3Merge
 
4
from merge_core import ApplyMerge3
4
5
from bzrlib import find_branch
5
6
import bzrlib.osutils
6
7
from bzrlib.errors import BzrCommandError
7
 
from bzrlib.delta import compare_trees
 
8
from bzrlib.diff import compare_trees
8
9
from trace import mutter, warning
9
10
import os.path
10
11
import tempfile
165
166
 
166
167
def merge(other_revision, base_revision,
167
168
          check_clean=True, ignore_zero=False,
168
 
          this_dir=None, backup_files=False, merge_type=ApplyMerge3,
169
 
          file_list=None):
 
169
          this_dir=None):
170
170
    """Merge changes into a tree.
171
171
 
172
172
    base_revision
201
201
                raise UnrelatedBranches()
202
202
            base_revision = ['.', base_revno]
203
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
204
        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)
 
205
                    ignore_zero=ignore_zero)
223
206
    finally:
224
207
        shutil.rmtree(tempdir)
225
208
 
226
209
 
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
 
    """
 
210
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
 
211
    """Generate a changeset, using the text_id to mark really-changed files.
 
212
    This permits blazing comparisons when text_ids are present.  It also
 
213
    disables metadata comparison for files with identical texts.
 
214
    """ 
238
215
    for file_id in tree_a.tree.inventory:
239
216
        if file_id not in tree_b.tree.inventory:
240
217
            continue
248
225
            continue
249
226
        inventory_a[abspath(tree_a.tree, file_id)].interesting = False
250
227
        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
228
    cset =  generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
265
229
    for entry in cset.entries.itervalues():
266
230
        entry.metadata_change = None
268
232
 
269
233
 
270
234
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
271
 
                ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
272
 
                interesting_ids=None):
 
235
                ignore_zero=False, merge_type="diff3"):
 
236
    merge_types = {"merge3": ApplyMerge3, 
 
237
                   "diff3": Diff3Merge}
273
238
 
274
239
    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)
 
240
        return merge_types[merge_type](base_file, other_file)
283
241
 
284
242
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
285
243
 
287
245
        return tree.inventory
288
246
 
289
247
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
290
 
                             generate_cset, get_inventory,
 
248
                             generate_cset_optimized, get_inventory,
291
249
                             MergeConflictHandler(base_tree.root,
292
250
                                                  ignore_zero=ignore_zero),
293
251
                             merge_factory=merge_factory)
344
302
    assert len(new_inventory_list) == len(old_entries) + insertions - deletions
345
303
    new_inventory_list.sort()
346
304
    return new_inventory_list
347
 
 
348
 
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
349
 
                     "diff3": (Diff3Merge,  "Merge using external diff3")
350
 
              }
351