Page MenuHomePhabricator
Files F15382263

D16579.id39909.diff
No OneTemporary
Actions

D16579.id39909.diff
View Options

diff --git a/src/lint/engine/ArcanistLintEngine.php b/src/lint/engine/ArcanistLintEngine.php
--- a/src/lint/engine/ArcanistLintEngine.php
+++ b/src/lint/engine/ArcanistLintEngine.php
@@ -343,7 +343,18 @@
$path = idx($location, 'path', $message->getPath());
if (!array_key_exists($path, $this->changedLines)) {
- continue;
+ if (phutil_is_windows()) {
+ // We try checking the UNIX path form as well, on Windows. Linters
+ // store noramlized paths, which use the Windows-style "\" as a
+ // delimiter; as such, they don't match the UNIX-style paths stored
+ // in changedLines, which come from the VCS.
+ $path = str_replace('\\', '/', $path);
+ if (!array_key_exists($path, $this->changedLines)) {
+ continue;
+ }
+ } else {
+ continue;
+ }
}
$changed = $this->getPathChangedLines($path);
diff --git a/src/workflow/ArcanistInstallCertificateWorkflow.php b/src/workflow/ArcanistInstallCertificateWorkflow.php
--- a/src/workflow/ArcanistInstallCertificateWorkflow.php
+++ b/src/workflow/ArcanistInstallCertificateWorkflow.php
@@ -118,7 +118,15 @@
$token));
}
- if (strncmp($token, 'cli-', 4) !== 0) {
+ if (strncmp($token, 'api-', 4) == 0) {
+ echo pht(
+ 'You are installing a standard API token, but a CLI API token '.
+ 'was expected. If you\'re writing a script, consider passing the '.
+ 'token at runtime with --conduit-token instead of installing it.');
+ if (!phutil_console_confirm(pht('Install this token anyway?'))) {
+ throw new ArcanistUsageException(pht('Not installing API token.'));
+ }
+ } else if (strncmp($token, 'cli-', 4) !== 0) {
throw new ArcanistUsageException(
pht(
'The token "%s" is not formatted correctly. Valid API tokens '.

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 11:33 AM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7687033
Default Alt Text
D16579.id39909.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility