X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/6ef083635c4bf8eb46d29de59501da90fe34b994..40c5643cb1449c86bcf90c1ece8d33631936e4f6:/src/mw/clicommands.py diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 0fa122a..8a7971d 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -24,6 +24,7 @@ import mw.metadir from optparse import OptionParser, OptionGroup import os import simplemediawiki +import subprocess import sys import time @@ -126,7 +127,7 @@ class PullCategoryMembersCommand(CommandBase): def __init__(self): usage = '[options] PAGENAME ...' - CommandBase.__init__(self, 'pullcat', 'add remote pages to repo ' + CommandBase.__init__(self, 'pull_commandat', 'add remote pages to repo ' 'belonging to the given category', usage) def _do_command(self): @@ -145,9 +146,9 @@ class PullCategoryMembersCommand(CommandBase): for pageid in response.keys(): pagename = response[pageid]['title'] print pagename - pullc = PullCommand() - pullc.args = [pagename.encode('utf-8')] - pullc._do_command() + pull_command = PullCommand() + pull_command.args = [pagename.encode('utf-8')] + pull_command._do_command() class PullCommand(CommandBase): @@ -174,7 +175,7 @@ class PullCommand(CommandBase): converted_pages.append(pagename) pages = converted_pages - 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)]: # XXX ? data = { 'action': 'query', 'titles': '|'.join(these_pages), @@ -182,32 +183,48 @@ class PullCommand(CommandBase): 'rvprop': 'ids|flags|timestamp|user|comment|content', } response = self.api.call(data)['query']['pages'] + # for every pageid, returns dict.keys() = {'lastrevid', 'pageid', 'title', 'counter', 'length', 'touched': u'2011-02-02T19:32:04Z', 'ns', 'revisions' {...}} for pageid in response.keys(): pagename = response[pageid]['title'] - # if pagename exists as file and its status is 'M' warn not pulled + + # 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'] + else: + last_wiki_rev_comment = '' + last_wiki_rev_user = response[pageid]['revisions'][0]['user'] + + # check if working file is modified or if wiki page doesn't exists status = self.metadir.working_dir_status() filename = mw.metadir.pagename_to_filename(pagename) + full_filename = os.path.join(self.metadir.root, filename + '.wiki') if filename + '.wiki' in status and \ status[filename + '.wiki' ] in ['M']: - print('%s: "%s" has uncommitted modifications ' - '-- skipping!' % (self.me, pagename)) + print 'skipping: "%s" -- uncommitted modifications ' % (pagename) continue if 'missing' in response[pageid].keys(): - print '%s: %s: page does not exist, file not created' % \ + print 'error: "%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]) - with file(os.path.join(self.metadir.root, filename + '.wiki'), - 'w') as fd: - data = response[pageid]['revisions'][0]['*'] - data = data.encode('utf-8') - fd.write(data) - + wiki_revids = sorted([x['revid'] for x in response[pageid]['revisions']]) + last_wiki_revid = wiki_revids[-1] + working_revids = sorted(self.metadir.pages_get_rv_list({'id' : pageid})) + last_working_revid = working_revids[-1] + if ( os.path.exists(full_filename) and + last_wiki_revid == last_working_revid): + print 'wiki unchanged: "%s"' % (pagename) + else: + print 'pulling: "%s" : "%s" by "%s"' % ( + pagename, last_wiki_rev_comment, last_wiki_rev_user) + self.metadir.pagedict_add(pagename, pageid, last_wiki_revid) + self.metadir.pages_add_rv(int(pageid), + response[pageid]['revisions'][0]) + with file(full_filename, 'w') as fd: + data = response[pageid]['revisions'][0]['*'] + data = data.encode('utf-8') + fd.write(data) + class StatusCommand(CommandBase): def __init__(self): @@ -235,6 +252,39 @@ class DiffCommand(CommandBase): mw.metadir.filename_to_pagename(filename[:-5])), +class MergeCommand(CommandBase): + def __init__(self): + CommandBase.__init__(self, 'merge', 'merge local and wiki copies') + self.merge_tool = self.metadir.config.get('merge', 'tool') + + def _do_command(self): + self._die_if_no_init() + 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 + subprocess.call([self.merge_tool, full_filename + '.local', + full_filename + '.remote', '-o', full_filename + '.merge']) + # 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): @@ -282,12 +332,12 @@ class CommitCommand(CommandBase): 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) + print 'warning: edit conflict detected on "%s" (%s -> %s) ' \ + '-- skipping! (try merge)' % (filename, awaitedrevid, revid) continue edittoken = pages[pageid]['edittoken'] - filename = os.path.join(self.metadir.root, filename) - text = codecs.open(filename, 'r', 'utf-8').read() + 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] @@ -305,15 +355,22 @@ class CommitCommand(CommandBase): 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 - self.metadir.clean_page(filename[:-5]) + 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 -- ' \ - 'skipping!' % filename + print 'warning: edit conflict detected on %s (%s -> %s) ' \ + '-- skipping!' % (file, + response['edit']['oldrevid'], revid) continue data = { 'action': 'query', @@ -325,6 +382,12 @@ class CommitCommand(CommandBase): 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 file_num != len(status) - 1: print 'waiting 3s before processing the next file' time.sleep(3)