import os, git, subprocess
-'''A VCS must have an "update" method with an optional "force" parameter.'''
+'''A VCS must have an "update" method with an optional "forceVersion" parameter, and a "version" method.'''
# Fetch updates from git
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/'):]
# load existing repo
repo = git.Repo(self.folder)
origin = repo.remotes.origin
+ origin.config_writer.set_value("url", self.url) # make sure we use the current URL
else:
# create a new one
os.makedirs(self.folder)
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)",
# Fetch updates via SVN
class SVN:
- def __init__(self, folder, svnPath, versionName):
+ def __init__(self, folder, url, versionName):
self.folder = os.path.abspath(folder)
- self.svnPath = svnPath
+ 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
- subprocess.check_call(['svn', 'switch', self.svnPath]) # and update to the URL we got
+ 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.svnPath, self.folder])# just download it
+ subprocess.check_call(['svn', 'co', self.url, self.folder]) # just download it
def version(self):
return self.versionName