← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_fileid_involved.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_fileid_involved.py
19
19
 
20
20
from bzrlib import (
21
21
    errors,
 
22
    inventory,
22
23
    remote,
23
24
    revision as _mod_revision,
24
25
    tests,
213
214
 
214
215
        if len(history) < 2: return
215
216
 
 
217
        graph = self.branch.repository.get_graph()
216
218
        for start in range(0,len(history)-1):
217
219
            start_id = history[start]
218
220
            for end in range(start+1,len(history)):
219
221
                end_id = history[end]
220
 
                old_revs = set(self.branch.repository.get_ancestry(start_id))
221
 
                new_revs = set(self.branch.repository.get_ancestry(end_id))
 
222
                unique_revs = graph.find_unique_ancestors(end_id, [start_id])
222
223
                l1 = self.branch.repository.fileids_altered_by_revision_ids(
223
 
                    new_revs.difference(old_revs))
 
224
                    unique_revs)
224
225
                l1 = set(l1.keys())
225
 
 
226
226
                l2 = self.compare_tree_fileids(self.branch, start_id, end_id)
227
227
                self.assertEquals(l1, l2)
228
228
 
304
304
        history = self.branch.revision_history()
305
305
        old_rev = history[0]
306
306
        new_rev = history[1]
307
 
        old_revs = set(self.branch.repository.get_ancestry(old_rev))
308
 
        new_revs = set(self.branch.repository.get_ancestry(new_rev))
 
307
        graph = self.branch.repository.get_graph()
 
308
        unique_revs = graph.find_unique_ancestors(new_rev, [old_rev])
309
309
 
310
310
        l1 = self.branch.repository.fileids_altered_by_revision_ids(
311
 
            new_revs.difference(old_revs))
 
311
            unique_revs)
312
312
        l1 = set(l1.keys())
313
313
 
314
314
        l2 = self.compare_tree_fileids(self.branch, old_rev, new_rev)
325
325
            ('add', ('a', 'a-file-id', 'file', 'some content\n'))])
326
326
        b = builder.get_branch()
327
327
        old_rt = b.repository.revision_tree('A-id')
328
 
        new_inv = old_rt.inventory._get_mutable_inventory()
 
328
        new_inv = inventory.mutable_inventory_from_tree(old_rt)
329
329
        new_inv.revision_id = 'B-id'
330
330
        new_inv['a-file-id'].revision = 'ghost-id'
331
331
        new_rev = _mod_revision.Revision('B-id',