commit command shortcut

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index e44f0d8b639501a794885cccdf0e2209b63f9131..5eab8bdbea9b982834b1e9b700311e08b0783c10 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -31,14 +31,16 @@ class CommandBase(object):
         self.description = description
         if usage is None:
             usage = '%prog ' + name
+        else:
+            usage = '%%prog %s %s' % (name, usage)
         self.parser = OptionParser(usage=usage, description=description)
         self.name = name
         self.metadir = mw.metadir.Metadir()
-        global_options = OptionGroup(self.parser, "Global Options")
-        global_options.add_option('-u', '--use-auth', action='store_true',
-                                  dest='use_auth', help='force authentication '
-                                  'even if not required')
-        self.parser.add_option_group(global_options)
+        #global_options = OptionGroup(self.parser, "Global Options")
+        #global_options.add_option('-u', '--use-auth', action='store_true',
+        #                          dest='use_auth', help='force authentication '
+        #                          'even if not required')
+        #self.parser.add_option_group(global_options)
         self.shortcuts = []
 
     def main(self):
@@ -71,21 +73,23 @@ class CommandBase(object):
 class InitCommand(CommandBase):
 
     def __init__(self):
-        usage = '%prog init API_URL'
+        usage = 'API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)
+        self.parser.add_option('-u', '--username', dest='username',
+                               help='use wiki with login')
 
     def _do_command(self):
         if len(self.args) < 1:
             self.parser.error('must have URL to remote api.php')
         elif len(self.args) > 1:
             self.parser.error('too many arguments')
-        self.metadir.create(self.args[0])
+        self.metadir.create(self.args[0], self.options.username)
 
 
 class PullCommand(CommandBase):
 
     def __init__(self):
-        usage = '%prog fetch [options] PAGENAME ...'
+        usage = '[options] PAGENAME ...'
         CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
 
     def _do_command(self):
@@ -144,3 +148,14 @@ class DiffCommand(CommandBase):
                 print self.metadir.diff_rv_to_working(
                     mw.api.filename_to_pagename(file[:-5])
                 ),
+
+
+class CommitCommand(CommandBase):
+
+    def __init__(self):
+        CommandBase.__init__(self, 'commit', 'commit changes to wiki')
+        self.shortcuts.append('ci')
+
+    def _do_command(self):
+        self._die_if_no_init()
+        self._api_setup()