Browse Source

Tweak GitRebase and Insight suggestions.

1.0
Andrés Montañez 10 years ago
parent
commit
92b22d52a3
  1. 1
      Mage/Command/Factory.php
  2. 1
      Mage/Config.php
  3. 1
      Mage/Console.php
  4. 15
      Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php
  5. 1
      Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php
  6. 1
      Mage/Task/Factory.php

1
Mage/Command/Factory.php

@ -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;

1
Mage/Config.php

@ -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;

1
Mage/Console.php

@ -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);

15
Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php

@ -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');

1
Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php

@ -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;

1
Mage/Task/Factory.php

@ -11,7 +11,6 @@
namespace Mage\Task; namespace Mage\Task;
use Mage\Config; use Mage\Config;
use Mage\Autoload;
use Exception; use Exception;

Loading…
Cancel
Save