← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-08-10 15:05:26 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: abentley@panoramicfeedback.com-20050810150526-468a7e2e3dc299e4
Switched to using a set of interesting file_ids instead of SourceFile attribute

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
96
96
        self.id = id
97
97
        self.present = present
98
98
        self.isdir = isdir
99
 
        self.interesting = True
100
99
 
101
100
    def __repr__(self):
102
101
        return "SourceFile(%s, %s)" % (self.path, self.id)
243
242
    """Generate a changeset.  If interesting_ids is supplied, only changes
244
243
    to those files will be shown.  Metadata changes are stripped.
245
244
    """ 
246
 
    if interesting_ids is not None:
247
 
        set_interesting(inventory_a, inventory_b, interesting_ids)
248
 
    cset =  generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
 
245
    cset =  generate_changeset(tree_a, tree_b, inventory_a, inventory_b, 
 
246
                               interesting_ids)
249
247
    for entry in cset.entries.itervalues():
250
248
        entry.metadata_change = None
251
249
    return cset
260
258
        if backup_files:
261
259
            contents_change = BackupBeforeChange(contents_change)
262
260
        return contents_change
263
 
    
264
 
    def generate_cset(tree_a, tree_b, inventory_a, inventory_b):
265
 
        return generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
266
 
                                       interesting_ids)
267
261
 
268
262
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
269
263
 
271
265
        return tree.inventory
272
266
 
273
267
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
274
 
                             generate_cset, get_inventory,
 
268
                             generate_cset_optimized, get_inventory,
275
269
                             MergeConflictHandler(base_tree.root,
276
270
                                                  ignore_zero=ignore_zero),
277
 
                             merge_factory=merge_factory)
 
271
                             merge_factory=merge_factory, 
 
272
                             interesting_ids=interesting_ids)
278
273
 
279
274
    adjust_ids = []
280
275
    for id, path in inv_changes.iteritems():