X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/02b5afbf47783fbb9033b6776596a50bf9fd3cb0..08936d4ee431ed67dbc75214b364fad42fb72900:/vcs.py

diff --git a/vcs.py b/vcs.py
index c63b2b9..9c91e93 100644
--- a/vcs.py
+++ b/vcs.py
@@ -36,13 +36,13 @@ 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
 
@@ -65,10 +65,11 @@ class KDEGit(Git):
 
 # 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):
 		if os.path.exists(self.folder):
 			os.chdir(self.folder) # go into repository
@@ -76,6 +77,12 @@ class SVN:
 		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)