From fa54b2ea270ae1e03373321985497bd1379bde6a Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Tue, 19 Jun 2012 18:14:26 -0700
Subject: [PATCH] Wrap and simplify diff error excuse

Test Plan: Performed a lint error.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D2802
---
 src/workflow/ArcanistDiffWorkflow.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
index 001f5166..7faab413 100644
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -1104,14 +1104,14 @@ EOTEXT
         case ArcanistLintWorkflow::RESULT_WARNINGS:
           $this->lintExcuse = $this->getErrorExcuse(
             "Lint issued unresolved warnings.",
-            $repository_api->getScratchFilePath('lint-excuses'));
+            'lint-excuses');
           break;
         case ArcanistLintWorkflow::RESULT_ERRORS:
           echo phutil_console_format(
             "<bg:red>** LINT ERRORS **</bg> Lint raised errors!\n");
           $this->lintExcuse = $this->getErrorExcuse(
             "Lint issued unresolved errors!",
-            $repository_api->getScratchFilePath('lint-excuses'));
+            'lint-excuses');
           break;
       }
 
@@ -1168,7 +1168,7 @@ EOTEXT
             "<bg:red>** UNIT ERRORS **</bg> Unit testing raised errors!\n");
           $this->unitExcuse = $this->getErrorExcuse(
             "Unit test results include failures!",
-            $repository_api->getScratchFilePath('unit-excuses'));
+            'unit-excuses');
           break;
       }
 
@@ -1184,7 +1184,7 @@ EOTEXT
     return null;
   }
 
-  private function getErrorExcuse($prompt, $history = '') {
+  private function getErrorExcuse($prompt, $history) {
     if ($this->getArgument('excuse')) {
       $prompt .= " Ignore them?";
       if (!phutil_console_confirm($prompt)) {
@@ -1193,9 +1193,11 @@ EOTEXT
       return $this->getArgument('excuse');
     }
 
+    $history = $this->getRepositoryAPI()->getScratchFilePath($history);
+
     $prompt .= " Provide explanation to continue or press Enter to abort.";
     echo "\n\n";
-    echo phutil_console_format($prompt);
+    echo phutil_console_wrap($prompt);
     $return = phutil_console_prompt("Explanation:", $history);
     if ($return == '') {
       throw new ArcanistUserAbortException();