From 7e677c27eccfeaaf15921e8edbbc8eb5f1951351 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@dropbox.com>
Date: Thu, 3 Sep 2015 12:01:01 -0700
Subject: [PATCH] Fix callsites which called libphutil_console_wrap like it
 were _format

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
---
 scripts/arcanist.php                  | 6 +++---
 src/workflow/ArcanistDiffWorkflow.php | 5 ++---
 src/workflow/ArcanistWorkflow.php     | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/arcanist.php b/scripts/arcanist.php
index ff80fa6e..f29311f6 100755
--- a/scripts/arcanist.php
+++ b/scripts/arcanist.php
@@ -620,9 +620,9 @@ function arcanist_load_libraries(
         throw new ArcanistUsageException($error);
       } else {
         fwrite(STDERR, phutil_console_wrap(
-          "%s: %s\n\n",
-          pht('WARNING'),
-          $error));
+          phutil_console_format("%s: %s\n",
+                                pht('WARNING'),
+                                $error)));
       }
     } catch (PhutilLibraryConflictException $ex) {
       if ($ex->getLibrary() != 'arcanist') {
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
index 16811e20..3074c166 100644
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -1030,9 +1030,8 @@ EOTEXT
               } catch (ConduitClientException $e) {
                 if ($e->getErrorCode() == 'ERR-BAD-ARCANIST-PROJECT') {
                   echo phutil_console_wrap(
-                    "%s\n",
-                    pht('Lookup of encoding in arcanist project failed'),
-                    $e->getMessage());
+                    pht('Lookup of encoding in arcanist project failed: %s',
+                        $e->getMessage())."\n");
                 } else {
                   throw $e;
                 }
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
index 87b37605..047477e5 100644
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -1585,12 +1585,11 @@ abstract class ArcanistWorkflow extends Phobject {
     } catch (ConduitClientException $ex) {
       if ($ex->getErrorCode() == 'ERR-CONDUIT-CALL') {
         echo phutil_console_wrap(
-          "%s\n\n",
           pht(
             'This feature requires a newer version of Phabricator. Please '.
             'update it using these instructions: %s',
             'https://secure.phabricator.com/book/phabricator/article/'.
-              'upgrading/'));
+              'upgrading/')."\n\n");
       }
       throw $ex;
     }