Meta/cook: more auto-transition of states

gitster · gitster · commit 7f71885f3006 · 2017-02-10T14:18:20.000-08:00
Just like "Will merge to 'next'" is automatically promoted to "Will
merge to 'master'" once the topic is merged to 'next', transition
two more states automatically when a topic is merged to 'next'.
"Will merge to and cook in 'next'" will become "Will cook in 'next'"
"Will merge to 'next' and then to 'master'" will become "Will merge
to 'master'".
diff --git a/cook b/cook
@@ -557,6 +557,8 @@ sub tweak_willdo {
 	$desc =~ s/\n<<\n.*//s;
 	if ($desc =~ /^  \(merged to 'next'/m) {
 		$text =~ s/^ Will merge to 'next'\.$/ Will merge to 'master'./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;
 }

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,8 @@ sub tweak_willdo {`
`557`	`557`	`$desc =~ s/\n<<\n.*//s;`
`558`	`558`	`if ($desc =~ /^ \(merged to 'next'/m) {`
`559`	`559`	`$text =~ s/^ Will merge to 'next'\.$/ Will merge to 'master'./m;`
	`560`	`+ $text =~ s/^ Will merge to and then cook in 'next'\.$/ Will cook in 'next'./m;`
	`561`	`+ $text =~ s/^ Will merge to 'next' and then to 'master'\.$/ Will merge to 'master'./m;`
`560`	`562`	`}`
`561`	`563`	`$td->{'text'} = $text;`
`562`	`564`	`}`