[PATCH 3 of 3] hghave: remove quiet option
Gregory Szorc
gregory.szorc at gmail.com
Sat Aug 22 13:03:11 CDT 2015
# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1440265058 25200
# Sat Aug 22 10:37:38 2015 -0700
# Node ID 210da28d3c8030737c5533ccdb457380b36e4d89
# Parent f80e33f600fd047bab33fa23b239f2eb58439228
hghave: remove quiet option
The --quiet flag appears to be unused. Kill it.
diff --git a/tests/hghave b/tests/hghave
--- a/tests/hghave
+++ b/tests/hghave
@@ -29,12 +29,10 @@ parser = optparse.OptionParser("%prog [o
parser.add_option("--test-features", action="store_true",
help="test available features")
parser.add_option("--list-features", action="store_true",
help="list available features")
-parser.add_option("-q", "--quiet", action="store_true",
- help="check features silently")
-def _loadaddon(quiet):
+def _loadaddon():
if 'TESTDIR' in os.environ:
# loading from '.' isn't needed, because `hghave` should be
# running at TESTTMP in this case
path = os.environ['TESTDIR']
@@ -47,21 +45,20 @@ def _loadaddon(quiet):
sys.path.insert(0, path)
try:
import hghaveaddon
except BaseException, inst:
- if not quiet:
- sys.stderr.write('failed to import hghaveaddon.py from %r: %s\n'
- % (path, inst))
+ sys.stderr.write('failed to import hghaveaddon.py from %r: %s\n'
+ % (path, inst))
sys.exit(2)
sys.path.pop(0)
if __name__ == '__main__':
options, args = parser.parse_args()
- _loadaddon(options.quiet)
+ _loadaddon()
if options.list_features:
list_features()
sys.exit(0)
if options.test_features:
sys.exit(test_features())
- hghave.require(args, options.quiet)
+ hghave.require(args)
diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -46,19 +46,18 @@ def checkfeatures(features):
result['skipped'].append('system supports %s' % desc)
return result
-def require(features, quiet=False):
+def require(features):
"""Require that features are available, exiting if not."""
result = checkfeatures(features)
- if not quiet:
- for missing in result['missing']:
- sys.stderr.write('skipped: unknown feature: %s\n' % missing)
- for msg in result['skipped']:
- sys.stderr.write('skipped: %s\n' % msg)
- for msg in result['error']:
- sys.stderr.write('%s\n' % msg)
+ for missing in result['missing']:
+ sys.stderr.write('skipped: unknown feature: %s\n' % missing)
+ for msg in result['skipped']:
+ sys.stderr.write('skipped: %s\n' % msg)
+ for msg in result['error']:
+ sys.stderr.write('%s\n' % msg)
if result['missing']:
sys.exit(2)
More information about the Mercurial-devel
mailing list