from optparse import OptionParser, OptionGroup
import os
import simplemediawiki
+import subprocess
import sys
import time
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):
converted_pages.append(pagename)
pages = converted_pages
- for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]: # XXX ?
+ 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),
for pageid in response.keys():
pagename = response[pageid]['title']
- # XXX is the revisions list a sorted one, should I use [0] or [-1]?
- last_wiki_rev_comment = response[pageid]['revisions'][0]['comment']
+ 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
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)
+ 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
last_working_revid = working_revids[-1]
if ( os.path.exists(full_filename) and
last_wiki_revid == last_working_revid):
- print 'wiki unchanged: %s' % (pagename)
+ #print 'wiki unchanged: "%s"' % (pagename)
+ pass
else:
- print 'pulling: %s : %s -- %s' % (
+ 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),
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 filename in status:
- print '%s %s' % (status[filename], filename)
+
+ if not self.options.show_all and status[filename] == 'C':
+ continue
+ else:
+ print '%s %s' % (status[filename], filename)
class DiffCommand(CommandBase):
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):
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:
+ 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, filename in enumerate(status):
+ for filename in status:
if status[filename] in ['M']:
+ files_to_commit -= 1
# get edit token
data = {
'action': 'query',
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']
full_filename = os.path.join(self.metadir.root, filename)
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 '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 - ' \
response = self.api.call(data)['query']['pages']
self.metadir.pages_add_rv(int(pageid),
response[pageid]['revisions'][0])
- if file_num != len(status) - 1:
+ # 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:
projects / mw / blobdiff