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 bc9683cdc1dd8902b8a1dcbdc9cd45f27e2ecdf1..e441e3072441f06b701b8962adf3fb22aec2ea4e 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -1,6 +1,6 @@
 ###
 # mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 2009  Ian Weller <ian@ianweller.org>
+# Copyright (C) 2010  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
@@ -16,7 +16,6 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
-import codecs
 import getpass
 import mw.api
 import mw.metadir
@@ -32,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()
@@ -72,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):
@@ -86,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):
@@ -127,23 +128,21 @@ class StatusCommand(CommandBase):
 
     def _do_command(self):
         self._die_if_no_init()
-        check = []
-        for root, dirs, files in os.walk(self.metadir.root):
-            if root == self.metadir.root:
-                dirs.remove('.mw')
-            for name in files:
-                check.append(os.path.join(root, name))
-        check.sort()
-        for full in check:
-            name = os.path.split(full)[1]
-            if name[-5:] == '.wiki':
-                pagename = mw.api.filename_to_pagename(name[:-5])
-                pageid = self.metadir.get_pageid_from_pagename(pagename)
-                if not pageid:
-                    print '? %s' % os.path.relpath(full, self.metadir.root)
-                else:
-                    rvid = self.metadir.pages_get_rv_list(pageid)[-1]
-                    rv = self.metadir.pages_get_rv(pageid, rvid)
-                    cur_content = codecs.open(full, 'r', 'utf-8').read()
-                    if cur_content != rv['content']:
-                        print 'U %s' % os.path.relpath(full, self.metadir.root)
+        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])
+                ),