← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2006-03-02 10:51:24 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302105124-675e0bed0d749b43
get knit repositories really using knits for text storage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
639
639
        """
640
640
        return self._sha1s[self._lookup(name)]
641
641
 
 
642
    @deprecated_method(zero_eight)
642
643
    def numversions(self):
 
644
        """How many versions are in this weave?
 
645
 
 
646
        Deprecated in favour of num_versions.
 
647
        """
 
648
        return self.num_versions()
 
649
 
 
650
    def num_versions(self):
 
651
        """How many versions are in this weave?"""
643
652
        l = len(self._parents)
644
653
        assert l == len(self._sha1s)
645
654
        return l
646
655
 
647
 
    __len__ = numversions
 
656
    __len__ = num_versions
648
657
 
649
658
    def check(self, progress_bar=None):
650
659
        # TODO evaluate performance hit of using string sets in this routine.
651
660
        # check no circular inclusions
652
 
        for version in range(self.numversions()):
 
661
        for version in range(self.num_versions()):
653
662
            inclusions = list(self._parents[version])
654
663
            if inclusions:
655
664
                inclusions.sort()
658
667
                                           % (inclusions[-1], version))
659
668
 
660
669
        # try extracting all versions; parallel extraction is used
661
 
        nv = self.numversions()
 
670
        nv = self.num_versions()
662
671
        sha1s = {}
663
672
        texts = {}
664
673
        inclusions = {}
894
903
    """
895
904
    wr = Weave()
896
905
    ia = ib = 0
897
 
    queue_a = range(wa.numversions())
898
 
    queue_b = range(wb.numversions())
 
906
    queue_a = range(wa.num_versions())
 
907
    queue_b = range(wb.num_versions())
899
908
    # first determine combined parents of all versions
900
909
    # map from version name -> all parent names
901
910
    combined_parents = _reweave_parent_graphs(wa, wb)
944
953
    for i in (6, 50, 10, 10):
945
954
        print '-' * i,
946
955
    print
947
 
    for i in range(w.numversions()):
 
956
    for i in range(w.num_versions()):
948
957
        sha1 = w._sha1s[i]
949
958
        name = w._names[i]
950
959
        parent_str = ' '.join(map(str, w._parents[i]))
1112
1121
        pb = ProgressBar()
1113
1122
        w.check(pb)
1114
1123
        pb.clear()
1115
 
        print '%d versions ok' % w.numversions()
 
1124
        print '%d versions ok' % w.num_versions()
1116
1125
 
1117
1126
    elif cmd == 'inclusions':
1118
1127
        w = readit()