← Back to branch summary

~lifeless/bzr/index.range_map

« back to all changes in this revision

Viewing changes to bzrlib/tests/repository_implementations/test_check_reconcile.py

  • Committer: Robert Collins
  • Date: 2008-06-19 01:17:19 UTC
  • mfrom: (3218.1.277 +trunk)
  • Revision ID: robertc@robertcollins.net-20080619011719-1c4g4uxzzhdls2wf
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_check_reconcile.py
114
114
                    "Format does not support text parent reconciliation")
115
115
 
116
116
    def file_parents(self, repo, revision_id):
117
 
        return tuple(repo.weave_store.get_weave('a-file-id',
118
 
            repo.get_transaction()).get_parents(revision_id))
 
117
        return repo.weave_store.get_weave('a-file-id',
 
118
            repo.get_transaction()).get_parent_map([revision_id])[revision_id]
119
119
 
120
120
    def assertFileVersionAbsent(self, repo, revision_id):
121
121
        self.assertFalse(repo.weave_store.get_weave('a-file-id',
153
153
        :returns: A dict of `{version: hash}`.
154
154
        """
155
155
        vf = repo.weave_store.get_weave('a-file-id', repo.get_transaction())
156
 
        return dict((v, vf.get_sha1(v)) for v in versions)
 
156
        return dict(zip(versions, vf.get_sha1s(versions)))
157
157
 
158
158
    def test_reconcile_behaviour(self):
159
159
        """Populate a repository and reconcile it, verifying the state before