Make sure an updated git URL is used

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index a810d35291907ab5464ef1e603640cb2778acf38..e30d31a9cb4d24e02483ea0cd261ae7eb4544267 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -8,11 +8,11 @@ class Git:
                self.folder = os.path.abspath(folder)
                self.url = url
                self.commit = commit
-       
+
        class _ProgressPrinter(git.remote.RemoteProgress):
                def update(self, op_code, cur_count, max_count=None, message=''):
                        print self._cur_line+(" "*30)+"\r",
-       
+
        def update(self):
                isBranch = (self.commit.startswith('origin/'))
                if isBranch:
@@ -24,6 +24,7 @@ class Git:
                        # 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)
@@ -36,33 +37,35 @@ 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
 
-class KDEGit(Git):
-       def __init__(self, folder, name, commit):
-               Git.__init__(self, folder, 'kde:'+name, commit)
+       def version(self):
+               repo = git.Repo(self.folder)
+               v = repo.git.describe()
+               if v.startswith('v'): v = v[1:]
+               return v
 
 # 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