git: suppress stderr when switching branches

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index 8d8d836284a95360222bb16b786777af7d6bc9f3..14944788a5b7b2259fd7ae07618f16d7dc17e959 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -32,13 +32,14 @@ def get_non_digit_prefix(val):
 
 class GitCommand:
        def __getattr__(self, name):
-               def call(*args):
+               def call(*args, suppress_stderr = False, split = True):
                        cmd = ["git", name.replace('_', '-')] + list(args)
-                       p = subprocess.Popen(cmd, stdout=subprocess.PIPE) # TODO use with
-                       (stdout, stderr) = p.communicate()
-                       if p.returncode != 0:
-                               raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
-                       return filter(len, stdout.split('\n')) # return list of non-empty lines
+                       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')
+                       return stdout.split('\n') if split else stdout
                return call
 git = GitCommand()
 
@@ -72,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)
-                       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.checkout(branchname)
+               git.checkout(branchname, suppress_stderr=True)
                if mode == MODE_RESET:
                        git.reset("--hard", self.commit)
                else:
@@ -83,10 +84,10 @@ class Git:
                # update submodules
                git.submodule("update", "--init", "--recursive", "--rebase")
                # done
-               print "...done",
-               if git.rev_parse("HEAD")[0] != git.rev_parse(self.commit)[0]:
-                       print "(keeping local patches around)",
-               print
+               print("...done", end=' ')
+               if git.rev_parse("HEAD", split=False) != git.rev_parse(self.commit, split=False):
+                       print("(keeping local patches around)", end=' ')
+               print()
 
        def version(self):
                repo = git.Repo(self.folder)
@@ -95,14 +96,14 @@ class Git:
 
        def checkVersions(self):
                self.update(mode = MODE_FETCH)
-               currentVersion = git.describe()[0]
+               currentVersion = git.describe(split=False)
                # get sorted list of tag names with the same non-digit prefix and higher version number
                tags = git.tag()
-               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 = [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)
-               print "Versions newer than "+currentVersion+" available:"
-               print tags
+               print("Versions newer than "+currentVersion+" available:")
+               print(tags)
 
 # Fetch updates via SVN
 class SVN:
@@ -124,4 +125,4 @@ class SVN:
                return None
        
        def checkVersions(self):
-               print "Version checking not supporting with SVN"
+               print("Version checking not supporting with SVN")