r23143 - /scripts/qa/templates/by_category

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Jul 14 07:37:29 2008
New Revision: 23143

URL: http://svn.debian.org/wsvn/?sc=1&rev=23143
Log:
Abstract SVN links; support viewsvn

Modified:
    scripts/qa/templates/by_category

Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=23143&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Mon Jul 14 07:37:29 2008
@@ -104,6 +104,26 @@
 [% END #IF bugs %]
 [% END #BLOCK bts_link %]
 
+[% BLOCK file_in_svn %]
+    [% IF wsvn_url %]
+    [% pkg.svn.dir | format("$wsvn_url")
+    %]/$file?op=file&rev=0&sc=0[% END %]
+    [% ELSE IF viewsvn_url %]
+    [% pkg.svn.dir | format("$viewsvn_url")
+    %]/$file?view=markup[% END %]
+    [% END %]
+[% END #BLOCK file_in_svn %]
+
+[% BLOCK dir_in_svn %]
+    [% IF wsvn_url %]
+    [% pkg.svn.dir | format("$wsvn_url")
+    %]/$dir?rev=0&sc=0[% END %]
+    [% ELSE IF viewsvn_url %]
+    [% pkg.svn.dir | format("$viewsvn_url")
+    %]/$dir?[% END %]
+    [% END %]
+[% END #BLOCK dir_in_svn %]
+
 [% BLOCK package %]
     [% SET arch_ver = pkg.archive.most_recent %]
     [% SET arch_src = pkg.archive.most_recent_src %]
@@ -140,8 +160,7 @@
         </td>
 
         <td[% IF pkg.hilight.svn %] class="todo"[% END %]>
-            [% chlog_url = BLOCK %][% pkg.svn.dir | format("$wsvn_url")
-            %]/debian/changelog?op=file&amp;rev=0&amp;sc=0[% END %]
+            [% chlog_url = BLOCK %][% file_in_svn file="debian/changelog" %][% END %]
             <span class="popup svn-rel"><a href="$chlog_url">$svn_ver</a><span
                     id="${pkg.svn.dir}_rel_chlog_balloon" class="balloon"><a
                         href="javascript:async_get(
@@ -195,28 +214,18 @@
         <td>[% INCLUDE bts_link pkg=pkg %]</td>
 
         <td[% IF pkg.hilight.upstream %] class="todo"[% END %]>[% IF
-            pkg.watch.upstream_mangled %]<a href="[% 
-            pkg.watch.upstream_url | html %]">[%
-                pkg.watch.upstream_mangled
+        pkg.watch.upstream_mangled %]<a href="[% pkg.watch.upstream_url | html
+        %]">[% pkg.watch.upstream_mangled
             %]</a>[% ELSE %][% pkg.watch.error %][% END %]
-            [% IF pkg.watch.upstream_dir %]
-            <a href="$pkg.watch.upstream_dir" class="watch-up-dir">(browse)</a>
-            [% END %]
-            [% IF pkg.hilight.upstream %]
-            [% IF pkg.watch.error %]
-            <a href="[% "${pkg.svn.dir}" | format("$wsvn_url")
-                        %]/debian/copyright?op=file&amp;rev=0&amp;sc=0"
-                class="watch-cp-info">(copyright info)</a>
-            [% END %]
-            [% IF pkg.watch.error != "Missing" AND ! pkg.status.needs_upgrade %]
-            <a href="[% "${pkg.svn.dir}" | format("$wsvn_url")
-                        %]/debian/watch?op=file&amp;rev=0&amp;sc=0"
-                class="watch-file">(watchfile)</a>
-            [% END %]
-            [% END %]
-            </td>
-    </tr>
-[% END #BLOCK package %]
+            [% IF pkg.watch.upstream_dir %] <a href="$pkg.watch.upstream_dir"
+            class="watch-up-dir">(browse)</a> [% END %] [% IF
+            pkg.hilight.upstream %] [% IF pkg.watch.error %] <a href="[%
+            file_in_svn file='debian/copyright' %]"
+                class="watch-cp-info">(copyright info)</a> [% END %] [% IF
+                pkg.watch.error != "Missing" AND ! pkg.status.needs_upgrade %]
+                <a href="[% file_in_svn file='debian/watch' %]"
+                class="watch-file">(watchfile)</a> [% END %] [% END %] </td>
+                </tr> [% END #BLOCK package %]
 
 [% BLOCK section %]
     [% IF list.0 %]