merge changes from dla source tree

diff --git a/Debbugs/Bugs.pm b/Debbugs/Bugs.pm
index 010d671618d20c05e9883d47463c0d67664626de..e8d162edf279bd0d8c381e3696c6e6d57fb6775a 100644 (file)
--- a/Debbugs/Bugs.pm
+++ b/Debbugs/Bugs.pm
@@ -290,7 +290,7 @@ sub newest_bug {
      my $next_number = <$nn_fh>;
      close $nn_fh;
      chomp $next_number;
-     return $next_number+0;
+     return $next_number-1;
 }
 
 =head2 bug_filter

diff --git a/Debbugs/SOAP.pm b/Debbugs/SOAP.pm
index cfe74bbf0c43cc4c5d63f7bd406b139cb6e9cab4..ebb96668b894bb770e6e2e1357dafe22e16c7190 100644 (file)
--- a/Debbugs/SOAP.pm
+++ b/Debbugs/SOAP.pm
@@ -138,6 +138,22 @@ sub get_bugs{
      return \@bugs;
 }
 
+=head2 newest_bugs
+
+     my @bugs = newest_bugs(5);
+
+Returns a list of the newest bugs. [Note that all bugs are *not*
+guaranteed to exist, but they should in the most common cases.]
+
+=cut
+
+sub newest_bugs{
+     my $VERSION = __populate_version(pop);
+     my ($self,$num) = @_;
+     my $newest_bug = Debbugs::bugs::newest_bug();
+     return [($newest_bug - $num + 1) .. $newest_bug];
+
+}
 
 =head2 get_bug_log
 
@@ -192,9 +208,8 @@ sub get_bug_log{
          next if defined $msg_id and $msg_id =~ /handler\..+\.ack(?:info)?\@/;
          my $message = parse($record->{text});
          my ($header,$body) = map {join("\n",make_list($_))}
-              values %{$message};
-         push @messages,{html => $record->{html},
-                         header => $header,
+              @{$message}{qw(header body)};
+         push @messages,{header => $header,
                          body   => $body,
                          attachments => [],
                          msg_num => $current_msg,

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index f386655c0a1c1de463446812d4e6fd7917215f17..c36f9f68b8623f8bc0b1b00c7fd6c040a5ff144a 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -20,7 +20,7 @@ use Debbugs::Config qw(:globals :text :config);
 use Debbugs::User;
 use Debbugs::CGI qw(version_url maint_decode);
 use Debbugs::Common qw(getparsedaddrs :date make_list getmaintainers);
-use Debbugs::Bugs qw(get_bugs bug_filter);
+use Debbugs::Bugs qw(get_bugs bug_filter newest_bug);
 use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions);
 use Debbugs::Status qw(:status);
 use Debbugs::CGI qw(:all);
@@ -41,7 +41,7 @@ our %param = cgi_parameters(query => $q,
                            single => [qw(ordering archive repeatmerged),
                                       qw(bug-rev pend-rev sev-rev),
                                       qw(maxdays mindays version),
-                                      qw(data which dist),
+                                      qw(data which dist newest),
                                      ],
                            default => {ordering => 'normal',
                                        archive  => 0,
@@ -85,42 +85,50 @@ unless (defined $ordering) {
    $ordering = "raw" if $raw_sort;
    $ordering = 'age' if $age_sort;
 }
-my ($bug_order) = $ordering =~ /(age(?:rev)?)/;
+our ($bug_order) = $ordering =~ /(age(?:rev)?)/;
 $bug_order = '' if not defined $bug_order;
 
 my $bug_rev = ($param{'bug-rev'} || "no") eq "yes";
 my $pend_rev = ($param{'pend-rev'} || "no") eq "yes";
 my $sev_rev = ($param{'sev-rev'} || "no") eq "yes";
-my $pend_exc = $param{'&pend-exc'} || $param{'pend-exc'} || "";
-my $pend_inc = $param{'&pend-inc'} || $param{'pend-inc'} || "";
-my $sev_exc = $param{'&sev-exc'} || $param{'sev-exc'} || "";
-my $sev_inc = $param{'&sev-inc'} || $param{'sev-inc'} || "";
-my $maxdays = ($param{'maxdays'} || -1);
-my $mindays = ($param{'mindays'} || 0);
-my $version = $param{'version'} || undef;
-my $dist = $param{'dist'} || undef;
-my $arch = $param{'arch'} || undef;
 
-{
-    if (defined $param{'vt'}) {
-        my $vt = $param{'vt'};
-        if ($vt eq "none") { $dist = undef; $arch = undef; $version = undef; }
-        if ($vt eq "bysuite") {
-            $version = undef;
-            $arch = undef if ($arch eq "any");
-        }
-        if ($vt eq "bypkg" || $vt eq "bysrc") { $dist = undef; $arch = undef; }
-    }
-    if (defined $param{'includesubj'}) {
-        my $is = $param{'includesubj'};
-        $include .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $is));
-    }
-    if (defined $param{'excludesubj'}) {
-        my $es = $param{'excludesubj'};
-        $exclude .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $es));
-    }
+my @inc_exc_mapping = ({name   => 'pending',
+                       incexc => 'include',
+                       key    => 'pend-inc',
+                      },
+                      {name   => 'pending',
+                       incexc => 'exclude',
+                       key    => 'pend-exc',
+                      },
+                      {name   => 'severity',
+                       incexc => 'include',
+                       key    => 'sev-inc',
+                      },
+                      {name   => 'severity',
+                       incexc => 'exclude',
+                       key    => 'sev-exc',
+                      },
+                      {name   => 'subject',
+                       incexc => 'include',
+                       key    => 'includesubj',
+                      },
+                      {name   => 'subject',
+                       incexc => 'exclude',
+                       key    => 'excludesubj',
+                      },
+                     );
+for my $incexcmap (@inc_exc_mapping) {
+     push @{$param{$incexcmap->{incexc}}}, map {"$incexcmap->{name}:$_"}
+         map{split /\s*,\s*/} make_list($param{$incexcmap->{key}})
+              if exists $param{$incexcmap->{key}};
+     delete $param{$incexcmap->{key}};
 }
 
+my $maxdays = ($param{'maxdays'} || -1);
+my $mindays = ($param{'mindays'} || 0);
+my $version = $param{'version'} || undef;
+# XXX Once the options/selection is rewritten, this should go away
+my $dist = $param{dist} || undef;
 
 our %hidden = map { $_, 1 } qw(status severity classification);
 our %cats = (
@@ -157,7 +165,7 @@ our %cats = (
 );
 
 my @select_key = (qw(submitter maint pkg package src usertag),
-                 qw(status tag maintenc owner severity)
+                 qw(status tag maintenc owner severity newest)
                 );
 
 if (exists $param{which} and exists $param{data}) {
@@ -308,7 +316,7 @@ while (my ($key,$value) = splice @search_key_order, 0, 2) {
      }
      push @title,$value.' '.join(' or ', @entries);
 }
-my $title = join(' and ', map {/ or /?"($_)":$_} @title);
+my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
 @title = ();
 
 # we have to special case the maint="" search, unfortunatly.
@@ -322,7 +330,12 @@ if (defined $param{maint} and $param{maint} eq "") {
                           return 0;
                      }
                     );
-     $title = 'in packages with no maintainer';
+     $title = $gBugs.' in packages with no maintainer';
+}
+elsif (defined $param{newest}) {
+     my $newest_bug = newest_bug();
+     @bugs = ($newest_bug - $param{newest} + 1) .. $newest_bug;
+     $title = @bugs.' newest '.$gBugs;
 }
 else {
      #yeah for magick!
@@ -333,10 +346,10 @@ else {
 }
 
 if (defined $param{version}) {
-     $title .= " at version $version";
+     $title .= " at version $param{version}";
 }
 elsif (defined $param{dist}) {
-     $title .= " in $dist";
+     $title .= " in $param{dist}";
 }
 
 $title = html_escape($title);
@@ -360,7 +373,7 @@ print "<HTML><HEAD>\n" .
     "</HEAD>\n" .
     '<BODY onload="pagemain();">' .
     "\n";
-print "<H1>" . "$gProject$Archived $gBug report logs: $gBugs $title" .
+print "<H1>" . "$gProject$Archived $gBug report logs: $title" .
       "</H1>\n";
 
 my $showresult = 1;
@@ -413,7 +426,7 @@ sub output_package_info{
              print "<p>You may want to refer to the following individual bug pages:\n";
         }
         #push @pkgs, $src if ( $src && !grep(/^\Q$src\E$/, @pkgs) );
-        print join( ", ", map( "<A href=\"" . html_escape(munge_url($this,package=>$_)) . "\">$_</A>", @pkgs ) );
+        print join( ", ", map( "<A href=\"" . html_escape(munge_url($this,package=>$_,src=>[],newest=>[])) . "\">$_</A>", @pkgs ) );
         print ".\n";
     }
     my @references;
@@ -432,7 +445,7 @@ sub output_package_info{
         }
         # Only output this if the source listing is non-trivial.
         if ($srcorbin eq 'binary' and $srcforpkg) {
-             push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[])), html_escape($srcforpkg);
+             push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[],newest=>[])), html_escape($srcforpkg);
         }
     }
     if (@references) {
@@ -732,6 +745,21 @@ sub pkg_htmlizebugs {
     );
 
     my %section = ();
+    # Make the include/exclude map
+    my %include;
+    my %exclude;
+    for my $include (make_list($param{include})) {
+        next unless defined $include;
+        my ($key,$value) = split /\s*:\s*/,$include,2;
+        next unless defined $value;
+        push @{$include{$key}}, split /\s*,\s*/, $value;
+    }
+    for my $exclude (make_list($param{exclude})) {
+        next unless defined $exclude;
+        my ($key,$value) = split /\s*:\s*/,$exclude,2;
+        next unless defined $value;
+        push @{$exclude{$key}}, split /\s*,\s*/, $value;
+    }
 
     foreach my $bug (@bugs) {
         my %status = %{get_bug_status(bug=>$bug,
@@ -745,6 +773,8 @@ sub pkg_htmlizebugs {
                           status => \%status,
                           (exists $param{repeatmerged}?(repeat_merged => $param{repeatmerged}):()),
                           seen_merged => \%seenmerged,
+                          (keys %include ? (include => \%include):()),
+                          (keys %exclude ? (exclude => \%exclude):()),
                          );
 
        my $html = sprintf "<li><a href=\"%s\">#%d: %s</a>\n<br>",
@@ -848,7 +878,7 @@ sub pkg_htmlpackagelinks {
     return 'Package' . (@pkglist > 1 ? 's' : '') . ': ' .
            join(', ',
                 map {
-                    '<a class="submitter" href="' . munge_url($this,src=>[],package=>$_) . '">' .
+                    '<a class="submitter" href="' . munge_url($this,src=>[],package=>$_,newest=>[]) . '">' .
                     $openstrong . html_escape($_) . $closestrong . '</a>'
                 } @pkglist
            );
@@ -1057,7 +1087,7 @@ sub determine_ordering {
         while (defined $param{"pri$i"}) {
             my $h = {};
 
-            my $pri = $param{"pri$i"};
+            my ($pri) = make_list($param{"pri$i"});
             if ($pri =~ m/^([^:]*):(.*)$/) {
               $h->{"nam"} = $1;  # overridden later if necesary
               $h->{"pri"} = [ map { "$1=$_" } (split /,/, $2) ];
@@ -1065,12 +1095,12 @@ sub determine_ordering {
               $h->{"pri"} = [ split /,/, $pri ];
             }
 
-           $h->{"nam"} = $param{"nam$i"}
-                if (defined $param{"nam$i"}); 
-            $h->{"ord"} = [ split /\s*,\s*/, $param{"ord$i"} ]
-                if (defined $param{"ord$i"}); 
-            $h->{"ttl"} = [ split /\s*,\s*/, $param{"ttl$i"} ]
-                if (defined $param{"ttl$i"}); 
+           ($h->{"nam"}) = make_list($param{"nam$i"})
+                if (defined $param{"nam$i"});
+            $h->{"ord"} = [ split /\s*,\s*/, make_list($param{"ord$i"}) ]
+                if (defined $param{"ord$i"});
+            $h->{"ttl"} = [ split /\s*,\s*/, make_list($param{"ttl$i"}) ]
+                if (defined $param{"ttl$i"});
 
             push @c, $h;
            $i++;

diff --git a/debian/changelog b/debian/changelog
index d32fca60a25bc5049d39d7f99819cf1e8bac40b6..42889f0dd00f3cc72719d4c8b8b5d8e4d30d7cff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -195,6 +195,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add bugspam.cgi with confirm string (closes: #348225)
     - Allow selecting both archived and unarchived bugs (closes: #320175)
     - Support intersecting sets of bugs (closes: #164421)
+    - Allow selecting the newest N bugs (closes: #84681)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100