X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/546c80d1c559cb94223f9c459db719d143df7291..1c7ec34aa2c1faefe2cc96df094e427e3ef83376:/vcs.py

diff --git a/vcs.py b/vcs.py
index 8acb571..b700b6e 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/'):]
@@ -47,24 +46,43 @@ class Git:
 			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
+
+	def ignore(self, name):
+		with open(os.path.join(self.folder, '.git', 'info', 'exclude'), 'r+') as f:
+			for line in f:
+				line = line.replace('\n', '').replace('\r', '')
+				if line == name: return # is already ignored
+			print >>f, name # add ignore line
+
 class KDEGit(Git):
 	def __init__(self, folder, name, commit):
 		Git.__init__(self, folder, 'kde:'+name, commit)
 
 # 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
+
+	def ignore(self, name):
+		pass
+
 class KDESVN(SVN):
-	def __init__(self, folder, svnPath):
-		SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath)
+	def __init__(self, folder, svnPath, version):
+		SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath, version)