Commit 13a851c144b0ea32b3c43e123fc04fd90ee02e39
2020-01-04T19:50:01
simplify changed-path and branch-done detection in commit graph
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/lib/commit_graph.c b/lib/commit_graph.c
index c648591..da0a70c 100644
--- a/lib/commit_graph.c
+++ b/lib/commit_graph.c
@@ -318,31 +318,6 @@ add_node(struct got_commit_graph_node **new_node,
}
const struct got_error *
-detect_change(int *changed, int *branch_done, const char *path,
- struct got_commit_object *commit, struct got_object_id *commit_id,
- struct got_repository *repo)
-{
- const struct got_error *err;
-
- *changed = 0;
- *branch_done = 0;
-
- err = detect_changed_path(changed, commit, commit_id, path, repo);
- if (err) {
- if (err->code != GOT_ERR_NO_OBJ)
- return err;
- /*
- * History of the path stops here on the current
- * branch. Keep going on other branches.
- */
- err = NULL;
- *branch_done = 1;
- }
-
- return NULL;
-}
-
-const struct got_error *
got_commit_graph_open(struct got_commit_graph **graph,
const char *path, int first_parent_traversal)
{
@@ -453,7 +428,7 @@ fetch_commits_from_open_branches(int *nfetched,
struct got_object_id *commit_id;
struct got_commit_object *commit;
struct got_commit_graph_node *new_node;
- int branch_done, changed;
+ int changed;
if (cancel_cb) {
err = (*cancel_cb)(cancel_arg);
@@ -465,20 +440,25 @@ fetch_commits_from_open_branches(int *nfetched,
commit = arg.tips[i].commit;
new_node = arg.tips[i].new_node;
- err = detect_change(&changed, &branch_done, graph->path,
- commit, commit_id, repo);
- if (err)
+ err = detect_changed_path(&changed, commit, commit_id,
+ graph->path, repo);
+ if (err) {
+ if (err->code != GOT_ERR_NO_OBJ)
+ break;
+ /*
+ * History of the path stops here on the current
+ * branch. Keep going on other branches.
+ */
+ err = close_branch(graph, commit_id);
break;
+ }
if (changed) {
add_node_to_iter_list(graph, new_node);
if (changed_id && *changed_id == NULL)
*changed_id = commit_id;
}
- if (branch_done)
- err = close_branch(graph, commit_id);
- else
- err = advance_branch(graph, new_node, commit_id,
- commit, repo);
+ err = advance_branch(graph, new_node, commit_id,
+ commit, repo);
if (err)
break;
}
@@ -518,7 +498,7 @@ got_commit_graph_iter_start(struct got_commit_graph *graph,
const struct got_error *err = NULL;
struct got_commit_graph_node *start_node;
struct got_commit_object *commit;
- int changed, branch_done;
+ int changed;
if (!TAILQ_EMPTY(&graph->iter_list))
return got_error(GOT_ERR_ITER_BUSY);
@@ -531,8 +511,7 @@ got_commit_graph_iter_start(struct got_commit_graph *graph,
if (err)
goto done;
- err = detect_change(&changed, &branch_done, graph->path,
- commit, id, repo);
+ err = detect_changed_path(&changed, commit, id, graph->path, repo);
if (err)
goto done;
if (changed)