Patchwork [1,of,4] debuginstall: add mercurial version

login
register
mail settings
Submitter timeless
Date May 11, 2016, 5:23 a.m.
Message ID <8c51b867ca30b264bc55.1462944201@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/15005/
State Superseded, archived
Headers show

Comments

timeless - May 11, 2016, 5:23 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1462920345 0
#      Tue May 10 22:45:45 2016 +0000
# Node ID 8c51b867ca30b264bc55047986e4de25edb3ef75
# Parent  cfb766fa3a0d41c83a57172c6a167caf1930a727
# EXP-Topic runtests
# Available At bb://timeless/mercurial-crew
#              hg pull bb://timeless/mercurial-crew -r 8c51b867ca30
debuginstall: add mercurial version

Patch

diff -r cfb766fa3a0d -r 8c51b867ca30 mercurial/commands.py
--- a/mercurial/commands.py	Wed May 11 04:49:27 2016 +0000
+++ b/mercurial/commands.py	Tue May 10 22:45:45 2016 +0000
@@ -2740,6 +2740,13 @@ 
     fm.write('pythonlib', _("checking Python lib (%s)...\n"),
              os.path.dirname(os.__file__))
 
+    # hg version
+    hgver = util.version()
+    fm.write('hgver', _("checking Mercurial version (%s)\n"),
+             hgver.split('+')[0])
+    fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
+             '+'.join(hgver.split('+')[1:]))
+
     # compiled modules
     fm.write('hgmodules', _("checking installed modules (%s)...\n"),
              os.path.dirname(__file__))
diff -r cfb766fa3a0d -r 8c51b867ca30 tests/test-install.t
--- a/tests/test-install.t	Wed May 11 04:49:27 2016 +0000
+++ b/tests/test-install.t	Tue May 10 22:45:45 2016 +0000
@@ -4,6 +4,8 @@ 
   checking Python executable (*) (glob)
   checking Python version (2.*) (glob)
   checking Python lib (*lib*)... (glob)
+  checking Mercurial version (*) (glob)
+  checking Mercurial custom build (*) (glob)
   checking installed modules (*mercurial)... (glob)
   checking templates (*mercurial?templates)... (glob)
   checking default template (*mercurial?templates?map-cmdline.default) (glob)
@@ -24,6 +26,8 @@ 
     "encodingerror": null,
     "extensionserror": null,
     "hgmodules": "*mercurial", (glob)
+    "hgver": "*", (glob)
+    "hgverextra": "*", (glob)
     "problems": 0,
     "pythonexe": "*", (glob)
     "pythonlib": "*", (glob)
@@ -41,6 +45,8 @@ 
   checking Python executable (*) (glob)
   checking Python version (2.*) (glob)
   checking Python lib (*lib*)... (glob)
+  checking Mercurial version (*) (glob)
+  checking Mercurial custom build (*) (glob)
   checking installed modules (*mercurial)... (glob)
   checking templates (*mercurial?templates)... (glob)
   checking default template (*mercurial?templates?map-cmdline.default) (glob)
@@ -62,6 +68,8 @@ 
   checking Python executable (*) (glob)
   checking Python version (*) (glob)
   checking Python lib (*lib*)... (glob)
+  checking Mercurial version (*) (glob)
+  checking Mercurial custom build (*) (glob)
   checking installed modules (*mercurial)... (glob)
   checking templates (*mercurial?templates)... (glob)
   checking default template (*mercurial?templates?map-cmdline.default) (glob)