/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 cache.py

Use relative imports where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cache.py
29
29
    ShaFile,
30
30
    )
31
31
 
32
 
import bzrlib
33
 
from bzrlib import (
 
32
from ... import (
34
33
    btree_index as _mod_btree_index,
 
34
    errors as bzr_errors,
35
35
    index as _mod_index,
36
36
    osutils,
37
37
    registry,
38
38
    trace,
39
39
    versionedfile,
40
40
    )
41
 
from bzrlib.transport import (
 
41
from ...transport import (
42
42
    get_transport,
43
43
    )
44
44
 
47
47
    try:
48
48
        from xdg.BaseDirectory import xdg_cache_home
49
49
    except ImportError:
50
 
        from bzrlib.config import config_dir
 
50
        from ...config import config_dir
51
51
        ret = os.path.join(config_dir(), "git")
52
52
    else:
53
53
        ret = os.path.join(xdg_cache_home, "bazaar", "git")
78
78
            (sqlite3.sqlite_version_info[0] == 3 and
79
79
             sqlite3.sqlite_version_info[1] < 3)):
80
80
        trace.warning('Needs at least sqlite 3.3.x')
81
 
        raise bzrlib.errors.BzrError("incompatible sqlite library")
 
81
        raise bzr_errors.BzrError("incompatible sqlite library")
82
82
 
83
83
try:
84
84
    try:
85
85
        import sqlite3
86
86
        check_pysqlite_version(sqlite3)
87
 
    except (ImportError, bzrlib.errors.BzrError), e:
 
87
    except (ImportError, bzr_errors.BzrError), e:
88
88
        from pysqlite2 import dbapi2 as sqlite3
89
89
        check_pysqlite_version(sqlite3)
90
90
except:
91
91
    trace.warning('Needs at least Python2.5 or Python2.4 with the pysqlite2 '
92
92
            'module')
93
 
    raise bzrlib.errors.BzrError("missing sqlite library")
 
93
    raise bzr_errors.BzrError("missing sqlite library")
94
94
 
95
95
 
96
96
_mapdbs = threading.local()
201
201
        try:
202
202
            format_name = transport.get_bytes('format')
203
203
            format = formats.get(format_name)
204
 
        except bzrlib.errors.NoSuchFile:
 
204
        except bzr_errors.NoSuchFile:
205
205
            format = formats.get('default')
206
206
            format.initialize(transport)
207
207
        return format.open(transport)
217
217
        :param repository: Repository to open the cache for
218
218
        :return: A `BzrGitCache`
219
219
        """
220
 
        from bzrlib.transport.local import LocalTransport
 
220
        from ...transport.local import LocalTransport
221
221
        repo_transport = getattr(repository, "_transport", None)
222
222
        if (repo_transport is not None and
223
223
            isinstance(repo_transport, LocalTransport)):
225
225
            # to update its cache.
226
226
            try:
227
227
                repo_transport = remove_readonly_transport_decorator(repo_transport)
228
 
            except bzrlib.errors.ReadOnlyError:
 
228
            except bzr_errors.ReadOnlyError:
229
229
                transport = None
230
230
            else:
231
231
                try:
232
232
                    repo_transport.mkdir('git')
233
 
                except bzrlib.errors.FileExists:
 
233
                except bzr_errors.FileExists:
234
234
                    pass
235
235
                transport = repo_transport.clone('git')
236
236
        else:
392
392
    def open(self, transport):
393
393
        try:
394
394
            basepath = transport.local_abspath(".")
395
 
        except bzrlib.errors.NotLocalUrl:
 
395
        except bzr_errors.NotLocalUrl:
396
396
            basepath = get_cache_dir()
397
397
        return SqliteBzrGitCache(os.path.join(basepath, "idmap.db"))
398
398
 
568
568
    def open(self, transport):
569
569
        try:
570
570
            basepath = transport.local_abspath(".").encode(osutils._fs_enc)
571
 
        except bzrlib.errors.NotLocalUrl:
 
571
        except bzr_errors.NotLocalUrl:
572
572
            basepath = get_cache_dir()
573
573
        assert isinstance(basepath, str)
574
574
        try:
756
756
        shamap = IndexGitShaMap(transport.clone('index'))
757
757
        #trees_store = knit.make_file_factory(True, mapper)(transport)
758
758
        #content_cache = VersionedFilesContentCache(trees_store)
759
 
        from bzrlib.plugins.git.transportgit import TransportObjectStore
 
759
        from .transportgit import TransportObjectStore
760
760
        store = TransportObjectStore(transport.clone('objects'))
761
761
        content_cache = GitObjectStoreContentCache(store)
762
762
        super(IndexBzrGitCache, self).__init__(shamap, content_cache,
772
772
        super(IndexGitCacheFormat, self).initialize(transport)
773
773
        transport.mkdir('index')
774
774
        transport.mkdir('objects')
775
 
        from bzrlib.plugins.git.transportgit import TransportObjectStore
 
775
        from .transportgit import TransportObjectStore
776
776
        TransportObjectStore.init(transport.clone('objects'))
777
777
 
778
778
    def open(self, transport):
812
812
        if transport is not None:
813
813
            try:
814
814
                transport.mkdir('git')
815
 
            except bzrlib.errors.FileExists:
 
815
            except bzr_errors.FileExists:
816
816
                pass
817
817
            return cls(transport.clone('git'))
818
 
        from bzrlib.transport import get_transport
 
818
        from ...transport import get_transport
819
819
        return cls(get_transport(get_cache_dir()))
820
820
 
821
821
    def __repr__(self):
861
861
    def _add_node(self, key, value):
862
862
        try:
863
863
            self._builder.add_node(key, value)
864
 
        except bzrlib.errors.BadIndexDuplicateKey:
 
864
        except bzr_errors.BadIndexDuplicateKey:
865
865
            # Multiple bzr objects can have the same contents
866
866
            return True
867
867
        else:
974
974
        return
975
975
    try:
976
976
        repo_transport.mkdir("git")
977
 
    except bzrlib.errors.FileExists:
 
977
    except bzr_errors.FileExists:
978
978
        return
979
979
    # Prefer migrating git.db over git.tdb, since the latter may not 
980
980
    # be openable on some platforms.
991
991
        try:
992
992
            return transport._decorated
993
993
        except AttributeError:
994
 
            raise bzrlib.errors.ReadOnlyError(transport)
 
994
            raise bzr_errors.ReadOnlyError(transport)
995
995
    return transport
996
996
 
997
997
 
1008
1008
    if repo_transport is not None:
1009
1009
        try:
1010
1010
            migrate_ancient_formats(repo_transport)
1011
 
        except bzrlib.errors.ReadOnlyError:
 
1011
        except bzr_errors.ReadOnlyError:
1012
1012
            pass # Not much we can do
1013
1013
    return BzrGitCacheFormat.from_repository(repository)