← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Aaron Bentley
  • Date: 2007-08-26 22:29:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2905.
  • Revision ID: aaron.bentley@utoronto.ca-20070826222928-xex3vixfmuto3ule
Misc cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
278
278
 
279
279
    def _reconcile_steps(self):
280
280
        """Perform the steps to reconcile this repository."""
281
 
        self._load_indexes()
282
281
        if self.thorough:
 
282
            self._load_indexes()
283
283
            self._gc_inventory()
284
 
        self._fix_text_parents()
 
284
            self._fix_text_parents()
285
285
 
286
286
    def _load_indexes(self):
287
287
        """Load indexes for the reconciliation."""
343
343
            mutter('Garbage inventory {%s} found.', revision_id)
344
344
 
345
345
    def _fix_text_parents(self):
 
346
        """Fix bad versionedfile parent entries.
 
347
 
 
348
        It is possible for the parents entrie in a versionedfile entry to be
 
349
        inconsistent with the values in the revision and inventory.
 
350
 
 
351
        This method finds entries with such inconsistencies, corrects their
 
352
        parent lists, and replaces the versionedfile with a corrected version.
 
353
        """
346
354
        transaction = self.repo.get_transaction()
347
355
        revision_parents = repository._RevisionParentsProvider(self.repo)
348
356
        revision_graph = graph.Graph(revision_parents)