/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/knit.py

  • Committer: John Arbash Meinel
  • Date: 2006-11-24 18:54:27 UTC
  • mto: This revision was merged to the branch mainline in revision 2150.
  • Revision ID: john@arbash-meinel.com-20061124185427-w22ez7zgqp143ikf
In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
840
840
                data_pos, length = self._index.get_position(version_id)
841
841
                version_id_records.append((version_id, data_pos, length))
842
842
 
843
 
        count = 0
844
843
        total = len(version_id_records)
845
 
        pb.update('Walking content.', count, total)
846
 
        for version_id, data, sha_value in \
847
 
            self._data.read_records_iter(version_id_records):
848
 
            pb.update('Walking content.', count, total)
 
844
        for version_idx, (version_id, data, sha_value) in \
 
845
            enumerate(self._data.read_records_iter(version_id_records)):
 
846
            pb.update('Walking content.', version_idx, total)
849
847
            method = self._index.get_method(version_id)
850
848
            version_idx = self._index.lookup(version_id)
851
849
            assert method in ('fulltext', 'line-delta')
858
856
                for start, end, count, lines in delta:
859
857
                    for origin, line in lines:
860
858
                        yield line
861
 
            count +=1
862
859
        pb.update('Walking content.', total, total)
863
860
        
864
861
    def num_versions(self):