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"
38 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
39 372ccdbb 2018-06-10 stsp struct got_object_id id;
42 372ccdbb 2018-06-10 stsp * Each graph node corresponds to a commit object.
43 372ccdbb 2018-06-10 stsp * Graph vertices are modelled with two separate adjacency lists:
44 372ccdbb 2018-06-10 stsp * Adjacencies of a graph node are either parent (older) commits,
45 372ccdbb 2018-06-10 stsp * and child (younger) commits.
47 b43fbaa0 2018-06-11 stsp int nparents;
48 79f35eb3 2018-06-11 stsp struct got_object_id_queue parent_ids;
49 372ccdbb 2018-06-10 stsp int nchildren;
50 79f35eb3 2018-06-11 stsp struct got_object_id_queue child_ids;
52 b43fbaa0 2018-06-11 stsp time_t commit_timestamp;
54 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
55 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
58 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
60 372ccdbb 2018-06-10 stsp struct got_commit_graph {
61 372ccdbb 2018-06-10 stsp /* The set of all commits we have traversed. */
62 372ccdbb 2018-06-10 stsp struct got_object_idset *node_ids;
64 372ccdbb 2018-06-10 stsp /* The commit at which traversal began (youngest commit in node_ids). */
65 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *head_node;
68 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
71 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
72 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
73 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
74 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
75 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
77 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
78 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
79 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
81 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
82 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
83 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
85 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
87 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
88 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
90 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
91 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
94 372ccdbb 2018-06-10 stsp static struct got_commit_graph *
95 372ccdbb 2018-06-10 stsp alloc_graph(void)
97 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
99 372ccdbb 2018-06-10 stsp graph = calloc(1, sizeof(*graph));
100 372ccdbb 2018-06-10 stsp if (graph == NULL)
101 372ccdbb 2018-06-10 stsp return NULL;
103 60f2eee1 2018-07-08 stsp graph->node_ids = got_object_idset_alloc();
104 372ccdbb 2018-06-10 stsp if (graph->node_ids == NULL) {
105 372ccdbb 2018-06-10 stsp free(graph);
106 372ccdbb 2018-06-10 stsp return NULL;
109 60f2eee1 2018-07-08 stsp graph->open_branches = got_object_idset_alloc();
110 372ccdbb 2018-06-10 stsp if (graph->open_branches == NULL) {
111 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
112 372ccdbb 2018-06-10 stsp free(graph);
113 372ccdbb 2018-06-10 stsp return NULL;
116 31920504 2018-06-11 stsp TAILQ_INIT(&graph->iter_list);
117 372ccdbb 2018-06-10 stsp return graph;
122 372ccdbb 2018-06-10 stsp is_head_node(struct got_commit_graph_node *node)
124 372ccdbb 2018-06-10 stsp return node->nchildren == 0;
128 372ccdbb 2018-06-10 stsp is_merge_point(struct got_commit_graph_node *node)
130 b43fbaa0 2018-06-11 stsp return node->nparents > 1;
134 372ccdbb 2018-06-10 stsp is_branch_point(struct got_commit_graph_node *node)
136 372ccdbb 2018-06-10 stsp return node->nchildren > 1;
140 372ccdbb 2018-06-10 stsp is_root_node(struct got_commit_graph_node *node)
142 b43fbaa0 2018-06-11 stsp return node->nparents == 0;
146 4626e416 2018-06-10 stsp static void
147 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
148 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *node,
149 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *child_node)
151 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
153 31920504 2018-06-11 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
154 31920504 2018-06-11 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
158 fe8df4c2 2018-06-16 stsp /* Ensure that an iteration in progress will see this new commit. */
159 fe8df4c2 2018-06-16 stsp if (graph->iter_node) {
160 fe8df4c2 2018-06-16 stsp n = graph->iter_node;
161 fe8df4c2 2018-06-16 stsp while (n) {
162 fe8df4c2 2018-06-16 stsp next = TAILQ_NEXT(n, entry);
163 fe8df4c2 2018-06-16 stsp if (next &&
164 fe8df4c2 2018-06-16 stsp node->commit_timestamp >= next->commit_timestamp) {
165 fe8df4c2 2018-06-16 stsp TAILQ_INSERT_BEFORE(next, node, entry);
170 fe8df4c2 2018-06-16 stsp TAILQ_INSERT_AFTER(&graph->iter_list, graph->iter_node,
171 fe8df4c2 2018-06-16 stsp node, entry);
176 58e5f354 2018-06-11 stsp * If a child node is known, begin looping over the list there
177 a37db869 2018-06-11 stsp * instead of beginning from the list head.
179 58e5f354 2018-06-11 stsp n = child_node ? child_node : TAILQ_FIRST(&graph->iter_list);
181 d2312330 2018-06-11 stsp /* Insert into list based on committer timestamp. */
183 d2312330 2018-06-11 stsp if (node->commit_timestamp == n->commit_timestamp) {
184 d2312330 2018-06-11 stsp TAILQ_INSERT_AFTER(&graph->iter_list, n, node, entry);
186 d2312330 2018-06-11 stsp } else if (node->commit_timestamp < n->commit_timestamp) {
187 4bd3f2bb 2018-06-10 stsp next = TAILQ_NEXT(n, entry);
188 4bd3f2bb 2018-06-10 stsp if (next == NULL) {
189 31920504 2018-06-11 stsp TAILQ_INSERT_AFTER(&graph->iter_list, n,
190 4bd3f2bb 2018-06-10 stsp node, entry);
193 b43fbaa0 2018-06-11 stsp if (node->commit_timestamp >= next->commit_timestamp) {
194 4bd3f2bb 2018-06-10 stsp TAILQ_INSERT_BEFORE(next, node, entry);
198 4bd3f2bb 2018-06-10 stsp TAILQ_INSERT_BEFORE(n, node, entry);
201 9ba79e04 2018-06-11 stsp n = TAILQ_NEXT(n, entry);
202 9ba79e04 2018-06-11 stsp } while (n);
205 372ccdbb 2018-06-10 stsp static const struct got_error *
206 79f35eb3 2018-06-11 stsp add_vertex(struct got_object_id_queue *ids, struct got_object_id *id)
208 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
210 79f35eb3 2018-06-11 stsp qid = calloc(1, sizeof(*qid));
211 79f35eb3 2018-06-11 stsp if (qid == NULL)
212 b43fbaa0 2018-06-11 stsp return got_error_from_errno();
214 79f35eb3 2018-06-11 stsp qid->id = got_object_id_dup(id);
215 79f35eb3 2018-06-11 stsp if (qid->id == NULL) {
216 b43fbaa0 2018-06-11 stsp const struct got_error *err = got_error_from_errno();
218 b43fbaa0 2018-06-11 stsp return err;
221 79f35eb3 2018-06-11 stsp SIMPLEQ_INSERT_TAIL(ids, qid, entry);
222 0ed6ed4c 2018-06-13 stsp return NULL;
225 0ed6ed4c 2018-06-13 stsp static const struct got_error *
226 0ed6ed4c 2018-06-13 stsp advance_open_branches(struct got_commit_graph *graph,
227 0ed6ed4c 2018-06-13 stsp struct got_commit_graph_node *node,
228 0ed6ed4c 2018-06-13 stsp struct got_object_id *commit_id, struct got_commit_object *commit)
230 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
231 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
233 e7c810ea 2018-06-22 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
234 0ed6ed4c 2018-06-13 stsp if (err && err->code != GOT_ERR_NO_OBJ)
235 0ed6ed4c 2018-06-13 stsp return err;
237 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
238 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
239 0ed6ed4c 2018-06-13 stsp if (qid == NULL)
240 0ed6ed4c 2018-06-13 stsp return NULL;
241 0ed6ed4c 2018-06-13 stsp err = got_object_idset_add(NULL, graph->open_branches, qid->id,
243 0ed6ed4c 2018-06-13 stsp if (err && err->code != GOT_ERR_OBJ_EXISTS)
244 0ed6ed4c 2018-06-13 stsp return err;
245 0ed6ed4c 2018-06-13 stsp return NULL;
248 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
249 0ed6ed4c 2018-06-13 stsp if (got_object_idset_get(graph->node_ids, qid->id))
250 0ed6ed4c 2018-06-13 stsp continue; /* parent already traversed */
251 0ed6ed4c 2018-06-13 stsp err = got_object_idset_add(NULL, graph->open_branches,
252 0ed6ed4c 2018-06-13 stsp qid->id, node);
253 0ed6ed4c 2018-06-13 stsp if (err && err->code != GOT_ERR_OBJ_EXISTS)
254 0ed6ed4c 2018-06-13 stsp return err;
257 b43fbaa0 2018-06-11 stsp return NULL;
260 fb5b9d5a 2018-07-23 stsp static void
261 fb5b9d5a 2018-07-23 stsp free_node(struct got_commit_graph_node *node)
263 fb5b9d5a 2018-07-23 stsp while (!SIMPLEQ_EMPTY(&node->child_ids)) {
264 fb5b9d5a 2018-07-23 stsp struct got_object_qid *child = SIMPLEQ_FIRST(&node->child_ids);
265 fb5b9d5a 2018-07-23 stsp SIMPLEQ_REMOVE_HEAD(&node->child_ids, entry);
266 fb5b9d5a 2018-07-23 stsp free(child);
268 fb5b9d5a 2018-07-23 stsp while (!SIMPLEQ_EMPTY(&node->parent_ids)) {
269 fb5b9d5a 2018-07-23 stsp struct got_object_qid *pid = SIMPLEQ_FIRST(&node->parent_ids);
270 fb5b9d5a 2018-07-23 stsp SIMPLEQ_REMOVE_HEAD(&node->parent_ids, entry);
273 fb5b9d5a 2018-07-23 stsp free(node);
276 b43fbaa0 2018-06-11 stsp static const struct got_error *
277 372ccdbb 2018-06-10 stsp add_node(struct got_commit_graph_node **new_node,
278 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
279 9ba79e04 2018-06-11 stsp struct got_commit_object *commit, struct got_commit_graph_node *child_node)
281 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
282 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node, *existing_node;
283 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
285 372ccdbb 2018-06-10 stsp *new_node = NULL;
287 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
288 372ccdbb 2018-06-10 stsp if (node == NULL)
289 372ccdbb 2018-06-10 stsp return got_error_from_errno();
291 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
292 b43fbaa0 2018-06-11 stsp SIMPLEQ_INIT(&node->parent_ids);
293 372ccdbb 2018-06-10 stsp SIMPLEQ_INIT(&node->child_ids);
294 79f35eb3 2018-06-11 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
295 79f35eb3 2018-06-11 stsp err = add_vertex(&node->parent_ids, qid->id);
297 fb5b9d5a 2018-07-23 stsp free_node(node);
298 b43fbaa0 2018-06-11 stsp return err;
300 b43fbaa0 2018-06-11 stsp node->nparents++;
302 788c352e 2018-06-16 stsp node->commit_timestamp = mktime(&commit->tm_committer);
303 4e845d01 2018-07-22 stsp if (node->commit_timestamp == -1) {
304 fb5b9d5a 2018-07-23 stsp free_node(node);
305 788c352e 2018-06-16 stsp return got_error_from_errno();
308 372ccdbb 2018-06-10 stsp err = got_object_idset_add((void **)(&existing_node),
309 372ccdbb 2018-06-10 stsp graph->node_ids, &node->id, node);
310 372ccdbb 2018-06-10 stsp if (err == NULL) {
311 9ba79e04 2018-06-11 stsp add_node_to_iter_list(graph, node, child_node);
312 0ed6ed4c 2018-06-13 stsp err = advance_open_branches(graph, node, commit_id, commit);
313 372ccdbb 2018-06-10 stsp *new_node = node;
314 372ccdbb 2018-06-10 stsp } else if (err->code == GOT_ERR_OBJ_EXISTS) {
315 372ccdbb 2018-06-10 stsp err = NULL;
316 fb5b9d5a 2018-07-23 stsp free_node(node);
317 372ccdbb 2018-06-10 stsp node = existing_node;
319 fb5b9d5a 2018-07-23 stsp free_node(node);
320 372ccdbb 2018-06-10 stsp return err;
323 9ba79e04 2018-06-11 stsp if (child_node) {
324 79f35eb3 2018-06-11 stsp struct got_object_qid *cid;
326 372ccdbb 2018-06-10 stsp /* Prevent linking to self. */
327 4e845d01 2018-07-22 stsp if (got_object_id_cmp(commit_id, &child_node->id) == 0) {
328 4e845d01 2018-07-22 stsp err = got_error(GOT_ERR_BAD_OBJ_ID);
332 ce47a424 2018-07-22 stsp /* Prevent double-linking to the same child (treat as no-op). */
333 372ccdbb 2018-06-10 stsp SIMPLEQ_FOREACH(cid, &node->child_ids, entry) {
334 9ba79e04 2018-06-11 stsp if (got_object_id_cmp(cid->id, &child_node->id) == 0)
335 4e845d01 2018-07-22 stsp goto free_node;
338 9ba79e04 2018-06-11 stsp err = add_vertex(&node->child_ids, &child_node->id);
341 372ccdbb 2018-06-10 stsp node->nchildren++;
346 4e845d01 2018-07-22 stsp if (node != existing_node)
347 fb5b9d5a 2018-07-23 stsp free_node(node);
348 4e845d01 2018-07-22 stsp *new_node = NULL;
350 c4d7a9c4 2018-06-11 stsp return err;
353 c4d7a9c4 2018-06-11 stsp const struct got_error *
354 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
355 0ed6ed4c 2018-06-13 stsp struct got_object_id *commit_id, int first_parent_traversal,
356 0ed6ed4c 2018-06-13 stsp struct got_repository *repo)
358 c4d7a9c4 2018-06-11 stsp const struct got_error *err = NULL;
359 c4d7a9c4 2018-06-11 stsp struct got_commit_object *commit;
361 c4d7a9c4 2018-06-11 stsp *graph = NULL;
363 be6a1b5a 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
365 372ccdbb 2018-06-10 stsp return err;
367 372ccdbb 2018-06-10 stsp *graph = alloc_graph();
368 372ccdbb 2018-06-10 stsp if (*graph == NULL) {
369 372ccdbb 2018-06-10 stsp got_object_commit_close(commit);
370 372ccdbb 2018-06-10 stsp return got_error_from_errno();
373 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
374 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
376 372ccdbb 2018-06-10 stsp err = add_node(&(*graph)->head_node, *graph, commit_id, commit, NULL);
377 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
379 372ccdbb 2018-06-10 stsp got_commit_graph_close(*graph);
380 372ccdbb 2018-06-10 stsp *graph = NULL;
381 372ccdbb 2018-06-10 stsp return err;
384 372ccdbb 2018-06-10 stsp return NULL;
387 372ccdbb 2018-06-10 stsp struct got_commit_graph_branch {
388 372ccdbb 2018-06-10 stsp struct got_object_id parent_id;
389 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node;
392 372ccdbb 2018-06-10 stsp struct gather_branches_arg {
393 372ccdbb 2018-06-10 stsp struct got_commit_graph_branch *branches;
394 372ccdbb 2018-06-10 stsp int nbranches;
397 372ccdbb 2018-06-10 stsp static void
398 372ccdbb 2018-06-10 stsp gather_branches(struct got_object_id *id, void *data, void *arg)
400 372ccdbb 2018-06-10 stsp struct gather_branches_arg *a = arg;
401 372ccdbb 2018-06-10 stsp memcpy(&a->branches[a->nbranches].parent_id, id, sizeof(*id));
402 372ccdbb 2018-06-10 stsp a->branches[a->nbranches].node = data;
403 372ccdbb 2018-06-10 stsp a->nbranches++;
406 1142eae9 2018-06-11 stsp static const struct got_error *
407 1142eae9 2018-06-11 stsp fetch_commits_from_open_branches(int *ncommits, int *wanted_id_added,
408 1142eae9 2018-06-11 stsp struct got_commit_graph *graph, struct got_repository *repo,
409 1142eae9 2018-06-11 stsp struct got_object_id *wanted_id)
411 372ccdbb 2018-06-10 stsp const struct got_error *err;
412 372ccdbb 2018-06-10 stsp struct got_commit_graph_branch *branches;
413 372ccdbb 2018-06-10 stsp struct gather_branches_arg arg;
416 372ccdbb 2018-06-10 stsp *ncommits = 0;
417 1142eae9 2018-06-11 stsp if (wanted_id_added)
418 1142eae9 2018-06-11 stsp *wanted_id_added = 0;
420 372ccdbb 2018-06-10 stsp arg.nbranches = got_object_idset_num_elements(graph->open_branches);
421 372ccdbb 2018-06-10 stsp if (arg.nbranches == 0)
422 372ccdbb 2018-06-10 stsp return NULL;
425 372ccdbb 2018-06-10 stsp * Adding nodes to the graph might change the graph's open
426 372ccdbb 2018-06-10 stsp * branches state. Create a local copy of the current state.
428 372ccdbb 2018-06-10 stsp branches = calloc(arg.nbranches, sizeof(*branches));
429 372ccdbb 2018-06-10 stsp if (branches == NULL)
430 372ccdbb 2018-06-10 stsp return got_error_from_errno();
431 372ccdbb 2018-06-10 stsp arg.nbranches = 0; /* reset; gather_branches() will increment */
432 372ccdbb 2018-06-10 stsp arg.branches = branches;
433 372ccdbb 2018-06-10 stsp got_object_idset_for_each(graph->open_branches, gather_branches, &arg);
435 372ccdbb 2018-06-10 stsp for (i = 0; i < arg.nbranches; i++) {
436 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
437 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *child_node, *new_node;
438 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
440 372ccdbb 2018-06-10 stsp commit_id = &branches[i].parent_id;
441 372ccdbb 2018-06-10 stsp child_node = branches[i].node;
443 be6a1b5a 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
447 9ba79e04 2018-06-11 stsp err = add_node(&new_node, graph, commit_id, commit, child_node);
448 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
451 372ccdbb 2018-06-10 stsp if (new_node)
452 372ccdbb 2018-06-10 stsp (*ncommits)++;
453 1142eae9 2018-06-11 stsp if (wanted_id && got_object_id_cmp(commit_id, wanted_id) == 0)
454 1142eae9 2018-06-11 stsp *wanted_id_added = 1;
457 372ccdbb 2018-06-10 stsp free(branches);
458 372ccdbb 2018-06-10 stsp return err;
461 372ccdbb 2018-06-10 stsp const struct got_error *
462 372ccdbb 2018-06-10 stsp got_commit_graph_fetch_commits(int *nfetched, struct got_commit_graph *graph,
463 372ccdbb 2018-06-10 stsp int limit, struct got_repository *repo)
465 372ccdbb 2018-06-10 stsp const struct got_error *err;
466 1142eae9 2018-06-11 stsp int ncommits;
468 372ccdbb 2018-06-10 stsp *nfetched = 0;
470 1142eae9 2018-06-11 stsp while (*nfetched < limit) {
471 1142eae9 2018-06-11 stsp err = fetch_commits_from_open_branches(&ncommits, NULL,
472 1142eae9 2018-06-11 stsp graph, repo, NULL);
474 372ccdbb 2018-06-10 stsp return err;
475 372ccdbb 2018-06-10 stsp if (ncommits == 0)
477 1142eae9 2018-06-11 stsp *nfetched += ncommits;
480 372ccdbb 2018-06-10 stsp return NULL;
483 1142eae9 2018-06-11 stsp const struct got_error *
484 1142eae9 2018-06-11 stsp got_commit_graph_fetch_commits_up_to(int *nfetched,
485 1142eae9 2018-06-11 stsp struct got_commit_graph *graph, struct got_object_id *wanted_id,
486 1142eae9 2018-06-11 stsp struct got_repository *repo)
488 1142eae9 2018-06-11 stsp const struct got_error *err;
489 1142eae9 2018-06-11 stsp int ncommits, wanted_id_added = 0;
491 1142eae9 2018-06-11 stsp *nfetched = 0;
493 6e0c0f9a 2018-06-11 stsp if (got_object_idset_get(graph->node_ids, wanted_id) != NULL)
494 6e0c0f9a 2018-06-11 stsp return NULL;
496 1142eae9 2018-06-11 stsp while (!wanted_id_added) {
497 1142eae9 2018-06-11 stsp err = fetch_commits_from_open_branches(&ncommits,
498 1142eae9 2018-06-11 stsp &wanted_id_added, graph, repo, wanted_id);
500 1142eae9 2018-06-11 stsp return err;
501 1142eae9 2018-06-11 stsp if (ncommits == 0)
502 1142eae9 2018-06-11 stsp return NULL;
503 1142eae9 2018-06-11 stsp *nfetched += ncommits;
506 1142eae9 2018-06-11 stsp return NULL;
509 372ccdbb 2018-06-10 stsp static void
510 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
512 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
513 fb5b9d5a 2018-07-23 stsp free_node(node);
517 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
519 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->open_branches);
520 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
521 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
522 372ccdbb 2018-06-10 stsp free(graph);
525 372ccdbb 2018-06-10 stsp const struct got_error *
526 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
527 372ccdbb 2018-06-10 stsp struct got_object_id *id)
529 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
531 372ccdbb 2018-06-10 stsp start_node = got_object_idset_get(graph->node_ids, id);
532 372ccdbb 2018-06-10 stsp if (start_node == NULL)
533 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_NO_OBJ);
535 372ccdbb 2018-06-10 stsp graph->iter_node = start_node;
536 372ccdbb 2018-06-10 stsp return NULL;
539 372ccdbb 2018-06-10 stsp const struct got_error *
540 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
541 b43fbaa0 2018-06-11 stsp struct got_commit_graph *graph)
543 9ba79e04 2018-06-11 stsp *id = NULL;
545 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
546 372ccdbb 2018-06-10 stsp /* We are done interating, or iteration was not started. */
547 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
550 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
551 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
552 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
553 9ba79e04 2018-06-11 stsp *id = &graph->iter_node->id;
554 9ba79e04 2018-06-11 stsp /* We are done interating. */
555 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
556 372ccdbb 2018-06-10 stsp return NULL;
559 9ba79e04 2018-06-11 stsp if (TAILQ_NEXT(graph->iter_node, entry) == NULL)
560 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_ITER_NEED_MORE);
562 372ccdbb 2018-06-10 stsp *id = &graph->iter_node->id;
563 9ba79e04 2018-06-11 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
564 372ccdbb 2018-06-10 stsp return NULL;
