Merge branch 'upstream'

[mw] / src / mw / cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index ef33d7357b41a267edb7237f28038a892fc0932a..6e73c027b0c9acda0ed2ac94a3e1b696b601d434 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -1,6 +1,6 @@
 ###
 # mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 2010  Ian Weller <ian@ianweller.org>
+# Copyright (C) 2011  Ian Weller <ian@ianweller.org> and others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,7 +45,9 @@ class CLI(object):
     def usage(self):
         print 'usage: %s [subcommand]' % self.me
         print
-        for name in self.commands:
+        commands = self.commands.keys()
+        commands.sort()
+        for name in commands:
             cmd = self.commands[name]
             if len(cmd.shortcuts) > 0:
                 full = name + ' (' + ' '.join(cmd.shortcuts) + ')'
@@ -59,7 +61,7 @@ class CLI(object):
         # determine what the subcommand is
         if len(sys.argv) > 1:
             if sys.argv[1] in self.all_commands:
-                the_command = sys.argv[1] # SWEET ACTION
+                the_command = sys.argv[1]  # SWEET ACTION
             elif sys.argv[1] in ['--help', '-h', 'help']:
                 self.usage()
             else: