PushInfo: added summary field to help providing user readable information

Index.checkout: fixed bug in exception creator function

Author: Byron

lib/git/index.py

@@ -1108,7 +1108,7 @@ def handle_stderr(proc, iter_checked_out_files):
 			kwargs['as_process'] = True
 			kwargs['istream'] = subprocess.PIPE
 			proc = self.repo.git.checkout_index(args, **kwargs)
-			make_exc = lambda : GitCommandError(("git-checkout-index",)+args, 128, proc.stderr.read())
+			make_exc = lambda : GitCommandError(("git-checkout-index",)+tuple(args), 128, proc.stderr.read())
 			checked_out_files = list()
 			for path in paths:
 				path = self._to_relative_path(path)

lib/git/remote.py

@@ -154,9 +154,10 @@ class PushInfo(object):
 	 					# 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
 	 					# 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')
+	__slots__ = ('local_ref', 'remote_ref_string', 'flags', 'old_commit', '_remote', 'summary')
 
 	NEW_TAG, NEW_HEAD, NO_MATCH, REJECTED, REMOTE_REJECTED, REMOTE_FAILURE, DELETED, \
 	FORCED_UPDATE, FAST_FORWARD, UP_TO_DATE, ERROR = [ 1 << x for x in range(11) ]
@@ -165,7 +166,8 @@ class PushInfo(object):
 					'+' : FORCED_UPDATE, ' ' : FAST_FORWARD, 
 					'=' : UP_TO_DATE, '!' : 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=None, 
+					summary=''):
 		"""
 		Initialize a new instance
 		"""
@@ -174,6 +176,7 @@ def __init__(self, flags, local_ref, remote_ref_string, remote, old_commit=None)
 		self.remote_ref_string = remote_ref_string
 		self._remote = remote
 		self.old_commit = old_commit
+		self.summary = summary
 
 	@property
 	def remote_ref(self):
@@ -241,7 +244,7 @@ def _from_line(cls, remote, line):
 			old_commit = Commit(remote.repo, old_sha)
 		# END message handling
 
-		return PushInfo(flags, from_ref, to_ref_string, remote, old_commit)
+		return PushInfo(flags, from_ref, to_ref_string, remote, old_commit, summary)
 
 
 class FetchInfo(object):

test/git/test_remote.py

@@ -70,6 +70,7 @@ def _test_fetch_result(self, results, remote):
 		# self._print_fetchhead(remote.repo)
 		assert len(results) > 0 and isinstance(results[0], FetchInfo)
 		for info in results:
+			assert isinstance(info.note, basestring)
 			if isinstance(info.ref, Reference):
 				assert info.flags != 0
 			# END reference type flags handling 
@@ -85,6 +86,7 @@ def _test_push_result(self, results, remote):
 		assert len(results) > 0 and isinstance(results[0], PushInfo)
 		for info in results:
 			assert info.flags
+			assert isinstance(info.summary, basestring)
 			if info.old_commit is not None:
 				assert isinstance(info.old_commit, Commit)
 			if info.flags & info.ERROR: