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
@@ -579,8 +579,8 @@ sub tweak_willdo {
579
$desc =~ s/\n<<\n.*//s;
580
if ($desc =~ /^ \(merged to 'next'/m) {
581
$text =~ s/^ Will merge to 'next'\.$/ $mergetomaster/m;
582
- $text =~ s/^ Will merge to and then cook in 'next'\.$/ Will cook in 'next'./m;
583
- $text =~ s/^ Will merge to 'next' and then to 'master'\.$/ $mergetomaster/m;
582
+ $text =~ s/^ Will merge to and (then )?cook in 'next'\.$/ Will cook in 'next'./m;
583
+ $text =~ s/^ Will merge to 'next' and (then )?to 'master'\.$/ Will merge to 'master'./m;
584
}
585
$td->{'text'} = $text;
586
}
@@ -706,9 +706,10 @@ sub wildo_flush_topic {
706
}
707
708
sub wildo_match {
709
+ # NEEDSWORK: unify with Reintegrate::annotate_merge
710
if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled|wait)[,. ]/ ||
711
/^Not urgent/ || /^Not ready/ || /^Waiting for / ||
711
- /^Can wait in / || /^Still / ||
712
+ /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ ||
713
/^Needs? / || /^Expecting / || /^May want to /) {
714
return 1;
715
}