Meta/cook: catch 'will wait...', too

... and ignore ??/wip-* while at it.

diff --git a/Reintegrate b/Reintegrate
index 34ba795c82c4072f2a8850dac439bdd0bc101ce5..7767a079b54239f9edf88c2169c73d9f1bb6b373 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -27,7 +27,7 @@ annotate_merge () {
        perl -e '
                sub wildo_match {
                        s/^\s*//;
-                       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+                       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled|wait)[,. ]/ ||
                            /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
                            /^Can wait in / || /^Still / ||
                            /^Needs? / || /^Expecting / || /^May want to /) {

diff --git a/cook b/cook
index 7afa1e21e97ac275dccf8d2e5941653585135d4f..7370f95bb3367f750d7f5346b56d15c1f46fbd3d 100755 (executable)
--- a/cook
+++ b/cook
@@ -120,6 +120,8 @@ sub get_commit {
        while (<$fh>) {
                chomp;
                my ($branch, $date) = /^(\S+) (.*)$/;
+
+               next if ($branch =~ m|^../wip-|);
                push @topic, $branch;
                $date =~ s/ .*//;
                $topic{$branch} = +{
@@ -684,7 +686,7 @@ sub wildo_flush_topic {
 }
 
 sub wildo_match {
-       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled|wait)[,. ]/ ||
            /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
            /^Can wait in / || /^Still / ||
            /^Needs? / || /^Expecting / || /^May want to /) {