Support specifying a SHA1 as version

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index 893a75f159832a4e84dd49ee394a0acdbab7ebd1..9c91e933654d0326f2c06d31f8a1be0f4a8a4600 100644 (file)
--- 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,16 +52,24 @@ 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):
+       def __init__(self, folder, svnPath, versionName):
                self.folder = os.path.abspath(folder)
                self.svnPath = svnPath
-       
+               self.versionName = versionName
+
        def update(self):
                if os.path.exists(self.folder):
                        os.chdir(self.folder) # go into repository
@@ -69,6 +77,12 @@ class SVN:
                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):
-               SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath)
+       def __init__(self, folder, svnPath, version):
+               SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath, version)