Move some cmdline code to a more logical place.

2 files changed, 6 insertions, 4 deletions

diff --git a/TODO.txt b/TODO.txt
index be8f8010..d1b30257 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -101,6 +101,7 @@ x Why can't you specify execute (-x) and report (-r) in the same invocation?
     - Some way to focus in on red and yellow

         - Show only lines near highlights?

         - Jump to next highlight?

+            - Keyboard navigation: N and P

     - Cookie for changes to pyfile.html state.

     + Clickable column headers on the index page.

     + Syntax coloring in HTML report.

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index fe8da549..27c28d48 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -370,10 +370,6 @@ class CoverageScript(object):
                 self.help_fn(parser=parser)
             return OK
 
-        if options.version:
-            self.help_fn(topic='version')
-            return OK
-
         if "help" in options.actions:
             if args:
                 for a in args:
@@ -386,6 +382,11 @@ class CoverageScript(object):
                 self.help_fn(topic='help')
             return OK
 
+        # Handle version.
+        if options.version:
+            self.help_fn(topic='version')
+            return OK
+
         # Check for conflicts and problems in the options.
         for i in ['erase', 'execute']:
             for j in ['annotate', 'html', 'report', 'combine']: