@matheusbsbs / matheus-bagliano / commits / 916d0626c2

Fork 0

maintenance: use pointers to check --auto

The 'git maintenance run' command has an '--auto' option. This is used by other Git commands such as 'git commit' or 'git fetch' to check if maintenance should be run after adding data to the repository. Previously, this --auto option was only used to add the argument to the 'git gc' command as part of the 'gc' task. We will be expanding the other tasks to perform a check to see if they should do work as part of the --auto flag, when they are enabled by config. First, update the 'gc' task to perform the auto check inside the maintenance process. This prevents running an extra 'git gc --auto' command when not needed. It also shows a model for other tasks. Second, use the 'auto_condition' function pointer as a signal for whether we enable the maintenance task under '--auto'. For instance, we do not want to enable the 'fetch' task in '--auto' mode, so that function pointer will remain NULL. Now that we are not automatically calling 'git gc', a test in t5514-fetch-multiple.sh must be changed to watch for 'git maintenance' instead. We continue to pass the '--auto' option to the 'git gc' command when necessary, because of the gc.autoDetach config option changes behavior. Likely, we will want to absorb the daemonizing behavior implied by gc.autoDetach as a maintenance.autoDetach config option. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Derrick Stolee committed Sep 17, 2020 at 18:11 UTC 916d0626c202c18e6d615abb69ba1f15b335c3ea

3 files changed +18 -2

builtin/gc.c

+16

@@ -755,9 +755,17 @@ static int maintenance_task_gc(struct maintenance_run_opts *opts)

755

756 typedef int maintenance_task_fn(struct maintenance_run_opts *opts);

757

758 +/*

759 + * An auto condition function returns 1 if the task should run

760 + * and 0 if the task should NOT run. See needs_to_gc() for an

761 + * example.

762 + */

763 +typedef int maintenance_auto_fn(void);

764 +

765 struct maintenance_task {

766 const char *name;

767 maintenance_task_fn *fn;

768 + maintenance_auto_fn *auto_condition;

769 unsigned enabled:1;

770

771 /* -1 if not selected. */

@@ -776,6 +784,7 @@ static struct maintenance_task tasks[] = {

784 [TASK_GC] = {

785 "gc",

786 maintenance_task_gc,

787 + need_to_gc,

788 1,

789 },

790 [TASK_COMMIT_GRAPH] = {

@@ -831,6 +840,11 @@ static int maintenance_run_tasks(struct maintenance_run_opts *opts)

840 if (!found_selected && !tasks[i].enabled)

841 continue;

842

843 + if (opts->auto_flag &&

844 + (!tasks[i].auto_condition ||

845 + !tasks[i].auto_condition()))

846 + continue;

847 +

848 if (tasks[i].fn(opts)) {

849 error(_("task '%s' failed"), tasks[i].name);

850 result = 1;

@@ -845,6 +859,8 @@ static void initialize_task_config(void)

859 {

860 int i;

861 struct strbuf config_name = STRBUF_INIT;

862 + gc_config();

863 +

864 for (i = 0; i < TASK__COUNT; i++) {

865 int config_value;

866

t/t5514-fetch-multiple.sh

+1 -1

@@ -108,7 +108,7 @@ test_expect_success 'git fetch --multiple (two remotes)' '

108 GIT_TRACE=1 git fetch --multiple one two 2>trace &&

109 git branch -r > output &&

110 test_cmp ../expect output &&

111 - grep "built-in: git gc" trace >gc &&

111 + grep "built-in: git maintenance" trace >gc &&

112 test_line_count = 1 gc

113 )

114 '

t/t7900-maintenance.sh

+1 -1

@@ -23,7 +23,7 @@ test_expect_success 'run [--auto|--quiet]' '

23 GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \

24 git maintenance run --no-quiet 2>/dev/null &&

25 test_subcommand git gc --quiet <run-no-auto.txt &&

26 - test_subcommand git gc --auto --quiet <run-auto.txt &&

26 + test_subcommand ! git gc --auto --quiet <run-auto.txt &&

27 test_subcommand git gc --no-quiet <run-no-quiet.txt

28 '