Write basic diff command using bzrlib.diff

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 3657d532ad18280d37db5bdd90878fede112ec77..8f951a60bed7f6f92c8926fc24c8ee9fa115da3e 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
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 import getpass
@@ -24,7 +23,9 @@ from optparse import OptionParser, OptionGroup
 import os
 import sys
 
+
 class CommandBase(object):
+
     def __init__(self, name, description, usage=None):
         self.me = os.path.basename(sys.argv[0])
         self.description = description
@@ -45,9 +46,17 @@ class CommandBase(object):
         self.args = self.args[1:] # don't need the first thing
         self._do_command()
 
+    def _do_command(self):
+        pass
+
     def _login(self):
         user = raw_input('Username: ')
         passwd = getpass.getpass()
+        result = self.api.call({'action': 'login',
+                                'lgname': user,
+                                'lgpassword': passwd})
+        if result['login']['result'] != 'Success':
+            raise Exception('Login error: %s' % result['login']['result'])
 
     def _die_if_no_init(self):
         if self.metadir.config is None:
@@ -60,6 +69,7 @@ class CommandBase(object):
 
 
 class InitCommand(CommandBase):
+
     def __init__(self):
         usage = '%prog init API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)
@@ -72,18 +82,18 @@ class InitCommand(CommandBase):
         self.metadir.create(self.args[0])
 
 
-class FetchCommand(CommandBase):
+class PullCommand(CommandBase):
+
     def __init__(self):
         usage = '%prog fetch [options] PAGENAME ...'
-        CommandBase.__init__(self, 'fetch', 'fetch remote pages', usage)
-        self.shortcuts.append('ft')
+        CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
 
     def _do_command(self):
         self._die_if_no_init()
         self._api_setup()
         pages = []
         pages += self.args
-        for these_pages in [pages[i:i+25] for i in range(0, len(pages), 25)]:
+        for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:
             data = {
                     'action': 'query',
                     'titles': '|'.join(these_pages),
@@ -92,12 +102,45 @@ class FetchCommand(CommandBase):
             }
             response = self.api.call(data)['query']['pages']
             for pageid in response.keys():
-                revid = [x['revid'] for x in response[pageid]['revisions']]
-                self.metadir.add_page_info(int(pageid),
-                                           response[pageid]['title'],
-                                           revid)
-                self.metadir.add_rv_info(response[pageid]['revisions'][0])
-                fd = file(os.path.join(self.metadir.root, \
-                        response[pageid]['title'].replace(' ', '_') + \
-                        '.wiki'), 'w')
+                pagename = response[pageid]['title']
+                if 'missing' in response[pageid].keys():
+                    print '%s: %s: page does not exist, file not created' % \
+                            (self.me, pagename)
+                    continue
+                revids = [x['revid'] for x in response[pageid]['revisions']]
+                revids.sort()
+                self.metadir.pagedict_add(pagename, pageid, revids[-1])
+                self.metadir.pages_add_rv(int(pageid),
+                                          response[pageid]['revisions'][0])
+                filename = mw.api.pagename_to_filename(pagename)
+                fd = file(os.path.join(self.metadir.root, filename + '.wiki'),
+                          'w')
                 fd.write(response[pageid]['revisions'][0]['*'].encode('utf-8'))
+
+
+class StatusCommand(CommandBase):
+
+    def __init__(self):
+        CommandBase.__init__(self, 'status', 'check repo status')
+        self.shortcuts.append('st')
+
+    def _do_command(self):
+        self._die_if_no_init()
+        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])
+                )