D7851.id17762.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7851.id17762.diff
View Options

	Index: src/workflow/ArcanistSetConfigWorkflow.php
	===================================================================
	--- src/workflow/ArcanistSetConfigWorkflow.php
	+++ src/workflow/ArcanistSetConfigWorkflow.php
	@@ -125,7 +125,7 @@
	}

	private function show() {
	- $config = $this->getConfigurationManager()->readUserArcConfig();
	+ $config_manager = $this->getConfigurationManager();

	$settings = new ArcanistSettings();

	@@ -136,7 +136,14 @@
	$example = $settings->getExample($key);
	$help = $settings->getHelp($key);

	- $value = idx($config, $key);
	+ $config = $config_manager->getConfigFromAllSources($key);
	+ if (empty($config)) {
	+ $value = null;
	+ $source = "";
	+ } else {
	+ reset($config);
	+ list($source, $value) = each($config);
	+ }
	$value = $settings->formatConfigValueForDisplay($key, $value);

	echo phutil_console_format("__%s__ (%s)\n\n", $key, $type);
	@@ -144,7 +151,10 @@
	echo phutil_console_format(" Example: %s\n", $example);
	}
	if (strlen($value)) {
	- echo phutil_console_format(" User Setting: %s\n", $value);
	+ if (!empty($source)) {
	+ $source = "From: $source";
	+ }
	+ echo phutil_console_format(" Current Setting: %s $source\n", $value);
	}
	echo "\n";
	echo phutil_console_wrap($help, 4);