Meta/cook, Meta/Reintegrate: add a few more $willdo verbs
"Will hold" and "Will eject (from ...)" are common things to say.
Junio C Hamano committed
Jun 23, 2016 at 15:26 UTC
17abc906c52dc431aed5153ebf00c7dd24371b75
2 files changed
+5
-4
Reintegrate
+1
-1
@@ -27,7 +27,7 @@ annotate_merge () {
27
perl -e '
28
sub wildo_match {
29
s/^\s*//;
30
- if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
30
+ if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
31
/^Not urgent/ || /^Not ready/ || /^Waiting for / ||
32
/^Can wait in / || /^Still / ||
33
/^Needs? / || /^Expecting / || /^May want to /) {
cook
+4
-3
@@ -682,9 +682,10 @@ sub wildo_flush_topic {
682
}
683
684
sub wildo_match {
685
- if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
686
- /^Not urgent/ || /^Not ready/ || /^Waiting for / || /^Can wait in / ||
687
- /^Needs? / || /^Expecting / || /^May want to / || /^Still /) {
685
+ if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
686
+ /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
687
+ /^Can wait in / || /^Still / ||
688
+ /^Needs? / || /^Expecting / || /^May want to /) {
689
return 1;
690
}
691
if (/^I think this is ready for /) {