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 callsites which called libphutil_console_wrap like it were _format

Browse source 
Summary:
7e2df9a attempted to pht() some strings; unfortunately, it assumed
that some things that were calls to phutil_console_wrap() were
actually calls to phutil_console_format().  This produces errors of
the form:

    [2015-07-17 21:17:28] ERROR 2: str_repeat() expects parameter 2 to be long, string given at [/usr/local/libphutil/src/console/format.php:162]
    #0 str_repeat(string, string) called at [<phutil>/src/console/format.php:162]
    #1 phutil_console_wrap(string, string, string) called at [<arcanist>/scripts/arcanist.php:620]
    #2 arcanist_load_libraries(array, boolean, string, ArcanistWorkingCopyIdentity) called at [<arcanist>/scripts/arcanist.php:154]
    %s: %s

Provide an additional call to phutil_console_format() when necessary,
or simply append the relevant characters if possible.

Test Plan: Caused a library load error

Reviewers: #blessed_reviewers, epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14053
This commit is contained in:
Alex Vandiver 2015-09-03 12:01:01 -07:00 committed by epriestley
parent 029e5a7c29
commit 7e677c27ec
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/arcanist.php
View file

@ -620,9 +620,9 @@ function arcanist_load_libraries(
throw new ArcanistUsageException($error); throw new ArcanistUsageException($error);
} else { } else {
fwrite(STDERR, phutil_console_wrap( fwrite(STDERR, phutil_console_wrap(
"%s: %s\n\n", phutil_console_format("%s: %s\n",
pht('WARNING'), pht('WARNING'),
$error)); $error)));
} }
} catch (PhutilLibraryConflictException $ex) { } catch (PhutilLibraryConflictException $ex) {
if ($ex->getLibrary() != 'arcanist') { if ($ex->getLibrary() != 'arcanist') {

5
src/workflow/ArcanistDiffWorkflow.php
View file

@ -1030,9 +1030,8 @@ EOTEXT
} catch (ConduitClientException $e) { } catch (ConduitClientException $e) {
if ($e->getErrorCode() == 'ERR-BAD-ARCANIST-PROJECT') { if ($e->getErrorCode() == 'ERR-BAD-ARCANIST-PROJECT') {
echo phutil_console_wrap( echo phutil_console_wrap(
"%s\n", pht('Lookup of encoding in arcanist project failed: %s',
pht('Lookup of encoding in arcanist project failed'), $e->getMessage())."\n");
$e->getMessage());
} else { } else {
throw $e; throw $e;
} }

3
src/workflow/ArcanistWorkflow.php
View file

@ -1585,12 +1585,11 @@ abstract class ArcanistWorkflow extends Phobject {
} catch (ConduitClientException $ex) { } catch (ConduitClientException $ex) {
if ($ex->getErrorCode() == 'ERR-CONDUIT-CALL') { if ($ex->getErrorCode() == 'ERR-CONDUIT-CALL') {
echo phutil_console_wrap( echo phutil_console_wrap(
"%s\n\n",
pht( pht(
'This feature requires a newer version of Phabricator. Please '. 'This feature requires a newer version of Phabricator. Please '.
'update it using these instructions: %s', 'update it using these instructions: %s',
'https://secure.phabricator.com/book/phabricator/article/'. 'https://secure.phabricator.com/book/phabricator/article/'.
'upgrading/')); 'upgrading/')."\n\n");
} }
throw $ex; throw $ex;
} }