X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/05537e76088cc171e78ffa582b215bedce1b7c44..6f11d5aa5c05eec216b9c21eced82c445dd20975:/vcs.py

diff --git a/vcs.py b/vcs.py
index 564b0c1..73ffb10 100644
--- a/vcs.py
+++ b/vcs.py
@@ -15,22 +15,33 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import os, git, subprocess
+import os, git, subprocess, re
 
-'''A VCS must have an "update" method with an optional "forceVersion" parameter, and optionally a "version" method.'''
+'''A VCS must have an "update" method with an optional "mode" parameter taking one of the three values below,
+   a "version" method returning a version name (or None),
+   and a "newVersions" method which checks for new versions and prints the result to standard output.'''
+MODE_FETCH = 0
+MODE_REBASE = 1
+MODE_RESET = 2
+
+def natural_sort_key(val):
+	return [ (int(c) if c.isdigit() else c) for c in re.split('([0-9]+)', val) ]
+
+def get_non_digit_prefix(val):
+	return re.match('[^0-9]*', val).group(0)
 
 # Fetch updates from git
 class Git:
-	def __init__(self, folder, url, commit):
+	def __init__(self, folder, config):
 		self.folder = os.path.abspath(folder)
-		self.url = url
-		self.commit = commit
+		self.url = config['url']
+		self.commit = config['version']
 
 	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, forceVersion=False):
+	def update(self, mode = MODE_REBASE):
 		isBranch = (self.commit.startswith('origin/'))
 		if isBranch:
 			branchname = self.commit[len('origin/'):]
@@ -49,6 +60,8 @@ class Git:
 			origin = repo.create_remote('origin', self.url)
 		origin.fetch(progress=Git._ProgressPrinter()) # download new data
 		print " "*80+"\r", # clean the line we are in
+		if mode == MODE_FETCH:
+			return
 		# create/find correct branch
 		if branchname in repo.heads:
 			branch = repo.heads[branchname]
@@ -58,7 +71,7 @@ class Git:
 				branch.set_tracking_branch(origin.refs[branchname])
 		# update it to the latest remote commit
 		branch.checkout()
-		if forceVersion:
+		if mode == MODE_RESET:
 			repo.head.reset(self.commit, working_tree=True)
 		else:
 			repo.git.rebase(self.commit)
@@ -73,8 +86,19 @@ class Git:
 	def version(self):
 		repo = git.Repo(self.folder)
 		v = repo.git.describe()
-		if v.startswith('v'): v = v[1:]
-		return v
+		return v[len(get_non_digit_prefix(v)):] # remove the non-digit prefix from v (so that it starts with a number)
+
+	def checkVersions(self):
+		self.update(mode = MODE_FETCH)
+		repo = git.Repo(self.folder)
+		currentVersion = repo.git.describe()
+		# get sorted list of tag names with the same non-digit prefix and higher version number
+		tags = map(str, repo.tags)
+		tags = filter(lambda t: get_non_digit_prefix(t) == get_non_digit_prefix(currentVersion) and natural_sort_key(t) > natural_sort_key(currentVersion), tags)
+		if not tags: return
+		tags.sort(key = natural_sort_key)
+		print "Versions newer than "+currentVersion+" available:"
+		print tags
 
 # Fetch updates via SVN
 class SVN:
@@ -82,11 +106,18 @@ class SVN:
 		self.folder = os.path.abspath(folder)
 		self.url = url
 
-	def update(self, forceVersion=False):
+	def update(self, mode = MODE_REBASE):
+		if mode == MODE_FETCH: raise Exception("Just fetching is not supported with SVN")
 		if os.path.exists(self.folder):
 			os.chdir(self.folder) # go into repository
-			if forceVersion: subprocess.check_call(['svn', 'revert', '-R', '.'])
+			if mode == MODE_RESET: subprocess.check_call(['svn', 'revert', '-R', '.'])
 			subprocess.check_call(['svn', 'switch', self.url]) # and update to the URL we got
 		else:
 			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
+	
+	def version(self):
+		return None
+	
+	def checkVersions(self):
+		print "Version checking not supporting with SVN"