Whip 'select for diffs', 'diff to previous', and 'diff to selected'
into shape for Subversion.
* viewcvs/lib/viewcvs.py
(view_log): Grab the path of a version selected for diffs from the
query data, and stash it in the data dictionary.
* viewcvs/templates/log_table.ezt
* viewcvs/templates/log.ezt
Fix the 'diff to previous', 'diff to selected', and 'select for
diff' links for Subversion. Also, don't display the various "branch
point" and "next main" diff links for Subversion.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@720 8cb11bc2-c004-0410-86c3-e597b4017df7
remotes/tags/1.0.0-rc1
cmpilato
parent
1ab8cfbd92
commit
9a8d5d115b
|
|
@ -1962,7 +1962,8 @@ def view_log(request):
|
|||
'nav_path' : clickable_path(request, 1, 0),
|
||||
'branch' : None,
|
||||
'mime_type' : request.mime_type,
|
||||
'rev_selected' : request.query_dict.get('r1'),
|
||||
'rev_selected' : request.query_dict.get('r1'),
|
||||
'path_selected' : request.query_dict.get('p1'),
|
||||
'diff_format' : diff_format,
|
||||
'logsort' : logsort,
|
||||
'viewable' : ezt.boolean(request.default_viewable),
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
[is entries.rev rev_selected]
|
||||
- <b>[[]selected]</b>
|
||||
[else]
|
||||
- <a href="[diff_url]?r1=[entries.rev][diff_params]">[[]select for diffs]</a>
|
||||
- <a href="[diff_url]?r1=[entries.rev][is roottype "svn"]&p1=[entries.filename][end][diff_params]">[[]select for diffs]</a>
|
||||
[end]
|
||||
|
||||
[end]
|
||||
|
|
@ -150,39 +150,37 @@
|
|||
<br><b><i>FILE REMOVED</i></b>
|
||||
[else]
|
||||
[if-any entries.prev]
|
||||
[is roottype "svn"]
|
||||
<br>Diff to <a href="[diff_url]?r1=[entries.prev][if-any entries.prev_path]&p1=[entries.prev_path][end]&r2=[entries.rev]&p2=[entries.filename][diff_params]">previous [entries.prev]</a>
|
||||
[else]
|
||||
<br>Diff to <a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev][diff_params]">previous [entries.prev]</a>
|
||||
[end]
|
||||
<br>Diff to <a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[entries.prev_path][end]&p2=[entries.filename][end][diff_params]">previous [entries.prev]</a>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
(<a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev]&diff_format=h[diff_params]">colored</a>)
|
||||
(<a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[entries.prev_path][end]&p2=[entries.filename][end]&diff_format=h[diff_params]">colored</a>)
|
||||
[end]
|
||||
[end]
|
||||
|
||||
[if-any entries.branch_point]
|
||||
, to <a href="[diff_url]?r1=[entries.branch_point]&r2=[entries.rev][diff_params]">branch point [entries.branch_point]</a>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
, (<a href="[diff_url]?r1=[entries.branch_point]&r2=[entries.rev]&diff_format=h[diff_params]">colored</a>)
|
||||
[is roottype "cvs"]
|
||||
[if-any entries.branch_point]
|
||||
, to <a href="[diff_url]?r1=[entries.branch_point]&r2=[entries.rev][diff_params]">branch point [entries.branch_point]</a>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
, (<a href="[diff_url]?r1=[entries.branch_point]&r2=[entries.rev]&diff_format=h[diff_params]">colored</a>)
|
||||
[end]
|
||||
[end]
|
||||
[end]
|
||||
|
||||
[if-any entries.next_main]
|
||||
, to <a href="[diff_url]?r1=[entries.next_main]&r2=[entries.rev][diff_params]">next main [entries.next_main]</a>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
, (<a href="[diff_url]?r1=[entries.next_main]&r2=[entries.rev]&diff_format=h[diff_params]">colored</a>)
|
||||
|
||||
[if-any entries.next_main]
|
||||
, to <a href="[diff_url]?r1=[entries.next_main]&r2=[entries.rev][diff_params]">next main [entries.next_main]</a>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
, (<a href="[diff_url]?r1=[entries.next_main]&r2=[entries.rev]&diff_format=h[diff_params]">colored</a>)
|
||||
[end]
|
||||
[end]
|
||||
[end]
|
||||
|
||||
[if-any entries.to_selected]
|
||||
[if-any entries.prev], [else]<br>Diff[end]
|
||||
to <a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev][diff_params]">selected [rev_selected]</a>
|
||||
to <a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[path_selected][end]&p2=[entries.filename][end][diff_params]">selected [rev_selected]</a>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
(<a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev]&diff_format=h[diff_params]">colored</a>)
|
||||
(<a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[path_selected][end]&p2=[entries.filename][end]&diff_format=h[diff_params]">colored</a>)
|
||||
[end]
|
||||
[end]
|
||||
[end]
|
||||
|
|
|
|||
|
|
@ -89,20 +89,20 @@ href="[docroot]/help_logtable.html">ViewCVS and CVS Help</a></b></h3></td>
|
|||
[is entries.rev rev_selected]
|
||||
<b>[[]selected]</b><br>
|
||||
[else]
|
||||
<a href="[diff_url]?r1=[entries.rev][diff_params]"><b>[[]select for diffs]</b></a><br>
|
||||
<a href="[diff_url]?r1=[entries.rev][is roottype "svn"]&p1=[entries.filename][end][diff_params]"><b>[[]select for diffs]</b></a><br>
|
||||
[end]
|
||||
[if-any entries.to_selected]
|
||||
<a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev][diff_params]"><b>Diff to selected [rev_selected]</b></a><br>
|
||||
<a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[path_selected][end]&p2=[entries.filename][end][diff_params]"><b>Diff to selected [rev_selected]</b></a><br>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
<a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev]&diff_format=h[diff_params]"><b>colored</b></a><br>
|
||||
<a href="[diff_url]?r1=[rev_selected]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[path_selected][end]&p2=[entries.filename][end]&diff_format=h[diff_params]"><b>colored</b></a><br>
|
||||
[end]
|
||||
[end]
|
||||
[if-any entries.prev]
|
||||
<a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev][diff_params]"><b>Diff to previous [entries.prev]</b></a><br>
|
||||
<a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[entries.prev_path][end]&p2=[entries.filename][end][diff_params]"><b>Diff to previous [entries.prev]</b></a><br>
|
||||
[if-any human_readable]
|
||||
[else]
|
||||
<a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev]&diff_format=h[diff_params]"><b>colored</b></a><br>
|
||||
<a href="[diff_url]?r1=[entries.prev]&r2=[entries.rev][is roottype "svn"][if-any entries.prev_path]&p1=[entries.prev_path][end]&p2=[entries.filename][end]&diff_format=h[diff_params]"><b>colored</b></a><br>
|
||||
[end]
|
||||
[end]
|
||||
[end]
|
||||
|
|
|
|||
Loading…
Reference in New Issue