X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/b82c0cdbd36ccfbdff73f65616f30f7d22f9083b..ca9f7861296b734673b388d61e0e2510fbcef625:/vcs.py

diff --git a/vcs.py b/vcs.py
index 994f03b..0dc9685 100644
--- a/vcs.py
+++ b/vcs.py
@@ -1,6 +1,6 @@
 import os, git, subprocess
 
-'''A VCS must have an "update" method with an optional "force" parameter.'''
+'''A VCS must have an "update" method with an optional "forceVersion" parameter, and optionally a "version" method.'''
 
 # Fetch updates from git
 class Git:
@@ -8,13 +8,12 @@ class Git:
 		self.folder = os.path.abspath(folder)
 		self.url = url
 		self.commit = commit
-	
+
 	class _ProgressPrinter(git.remote.RemoteProgress):
 		def update(self, op_code, cur_count, max_count=None, message=''):
 			print self._cur_line+(" "*30)+"\r",
-	
-	def update(self):
-		print "Updating",self.folder
+
+	def update(self, forceVersion=False):
 		isBranch = (self.commit.startswith('origin/'))
 		if isBranch:
 			branchname = self.commit[len('origin/'):]
@@ -25,6 +24,7 @@ class Git:
 			# load existing repo
 			repo = git.Repo(self.folder)
 			origin = repo.remotes.origin
+			origin.config_writer.set_value("url", self.url) # make sure we use the current URL
 		else:
 			# create a new one
 			os.makedirs(self.folder)
@@ -37,26 +37,39 @@ class Git:
 			branch = repo.heads[branchname]
 		else:
 			branch = repo.create_head(branchname, self.commit)
-			if isBranch:
+			if isBranch: # track remote branch
 				branch.set_tracking_branch(origin.refs[branchname])
 		# update it to the latest remote commit
 		branch.checkout()
-		repo.git.rebase(self.commit)
+		if forceVersion:
+			repo.head.reset(self.commit, working_tree=True)
+		else:
+			repo.git.rebase(self.commit)
+		# update submodules
+		repo.git.submodule("update", "--init", "--recursive", "--rebase")
+		# done
 		print "...done",
-		if repo.head.reference.commit != repo.refs[self.commit].commit:
+		if repo.head.reference.commit != repo.commit(self.commit):
 			print "(keeping local patches around)",
 		print
 
+	def version(self):
+		repo = git.Repo(self.folder)
+		v = repo.git.describe()
+		if v.startswith('v'): v = v[1:]
+		return v
+
 # Fetch updates via SVN
 class SVN:
-	def __init__(self, folder, svnPath):
+	def __init__(self, folder, url):
 		self.folder = os.path.abspath(folder)
-		self.svnPath = svnPath
-	
-	def update(self):
-		print "Updating",self.folder
+		self.url = url
+
+	def update(self, forceVersion=False):
 		if os.path.exists(self.folder):
 			os.chdir(self.folder) # go into repository
-			subprocess.check_call(['svn', 'switch', self.svnPath]) # and update to the URL we got
+			if forceVersion: subprocess.check_call(['svn', 'revert', '-R', '.'])
+			subprocess.check_call(['svn', 'switch', self.url]) # and update to the URL we got
 		else:
-			subprocess.check_call(['svn', 'co', self.svnPath, self.folder])# just download it
+			os.makedirs(self.folder) # if even the parent folder does not exist, svn fails
+			subprocess.check_call(['svn', 'co', self.url, self.folder]) # just download it