diff options
| -rw-r--r-- | git/db.py | 16 | ||||
| m--------- | git/ext/gitdb | 0 | ||||
| -rw-r--r-- | git/index/base.py | 4 | ||||
| -rw-r--r-- | git/objects/fun.py | 2 | ||||
| -rw-r--r-- | git/objects/tag.py | 2 | ||||
| -rw-r--r-- | git/objects/tree.py | 4 | ||||
| -rw-r--r-- | git/refs/tag.py | 2 | ||||
| -rw-r--r-- | git/repo/base.py | 4 | ||||
| -rw-r--r-- | git/util.py | 1 |
9 files changed, 20 insertions, 15 deletions
@@ -13,14 +13,14 @@ from gitdb.util import ( bin_to_hex, hex_to_bin ) -from gitdb.db import ( - GitDB, - LooseObjectDB +from gitdb.db.py import ( + PureGitDB, + PureLooseObjectODB ) from git.util import RemoteProgress -from gitdb.db.base import TransportDBMixin -from gitdb.db.base import FetchInfo as GitdbFetchInfo -from gitdb.db.base import PushInfo as GitdbPushInfo +from gitdb.db.py.base import TransportDB +from gitdb.db.interface import FetchInfo as GitdbFetchInfo +from gitdb.db.interface import PushInfo as GitdbPushInfo from git.util import join_path from gitdb.util import join @@ -36,7 +36,7 @@ import re import sys -__all__ = ('GitCmdObjectDB', 'GitDB', 'RemoteProgress' ) +__all__ = ('GitCmdObjectDB', 'PureGitDB', 'RemoteProgress' ) class PushInfo(GitdbPushInfo): @@ -269,7 +269,7 @@ class FetchInfo(GitdbFetchInfo): return cls(remote_local_ref, flags, note, old_commit_binsha) -class GitCmdObjectDB(LooseObjectDB, TransportDBMixin): +class GitCmdObjectDB(PureLooseObjectODB, TransportDB): """A database representing the default git object store, which includes loose objects, pack files and an alternates file diff --git a/git/ext/gitdb b/git/ext/gitdb -Subproject e24994109f01bd315fd6a2aaecbbfcdd05bd058 +Subproject 6463c10db377573e695bc504a9451bdb6cbf61f diff --git a/git/index/base.py b/git/index/base.py index 88410e20..7f3db35d 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -63,7 +63,7 @@ from fun import ( ) from gitdb.base import IStream -from gitdb.db import MemoryDB +from gitdb.db.py import PureMemoryDB from gitdb.util import to_bin_sha from itertools import izip @@ -512,7 +512,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): :raise UnmergedEntriesError: """ # we obtain no lock as we just flush our contents to disk as tree # If we are a new index, the entries access will load our data accordingly - mdb = MemoryDB() + mdb = PureMemoryDB() entries = self._entries_sorted() binsha, tree_items = write_tree_from_cache(entries, mdb, slice(0, len(entries))) diff --git a/git/objects/fun.py b/git/objects/fun.py index 22016b27..2443bad7 100644 --- a/git/objects/fun.py +++ b/git/objects/fun.py @@ -1,2 +1,4 @@ """Module with functions which are supposed to be as fast as possible""" +from gitdb.object.fun import * + diff --git a/git/objects/tag.py b/git/objects/tag.py index a3a85eef..59b2362e 100644 --- a/git/objects/tag.py +++ b/git/objects/tag.py @@ -5,7 +5,7 @@ # the BSD License: http://www.opensource.org/licenses/bsd-license.php """ Module containing all object based types. """ from git.util import RepoAliasMixin -from gitdb.object.tag import GitDB_TagObject +from gitdb.object.tag import TagObject as GitDB_TagObject __all__ = ("TagObject", ) class TagObject(GitDB_TagObject, RepoAliasMixin): diff --git a/git/objects/tree.py b/git/objects/tree.py index 23e1dfe4..00ef07fc 100644 --- a/git/objects/tree.py +++ b/git/objects/tree.py @@ -4,9 +4,11 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php from git.util import RepoAliasMixin -from gitdb.object.tree import GitDB_Tree, TreeModifier +from gitdb.object.tree import Tree as GitDB_Tree +from gitdb.object.tree import TreeModifier import git.diff as diff +from blob import Blob from submodule.base import Submodule __all__ = ("TreeModifier", "Tree") diff --git a/git/refs/tag.py b/git/refs/tag.py index 7bcff886..47c9ea4d 100644 --- a/git/refs/tag.py +++ b/git/refs/tag.py @@ -2,7 +2,7 @@ from gitdb.ref.tag import TagReference as GitDB_TagReference __all__ = ["TagReference", "Tag"] -class TagReference(GitDB_TagReference, GitDB_TagReference): +class TagReference(GitDB_TagReference): __slots__ = tuple() @classmethod diff --git a/git/repo/base.py b/git/repo/base.py index b8509aa7..29916986 100644 --- a/git/repo/base.py +++ b/git/repo/base.py @@ -14,7 +14,7 @@ from git.config import GitConfigParser from git.remote import Remote from git.db import ( GitCmdObjectDB, - GitDB + PureGitDB ) @@ -33,7 +33,7 @@ import os import sys import re -DefaultDBType = GitDB +DefaultDBType = PureGitDB if sys.version_info[1] < 5: # python 2.4 compatiblity DefaultDBType = GitCmdObjectDB # END handle python 2.4 diff --git a/git/util.py b/git/util.py index a1d0cb12..3d0bd82e 100644 --- a/git/util.py +++ b/git/util.py @@ -19,6 +19,7 @@ from gitdb.util import ( to_bin_sha, join_path, join_path_native, + to_native_path, to_native_path_linux, to_native_path_windows, assure_directory_exists, |