Page MenuHomePhabricator
Files F13187879

D21005.diff
No OneTemporary
Actions

D21005.diff
View Options

diff --git a/scripts/arcanist.php b/scripts/arcanist.php
--- a/scripts/arcanist.php
+++ b/scripts/arcanist.php
@@ -55,9 +55,6 @@
'help' => pht('Load a libphutil library.'),
'repeat' => true,
),
- array(
- 'name' => 'skip-arcconfig',
- ),
array(
'name' => 'arcrc-file',
'param' => 'filename',
@@ -76,17 +73,6 @@
'name' => 'anonymous',
'help' => pht('Run workflow as a public user, without authenticating.'),
),
- array(
- 'name' => 'conduit-version',
- 'param' => 'version',
- 'help' => pht(
- '(Developers) Mock client version in protocol handshake.'),
- ),
- array(
- 'name' => 'conduit-timeout',
- 'param' => 'timeout',
- 'help' => pht('Set Conduit timeout (in seconds).'),
- ),
array(
'name' => 'config',
'param' => 'key=value',
@@ -101,9 +87,6 @@
$force_conduit = $base_args->getArg('conduit-uri');
$force_token = $base_args->getArg('conduit-token');
-$force_conduit_version = $base_args->getArg('conduit-version');
-$conduit_timeout = $base_args->getArg('conduit-timeout');
-$skip_arcconfig = $base_args->getArg('skip-arcconfig');
$custom_arcrc = $base_args->getArg('arcrc-file');
$is_anonymous = $base_args->getArg('anonymous');
$load = $base_args->getArg('load-phutil-library');
@@ -157,12 +140,8 @@
$system_config = $configuration_manager->readSystemArcConfig();
$runtime_config = $configuration_manager->applyRuntimeArcConfig($base_args);
- if ($skip_arcconfig) {
- $working_copy = ArcanistWorkingCopyIdentity::newDummyWorkingCopy();
- } else {
- $working_copy =
- ArcanistWorkingCopyIdentity::newFromPath($working_directory);
- }
+ $working_copy =
+ ArcanistWorkingCopyIdentity::newFromPath($working_directory);
$configuration_manager->setWorkingCopyIdentity($working_copy);
// Load additional libraries, which can provide new classes like configuration
@@ -221,13 +200,7 @@
}
$user_config = $configuration_manager->readUserConfigurationFile();
-
- $config_class = $working_copy->getProjectConfig('arcanist_configuration');
- if ($config_class) {
- $config = new $config_class();
- } else {
- $config = new ArcanistConfiguration();
- }
+ $config = new ArcanistConfiguration();
$command = strtolower($args[0]);
$args = array_slice($args, 1);
@@ -247,13 +220,6 @@
// their behaviors.
putenv('ARCANIST='.$command);
- if ($force_conduit_version) {
- $workflow->forceConduitVersion($force_conduit_version);
- }
- if ($conduit_timeout) {
- $workflow->setConduitTimeout($conduit_timeout);
- }
-
$need_working_copy = $workflow->requiresWorkingCopy();
$supported_vcs_types = $workflow->getSupportedRevisionControlSystems();
@@ -378,20 +344,9 @@
);
$workflow->setConduitCredentials($credentials);
- $basic_user = $configuration_manager->getConfigFromAnySource(
- 'http.basicauth.user');
- $basic_pass = $configuration_manager->getConfigFromAnySource(
- 'http.basicauth.pass');
-
$engine = id(new ArcanistConduitEngine())
->setConduitURI($conduit_uri)
- ->setConduitToken($conduit_token)
- ->setBasicAuthUser($basic_user)
- ->setBasicAuthPass($basic_pass);
-
- if ($conduit_timeout) {
- $engine->setConduitTimeout($conduit_timeout);
- }
+ ->setConduitToken($conduit_token);
$workflow->setConduitEngine($engine);
diff --git a/src/config/arc/ArcanistArcConfigurationEngineExtension.php b/src/config/arc/ArcanistArcConfigurationEngineExtension.php
--- a/src/config/arc/ArcanistArcConfigurationEngineExtension.php
+++ b/src/config/arc/ArcanistArcConfigurationEngineExtension.php
@@ -79,14 +79,6 @@
"behind HTTPS signed by your organization's internal CA."),
'example' => 'support/yourca.pem',
),
- 'https.blindly-trust-domains' => array(
- 'type' => 'list',
- 'help' => pht(
- 'List of domains to blindly trust SSL certificates for. '.
- 'Disables peer verification.'),
- 'default' => array(),
- 'example' => '["secure.mycompany.com"]',
- ),
'browser' => array(
'type' => 'string',
'help' => pht('Command to use to invoke a web browser.'),
diff --git a/src/configuration/ArcanistSettings.php b/src/configuration/ArcanistSettings.php
--- a/src/configuration/ArcanistSettings.php
+++ b/src/configuration/ArcanistSettings.php
@@ -108,14 +108,6 @@
"behind HTTPS signed by your organization's internal CA."),
'example' => 'support/yourca.pem',
),
- 'https.blindly-trust-domains' => array(
- 'type' => 'list',
- 'help' => pht(
- 'List of domains to blindly trust SSL certificates for. '.
- 'Disables peer verification.'),
- 'default' => array(),
- 'example' => '["secure.mycompany.com"]',
- ),
'browser' => array(
'type' => 'string',
'help' => pht('Command to use to invoke a web browser.'),
@@ -127,16 +119,6 @@
'default' => array(),
'example' => '["ExampleEventListener"]',
),
- 'http.basicauth.user' => array(
- 'type' => 'string',
- 'help' => pht('Username to use for basic auth over HTTP transports.'),
- 'example' => '"bob"',
- ),
- 'http.basicauth.pass' => array(
- 'type' => 'string',
- 'help' => pht('Password to use for basic auth over HTTP transports.'),
- 'example' => '"bobhasasecret"',
- ),
'arc.autostash' => array(
'type' => 'bool',
'help' => pht(
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -45,7 +45,6 @@
private $conduitURI;
private $conduitCredentials;
private $conduitAuthenticated;
- private $forcedConduitVersion;
private $conduitTimeout;
private $userPHID;
@@ -319,12 +318,6 @@
$this->conduit->setTimeout($this->conduitTimeout);
}
- $user = $this->getConfigFromAnySource('http.basicauth.user');
- $pass = $this->getConfigFromAnySource('http.basicauth.pass');
- if ($user !== null && $pass !== null) {
- $this->conduit->setBasicAuthCredentials($user, $pass);
- }
-
return $this;
}
@@ -363,24 +356,6 @@
}
- /**
- * Force arc to identify with a specific Conduit version during the
- * protocol handshake. This is primarily useful for development (especially
- * for sending diffs which bump the client Conduit version), since the client
- * still actually speaks the builtin version of the protocol.
- *
- * Controlled by the --conduit-version flag.
- *
- * @param int Version the client should pretend to be.
- * @return this
- * @task conduit
- */
- final public function forceConduitVersion($version) {
- $this->forcedConduitVersion = $version;
- return $this;
- }
-
-
/**
* Get the protocol version the client should identify with.
*
@@ -388,25 +363,7 @@
* @task conduit
*/
final public function getConduitVersion() {
- return nonempty($this->forcedConduitVersion, 6);
- }
-
-
- /**
- * Override the default timeout for Conduit.
- *
- * Controlled by the --conduit-timeout flag.
- *
- * @param float Timeout, in seconds.
- * @return this
- * @task conduit
- */
- final public function setConduitTimeout($timeout) {
- $this->conduitTimeout = $timeout;
- if ($this->conduit) {
- $this->conduit->setConduitTimeout($timeout);
- }
- return $this;
+ return 6;
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 4:49 AM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6289314
Default Alt Text
D21005.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility