diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-05-06 18:53:59 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-05-06 18:53:59 +0200 |
| commit | 7ae36c3e019a5cc16924d1b6007774bfb625036f (patch) | |
| tree | 52ad2a3cd8187c42a3a02d6b08dda9493a23042b /git/db/cmd | |
| parent | acf5e6ea64a2f24117f1d419c208ed1c38c43690 (diff) | |
| download | GitPython-7ae36c3e019a5cc16924d1b6007774bfb625036f.tar.gz GitPython-7ae36c3e019a5cc16924d1b6007774bfb625036f.zip | |
Started to fix imports - tests still have no chance to work as database changed drastically. Now the actual work begins
Diffstat (limited to 'git/db/cmd')
| -rw-r--r-- | git/db/cmd/__init__.py | 1 | ||||
| -rw-r--r-- | git/db/cmd/complex.py (renamed from git/db/cmd/git.py) | 27 |
2 files changed, 13 insertions, 15 deletions
diff --git a/git/db/cmd/__init__.py b/git/db/cmd/__init__.py index 8b137891..968d8c11 100644 --- a/git/db/cmd/__init__.py +++ b/git/db/cmd/__init__.py @@ -1 +1,2 @@ +from complex import * diff --git a/git/db/cmd/git.py b/git/db/cmd/complex.py index 6c060f0e..73e2048f 100644 --- a/git/db/cmd/git.py +++ b/git/db/cmd/complex.py @@ -1,8 +1,8 @@ """Module with our own git implementation - it uses the git command""" -from exc import ( +from git.exc import ( GitCommandError, BadObject - ) + ) from git.base import ( OInfo, @@ -13,10 +13,7 @@ from git.util import ( bin_to_hex, hex_to_bin ) -from git.db.py import ( - PureGitDB, - PureLooseObjectODB - ) +from git.db.py.loose import PureLooseObjectODB from git.util import RemoteProgress from git.db.py.base import TransportDB from git.db.interface import FetchInfo as GitdbFetchInfo @@ -25,18 +22,18 @@ from git.db.interface import PushInfo as GitdbPushInfo from git.util import join_path from git.util import join -from refs import ( - Reference, - RemoteReference, - SymbolicReference, - TagReference - ) +from git.refs import ( + Reference, + RemoteReference, + SymbolicReference, + TagReference + ) import re import sys -__all__ = ('GitCmdObjectDB', 'PureGitDB', 'RemoteProgress' ) +__all__ = ('CmdGitDB', 'RemoteProgress' ) class PushInfo(GitdbPushInfo): @@ -269,7 +266,7 @@ class FetchInfo(GitdbFetchInfo): return cls(remote_local_ref, flags, note, old_commit_binsha) -class GitCmdObjectDB(PureLooseObjectODB, TransportDB): +class CmdGitDB(PureLooseObjectODB, TransportDB): """A database representing the default git object store, which includes loose objects, pack files and an alternates file @@ -279,7 +276,7 @@ class GitCmdObjectDB(PureLooseObjectODB, TransportDB): """ def __init__(self, root_path, git): """Initialize this instance with the root and a git command""" - super(GitCmdObjectDB, self).__init__(root_path) + super(CmdGitDB, self).__init__(root_path) self._git = git @classmethod |
