← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 17:52:20 UTC
  • mto: This revision was merged to the branch mainline in revision 5801.
  • Revision ID: jelmer@samba.org-20110405175220-07pi4se33fhvore7
Avoid bzrlib.knit imports when using groupcompress repositories.

Add bzrlib.knit to the blacklist in test_import_tariff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
26
26
    errors,
27
27
    index as _mod_index,
28
28
    inventory,
29
 
    knit,
30
29
    osutils,
31
 
    pack,
 
30
    pack as _mod_pack,
32
31
    revision as _mod_revision,
33
32
    trace,
34
33
    ui,
154
153
        # expose this on self, for the occasion when clients want to add data.
155
154
        self._write_data = _write_data
156
155
        # a pack writer object to serialise pack records.
157
 
        self._writer = pack.ContainerWriter(self._write_data)
 
156
        self._writer = _mod_pack.ContainerWriter(self._write_data)
158
157
        self._writer.begin()
159
158
        # what state is the pack in? (open, finished, aborted)
160
159
        self._state = 'open'
354
353
        """Build a VersionedFiles instance on top of this group of packs."""
355
354
        index_name = index_name + '_index'
356
355
        index_to_pack = {}
357
 
        access = knit._DirectPackAccess(index_to_pack,
 
356
        access = _mod_pack._DirectPackAccess(index_to_pack,
358
357
                                        reload_func=self._reload_func)
359
358
        if for_write:
360
359
            # Use new_pack