X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/af5f9b43d968a775d0dd1ce6f1edc7bda0f799eb..ec2daa42720cdc0b7940d124fbe7bac399294dff:/src/mw/clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 4ecafb0..088df16 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -149,10 +149,10 @@ class PullCommand(CommandBase):
                 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'))
-
+                with file(os.path.join(self.metadir.root, filename + '.wiki'),
+                          'w') as fd:
+                    data = response[pageid]['revisions'][0]['*'].encode('utf-8')
+                    fd.write(data)
 
 class StatusCommand(CommandBase):
 
@@ -190,7 +190,7 @@ class CommitCommand(CommandBase):
         self.parser.add_option('-m', '--message', dest='edit_summary',
                                help='don\'t prompt for edit summary and '
                                'use this instead')
-        self.parser.add_option('--bot', dest='bot', action='store_true',
+        self.parser.add_option('-b', '--bot', dest='bot', action='store_true',
                                help='mark actions as a bot (won\'t affect '
                                'anything if you don\'t have the bot right',
                                default=False)
@@ -207,10 +207,6 @@ class CommitCommand(CommandBase):
         if nothing_to_commit:
             print 'nothing to commit'
             sys.exit()
-        print
-        print 'WARNING: mw does not do collision detection yet.'
-        print 'Hit ^C now if you haven\'t double checked, otherwise hit Enter'
-        raw_input()
         if self.options.edit_summary == None:
             print 'Edit summary:',
             edit_summary = raw_input()
@@ -221,18 +217,24 @@ class CommitCommand(CommandBase):
                 # get edit token
                 data = {
                         'action': 'query',
-                        'prop': 'info',
+                        'prop': 'info|revisions',
                         'intoken': 'edit',
                         'titles': mw.api.filename_to_pagename(file[:-5]),
                 }
                 response = self.api.call(data)
                 pageid = response['query']['pages'].keys()[0]
+                revid = response['query']['pages'][pageid]['revisions'][0]['revid']
+                awaitedrevid = self.metadir.pages_get_rv_list( {'id': pageid } )[0]                
+                if revid != awaitedrevid:
+                    print "warning: edit conflict detected on %s (%s -> %s) " \
+                            "-- skipping!" % (file , awaitedrevid, revid)
+                    continue
                 edittoken = response['query']['pages'][pageid]['edittoken']
                 # FIXME use basetimestamp and starttimestamp
                 filename = os.path.join(self.metadir.root, file)
                 text = codecs.open(filename, 'r', 'utf-8').read()
                 text = text.encode('utf-8')
-                if text[-1] == '\n':
+                if (len(text) != 0) and (text[-1] == '\n'):
                     text = text[:-1]
                 md5 = hashlib.md5()
                 md5.update(text)
@@ -249,6 +251,15 @@ class CommitCommand(CommandBase):
                     data['bot'] = 'bot'
                 response = self.api.call(data)
                 if response['edit']['result'] == 'Success':
+                    if response['edit'].has_key('nochange'):
+                        print "warning: no changes detected in %s - " \
+                                "skipping and removing ending LF" % file
+                        self.metadir.clean_page(file[:-5])
+                        continue
+                    if response['edit']['oldrevid'] != revid:
+                        print "warning: edit conflict detected on %s -- " \
+                                "skipping!" % file
+                        continue
                     data = {
                             'action': 'query',
                             'revids': response['edit']['newrevid'],
@@ -260,5 +271,5 @@ class CommitCommand(CommandBase):
                     self.metadir.pages_add_rv(int(pageid),
                                               response[pageid]['revisions'][0])
                 else:
-                    print 'committing %s failed: %s' % \
+                    print 'error: committing %s failed: %s' % \
                             (file, response['edit']['result'])