Meta/cook: do not mark 'discarded' ones as graduate
Junio C Hamano committed
Sep 28, 2011 at 18:11 UTC
3f9837b1e7ff32d8dca9fe9cac18790ee7751f91
1 file changed
+15
-2
cook
+15
-2
@@ -10,7 +10,8 @@ my %reverts = ('next' => {
10
%reverts = ();
11
12
sub phrase_these {
13
- my (@u) = sort @_;
13
+ my %uniq = ();
14
+ my (@u) = grep { $uniq{$_}++ == 0 } sort @_;
15
my @d = ();
16
for (my $i = 0; $i < @u; $i++) {
17
push @d, $u[$i];
@@ -437,6 +438,7 @@ sub write_cooking {
438
439
my $graduated = 'Graduated to "master"';
440
my $new_topics = 'New Topics';
441
+my $discarded = 'Discarded';
442
my $old_new_topics = 'Old New Topics';
443
444
sub update_issue {
@@ -547,6 +549,7 @@ sub merge_cooking {
549
}
550
next;
551
}
552
+ # Annotate if the contents of the topic changed
553
my $n = $current->{$topic}{'desc'};
554
my $o = $td->{$topic}{'desc'};
555
if ($n ne $o) {
@@ -558,6 +561,7 @@ sub merge_cooking {
561
next if ($topic eq $blurb);
562
next if (!$incremental &&
563
grep { $topic eq $_ } @{$sd->{$graduated}});
564
+ next if (grep { $topic eq $_ } @{$sd->{$discarded}});
565
if (!exists $current->{$topic}) {
566
push @gone_topic, $topic;
567
}
@@ -627,10 +631,19 @@ sub wildo {
631
}
632
next if (/^ /);
633
if (defined $topic &&
630
- /Will (?:\S+ )?(merge|drop|discard|cook)[. ]/i) {
634
+ /Will (?:\S+ ){0,2}(merge|drop|discard|cook)[. ]/i) {
635
wildo_queue(\%what, $_, $topic);
636
$topic = undef;
637
}
638
+ if (defined $topic &&
639
+ /^Not urgent;/) {
640
+ wildo_queue(\%what, $_, $topic);
641
+ $topic = undef;
642
+ }
643
+ if (defined $topic &&
644
+ /Originally merged to 'next' on ([-0-9]+)/) {
645
+ $topic->[1] = $1;
646
+ }
647
}
648
if (defined $topic) {
649
wildo_queue(\%what, "Undecided", $topic);