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

diff --git a/vcs.py b/vcs.py
index 994f03b..b2387c7 100644
--- a/vcs.py
+++ b/vcs.py
@@ -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
 		isBranch = (self.commit.startswith('origin/'))
 		if isBranch:
 			branchname = self.commit[len('origin/'):]
@@ -37,26 +36,35 @@ 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)
 		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, svnPath, versionName):
 		self.folder = os.path.abspath(folder)
 		self.svnPath = svnPath
-	
+		self.versionName = versionName
+
 	def update(self):
-		print "Updating",self.folder
 		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
 		else:
 			subprocess.check_call(['svn', 'co', self.svnPath, self.folder])# just download it
+
+	def version(self):
+		return self.versionName