← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-08-01 23:14:12 UTC
  • mfrom: (974.1.11)
  • Revision ID: mbp@sourcefrog.net-20050801231412-6a6278d24a7cbb0a
- merge aaron's revert and merge improvements

Show diffs side-by-side

added added

removed removed

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