Remove splitting from git wrapper

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index c1068fb73bec0b95ecc896199c48033844be5840..7e6c1a301e40cafadcfd732d839528a9c08fb862 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -32,14 +32,14 @@ def get_non_digit_prefix(val):
 
 class GitCommand:
        def __getattr__(self, name):
 
 class GitCommand:
        def __getattr__(self, name):

-               def call(*args, split = True):
+               def call(*args, suppress_stderr = False):

                        cmd = ["git", name.replace('_', '-')] + list(args)
                        cmd = ["git", name.replace('_', '-')] + list(args)

-                       with subprocess.Popen(cmd, stdout=subprocess.PIPE) as p:
+                       with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE if suppress_stderr else None) as p:

                                (stdout, stderr) = p.communicate()
                                if p.returncode != 0:
                                        raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
                        stdout = stdout.decode('utf-8').strip('\n')
                                (stdout, stderr) = p.communicate()
                                if p.returncode != 0:
                                        raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
                        stdout = stdout.decode('utf-8').strip('\n')

-                       return stdout.split('\n') if split else stdout
+                       return stdout

                return call
 git = GitCommand()
 
                return call
 git = GitCommand()
 


@@ -73,10 +73,10 @@ class Git:
                # create/find correct branch
                if not git.branch("--list", branchname): # the branch does not yet exit
                        git.branch(branchname, self.commit)
                # create/find correct branch
                if not git.branch("--list", branchname): # the branch does not yet exit
                        git.branch(branchname, self.commit)

-                       if isBranch: # make sure we track remote branch
+                       if isBranch: # make sure we track the correct remote branch

                                git.branch("-u", self.commit, branchname)
                # update it to the latest remote commit
                                git.branch("-u", self.commit, branchname)
                # update it to the latest remote commit

-               git.checkout(branchname)
+               git.checkout(branchname, suppress_stderr=True)

                if mode == MODE_RESET:
                        git.reset("--hard", self.commit)
                else:
                if mode == MODE_RESET:
                        git.reset("--hard", self.commit)
                else:


@@ -85,20 +85,19 @@ class Git:
                git.submodule("update", "--init", "--recursive", "--rebase")
                # done
                print("...done", end=' ')
                git.submodule("update", "--init", "--recursive", "--rebase")
                # done
                print("...done", end=' ')

-               if git.rev_parse("HEAD", split=False) != git.rev_parse(self.commit, split=False):
+               if git.rev_parse("HEAD") != git.rev_parse(self.commit):

                        print("(keeping local patches around)", end=' ')
                print()
 
        def version(self):
                        print("(keeping local patches around)", end=' ')
                print()
 
        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)

-               currentVersion = git.describe(split=False)
+               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 = git.tag()
+               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)
                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)