commit 0279329dccffda40b130fe1a08f888694df1238f from: Stefan Sperling via: Thomas Adam date: Sat Mar 30 17:21:23 2024 UTC rename got_commit_graph_iter_start() to got_commit_graph_bfsort() This function begins a breadth-first traversal. The new name makes it easier to distinguish from got_commit_graph_toposort(). commit - 473cd2ee73f447fd177f9c48f17fb6e8b2f5b533 commit + 0279329dccffda40b130fe1a08f888694df1238f blob - af1a4ad687b6df528594ca423dfba16083a969f0 blob + 5f09ada324b00bff599343c546bea9dacc1e0e7f --- cvg/cvg.c +++ cvg/cvg.c @@ -2119,7 +2119,7 @@ check_same_branch(struct got_object_id *commit_id, if (err) goto done; - err = got_commit_graph_iter_start(graph, head_commit_id, repo, + err = got_commit_graph_bfsort(graph, head_commit_id, repo, check_cancelled, NULL); if (err) goto done; @@ -3783,7 +3783,7 @@ print_commits(struct got_object_id *root_id, struct go err = got_commit_graph_open(&graph, path, !log_branches); if (err) return err; - err = got_commit_graph_iter_start(graph, root_id, repo, + err = got_commit_graph_bfsort(graph, root_id, repo, check_cancelled, NULL); if (err) goto done; blob - 744c27831da9fae5b3fc6abdfcc2c92d92dfbfc1 blob + f003d91a0b27eaff452754fc7b1c0d9579821eb3 --- got/got.c +++ got/got.c @@ -2945,7 +2945,7 @@ check_same_branch(struct got_object_id *commit_id, if (err) goto done; - err = got_commit_graph_iter_start(graph, head_commit_id, repo, + err = got_commit_graph_bfsort(graph, head_commit_id, repo, check_cancelled, NULL); if (err) goto done; @@ -4484,7 +4484,7 @@ print_commits(struct got_object_id *root_id, struct go err = got_commit_graph_toposort(graph, root_id, repo, check_cancelled, NULL); } else { - err = got_commit_graph_iter_start(graph, root_id, repo, + err = got_commit_graph_bfsort(graph, root_id, repo, check_cancelled, NULL); } if (err) @@ -10873,7 +10873,7 @@ collect_commits(struct got_object_id_queue *commits, if (err) return err; - err = got_commit_graph_iter_start(graph, iter_start_id, repo, + err = got_commit_graph_bfsort(graph, iter_start_id, repo, check_cancelled, NULL); if (err) goto done; @@ -11265,7 +11265,7 @@ find_merge_commit_yca(struct got_object_id **new_yca_i if (err) return err; - err = got_commit_graph_iter_start(graph, base_commit_id, + err = got_commit_graph_bfsort(graph, base_commit_id, repo, check_cancelled, NULL); if (err) goto done; blob - cbcf820139e46dade5b52bbe6e2a5bbd3815b8ee blob + baf885a2ff3bb7c807406742e7ae48aca41aa678 --- gotd/repo_write.c +++ gotd/repo_write.c @@ -1921,7 +1921,7 @@ print_commits(struct got_object_id *root_id, struct go err = got_commit_graph_open(&graph, "/", 1); if (err) return err; - err = got_commit_graph_iter_start(graph, root_id, repo, + err = got_commit_graph_bfsort(graph, root_id, repo, check_cancelled, NULL); if (err) goto done; blob - 169c3b1748004171e8a647860aeeb51664cae1cb blob + c76dcd4645b83f87a2252fbd462d25a8ad081d9c --- gotwebd/got_operations.c +++ gotwebd/got_operations.c @@ -383,7 +383,7 @@ got_get_repo_commits(struct request *c, size_t limit) goto done; } - error = got_commit_graph_iter_start(graph, id, repo, NULL, NULL); + error = got_commit_graph_bfsort(graph, id, repo, NULL, NULL); if (error) goto done; blob - a425d8d817ab860cb50f4d849945ba8fe207c0fd blob + 2ae96c907d138e8c9851d99c54375d81566eda8f --- include/got_commit_graph.h +++ include/got_commit_graph.h @@ -20,7 +20,7 @@ const struct got_error *got_commit_graph_open(struct g const char *, int); void got_commit_graph_close(struct got_commit_graph *); -const struct got_error *got_commit_graph_iter_start( +const struct got_error *got_commit_graph_bfsort( struct got_commit_graph *, struct got_object_id *, struct got_repository *, got_cancel_cb, void *); const struct got_error *got_commit_graph_toposort(struct got_commit_graph *, blob - 5025bfe21dc3881b31112c90ba5987b035d9eae6 blob + ddb4cb1f773cfe8dfcf75af7cffc902778dfd752 --- lib/blame.c +++ lib/blame.c @@ -579,7 +579,7 @@ blame_open(struct got_blame **blamep, const char *path if (err) goto done; - err = got_commit_graph_iter_start(graph, start_commit_id, repo, + err = got_commit_graph_bfsort(graph, start_commit_id, repo, cancel_cb, cancel_arg); if (err) goto done; blob - bb8f09bf9b71aaa916498b8ca230950f1cd0549a blob + 25522c81fb2b8206f953e4b128d8aa1c9c000bad --- lib/commit_graph.c +++ lib/commit_graph.c @@ -582,7 +582,7 @@ remove_branch_tip(struct got_object_id *commit_id, voi } const struct got_error * -got_commit_graph_iter_start(struct got_commit_graph *graph, +got_commit_graph_bfsort(struct got_commit_graph *graph, struct got_object_id *id, struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg) { @@ -739,12 +739,12 @@ got_commit_graph_find_youngest_common_ancestor(struct if (err) goto done; } else { - err = got_commit_graph_iter_start(graph, commit_id, repo, + err = got_commit_graph_bfsort(graph, commit_id, repo, cancel_cb, cancel_arg); if (err) goto done; - err = got_commit_graph_iter_start(graph2, commit_id2, repo, + err = got_commit_graph_bfsort(graph2, commit_id2, repo, cancel_cb, cancel_arg); if (err) goto done; @@ -835,7 +835,7 @@ got_commit_graph_toposort(struct got_commit_graph *gra STAILQ_INIT(&commits); if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) - return got_commit_graph_iter_start(graph, id, repo, + return got_commit_graph_bfsort(graph, id, repo, cancel_cb, cancel_arg); /* Clear left-over state from previous iteration attempts. */ blob - de26ffa1417cd4d2308f644b6a33a4a778f1f47e blob + 8ab3bab5a72fce833f44118899959e311ecac180 --- lib/keyword.c +++ lib/keyword.c @@ -197,7 +197,7 @@ got_keyword_to_idstr(char **ret, const char *keyword, if (err) goto done; - err = got_commit_graph_iter_start(graph, + err = got_commit_graph_bfsort(graph, head_id != NULL ? head_id : kwid, repo, NULL, NULL); if (err) goto done; blob - de94ddedf322329e50f2e9155daa6a586c650eeb blob + c1bf4e3aa81fc1c0a524ddb49c9a50842105c77c --- tog/tog.c +++ tog/tog.c @@ -3878,7 +3878,7 @@ open_log_view(struct tog_view *view, struct got_object !s->log_branches); if (err) goto done; - err = got_commit_graph_iter_start(thread_graph, s->start_id, + err = got_commit_graph_bfsort(thread_graph, s->start_id, s->repo, NULL, NULL); if (err) goto done; @@ -4334,7 +4334,7 @@ input_log_view(struct tog_view **new_view, struct tog_ s->in_repo_path, !s->log_branches); if (err) return err; - err = got_commit_graph_iter_start(s->thread_args.graph, + err = got_commit_graph_bfsort(s->thread_args.graph, s->start_id, s->repo, NULL, NULL); if (err) return err;