diff options
Diffstat (limited to 'diff.ezt')
| -rw-r--r-- | diff.ezt | 240 |
1 files changed, 240 insertions, 0 deletions
diff --git a/diff.ezt b/diff.ezt new file mode 100644 index 0000000..f01fbc4 --- /dev/null +++ b/diff.ezt @@ -0,0 +1,240 @@ +[# setup page definitions] + [define page_title]Diff of /[where][end] + [define help_href][docroot]/help_rootview.html[end] +[# end] + +[include "include/header.ezt" "diff"] +[include "include/file_header.ezt"] + +<h3 style="text-align:center;"></h3> + +[if-any raw_diff] + <pre class="vc_raw_diff">[raw_diff]</pre> +[end] + +[define left_view_href][if-any left.prefer_markup][left.view_href][else][if-any left.download_href][left.download_href][end][end][end] +[define right_view_href][if-any right.prefer_markup][right.view_href][else][if-any right.download_href][right.download_href][end][end][end] + +[if-any changes] +<table cellspacing="0" cellpadding="0"> + <tr class="vc_diff_header"> + <th style="width:6%;"></th> + <th style="width:47%; vertical-align:top;"> + [is left.path right.path][else][left.path][end] + revision [if-any left_view_href]<a href="[left_view_href]">[end][left.rev][if-any left_view_href]</a>[end][if-any left.author] by <em>[left.author]</em>[end], + [left.date] + [if-any left.tag]<br />Tag: [left.tag][end] + </th> + <th style="width:47%; vertical-align:top;"> + [is left.path right.path][else][right.path][end] + revision [if-any right_view_href]<a href="[right_view_href]">[end][right.rev][if-any right_view_href]</a>[end][if-any right.author] by <em>[right.author]</em>[end], + [right.date] + [if-any right.tag]<br />Tag: [right.tag][end] + </th> + </tr> + + [for changes] + [is changes.type "header"] + <tr class="vc_diff_chunk_header" id="h[changes.line_info_right]"> + <td style="width:6%;"><strong>#</strong></td> + <td style="width:47%;"> + <strong>Line [changes.line_info_left]</strong> + <span class="vc_diff_chunk_extra">[changes.line_info_extra]</span> + </td> + <td style="width:47%;"> + <strong>Line [changes.line_info_right]</strong> + <span class="vc_diff_chunk_extra">[changes.line_info_extra]</span> + </td> + </tr> + [else] + [is changes.type "add"] + <tr> + <td class="vc_diff_line_number" id="l[changes.line_number]">[if-any right.annotate_href]<a href="[right.annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td> + <td class="vc_diff_empty"> </td> + <td class="vc_diff_add"> [changes.right]</td> + </tr> + [else] + [is changes.type "remove"] + <tr> + <td></td> + <td class="vc_diff_remove"> [changes.left]</td> + <td class="vc_diff_empty"> </td> + </tr> + [else] + [is changes.type "change"] + <tr> + [if-any changes.have_right] + <td class="vc_diff_line_number" id="l[changes.line_number]">[if-any right.annotate_href]<a href="[right.annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td> + [else] + <td></td> + [end] + [if-any changes.have_left] + <td class="vc_diff_change"> [changes.left]</td> + [else] + <td class="vc_diff_change_empty"> </td> + [end] + [if-any changes.have_right] + <td class="vc_diff_change"> [changes.right]</td> + [else] + <td class="vc_diff_change_empty"> </td> + [end] + </tr> + [else] + [is changes.type "no-changes"] + <tr> + <td colspan="3"> </td> + </tr> + <tr class="vc_diff_empty"> + <td colspan="3" style="text-align:center;"><br /> + <strong>- No changes -</strong><br /> </td> + </tr> + [else] + [is changes.type "binary-diff"] + <tr> + <td colspan="3"> </td> + </tr> + <tr class="vc_diff_empty"> + <td colspan="3" style="text-align:center;"><br /> + <strong>- Binary file revisions differ -</strong><br /> </td> + </tr> + [else] + [is changes.type "error"] + <tr> + <td colspan="3"> </td> + </tr> + <tr class="vc_diff_empty"> + <td colspan="3" style="text-align:center;"> <br /> + <strong>- ViewVC depends on rcsdiff and GNU diff to create + this page. ViewVC cannot find GNU diff. Even if you + have GNU diff installed, the rcsdiff program must be + configured and compiled with the GNU diff location. + -</strong> <br /> </td> + </tr> + [else] + <tr> + <td class="vc_diff_line_number" id="l[changes.line_number]">[if-any right.annotate_href]<a href="[right.annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td> + <td class="vc_diff_nochange"> [changes.left]</td> + <td class="vc_diff_nochange"> [changes.right]</td> + </tr> + [end] + [end] + [end] + [end] + [end] + [end] + [end] + [end] +</table> +[end] + +[if-any sidebyside] + <table class="vc_idiff"> + <colgroup><col /><col class="content" /></colgroup> + <colgroup><col /><col class="content" /></colgroup> + <thead> + <tr> + <th colspan="2"> + [is left.path right.path][else][left.path][end] + Revision [left.rev] + </th> + <th colspan="2"> + [is left.path right.path][else][right.path][end] + Revision [right.rev] + </th> + </tr> + </thead> + <tbody> + [for sidebyside] + [if-any sidebyside.gap] + <tr> + <th>…</th><th></th> + <th>…</th><th></th> + </tr> + [end] + <tr> + [for sidebyside.columns] + <th>[sidebyside.columns.line_number]</th><td[if-any sidebyside.columns.line_number][else] class="vc_idiff_empty"[end]>[for sidebyside.columns.segments][if-any sidebyside.columns.segments.type]<span class="vc_idiff_[sidebyside.columns.segments.type]">[sidebyside.columns.segments.text]</span>[else][sidebyside.columns.segments.text][end][end]</td> + [end] + </tr> + [end] + </tbody> + </table> +[end] + +[if-any unified] + <table class="vc_idiff"> + <thead> + <tr> + <th>r[left.rev]</th> + <th>r[right.rev]</th> + <th></th> + </tr> + </thead> + <tbody> + [for unified] + [if-any unified.gap] + <tr> + <th>…</th> + <th>…</th> + <th></th> + </tr> + [end] + <tr> + <th>[unified.left_number]</th> + <th>[unified.right_number]</th> + <td[if-any unified.type] class="vc_idiff_[unified.type]"[end]>[for unified.segments][if-any unified.segments.type]<span class="vc_idiff_[unified.segments.type]">[unified.segments.text]</span>[else][unified.segments.text][end][end]</td> + </tr> + [end] + </tbody> + </table> +[end] + +<hr style="margin-top:1em;" /> + +<table cellpadding="10" class="auto"> + <tr> + <td> + <form method="get" action="[diff_format_action]"> + <div> + [for diff_format_hidden_values]<input type="hidden" name="[diff_format_hidden_values.name]" value="[diff_format_hidden_values.value]"/>[end] + <select name="diff_format" onchange="submit()"> + <option value="h" [is diff_format "h"]selected="selected"[end]>Colored Diff</option> + <option value="l" [is diff_format "l"]selected="selected"[end]>Long Colored Diff</option> + <option value="f" [is diff_format "f"]selected="selected"[end]>Full Colored Diff</option> + <option value="u" [is diff_format "u"]selected="selected"[end]>Unidiff</option> + <option value="c" [is diff_format "c"]selected="selected"[end]>Context Diff</option> + <option value="s" [is diff_format "s"]selected="selected"[end]>Side by Side</option> + </select> + <input type="submit" value="Show" /> + </div> + </form> + </td> + <td> +[if-any raw_diff] + +[else] + <table style="border:solid gray 1px;" class="auto"> + <tr> + <td>Legend:<br /> + <table cellspacing="0" cellpadding="1"> + <tr> + <td style="text-align:center;" class="vc_diff_remove">Removed from v.[left.rev]</td> + <td class="vc_diff_empty"> </td> + </tr> + <tr> + <td style="text-align:center;" colspan="2" class="vc_diff_change">changed lines</td> + </tr> + <tr> + <td class="vc_diff_empty"> </td> + <td style="text-align:center;" class="vc_diff_add">Added in v.[right.rev]</td> + </tr> + </table> + </td> + </tr> + </table> +[end] + </td> + </tr> +</table> + +[include "include/footer.ezt"] |