From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
Instead of writing a new commit-graph in every 'git maintenance run
--auto' process (when maintenance.commit-graph.enalbed is configured to
be true), only write when there are "enough" commits not in a
commit-graph file.
This count is controlled by the maintenance.commit-graph.auto config
option.
To compute the count, use a depth-first search starting at each ref, and
leaving markers using the PARENT1 flag. If this count reaches the limit,
then terminate early and start the task. Otherwise, this operation will
peel every ref and parse the commit it points to. If these are all in
the commit-graph, then this is typically a very fast operation. Users
with many refs might feel a slow-down, and hence could consider updating
their limit to be very small. A negative value will force the step to
run every time.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
Documentation/config/maintenance.txt | 10 ++++
builtin/gc.c | 76 ++++++++++++++++++++++++++++
object.h | 1 +
3 files changed, 87 insertions(+)
diff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.txt
index 370cbfb42f..9bd69b9df3 100644
--- a/Documentation/config/maintenance.txt
+++ b/Documentation/config/maintenance.txt
@@ -2,3 +2,13 @@ maintenance.<task>.enabled::
This boolean config option controls whether the maintenance task
with name `<task>` is run when no `--task` option is specified.
By default, only `maintenance.gc.enabled` is true.
+
+maintenance.commit-graph.auto::
+ This integer config option controls how often the `commit-graph` task
+ should be run as part of `git maintenance run --auto`. If zero, then
+ the `commit-graph` task will not run with the `--auto` option. A
+ negative value will force the task to run every time. Otherwise, a
+ positive value implies the command should run when the number of
+ reachable commits that are not in the commit-graph file is at least
+ the value of `maintenance.commit-graph.auto`. The default value is
+ 100.
diff --git a/builtin/gc.c b/builtin/gc.c
index dd24026b41..81b076b012 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -30,6 +30,7 @@
#include "promisor-remote.h"
#include "remote.h"
#include "midx.h"
+#include "refs.h"
#define FAILED_RUN "failed to run %s"
@@ -720,6 +721,80 @@ struct maintenance_opts {
int tasks_selected;
} opts;
+/* Remember to update object flag allocation in object.h */
+#define PARENT1 (1u<<16)
+
+static int num_commits_not_in_graph = 0;
+static int limit_commits_not_in_graph = 100;
+
+static int dfs_on_ref(const char *refname,
+ const struct object_id *oid, int flags,
+ void *cb_data)
+{
+ int result = 0;
+ struct object_id peeled;
+ struct commit_list *stack = NULL;
+ struct commit *commit;
+
+ if (!peel_ref(refname, &peeled))
+ oid = &peeled;
+ if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT)
+ return 0;
+
+ commit = lookup_commit(the_repository, oid);
+ if (!commit)
+ return 0;
+ if (parse_commit(commit))
+ return 0;
+
+ commit_list_append(commit, &stack);
+
+ while (!result && stack) {
+ struct commit_list *parent;
+
+ commit = pop_commit(&stack);
+
+ for (parent = commit->parents; parent; parent = parent->next) {
+ if (parse_commit(parent->item) ||
+ commit_graph_position(parent->item) != COMMIT_NOT_FROM_GRAPH ||
+ parent->item->object.flags & PARENT1)
+ continue;
+
+ parent->item->object.flags |= PARENT1;
+ num_commits_not_in_graph++;
+
+ if (num_commits_not_in_graph >= limit_commits_not_in_graph) {
+ result = 1;
+ break;
+ }
+
+ commit_list_append(parent->item, &stack);
+ }
+ }
+
+ free_commit_list(stack);
+ return result;
+}
+
+static int should_write_commit_graph(struct repository *r)
+{
+ int result;
+
+ repo_config_get_int(r, "maintenance.commit-graph.auto",
+ &limit_commits_not_in_graph);
+
+ if (!limit_commits_not_in_graph)
+ return 0;
+ if (limit_commits_not_in_graph < 0)
+ return 1;
+
+ result = for_each_ref(dfs_on_ref, NULL);
+
+ clear_commit_marks_all(PARENT1);
+
+ return result;
+}
+
static int run_write_commit_graph(struct repository *r)
{
int result;
@@ -1250,6 +1325,7 @@ static void initialize_tasks(struct repository *r)
tasks[num_tasks]->name = "commit-graph";
tasks[num_tasks]->fn = maintenance_task_commit_graph;
+ tasks[num_tasks]->auto_condition = should_write_commit_graph;
num_tasks++;
hashmap_init(&task_map, task_entry_cmp, NULL, MAX_NUM_TASKS);
diff --git a/object.h b/object.h
index 38dc2d5a6c..4f886495d7 100644
--- a/object.h
+++ b/object.h
@@ -73,6 +73,7 @@ struct object_array {
* list-objects-filter.c: 21
* builtin/fsck.c: 0--3
* builtin/index-pack.c: 2021
+ * builtin/maintenance.c: 16
* builtin/pack-objects.c: 20
* builtin/reflog.c: 10--12
* builtin/show-branch.c: 0-------------------------------------------26
--
gitgitgadget
