log successful completion

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index b700b6e22c8e027d42825a207885bb728a67bcfc..0dc9685a265172dafbd73b6dffedf0c5e1a0294d 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -1,6 +1,6 @@
 import os, git, subprocess
 
 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 optionally a "version" method.'''

 
 # Fetch updates from git
 class Git:
 
 # Fetch updates from git
 class Git:


@@ -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, 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/'):]
                isBranch = (self.commit.startswith('origin/'))
                if isBranch:
                        branchname = self.commit[len('origin/'):]


@@ -24,6 +24,7 @@ class Git:
                        # load existing repo
                        repo = git.Repo(self.folder)
                        origin = repo.remotes.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)
                else:
                        # create a new one
                        os.makedirs(self.folder)


@@ -36,13 +37,19 @@ class Git:
                        branch = repo.heads[branchname]
                else:
                        branch = repo.create_head(branchname, self.commit)
                        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()
                                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)
+               # update submodules
+               repo.git.submodule("update", "--init", "--recursive", "--rebase")
+               # done

                print "...done",
                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
 
                        print "(keeping local patches around)",
                print
 


@@ -52,37 +59,17 @@ class Git:
                if v.startswith('v'): v = v[1:]
                return v
 
                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:
 # Fetch updates via SVN
 class SVN:

-       def __init__(self, folder, svnPath, versionName):
+       def __init__(self, folder, url):

                self.folder = os.path.abspath(folder)
                self.folder = os.path.abspath(folder)

-               self.svnPath = svnPath
-               self.versionName = versionName
+               self.url = url

 
 

-       def update(self):
+       def update(self, forceVersion=False):

                if os.path.exists(self.folder):
                        os.chdir(self.folder) # go into repository
                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:
                else:

-                       subprocess.check_call(['svn', 'co', self.svnPath, self.folder])# just download it
-
-       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)
+                       os.makedirs(self.folder) # if even the parent folder does not exist, svn fails
+                       subprocess.check_call(['svn', 'co', self.url, self.folder]) # just download it