cook: teach 'on hold' and other status
Junio C Hamano committed
Mar 1, 2019 at 07:30 UTC
5410cdfd20f1e4a8880caeb9b9b97734777ba89e
1 file changed
+4
-3
cook
+4
-3
index 1428aee225..73d96af536 100755
--- a/cook
+++ b/cook
@@ -579,8 +579,8 @@ sub tweak_willdo {
$desc =~ s/\n<<\n.*//s;
if ($desc =~ /^ \(merged to 'next'/m) {
$text =~ s/^ Will merge to 'next'\.$/ $mergetomaster/m;
- $text =~ s/^ Will merge to and then cook in 'next'\.$/ Will cook in 'next'./m;
- $text =~ s/^ Will merge to 'next' and then to 'master'\.$/ $mergetomaster/m;
+ $text =~ s/^ Will merge to and (then )?cook in 'next'\.$/ Will cook in 'next'./m;
+ $text =~ s/^ Will merge to 'next' and (then )?to 'master'\.$/ Will merge to 'master'./m;
}
$td->{'text'} = $text;
}
@@ -706,9 +706,10 @@ sub wildo_flush_topic {
}
sub wildo_match {
+ # NEEDSWORK: unify with Reintegrate::annotate_merge
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 / ||
+ /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ ||
/^Needs? / || /^Expecting / || /^May want to /) {
return 1;
}