#!/usr/bin/perl
-# $Id: service.in,v 1.115 2005/10/06 03:46:13 ajt Exp $
+# $Id: service.in,v 1.118 2005/10/19 01:22:14 don Exp $
#
# Usage: service <code>.nn
# Temps: incoming/P<code>.nn
&transcript("Selected user id ($newuser) invalid, sorry\n");
$user = "";
}
+ } elsif (m/^usercategory\s+(\S+)(\s+\[hidden\])?\s*$/i) {
+ $ok++;
+ my $catname = $1;
+ my $hidden = ($2 ne "");
+
+ my $prefix = "";
+ my @cats;
+ my $bad = 0;
+ my $catsec = 0;
+ while (++$procline <= $#bodylines) {
+ unless ($bodylines[$procline] =~ m/^\s*([*+])\s*(\S.*)$/) {
+ $procline--;
+ last;
+ }
+ &transcript("> $bodylines[$procline]\n");
+ next if $bad;
+ my ($o, $txt) = ($1, $2);
+ if ($#cats == -1 && $o eq "+") {
+ &transcript("User defined category specification must start with a category name. Skipping.\n\n");
+ $bad = 1;
+ next;
+ }
+ if ($o eq "+") {
+ unless (ref($cats[-1]) eq "HASH") {
+ $cats[-1] = { "nam" => $cats[-1],
+ "pri" => [], "ttl" => [] };
+ }
+ $catsec++;
+ my ($desc, $ord, $op);
+ if ($txt =~ m/^(.*\S)\s*\[((\d+):\s*)?\]\s*$/) {
+ $desc = $1; $ord = $3; $op = "";
+ } elsif ($txt =~ m/^(.*\S)\s*\[((\d+):\s*)?(\S+)\]\s*$/) {
+ $desc = $1; $ord = $3; $op = $4;
+ } elsif ($txt =~ m/^([^[\s]+)\s*$/) {
+ $desc = ""; $op = $1;
+ } else {
+ &transcript("Unrecognised syntax for category section. Skipping.\n\n");
+ $bad = 1;
+ next;
+ }
+ $ord = 999 unless defined $ord;
+
+ if ($op) {
+ push @{$cats[-1]->{"pri"}}, $prefix . $op;
+ push @{$cats[-1]->{"ttl"}}, $desc;
+ push @ords, "$ord $catsec";
+ } else {
+ @cats[-1]->{"def"} = $desc;
+ push @ords, "$ord DEF";
+ $catsec--;
+ }
+ @ords = sort { my ($a1, $a2, $b1, $b2) = split / /, "$a $b";
+ $a1 <=> $b1 || $a2 <=> $b2; } @ords;
+ $cats[-1]->{"ord"} = [map { m/^.* (\S+)/; $1 eq "DEF" ? $catsec + 1 : $1 } @ords];
+ } elsif ($o eq "*") {
+ $catsec = 0;
+ my ($name);
+ if ($txt =~ m/^(.*\S)(\s*\[(\S+)\])\s*$/) {
+ $name = $1; $prefix = $3;
+ } else {
+ $name = $txt; $prefix = "";
+ }
+ push @cats, $name;
+ }
+ }
+ # XXX: got @cats, now do something with it
+ my $u = Debbugs::User::get_user($user);
+ if (@cats) {
+ &transcript("Added usercategory $catname.\n\n");
+ $u->{"categories"}->{$catname} = [ @cats ];
+ } else {
+ &transcript("Removed usercategory $catname.\n\n");
+ delete $u->{"categories"}->{$catname};
+ }
+ $u->write();
} elsif (m/^usertags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) {
$ok++;
$ref = $1; $addsubcode = $3 || "+"; $tags = $4;
} else {
my %ut;
Debbugs::User::read_usertags(\%ut, $user);
- my @oldtags = (); my @newtags = ();
- my %chtags = map { ($_, 1) } split /[,\s]+/, $tags;
+ my @oldtags = (); my @newtags = (); my @badtags = ();
+ my %chtags;
+ for my $t (split /[,\s]+/, $tags) {
+ if ($t =~ m/^[a-zA-Z0-9.+\@-]+$/) {
+ $chtags{$t} = 1;
+ } else {
+ push @badtags, $t;
+ }
+ }
+ if (@badtags) {
+ &transcript("Ignoring illegal tag/s: ".join(', ', @badtags).".\nPlease use only alphanumerics, at, dot, plus and dash.\n");
+ }
for my $t (keys %chtags) {
$ut{$t} = [] unless defined $ut{$t};
}
&transcript("$action\n\n");
}
&endmerge;
+ } elsif (m/^forcemerge\s+\#?(-?\d+(\s+\#?-?\d+)+)\s*$/i) {
+ $ok++;
+ my @tomerge = split /\s+\#?/,$1;
+ my $master_bug = shift @tomerge;
+ my $master_bug_data;
+ @tomerge = ($master_bug, sort { $a <=> $b } @tomerge);
+ @newmergelist= ();
+ my %tags = ();
+ my %found = ();
+ my %fixed = ();
+ # Here we try to do the right thing.
+ # First, if the bugs are in the same package, we merge all of the found, fixed, and tags.
+ # If not, we discard the found and fixed.
+ # Everything else we set to the values of the first bug.
+ &getmerge;
+ while (defined($ref= shift(@tomerge))) {
+ &transcript("D| checking merge $ref\n") if $dl;
+ $ref+= 0;
+ if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
+ $ref = $clonebugs{$ref};
+ }
+ next if grep($_ eq $ref,@newmergelist);
+ if (!&getbug) { ¬foundbug; @newmergelist=(); last }
+ if (!&checkpkglimit) { &cancelbug; @newmergelist=(); last; }
+ &foundbug;
+ &transcript("D| adding $ref ($data->{mergedwith})\n") if $dl;
+ $master_bug_data = $data if not defined $master_bug_data;
+ if ($data->{package} ne $master_bug_data->{package}) {
+ &transcript("Mismatch - only $gBugs in the same package can be forcibly merged:\n".
+ "$gBug $ref is not in the same package as $master_bug\n");
+ &cancelbug; @newmergelist=(); last;
+ }
+ for my $t (split /\s+/,$data->{keywords}) {
+ $tags{$t} = 1;
+ }
+ @found{@{$data->{found_versions}}} = (1) x @{$data->{found_versions}};
+ @fixed{@{$data->{fixed_versions}}} = (1) x @{$data->{fixed_versions}};
+ push(@newmergelist,$ref);
+ push(@tomerge,split(/ /,$data->{mergedwith}));
+ &cancelbug;
+ }
+ if (@newmergelist) {
+ @newmergelist= sort { $a <=> $b } @newmergelist;
+ $action= "Forcibly Merged @newmergelist.";
+ delete @fixed{keys %found};
+ for $ref (@newmergelist) {
+ &getbug || die "huh ? $gBug $ref disappeared during merge";
+ &addmaintainers($data);
+ @bug_affected{@newmergelist} = 1 x @newmergelist;
+ $data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist));
+ $data->{keywords}= join(' ', keys %tags);
+ $data->{found_versions}= [sort keys %found];
+ $data->{fixed_versions}= [sort keys %fixed];
+ my @field_list = qw(forwarded package severity blocks blockedby owner done);
+ @{$data}{@field_list} = @{$master_bug_data}{@field_list}
+ &savebug;
+ }
+ &transcript("$action\n\n");
+ }
+ &endmerge;
} elsif (m/^clone\s+#?(\d+)\s+((-\d+\s+)*-\d+)\s*$/i) {
$ok++;
&unfilelock;
utime(time,time,"db-h");
-&sendmailmessage($reply,$replyto,@maintccaddrs,@bcc);
+&sendmailmessage($reply,exists $header{'x-debbugs-no-ack'}?():$replyto,@maintccaddrs,@bcc);
unlink("incoming/P$nn") || &quit("unlinking incoming/P$nn: $!");
projects / debbugs.git / blobdiff