mirror of
https://github.com/hauke68/Magallanes.git
synced 2025-09-13 20:50:18 +02:00
Tweak GitRebase and Insight suggestions.
This commit is contained in:
parent
2deaa27a2a
commit
92b22d52a3
@ -12,7 +12,6 @@ namespace Mage\Command;
|
|||||||
|
|
||||||
use Mage\Command\AbstractCommand;
|
use Mage\Command\AbstractCommand;
|
||||||
use Mage\Config;
|
use Mage\Config;
|
||||||
use Mage\Autoload;
|
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@ namespace Mage;
|
|||||||
use Mage\Config\ConfigNotFoundException;
|
use Mage\Config\ConfigNotFoundException;
|
||||||
use Mage\Config\RequiredConfigNotFoundException;
|
use Mage\Config\RequiredConfigNotFoundException;
|
||||||
use Mage\Console;
|
use Mage\Console;
|
||||||
use Mage\Yaml\Exception\RuntimeException;
|
|
||||||
use Mage\Yaml\Yaml;
|
use Mage\Yaml\Yaml;
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
|
@ -119,7 +119,6 @@ class Console
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$exceptionOccured = false;
|
|
||||||
// Run Command - Check if there is a Configuration Error
|
// Run Command - Check if there is a Configuration Error
|
||||||
if ($configError !== false) {
|
if ($configError !== false) {
|
||||||
self::output('<red>' . $configError . '</red>', 1, 2);
|
self::output('<red>' . $configError . '</red>', 1, 2);
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
|
|
||||||
namespace Mage\Task\BuiltIn\Deployment\Strategy;
|
namespace Mage\Task\BuiltIn\Deployment\Strategy;
|
||||||
|
|
||||||
use Mage\Task\AbstractTask;
|
|
||||||
use Mage\Task\Releases\IsReleaseAware;
|
use Mage\Task\Releases\IsReleaseAware;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -35,20 +34,6 @@ class GitRebaseTask extends BaseStrategyTaskAbstract implements IsReleaseAware
|
|||||||
*/
|
*/
|
||||||
public function run()
|
public function run()
|
||||||
{
|
{
|
||||||
$this->checkOverrideRelease();
|
|
||||||
$excludes = $this->getExcludes();
|
|
||||||
|
|
||||||
// If we are working with releases
|
|
||||||
$deployToDirectory = $this->getConfig()->deployment('to');
|
|
||||||
if ($this->getConfig()->release('enabled', false) == true) {
|
|
||||||
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
|
|
||||||
|
|
||||||
$deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/')
|
|
||||||
. '/' . $releasesDirectory
|
|
||||||
. '/' . $this->getConfig()->getReleaseId();
|
|
||||||
$this->runCommandRemote('mkdir -p ' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId());
|
|
||||||
}
|
|
||||||
|
|
||||||
$branch = $this->getParameter('branch', 'master');
|
$branch = $this->getParameter('branch', 'master');
|
||||||
$remote = $this->getParameter('remote', 'origin');
|
$remote = $this->getParameter('remote', 'origin');
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
|
|
||||||
namespace Mage\Task\BuiltIn\Deployment\Strategy;
|
namespace Mage\Task\BuiltIn\Deployment\Strategy;
|
||||||
|
|
||||||
use Mage\Console;
|
|
||||||
use Mage\Task\BuiltIn\Deployment\Strategy\BaseStrategyTaskAbstract;
|
use Mage\Task\BuiltIn\Deployment\Strategy\BaseStrategyTaskAbstract;
|
||||||
use Mage\Task\Releases\IsReleaseAware;
|
use Mage\Task\Releases\IsReleaseAware;
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
namespace Mage\Task;
|
namespace Mage\Task;
|
||||||
|
|
||||||
use Mage\Config;
|
use Mage\Config;
|
||||||
use Mage\Autoload;
|
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user