[gentoo-commits] proj/portage:xml-schema commit in: pym/repoman/modules/vcs/git/, pym/repoman/, pym/repoman/modules/vcs/

[gentoo-commits] proj/portage:xml-schema commit in: pym/repoman/modules/vcs/git/, pym/repoman/, pym/repoman/modules/vcs/

[Michał Górny]

commit:     2e1ee76d7df8b96a078b220e542278d93b0bcf20
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 18:05:46 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 17:57:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e1ee76d

repoman: Migrate vcs index update code to the vcs modules

 pym/repoman/actions.py                 | 22 +---------------------
 pym/repoman/modules/vcs/changes.py     |  4 ++++
 pym/repoman/modules/vcs/git/changes.py | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 4d06555..6c9de57 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -164,27 +164,7 @@ class Actions(object):
 		if self.repo_settings.sign_manifests:
 			self.sign_manifest(myupdates, myremoved, mymanifests)
 
-		if self.vcs_settings.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 self.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" % (self.vcs_settings.vcs, retval),
-						level=logging.ERROR, noiselevel=-1)
-					sys.exit(retval)
+		self.vcs_settings.changes.update_index(mymanifests, myupdates)
 
 		self.add_manifest(mymanifests, myheaders, myupdates, myremoved, commitmessage)
 

diff --git a/pym/repoman/modules/vcs/changes.py b/pym/repoman/modules/vcs/changes.py
index 27b627f..948407c 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -85,3 +85,7 @@ class ChangesBase(object):
 	def clear_attic(myheaders):
 		'''Old CVS leftover'''
 		pass
+
+	def update_index(self, mymanifests, myupdates):
+		'''Update the vcs's modified index if it is needed'''
+		pass

diff --git a/pym/repoman/modules/vcs/git/changes.py b/pym/repoman/modules/vcs/git/changes.py
index 1970b3a..018458c 100644
--- a/pym/repoman/modules/vcs/git/changes.py
+++ b/pym/repoman/modules/vcs/git/changes.py
@@ -2,11 +2,16 @@
 Git module Changes class submodule
 '''
 
+import logging
+import sys
+
 from repoman.modules.vcs.changes import ChangesBase
 from repoman._subprocess import repoman_popen
 from repoman._portage import portage
 from portage import os
 from portage.package.ebuild.digestgen import digestgen
+from portage.process import spawn
+from portage.util import writemsg_level
 
 
 class Changes(ChangesBase):
@@ -63,3 +68,25 @@ class Changes(ChangesBase):
 			for x in broken_changelog_manifests:
 				self.repoman_settings["O"] = os.path.join(self.repo_settings.repodir, x)
 				digestgen(mysettings=self.repoman_settings, myportdb=self.repo_settings.portdb)
+
+	def update_index(self, mymanifests, myupdates):
+		# 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 self.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" % (self.vcs_settings.vcs, retval),
+					level=logging.ERROR, noiselevel=-1)
+				sys.exit(retval)