/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2007-10-26 06:58:43 UTC
  • mto: This revision was merged to the branch mainline in revision 2945.
  • Revision ID: andrew.bennetts@canonical.com-20071026065843-zof5jrpbfic8cmxl
Tweaks suggested by review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2725
2725
        It also detects file versions that are not referenced by their
2726
2726
        corresponding revision's inventory.
2727
2727
 
2728
 
        :returns: A tuple of (wrong_parents, dangling_file_version).
 
2728
        :returns: A tuple of (wrong_parents, dangling_file_versions).
2729
2729
            wrong_parents is a dict mapping {revision_id: (stored_parents,
2730
2730
            correct_parents)} for each revision_id where the stored parents
2731
 
            are not correct.  dangling_file_version is a set of revision_ids
2732
 
            for versions that are present in this versioned file, but not used
2733
 
            by the corresponding inventory.
 
2731
            are not correct.  dangling_file_versions is a set of (file_id,
 
2732
            revision_id) tuples for versions that are present in this versioned
 
2733
            file, but not used by the corresponding inventory.
2734
2734
        """
2735
2735
        wrong_parents = {}
2736
 
        dangling_file_version = set()
 
2736
        dangling_file_versions = set()
2737
2737
        for num, revision_id in enumerate(self.planned_revisions):
2738
2738
            correct_parents = self.calculate_file_version_parents(
2739
2739
                revision_id, file_id)
2748
2748
            if text_revision != revision_id:
2749
2749
                # This file version is not referenced by its corresponding
2750
2750
                # inventory!
2751
 
                dangling_file_version.add((file_id, revision_id))
 
2751
                dangling_file_versions.add((file_id, revision_id))
2752
2752
            if correct_parents != knit_parents:
2753
2753
                wrong_parents[revision_id] = (knit_parents, correct_parents)
2754
 
        return wrong_parents, dangling_file_version
 
2754
        return wrong_parents, dangling_file_versions