projects
/
mw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nix warning on edit collision since we do that now
[mw]
/
src
/
mw
/
cli.py
diff --git
a/src/mw/cli.py
b/src/mw/cli.py
index 238f72ed9b518264f17e2ea28bfed8719577dc6e..52df23b658101c7a7d909e6c1ed8ad3466fc03c8 100644
(file)
--- a/
src/mw/cli.py
+++ b/
src/mw/cli.py
@@
-1,6
+1,6
@@
###
# mw - VCS-like nonsense for MediaWiki websites
###
# mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 20
09
Ian Weller <ian@ianweller.org>
+# Copyright (C) 20
10
Ian Weller <ian@ianweller.org>
#
# 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
#
# 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
@@
-16,13
+16,13
@@
# with this program. If not, see <http://www.gnu.org/licenses/>.
###
# with this program. If not, see <http://www.gnu.org/licenses/>.
###
-import inspect
import mw.clicommands
import os
import sys
import mw.clicommands
import os
import sys
-from pprint import pprint
+
class CLI(object):
class CLI(object):
+
def __init__(self):
self.me = os.path.basename(sys.argv[0])
self.commands = {}
def __init__(self):
self.me = os.path.basename(sys.argv[0])
self.commands = {}
@@
-45,7
+45,9
@@
class CLI(object):
def usage(self):
print 'usage: %s [subcommand]' % self.me
print
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) + ')'
cmd = self.commands[name]
if len(cmd.shortcuts) > 0:
full = name + ' (' + ' '.join(cmd.shortcuts) + ')'
@@
-60,7
+62,7
@@
class CLI(object):
if len(sys.argv) > 1:
if sys.argv[1] in self.all_commands:
the_command = sys.argv[1] # SWEET ACTION
if len(sys.argv) > 1:
if sys.argv[1] in self.all_commands:
the_command = sys.argv[1] # SWEET ACTION
- elif sys.argv[1] in ['--help', '-h']:
+ elif sys.argv[1] in ['--help', '-h'
, 'help'
]:
self.usage()
else:
print '%s: invalid subcommand: %s' % (self.me, sys.argv[1])
self.usage()
else:
print '%s: invalid subcommand: %s' % (self.me, sys.argv[1])
Benjamin Mako Hill
||
Want to submit a patch?