trying merge

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index b6770042c2feba4a327bff064982a6152acf2ba7..2681c438ee99aa4d5da20856340eeeb0fbfe43b4 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -186,7 +186,7 @@ class PullCommand(CommandBase):
             for pageid in response.keys():
                 pagename = response[pageid]['title']
                 
             for pageid in response.keys():
                 pagename = response[pageid]['title']
                 

-                # is the revisions list a sorted one, should I use [0] or [-1]?
+                # XXX is the revisions list a sorted one, should I use [0] or [-1]?

                 last_wiki_rev_comment = response[pageid]['revisions'][0]['comment']
                 last_wiki_rev_user = response[pageid]['revisions'][0]['user']
                 
                 last_wiki_rev_comment = response[pageid]['revisions'][0]['comment']
                 last_wiki_rev_user = response[pageid]['revisions'][0]['user']
                 


@@ -319,6 +319,11 @@ class CommitCommand(CommandBase):
                 if self.options.bot:
                     data['bot'] = 'bot'
                 response = self.api.call(data)
                 if self.options.bot:
                     data['bot'] = 'bot'
                 response = self.api.call(data)

+                 if 'error' in response:
+                     if 'code' in response['error']:
+                         if response['error']['code'] == 'permissiondenied':
+                             print 'Permission denied -- try running "mw login"'
+                             return

                 if response['edit']['result'] == 'Success':
                     if 'nochange' in response['edit']:
                         print 'warning: no changes detected in %s - ' \
                 if response['edit']['result'] == 'Success':
                     if 'nochange' in response['edit']:
                         print 'warning: no changes detected in %s - ' \