Page MenuHomePhabricator
Files F15334400

D21302.diff
No OneTemporary
Actions

D21302.diff
View Options

diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -118,9 +118,6 @@
'many Arcanist/Phabricator features which depend on having access '.
'to the working copy.'),
'conflicts' => array(
- 'apply-patches' => pht('%s disables lint.', '--raw'),
- 'never-apply-patches' => pht('%s disables lint.', '--raw'),
-
'create' => pht(
'%s and %s both need stdin. Use %s.',
'--raw',
@@ -140,10 +137,6 @@
'Generate diff by executing a specified command, not from the '.
'working copy. This disables many Arcanist/Phabricator features '.
'which depend on having access to the working copy.'),
- 'conflicts' => array(
- 'apply-patches' => pht('%s disables lint.', '--raw-command'),
- 'never-apply-patches' => pht('%s disables lint.', '--raw-command'),
- ),
),
'create' => array(
'help' => pht('Always create a new revision.'),
@@ -183,10 +176,6 @@
),
'nolint' => array(
'help' => pht('Do not run lint.'),
- 'conflicts' => array(
- 'apply-patches' => pht('%s suppresses lint.', '--nolint'),
- 'never-apply-patches' => pht('%s suppresses lint.', '--nolint'),
- ),
),
'only' => array(
'help' => pht(
@@ -200,26 +189,6 @@
'allow-untracked' => array(
'help' => pht('Skip checks for untracked files in the working copy.'),
),
- 'apply-patches' => array(
- 'help' => pht(
- 'Apply patches suggested by lint to the working copy without '.
- 'prompting.'),
- 'conflicts' => array(
- 'never-apply-patches' => true,
- ),
- 'passthru' => array(
- 'lint' => true,
- ),
- ),
- 'never-apply-patches' => array(
- 'help' => pht('Never apply patches suggested by lint.'),
- 'conflicts' => array(
- 'apply-patches' => true,
- ),
- 'passthru' => array(
- 'lint' => true,
- ),
- ),
'amend-all' => array(
'help' => pht(
'When linting git repositories, amend HEAD with all patches '.

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 8:47 AM (2 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387743
Default Alt Text
D21302.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility