/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
841
841
                knit = self._revision_store.get_signature_file(
842
842
                    self.get_transaction())
843
843
            else:
844
 
                raise RepositoryDataStreamError(
 
844
                raise errors.RepositoryDataStreamError(
845
845
                    "Unrecognised data stream key '%s'" % (item_key,))
846
846
            decoded_list = bencode.bdecode(bytes)
847
847
            format = decoded_list.pop(0)
1778
1778
        """Return the graph walker for this repository format"""
1779
1779
        parents_provider = self._make_parents_provider()
1780
1780
        if (other_repository is not None and
1781
 
            other_repository.bzrdir.transport.base !=
1782
 
            self.bzrdir.transport.base):
 
1781
            not self.has_same_location(other_repository)):
1783
1782
            parents_provider = graph._StackedParentsProvider(
1784
1783
                [parents_provider, other_repository._make_parents_provider()])
1785
1784
        return graph.Graph(parents_provider)
2091
2090
    # Set to True or False in derived classes. True indicates that the format
2092
2091
    # supports ghosts gracefully.
2093
2092
    supports_ghosts = None
 
2093
    # Can this repository be given external locations to lookup additional
 
2094
    # data. Set to True or False in derived classes.
 
2095
    supports_external_lookups = None
2094
2096
 
2095
2097
    def __str__(self):
2096
2098
        return "<%s>" % self.__class__.__name__
2235
2237
 
2236
2238
    rich_root_data = False
2237
2239
    supports_tree_reference = False
 
2240
    supports_external_lookups = False
2238
2241
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2239
2242
 
2240
2243
    def __init__(self):
2299
2302
 
2300
2303
# Pack-based formats. There is one format for pre-subtrees, and one for
2301
2304
# post-subtrees to allow ease of testing.
2302
 
# NOTE: These are experimental in 0.92.
 
2305
# NOTE: These are experimental in 0.92. Stable in 1.0 and above
2303
2306
format_registry.register_lazy(
2304
2307
    'Bazaar pack repository format 1 (needs bzr 0.92)\n',
2305
2308
    'bzrlib.repofmt.pack_repo',
2315
2318
    'bzrlib.repofmt.pack_repo',
2316
2319
    'RepositoryFormatKnitPack4',
2317
2320
    )
 
2321
# Development formats. 
 
2322
# 1.2->1.3
 
2323
# development 0 - stub to introduce development versioning scheme.
 
2324
format_registry.register_lazy(
 
2325
    "Bazaar development format 0 (needs bzr.dev from before 1.3)\n",
 
2326
    'bzrlib.repofmt.pack_repo',
 
2327
    'RepositoryFormatPackDevelopment0',
 
2328
    )
 
2329
format_registry.register_lazy(
 
2330
    ("Bazaar development format 0 with subtree support "
 
2331
        "(needs bzr.dev from before 1.3)\n"),
 
2332
    'bzrlib.repofmt.pack_repo',
 
2333
    'RepositoryFormatPackDevelopment0Subtree',
 
2334
    )
 
2335
# 1.3->1.4 go below here
2318
2336
 
2319
2337
 
2320
2338
class InterRepository(InterObject):
2827
2845
        try:
2828
2846
            from bzrlib.repofmt.knitrepo import (RepositoryFormatKnit1,
2829
2847
                RepositoryFormatKnit3)
2830
 
            from bzrlib.repofmt.pack_repo import (RepositoryFormatKnitPack1,
2831
 
                RepositoryFormatKnitPack3)
2832
 
            return (isinstance(source._format,
2833
 
                    (RepositoryFormatKnit1, RepositoryFormatKnitPack1)) and
2834
 
                isinstance(target._format,
2835
 
                    (RepositoryFormatKnit3, RepositoryFormatKnitPack3))
2836
 
                )
 
2848
            from bzrlib.repofmt.pack_repo import (
 
2849
                RepositoryFormatKnitPack1,
 
2850
                RepositoryFormatKnitPack3,
 
2851
                RepositoryFormatPackDevelopment0,
 
2852
                RepositoryFormatPackDevelopment0Subtree,
 
2853
                )
 
2854
            nosubtrees = (
 
2855
                RepositoryFormatKnit1,
 
2856
                RepositoryFormatKnitPack1,
 
2857
                RepositoryFormatPackDevelopment0,
 
2858
                )
 
2859
            subtrees = (
 
2860
                RepositoryFormatKnit3,
 
2861
                RepositoryFormatKnitPack3,
 
2862
                RepositoryFormatPackDevelopment0Subtree,
 
2863
                )
 
2864
            return (isinstance(source._format, nosubtrees) and
 
2865
                isinstance(target._format, subtrees))
2837
2866
        except AttributeError:
2838
2867
            return False
2839
2868