revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 14:52:40 +01:00
Code Issues Releases Wiki Activity

Don't try to run didAbortWorkflow() if the user never provided a command

Browse source 
Summary:
If you type `arc`, you currently get a fatal since $config isn't defined. Don't try to run the hook if we never built a config.

(We could build the config earlier and then run the hook anyway, but $workflow and $command would not be defined. It seems unlikely that executing the hook here is useful, since it affects only the case that the user types `arc` on its own.)

Test Plan: Typed `arc`. Typed `arc diff`, etc.

Reviewers: vrana, btrahan

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D3841
This commit is contained in:
epriestley 2012-10-30 10:44:49 -07:00
parent d96eaed097
commit 44842aeb25
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/arcanist.php
View file

@ -63,6 +63,7 @@ $args = array_values($argv);
$working_directory = getcwd(); $working_directory = getcwd();
$console = PhutilConsole::getConsole(); $console = PhutilConsole::getConsole();
$config = null;
try { try {
@ -125,9 +126,9 @@ try {
$user_config = ArcanistBaseWorkflow::readUserConfigurationFile(); $user_config = ArcanistBaseWorkflow::readUserConfigurationFile();
$config = $working_copy->getConfig('arcanist_configuration'); $config_class = $working_copy->getConfig('arcanist_configuration');
if ($config) { if ($config_class) {
$config = new $config(); $config = new $config_class();
} else { } else {
$config = new ArcanistConfiguration(); $config = new ArcanistConfiguration();
} }
@ -327,7 +328,9 @@ try {
$ex->getMessage()); $ex->getMessage());
} }
$config->didAbortWorkflow($command, $workflow, $ex); if ($config) {
$config->didAbortWorkflow($command, $workflow, $ex);
}
if ($config_trace_mode) { if ($config_trace_mode) {
echo "\n"; echo "\n";