deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added ability to merge in-database project config over in-repository

Browse source 
config instead of only overwrite. This commit solve issues: #14, #70,
#106, #121.
This commit is contained in:
Dmitry Khomutov 2018-04-15 15:48:50 +07:00
commit 069026bc2d
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
20 changed files with 277 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Build/SvnBuild.php
View file

@ -50,14 +50,13 @@ class SvnBuild extends Build
$svn = $builder->getConfig('svn');
if ($svn) {
foreach ($svn as $key => $value) {
$cmd .= " --$key $value ";
$cmd .= " --${key} ${value} ";
}
}
$depth = $builder->getConfig('clone_depth');
if (!is_null($depth)) {
$cmd .= ' --depth ' . intval($depth) . ' ';
$buildSettings = $builder->getConfig('build_settings');
if ($buildSettings && isset($buildSettings['clone_depth'])) {
$cmd .= ' --depth ' . intval($buildSettings['clone_depth']) . ' ';
}
$this->svnCommand = $cmd;
@ -68,8 +67,6 @@ class SvnBuild extends Build
*/
public function createWorkingCopy(Builder $builder, $buildPath)
{
$this->handleConfig($builder, $buildPath);
$this->extendSvnCommandFromConfig($builder);
$key = trim($this->getProject()->getSshPrivateKey());