← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
697
697
        # Additional places to query for data.
698
698
        self._fallback_repositories = []
699
699
        # What order should fetch operations request streams in?
700
 
        # The default is unsorted as that is the cheapest for an origin to
 
700
        # The default is unordered as that is the cheapest for an origin to
701
701
        # provide.
702
 
        self._fetch_order = 'unsorted'
 
702
        self._fetch_order = 'unordered'
703
703
        # Does this repository use deltas that can be fetched as-deltas ?
704
704
        # (E.g. knits, where the knit deltas can be transplanted intact.
705
705
        # We default to False, which will ensure that enough data to get
2306
2306
    'RepositoryFormatKnitPack5',
2307
2307
    )
2308
2308
format_registry.register_lazy(
 
2309
    'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n',
 
2310
    'bzrlib.repofmt.pack_repo',
 
2311
    'RepositoryFormatKnitPack5RichRoot',
 
2312
    )
 
2313
format_registry.register_lazy(
2309
2314
    'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n',
2310
2315
    'bzrlib.repofmt.pack_repo',
2311
 
    'RepositoryFormatKnitPack5RichRoot',
 
2316
    'RepositoryFormatKnitPack5RichRootBroken',
2312
2317
    )
2313
2318
 
2314
2319
# Development formats. 
2909
2914
    @staticmethod
2910
2915
    def is_compatible(source, target):
2911
2916
        """Be compatible with Knit1 source and Knit3 target"""
2912
 
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
2913
2917
        try:
2914
 
            from bzrlib.repofmt.knitrepo import (RepositoryFormatKnit1,
2915
 
                RepositoryFormatKnit3)
 
2918
            from bzrlib.repofmt.knitrepo import (
 
2919
                RepositoryFormatKnit1,
 
2920
                RepositoryFormatKnit3,
 
2921
                )
2916
2922
            from bzrlib.repofmt.pack_repo import (
2917
2923
                RepositoryFormatKnitPack1,
2918
2924
                RepositoryFormatKnitPack3,
 
2925
                RepositoryFormatKnitPack4,
 
2926
                RepositoryFormatKnitPack5,
 
2927
                RepositoryFormatKnitPack5RichRoot,
2919
2928
                RepositoryFormatPackDevelopment0,
2920
2929
                RepositoryFormatPackDevelopment0Subtree,
2921
2930
                )
2923
2932
                RepositoryFormatKnit1,
2924
2933
                RepositoryFormatKnitPack1,
2925
2934
                RepositoryFormatPackDevelopment0,
 
2935
                RepositoryFormatKnitPack4,
 
2936
                RepositoryFormatKnitPack5,
 
2937
                RepositoryFormatKnitPack5RichRoot,
2926
2938
                )
2927
2939
            subtrees = (
2928
2940
                RepositoryFormatKnit3,