SVN: force SourceSVN plugin in svn_call

dregad · dregad · commit baad7d3adc35 · 2016-12-31T11:02:31.000+01:00
When used with a child plugin (e.g. SourceWebSVN), the wrong plugin basename is used, resulting in configured options (e.g. svnargs) to be ignored. We now push the current plugin to SourceSVN, to ensure the configuration is retrieved properly Fixes #186
diff --git a/SourceSVN/SourceSVN.php b/SourceSVN/SourceSVN.php
@@ -313,6 +313,8 @@ private function svn_call( $p_repo=null ) {
 		if ( is_null( $s_call ) ) {
 			$s_call = self::svn_binary() . ' --non-interactive';
 
+			plugin_push_current( 'SourceSVN' );
+
 			if ( plugin_config_get( 'svnssl', false ) ) {
 				$s_call .= ' --trust-server-cert';
 			}
@@ -321,6 +323,8 @@ private function svn_call( $p_repo=null ) {
 			if ( !is_blank( $t_svnargs ) ) {
 				$s_call .= " $t_svnargs";
 			}
+
+			plugin_pop_current();
 		}
 
 		# If not given a repo, just return the base SVN binary

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ private function svn_call( $p_repo=null ) {`
`313`	`313`	`if ( is_null( $s_call ) ) {`
`314`	`314`	`$s_call = self::svn_binary() . ' --non-interactive';`
`315`	`315`
	`316`	`+ plugin_push_current( 'SourceSVN' );`
	`317`	`+`
`316`	`318`	`if ( plugin_config_get( 'svnssl', false ) ) {`
`317`	`319`	`$s_call .= ' --trust-server-cert';`
`318`	`320`	`}`
`@@ -321,6 +323,8 @@ private function svn_call( $p_repo=null ) {`
`321`	`323`	`if ( !is_blank( $t_svnargs ) ) {`
`322`	`324`	`$s_call .= " $t_svnargs";`
`323`	`325`	`}`
	`326`	`+`
	`327`	`+ plugin_pop_current();`
`324`	`328`	`}`
`325`	`329`
`326`	`330`	`# If not given a repo, just return the base SVN binary`