scalar clone: add --no-maintenance option

When creating a new enlistment via 'scalar clone', the default is to set
up situations that work for most user scenarios. Background maintenance
is one of those highly-recommended options for most users.

However, when using 'scalar clone' to create an enlistment in a
different situation, such as prepping a VM image, it may be valuable to
disable background maintenance so the manual maintenance steps do not
get blocked by concurrent background maintenance activities.

Add a new --no-maintenance option to 'scalar clone'.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/scalar.adoc b/Documentation/scalar.adoc
index b2b244a8649930b1a22e4c9add2603a4a9647a7c..7753df3b4352b60294f28b99bd852b4434f499aa 100644 (file)
--- a/Documentation/scalar.adoc
+++ b/Documentation/scalar.adoc
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]
-       [--[no-]src] <url> [<enlistment>]
+       [--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]
 scalar list
 scalar register [--[no-]maintenance] [<enlistment>]
 scalar unregister [<enlistment>]
@@ -97,6 +97,11 @@ cloning. If the HEAD at the remote did not point at any branch when
        A sparse-checkout is initialized by default. This behavior can be
        turned off via `--full-clone`.
 
+--[no-]maintenance::
+       By default, `scalar clone` configures the enlistment to use Git's
+       background maintenance feature. Use the `--no-maintenance` to skip
+       this configuration.
+
 List
 ~~~~
 

diff --git a/scalar.c b/scalar.c
index da0c46bc96cc76f75496d6aa626190e0c018149c..dd6e1447e0863470fbbbdad2300781e53bc01842 100644 (file)
--- a/scalar.c
+++ b/scalar.c
@@ -426,7 +426,7 @@ static int cmd_clone(int argc, const char **argv)
        const char *branch = NULL;
        char *branch_to_free = NULL;
        int full_clone = 0, single_branch = 0, show_progress = isatty(2);
-       int src = 1, tags = 1;
+       int src = 1, tags = 1, maintenance = 1;
        struct option clone_options[] = {
                OPT_STRING('b', "branch", &branch, N_("<branch>"),
                           N_("branch to checkout after clone")),
@@ -439,11 +439,13 @@ static int cmd_clone(int argc, const char **argv)
                         N_("create repository within 'src' directory")),
                OPT_BOOL(0, "tags", &tags,
                         N_("specify if tags should be fetched during clone")),
+               OPT_BOOL(0, "maintenance", &maintenance,
+                        N_("specify if background maintenance should be enabled")),
                OPT_END(),
        };
        const char * const clone_usage[] = {
                N_("scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
-                  "\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"),
+                  "\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"),
                NULL
        };
        const char *url;
@@ -565,7 +567,8 @@ static int cmd_clone(int argc, const char **argv)
        if (res)
                goto cleanup;
 
-       res = register_dir(1);
+       /* If --no-maintenance, then skip maintenance command entirely. */
+       res = register_dir(maintenance);
 
 cleanup:
        free(branch_to_free);

diff --git a/t/t9211-scalar-clone.sh b/t/t9211-scalar-clone.sh
index 01f71910f5332365edbd5eff306b728e8b6a093c..bfbf22a4621843cfde09e813ea7a3e401843185c 100755 (executable)
--- a/t/t9211-scalar-clone.sh
+++ b/t/t9211-scalar-clone.sh
@@ -177,7 +177,16 @@ test_expect_success 'progress without tty' '
 test_expect_success 'scalar clone warns when background maintenance fails' '
        GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
                scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
-       grep "could not turn on maintenance" err
+       grep "could not toggle maintenance" err
+'
+
+test_expect_success 'scalar clone --no-maintenance' '
+       GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
+       GIT_TRACE2_EVENT="$(pwd)/no-maint.event" \
+       GIT_TRACE2_EVENT_DEPTH=100 \
+               scalar clone --no-maintenance "file://$(pwd)/to-clone" no-maint 2>err &&
+       ! grep "could not toggle maintenance" err &&
+       test_subcommand ! git maintenance unregister --force <no-maint.event
 '
 
 test_expect_success '`scalar clone --no-src`' '