X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/02b5afbf47783fbb9033b6776596a50bf9fd3cb0..e14e79eb3d371385da62524a6555307446296482:/vcs.py?ds=inline

diff --git a/vcs.py b/vcs.py
index c63b2b9..f40c6e9 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
 
@@ -52,30 +52,19 @@ class Git:
 		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, url, versionName):
 		self.folder = os.path.abspath(folder)
-		self.svnPath = svnPath
-	
+		self.url = url
+		self.versionName = versionName
+
 	def update(self):
 		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
+			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
+			subprocess.check_call(['svn', 'co', self.url, self.folder]) # just download it
 
-class KDESVN(SVN):
-	def __init__(self, folder, svnPath):
-		SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath)
+	def version(self):
+		return self.versionName