← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitpack_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitpack_repo.py
24
24
import time
25
25
 
26
26
from bzrlib import (
27
 
    bzrdir,
 
27
    controldir,
28
28
    debug,
29
29
    errors,
30
30
    knit,
155
155
    index_class = GraphIndex
156
156
 
157
157
    def _get_matching_bzrdir(self):
158
 
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
 
158
        return controldir.format_registry.make_bzrdir('pack-0.92')
159
159
 
160
160
    def _ignore_setting_bzrdir(self, format):
161
161
        pass
195
195
    index_class = GraphIndex
196
196
 
197
197
    def _get_matching_bzrdir(self):
198
 
        return bzrdir.format_registry.make_bzrdir(
 
198
        return controldir.format_registry.make_bzrdir(
199
199
            'pack-0.92-subtree')
200
200
 
201
201
    def _ignore_setting_bzrdir(self, format):
234
234
    index_class = GraphIndex
235
235
 
236
236
    def _get_matching_bzrdir(self):
237
 
        return bzrdir.format_registry.make_bzrdir(
 
237
        return controldir.format_registry.make_bzrdir(
238
238
            'rich-root-pack')
239
239
 
240
240
    def _ignore_setting_bzrdir(self, format):
274
274
        return xml5.serializer_v5
275
275
 
276
276
    def _get_matching_bzrdir(self):
277
 
        return bzrdir.format_registry.make_bzrdir('1.6')
 
277
        return controldir.format_registry.make_bzrdir('1.6')
278
278
 
279
279
    def _ignore_setting_bzrdir(self, format):
280
280
        pass
314
314
        return xml6.serializer_v6
315
315
 
316
316
    def _get_matching_bzrdir(self):
317
 
        return bzrdir.format_registry.make_bzrdir(
 
317
        return controldir.format_registry.make_bzrdir(
318
318
            '1.6.1-rich-root')
319
319
 
320
320
    def _ignore_setting_bzrdir(self, format):
359
359
        return xml7.serializer_v7
360
360
 
361
361
    def _get_matching_bzrdir(self):
362
 
        matching = bzrdir.format_registry.make_bzrdir(
 
362
        matching = controldir.format_registry.make_bzrdir(
363
363
            '1.6.1-rich-root')
364
364
        matching.repository_format = self
365
365
        return matching
401
401
        return xml5.serializer_v5
402
402
 
403
403
    def _get_matching_bzrdir(self):
404
 
        return bzrdir.format_registry.make_bzrdir('1.9')
 
404
        return controldir.format_registry.make_bzrdir('1.9')
405
405
 
406
406
    def _ignore_setting_bzrdir(self, format):
407
407
        pass
438
438
        return xml6.serializer_v6
439
439
 
440
440
    def _get_matching_bzrdir(self):
441
 
        return bzrdir.format_registry.make_bzrdir(
 
441
        return controldir.format_registry.make_bzrdir(
442
442
            '1.9-rich-root')
443
443
 
444
444
    def _ignore_setting_bzrdir(self, format):
479
479
        return xml7.serializer_v7
480
480
 
481
481
    def _get_matching_bzrdir(self):
482
 
        return bzrdir.format_registry.make_bzrdir(
 
482
        return controldir.format_registry.make_bzrdir(
483
483
            'development5-subtree')
484
484
 
485
485
    def _ignore_setting_bzrdir(self, format):