Added special cases to test that shows we cannot yet:

handle the FETCH_HEAD case and
handle tags
System needs to be adjusted to take the FETCH_HEAD info into account to cover the tags case

Author: Byron

lib/git/remote.py

@@ -68,7 +68,7 @@ class FetchInfo(object):
 		BRANCH_UPTODATE, REJECTED, FORCED_UPDATE, FAST_FORWARD, NEW_TAG, \
 		TAG_UPDATE, NEW_BRANCH, ERROR = [ 1 << x for x in range(1,9) ]
 		#                             %c    %-*s %-*s             -> %s       (%s)
-		re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.]+\]?)\s+(.+) -> (.+/[\w_\.-]+)(  \(.*\)?$)?")
+		re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.]+\]?)\s+(.+) -> ([/\w_\.-]+)(  \(.*\)?$)?")
 
 		_flag_map = { 	'!' : ERROR, '+' : FORCED_UPDATE, '-' : TAG_UPDATE, '*' : 0,
 						'=' : BRANCH_UPTODATE, ' ' : FAST_FORWARD } 

test/git/test_remote.py

@@ -18,7 +18,7 @@ def _print_fetchhead(self, repo):
 
 
 	def _test_fetch_result(self, results, remote):
-		# self._print_fetchhead(remote.repo)
+		self._print_fetchhead(remote.repo)
 		assert len(results) > 0 and isinstance(results[0], remote.FetchInfo)
 		for info in results:
 			assert info.flags != 0
@@ -38,8 +38,8 @@ def _test_fetch(self,remote, rw_repo, remote_repo):
 		# specialized fetch testing to de-clutter the main test
 		self._test_fetch_info(rw_repo)
 
-		def fetch_and_test(remote):
-			res = remote.fetch()
+		def fetch_and_test(remote, **kwargs):
+			res = remote.fetch(**kwargs)
 			self._test_fetch_result(res, remote)
 			return res
 		# END fetch and check
@@ -93,6 +93,23 @@ def get_info(res, remote, name):
 		assert len(stale_refs) == 2 and isinstance(stale_refs[0], RemoteReference)
 		RemoteReference.delete(rw_repo, *stale_refs)
 
+		# test single branch fetch with refspec
+		res = fetch_and_test(remote, refspec="master:refs/remotes/%s/master"%remote)
+		assert len(res) == 1 and get_info(res, remote, 'master')
+		
+		# without refspec
+		res = fetch_and_test(remote, refspec='master')
+		assert len(res) == 1
+		
+		# add new tag reference
+		rtag = TagReference.create(remote_repo, "1.0-RV_hello.there")
+		res = fetch_and_test(remote, tags=True)
+		ltag = res[str(rtag)]
+		assert isinstance(ltag, TagReference)
+		
+		# delete tag
+		
+		# adjust tag commit
 
 		self.fail("tag handling, tag uptodate, new tag, new branch")