[gentoo-commits] portage r12142 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-12-03 08:22:10 +0000 (Wed, 03 Dec 2008)
New Revision: 12142

Modified:
   main/trunk/bin/repoman
Log:
It's not safe to use the git commit -a option since there might
be some modified files elsewhere in the working tree that the
user doesn't want to commit. Therefore, call git update-index
in order to ensure that the index is updated with the latest
versions of all new and modified files in the relevant portion
of the working tree.


Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman	2008-12-03 05:44:07 UTC (rev 12141)
+++ main/trunk/bin/repoman	2008-12-03 08:22:10 UTC (rev 12142)
@@ -1764,6 +1764,8 @@
 			mymanifests.add(f)
 		else:
 			myupdates.add(f)
+	if vcs == 'git':
+		myupdates.difference_update(myremoved)
 	myupdates = list(myupdates)
 	mymanifests = list(mymanifests)
 	myheaders = []
@@ -2058,6 +2060,27 @@
 			portage.writemsg("!!! Disabled FEATURES='sign'\n")
 			signed = False
 
+	if vcs == 'git':
+		# It's not safe to use the git commit -a option since there might
+		# be some modified files elsewhere in the working tree that the
+		# user doesn't want to commit. Therefore, call git update-index
+		# in order to ensure that the index is updated with the latest
+		# versions of all new and modified files in the relevant portion
+		# of the working tree.
+		myfiles = mymanifests + myupdates
+		myfiles.sort()
+		update_index_cmd = ["git", "update-index"]
+		update_index_cmd.extend(f.lstrip("./") for f in myfiles)
+		if options.pretend:
+			print "(%s)" % (" ".join(update_index_cmd),)
+		else:
+			retval = spawn(update_index_cmd, env=os.environ)
+			if retval != os.EX_OK:
+				writemsg_level(("!!! Exiting on %s (shell) " + \
+					"error code: %s\n") % (vcs, retval),
+					level=logging.ERROR, noiselevel=-1)
+				sys.exit(retval)
+
 	if vcs == 'git' or manifest_commit_required or signed:
 
 		myfiles = mymanifests[:]