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

Fix a couple of lint issues, and update to version 2 (github).

Browse source
This commit is contained in:
epriestley 2011-01-09 15:51:04 -08:00
parent 2e73916fa2
commit 2c235bdf38
6 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
.DS_Store
._*
*.a *.a
*.o *.o
/support/xhpast/xhpast /support/xhpast/xhpast

2
scripts/arcanist.php
View file

@ -116,7 +116,7 @@ try {
'conduit.connect', 'conduit.connect',
array( array(
'client' => 'arc', 'client' => 'arc',
'clientVersion' => 1, 'clientVersion' => 2,
'clientDescription' => php_uname('n').':'.$description, 'clientDescription' => php_uname('n').':'.$description,
'user' => getenv('USER'), 'user' => getenv('USER'),
)); ));

2
src/lint/linter/phutilmodule/ArcanistPhutilModuleLinter.php
View file

@ -92,7 +92,7 @@ class ArcanistPhutilModuleLinter extends ArcanistLinter {
$modules = array(); $modules = array();
$moduleinfo = array(); $moduleinfo = array();
$project_root = $this->getEngine()->getWorkingCopy()->getProjectRoot(); $project_root = $this->getEngine()->getWorkingCopy()->getProjectRoot();
foreach ($paths as $path) { foreach ($paths as $path) {

4
src/workflow/amend/ArcanistAmendWorkflow.php
View file

@ -108,7 +108,7 @@ EOTEXT
$repository_api->amendGitHeadCommit($message); $repository_api->amendGitHeadCommit($message);
echo "Amended commit message.\n"; echo "Amended commit message.\n";
} }
$working_copy = $this->getWorkingCopy(); $working_copy = $this->getWorkingCopy();
$remote_hooks = $working_copy->getConfig('remote_hooks_installed', false); $remote_hooks = $working_copy->getConfig('remote_hooks_installed', false);
if (!$remote_hooks) { if (!$remote_hooks) {
@ -120,7 +120,7 @@ EOTEXT
'mark-committed', 'mark-committed',
array($revision_id)); array($revision_id));
$mark_workflow->run(); $mark_workflow->run();
} }
return 0; return 0;
} }

2
src/workflow/base/ArcanistBaseWorkflow.php
View file

@ -534,7 +534,7 @@ class ArcanistBaseWorkflow {
} }
$api->setRelativeCommit(trim($merge_base)); $api->setRelativeCommit(trim($merge_base));
} }
protected function normalizeRevisionID($revision_id) { protected function normalizeRevisionID($revision_id) {
return ltrim(strtoupper($revision_id), 'D'); return ltrim(strtoupper($revision_id), 'D');
} }

16
support/xhpast/parser_nodes.php
View file

@ -1,5 +1,21 @@
<?php <?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
function xhp_parser_node_constants() { function xhp_parser_node_constants() {
return array( return array(
9000 => 'n_PROGRAM', 9000 => 'n_PROGRAM',