← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-30 05:08:02 UTC
  • mfrom: (2951.2.10 reconcile.packs)
  • mto: This revision was merged to the branch mainline in revision 3063.
  • Revision ID: john@arbash-meinel.com-20071130050802-aqswmc0a7sv7hal9
merge Robert's reconcile work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
379
379
        versions = self.revisions.versions()
380
380
        mutter('Prepopulating revision text cache with %d revisions',
381
381
                len(versions))
382
 
        vf_checker = self.repo.get_versioned_file_checker()
 
382
        vf_checker = self.repo._get_versioned_file_checker()
383
383
        # List all weaves before altering, to avoid race conditions when we
384
384
        # delete unused weaves.
385
385
        weaves = list(enumerate(self.repo.weave_store))
388
388
                           len(self.repo.weave_store))
389
389
            vf = self.repo.weave_store.get_weave(file_id, transaction)
390
390
            versions_with_bad_parents, unused_versions = \
391
 
                vf_checker.check_file_version_parents(vf, file_id,
392
 
                vf.versions())
 
391
                vf_checker.check_file_version_parents(vf, file_id)
393
392
            if (len(versions_with_bad_parents) == 0 and
394
393
                len(unused_versions) == 0):
395
394
                continue