--- a/tests/hghave Mon Aug 27 22:17:51 2007 +0200
+++ b/tests/hghave Mon Aug 27 22:17:51 2007 +0200
@@ -5,11 +5,22 @@
"""
import optparse
import os
+import re
import sys
import tempfile
tempprefix = 'hg-hghave-'
+def matchoutput(cmd, regexp):
+ """Return True if cmd executes successfully and its output
+ is matched by the supplied regular expression.
+ """
+ r = re.compile(regexp)
+ fh = os.popen(cmd)
+ s = fh.read()
+ ret = fh.close()
+ return ret is None and r.search(s)
+
def has_symlink():
return hasattr(os, "symlink")
@@ -52,10 +63,7 @@
return False
def has_git():
- fh = os.popen('git --version 2>&1')
- s = fh.read()
- ret = fh.close()
- return ret is None and s.startswith('git version')
+ return matchoutput('git --version 2>&1', r'^git version')
checks = {
"eol-in-paths": (has_eol_in_paths, "end-of-lines in paths"),