r23220 - in /scripts/qa: DebianQA/Config.pm debianqa.conf-sample templates/by_category

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Jul 15 10:48:57 2008
New Revision: 23220

URL: http://svn.debian.org/wsvn/?sc=1&rev=23220
Log:
split the package and file substitutions to allow for $pkg/trunk-style repositories

Modified:
    scripts/qa/DebianQA/Config.pm
    scripts/qa/debianqa.conf-sample
    scripts/qa/templates/by_category

Modified: scripts/qa/DebianQA/Config.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Config.pm?rev=23220&op=diff
==============================================================================
--- scripts/qa/DebianQA/Config.pm (original)
+++ scripts/qa/DebianQA/Config.pm Tue Jul 15 10:48:57 2008
@@ -147,6 +147,8 @@
     $CFG{qareport_cgi}{scm_web_dir} ||= 
         $CFG{qareport_cgi}{wsvn_url}.'/?rev=0&sc='
         if $CFG{qareport_cgi}{wsvn_url};
+    $CFG{qareport_cgi}{scm_web_file} =~ s'%s'${pkg}/${file}';
+    $CFG{qareport_cgi}{scm_web_dir} =~ s'%s'${pkg}/${dir}';
 }
 # Parses command line options, loads configuration file if specified, removes
 # arguments from @ARGV and returns a hash with the parsed options.

Modified: scripts/qa/debianqa.conf-sample
URL: http://svn.debian.org/wsvn/scripts/qa/debianqa.conf-sample?rev=23220&op=diff
==============================================================================
--- scripts/qa/debianqa.conf-sample (original)
+++ scripts/qa/debianqa.conf-sample Tue Jul 15 10:48:57 2008
@@ -11,10 +11,10 @@
 group_url = http://pkg-foo.alioth.debian.org/
 ; sprintf format for the package SCM web location, takes one parameter, the
 ; package directory/file. Samples are for ViewSVN (recommended) and WebSVN
-;scm_web_dir = http://svn.debian.org/viewsvn/pkg-foo/trunk/%s?
-;scm_web_dir = http://svn.debian.org/wsvn/pkg-foo/trunk/%s/?rev=0&sc=0
-;scm_web_file = http://svn.debian.org/viewsvn/pkg-foo/trunk/%s?view=markup
-;scm_web_file = http://svn.debian.org/wsvn/pkg-foo/trunk/%s/?op=file&rev=0&sc=0
+;scm_web_file = http://svn.debian.org/viewsvn/pkg-foo/trunk/${pkg}/{$file}?view=markup
+;scm_web_file = http://svn.debian.org/wsvn/pkg-foo/trunk/${pkg}/{$file}/?op=file&rev=0&sc=0
+;scm_web_dir = http://svn.debian.org/viewsvn/pkg-foo/trunk/${pkg}/${dir}/?
+;scm_web_dir = http://svn.debian.org/wsvn/pkg-foo/trunk/${pkg}/${dir}/?rev=0&sc=0
 ; Defaults for CGI options
 ;default_show_all = 0
 ;default_start_collapsed = 0

Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=23220&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Tue Jul 15 10:48:57 2008
@@ -29,6 +29,14 @@
 <span>Uploaders: [% myupldr.join(", ") %] </span>
 [% END #IF %]
 [% END #BLOCK %]
+
+[% BLOCK scm_file_url %]
+[% $scm_web_file | replace('${pkg}', $pkg.svn.dir) | replace('${file}', $file) %]
+[% END #BLOCK scm_file_url %]
+
+[% BLOCK scm_dir_url %]
+[% $scm_web_dir | replace('${pkg}', $pkg.svn.dir) | replace('${dir}', $dir) %]
+[% END #BLOCK scm_dir_url %]
 
 [% MACRO check_maint(pkg, s) BLOCK %]
 [% IF s == "svn";
@@ -140,8 +148,8 @@
         </td>
 
         <td[% IF pkg.hilight.svn %] class="todo"[% END %]>
-            [% chlog_url = BLOCK %][% "${pkg.svn.dir}/debian/changelog" |
-            format(scm_web_file) | html %][% END %]
+            [% chlog_url = BLOCK %][% INCLUDE scm_file_url file='debian/changelog'
+            html %][% 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(
@@ -201,11 +209,10 @@
             [% 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}/debian/copyright" | format(scm_web_file) | html %]"
+            INCLUDE scm_file_url file="debian/copyright" | html %]"
                 class="watch-cp-info">(copyright info)</a> [% END %] [% IF
                 pkg.watch.error != "Missing" AND ! pkg.status.needs_upgrade %]
-                <a href="[% "${pkg.svn.dir}/debian/watch" |
-                format(scm_web_file) | html %]"
+                <a href="[% INCLUDE scm_file_url file="debian/watch" | html %]"
                 class="watch-file">(watchfile)</a> [% END %] [% END %] </td>
                 </tr> [% END #BLOCK package %]