/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: Aaron Bentley
  • Date: 2006-06-21 13:37:30 UTC
  • mfrom: (1799 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1802.
  • Revision ID: abentley@panoramicfeedback.com-20060621133730-6f6f965f4d2e3743
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
77
77
from bzrlib.errors import FileExists, NoSuchFile, KnitError, \
78
78
        InvalidRevisionId, KnitCorrupt, KnitHeaderError, \
79
79
        RevisionNotPresent, RevisionAlreadyPresent
80
 
from bzrlib.tuned_gzip import *
 
80
from bzrlib.tuned_gzip import GzipFile
81
81
from bzrlib.trace import mutter
82
82
from bzrlib.osutils import contains_whitespace, contains_linebreaks, \
83
83
     sha_strings
573
573
            records = []
574
574
            for comp_id in basis_versions:
575
575
                data_pos, data_size = basis._index.get_data_position(comp_id)
576
 
                records.append((piece_id, data_pos, data_size))
 
576
                records.append((comp_id, data_pos, data_size))
577
577
            components.update(basis._data.read_records(records))
578
578
 
579
579
        records = []
1069
1069
        # position in _history is the 'official' index for a revision
1070
1070
        # but the values may have come from a newer entry.
1071
1071
        # so - wc -l of a knit index is != the number of unique names
1072
 
        # in the weave.
 
1072
        # in the knit.
1073
1073
        self._history = []
1074
1074
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1075
1075
        try: