]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/cook -w: catch "stalled" category as well
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jan 2012 00:53:47 +0000 (16:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jan 2012 00:53:47 +0000 (16:53 -0800)
cook

diff --git a/cook b/cook
index 30a5965151ff3885b28b32a0df1e86bdb1201454..c5d0cb0bf0119b25672eb85848fc08771b21843d 100755 (executable)
--- 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);