← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-15 03:58:20 UTC
  • mfrom: (4963 +trunk)
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100115035820-ilb3t36swgzq6v1l
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
1423
1423
        # resumed packs
1424
1424
        self._resumed_packs = []
1425
1425
 
 
1426
    def __repr__(self):
 
1427
        return '%s(%r)' % (self.__class__.__name__, self.repo)
 
1428
 
1426
1429
    def add_pack_to_memory(self, pack):
1427
1430
        """Make a Pack object available to the repository to satisfy queries.
1428
1431
 
2234
2237
        self._reconcile_fixes_text_parents = True
2235
2238
        self._reconcile_backsup_inventory = False
2236
2239
 
2237
 
    def _warn_if_deprecated(self):
 
2240
    def _warn_if_deprecated(self, branch=None):
2238
2241
        # This class isn't deprecated, but one sub-format is
2239
2242
        if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
2240
 
            from bzrlib import repository
2241
 
            if repository._deprecation_warning_done:
2242
 
                return
2243
 
            repository._deprecation_warning_done = True
2244
 
            warning("Format %s for %s is deprecated - please use"
2245
 
                    " 'bzr upgrade --1.6.1-rich-root'"
2246
 
                    % (self._format, self.bzrdir.transport.base))
 
2243
            super(KnitPackRepository, self)._warn_if_deprecated(branch)
2247
2244
 
2248
2245
    def _abort_write_group(self):
2249
2246
        self.revisions._index._key_dependencies.clear()