cook: teach 'on hold' and other status

gitster · gitster · commit 5410cdfd20f1 · 2019-03-01T07:30:47.000+09:00
diff --git 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;
 	}

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