Renaemd odb to repo (once again) as references require a full repository with reference support, as opposed to a plain odb which objects are already happy with. Tests now work up to the point where a rev-parse is required. This could be helped, but revparse could also be implemented somewhere which was the reason for pulling in so much code in the first place

Author: Byron

gitdb/ref/__init__.py

@@ -2,14 +2,15 @@
 # import all modules in order, fix the names they require
 from symbolic import *
 from reference import *
+from headref import *
 from head import *
 from tag import *
 from remote import *
 
 # name fixes
-import head
-head.Head.RemoteReferenceCls = RemoteReference
-del(head)
+import headref
+headref.Head.RemoteReferenceCls = RemoteReference
+del(headref)
 
 
 import symbolic

gitdb/ref/head.py

@@ -1,106 +1,22 @@
 from symbolic import SymbolicReference
-from reference import Reference
-from gitdb.config import SectionConstraint
-from gitdb.util import join_path
 
-__all__ = ["HEAD", "Head"]
+__all__ = ["HEAD"]
 
-
-	
 class HEAD(SymbolicReference):
 	"""Special case of a Symbolic Reference as it represents the repository's 
 	HEAD reference."""
 	_HEAD_NAME = 'HEAD'
 	_ORIG_HEAD_NAME = 'ORIG_HEAD'
 	__slots__ = tuple()
 
-	def __init__(self, odb, path=_HEAD_NAME):
+	def __init__(self, repo, path=_HEAD_NAME):
 		if path != self._HEAD_NAME:
 			raise ValueError("HEAD instance must point to %r, got %r" % (self._HEAD_NAME, path))
-		super(HEAD, self).__init__(odb, path)
+		super(HEAD, self).__init__(repo, path)
 
 	def orig_head(self):
 		"""
 		:return: SymbolicReference pointing at the ORIG_HEAD, which is maintained 
 			to contain the previous value of HEAD"""
-		return SymbolicReference(self.odb, self._ORIG_HEAD_NAME)
-		
-
-class Head(Reference):
-	"""A Head is a named reference to a Commit"""
-	_common_path_default = "refs/heads"
-	k_config_remote = "remote"
-	k_config_remote_ref = "merge"			# branch to merge from remote
-	
-	# will be set by init method !
-	RemoteReferenceCls = None
-	
-	#{ Configuration
-	
-	def set_tracking_branch(self, remote_reference):
-		"""
-		Configure this branch to track the given remote reference. This will alter
-			this branch's configuration accordingly.
-		
-		:param remote_reference: The remote reference to track or None to untrack 
-			any references
-		:return: self"""
-		if remote_reference is not None and not isinstance(remote_reference, self.RemoteReferenceCls):
-			raise ValueError("Incorrect parameter type: %r" % remote_reference)
-		# END handle type
-		
-		writer = self.config_writer()
-		if remote_reference is None:
-			writer.remove_option(self.k_config_remote)
-			writer.remove_option(self.k_config_remote_ref)
-			if len(writer.options()) == 0:
-				writer.remove_section()
-			# END handle remove section
-		else:
-			writer.set_value(self.k_config_remote, remote_reference.remote_name)
-			writer.set_value(self.k_config_remote_ref, Head.to_full_path(remote_reference.remote_head))
-		# END handle ref value
-		
-		return self
-		
-	def tracking_branch(self):
-		"""
-		:return: The remote_reference we are tracking, or None if we are 
-			not a tracking branch"""
-		reader = self.config_reader()
-		if reader.has_option(self.k_config_remote) and reader.has_option(self.k_config_remote_ref):
-			ref = Head(self.odb, Head.to_full_path(reader.get_value(self.k_config_remote_ref)))
-			remote_refpath = self.RemoteReferenceCls.to_full_path(join_path(reader.get_value(self.k_config_remote), ref.name))
-			return self.RemoteReferenceCls(self.odb, remote_refpath)
-		# END handle have tracking branch
-		
-		# we are not a tracking branch
-		return None
-	
-		
-	#{ Configruation
-	
-	def _config_parser(self, read_only):
-		if read_only:
-			parser = self.odb.config_reader()
-		else:
-			parser = self.odb.config_writer()
-		# END handle parser instance
-		
-		return SectionConstraint(parser, 'branch "%s"' % self.name)
-	
-	def config_reader(self):
-		"""
-		:return: A configuration parser instance constrained to only read 
-			this instance's values"""
-		return self._config_parser(read_only=True)
-		
-	def config_writer(self):
-		"""
-		:return: A configuration writer instance with read-and write acccess
-			to options of this head"""
-		return self._config_parser(read_only=False)
-	
-	#} END configuration
-		
+		return SymbolicReference(self.repo, self._ORIG_HEAD_NAME)
 

gitdb/ref/headref.py

@@ -0,0 +1,84 @@
+from reference import Reference
+from gitdb.config import SectionConstraint
+from gitdb.util import join_path
+
+__all__ = ["Head"]
+
+class Head(Reference):
+	"""A Head is a named reference to a Commit"""
+	_common_path_default = "refs/heads"
+	k_config_remote = "remote"
+	k_config_remote_ref = "merge"			# branch to merge from remote
+	
+	# will be set by init method !
+	RemoteReferenceCls = None
+	
+	#{ Configuration
+	
+	def set_tracking_branch(self, remote_reference):
+		"""
+		Configure this branch to track the given remote reference. This will alter
+			this branch's configuration accordingly.
+		
+		:param remote_reference: The remote reference to track or None to untrack 
+			any references
+		:return: self"""
+		if remote_reference is not None and not isinstance(remote_reference, self.RemoteReferenceCls):
+			raise ValueError("Incorrect parameter type: %r" % remote_reference)
+		# END handle type
+		
+		writer = self.config_writer()
+		if remote_reference is None:
+			writer.remove_option(self.k_config_remote)
+			writer.remove_option(self.k_config_remote_ref)
+			if len(writer.options()) == 0:
+				writer.remove_section()
+			# END handle remove section
+		else:
+			writer.set_value(self.k_config_remote, remote_reference.remote_name)
+			writer.set_value(self.k_config_remote_ref, Head.to_full_path(remote_reference.remote_head))
+		# END handle ref value
+		
+		return self
+		
+	def tracking_branch(self):
+		"""
+		:return: The remote_reference we are tracking, or None if we are 
+			not a tracking branch"""
+		reader = self.config_reader()
+		if reader.has_option(self.k_config_remote) and reader.has_option(self.k_config_remote_ref):
+			ref = Head(self.repo, Head.to_full_path(reader.get_value(self.k_config_remote_ref)))
+			remote_refpath = self.RemoteReferenceCls.to_full_path(join_path(reader.get_value(self.k_config_remote), ref.name))
+			return self.RemoteReferenceCls(self.repo, remote_refpath)
+		# END handle have tracking branch
+		
+		# we are not a tracking branch
+		return None
+	
+		
+	#{ Configruation
+	
+	def _config_parser(self, read_only):
+		if read_only:
+			parser = self.repo.config_reader()
+		else:
+			parser = self.repo.config_writer()
+		# END handle parser instance
+		
+		return SectionConstraint(parser, 'branch "%s"' % self.name)
+	
+	def config_reader(self):
+		"""
+		:return: A configuration parser instance constrained to only read 
+			this instance's values"""
+		return self._config_parser(read_only=True)
+		
+	def config_writer(self):
+		"""
+		:return: A configuration writer instance with read-and write acccess
+			to options of this head"""
+		return self._config_parser(read_only=False)
+	
+	#} END configuration
+		
+

gitdb/ref/log.py

@@ -151,7 +151,7 @@ def path(cls, ref):
 			instance would be found. The path is not guaranteed to point to a valid 
 			file though.
 		:param ref: SymbolicReference instance"""
-		return join(ref.odb.git_path(), "logs", to_native_path(ref.path))
+		return join(ref.repo.git_path(), "logs", to_native_path(ref.path))
 
 	@classmethod
 	def iter_entries(cls, stream):

gitdb/ref/reference.py

@@ -1,6 +1,7 @@
 import os
 
 from symbolic import SymbolicReference
+from head import HEAD
 from gitdb.util import (
 							LazyMixin, 
 							Iterable,
@@ -37,8 +38,8 @@ def __str__(self):
 	def set_object(self, object, logmsg = None):
 		"""Special version which checks if the head-log needs an update as well"""
 		oldbinsha = None
+		head = HEAD(self.repo)
 		if logmsg is not None:
-			head = self.repo.head
 			if not head.is_detached and head.ref == self:
 				oldbinsha = self.commit.binsha
 			#END handle commit retrieval
@@ -59,7 +60,7 @@ def set_object(self, object, logmsg = None):
 			# * check with HEAD only which should cover 99% of all usage
 			# * scenarios (even 100% of the default ones).
 			# */
-			self.repo.head.log_append(oldbinsha, logmsg)
+			head.log_append(oldbinsha, logmsg)
 		#END check if the head
 
 	# NOTE: Don't have to overwrite properties as the will only work without a the log

gitdb/ref/remote.py

@@ -1,4 +1,4 @@
-from head import Head
+from headref import Head
 from gitdb.util import (
 						join, 
 						join_path