← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

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