scalar reconfigure: add --maintenance option

When users want to enable the latest and greatest configuration options
recommended by Scalar after a Git upgrade, 'scalar reconfigure --all' is
a great option that iterates over all repos in the multi-valued
'scalar.repos' config key.

However, this feature previously forced users to enable background
maintenance. In some environments this is not preferred.

Create a new --[no-]maintenance flag for this subcommand, allowing users
to enable or disable background maintenance.

This presents a behavior change in the default case, removing
adjustments to background maintenance unless one of the --maintenance or
--no-maintenance options is specified.

Helped-by: Junio C Hamano <[email protected]>
Signed-off-by: Derrick Stolee <[email protected]>

Author: derrickstolee

Documentation/scalar.adoc

@@ -14,7 +14,7 @@ scalar list
 scalar register [--[no-]maintenance] [<enlistment>]
 scalar unregister [<enlistment>]
 scalar run ( all | config | commit-graph | fetch | loose-objects | pack-files ) [<enlistment>]
-scalar reconfigure [ --all | <enlistment> ]
+scalar reconfigure [--[no-]maintenance] [ --all | <enlistment> ]
 scalar diagnose [<enlistment>]
 scalar delete <enlistment>
 
@@ -160,8 +160,15 @@ After a Scalar upgrade, or when the configuration of a Scalar enlistment
 was somehow corrupted or changed by mistake, this subcommand allows to
 reconfigure the enlistment.
 
-With the `--all` option, all enlistments currently registered with Scalar
-will be reconfigured. Use this option after each Scalar upgrade.
+--all::
+	When `--all` is specified, reconfigure all enlistments currently
+	registered with Scalar by the `scalar.repo` config key. Use this
+	option after each upgrade to get the latest features.
+
+--[no-]maintenance::
+	Specify if maintenance should be enabled or disabled for each
+	enlistment being reconfigured. Default behavior will not adjust
+	the maintenance configuration.	
 
 Diagnose
 ~~~~~~~~

scalar.c

@@ -668,13 +668,17 @@ static int remove_deleted_enlistment(struct strbuf *path)
 static int cmd_reconfigure(int argc, const char **argv)
 {
 	int all = 0;
+	int maintenance = -1;
+
 	struct option options[] = {
 		OPT_BOOL('a', "all", &all,
 			 N_("reconfigure all registered enlistments")),
+		OPT_BOOL(0, "maintenance", &maintenance,
+			 N_("enable or disable background maintenance")),
 		OPT_END(),
 	};
 	const char * const usage[] = {
-		N_("scalar reconfigure [--all | <enlistment>]"),
+		N_("scalar reconfigure [--[no-]maintenance] [--all | <enlistment>]"),
 		NULL
 	};
 	struct string_list scalar_repos = STRING_LIST_INIT_DUP;
@@ -758,7 +762,8 @@ static int cmd_reconfigure(int argc, const char **argv)
 		the_repository = old_repo;
 		repo_clear(&r);
 
-		if (toggle_maintenance(1) >= 0)
+		if (maintenance >= 0 &&
+		    toggle_maintenance(maintenance) >= 0)
 			succeeded = 1;
 
 loop_end:

t/t9210-scalar.sh

@@ -207,10 +207,21 @@ test_expect_success 'scalar reconfigure' '
 	test true = "$(git -C one/src config core.preloadIndex)" &&
 	git -C one/src config core.preloadIndex false &&
 	rm one/src/cron.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a &&
+	GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a --maintenance &&
 	test_path_is_file one/src/cron.txt &&
 	test true = "$(git -C one/src config core.preloadIndex)" &&
-	test_subcommand git maintenance start <reconfigure
+	test_subcommand git maintenance start <reconfigure &&
+	test_subcommand ! git maintenance unregister --force <reconfigure &&
+
+	GIT_TRACE2_EVENT="$(pwd)/reconfigure-no-maint" \
+		scalar reconfigure -a --no-maintenance &&
+	test_subcommand ! git maintenance start <reconfigure-no-maint &&
+	test_subcommand git maintenance unregister --force <reconfigure-no-maint &&
+
+	GIT_TRACE2_EVENT="$(pwd)/reconfigure-default" \
+		scalar reconfigure -a &&
+	test_subcommand ! git maintenance start <reconfigure-default &&
+	test_subcommand ! git maintenance unregister --force <reconfigure-default
 '
 
 test_expect_success 'scalar reconfigure --all with includeIf.onbranch' '