mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-09 16:32:39 +01:00
Remove obscure features no longer supported by Toolsets from "classic" Arcanist
Summary: Depends on D21004. Ref T13490. The "wilds" branch removed a bunch of dead features but some of them were resurrected by the merge. I don't think any of these are desirable to retain, so purge them all again, even in classic mode. Test Plan: Grepped for affected symbols. Maniphest Tasks: T13490 Differential Revision: https://secure.phabricator.com/D21005
This commit is contained in:
parent
eb6edb2739
commit
d4e4271b57
4 changed files with 5 additions and 119 deletions
|
@ -55,9 +55,6 @@ $base_args->parsePartial(
|
|||
'help' => pht('Load a libphutil library.'),
|
||||
'repeat' => true,
|
||||
),
|
||||
array(
|
||||
'name' => 'skip-arcconfig',
|
||||
),
|
||||
array(
|
||||
'name' => 'arcrc-file',
|
||||
'param' => 'filename',
|
||||
|
@ -76,17 +73,6 @@ $base_args->parsePartial(
|
|||
'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 @@ $config_trace_mode = $base_args->getArg('trace');
|
|||
|
||||
$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 @@ try {
|
|||
$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);
|
||||
}
|
||||
$configuration_manager->setWorkingCopyIdentity($working_copy);
|
||||
|
||||
// Load additional libraries, which can provide new classes like configuration
|
||||
|
@ -221,13 +200,7 @@ try {
|
|||
}
|
||||
|
||||
$user_config = $configuration_manager->readUserConfigurationFile();
|
||||
|
||||
$config_class = $working_copy->getProjectConfig('arcanist_configuration');
|
||||
if ($config_class) {
|
||||
$config = new $config_class();
|
||||
} else {
|
||||
$config = new ArcanistConfiguration();
|
||||
}
|
||||
|
||||
$command = strtolower($args[0]);
|
||||
$args = array_slice($args, 1);
|
||||
|
@ -247,13 +220,6 @@ try {
|
|||
// 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 @@ try {
|
|||
);
|
||||
$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);
|
||||
|
||||
|
|
|
@ -79,14 +79,6 @@ final class ArcanistArcConfigurationEngineExtension
|
|||
"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.'),
|
||||
|
|
|
@ -108,14 +108,6 @@ final class ArcanistSettings extends Phobject {
|
|||
"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 @@ final class ArcanistSettings extends Phobject {
|
|||
'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(
|
||||
|
|
|
@ -45,7 +45,6 @@ abstract class ArcanistWorkflow extends Phobject {
|
|||
private $conduitURI;
|
||||
private $conduitCredentials;
|
||||
private $conduitAuthenticated;
|
||||
private $forcedConduitVersion;
|
||||
private $conduitTimeout;
|
||||
|
||||
private $userPHID;
|
||||
|
@ -319,12 +318,6 @@ abstract class ArcanistWorkflow extends Phobject {
|
|||
$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 @@ abstract class ArcanistWorkflow extends Phobject {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* 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 @@ abstract class ArcanistWorkflow extends Phobject {
|
|||
* @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;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue