Fetch info can now deal much better with non-default ref specs, see gitpython-developers#23, gitpython-developers#24, gitpython-developers#25

Author: Byron

git/db/cmd/base.py

@@ -432,20 +432,47 @@ def _from_line(cls, repo, line, fetch_line):
 		ref_type = None
 		if remote_local_ref == "FETCH_HEAD":
 			ref_type = SymbolicReference
-		elif ref_type_name	== "branch":
+		elif ref_type_name in ("remote-tracking", "branch"):
+			# note: remote-tracking is just the first part of the 'remote-tracking branch' token.
+			# We don't parse it correctly, but its enough to know what to do, and its new in git 1.7something
 			ref_type = RemoteReference
 		elif ref_type_name == "tag":
 			ref_type = TagReference
 		else:
 			raise TypeError("Cannot handle reference type: %r" % ref_type_name)
+		#END handle ref type
 
 		# create ref instance
 		if ref_type is SymbolicReference:
 			remote_local_ref = ref_type(repo, "FETCH_HEAD") 
 		else:
-			remote_local_ref = Reference.from_path(repo, join_path(ref_type._common_path_default, remote_local_ref.strip()))
+			# determine prefix. Tags are usually pulled into refs/tags, they may have subdirectories.
+			# It is not clear sometimes where exactly the item is, unless we have an absolute path as indicated
+			# by the 'ref/' prefix. Otherwise even a tag could be in refs/remotes, which is when it will have the
+			# 'tags/' subdirectory in its path.
+			# We don't want to test for actual existence, but try to figure everything out analytically.
+			ref_path = None
+			remote_local_ref = remote_local_ref.strip()
+			if remote_local_ref.startswith(Reference._common_path_default + "/"):
+				# always use actual type if we get absolute paths
+				# Will always be the case if something is fetched outside of refs/remotes (if its not a tag)
+				ref_path = remote_local_ref
+				if ref_type is not TagReference and not remote_local_ref.startswith(RemoteReference._common_path_default + "/"):
+					ref_type = Reference
+				#END downgrade remote reference
+			elif ref_type is TagReference and 'tags/' in remote_local_ref:
+				# even though its a tag, it is located in refs/remotes
+				ref_path = join_path(RemoteReference._common_path_default, remote_local_ref)
+			else:
+				ref_path = join_path(ref_type._common_path_default, remote_local_ref)
+			#END obtain refpath
+			
+			# even though the path could be within the git conventions, we make 
+			# sure we respect whatever the user wanted, and disabled path checking
+			remote_local_ref = ref_type(repo, ref_path, check_path=False)
 		# END create ref instance 
 
+		
 		note = ( note and note.strip() ) or ''
 
 		# parse flags from control_character

git/test/db/cmd/test_base.py

@@ -11,6 +11,8 @@
 from git.db.complex import CmdCompatibilityGitDB
 from git.db.cmd.base import *
 
+from git.refs import TagReference, Reference, RemoteReference
+
 class TestBase(RepoBase):
 	RepoCls = CmdCompatibilityGitDB
 
@@ -28,5 +30,62 @@ def test_basics(self):
 			self.failUnlessRaises(BadObject, gdb.partial_to_complete_sha_hex, invalid_rev)
 
 	def test_fetch_info(self):
-		self.failUnlessRaises(ValueError, CmdFetchInfo._from_line, self.rorepo, "nonsense", '')
-		self.failUnlessRaises(ValueError, CmdFetchInfo._from_line, self.rorepo, "? [up to date]      0.1.7RC    -> origin/0.1.7RC", '')
+		self.failUnlessRaises(ValueError, CmdCmdFetchInfo._from_line, self.rorepo, "nonsense", '')
+		self.failUnlessRaises(ValueError, CmdCmdFetchInfo._from_line, self.rorepo, "? [up to date]      0.1.7RC    -> origin/0.1.7RC", '')
+		
+	
+	def test_fetch_info(self):
+		# assure we can handle remote-tracking branches
+		fetch_info_line_fmt = "c437ee5deb8d00cf02f03720693e4c802e99f390	not-for-merge	%s '0.3' of git://github.com/gitpython-developers/GitPython"
+		remote_info_line_fmt = "* [new branch]      nomatter     -> %s"
+		fi = CmdFetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "local/master", 
+							fetch_info_line_fmt % 'remote-tracking branch')
+		
+		# we wouldn't be here if it wouldn't have worked
+		
+		# handles non-default refspecs: One can specify a different path in refs/remotes
+		# or a special path just in refs/something for instance
+		
+		fi = CmdFetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "subdir/tagname", 
+							fetch_info_line_fmt % 'tag')
+		
+		assert isinstance(fi.ref, TagReference)
+		assert fi.ref.path.startswith('refs/tags')
+		
+		# it could be in a remote direcftory though
+		fi = CmdFetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "remotename/tags/tagname", 
+							fetch_info_line_fmt % 'tag')
+		
+		assert isinstance(fi.ref, TagReference)
+		assert fi.ref.path.startswith('refs/remotes/')
+		
+		# it can also be anywhere !
+		tag_path = "refs/something/remotename/tags/tagname"
+		fi = CmdFetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % tag_path, 
+							fetch_info_line_fmt % 'tag')
+		
+		assert isinstance(fi.ref, TagReference)
+		assert fi.ref.path == tag_path
+		
+		# branches default to refs/remotes
+		fi = CmdFetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "remotename/branch", 
+							fetch_info_line_fmt % 'branch')
+		
+		assert isinstance(fi.ref, RemoteReference)
+		assert fi.ref.remote_name == 'remotename'
+		
+		# but you can force it anywhere, in which case we only have a references
+		fi = CmdFetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "refs/something/branch", 
+							fetch_info_line_fmt % 'branch')
+		
+		assert type(fi.ref) is Reference
+		assert fi.ref.path == "refs/something/branch"
+		
+					
+	

git/test/test_remote.py

@@ -256,7 +256,7 @@ def get_info(res, remote, name):
 			shutil.rmtree(other_repo_dir)
 		# END test and cleanup
 
-	def _test_push_and_pull(self,remote, rw_repo, remote_repo):
+	def _verify_push_and_pull(self,remote, rw_repo, remote_repo):
 		# push our changes
 		lhead = rw_repo.head
 		lindex = rw_repo.index
@@ -407,7 +407,7 @@ def test_base(self, rw_repo, remote_repo):
 			# END for each rename ( back to prev_name )
 
 			# PUSH/PULL TESTING
-			self._test_push_and_pull(remote, rw_repo, remote_repo)
+			self._verify_push_and_pull(remote, rw_repo, remote_repo)
 
 			# FETCH TESTING
 			# Only for remotes - local cases are the same or less complicated