← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2007-10-05 00:44:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2905.
  • Revision ID: andrew.bennetts@canonical.com-20071005004453-01gpk6nnh4zelciv
Move check_parents out of VersionedFile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
368
368
            self.pb.update('Fixing text parents', num,
369
369
                           len(self.repo.weave_store))
370
370
            vf = self.repo.weave_store.get_weave(file_id, transaction)
371
 
            versions_with_bad_parents = vf.check_parents(
372
 
                self.revisions.versions(),
373
 
                revision_versions.get_text_version,
374
 
                file_id,
375
 
                revision_parents,
376
 
                self.repo.get_graph(),
377
 
                self.repo.get_inventory)
 
371
            vf_checker = self.repo.get_versioned_file_checker(
 
372
                self.revisions.versions(), revision_versions)
 
373
            versions_with_bad_parents = vf_checker.check_file_version_parents(
 
374
                vf, file_id, revision_parents)
378
375
            if len(versions_with_bad_parents) == 0:
379
376
                continue
380
377
            new_vf = self.repo.weave_store.get_empty('temp:%s' % file_id,