X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/3a6b5ad415ec7aed415210d80107605149689e68..187e1b6111879b67f575940be29d2adeb715102c:/vcs.py

diff --git a/vcs.py b/vcs.py
index e30d31a..0931beb 100644
--- a/vcs.py
+++ b/vcs.py
@@ -13,7 +13,7 @@ class Git:
 		def update(self, op_code, cur_count, max_count=None, message=''):
 			print self._cur_line+(" "*30)+"\r",
 
-	def update(self):
+	def update(self, forceVersion=False):
 		isBranch = (self.commit.startswith('origin/'))
 		if isBranch:
 			branchname = self.commit[len('origin/'):]
@@ -41,7 +41,10 @@ class Git:
 				branch.set_tracking_branch(origin.refs[branchname])
 		# update it to the latest remote commit
 		branch.checkout()
-		repo.git.rebase(self.commit)
+		if forceVersion:
+			repo.head.reset(self.commit, working_tree=True)
+		else:
+			repo.git.rebase(self.commit)
 		print "...done",
 		if repo.head.reference.commit != repo.commit(self.commit):
 			print "(keeping local patches around)",
@@ -60,9 +63,10 @@ class SVN:
 		self.url = url
 		self.versionName = versionName
 
-	def update(self):
+	def update(self, forceVersion=False):
 		if os.path.exists(self.folder):
 			os.chdir(self.folder) # go into repository
+			if forceVersion: subprocess.check_call(['svn', 'revert', '-R', '.'])
 			subprocess.check_call(['svn', 'switch', self.url]) # and update to the URL we got
 		else:
 			subprocess.check_call(['svn', 'co', self.url, self.folder]) # just download it