Removed all parts of the reference implementation which doesn't require the git command. everything else was moved to GitDB. None of the tests is yet expected to run, although git-python should have less trouble getting the tests back up running than GitDB. plenty of code needs to be de-duplicated though in case of the tests, which will be some work

Author: Byron

doc/source/changes.rst

@@ -5,7 +5,8 @@ Changelog
 NEXT
 ====
 * ### Interface Changes ###
- * None yet
+ * SymbolicReference
+  * object_binsha property added
 * Blob Type
  * Added mode constants to ease the manual creation of blobs
 

git/db.py

@@ -50,11 +50,11 @@ class PushInfo(GitdbPushInfo):
 		info.remote_ref_string # path to the remote reference located on the remote side
 		info.remote_ref # Remote Reference on the local side corresponding to 
 						# the remote_ref_string. It can be a TagReference as well.
-		info.old_commit # commit at which the remote_ref was standing before we pushed
+		info.old_commit_binsha # binary sha at which the remote_ref was standing before we pushed
 						# it to local_ref.commit. Will be None if an error was indicated
 		info.summary	# summary line providing human readable english text about the push
 		"""
-	__slots__ = ('local_ref', 'remote_ref_string', 'flags', 'old_commit', '_remote', 'summary')
+	__slots__ = ('local_ref', 'remote_ref_string', 'flags', 'old_commit_binsha', '_remote', 'summary')
 
 	_flag_map = {	'X' : GitdbPushInfo.NO_MATCH, 
 					'-' : GitdbPushInfo.DELETED, '*' : 0,
@@ -63,14 +63,14 @@ class PushInfo(GitdbPushInfo):
 					'=' : GitdbPushInfo.UP_TO_DATE, 
 					'!' : GitdbPushInfo.ERROR }
 
-	def __init__(self, flags, local_ref, remote_ref_string, remote, old_commit=None, 
+	def __init__(self, flags, local_ref, remote_ref_string, remote, old_commit_binsha=None, 
 					summary=''):
 		""" Initialize a new instance """
 		self.flags = flags
 		self.local_ref = local_ref
 		self.remote_ref_string = remote_ref_string
 		self._remote = remote
-		self.old_commit = old_commit
+		self.old_commit_binsha = old_commit_binsha
 		self.summary = summary
 
 	@property
@@ -111,7 +111,7 @@ def _from_line(cls, remote, line):
 			from_ref = Reference.from_path(remote.repo, from_ref_string)
 
 		# commit handling, could be message or commit info
-		old_commit = None
+		old_commit_binsha = None
 		if summary.startswith('['):
 			if "[rejected]" in summary:
 				flags |= cls.REJECTED
@@ -134,10 +134,10 @@ def _from_line(cls, remote, line):
 				split_token = ".."
 			old_sha, new_sha = summary.split(' ')[0].split(split_token)
 			# have to use constructor here as the sha usually is abbreviated
-			old_commit = remote.repo.commit(old_sha)
+			old_commit_binsha = remote.repo.commit(old_sha)
 		# END message handling
 
-		return PushInfo(flags, from_ref, to_ref_string, remote, old_commit, summary)
+		return PushInfo(flags, from_ref, to_ref_string, remote, old_commit_binsha, summary)
 
 
 class FetchInfo(GitdbFetchInfo):
@@ -151,10 +151,10 @@ class FetchInfo(GitdbFetchInfo):
 						# i.e. info.flags & info.REJECTED 
 						# is 0 if ref is FETCH_HEAD
 	 info.note			# additional notes given by git-fetch intended for the user
-	 info.old_commit	# if info.flags & info.FORCED_UPDATE|info.FAST_FORWARD, 
+	 info.old_commit_binsha	# if info.flags & info.FORCED_UPDATE|info.FAST_FORWARD, 
 						# field is set to the previous location of ref, otherwise None
 	"""
-	__slots__ = ('ref','old_commit', 'flags', 'note')
+	__slots__ = ('ref','old_commit_binsha', 'flags', 'note')
 
 	#							  %c	%-*s %-*s			  -> %s		  (%s)
 	re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.]+\]?)\s+(.+) -> ([/\w_\+\.-]+)(	 \(.*\)?$)?")
@@ -166,14 +166,14 @@ class FetchInfo(GitdbFetchInfo):
 					'=' : GitdbFetchInfo.HEAD_UPTODATE, 
 					' ' : GitdbFetchInfo.FAST_FORWARD } 
 
-	def __init__(self, ref, flags, note = '', old_commit = None):
+	def __init__(self, ref, flags, note = '', old_commit_binsha = None):
 		"""
 		Initialize a new instance
 		"""
 		self.ref = ref
 		self.flags = flags
 		self.note = note
-		self.old_commit = old_commit
+		self.old_commit_binsha = old_commit_binsha
 
 	def __str__(self):
 		return self.name
@@ -250,7 +250,7 @@ def _from_line(cls, repo, line, fetch_line):
 		# END control char exception hanlding 
 
 		# parse operation string for more info - makes no sense for symbolic refs
-		old_commit = None
+		old_commit_binsha = None
 		if isinstance(remote_local_ref, Reference):
 			if 'rejected' in operation:
 				flags |= cls.REJECTED
@@ -262,11 +262,11 @@ def _from_line(cls, repo, line, fetch_line):
 				split_token = '...'
 				if control_character == ' ':
 					split_token = split_token[:-1]
-				old_commit = repo.rev_parse(operation.split(split_token)[0])
+				old_commit_binsha = repo.rev_parse(operation.split(split_token)[0])
 			# END handle refspec
 		# END reference flag handling
 
-		return cls(remote_local_ref, flags, note, old_commit)
+		return cls(remote_local_ref, flags, note, old_commit_binsha)
 
 
 class GitCmdObjectDB(LooseObjectDB, TransportDBMixin):

git/ext/gitdb

@@ -8,13 +8,13 @@
 
 # name fixes
 import head
-head.RemoteReference = RemoteReference
+head.Head.RemoteReferenceCls = RemoteReference
 del(head)
 
 
 import symbolic
-for item in (HEAD, Head, RemoteReference, TagReference, Reference, SymbolicReference):
-	setattr(symbolic, item.__name__, item)
+for item in (HEAD, Head, RemoteReference, TagReference, Reference):
+	setattr(symbolic.SymbolicReference, item.__name__+'Cls', item)
 del(symbolic)
 
 

git/refs/__init__.py

@@ -1,33 +1,15 @@
-from symbolic import SymbolicReference
-from reference import Reference
-
-from git.config import SectionConstraint
-
-from git.util import join_path
 
+from gitdb.ref.head import HEAD as GitDB_HEAD
+from gitdb.ref.head import Head as GitDB_Head
 from git.exc import GitCommandError
+from git.util import RepoAliasMixin
 
 __all__ = ["HEAD", "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'
+class HEAD(GitDB_HEAD, RepoAliasMixin):
+	"""Provides additional functionality using the git command"""
 	__slots__ = tuple()
-	
-	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__(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.repo, self._ORIG_HEAD_NAME)
 
 	def reset(self, commit='HEAD', index=True, working_tree = False, 
 				paths=None, **kwargs):
@@ -91,8 +73,10 @@ def reset(self, commit='HEAD', index=True, working_tree = False,
 		return self
 
 
-class Head(Reference):
-	"""A Head is a named reference to a Commit. Every Head instance contains a name
+class Head(GitDB_Head, RepoAliasMixin):
+	"""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
 	and a Commit object.
 
 	Examples::
@@ -108,6 +92,8 @@ class Head(Reference):
 
 		>>> head.commit.hexsha
 		'1c09f116cbc2cb4100fb6935bb162daa4723f455'"""
+	__slots__ = tuple()
+	
 	_common_path_default = "refs/heads"
 	k_config_remote = "remote"
 	k_config_remote_ref = "merge"			# branch to merge from remote
@@ -125,47 +111,7 @@ def delete(cls, repo, *heads, **kwargs):
 			flag = "-D"
 		repo.git.branch(flag, *heads)
 
-	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, RemoteReference):
-			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 = RemoteReference.to_full_path(join_path(reader.get_value(self.k_config_remote), ref.name))
-			return RemoteReference(self.repo, remote_refpath)
-		# END handle have tracking branch
-		
-		# we are not a tracking branch
-		return None
-	
 	def rename(self, new_path, force=False):
 		"""Rename self to a new path
 		
@@ -217,30 +163,4 @@ def checkout(self, force=False, **kwargs):
 
 		self.repo.git.checkout(self, **kwargs)
 		return self.repo.active_branch
-		
-	#{ 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
-