From e1c8da09e49980e1c02a849c9f906733ba203e62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Jan 2012 16:53:47 -0800 Subject: [PATCH] Meta/cook -w: catch "stalled" category as well --- cook | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/cook b/cook index 30a5965151..c5d0cb0bf0 100755 --- a/cook +++ b/cook @@ -629,15 +629,20 @@ sub wildo_queue { } sub wildo { - my (%what, $topic, $last_merge_to_next); + my (%what, $topic, $last_merge_to_next, $in_stalled); my $too_recent = '9999-99-99'; while (<>) { chomp; next if (/^\[Graduated to/../^-{20,}$/); - next if (/^\[Stalled\]/../^-{20,}$/); next if (/^\[Discarded\]/../^-{20,}$/); + if (/^\[Stalled\]/../^-{20,}$/) { + $in_stalled = 1; + } else { + $in_stalled = 0; + } + if (/^\* (\S+) \(([-0-9]+)\) (\d+) commits?$/) { if (defined $topic) { wildo_queue(\%what, "Undecided", $topic); @@ -657,7 +662,12 @@ sub wildo { } next if (/^ /); next unless defined $topic; - if (/^Will (?:\S+ ){0,2}(keep|merge|drop|discard|cook|kick)[,. ]/ || + + if ($in_stalled) { + wildo_queue(\%what, "Stalled", $topic); + $topic = undef; + } + if (/^Will (?:\S+ ){0,2}(keep|merge|drop|discard|cook|kick|defer)[,. ]/ || /^Not urgent/ || /^Not ready/ || /^Waiting for / || /^Needs? / || /Expecting /) { wildo_queue(\%what, $_, $topic); -- 2.47.3