Allow to override "--auto-deploy" flag of the "commit" command, that …

…is invoked after "merge" command

README.md

@@ -306,6 +306,7 @@ The merges performed outside of SVN-Buddy are detected automatically (thanks to
 * `-s`, `--with-summary` - Shows number of added/changed/removed paths in the revision
 * `--update-revision=UPDATE-REVISION` - Update working copy to given revision before performing a merge
 * `--auto-commit=AUTO-COMMIT` - Automatically perform commit on successful merge, e.g. `yes` or `no`
+* `--auto-deploy=AUTO-DEPLOY` - Automatically perform remote deployment on successful merge commit, e.g. `yes` or `no`
 * `--record-only` - Mark revisions as merged without actually merging them
 * `--reverse` - Rollback previously merged revisions
 * `-a`, `--aggregate` - Aggregate displayed revisions by bugs

src/SVNBuddy/Command/MergeCommand.php

@@ -177,6 +177,12 @@ protected function configure()
 				InputOption::VALUE_REQUIRED,
 				'Automatically perform commit on successful merge, e.g. <comment>yes</comment> or <comment>no</comment>'
 			)
+			->addOption(
+				'auto-deploy',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Automatically perform remote deployment on successful merge commit, e.g. <comment>yes</comment> or <comment>no</comment>'
+			)
 			->addOption(
 				'record-only',
 				null,
@@ -225,7 +231,7 @@ public function completeOptionValues($optionName, CompletionContext $context)
 			return $this->getAllRefs();
 		}
 
-		if ( $optionName === 'auto-commit' ) {
+		if ( $optionName === 'auto-commit' || $optionName === 'auto-deploy' ) {
 			return array('yes', 'no');
 		}
 
@@ -853,8 +859,17 @@ protected function performCommit()
 		}
 
 		if ( $auto_commit ) {
+			$auto_deploy = $this->io->getOption('auto-deploy');
+
+			if ( $auto_deploy !== null ) {
+				$commit_arguments = array('--auto-deploy' => $auto_deploy);
+			}
+			else {
+				$commit_arguments = array();
+			}
+
 			$this->io->writeln(array('', 'Commencing automatic commit after merge ...'));
-			$this->runOtherCommand('commit');
+			$this->runOtherCommand('commit', $commit_arguments);
 		}
 
 		return $auto_commit;