Started to fix imports - tests still have no chance to work as database changed drastically. Now the actual work begins

Author: Byron

doc/source/changes.rst

@@ -4,13 +4,22 @@ Changelog
 
 NEXT
 ====
+* ### Class Renames ###
+
+ * Renamed **GitCmdObjectDB** to **CmdGitDB** (analogue to **PureCmdDB**)
+ 
 * ### Interface Changes ###
+
  * SymbolicReference
+ 
   * object_binsha property added
-* Blob Type
- * Added mode constants to ease the manual creation of blobs
+  
+ * Blob Type
+ 
+  * Added mode constants to ease the manual creation of blobs
 
 * ### Module Changes ###
+
  * Removed rev_parse function from git.repo.fun - the respective functionality is available only through the repository's rev_parse method, which might in turn translate to any implementation.
 
 0.3.1 Beta 2

git/__init__.py

@@ -37,9 +37,9 @@ def _init_externals():
 from git.exc import *
 from git.db import *
 from git.cmd import Git
-from git.repo import Repo
 from git.remote import *
 from git.index import *
+from git.repo import Repo
 from git.util import (
 						LockFile, 
 						BlockingLockFile, 

git/db/cmd/__init__.py

@@ -1 +1,2 @@
 
+from complex import *

git/db/cmd/git.py renamed to 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 @@
 							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.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 @@ def _from_line(cls, repo, line, fetch_line):
 		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

git/db/py/__init__.py

@@ -3,11 +3,4 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from base import *
-from loose import *
-from mem import *
-from pack import *
-from git import *
-from ref import *
-from resolve import *
-from transport import *
+from complex import *

git/db/py/base.py

@@ -3,7 +3,6 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains basic implementations for the interface building blocks"""
-
 from git.db.interface import *
 
 from git.util import (

git/db/py/git.py renamed to git/db/py/complex.py

@@ -3,12 +3,11 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains the MemoryDatabase implementation"""
-from loose import PureLooseObjectODB
 from base import (
 						PureObjectDBR, 
 						PureObjectDBW
 					)
-
+from loose import PureLooseObjectODB
 from git.base import (
 							OStream,
 							IStream,

git/db/py/mem.py

@@ -31,7 +31,7 @@ def _update_dbs_from_ref_file(self):
 		dbcls = self.ObjectDBCls
 		if dbcls is None:
 			# late import
-			from git import PureGitODB
+			from complex import PureGitODB	# TODO: This should be a configurable for flexibility
 			dbcls = PureGitODB
 		# END get db type
 

git/db/py/ref.py

@@ -3,8 +3,8 @@
 
 from git.db.interface import ReferencesMixin
 from git.exc import BadObject
-from git.ref import SymbolicReference
-from git.object.base import Object
+from git.refs import SymbolicReference
+from git.objects.base import Object
 from git.util import (
 							join,
 							isdir, 

git/db/py/resolve.py

@@ -63,7 +63,7 @@
 				)
 
 from git.base import IStream
-from git.db.py import PureMemoryDB
+from git.db.py.mem import PureMemoryDB
 from git.util import to_bin_sha
 from itertools import izip
 

git/index/base.py

@@ -35,7 +35,7 @@
 
 __all__ = ('Commit', )
 
-class Commit(GitDB_Commit, Diffable, Iterable, RepoAliasMixin, base.Object, Traversable, Serializable):
+class Commit(Diffable, Iterable, RepoAliasMixin, base.Object, Traversable, Serializable):
 	"""Wraps a git Commit object.
 	
 	This class will act lazily on some of its attributes and will query the 

git/objects/commit.py

@@ -1,5 +1,4 @@
 from git.util import RepoAliasMixin
-from git.object.submodule import Submodule as GitDB_Submodule
 import util
 from util import (
 					mkhead,
@@ -55,7 +54,7 @@ class UpdateProgress(RemoteProgress):
 # IndexObject comes via util module, its a 'hacky' fix thanks to pythons import 
 # mechanism which cause plenty of trouble of the only reason for packages and
 # modules is refactoring - subpackages shoudn't depend on parent packages
-class Submodule(GitDB_Submodule, Iterable, Traversable, RepoAliasMixin):
+class Submodule(Iterable, Traversable, RepoAliasMixin):
 	"""Implements access to a git submodule. They are special in that their sha
 	represents a commit in the submodule's repository which is to be checked out
 	at the path of this instance. 

git/objects/submodule/base.py

@@ -8,7 +8,7 @@
 from git.typ import ObjectType
 from base import IndexObject
 from blob import Blob
-from submodule import Submodule
+from submodule.base import Submodule
 
 from fun import (
 					tree_entries_from_data,