Merge lp:~widelands-dev/widelands/detect_revision_update into lp:widelands

[Tino]

use git rev-parse instead of show with head
remove use of deprecated os.open
avoid leaking of stderr into cmake output on windows

[GunChleoc (gunchleoc)]

Code LGTM. Not tested.

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4038. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432860634.
Appveyor build 3834. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_detect_revision_update-3834.

[GunChleoc (gunchleoc)]

Appveyor builds are working, compiling from Git on Linux will not. We have to wait for https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728, merge in trunk and then test again.

[Tino (tino79)]

No, the cmake warning is not causing the failure.
I've updated the whole function, should work on every os...

[Tino (tino79)]

Ok, currently at least on travis (MacOS and Linux) and on Travis (Windows) CMake + DetectRevision.py can determine the git version.
On my local machine (windows) both git and bzr work.

So this can go in from my side.

review: Approve

[GunChleoc (gunchleoc)]

I have tested both git and bzr. Linux is fine, so is git on MSys2. I could not it to work with bazaar on MSys2, but that's because the bzr pypi package is buggy, and it's accordingly already broken in trunk.

@bunnybot merge

=== modified file 'utils/detect_revision.py'
--- utils/detect_revision.py	2018-09-26 08:47:26 +0000
+++ utils/detect_revision.py	2018-09-28 08:20:49 +0000
@@ -42,20 +42,19 @@
 
 
 def detect_git_revision():
-    if not sys.platform.startswith('linux') and \
-       not sys.platform.startswith('darwin'):
-        git_revnum = os.popen(
-            'git show --pretty=format:%h | head -n 1').read().rstrip()
+    try:
+        cmd = subprocess.Popen(
+            ['git','rev-parse','--short','HEAD'],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,cwd=base_path
+        )
+        stdout,stderr = cmd.communicate()
+        git_revnum = stdout.rstrip()
         if git_revnum:
-            return 'unofficial-git-%s' % (git_revnum,)
-        else:
-            return None
-
-    is_git_workdir = os.system('git show >/dev/null 2>&1') == 0
-    if is_git_workdir:
-        git_revnum = os.popen(
-            'git show --pretty=format:%h | head -n 1').read().rstrip()
-        return 'unofficial-git-%s' % (git_revnum,)
+            return 'unofficial-git-%s' % git_revnum
+    except Exception as e:
+        pass
+    return None
 
 
 def check_for_explicit_version():
@@ -72,8 +71,12 @@
 
 def detect_bzr_revision():
     if __has_bzrlib:
-        b = BzrDir.open(base_path).open_branch()
-        revno, nick = b.revno(), b.nick
+        try:
+            b = BzrDir.open(base_path).open_branch()
+            revno, nick = b.revno(), b.nick
+            return 'bzr%s[%s]' % (revno, nick)
+        except:
+            return None 
     else:
         # Windows stand alone installer do not come with bzrlib. We try to
         # parse the output of bzr then directly
@@ -83,9 +86,11 @@
             ).stdout.read().strip().decode('utf-8')
             revno = run_bzr('revno')
             nick = run_bzr('nick')
+            return 'bzr%s[%s]' % (revno, nick)
         except OSError:
             return None
-    return 'bzr%s[%s]' % (revno, nick)
+    return None
+    
 
 
 def detect_revision():