Move loading a module by filename into a helper function

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index 73ffb10113c2c005aac7f9668b8fd01d2e4131ee..5e481dea4b86439a7dd8ed71c29af2fc9ee75d1e 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -1,5 +1,5 @@
 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories
 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories

-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 

-import os, git, subprocess, re
+import os, subprocess, re

 
 '''A VCS must have an "update" method with an optional "mode" parameter taking one of the three values below,
    a "version" method returning a version name (or None),
 
 '''A VCS must have an "update" method with an optional "mode" parameter taking one of the three values below,
    a "version" method returning a version name (or None),


@@ -30,6 +30,15 @@ def natural_sort_key(val):
 def get_non_digit_prefix(val):
        return re.match('[^0-9]*', val).group(0)
 
 def get_non_digit_prefix(val):
        return re.match('[^0-9]*', val).group(0)
 

+class GitCommand:
+       def __getattr__(self, name):
+               def call(*args, get_stderr = False):
+                       cmd = ["git", name.replace('_', '-')] + list(args)
+                       output = subprocess.check_output(cmd, stderr=subprocess.STDOUT if get_stderr else None)
+                       return output.decode('utf-8').strip('\n')
+               return call
+git = GitCommand()
+

 # Fetch updates from git
 class Git:
        def __init__(self, folder, config):
 # Fetch updates from git
 class Git:
        def __init__(self, folder, config):


@@ -37,10 +46,6 @@ class Git:
                self.url = config['url']
                self.commit = config['version']
 
                self.url = config['url']
                self.commit = config['version']
 

-       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, mode = MODE_REBASE):
                isBranch = (self.commit.startswith('origin/'))
                if isBranch:
        def update(self, mode = MODE_REBASE):
                isBranch = (self.commit.startswith('origin/'))
                if isBranch:


@@ -50,55 +55,50 @@ class Git:
                # get us a git repository, and the "origin" remote
                if os.path.exists(self.folder):
                        # load existing repo
                # get us a git repository, and the "origin" remote
                if os.path.exists(self.folder):
                        # 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
+                       os.chdir(self.folder)
+                       git.remote("set-url", "origin", 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)

-                       repo = git.Repo.init(self.folder)
-                       origin = repo.create_remote('origin', self.url)
-               origin.fetch(progress=Git._ProgressPrinter()) # download new data
-               print " "*80+"\r", # clean the line we are in
+                       os.chdir(self.folder)
+                       git.init()
+                       git.remote("add", "origin", self.url)
+               git.fetch("origin")

                if mode == MODE_FETCH:
                        return
                # create/find correct branch
                if mode == MODE_FETCH:
                        return
                # create/find correct branch

-               if branchname in repo.heads:
-                       branch = repo.heads[branchname]
-               else:
-                       branch = repo.create_head(branchname, self.commit)
-                       if isBranch: # track remote branch
-                               branch.set_tracking_branch(origin.refs[branchname])
+               if not git.branch("--list", branchname): # the branch does not yet exit
+                       git.branch(branchname, self.commit)
+                       if isBranch: # make sure we track the correct remote branch
+                               git.branch("-u", self.commit, branchname)

                # update it to the latest remote commit
                # update it to the latest remote commit

-               branch.checkout()
+               git.checkout(branchname, get_stderr=True)

                if mode == MODE_RESET:
                if mode == MODE_RESET:

-                       repo.head.reset(self.commit, working_tree=True)
+                       git.reset("--hard", self.commit)

                else:
                else:

-                       repo.git.rebase(self.commit)
+                       git.rebase(self.commit)

                # update submodules
                # update submodules

-               repo.git.submodule("update", "--init", "--recursive", "--rebase")
+               git.submodule("update", "--init", "--recursive", "--rebase")

                # done
                # done

-               print "...done",
-               if repo.head.reference.commit != repo.commit(self.commit):
-                       print "(keeping local patches around)",
-               print
+               print("...done", end=' ')
+               if git.rev_parse("HEAD") != git.rev_parse(self.commit):
+                       print("(keeping local patches around)", end=' ')
+               print()

 
        def version(self):
 
        def version(self):

-               repo = git.Repo(self.folder)
-               v = repo.git.describe()
+               v = git.describe()

                return v[len(get_non_digit_prefix(v)):] # remove the non-digit prefix from v (so that it starts with a number)
 
        def checkVersions(self):
                self.update(mode = MODE_FETCH)
                return v[len(get_non_digit_prefix(v)):] # remove the non-digit prefix from v (so that it starts with a number)
 
        def checkVersions(self):
                self.update(mode = MODE_FETCH)

-               repo = git.Repo(self.folder)
-               currentVersion = repo.git.describe()
+               currentVersion = git.describe()

                # get sorted list of tag names with the same non-digit prefix and higher version number
                # get sorted list of tag names with the same non-digit prefix and higher version number

-               tags = map(str, repo.tags)
-               tags = filter(lambda t: get_non_digit_prefix(t) == get_non_digit_prefix(currentVersion) and natural_sort_key(t) > natural_sort_key(currentVersion), tags)
+               tags = git.tag().split('\n')
+               tags = [t for t in tags if get_non_digit_prefix(t) == get_non_digit_prefix(currentVersion) and natural_sort_key(t) > natural_sort_key(currentVersion)]

                if not tags: return
                tags.sort(key = natural_sort_key)
                if not tags: return
                tags.sort(key = natural_sort_key)

-               print "Versions newer than "+currentVersion+" available:"
-               print tags
+               print("Versions newer than "+currentVersion+" available:")
+               print(tags)

 
 # Fetch updates via SVN
 class SVN:
 
 # Fetch updates via SVN
 class SVN:


@@ -120,4 +120,4 @@ class SVN:
                return None
        
        def checkVersions(self):
                return None
        
        def checkVersions(self):

-               print "Version checking not supporting with SVN"
+               print("Version checking not supporting with SVN")