← 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: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
21
21
import time
22
22
 
23
23
from bzrlib import (
24
 
    bzrdir,
 
24
    controldir,
25
25
    chk_map,
26
26
    chk_serializer,
27
27
    debug,
1383
1383
    pack_compresses = True
1384
1384
 
1385
1385
    def _get_matching_bzrdir(self):
1386
 
        return bzrdir.format_registry.make_bzrdir('2a')
 
1386
        return controldir.format_registry.make_bzrdir('2a')
1387
1387
 
1388
1388
    def _ignore_setting_bzrdir(self, format):
1389
1389
        pass
1406
1406
    """
1407
1407
 
1408
1408
    def _get_matching_bzrdir(self):
1409
 
        return bzrdir.format_registry.make_bzrdir('development-subtree')
 
1409
        return controldir.format_registry.make_bzrdir('development-subtree')
1410
1410
 
1411
1411
    def _ignore_setting_bzrdir(self, format):
1412
1412
        pass