+ status = self.metadir.working_dir_status()
+ for filename in status:
+ if status[filename] == 'M':
+ print self.metadir.diff_rv_to_working(
+ mw.metadir.filename_to_pagename(filename[:-5])),
+
+
+class MergeCommand(CommandBase):
+ def __init__(self):
+ 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':
+ full_filename = os.path.join(self.metadir.root, filename)
+ pagename = mw.metadir.filename_to_pagename(filename[:-5])
+ # mv local to filename.wiki.local
+ os.rename(full_filename, full_filename + '.local')
+ # pull wiki copy
+ pull_command = PullCommand()
+ pull_command.args = [pagename.encode('utf-8')]
+ pull_command._do_command()
+ # mv remote to filename.wiki.remote
+ os.rename(full_filename, full_filename + '.remote')
+ # Open merge tool
+ 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')
+ os.remove(full_filename + '.remote')
+ # mw ci pagename
+ commit_command = CommitCommand()
+ commit_command.args = [pagename.encode('utf-8')]
+ commit_command._do_command()
+
+
+class CommitCommand(CommandBase):
+
+ def __init__(self):
+ usage = '[FILES]'
+ CommandBase.__init__(self, 'commit', 'commit changes to wiki', usage)
+ self.shortcuts.append('ci')
+ self.parser.add_option('-m', '--message', dest='edit_summary',
+ help='don\'t prompt for edit summary and '
+ 'use this instead')
+ 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)
+
+ 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)
+ for filename in status:
+ if status[filename] in ['M']:
+ print '%s %s' % (status[filename], filename)
+ files_to_commit += 1
+ if not files_to_commit:
+ print 'nothing to commit'
+ sys.exit()
+ if self.options.edit_summary == None:
+ print 'Edit summary:',
+ edit_summary = raw_input()
+ else:
+ edit_summary = self.options.edit_summary
+ for filename in status:
+ if status[filename] in ['M']:
+ files_to_commit -= 1
+ # get edit token
+ data = {
+ 'action': 'query',
+ 'prop': 'info|revisions',
+ 'intoken': 'edit',
+ 'titles': mw.metadir.filename_to_pagename(filename[:-5]),
+ }
+ response = self.api.call(data)
+ pages = response['query']['pages']
+ pageid = pages.keys()[0]
+ revid = 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! (try merge)' % (filename, awaitedrevid, revid)
+ continue
+ edittoken = pages[pageid]['edittoken']
+ full_filename = os.path.join(self.metadir.root, filename)
+ text = codecs.open(full_filename, 'r', 'utf-8').read()
+ text = text.encode('utf-8')
+ if (len(text) != 0) and (text[-1] == '\n'):
+ text = text[:-1]
+ md5 = hashlib.md5()
+ md5.update(text)
+ textmd5 = md5.hexdigest()
+ data = {
+ 'action': 'edit',
+ 'title': mw.metadir.filename_to_pagename(filename[:-5]),
+ 'token': edittoken,
+ 'text': text,
+ 'md5': textmd5,
+ 'summary': edit_summary,
+ }
+ 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 - ' \
+ 'skipping and removing ending LF' % filename
+ pagename = mw.metadir.filename_to_pagename(filename[:-5])
+ self.metadir.clean_page(pagename)
+ continue
+ if response['edit']['oldrevid'] != revid:
+ print 'warning: edit conflict detected on %s (%s -> %s) ' \
+ '-- skipping!' % (file,
+ response['edit']['oldrevid'], revid)
+ continue
+ data = {
+ 'action': 'query',
+ 'revids': response['edit']['newrevid'],
+ 'prop': 'info|revisions',
+ 'rvprop':
+ 'ids|flags|timestamp|user|comment|content',
+ }
+ response = self.api.call(data)['query']['pages']
+ 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]]
+ with file(full_filename, 'w') as fd:
+ data = response[pageid]['revisions'][0]['*']
+ data = data.encode('utf-8')
+ fd.write(data)
+ if files_to_commit :
+ print 'waiting 3s before processing the next file'
+ time.sleep(3)