2004-04-24 21:38:31 +04:00
|
|
|
[# setup page definitions]
|
|
|
|
|
[define location][rootname][if-any where]: [where][end][end]
|
|
|
|
|
[define page_title][cfg.general.main_title] - diff - [location][end]
|
2004-05-12 05:46:43 +04:00
|
|
|
[define help_href][docroot]/help_rootview.html[end]
|
2004-04-24 21:38:31 +04:00
|
|
|
[# end]
|
|
|
|
|
|
2004-04-15 09:57:57 +04:00
|
|
|
[include "include/header.ezt" "diff"]
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
|
|
|
|
|
<h3 align=center>Diff for /[where] between version [rev1] and [rev2]</h3>
|
Instead of sending colored diffs to the diff.ezt template, and raw
diffs to their own text/plain output, templatize all diffs. By
default now, all diffs will go through diff.ezt (which has been
updated to handle it). Only if the new 'makepatch' boolean CGI flag
is set will diffs be sent directly as text/plain, non-templatized
output.
* viewcvs/lib/viewcvs.py
(_legal_params): Add new 'makepatch' boolean parameter.
(check_freshness): Fix a speeling eror.
(MarkupPipeWrapper.__init__): Add 'htmlize' parameter, and use it.
(human_readable_diff): Lose the 'request', 'sym1', and 'sym2'
parameters. Now return the parsed dates and DiffSource object
instead of populating a data dictionary and completely generating
the page.
(spaced_html_text): Use an intermediate variable for readability.
(raw_diff): New.
(view_diff): Honor the new 'makepatch'. Update calls to
human_readable_diff(), and make use of raw_diff(). Do all page
generation for diffs here now. Adds a new 'raw_diff' data
dictionary item, useful for testing raw vs. colored, as well as
for positioning that raw diff output in the template.
* templates/diff.ezt
Use the new 'raw_diff' data dictionary item to position raw diff
output in the template. Update the diff form to allow for the
generation of traditional "patch-ish" raw diff output.
* templates/include/diff_form.ezt
Allow for the generation of traditional "patch-ish" raw diff output.
* website/styles.css
(vc_raw_diff): New style class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@864 8cb11bc2-c004-0410-86c3-e597b4017df7
2004-06-22 18:37:11 +04:00
|
|
|
|
|
|
|
|
[if-any raw_diff]
|
|
|
|
|
<pre class="vc_raw_diff">[raw_diff]</pre>
|
|
|
|
|
[else]
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
<table border=0 cellspacing=0 cellpadding=0 width="100%">
|
2004-05-12 05:46:43 +04:00
|
|
|
<tr class="vc_diff_header">
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
<th width="50%" valign=top>
|
Instead of sending colored diffs to the diff.ezt template, and raw
diffs to their own text/plain output, templatize all diffs. By
default now, all diffs will go through diff.ezt (which has been
updated to handle it). Only if the new 'makepatch' boolean CGI flag
is set will diffs be sent directly as text/plain, non-templatized
output.
* viewcvs/lib/viewcvs.py
(_legal_params): Add new 'makepatch' boolean parameter.
(check_freshness): Fix a speeling eror.
(MarkupPipeWrapper.__init__): Add 'htmlize' parameter, and use it.
(human_readable_diff): Lose the 'request', 'sym1', and 'sym2'
parameters. Now return the parsed dates and DiffSource object
instead of populating a data dictionary and completely generating
the page.
(spaced_html_text): Use an intermediate variable for readability.
(raw_diff): New.
(view_diff): Honor the new 'makepatch'. Update calls to
human_readable_diff(), and make use of raw_diff(). Do all page
generation for diffs here now. Adds a new 'raw_diff' data
dictionary item, useful for testing raw vs. colored, as well as
for positioning that raw diff output in the template.
* templates/diff.ezt
Use the new 'raw_diff' data dictionary item to position raw diff
output in the template. Update the diff form to allow for the
generation of traditional "patch-ish" raw diff output.
* templates/include/diff_form.ezt
Allow for the generation of traditional "patch-ish" raw diff output.
* website/styles.css
(vc_raw_diff): New style class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@864 8cb11bc2-c004-0410-86c3-e597b4017df7
2004-06-22 18:37:11 +04:00
|
|
|
version [rev1], [date1]
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
[if-any tag1]<br>Tag: [tag1][end]
|
|
|
|
|
</th>
|
|
|
|
|
<th width="50%" valign=top>
|
Instead of sending colored diffs to the diff.ezt template, and raw
diffs to their own text/plain output, templatize all diffs. By
default now, all diffs will go through diff.ezt (which has been
updated to handle it). Only if the new 'makepatch' boolean CGI flag
is set will diffs be sent directly as text/plain, non-templatized
output.
* viewcvs/lib/viewcvs.py
(_legal_params): Add new 'makepatch' boolean parameter.
(check_freshness): Fix a speeling eror.
(MarkupPipeWrapper.__init__): Add 'htmlize' parameter, and use it.
(human_readable_diff): Lose the 'request', 'sym1', and 'sym2'
parameters. Now return the parsed dates and DiffSource object
instead of populating a data dictionary and completely generating
the page.
(spaced_html_text): Use an intermediate variable for readability.
(raw_diff): New.
(view_diff): Honor the new 'makepatch'. Update calls to
human_readable_diff(), and make use of raw_diff(). Do all page
generation for diffs here now. Adds a new 'raw_diff' data
dictionary item, useful for testing raw vs. colored, as well as
for positioning that raw diff output in the template.
* templates/diff.ezt
Use the new 'raw_diff' data dictionary item to position raw diff
output in the template. Update the diff form to allow for the
generation of traditional "patch-ish" raw diff output.
* templates/include/diff_form.ezt
Allow for the generation of traditional "patch-ish" raw diff output.
* website/styles.css
(vc_raw_diff): New style class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@864 8cb11bc2-c004-0410-86c3-e597b4017df7
2004-06-22 18:37:11 +04:00
|
|
|
version [rev2], [date2]
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
[if-any tag2]<br>Tag: [tag2][end]
|
|
|
|
|
</th>
|
|
|
|
|
</tr>
|
|
|
|
|
|
2002-01-24 05:17:53 +03:00
|
|
|
[for changes]
|
|
|
|
|
[is changes.type "header"]
|
2004-05-12 05:46:43 +04:00
|
|
|
<tr class="vc_diff_chunk_header">
|
2002-01-24 05:17:53 +03:00
|
|
|
<td width="50%">
|
|
|
|
|
<table width="100%" border=1 cellpadding=5>
|
|
|
|
|
<tr>
|
|
|
|
|
<td> <b>Line [changes.line1]</b>
|
2004-05-12 05:46:43 +04:00
|
|
|
<span class="vc_diff_chunk_extra">[changes.extra]</span></td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
</table>
|
|
|
|
|
</td>
|
|
|
|
|
<td width="50%">
|
|
|
|
|
<table width="100%" border=1 cellpadding=5>
|
|
|
|
|
<tr>
|
|
|
|
|
<td> <b>Line [changes.line2]</b>
|
2004-05-12 05:46:43 +04:00
|
|
|
<span class="vc_diff_chunk_extra">[changes.extra]</span></td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
</table>
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
[is changes.type "add"]
|
|
|
|
|
<tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_empty"> </td>
|
|
|
|
|
<td class="vc_diff_add"> [changes.right]</td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
[is changes.type "remove"]
|
|
|
|
|
<tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_remove"> [changes.left]</td>
|
|
|
|
|
<td class="vc_diff_empty"> </td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
[is changes.type "change"]
|
|
|
|
|
<tr>
|
|
|
|
|
[if-any changes.have_left]
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_change"> [changes.left]</td>
|
2002-01-24 05:17:53 +03:00
|
|
|
[else]
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_change_empty"> </td>
|
2002-01-24 05:17:53 +03:00
|
|
|
[end]
|
|
|
|
|
[if-any changes.have_right]
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_change"> [changes.right]</td>
|
2002-01-24 05:17:53 +03:00
|
|
|
[else]
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_change_empty"> </td>
|
2002-01-24 05:17:53 +03:00
|
|
|
[end]
|
|
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
[is changes.type "no-changes"]
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan=2> </td>
|
|
|
|
|
</tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<tr class="vc_diff_empty">
|
2002-01-24 05:17:53 +03:00
|
|
|
<td colspan=2 align=center><br>
|
|
|
|
|
<b>- No changes -</b><br> </td>
|
|
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
[is changes.type "binary-diff"]
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan=2> </td>
|
|
|
|
|
</tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<tr class="vc_diff_empty">
|
2002-01-24 05:17:53 +03:00
|
|
|
<td colspan=2 align=center><br>
|
|
|
|
|
<b>- Binary file revisions differ -</b><br> </td>
|
|
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
[is changes.type "error"]
|
|
|
|
|
<tr>
|
|
|
|
|
<td colspan=2> </td>
|
|
|
|
|
</tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<tr class="vc_diff_empty">
|
2002-01-24 05:17:53 +03:00
|
|
|
<td colspan=2 align=center> <br>
|
|
|
|
|
<b>- ViewCVS depends on rcsdiff and GNU diff to create
|
|
|
|
|
this page. ViewCVS cannot find GNU diff. Even if you
|
|
|
|
|
have GNU diff installed, the rcsdiff program must be
|
|
|
|
|
configured and compiled with the GNU diff location.
|
|
|
|
|
-</b> <br> </td>
|
|
|
|
|
</tr>
|
|
|
|
|
[else]
|
|
|
|
|
<tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_nochange"> [changes.left]</td>
|
|
|
|
|
<td class="vc_diff_nochange"> [changes.right]</td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
[end]
|
|
|
|
|
[end]
|
|
|
|
|
[end]
|
|
|
|
|
[end]
|
|
|
|
|
[end]
|
|
|
|
|
[end]
|
|
|
|
|
[end]
|
2002-01-23 08:05:18 +03:00
|
|
|
[end]
|
2002-01-24 05:17:53 +03:00
|
|
|
</table>
|
Instead of sending colored diffs to the diff.ezt template, and raw
diffs to their own text/plain output, templatize all diffs. By
default now, all diffs will go through diff.ezt (which has been
updated to handle it). Only if the new 'makepatch' boolean CGI flag
is set will diffs be sent directly as text/plain, non-templatized
output.
* viewcvs/lib/viewcvs.py
(_legal_params): Add new 'makepatch' boolean parameter.
(check_freshness): Fix a speeling eror.
(MarkupPipeWrapper.__init__): Add 'htmlize' parameter, and use it.
(human_readable_diff): Lose the 'request', 'sym1', and 'sym2'
parameters. Now return the parsed dates and DiffSource object
instead of populating a data dictionary and completely generating
the page.
(spaced_html_text): Use an intermediate variable for readability.
(raw_diff): New.
(view_diff): Honor the new 'makepatch'. Update calls to
human_readable_diff(), and make use of raw_diff(). Do all page
generation for diffs here now. Adds a new 'raw_diff' data
dictionary item, useful for testing raw vs. colored, as well as
for positioning that raw diff output in the template.
* templates/diff.ezt
Use the new 'raw_diff' data dictionary item to position raw diff
output in the template. Update the diff form to allow for the
generation of traditional "patch-ish" raw diff output.
* templates/include/diff_form.ezt
Allow for the generation of traditional "patch-ish" raw diff output.
* website/styles.css
(vc_raw_diff): New style class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@864 8cb11bc2-c004-0410-86c3-e597b4017df7
2004-06-22 18:37:11 +04:00
|
|
|
[end]
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
|
2002-01-24 05:17:53 +03:00
|
|
|
<br><hr noshade width="100%">
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
|
2002-01-24 05:17:53 +03:00
|
|
|
<table border=0 cellpadding=10>
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
<tr>
|
Instead of sending colored diffs to the diff.ezt template, and raw
diffs to their own text/plain output, templatize all diffs. By
default now, all diffs will go through diff.ezt (which has been
updated to handle it). Only if the new 'makepatch' boolean CGI flag
is set will diffs be sent directly as text/plain, non-templatized
output.
* viewcvs/lib/viewcvs.py
(_legal_params): Add new 'makepatch' boolean parameter.
(check_freshness): Fix a speeling eror.
(MarkupPipeWrapper.__init__): Add 'htmlize' parameter, and use it.
(human_readable_diff): Lose the 'request', 'sym1', and 'sym2'
parameters. Now return the parsed dates and DiffSource object
instead of populating a data dictionary and completely generating
the page.
(spaced_html_text): Use an intermediate variable for readability.
(raw_diff): New.
(view_diff): Honor the new 'makepatch'. Update calls to
human_readable_diff(), and make use of raw_diff(). Do all page
generation for diffs here now. Adds a new 'raw_diff' data
dictionary item, useful for testing raw vs. colored, as well as
for positioning that raw diff output in the template.
* templates/diff.ezt
Use the new 'raw_diff' data dictionary item to position raw diff
output in the template. Update the diff form to allow for the
generation of traditional "patch-ish" raw diff output.
* templates/include/diff_form.ezt
Allow for the generation of traditional "patch-ish" raw diff output.
* website/styles.css
(vc_raw_diff): New style class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@864 8cb11bc2-c004-0410-86c3-e597b4017df7
2004-06-22 18:37:11 +04:00
|
|
|
<td>
|
|
|
|
|
<form method=get action="[diff_format_action]">
|
|
|
|
|
[diff_format_hidden_values]
|
|
|
|
|
<input type=checkbox name="makepatch" value="1">
|
|
|
|
|
Generate output suitable for use with a patch program<br>
|
|
|
|
|
<select name="diff_format" onchange="submit()">
|
|
|
|
|
<option value="h" [is diff_format "h"]selected[end]>Colored Diff</option>
|
|
|
|
|
<option value="l" [is diff_format "l"]selected[end]>Long Colored Diff</option>
|
|
|
|
|
<option value="u" [is diff_format "u"]selected[end]>Unidiff</option>
|
|
|
|
|
<option value="c" [is diff_format "c"]selected[end]>Context Diff</option>
|
|
|
|
|
<option value="s" [is diff_format "s"]selected[end]>Side by Side</option>
|
|
|
|
|
</select>
|
|
|
|
|
<input type=submit value="Show">
|
|
|
|
|
</form>
|
|
|
|
|
</td>
|
|
|
|
|
<td>
|
|
|
|
|
[if-any raw_diff]
|
|
|
|
|
|
|
|
|
|
[else]
|
2002-01-24 05:17:53 +03:00
|
|
|
<table border=1>
|
|
|
|
|
<tr>
|
|
|
|
|
<td>Legend:<br>
|
|
|
|
|
<table border=0 cellspacing=0 cellpadding=1>
|
|
|
|
|
<tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<td align=center class="vc_diff_remove">Removed from v.[rev1]</td>
|
|
|
|
|
<td class="vc_diff_empty"> </td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<tr>
|
|
|
|
|
<td align=center colspan=2 class="vc_diff_change">changed lines</td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
<tr>
|
2004-05-12 05:46:43 +04:00
|
|
|
<td class="vc_diff_empty"> </td>
|
|
|
|
|
<td align=center class="vc_diff_add">Added in v.[rev2]</td>
|
2002-01-24 05:17:53 +03:00
|
|
|
</tr>
|
|
|
|
|
</table>
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
|
</table>
|
Instead of sending colored diffs to the diff.ezt template, and raw
diffs to their own text/plain output, templatize all diffs. By
default now, all diffs will go through diff.ezt (which has been
updated to handle it). Only if the new 'makepatch' boolean CGI flag
is set will diffs be sent directly as text/plain, non-templatized
output.
* viewcvs/lib/viewcvs.py
(_legal_params): Add new 'makepatch' boolean parameter.
(check_freshness): Fix a speeling eror.
(MarkupPipeWrapper.__init__): Add 'htmlize' parameter, and use it.
(human_readable_diff): Lose the 'request', 'sym1', and 'sym2'
parameters. Now return the parsed dates and DiffSource object
instead of populating a data dictionary and completely generating
the page.
(spaced_html_text): Use an intermediate variable for readability.
(raw_diff): New.
(view_diff): Honor the new 'makepatch'. Update calls to
human_readable_diff(), and make use of raw_diff(). Do all page
generation for diffs here now. Adds a new 'raw_diff' data
dictionary item, useful for testing raw vs. colored, as well as
for positioning that raw diff output in the template.
* templates/diff.ezt
Use the new 'raw_diff' data dictionary item to position raw diff
output in the template. Update the diff form to allow for the
generation of traditional "patch-ish" raw diff output.
* templates/include/diff_form.ezt
Allow for the generation of traditional "patch-ish" raw diff output.
* website/styles.css
(vc_raw_diff): New style class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@864 8cb11bc2-c004-0410-86c3-e597b4017df7
2004-06-22 18:37:11 +04:00
|
|
|
[end]
|
2002-01-24 05:17:53 +03:00
|
|
|
</td>
|
|
|
|
|
</tr>
|
Big update! Convert the rest of the pages to use templates.
* annotation, human readable diff, CvsGraph, and a marked-up file all
use a template to generate the basic parts of the page. In many
cases (annotate, graph, markup), the content is still rendered
by other code.
* for the diff support, we take advantage of the new list iteration
support in EZT to "iterate on" a DiffSource object, which parses a
diff stream into structured object for the template to display.
* for the CvsGraph page, we make use of EZT's new stream support to
stream in an imagemap from the CvsGraph executable. the graph page
includes a navigation header now.
* updated the upgrading.html page with some items missing from the 0.7
instructions, plus new instructions.
* because of the complete conversion, the configuration file no longer
specifies colors or images -- these are all in the templates now.
Removed the relevant material from config.py and viewcvs.conf.dist.
* converted html_footer() to use the new footer.ezt template because
we still have to call that manually in the markup and annotate
cases.
* add the templates to viewcvs.conf.dist and config.py
* added a handy generate_page() utility for generating pages from a
template and its input data.
* removed download_link, html_icon, html_option, print_diff_select,
and navigate_header utility functions. These all printed HTML to the
output, but are obsolete due to the new templates.
* the new nav_header_data() utility function fills in data used by the
"header.ezt" template, which replaces the navigate_header() func.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@395 8cb11bc2-c004-0410-86c3-e597b4017df7
2001-12-18 03:22:14 +03:00
|
|
|
</table>
|
|
|
|
|
|
2004-04-16 00:37:59 +04:00
|
|
|
[include "include/footer.ezt"]
|