testing: detect additional Mercurial versions properly
authorGregory Szorc <gps@mozilla.com>
Sun, 18 Jan 2015 14:19:31 -0800
changeset 360135 e1c64ba5b940799fd9a9dc4a9904cfb549bdf651
parent 360134 166b0ef2505e192b6cd6d1e9508be421b1a82eca
child 360136 c232176aac87d753a5209dda7316039d47f0094a
push id16998
push userrwood@mozilla.com
push dateMon, 02 May 2016 19:42:03 +0000
testing: detect additional Mercurial versions properly
testing/hghave.py
--- a/testing/hghave.py
+++ b/testing/hghave.py
@@ -40,16 +40,17 @@ def has_docker():
     tf = tempfile.NamedTemporaryFile()
     tf.close()
     d = Docker(tf.name, url, tls=tls)
     return d.is_alive()
 
 def hgversion():
     v = os.environ['HGVERSION']
     v = v.split('+')[0]
+    v = v.split('-')[0]
     return tuple(int(i) for i in v.split('.'))
 
 @check('hg30+', 'Running with Mercurial 3.0+')
 def has_hg_30_plus():
     return hgversion()[0] >= 3
 
 @check('hg31+', 'Running with Mercurial 3.1+')
 def has_hg_31_plus():