2 372ccdbb 2018-06-10 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
4 372ccdbb 2018-06-10 stsp * Permission to use, copy, modify, and distribute this software for any
5 372ccdbb 2018-06-10 stsp * purpose with or without fee is hereby granted, provided that the above
6 372ccdbb 2018-06-10 stsp * copyright notice and this permission notice appear in all copies.
8 372ccdbb 2018-06-10 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 372ccdbb 2018-06-10 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 372ccdbb 2018-06-10 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 372ccdbb 2018-06-10 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 372ccdbb 2018-06-10 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 372ccdbb 2018-06-10 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 372ccdbb 2018-06-10 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 372ccdbb 2018-06-10 stsp #include <sys/types.h>
18 372ccdbb 2018-06-10 stsp #include <sys/stat.h>
19 372ccdbb 2018-06-10 stsp #include <sys/queue.h>
20 372ccdbb 2018-06-10 stsp #include <sys/stdint.h>
22 372ccdbb 2018-06-10 stsp #include <stdio.h>
23 372ccdbb 2018-06-10 stsp #include <stdlib.h>
24 372ccdbb 2018-06-10 stsp #include <string.h>
25 372ccdbb 2018-06-10 stsp #include <sha1.h>
26 372ccdbb 2018-06-10 stsp #include <zlib.h>
27 372ccdbb 2018-06-10 stsp #include <ctype.h>
29 372ccdbb 2018-06-10 stsp #include "got_error.h"
30 372ccdbb 2018-06-10 stsp #include "got_object.h"
31 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
33 372ccdbb 2018-06-10 stsp #include "got_lib_delta.h"
34 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
35 372ccdbb 2018-06-10 stsp #include "got_lib_object.h"
36 372ccdbb 2018-06-10 stsp #include "got_lib_object_idset.h"
37 31cedeaf 2018-09-15 stsp #include "got_lib_path.h"
39 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
40 372ccdbb 2018-06-10 stsp struct got_object_id id;
41 b43fbaa0 2018-06-11 stsp time_t commit_timestamp;
43 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
44 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
47 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
49 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip {
50 32777563 2018-11-07 stsp struct got_object_id *commit_id;
51 32777563 2018-11-07 stsp struct got_commit_object *commit;
52 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
53 32777563 2018-11-07 stsp int changed;
54 32777563 2018-11-07 stsp int branch_done;
57 372ccdbb 2018-06-10 stsp struct got_commit_graph {
58 372ccdbb 2018-06-10 stsp /* The set of all commits we have traversed. */
59 372ccdbb 2018-06-10 stsp struct got_object_idset *node_ids;
61 372ccdbb 2018-06-10 stsp /* The commit at which traversal began (youngest commit in node_ids). */
62 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *head_node;
65 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
68 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
69 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
70 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
71 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
72 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
74 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
75 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
76 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
78 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
79 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
80 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
82 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
84 32777563 2018-11-07 stsp /* Array of branch tips for fetch_commits_from_open_branches(). */
85 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
88 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
91 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
92 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
94 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
95 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
98 372ccdbb 2018-06-10 stsp static struct got_commit_graph *
99 31cedeaf 2018-09-15 stsp alloc_graph(const char *path)
101 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
103 372ccdbb 2018-06-10 stsp graph = calloc(1, sizeof(*graph));
104 372ccdbb 2018-06-10 stsp if (graph == NULL)
105 372ccdbb 2018-06-10 stsp return NULL;
107 31cedeaf 2018-09-15 stsp graph->path = strdup(path);
108 31cedeaf 2018-09-15 stsp if (graph->path == NULL) {
109 31cedeaf 2018-09-15 stsp free(graph);
110 31cedeaf 2018-09-15 stsp return NULL;
113 60f2eee1 2018-07-08 stsp graph->node_ids = got_object_idset_alloc();
114 372ccdbb 2018-06-10 stsp if (graph->node_ids == NULL) {
115 31cedeaf 2018-09-15 stsp free(graph->path);
116 372ccdbb 2018-06-10 stsp free(graph);
117 372ccdbb 2018-06-10 stsp return NULL;
120 60f2eee1 2018-07-08 stsp graph->open_branches = got_object_idset_alloc();
121 372ccdbb 2018-06-10 stsp if (graph->open_branches == NULL) {
122 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
123 31cedeaf 2018-09-15 stsp free(graph->path);
124 372ccdbb 2018-06-10 stsp free(graph);
125 372ccdbb 2018-06-10 stsp return NULL;
128 31920504 2018-06-11 stsp TAILQ_INIT(&graph->iter_list);
129 372ccdbb 2018-06-10 stsp return graph;
132 31cedeaf 2018-09-15 stsp static const struct got_error *
133 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
134 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
135 31cedeaf 2018-09-15 stsp struct got_repository *repo)
137 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
138 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
139 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
140 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
142 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
143 31cedeaf 2018-09-15 stsp *changed = 1;
144 31cedeaf 2018-09-15 stsp return NULL;
147 31cedeaf 2018-09-15 stsp *changed = 0;
149 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
150 31cedeaf 2018-09-15 stsp if (pid == NULL) {
151 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
152 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
154 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
155 fd1d2703 2018-11-04 stsp err = NULL;
157 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
158 31cedeaf 2018-09-15 stsp free(obj_id);
159 0e9101d5 2018-11-18 stsp return err;
162 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
164 0e9101d5 2018-11-18 stsp return err;
166 0e9101d5 2018-11-18 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
170 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
174 0e9101d5 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path,
178 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
180 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
181 31cedeaf 2018-09-15 stsp if (pcommit)
182 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
183 31cedeaf 2018-09-15 stsp return err;
186 4626e416 2018-06-10 stsp static void
187 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
188 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *node,
189 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *child_node)
191 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
193 31920504 2018-06-11 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
194 bee6b577 2018-09-19 stsp TAILQ_INSERT_HEAD(&graph->iter_list, node, entry);
195 bee6b577 2018-09-19 stsp graph->iter_node = node;
199 bee6b577 2018-09-19 stsp n = graph->iter_node;
200 fe8df4c2 2018-06-16 stsp /* Ensure that an iteration in progress will see this new commit. */
201 bee6b577 2018-09-19 stsp while (n) {
202 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
203 bee6b577 2018-09-19 stsp if (next && node->commit_timestamp >= next->commit_timestamp) {
204 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
209 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
212 0ed6ed4c 2018-06-13 stsp static const struct got_error *
213 31cedeaf 2018-09-15 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
215 31cedeaf 2018-09-15 stsp const struct got_error *err;
217 31cedeaf 2018-09-15 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
218 31cedeaf 2018-09-15 stsp if (err && err->code != GOT_ERR_NO_OBJ)
219 31cedeaf 2018-09-15 stsp return err;
220 31cedeaf 2018-09-15 stsp return NULL;
223 31cedeaf 2018-09-15 stsp static const struct got_error *
224 31cedeaf 2018-09-15 stsp advance_branch(struct got_commit_graph *graph,
225 0ed6ed4c 2018-06-13 stsp struct got_commit_graph_node *node,
226 41fa1437 2018-11-05 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
227 bee6b577 2018-09-19 stsp struct got_repository *repo)
229 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
230 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
232 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
234 0ed6ed4c 2018-06-13 stsp return err;
236 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
237 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
238 9b88e78c 2018-11-18 stsp if (qid == NULL ||
239 9b88e78c 2018-11-18 stsp got_object_idset_get(graph->open_branches, qid->id))
240 0ed6ed4c 2018-06-13 stsp return NULL;
241 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
242 9b88e78c 2018-11-18 stsp qid->id, node);
246 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
247 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
249 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
250 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
251 bee6b577 2018-09-19 stsp int branches_differ = 0;
253 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
254 bee6b577 2018-09-19 stsp graph->path);
256 bee6b577 2018-09-19 stsp return err;
258 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
259 6dcdad08 2018-11-18 stsp struct got_object_id *id;
261 bee6b577 2018-09-19 stsp if (got_object_idset_get(graph->node_ids, qid->id))
262 bee6b577 2018-09-19 stsp continue; /* parent already traversed */
263 9b88e78c 2018-11-18 stsp if (got_object_idset_get(graph->open_branches, qid->id))
266 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
267 bee6b577 2018-09-19 stsp graph->path);
269 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
270 bee6b577 2018-09-19 stsp branches_differ = 1;
273 6dcdad08 2018-11-18 stsp free(merged_id);
274 6dcdad08 2018-11-18 stsp free(prev_id);
275 bee6b577 2018-09-19 stsp return err;
278 bee6b577 2018-09-19 stsp if (prev_id) {
279 bee6b577 2018-09-19 stsp if (!branches_differ &&
280 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
281 bee6b577 2018-09-19 stsp branches_differ = 1;
282 6dcdad08 2018-11-18 stsp free(prev_id);
284 6dcdad08 2018-11-18 stsp prev_id = id;
287 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
288 bee6b577 2018-09-19 stsp * skip any other branches.
290 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
291 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
292 b36429ab 2018-11-05 stsp qid->id, node);
293 6dcdad08 2018-11-18 stsp free(merged_id);
295 b36429ab 2018-11-05 stsp return err;
299 6dcdad08 2018-11-18 stsp free(prev_id);
300 6dcdad08 2018-11-18 stsp prev_id = NULL;
301 6dcdad08 2018-11-18 stsp free(merged_id);
302 6dcdad08 2018-11-18 stsp merged_id = NULL;
305 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
306 bee6b577 2018-09-19 stsp * follow the first parent only.
308 bee6b577 2018-09-19 stsp if (!branches_differ) {
309 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
310 bee6b577 2018-09-19 stsp if (qid == NULL)
311 bee6b577 2018-09-19 stsp return NULL;
312 bee6b577 2018-09-19 stsp if (got_object_idset_get(graph->node_ids, qid->id))
313 bee6b577 2018-09-19 stsp return NULL; /* parent already traversed */
314 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
315 b36429ab 2018-11-05 stsp return NULL;
316 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
317 b36429ab 2018-11-05 stsp qid->id, node);
321 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
322 0ed6ed4c 2018-06-13 stsp if (got_object_idset_get(graph->node_ids, qid->id))
323 0ed6ed4c 2018-06-13 stsp continue; /* parent already traversed */
324 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
326 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
328 0ed6ed4c 2018-06-13 stsp return err;
331 b43fbaa0 2018-06-11 stsp return NULL;
334 b43fbaa0 2018-06-11 stsp static const struct got_error *
335 649fc316 2018-11-05 stsp add_node(struct got_commit_graph_node **new_node, int *changed,
336 1bf85b22 2018-11-07 stsp int *branch_done, struct got_commit_graph *graph,
337 1bf85b22 2018-11-07 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
338 1bf85b22 2018-11-07 stsp struct got_commit_graph_node *child_node, struct got_repository *repo)
340 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
341 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
343 372ccdbb 2018-06-10 stsp *new_node = NULL;
344 649fc316 2018-11-05 stsp *changed = 0;
345 1bf85b22 2018-11-07 stsp *branch_done = 0;
347 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
348 372ccdbb 2018-06-10 stsp if (node == NULL)
349 372ccdbb 2018-06-10 stsp return got_error_from_errno();
351 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
352 bfd1f6da 2018-11-05 stsp node->commit_timestamp = commit->committer_time;
354 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->node_ids, &node->id, node);
356 7a62478b 2018-11-18 stsp free(node);
357 372ccdbb 2018-06-10 stsp return err;
360 649fc316 2018-11-05 stsp err = detect_changed_path(changed, commit, commit_id, graph->path,
363 31cedeaf 2018-09-15 stsp if (err->code == GOT_ERR_NO_OBJ) {
365 31cedeaf 2018-09-15 stsp * History of the path stops here on the current
366 31cedeaf 2018-09-15 stsp * branch. Keep going on other branches.
368 31cedeaf 2018-09-15 stsp err = NULL;
369 1bf85b22 2018-11-07 stsp *branch_done = 1;
371 45f209d7 2018-11-18 stsp got_object_idset_remove(NULL, graph->node_ids,
372 45f209d7 2018-11-18 stsp &node->id);
373 7a62478b 2018-11-18 stsp free(node);
374 31cedeaf 2018-09-15 stsp return err;
378 ce95c694 2018-11-18 stsp if (*changed)
379 ce95c694 2018-11-18 stsp add_node_to_iter_list(graph, node, child_node);
380 ce95c694 2018-11-18 stsp *new_node = node;
381 ce95c694 2018-11-18 stsp return NULL;
384 c4d7a9c4 2018-06-11 stsp const struct got_error *
385 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
386 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
387 31cedeaf 2018-09-15 stsp int first_parent_traversal, struct got_repository *repo)
389 c4d7a9c4 2018-06-11 stsp const struct got_error *err = NULL;
390 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
391 1bf85b22 2018-11-07 stsp int changed, branch_done;
393 c4d7a9c4 2018-06-11 stsp *graph = NULL;
395 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
397 372ccdbb 2018-06-10 stsp return err;
399 31cedeaf 2018-09-15 stsp /* The path must exist in our initial commit. */
400 31cedeaf 2018-09-15 stsp if (!got_path_is_root_dir(path)) {
401 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
402 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
404 31cedeaf 2018-09-15 stsp return err;
405 31cedeaf 2018-09-15 stsp free(obj_id);
408 31cedeaf 2018-09-15 stsp *graph = alloc_graph(path);
409 372ccdbb 2018-06-10 stsp if (*graph == NULL) {
410 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
411 372ccdbb 2018-06-10 stsp return got_error_from_errno();
414 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
415 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
417 1bf85b22 2018-11-07 stsp err = add_node(&(*graph)->head_node, &changed, &branch_done, *graph,
418 1bf85b22 2018-11-07 stsp commit_id, commit, NULL, repo);
419 1bf85b22 2018-11-07 stsp if (err == NULL) {
420 1bf85b22 2018-11-07 stsp err = advance_branch(*graph, (*graph)->head_node, commit_id,
421 1bf85b22 2018-11-07 stsp commit, repo);
423 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
425 372ccdbb 2018-06-10 stsp got_commit_graph_close(*graph);
426 372ccdbb 2018-06-10 stsp *graph = NULL;
427 372ccdbb 2018-06-10 stsp return err;
430 372ccdbb 2018-06-10 stsp return NULL;
433 32777563 2018-11-07 stsp struct add_branch_tip_arg {
434 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
436 32777563 2018-11-07 stsp struct got_repository *repo;
437 32777563 2018-11-07 stsp struct got_commit_graph *graph;
440 cb103d04 2018-11-07 stsp static const struct got_error *
441 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
443 32777563 2018-11-07 stsp const struct got_error *err;
444 32777563 2018-11-07 stsp struct got_commit_graph_node *child_node = data;
445 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
446 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
447 32777563 2018-11-07 stsp struct got_commit_object *commit;
448 32777563 2018-11-07 stsp int changed, branch_done;
450 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
452 32777563 2018-11-07 stsp return err;
454 32777563 2018-11-07 stsp err = add_node(&new_node, &changed, &branch_done, a->graph,
455 32777563 2018-11-07 stsp commit_id, commit, child_node, a->repo);
457 32777563 2018-11-07 stsp return err;
459 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
460 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
461 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
462 32777563 2018-11-07 stsp a->tips[a->ntips].changed = changed;
463 32777563 2018-11-07 stsp a->tips[a->ntips].branch_done = branch_done;
464 b565f6f8 2018-07-23 stsp a->ntips++;
466 cb103d04 2018-11-07 stsp return NULL;
469 1142eae9 2018-06-11 stsp static const struct got_error *
470 32777563 2018-11-07 stsp fetch_commits_from_open_branches(int *nfetched,
471 31cedeaf 2018-09-15 stsp struct got_object_id **changed_id, struct got_commit_graph *graph,
472 644e44ed 2018-11-04 stsp struct got_repository *repo)
474 372ccdbb 2018-06-10 stsp const struct got_error *err;
475 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
476 32777563 2018-11-07 stsp int i, ntips;
478 32777563 2018-11-07 stsp *nfetched = 0;
479 649fc316 2018-11-05 stsp *changed_id = NULL;
481 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
482 32777563 2018-11-07 stsp if (ntips == 0)
483 372ccdbb 2018-06-10 stsp return NULL;
485 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
486 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
487 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
488 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
489 5e50c36a 2018-11-08 stsp sizeof(*tips));
490 b565f6f8 2018-07-23 stsp if (tips == NULL)
491 b565f6f8 2018-07-23 stsp return got_error_from_errno();
492 b565f6f8 2018-07-23 stsp graph->tips = tips;
493 32777563 2018-11-07 stsp graph->ntips = ntips;
495 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
496 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
497 32777563 2018-11-07 stsp arg.repo = repo;
498 32777563 2018-11-07 stsp arg.graph = graph;
499 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
504 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
505 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
506 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
507 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
508 32777563 2018-11-07 stsp int branch_done, changed;
510 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
511 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
512 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
513 32777563 2018-11-07 stsp branch_done = arg.tips[i].branch_done;
514 32777563 2018-11-07 stsp changed = arg.tips[i].changed;
516 1bf85b22 2018-11-07 stsp if (branch_done)
517 1bf85b22 2018-11-07 stsp err = close_branch(graph, commit_id);
519 1bf85b22 2018-11-07 stsp err = advance_branch(graph, new_node, commit_id,
520 1bf85b22 2018-11-07 stsp commit, repo);
523 32777563 2018-11-07 stsp if (changed && *changed_id == NULL)
524 32777563 2018-11-07 stsp *changed_id = commit_id;
527 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
528 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
529 32777563 2018-11-07 stsp (*nfetched) = arg.ntips;
530 372ccdbb 2018-06-10 stsp return err;
533 372ccdbb 2018-06-10 stsp const struct got_error *
534 31cedeaf 2018-09-15 stsp got_commit_graph_fetch_commits(struct got_commit_graph *graph, int limit,
535 31cedeaf 2018-09-15 stsp struct got_repository *repo)
537 372ccdbb 2018-06-10 stsp const struct got_error *err;
538 31cedeaf 2018-09-15 stsp int nfetched = 0, ncommits;
539 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
541 31cedeaf 2018-09-15 stsp while (nfetched < limit) {
542 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
543 644e44ed 2018-11-04 stsp &changed_id, graph, repo);
545 372ccdbb 2018-06-10 stsp return err;
546 372ccdbb 2018-06-10 stsp if (ncommits == 0)
548 31cedeaf 2018-09-15 stsp if (changed_id)
549 31cedeaf 2018-09-15 stsp nfetched += ncommits;
552 372ccdbb 2018-06-10 stsp return NULL;
555 cb103d04 2018-11-07 stsp static const struct got_error *
556 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
558 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
559 7a62478b 2018-11-18 stsp free(node);
560 cb103d04 2018-11-07 stsp return NULL;
564 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
566 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->open_branches);
567 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
568 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
569 b565f6f8 2018-07-23 stsp free(graph->tips);
570 31cedeaf 2018-09-15 stsp free(graph->path);
571 372ccdbb 2018-06-10 stsp free(graph);
574 372ccdbb 2018-06-10 stsp const struct got_error *
575 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
576 31cedeaf 2018-09-15 stsp struct got_object_id *id, struct got_repository *repo)
578 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
579 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
580 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
581 31cedeaf 2018-09-15 stsp int changed;
583 372ccdbb 2018-06-10 stsp start_node = got_object_idset_get(graph->node_ids, id);
584 372ccdbb 2018-06-10 stsp if (start_node == NULL)
585 91a3d81f 2018-11-11 stsp return got_error_no_obj(id);
587 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, &start_node->id);
589 31cedeaf 2018-09-15 stsp return err;
591 31cedeaf 2018-09-15 stsp err = detect_changed_path(&changed, commit, &start_node->id,
592 31cedeaf 2018-09-15 stsp graph->path, repo);
594 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
595 31cedeaf 2018-09-15 stsp return err;
598 31cedeaf 2018-09-15 stsp if (!changed) {
599 31cedeaf 2018-09-15 stsp /* Locate first commit which changed graph->path. */
600 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
601 31cedeaf 2018-09-15 stsp while (changed_id == NULL) {
602 31cedeaf 2018-09-15 stsp int ncommits;
603 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
604 644e44ed 2018-11-04 stsp &changed_id, graph, repo);
606 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
607 31cedeaf 2018-09-15 stsp return err;
610 31cedeaf 2018-09-15 stsp start_node = got_object_idset_get(graph->node_ids, changed_id);
612 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
614 372ccdbb 2018-06-10 stsp graph->iter_node = start_node;
615 372ccdbb 2018-06-10 stsp return NULL;
618 372ccdbb 2018-06-10 stsp const struct got_error *
619 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
620 b43fbaa0 2018-06-11 stsp struct got_commit_graph *graph)
622 9ba79e04 2018-06-11 stsp *id = NULL;
624 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
625 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
626 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
629 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
630 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
631 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
632 2c7f8870 2018-09-19 stsp /* We are done iterating. */
633 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
634 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
635 6bc66952 2018-09-19 stsp return NULL;
638 9ba79e04 2018-06-11 stsp if (TAILQ_NEXT(graph->iter_node, entry) == NULL)
639 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_ITER_NEED_MORE);
641 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
642 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
643 372ccdbb 2018-06-10 stsp return NULL;