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

diff --git a/vcs.py b/vcs.py
index b700b6e..b2387c7 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,17 +52,6 @@ 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, versionName):
@@ -79,10 +68,3 @@ class SVN:
 
 	def version(self):
 		return self.versionName
-
-	def ignore(self, name):
-		pass
-
-class KDESVN(SVN):
-	def __init__(self, folder, svnPath, version):
-		SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath, version)