From 5ca0f691a1d1e70407bf539466c8c9016c793658 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Mon, 19 Nov 2012 13:20:44 -0800
Subject: [PATCH] Reintroduce `arc diff --advice`

Summary:
Some users want be stopped even if there are lint advices.

NOTE: Deleted by D3364.

Test Plan:
On diff with lint advice:

  $ arc diff --preview # advice just printed
  $ arc diff --preview --advice # excuse required

Reviewers: epriestley

Reviewed By: epriestley

CC: akramer, aran, Korvin

Differential Revision: https://secure.phabricator.com/D3982
---
 src/workflow/ArcanistDiffWorkflow.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
index 881843da..aefe6fc5 100644
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -130,6 +130,7 @@ EOTEXT
           'less-context'        => null,
           'apply-patches'       => '--raw disables lint.',
           'never-apply-patches' => '--raw disables lint.',
+          'advice'              => '--raw disables lint.',
           'lintall'             => '--raw disables lint.',
 
           'create'              => '--raw and --create both need stdin. '.
@@ -149,6 +150,7 @@ EOTEXT
           'less-context'        => null,
           'apply-patches'       => '--raw-command disables lint.',
           'never-apply-patches' => '--raw-command disables lint.',
+          'advice'              => '--raw-command disables lint.',
           'lintall'             => '--raw-command disables lint.',
         ),
       ),
@@ -174,6 +176,7 @@ EOTEXT
           "Do not run lint.",
         'conflicts' => array(
           'lintall'   => '--nolint suppresses lint.',
+          'advice'    => '--nolint suppresses lint.',
           'apply-patches' => '--nolint suppresses lint.',
           'never-apply-patches' => '--nolint suppresses lint.',
         ),
@@ -187,6 +190,7 @@ EOTEXT
           'message'   => '--only does not affect revisions.',
           'edit'      => '--only does not affect revisions.',
           'lintall'   => '--only suppresses lint.',
+          'advice'    => '--only suppresses lint.',
           'apply-patches' => '--only suppresses lint.',
           'never-apply-patches' => '--only suppresses lint.',
         ),
@@ -231,6 +235,11 @@ EOTEXT
           'lint' => true,
         ),
       ),
+      'advice' => array(
+        'help' =>
+          "Require excuse for lint advice in addition to lint warnings and ".
+          "errors.",
+      ),
       'apply-patches' => array(
         'help' =>
           'Apply patches suggested by lint to the working copy without '.
@@ -1250,8 +1259,16 @@ EOTEXT
 
       switch ($lint_result) {
         case ArcanistLintWorkflow::RESULT_OKAY:
-          $this->console->writeOut(
-            "<bg:green>** LINT OKAY **</bg> No lint problems.\n");
+          if ($this->getArgument('advice') &&
+              $lint_workflow->getUnresolvedMessages()) {
+            $this->getErrorExcuse(
+              'lint',
+              "Lint issued unresolved advice.",
+              'lint-excuses');
+          } else {
+            $this->console->writeOut(
+              "<bg:green>** LINT OKAY **</bg> No lint problems.\n");
+          }
           break;
         case ArcanistLintWorkflow::RESULT_WARNINGS:
           $this->getErrorExcuse(