← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-23 19:45:15 UTC
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120223194515-1ctgfzj362m0tu0k
Use bzrdir.controldir for generic access to control directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
21
21
import itertools
22
22
 
23
23
from bzrlib import (
24
 
    bzrdir,
 
24
    controldir,
25
25
    errors,
26
26
    knit as _mod_knit,
27
27
    lockable_files,
405
405
        return xml7.serializer_v7
406
406
 
407
407
    def _get_matching_bzrdir(self):
408
 
        return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
 
408
        return controldir.format_registry.make_bzrdir('dirstate-with-subtree')
409
409
 
410
410
    def _ignore_setting_bzrdir(self, format):
411
411
        pass
447
447
        return xml6.serializer_v6
448
448
 
449
449
    def _get_matching_bzrdir(self):
450
 
        return bzrdir.format_registry.make_bzrdir('rich-root')
 
450
        return controldir.format_registry.make_bzrdir('rich-root')
451
451
 
452
452
    def _ignore_setting_bzrdir(self, format):
453
453
        pass