def test__render_data_diff(self):
item_name = u'Html_Item'
empty_html = u'<span></span>'
html = u'<span>\ud55c</span>'
meta = {CONTENTTYPE: u'text/html;charset=utf-8'}
item = Item.create(item_name)
item._save(meta, empty_html)
item = Item.create(item_name)
# Unicode test, html escaping
rev1 = update_item(item_name, meta, html)
rev2 = update_item(item_name, {}, u' ')
result = Text._render_data_diff(item.content, rev1, rev2)
assert escape(html) in result
# Unicode test, whitespace
rev1 = update_item(item_name, {}, u'\n\n')
rev2 = update_item(item_name, {}, u'\n \n')
result = Text._render_data_diff(item.content, rev1, rev2)
assert '<span> </span>' in result
# If fairly similar diffs are correctly spanned or not, also check indent
rev1 = update_item(item_name, {}, u'One Two Three Four\nSix\n\ud55c')
rev2 = update_item(item_name, {}, u'Two Three Seven Four\nSix\n\ud55c')
result = Text._render_data_diff(item.content, rev1, rev2)
assert '<span>One </span>Two Three Four' in result
assert 'Two Three <span>Seven </span>Four' in result
# Check for diff_html.diff return types
assert reduce(lambda x, y: x and y, [
isinstance(i[1], unicode) and isinstance(i[3], unicode)
for i in diff_html.diff(u'One Two Three Four\nSix\n',
u'Two Three Seven Four\nSix Seven\n')
], True)
def test_diff():
test_input1 = """ \n
AAA 001
AAA 002
AAA 003
AAA 004
AAA 005
"""
# Case 1: charobj.ratio() < 0.5 i.e. Insufficient similarity
test_input2 = """ \n
BBB 006
BBB 007
BBB 008
BBB 009
BBB 100
"""
result = diff_html.diff(test_input1, test_input2)
expected = [(4, '<span><br>AAA 001<br>AAA 002<br>AAA 003<br>AAA 004<br>AAA 005</span>',
4, '<span>BBB 006<br>BBB 007<br>BBB 008<br>BBB 009<br>BBB 100</span>')]
assert result == expected
#Case 2 : charobj.ratio() > 0.5 i.e. Some similarities
test_input3 = """ \n
AAA 006
AAA 007
AAA 008
AAA 009
AAA 100
"""
result = diff_html.diff(test_input1, test_input3)
expected = [(4, '<br>AAA 00<span>1</span><br>AAA 00<span>2</span><br>AAA 00<span>3</span><br>AAA 00<span>4<br>AAA 005</span>',
4, '<span>AAA 006</span><br>AAA 00<span>7</span><br>AAA 00<span>8</span><br>AAA 00<span>9</span><br>AAA <span>1</span>00')]
assert result == expected
def test_diff():
test_input1 = """ \n
AAA 001
AAA 002
AAA 003
AAA 004
AAA 005
"""
# Case 1: charobj.ratio() < 0.5 i.e. Insufficient similarity
test_input2 = """ \n
BBB 006
BBB 007
BBB 008
BBB 009
BBB 100
"""
result = diff_html.diff(test_input1, test_input2)
expected = [(4, '<span><br>AAA 001<br>AAA 002<br>AAA 003<br>AAA 004<br>AAA 005</span>',
4, '<span>BBB 006<br>BBB 007<br>BBB 008<br>BBB 009<br>BBB 100</span>')]
assert result == expected
# Case 2 : charobj.ratio() > 0.5 i.e. Some similarities
test_input3 = """ \n
AAA 006
AAA 007
AAA 008
AAA 009
AAA 100
"""
result = diff_html.diff(test_input1, test_input3)
expected = [(4, '<br>AAA 00<span>1</span><br>AAA 00<span>2</span><br>AAA 00<span>3</span><br>AAA 00<span>4<br>AAA 005</span>',
4, '<span>AAA 006</span><br>AAA 00<span>7</span><br>AAA 00<span>8</span><br>AAA 00<span>9</span><br>AAA <span>1</span>00')]
assert result == expected
def _do_diff(pagename, request):
# return attachment list
_ = request.getText
form = values_to_form(request.values)
att1 = form.get('att1', [''])[0]
att2 = form.get('att2', [''])[0]
sort = form.get('sort', ['normal'])[0]
if (not (att1 and att2)
or not (AttachFile.exists(request, pagename, att1)
and AttachFile.exists(request, pagename, att2))):
AttachFile.error_msg(
pagename, request,
_('Could not diff, attachments not selected or nonexisting'))
return
form['target'] = [att1]
request.values = CombinedMultiDict([MultiDict(form)])
pagename, filename, fpath = AttachFile._access_file(pagename, request)
att1data = open(fpath, 'r').read()
form['target'] = [att2]
request.values = CombinedMultiDict([MultiDict(form)])
pagename, filename, fpath = AttachFile._access_file(pagename, request)
att2data = open(fpath, 'r').read()
if sort == 'sort':
att1data = '\n'.join(sorted(att1data.split('\n')))
att2data = '\n'.join(sorted(att2data.split('\n')))
elif sort == 'uniq':
att1data = '\n'.join(sorted(set(att1data.split('\n'))))
att2data = '\n'.join(sorted(set(att2data.split('\n'))))
elif sort == 'cnt':
att1tmp = list()
for line in sorted(set(att1data.split('\n'))):
if not line:
continue
att1tmp.append("%s %s" % (att1data.count(line), line))
att2tmp = list()
for line in sorted(set(att2data.split('\n'))):
if not line:
continue
att2tmp.append("%s %s" % (att2data.count(line), line))
att1data = '\n'.join(att1tmp)
att2data = '\n'.join(att2tmp)
# Use user interface language for this generated page
request.setContentLanguage(request.lang)
request.theme.send_title(_('Diff of %s and %s') % (att1, att2),
pagename=pagename)
request.write('<div id="content">\n') # start content div
if request.user.show_fancy_diff:
from MoinMoin.util import diff_html
request.write(
request.formatter.rawHTML(
diff_html.diff(request, att1data, att2data)))
else:
from MoinMoin.util import diff_text
lines = diff_text.diff(att1data.split("\n"), att2data.split("\n"))
request.write(request.formatter.preformatted(1))
for line in lines:
if line[0] == "@":
request.write(request.formatter.rule(1))
request.write(request.formatter.text(line + '\n'))
request.write(request.formatter.preformatted(0))
AttachFile.send_uploadform(pagename, request)
request.write('</div>\n') # end content div
request.theme.send_footer(pagename)
request.theme.send_closing_html()
def execute(pagename, request):
""" Handle "action=diff"
checking for either a "rev=formerrevision" parameter
or rev1 and rev2 parameters
"""
if not request.user.may.read(pagename):
Page(request, pagename).send_page()
return
try:
date = request.values['date']
try:
date = long(date) # must be long for py 2.2.x
except StandardError:
date = 0
except KeyError:
date = 0
try:
rev1 = int(request.values.get('rev1', -1))
except StandardError:
rev1 = 0
try:
rev2 = int(request.values.get('rev2', 0))
except StandardError:
rev2 = 0
if rev1 == -1 and rev2 == 0:
rev1 = request.rev
if rev1 is None:
rev1 = -1
# spacing flag?
ignorews = int(request.values.get('ignorews', 0))
_ = request.getText
# get a list of old revisions, and back out if none are available
currentpage = Page(request, pagename)
currentrev = currentpage.current_rev()
if currentrev < 2:
request.theme.add_msg(_("No older revisions available!"), "error")
currentpage.send_page()
return
if date: # this is how we get called from RecentChanges
rev1 = 0
log = editlog.EditLog(request, rootpagename=pagename)
for line in log.reverse():
if date >= line.ed_time_usecs and int(line.rev) != 99999999:
rev1 = int(line.rev)
break
else:
rev1 = 1
rev2 = 0
if rev1 > 0 and rev2 > 0 and rev1 > rev2 or rev1 == 0 and rev2 > 0:
rev1, rev2 = rev2, rev1
if rev1 == -1:
oldrev = currentrev - 1
oldpage = Page(request, pagename, rev=oldrev)
elif rev1 == 0:
oldrev = currentrev
oldpage = currentpage
else:
oldrev = rev1
oldpage = Page(request, pagename, rev=oldrev)
if rev2 == 0:
newrev = currentrev
newpage = currentpage
else:
newrev = rev2
newpage = Page(request, pagename, rev=newrev)
oldlog = oldpage.editlog_entry()
newlog = newpage.editlog_entry()
if not oldlog or not newlog:
# We use "No log entries found." msg because we already have i18n
# for that. Better would "At least one log entry was not found.".
request.theme.add_msg(_("No log entries found."), "error")
currentpage.send_page()
return
edit_count = abs(newrev - oldrev)
# Start output
# This action generates content in the user language
request.setContentLanguage(request.lang)
request.theme.send_title(_('Diff for "%s"') % (pagename, ), pagename=pagename, allow_doubleclick=1)
f = request.formatter
request.write(f.div(1, id="content"))
oldrev = oldpage.get_real_rev()
newrev = newpage.get_real_rev()
title = _('Differences between revisions %d and %d') % (oldrev, newrev)
if edit_count > 1:
title += ' ' + _('(spanning %d versions)') % (edit_count, )
title = f.text(title)
page_url = wikiutil.escape(currentpage.url(request), True)
def enabled(val):
return not val and u' disabled="disabled"' or u''
revert_html = ""
if request.user.may.revert(pagename):
revert_html = """
<form action="%s" method="get">
<div style="text-align:center">
<input name="action" value="revert" type="hidden">
<input name="rev" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
""" % (page_url, rev2, _("Revert to this revision"), enabled(newrev < currentrev))
other_diff_button_html = """
<td style="border:0;">
<form action="%s" method="get">
<div style="text-align:%s">
<input name="action" value="diff" type="hidden">
<input name="rev1" value="%d" type="hidden">
<input name="rev2" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
</td>
"""
navigation_html = """
<span class="diff-header">%%s</span>
<table class="diff">
<tr>
%(button)s
<td style="border:0">
%%s
</td>
%(button)s
</tr>
</table>
""" % {'button': other_diff_button_html}
prev_oldrev = (oldrev > 1) and (oldrev - 1) or 1
next_oldrev = (oldrev < currentrev) and (oldrev + 1) or currentrev
prev_newrev = (newrev > 1) and (newrev - 1) or 1
next_newrev = (newrev < currentrev) and (newrev + 1) or currentrev
navigation_html = navigation_html % (title,
page_url, "left", prev_oldrev, oldrev, _("Previous change"), enabled(oldrev > 1),
revert_html,
page_url, "right", newrev, next_newrev, _("Next change"), enabled(newrev < currentrev), )
request.write(f.rawHTML(navigation_html))
def rev_nav_link(enabled, old_rev, new_rev, caption, css_classes, enabled_title, disabled_title):
if enabled:
return currentpage.link_to(request, on=1, querystr={
'action': 'diff',
'rev1': old_rev,
'rev2': new_rev,
}, css_class="diff-nav-link %s" % css_classes, title=enabled_title) + request.formatter.text(caption) + currentpage.link_to(request, on=0)
else:
return '<span class="diff-no-nav-link %(css_classes)s" title="%(disabled_title)s">%(caption)s</span>' % {
'css_classes': css_classes,
'disabled_title': disabled_title,
'caption': caption,
}
rev_info_html = """
<div class="diff-info diff-info-header">%%(rev_first_link)s %%(rev_prev_link)s %(rev_header)s %%(rev_next_link)s %%(rev_last_link)s</div>
<div class="diff-info diff-info-rev-size"><span class="diff-info-caption">%(rev_size_caption)s:</span> <span class="diff-info-value">%%(rev_size)d</span></div>
<div class="diff-info diff-info-rev-author"><span class="diff-info-caption">%(rev_author_caption)s:</span> <span class="diff-info-value">%%(rev_author)s</span></div>
<div class="diff-info diff-info-rev-comment"><span class="diff-info-caption">%(rev_comment_caption)s:</span> <span class="diff-info-value">%%(rev_comment)s</span></div>
""" % {
'rev_header': _('Revision %(rev)d as of %(date)s'),
'rev_size_caption': _('Size'),
'rev_author_caption': _('Editor'),
'rev_ts_caption': _('Date'),
'rev_comment_caption': _('Comment'),
}
rev_info_old_html = rev_info_html % {
'rev_first_link': rev_nav_link(oldrev > 1, 1, newrev, u'\u21e4', 'diff-first-link diff-old-rev', _('Diff with oldest revision in left pane'), _("No older revision available for diff")),
'rev_prev_link': rev_nav_link(oldrev > 1, prev_oldrev, newrev, u'\u2190', 'diff-prev-link diff-old-rev', _('Diff with older revision in left pane'), _("No older revision available for diff")),
'rev_next_link': rev_nav_link((oldrev < currentrev) and (next_oldrev < newrev), next_oldrev, newrev, u'\u2192', 'diff-next-link diff-old-rev', _('Diff with newer revision in left pane'), _("Can't change to revision newer than in right pane")),
'rev_last_link': '',
'rev': oldrev,
'rev_size': oldpage.size(),
'rev_author': oldlog.getEditor(request) or _('N/A'),
'date': request.user.getFormattedDateTime(wikiutil.version2timestamp(oldlog.ed_time_usecs)) or _('N/A'),
'rev_comment': wikiutil.escape(oldlog.comment) or '',
}
rev_info_new_html = rev_info_html % {
'rev_first_link': '',
'rev_prev_link': rev_nav_link((newrev > 1) and (oldrev < prev_newrev), oldrev, prev_newrev, u'\u2190', 'diff-prev-link diff-new-rev', _('Diff with older revision in right pane'), _("Can't change to revision older than revision in left pane")),
'rev_next_link': rev_nav_link(newrev < currentrev, oldrev, next_newrev, u'\u2192', 'diff-next-link diff-new-rev', _('Diff with newer revision in right pane'), _("No newer revision available for diff")),
'rev_last_link': rev_nav_link(newrev < currentrev, oldrev, currentrev, u'\u21e5', 'diff-last-link diff-old-rev', _('Diff with newest revision in right pane'), _("No newer revision available for diff")),
'rev': newrev,
'rev_size': newpage.size(),
'rev_author': newlog.getEditor(request) or _('N/A'),
'date': request.user.getFormattedDateTime(wikiutil.version2timestamp(newlog.ed_time_usecs)) or _('N/A'),
'rev_comment': wikiutil.escape(newlog.comment) or '',
}
if request.user.show_fancy_diff:
from MoinMoin.util import diff_html
request.write(f.rawHTML(diff_html.diff(request, oldpage.get_raw_body(), newpage.get_raw_body(), old_top=rev_info_old_html, new_top=rev_info_new_html, old_top_class="diff-info", new_top_class="diff-info")))
newpage.send_page(count_hit=0, content_only=1, content_id="content-below-diff")
else:
request.write(f.rawHTML('<table class="diff"><tr><td class="diff-info">%s</td><td class="diff-info">%s</td></tr></table>' % (rev_info_old_html, rev_info_new_html)))
from MoinMoin.util import diff_text
lines = diff_text.diff(oldpage.getlines(), newpage.getlines())
if not lines:
msg = f.text(" - " + _("No differences found!"))
if edit_count > 1:
msg = msg + f.paragraph(1) + f.text(_('The page was saved %(count)d times, though!') % {
'count': edit_count}) + f.paragraph(0)
request.write(msg)
else:
if ignorews:
request.write(f.text(_('(ignoring whitespace)')), f.linebreak())
else:
qstr = {'action': 'diff', 'ignorews': '1', }
if rev1:
qstr['rev1'] = str(rev1)
if rev2:
qstr['rev2'] = str(rev2)
request.write(f.paragraph(1), Page(request, pagename).link_to(request,
text=_('Ignore changes in the amount of whitespace'),
querystr=qstr, rel='nofollow'), f.paragraph(0))
request.write(f.preformatted(1))
for line in lines:
if line[0] == "@":
request.write(f.rule(1))
request.write(f.text(line + '\n'))
request.write(f.preformatted(0))
request.write(f.div(0)) # end content div
request.theme.send_footer(pagename)
request.theme.send_closing_html()
def test__render_data_diff(self):
item_name = u'Html_Item'
empty_html = u'<span></span>'
html = u'<span>\ud55c</span>'
meta = {CONTENTTYPE: u'text/html;charset=utf-8'}
item = Item.create(item_name)
item._save(meta, empty_html)
item = Item.create(item_name)
# Unicode test, html escaping
rev1 = update_item(item_name, meta, html)
rev2 = update_item(item_name, {}, u' ')
result = Text._render_data_diff(item.content, rev1, rev2)
assert escape(html) in result
# Unicode test, whitespace
rev1 = update_item(item_name, {}, u'\n\n')
rev2 = update_item(item_name, {}, u'\n \n')
result = Text._render_data_diff(item.content, rev1, rev2)
assert '<span> </span>' in result
# If fairly similar diffs are correctly spanned or not, also check indent
rev1 = update_item(item_name, {}, u'One Two Three Four\nSix\n\ud55c')
rev2 = update_item(item_name, {}, u'Two Three Seven Four\nSix\n\ud55c')
result = Text._render_data_diff(item.content, rev1, rev2)
assert '<span>One </span>Two Three Four' in result
assert 'Two Three <span>Seven </span>Four' in result
# Check for diff_html.diff return types
assert reduce(lambda x, y: x and y, [isinstance(i[1], unicode) and isinstance(i[3], unicode) for i in diff_html.diff(u'One Two Three Four\nSix\n', u'Two Three Seven Four\nSix Seven\n')], True)
def _do_diff(pagename, request):
# return attachment list
_ = request.getText
form = values_to_form(request.values)
att1 = form.get('att1', [''])[0]
att2 = form.get('att2', [''])[0]
sort = form.get('sort', ['normal'])[0]
if (not (att1 and att2) or not
(AttachFile.exists(request, pagename, att1) and
AttachFile.exists(request, pagename, att2))):
AttachFile.error_msg(pagename, request,
_('Could not diff, attachments not selected or nonexisting'))
return
form['target'] = [att1]
request.values = CombinedMultiDict([MultiDict(form)])
pagename, filename, fpath = AttachFile._access_file(pagename, request)
att1data = open(fpath, 'r').read()
form['target'] = [att2]
request.values = CombinedMultiDict([MultiDict(form)])
pagename, filename, fpath = AttachFile._access_file(pagename, request)
att2data = open(fpath, 'r').read()
if sort == 'sort':
att1data = '\n'.join(sorted(att1data.split('\n')))
att2data = '\n'.join(sorted(att2data.split('\n')))
elif sort == 'uniq':
att1data = '\n'.join(sorted(set(att1data.split('\n'))))
att2data = '\n'.join(sorted(set(att2data.split('\n'))))
elif sort == 'cnt':
att1tmp = list()
for line in sorted(set(att1data.split('\n'))):
if not line:
continue
att1tmp.append("%s %s" % (att1data.count(line), line))
att2tmp = list()
for line in sorted(set(att2data.split('\n'))):
if not line:
continue
att2tmp.append("%s %s" % (att2data.count(line), line))
att1data = '\n'.join(att1tmp)
att2data = '\n'.join(att2tmp)
# Use user interface language for this generated page
request.setContentLanguage(request.lang)
request.theme.send_title(_('Diff of %s and %s') % (att1, att2),
pagename=pagename)
request.write('<div id="content">\n') # start content div
if request.user.show_fancy_diff:
from MoinMoin.util import diff_html
request.write(request.formatter.rawHTML(diff_html.diff(request,
att1data,
att2data)))
else:
from MoinMoin.util import diff_text
lines = diff_text.diff(att1data.split("\n"), att2data.split("\n"))
request.write(request.formatter.preformatted(1))
for line in lines:
if line[0] == "@":
request.write(request.formatter.rule(1))
request.write(request.formatter.text(line + '\n'))
request.write(request.formatter.preformatted(0))
AttachFile.send_uploadform(pagename, request)
request.write('</div>\n') # end content div
request.theme.send_footer(pagename)
request.theme.send_closing_html()
def execute(pagename, request):
""" Handle "action=diff"
checking for either a "rev=formerrevision" parameter
or rev1 and rev2 parameters
"""
if not request.user.may.read(pagename):
Page(request, pagename).send_page()
return
try:
date = request.values['date']
try:
date = long(date) # must be long for py 2.2.x
except StandardError:
date = 0
except KeyError:
date = 0
try:
rev1 = int(request.values.get('rev1', -1))
except StandardError:
rev1 = 0
try:
rev2 = int(request.values.get('rev2', 0))
except StandardError:
rev2 = 0
if rev1 == -1 and rev2 == 0:
rev1 = request.rev
if rev1 is None:
rev1 = -1
# spacing flag?
ignorews = int(request.values.get('ignorews', 0))
_ = request.getText
# get a list of old revisions, and back out if none are available
currentpage = Page(request, pagename)
currentrev = currentpage.current_rev()
if currentrev < 2:
request.theme.add_msg(_("No older revisions available!"), "error")
currentpage.send_page()
return
if date: # this is how we get called from RecentChanges
rev1 = 0
log = editlog.EditLog(request, rootpagename=pagename)
for line in log.reverse():
if date >= line.ed_time_usecs and int(line.rev) != 99999999:
rev1 = int(line.rev)
break
else:
rev1 = 1
rev2 = 0
if rev1 > 0 and rev2 > 0 and rev1 > rev2 or rev1 == 0 and rev2 > 0:
rev1, rev2 = rev2, rev1
if rev1 == -1:
oldrev = currentrev - 1
oldpage = Page(request, pagename, rev=oldrev)
elif rev1 == 0:
oldrev = currentrev
oldpage = currentpage
else:
oldrev = rev1
oldpage = Page(request, pagename, rev=oldrev)
if rev2 == 0:
newrev = currentrev
newpage = currentpage
else:
newrev = rev2
newpage = Page(request, pagename, rev=newrev)
oldlog = oldpage.editlog_entry()
newlog = newpage.editlog_entry()
if not oldlog or not newlog:
# We use "No log entries found." msg because we already have i18n
# for that. Better would "At least one log entry was not found.".
request.theme.add_msg(_("No log entries found."), "error")
currentpage.send_page()
return
edit_count = abs(newrev - oldrev)
# Start output
# This action generates content in the user language
request.setContentLanguage(request.lang)
request.theme.send_title(_('Diff for "%s"') % (pagename, ),
pagename=pagename,
allow_doubleclick=1)
f = request.formatter
request.write(f.div(1, id="content"))
oldrev = oldpage.get_real_rev()
newrev = newpage.get_real_rev()
title = _('Differences between revisions %d and %d') % (oldrev, newrev)
if edit_count > 1:
title += ' ' + _('(spanning %d versions)') % (edit_count, )
title = f.text(title)
page_url = wikiutil.escape(currentpage.url(request), True)
def enabled(val):
return not val and u' disabled="disabled"' or u''
revert_html = ""
if request.user.may.revert(pagename):
revert_html = """
<form action="%s" method="get">
<div style="text-align:center">
<input name="action" value="revert" type="hidden">
<input name="rev" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
""" % (page_url, rev2, _("Revert to this revision"),
enabled(newrev < currentrev))
other_diff_button_html = """
<td style="border:0;">
<form action="%s" method="get">
<div style="text-align:%s">
<input name="action" value="diff" type="hidden">
<input name="rev1" value="%d" type="hidden">
<input name="rev2" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
</td>
"""
navigation_html = """
<span class="diff-header">%%s</span>
<table class="diff">
<tr>
%(button)s
<td style="border:0">
%%s
</td>
%(button)s
</tr>
</table>
""" % {
'button': other_diff_button_html
}
prev_oldrev = (oldrev > 1) and (oldrev - 1) or 1
next_oldrev = (oldrev < currentrev) and (oldrev + 1) or currentrev
prev_newrev = (newrev > 1) and (newrev - 1) or 1
next_newrev = (newrev < currentrev) and (newrev + 1) or currentrev
navigation_html = navigation_html % (
title,
page_url,
"left",
prev_oldrev,
oldrev,
_("Previous change"),
enabled(oldrev > 1),
revert_html,
page_url,
"right",
newrev,
next_newrev,
_("Next change"),
enabled(newrev < currentrev),
)
request.write(f.rawHTML(navigation_html))
def rev_nav_link(enabled, old_rev, new_rev, caption, css_classes,
enabled_title, disabled_title):
if enabled:
return currentpage.link_to(
request,
on=1,
querystr={
'action': 'diff',
'rev1': old_rev,
'rev2': new_rev,
},
css_class="diff-nav-link %s" % css_classes,
title=enabled_title) + request.formatter.text(
caption) + currentpage.link_to(request, on=0)
else:
return '<span class="diff-no-nav-link %(css_classes)s" title="%(disabled_title)s">%(caption)s</span>' % {
'css_classes': css_classes,
'disabled_title': disabled_title,
'caption': caption,
}
rev_info_html = """
<div class="diff-info diff-info-header">%%(rev_first_link)s %%(rev_prev_link)s %(rev_header)s %%(rev_next_link)s %%(rev_last_link)s</div>
<div class="diff-info diff-info-rev-size"><span class="diff-info-caption">%(rev_size_caption)s:</span> <span class="diff-info-value">%%(rev_size)d</span></div>
<div class="diff-info diff-info-rev-author"><span class="diff-info-caption">%(rev_author_caption)s:</span> <span class="diff-info-value">%%(rev_author)s</span></div>
<div class="diff-info diff-info-rev-comment"><span class="diff-info-caption">%(rev_comment_caption)s:</span> <span class="diff-info-value">%%(rev_comment)s</span></div>
""" % {
'rev_header': _('Revision %(rev)d as of %(date)s'),
'rev_size_caption': _('Size'),
'rev_author_caption': _('Editor'),
'rev_ts_caption': _('Date'),
'rev_comment_caption': _('Comment'),
}
rev_info_old_html = rev_info_html % {
'rev_first_link':
rev_nav_link(oldrev > 1, 1, newrev, u'\u21e4',
'diff-first-link diff-old-rev',
_('Diff with oldest revision in left pane'),
_("No older revision available for diff")),
'rev_prev_link':
rev_nav_link(oldrev > 1, prev_oldrev, newrev, u'\u2190',
'diff-prev-link diff-old-rev',
_('Diff with older revision in left pane'),
_("No older revision available for diff")),
'rev_next_link':
rev_nav_link(
(oldrev < currentrev) and (next_oldrev < newrev), next_oldrev,
newrev, u'\u2192', 'diff-next-link diff-old-rev',
_('Diff with newer revision in left pane'),
_("Can't change to revision newer than in right pane")),
'rev_last_link':
'',
'rev':
oldrev,
'rev_size':
oldpage.size(),
'rev_author':
oldlog.getEditor(request) or _('N/A'),
'date':
request.user.getFormattedDateTime(
wikiutil.version2timestamp(oldlog.ed_time_usecs)) or _('N/A'),
'rev_comment':
wikiutil.escape(oldlog.comment) or '',
}
rev_info_new_html = rev_info_html % {
'rev_first_link':
'',
'rev_prev_link':
rev_nav_link(
(newrev > 1) and (oldrev < prev_newrev), oldrev, prev_newrev,
u'\u2190', 'diff-prev-link diff-new-rev',
_('Diff with older revision in right pane'),
_("Can't change to revision older than revision in left pane")),
'rev_next_link':
rev_nav_link(newrev < currentrev, oldrev, next_newrev, u'\u2192',
'diff-next-link diff-new-rev',
_('Diff with newer revision in right pane'),
_("No newer revision available for diff")),
'rev_last_link':
rev_nav_link(newrev < currentrev, oldrev, currentrev, u'\u21e5',
'diff-last-link diff-old-rev',
_('Diff with newest revision in right pane'),
_("No newer revision available for diff")),
'rev':
newrev,
'rev_size':
newpage.size(),
'rev_author':
newlog.getEditor(request) or _('N/A'),
'date':
request.user.getFormattedDateTime(
wikiutil.version2timestamp(newlog.ed_time_usecs)) or _('N/A'),
'rev_comment':
wikiutil.escape(newlog.comment) or '',
}
if request.user.show_fancy_diff:
from MoinMoin.util import diff_html
request.write(
f.rawHTML(
diff_html.diff(request,
oldpage.get_raw_body(),
newpage.get_raw_body(),
old_top=rev_info_old_html,
new_top=rev_info_new_html,
old_top_class="diff-info",
new_top_class="diff-info")))
newpage.send_page(count_hit=0,
content_only=1,
content_id="content-below-diff")
else:
request.write(
f.rawHTML(
'<table class="diff"><tr><td class="diff-info">%s</td><td class="diff-info">%s</td></tr></table>'
% (rev_info_old_html, rev_info_new_html)))
from MoinMoin.util import diff_text
lines = diff_text.diff(oldpage.getlines(), newpage.getlines())
if not lines:
msg = f.text(" - " + _("No differences found!"))
if edit_count > 1:
msg = msg + f.paragraph(1) + f.text(
_('The page was saved %(count)d times, though!') %
{'count': edit_count}) + f.paragraph(0)
request.write(msg)
else:
if ignorews:
request.write(f.text(_('(ignoring whitespace)')),
f.linebreak())
else:
qstr = {
'action': 'diff',
'ignorews': '1',
}
if rev1:
qstr['rev1'] = str(rev1)
if rev2:
qstr['rev2'] = str(rev2)
request.write(
f.paragraph(1),
Page(request, pagename).link_to(
request,
text=_('Ignore changes in the amount of whitespace'),
querystr=qstr,
rel='nofollow'), f.paragraph(0))
request.write(f.preformatted(1))
for line in lines:
if line[0] == "@":
request.write(f.rule(1))
request.write(f.text(line + '\n'))
request.write(f.preformatted(0))
request.write(f.div(0)) # end content div
request.theme.send_footer(pagename)
request.theme.send_closing_html()
def execute(pagename, request):
""" Handle "action=diff"
checking for either a "rev=formerrevision" parameter
or rev1 and rev2 parameters
"""
if not request.user.may.read(pagename):
Page(request, pagename).send_page()
return
try:
date = request.form['date'][0]
try:
date = long(date) # must be long for py 2.2.x
except StandardError:
date = 0
except KeyError:
date = 0
try:
rev1 = int(request.form.get('rev1', [-1])[0])
except StandardError:
rev1 = 0
try:
rev2 = int(request.form.get('rev2', [0])[0])
except StandardError:
rev2 = 0
if rev1 == -1 and rev2 == 0:
rev1 = request.rev
if rev1 is None:
rev1 = -1
# spacing flag?
ignorews = int(request.form.get('ignorews', [0])[0])
_ = request.getText
# get a list of old revisions, and back out if none are available
currentpage = Page(request, pagename)
currentrev = currentpage.current_rev()
if currentrev < 2:
request.theme.add_msg(_("No older revisions available!"), "error")
currentpage.send_page()
return
if date: # this is how we get called from RecentChanges
rev1 = 0
log = editlog.EditLog(request, rootpagename=pagename)
for line in log.reverse():
if date >= line.ed_time_usecs and int(line.rev) != 99999999:
rev1 = int(line.rev)
break
else:
rev1 = 1
rev2 = 0
# Start output
# This action generates content in the user language
request.setContentLanguage(request.lang)
request.emit_http_headers()
request.theme.send_title(_('Diff for "%s"') % (pagename, ), pagename=pagename, allow_doubleclick=1)
if rev1 > 0 and rev2 > 0 and rev1 > rev2 or rev1 == 0 and rev2 > 0:
rev1, rev2 = rev2, rev1
if rev1 == -1:
oldrev = currentrev - 1
oldpage = Page(request, pagename, rev=oldrev)
elif rev1 == 0:
oldrev = currentrev
oldpage = currentpage
else:
oldrev = rev1
oldpage = Page(request, pagename, rev=oldrev)
if rev2 == 0:
newrev = currentrev
newpage = currentpage
else:
newrev = rev2
newpage = Page(request, pagename, rev=newrev)
edit_count = abs(newrev - oldrev)
f = request.formatter
request.write(f.div(1, id="content"))
oldrev = oldpage.get_real_rev()
newrev = newpage.get_real_rev()
revlist = currentpage.getRevList()
# code below assumes that the page exists and has at least
# one revision in the revlist, just bail out if not. Users
# shouldn't really run into this anyway.
if not revlist:
request.write(f.div(0)) # end content div
request.theme.send_footer(pagename)
request.theme.send_closing_html()
return
title = _('Differences between revisions %d and %d') % (oldrev, newrev)
if edit_count > 1:
title += ' ' + _('(spanning %d versions)') % (edit_count, )
title = f.text(title)
# Revision list starts from 2...
if oldrev == min(revlist):
disable_prev = u' disabled="disabled"'
else:
disable_prev = u''
if newrev == max(revlist):
disable_next = u' disabled="disabled"'
else:
disable_next = u''
page_url = wikiutil.escape(currentpage.url(request), True)
revert_html = ""
if request.user.may.revert(pagename):
revert_html = """
<td style="border:0">
<form action="%s" method="get">
<div style="text-align:center">
<input name="action" value="revert" type="hidden">
<input name="rev" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
</td>
""" % (page_url, rev2, _("Revert to this revision"), disable_next)
navigation_html = """
<span class="diff-header">%s</span>
<table class="diff">
<tr>
<td style="border:0">
<form action="%s" method="get">
<div style="text-align:left">
<input name="action" value="diff" type="hidden">
<input name="rev1" value="%d" type="hidden">
<input name="rev2" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
</td>
%s
<td style="border:0">
<form action="%s" method="get">
<div style="text-align:right">
<input name="action" value="diff" type="hidden">
<input name="rev1" value="%d" type="hidden">
<input name="rev2" value="%d" type="hidden">
<input value="%s" type="submit"%s>
</div>
</form>
</td>
</tr>
</table>
""" % (title,
page_url, oldrev - 1, oldrev, _("Previous change"), disable_prev,
revert_html,
page_url, newrev, newrev + 1, _("Next change"), disable_next, )
request.write(f.rawHTML(navigation_html))
if request.user.show_fancy_diff:
from MoinMoin.util import diff_html
request.write(f.rawHTML(diff_html.diff(request, oldpage.get_raw_body(), newpage.get_raw_body())))
newpage.send_page(count_hit=0, content_only=1, content_id="content-below-diff")
else:
from MoinMoin.util import diff_text
lines = diff_text.diff(oldpage.getlines(), newpage.getlines())
if not lines:
msg = f.text(" - " + _("No differences found!"))
if edit_count > 1:
msg = msg + f.paragraph(1) + f.text(_('The page was saved %(count)d times, though!') % {
'count': edit_count}) + f.paragraph(0)
request.write(msg)
else:
if ignorews:
request.write(f.text(_('(ignoring whitespace)')), f.linebreak())
else:
qstr = {'action': 'diff', 'ignorews': '1', }
if rev1:
qstr['rev1'] = str(rev1)
if rev2:
qstr['rev2'] = str(rev2)
request.write(f.paragraph(1), Page(request, pagename).link_to(request,
text=_('Ignore changes in the amount of whitespace'),
querystr=qstr, rel='nofollow'), f.paragraph(0))
request.write(f.preformatted(1))
for line in lines:
if line[0] == "@":
request.write(f.rule(1))
request.write(f.text(line + '\n'))
request.write(f.preformatted(0))
request.write(f.div(0)) # end content div
request.theme.send_footer(pagename)
request.theme.send_closing_html()
