← 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: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

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,
758
758
            expected_chk_roots)
759
759
        missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
760
760
        if missing_chk_roots:
761
 
            problems.append("missing referenced chk root keys: %s"
 
761
            problems.append(
 
762
                "missing referenced chk root keys: %s."
 
763
                "Run 'bzr reconcile --canonicalize-chks' on the affected "
 
764
                "repository."
762
765
                % (sorted(missing_chk_roots),))
763
766
            # Don't bother checking any further.
764
767
            return problems
954
957
            else:
955
958
                basis_tree = self.revision_tree(basis_revision_id)
956
959
                basis_tree.lock_read()
957
 
                basis_inv = basis_tree.inventory
 
960
                basis_inv = basis_tree.root_inventory
958
961
        try:
959
962
            result = basis_inv.create_by_apply_delta(delta, new_revision_id,
960
963
                propagate_caches=propagate_caches)
1383
1386
    pack_compresses = True
1384
1387
 
1385
1388
    def _get_matching_bzrdir(self):
1386
 
        return bzrdir.format_registry.make_bzrdir('2a')
 
1389
        return controldir.format_registry.make_bzrdir('2a')
1387
1390
 
1388
1391
    def _ignore_setting_bzrdir(self, format):
1389
1392
        pass
1406
1409
    """
1407
1410
 
1408
1411
    def _get_matching_bzrdir(self):
1409
 
        return bzrdir.format_registry.make_bzrdir('development-subtree')
 
1412
        return controldir.format_registry.make_bzrdir('development-subtree')
1410
1413
 
1411
1414
    def _ignore_setting_bzrdir(self, format):
1412
1415
        pass