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']
- # Is the revisions list a sorted one, should I use [0] or [-1]? -- reagle
+ 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_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" by "%s"' % (
pagename, last_wiki_rev_comment, last_wiki_rev_user)
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):
class MergeCommand(CommandBase):
def __init__(self):
- CommandBase.__init__(self, 'merge', 'merge local and wiki copies')
- self.merge_tool = self.metadir.config.get('merge', 'tool')
+ 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':
# 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'])
+ 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')
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',
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]]
+ #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:
+ if files_to_commit :
print 'waiting 3s before processing the next file'
time.sleep(3)
else: