{# vim: set et ts=8 sts=4 sw=4 ai: #} {% if pagepath %} {% extends "page.html" %} {% else %} {% extends "wiki.html" %} {% endif %} {% from "snippets/diff_side_by_side.html" import diff_side_by_side %} {%block head -%} {{- super() }} {%- if not revision %} {%- endif %} {% endblock head -%} {% block menu %} {{ super() }} {% if not pagepath %} {% include 'snippets/menu.html' %} {% if menutree %} {% include 'snippets/menutree.html' %} {% endif %} {% endif %} {% endblock %} {% block content %}
{% if rev_a and rev_b %}

Comparing {{rev_a}} to {{rev_b}}

{% macro revision_metadata(rev, metadata) %} {%- if metadata %}{{metadata.datetime|format_datetime}} {% endif -%} {{rev}} {%- if metadata %}{%if not metadata.author_email%}{{metadata.author_name}}{%else%}{{metadata.author_name}}{%endif%}{% endif %} {% if metadata %}{{metadata.message or '-/-'}}{% endif %} {% endmacro %}
{{ revision_metadata(rev_a, metadata_a) }} {{ revision_metadata(rev_b, metadata_b) }}
Date Author Commit Message
{% elif revision %}

Commit {{revision}}

{% endif %} {% if metadata %} {{metadata.datetime|format_datetime}} {%if not metadata.author_email%}{{metadata.author_name}}{%else%}{{metadata.author_name}}{%endif%}: {{metadata.message or '-/-'}} {%endif%} {% if side_by_side %} {%- macro side_header(file, url, rev) -%} {%- if url %}{{ file }}{% else %}{{ file }}{% endif %} {{ rev }} {%- endmacro %} {% for file in patchset %} {%- if file.path in side_by_side %} {%- set urlobj = url_map[file.path] %} {% call diff_side_by_side(side_by_side[file.path], color_a=rev_a[:6], color_b=rev_b[:6]) %} {{ side_header(urlobj.source_file, urlobj.source_url, rev_a) }} {{ side_header(urlobj.target_file, urlobj.target_url, rev_b) }} {% endcall %} {%- endif %} {% endfor %} {% else %} {# color the changed lines like the commit they belong to #} {% set colorcolumn = rev_a and rev_b %} {% set colspan = 2 + (2 if withlinenumbers else 0) %} {% for file in patchset %} {% with filename=file.path,lines=file_diffs[file.path],urlobj=url_map[file.path] %} {# {{filename}} {{lines}} {{file}} #} {%- if not page_filenames or filename in page_filenames %} {% for l in lines %} {%- if l.style == "hunk" %} {%- else %} {%- set color = none -%} {%- if colorcolumn and l.style == "removed" %}{% set color = rev_a[:6] %}{% elif colorcolumn and l.style == "added" %}{% set color = rev_b[:6] %}{% endif -%} {%- set firstcell = ' class="diff-decoration diff-color"' ~ (' style="border-left-color: #' ~ color ~ ';"' if color else '') if colorcolumn else ' class="diff-decoration"' -%} {%-if withlinenumbers -%} {{l.source}} {%- else -%} {{l.type}} {%- endif -%} {%- endif -%} {%- endfor -%}{# l in lines #} {%- else -%} {%- endif %} {% endwith %}{# filename,lines in file_diffs #} {% endfor %}{# filename,lines in file_diffs #}
{%- if urlobj.source_file == urlobj.target_file %} {{urlobj.source_file}} {{rev_a}} .. {{rev_b}} {%- else %} {%- if urlobj.source_url %} {{urlobj.source_file}} {%- else %} {{urlobj.source_file}} {%- endif %} .. {%- if urlobj.target_url %} {{urlobj.target_file}} {%- else %} {{urlobj.target_file}} {%- endif %} {%- endif %} {# {%- elif rev_a and rev_b %} {{url_map[filename][0][0]}} {{rev_a}} .. {{rev_b}} {%- endif %} #}
{{l.value}}{{l.target}} {{l.type}}{{l.value | replace('\n', '')}}
{% endif %}{# side_by_side #} {######} {% endblock %}