Moved rev_parse code into gitdb, this probably broke pretty much here, which is still to be fixed of course

Author: Byron

doc/source/changes.rst

@@ -9,6 +9,9 @@ NEXT
   * object_binsha property added
 * 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/ext/gitdb

@@ -1,13 +1,12 @@
 
 from gitdb.ref.head import HEAD as GitDB_HEAD
-from gitdb.ref.head import Head as GitDB_Head
+from gitdb.ref.headref import Head as GitDB_Head
 from git.exc import GitCommandError
-from git.util import RepoAliasMixin
 
 __all__ = ["HEAD", "Head"]
 
 
-class HEAD(GitDB_HEAD, RepoAliasMixin):
+class HEAD(GitDB_HEAD):
 	"""Provides additional functionality using the git command"""
 	__slots__ = tuple()
 
@@ -73,7 +72,7 @@ def reset(self, commit='HEAD', index=True, working_tree = False,
 		return self
 
 
-class Head(GitDB_Head, RepoAliasMixin):
+class Head(GitDB_Head):
 	"""The GitPyhton Head implementation provides more git-command based features
 	
 	A Head is a named reference to a Commit. Every Head instance contains a name

git/refs/head.py

@@ -1,8 +1,7 @@
 
 from gitdb.ref.reference import Reference as GitDB_Reference
-from git.util import RepoAliasMixin
 __all__ = ["Reference"]
 
-class Reference(GitDB_Reference, RepoAliasMixin):
+class Reference(GitDB_Reference):
 	__slots__ = tuple()
 	pass

git/refs/reference.py

@@ -1,11 +1,10 @@
 import os
 from gitdb.ref.remote import RemoteReference as GitDB_RemoteReference
-from git.util import RepoAliasMixin
 
 __all__ = ["RemoteReference"]
 
 
-class RemoteReference(GitDB_RemoteReference, RepoAliasMixin):
+class RemoteReference(GitDB_RemoteReference):
 	"""Represents a reference pointing to a remote head."""
 	__slots__ = tuple()
 

git/refs/remote.py

@@ -1,7 +1,6 @@
 from gitdb.ref.symbolic import SymbolicReference as GitDB_SymbolicReference
-from git.util import RepoAliasMixin
 __all__ = ["SymbolicReference"]
 
-class SymbolicReference(GitDB_SymbolicReference, RepoAliasMixin):
+class SymbolicReference(GitDB_SymbolicReference):
 	__slots__ = tuple()
 	pass

git/refs/symbolic.py

@@ -1,5 +1,4 @@
 from gitdb.ref.tag import TagReference as GitDB_TagReference
-from git.util import RepoAliasMixin
 
 __all__ = ["TagReference", "Tag"]
 

git/refs/tag.py

@@ -25,7 +25,6 @@
 						)
 
 from fun import (
-					rev_parse,
 					is_git_dir,
 					touch
 				)
@@ -67,10 +66,6 @@ class Repo(object):
 	re_author_committer_start = re.compile(r'^(author|committer)')
 	re_tab_full_line = re.compile(r'^\t(.*)$')
 
-	# invariants
-	# represents the configuration level of a configuration file
-	config_level = ("system", "global", "repository")
-
 	def __init__(self, path=None, odbt = DefaultDBType):
 		"""Create a new Repo instance
 
@@ -167,6 +162,9 @@ def _set_description(self, descr):
 	del _set_description
 
 
+	@property
+	def config_level(self):
+		return self.odb.config_level
 
 	@property
 	def working_tree_dir(self):
@@ -311,21 +309,6 @@ def delete_remote(self, remote):
 		"""Delete the given remote."""
 		return Remote.remove(self, remote)
 
-	def _get_config_path(self, config_level ):
-		# we do not support an absolute path of the gitconfig on windows , 
-		# use the global config instead
-		if sys.platform == "win32" and config_level == "system":
-			config_level = "global"
-			
-		if config_level == "system":
-			return "/etc/gitconfig"
-		elif config_level == "global":
-			return os.path.normpath(os.path.expanduser("~/.gitconfig"))
-		elif config_level == "repository":
-			return join(self.git_dir, "config")
-		
-		raise ValueError( "Invalid configuration level: %r" % config_level )
-			
 	def config_reader(self, config_level=None):
 		"""
 		:return:
@@ -341,12 +324,7 @@ def config_reader(self, config_level=None):
 			instance
 		:note: On windows, system configuration cannot currently be read as the path is 
 			unknown, instead the global path will be used."""
-		files = None
-		if config_level is None:
-			files = [ self._get_config_path(f) for f in self.config_level ]
-		else:
-			files = [ self._get_config_path(config_level) ]
-		return GitConfigParser(files, read_only=True)
+		return self.odb.config_reader(config_level) 
 
 	def config_writer(self, config_level="repository"):
 		"""
@@ -361,7 +339,7 @@ def config_writer(self, config_level="repository"):
 			system = sytem wide configuration file
 			global = user level configuration file
 			repository = configuration file for this repostory only"""
-		return GitConfigParser(self._get_config_path(config_level), read_only = False)
+		return self.odb.config_writer(config_level)
 
 	def commit(self, rev=None):
 		"""The Commit object for the specified revision
@@ -747,7 +725,8 @@ def archive(self, ostream, treeish=None, prefix=None,  **kwargs):
 		self.git.archive(treeish, **kwargs)
 		return self
 
-	rev_parse = rev_parse
+	def rev_parse(self, name):
+		return self.odb.rev_parse(name)
 
 	def __repr__(self):
 		return '<git.Repo "%s">' % self.git_dir