X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/40c5643cb1449c86bcf90c1ece8d33631936e4f6..cb2e8527af434daeeb20e4c796df43b7cff2b1a9:/src/mw/clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 8a7971d..433e607 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -187,6 +187,11 @@ class PullCommand(CommandBase):
             for pageid in response.keys():
                 pagename = response[pageid]['title']
                 
+                # If no revisions, then error, perhaps page deleted
+                if 'revisions' not in response[pageid]:
+                    print 'skipping:       "%s" -- cannot find page, perhaps deleted' % (pagename)
+                    continue
+                
                 # Is the revisions list a sorted one, should I use [0] or [-1]? -- reagle
                 if 'comment' in response[pageid]['revisions'][0]:
                     last_wiki_rev_comment = response[pageid]['revisions'][0]['comment']
@@ -254,11 +259,12 @@ class DiffCommand(CommandBase):
 
 class MergeCommand(CommandBase):
     def __init__(self):
-        CommandBase.__init__(self, 'merge', 'merge local and wiki copies')
-        self.merge_tool = self.metadir.config.get('merge', 'tool')
+        usage = '[FILES]'
+        CommandBase.__init__(self, 'merge', 'merge local and wiki copies', usage)
 
     def _do_command(self):
         self._die_if_no_init()
+        self.merge_tool = self.metadir.config.get('merge', 'tool')
         status = self.metadir.working_dir_status()
         for filename in status:
             if status[filename] == 'M':
@@ -273,8 +279,9 @@ class MergeCommand(CommandBase):
                 # mv remote to filename.wiki.remote
                 os.rename(full_filename, full_filename + '.remote')
                 # Open merge tool
-                subprocess.call([self.merge_tool, full_filename + '.local', 
-                    full_filename + '.remote', '-o', full_filename + '.merge'])
+                merge_command = self.merge_tool % (full_filename + '.local', 
+                    full_filename + '.remote', full_filename + '.merge')
+                subprocess.call(merge_command.split(' '))
                 # mv filename.merge filename and delete tmp files
                 os.rename(full_filename + '.merge', full_filename)
                 os.remove(full_filename + '.local')
@@ -302,13 +309,13 @@ class CommitCommand(CommandBase):
     def _do_command(self):
         self._die_if_no_init()
         self._api_setup()
+        files_to_commit = 0 # how many files to process
         status = self.metadir.working_dir_status(files=self.args)
-        nothing_to_commit = True
         for filename in status:
             print '%s %s' % (status[filename], filename)
             if status[filename] in ['M']:
-                nothing_to_commit = False
-        if nothing_to_commit:
+                files_to_commit += 1
+        if not files_to_commit:
             print 'nothing to commit'
             sys.exit()
         if self.options.edit_summary == None:
@@ -316,8 +323,9 @@ class CommitCommand(CommandBase):
             edit_summary = raw_input()
         else:
             edit_summary = self.options.edit_summary
-        for file_num, filename in enumerate(status):
+        for filename in status:
             if status[filename] in ['M']:
+                files_to_commit -= 1
                 # get edit token
                 data = {
                         'action': 'query',
@@ -383,12 +391,12 @@ class CommitCommand(CommandBase):
                     self.metadir.pages_add_rv(int(pageid),
                                               response[pageid]['revisions'][0])
                     # need to write latest rev to file too, as text may be changed
-                    # such as a sig, e.g., -~ =>  -[[User:Reagle|Reagle]]
+                    #such as a sig, e.g., -~ =>  -[[User:Reagle|Reagle]]
                     with file(full_filename, 'w') as fd:
                         data = response[pageid]['revisions'][0]['*']
                         data = data.encode('utf-8')
                         fd.write(data)
-                    if file_num != len(status) - 1:
+                    if files_to_commit :
                         print 'waiting 3s before processing the next file'
                         time.sleep(3)
                 else: