Meta/cook, Meta/Reintegrate: add a few more $willdo verbs

gitster · gitster · commit 17abc906c52d · 2016-06-23T15:30:20.000-07:00
"Will hold" and "Will eject (from ...)" are common things to say.
diff --git a/Reintegrate b/Reintegrate
@@ -27,7 +27,7 @@ annotate_merge () {
 	perl -e '
 		sub wildo_match {
 			s/^\s*//;
-			if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
+			if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
 			    /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
 			    /^Can wait in / || /^Still / ||
 			    /^Needs? / || /^Expecting / || /^May want to /) {
diff --git a/cook b/cook
@@ -682,9 +682,10 @@ sub wildo_flush_topic {
 }
 
 sub wildo_match {
-	if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
-	    /^Not urgent/ || /^Not ready/ || /^Waiting for / || /^Can wait in / ||
-	    /^Needs? / || /^Expecting / || /^May want to / || /^Still /) {
+	if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+	    /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
+	    /^Can wait in / || /^Still / ||
+	    /^Needs? / || /^Expecting / || /^May want to /) {
 		return 1;
 	}
 	if (/^I think this is ready for /) {

Original file line number	Diff line number	Diff line change
`@@ -682,9 +682,10 @@ sub wildo_flush_topic {`
`682`	`682`	`}`
`683`	`683`
`684`	`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 /) {`
`688`	`689`	`return 1;`
`689`	`690`	`}`
`690`	`691`	`if (/^I think this is ready for /) {`