subrepo, hghave: use "svn --version --quiet" to determine version number stable
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Oct 2012 16:52:20 +0200
branchstable
changeset 1136 294cea906d3a
parent 1135 7c026ccf4e1a
child 1137 2d9daef1e473
child 1138 bb419c4bfdd9
subrepo, hghave: use "svn --version --quiet" to determine version number svn --version --quiet is implemented since svn 0.14.1 (August 2002) and prints just the version number, not the long output (21 lines) of "svn --version". Additionally I expect this output format to be more stable, at least it is not changed with different translations. [ original upstream message ]
tests/hghave.py
--- a/tests/hghave.py	Wed Oct 10 01:30:45 2012 +0200
+++ b/tests/hghave.py	Thu Oct 04 16:52:20 2012 +0200
@@ -152,7 +152,7 @@
         return False
 
 def getsvnversion():
-    m = matchoutput('svn --version 2>&1', r'^svn,\s+version\s+(\d+)\.(\d+)')
+    m = matchoutput('svn --version --quiet 2>&1', r'^(\d+)\.(\d+)')
     if not m:
         return (0, 0)
     return (int(m.group(1)), int(m.group(2)))