remote.fetch: fetchInfo would not provide old_commit information in case of fast_forwards although. Renamed cumbersome 'commit_before_forced_updated' attribute to 'old_commit' to be en par with PushInfo

Byron · Byron · commit 202216e2cdb5 · 2009-11-23T18:49:31.000+01:00
diff --git a/lib/git/remote.py b/lib/git/remote.py
@@ -255,10 +255,10 @@ class FetchInfo(object):
 						# i.e. info.flags & info.REJECTED 
 						# is 0 if ref is SymbolicReference
 	 info.note			# additional notes given by git-fetch intended for the user
-	 info.commit_before_forced_update	# if info.flags & info.FORCED_UPDATE, 
+	 info.old_commit	# if info.flags & info.FORCED_UPDATE|info.FAST_FORWARD, 
 						# field is set to the previous location of ref, otherwise None
 	"""
-	__slots__ = ('ref','commit_before_forced_update', 'flags', 'note')
+	__slots__ = ('ref','old_commit', 'flags', 'note')
 	
 	NEW_TAG, NEW_HEAD, HEAD_UPTODATE, TAG_UPDATE, REJECTED, FORCED_UPDATE, \
 	FAST_FORWARD, ERROR = [ 1 << x for x in range(8) ]
@@ -276,7 +276,7 @@ def __init__(self, ref, flags, note = '', old_commit = None):
 		self.ref = ref
 		self.flags = flags
 		self.note = note
-		self.commit_before_forced_update = old_commit
+		self.old_commit = old_commit
 		
 	def __str__(self):
 		return self.name
@@ -369,8 +369,11 @@ def _from_line(cls, repo, line, fetch_line):
 				flags |= cls.NEW_TAG
 			if 'new branch' in operation:
 				flags |= cls.NEW_HEAD
-			if '...' in operation:
-				old_commit = Commit(repo, operation.split('...')[0])
+			if '...' in operation or '..' in operation:
+				split_token = '...'
+				if control_character == ' ':
+					split_token = split_token[:-1]
+				old_commit = Commit(repo, operation.split(split_token)[0])
 			# END handle refspec
 		# END reference flag handling
 		
diff --git a/test/git/test_remote.py b/test/git/test_remote.py
@@ -74,10 +74,10 @@ def _test_fetch_result(self, results, remote):
 				assert info.flags != 0
 			# END reference type flags handling 
 			assert isinstance(info.ref, (SymbolicReference, Reference))
-			if info.flags & info.FORCED_UPDATE:
-				assert isinstance(info.commit_before_forced_update, Commit)
+			if info.flags & (info.FORCED_UPDATE|info.FAST_FORWARD):
+				assert isinstance(info.old_commit, Commit)
 			else:
-				assert info.commit_before_forced_update is None
+				assert info.old_commit is None
 			# END forced update checking  
 		# END for each info
 		
