run-tests: factor out parse_args(). Clarify use of globals a bit.

tests/run-tests.py

@@ -46,6 +46,13 b' defaults = {'
     'port': ('HGTEST_PORT', 20059),
 }
 
+# globals set by parse_args() (ugh)
+verbose = False
+nodiff = False
+coverage = False
+python = None
+
+def parse_args():
 parser = optparse.OptionParser("%prog [options] [tests]")
 parser.add_option("-C", "--annotate", action="store_true",
     help="output files annotated with coverage")
@@ -90,6 +97,8 b' for option, default in defaults.items():'
     defaults[option] = int(os.environ.get(*default))
 parser.set_defaults(**defaults)
 (options, args) = parser.parse_args()
+
+    global verbose, nodiff, coverage, python
 verbose = options.verbose
 nodiff = options.nodiff
 coverage = options.cover or options.cover_stdlib or options.annotate
@@ -102,6 +111,8 b' if options.interactive and options.jobs '
     print '(--interactive overrides --jobs)'
     options.jobs = 1
 
+    return (options, args)
+
 def rename(src, dst):
     """Like os.rename(), trade atomicity and opened files friendliness
     for existing destination support.
@@ -478,6 +489,7 b' def run_one(test, skips, fails):'
         return None
     return ret == 0
 
+(options, args) = parse_args()
 if not options.child:
     os.umask(022)