revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-01-11 07:11:03 +01:00
Code Issues Releases Wiki Activity

Fix whitespace around else

Browse source
This commit is contained in:
vrana 2013-01-16 12:15:46 -08:00
parent f25c01606b
commit 8142aab9d3
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lint/linter/ArcanistPEP8Linter.php
View file

@ -47,8 +47,7 @@ final class ArcanistPEP8Linter extends ArcanistLinter {
$bin = csprintf('/usr/bin/env python2.6 %s',
phutil_get_library_root('arcanist').
'/../externals/pep8/pep8.py');
}
else {
} else {
if ($bin === null) {
$bin = 'pep8';
}

3
src/unit/engine/NoseTestEngine.php
View file

@ -218,8 +218,7 @@ final class NoseTestEngine extends ArcanistBaseUnitTestEngine {
if (intval($line->getAttribute("hits")) == 0) {
$coverage .= "U";
}
else if (intval($line->getAttribute("hits")) > 0) {
} else if (intval($line->getAttribute("hits")) > 0) {
$coverage .= "C";
}

3
src/unit/engine/PhpunitTestEngine.php
View file

@ -233,8 +233,7 @@ final class PhpunitTestEngine extends ArcanistBaseUnitTestEngine {
} else {
if ((int) $line->getAttribute('count') == 0) {
$coverage .= 'U';
}
else if ((int) $line->getAttribute('count') > 0) {
} else if ((int) $line->getAttribute('count') > 0) {
$coverage .= 'C';
}
}

9
src/workflow/ArcanistLandWorkflow.php
View file

@ -399,8 +399,7 @@ EOTEXT
// $err === 0 means something is outgoing
if ($err === 0) {
$local_ahead_of_remote = true;
}
else {
} else {
try {
$repository_api->execxLocal('pull -u');
} catch (CommandException $ex) {
@ -496,8 +495,7 @@ EOTEXT
$repository_api->execxLocal(
'merge --squash --ff-only %s',
$this->branch);
}
else if ($this->isHg) {
} else if ($this->isHg) {
// The hg code is a little more complex than git's because we
// need to handle the case where the landing branch has child branches:
// -a--------b master
@ -678,8 +676,7 @@ EOTEXT
"merged state. You can: abort with 'git merge --abort'; or follow ".
"the instructions to complete the merge.");
}
}
else if ($this->isHg) {
} else if ($this->isHg) {
// HG arc land currently doesn't support --merge.
// When merging a bookmark branch to a master branch that
// hasn't changed since the fork, mercurial fails to merge.