###
# mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 2010 Ian Weller <ian@ianweller.org>
+# Copyright (C) 2011 Ian Weller <ian@ianweller.org> and others
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
from optparse import OptionParser, OptionGroup
import os
import simplemediawiki
+import subprocess
import sys
import time
sys.exit(1)
def _api_setup(self):
- cookie_file = os.path.join(self.metadir.location, 'cookies')
+ cookie_filename = os.path.join(self.metadir.location, 'cookies')
self.api_url = self.metadir.config.get('remote', 'api_url')
self.api = simplemediawiki.MediaWiki(self.api_url,
- cookie_file=cookie_file)
+ cookie_file=cookie_filename)
class InitCommand(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):
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):
-
+
def __init__(self):
usage = '[options] PAGENAME ...'
CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
self._api_setup()
pages = []
pages += self.args
- for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:
+
+ # Pull should work with pagename, filename, or working directory
+ converted_pages = []
+ if pages == []:
+ pages = self.metadir.working_dir_status().keys()
+ for pagename in pages:
+ if '.wiki' in pagename:
+ converted_pages.append(
+ mw.metadir.filename_to_pagename(pagename[:-5]))
+ else:
+ converted_pages.append(pagename)
+ pages = converted_pages
+
+ for these_pages in [pages[i:i + 25] for i in
+ range(0, len(pages), 25)]: # what does this '25' do? - reagle
data = {
'action': 'query',
'titles': '|'.join(these_pages),
'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 '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']
+ 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 '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])
- filename = mw.metadir.pagename_to_filename(pagename)
- 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)
+ pass
+ 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):
CommandBase.__init__(self, 'status', 'check repo status')
self.shortcuts.append('st')
+ self.parser.add_option('-A', '--all', dest='show_all', action='store_true',
+ default = False,
+ help="show all files' status")
def _do_command(self):
self._die_if_no_init()
status = self.metadir.working_dir_status()
- for file in status:
- print '%s %s' % (status[file], file)
+ for filename in status:
+
+ if not self.options.show_all and status[filename] == 'C':
+ continue
+ else:
+ print '%s %s' % (status[filename], filename)
class DiffCommand(CommandBase):
def _do_command(self):
self._die_if_no_init()
status = self.metadir.working_dir_status()
- for file in status:
- if status[file] == 'M':
+ for filename in status:
+ if status[filename] == 'M':
print self.metadir.diff_rv_to_working(
- mw.metadir.filename_to_pagename(file[:-5])),
+ 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 _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 file in status:
- print '%s %s' % (status[file], file)
- if status[file] in ['M']:
- nothing_to_commit = False
- if nothing_to_commit:
+ 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:
edit_summary = raw_input()
else:
edit_summary = self.options.edit_summary
- for file_num, file in enumerate(status):
- if status[file] in ['M']:
+ 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(file[:-5]),
+ 'titles': mw.metadir.filename_to_pagename(filename[:-5]),
}
response = self.api.call(data)
pages = response['query']['pages']
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, file)
- 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]
textmd5 = md5.hexdigest()
data = {
'action': 'edit',
- 'title': mw.metadir.filename_to_pagename(file[:-5]),
+ 'title': mw.metadir.filename_to_pagename(filename[:-5]),
'token': edittoken,
'text': text,
'md5': textmd5,
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' % file
- self.metadir.clean_page(file[:-5])
+ '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 -- ' \
- 'skipping!' % file
+ print 'warning: edit conflict detected on %s (%s -> %s) ' \
+ '-- skipping!' % (file,
+ response['edit']['oldrevid'], revid)
continue
data = {
'action': 'query',
response = self.api.call(data)['query']['pages']
self.metadir.pages_add_rv(int(pageid),
response[pageid]['revisions'][0])
- if file_num != len(status) - 1:
- print 'waiting 10s before processing the next file'
- time.sleep(10)
+ # 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)
else:
print 'error: committing %s failed: %s' % \
- (file, response['edit']['result'])
+ (filename, response['edit']['result'])
projects / mw / blobdiff