Minor fix to usage bit in command generator

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index c940bd9259b9c83c368346a5956692baf42fb648..e441e3072441f06b701b8962adf3fb22aec2ea4e 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -31,6 +31,8 @@ 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()
@@ -71,7 +73,7 @@ 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)
 
     def _do_command(self):
@@ -85,7 +87,7 @@ class InitCommand(CommandBase):
 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):
@@ -129,3 +131,18 @@ class StatusCommand(CommandBase):
         status = self.metadir.working_dir_status()
         for file in status:
             print '%s %s' % (status[file], file)
+
+
+class DiffCommand(CommandBase):
+
+    def __init__(self):
+        CommandBase.__init__(self, 'diff', 'diff wiki to working directory')
+
+    def _do_command(self):
+        self._die_if_no_init()
+        status = self.metadir.working_dir_status()
+        for file in status:
+            if status[file] == 'U':
+                print self.metadir.diff_rv_to_working(
+                    mw.api.filename_to_pagename(file[:-5])
+                ),