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 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
32 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
33 324d37e7 2019-05-11 stsp #include "got_path.h"
35 372ccdbb 2018-06-10 stsp #include "got_lib_delta.h"
36 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
37 372ccdbb 2018-06-10 stsp #include "got_lib_object.h"
38 372ccdbb 2018-06-10 stsp #include "got_lib_object_idset.h"
40 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
41 372ccdbb 2018-06-10 stsp struct got_object_id id;
42 73026088 2018-11-18 stsp time_t timestamp;
44 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
45 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
48 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
50 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip {
51 32777563 2018-11-07 stsp struct got_object_id *commit_id;
52 32777563 2018-11-07 stsp struct got_commit_object *commit;
53 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
54 32777563 2018-11-07 stsp int changed;
55 32777563 2018-11-07 stsp int branch_done;
58 372ccdbb 2018-06-10 stsp struct got_commit_graph {
59 372ccdbb 2018-06-10 stsp /* The set of all commits we have traversed. */
60 372ccdbb 2018-06-10 stsp struct got_object_idset *node_ids;
62 372ccdbb 2018-06-10 stsp /* The commit at which traversal began (youngest commit in node_ids). */
63 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *head_node;
66 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
69 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
70 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
71 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
72 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
73 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
75 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
76 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
77 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
79 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
80 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
81 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
83 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
85 32777563 2018-11-07 stsp /* Array of branch tips for fetch_commits_from_open_branches(). */
86 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
89 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
92 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
93 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
95 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
96 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
99 372ccdbb 2018-06-10 stsp static struct got_commit_graph *
100 31cedeaf 2018-09-15 stsp alloc_graph(const char *path)
102 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
104 372ccdbb 2018-06-10 stsp graph = calloc(1, sizeof(*graph));
105 372ccdbb 2018-06-10 stsp if (graph == NULL)
106 372ccdbb 2018-06-10 stsp return NULL;
108 31cedeaf 2018-09-15 stsp graph->path = strdup(path);
109 31cedeaf 2018-09-15 stsp if (graph->path == NULL) {
110 31cedeaf 2018-09-15 stsp free(graph);
111 31cedeaf 2018-09-15 stsp return NULL;
114 60f2eee1 2018-07-08 stsp graph->node_ids = got_object_idset_alloc();
115 372ccdbb 2018-06-10 stsp if (graph->node_ids == NULL) {
116 31cedeaf 2018-09-15 stsp free(graph->path);
117 372ccdbb 2018-06-10 stsp free(graph);
118 372ccdbb 2018-06-10 stsp return NULL;
121 60f2eee1 2018-07-08 stsp graph->open_branches = got_object_idset_alloc();
122 372ccdbb 2018-06-10 stsp if (graph->open_branches == NULL) {
123 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
124 31cedeaf 2018-09-15 stsp free(graph->path);
125 372ccdbb 2018-06-10 stsp free(graph);
126 372ccdbb 2018-06-10 stsp return NULL;
129 31920504 2018-06-11 stsp TAILQ_INIT(&graph->iter_list);
130 372ccdbb 2018-06-10 stsp return graph;
133 31cedeaf 2018-09-15 stsp static const struct got_error *
134 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
135 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
136 31cedeaf 2018-09-15 stsp struct got_repository *repo)
138 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
139 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
140 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
141 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
143 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
144 31cedeaf 2018-09-15 stsp *changed = 1;
145 31cedeaf 2018-09-15 stsp return NULL;
148 31cedeaf 2018-09-15 stsp *changed = 0;
150 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
151 31cedeaf 2018-09-15 stsp if (pid == NULL) {
152 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
153 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
155 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
156 fd1d2703 2018-11-04 stsp err = NULL;
158 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
159 31cedeaf 2018-09-15 stsp free(obj_id);
160 0e9101d5 2018-11-18 stsp return err;
163 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
165 0e9101d5 2018-11-18 stsp return err;
167 0e9101d5 2018-11-18 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
171 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
175 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
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 73026088 2018-11-18 stsp if (next && node->timestamp >= next->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 9b88e78c 2018-11-18 stsp if (got_object_idset_get(graph->open_branches, qid->id))
264 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
265 bee6b577 2018-09-19 stsp graph->path);
267 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
268 bee6b577 2018-09-19 stsp branches_differ = 1;
271 6dcdad08 2018-11-18 stsp free(merged_id);
272 6dcdad08 2018-11-18 stsp free(prev_id);
273 bee6b577 2018-09-19 stsp return err;
276 bee6b577 2018-09-19 stsp if (prev_id) {
277 bee6b577 2018-09-19 stsp if (!branches_differ &&
278 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
279 bee6b577 2018-09-19 stsp branches_differ = 1;
280 6dcdad08 2018-11-18 stsp free(prev_id);
282 6dcdad08 2018-11-18 stsp prev_id = id;
285 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
286 bee6b577 2018-09-19 stsp * skip any other branches.
288 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
289 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
290 b36429ab 2018-11-05 stsp qid->id, node);
291 6dcdad08 2018-11-18 stsp free(merged_id);
293 b36429ab 2018-11-05 stsp return err;
297 6dcdad08 2018-11-18 stsp free(prev_id);
298 6dcdad08 2018-11-18 stsp prev_id = NULL;
299 6dcdad08 2018-11-18 stsp free(merged_id);
300 6dcdad08 2018-11-18 stsp merged_id = NULL;
303 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
304 bee6b577 2018-09-19 stsp * follow the first parent only.
306 bee6b577 2018-09-19 stsp if (!branches_differ) {
307 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
308 bee6b577 2018-09-19 stsp if (qid == NULL)
309 bee6b577 2018-09-19 stsp return NULL;
310 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
311 b36429ab 2018-11-05 stsp return NULL;
312 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
313 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
314 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
315 b36429ab 2018-11-05 stsp qid->id, node);
319 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
320 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
322 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
323 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
324 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
326 0ed6ed4c 2018-06-13 stsp return err;
329 b43fbaa0 2018-06-11 stsp return NULL;
332 b43fbaa0 2018-06-11 stsp static const struct got_error *
333 649fc316 2018-11-05 stsp add_node(struct got_commit_graph_node **new_node, int *changed,
334 1bf85b22 2018-11-07 stsp int *branch_done, struct got_commit_graph *graph,
335 1bf85b22 2018-11-07 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
336 1bf85b22 2018-11-07 stsp struct got_commit_graph_node *child_node, struct got_repository *repo)
338 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
339 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
341 372ccdbb 2018-06-10 stsp *new_node = NULL;
342 649fc316 2018-11-05 stsp *changed = 0;
343 1bf85b22 2018-11-07 stsp *branch_done = 0;
345 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
346 372ccdbb 2018-06-10 stsp if (node == NULL)
347 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
349 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
350 73026088 2018-11-18 stsp node->timestamp = commit->committer_time;
352 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->node_ids, &node->id, node);
354 7a62478b 2018-11-18 stsp free(node);
355 372ccdbb 2018-06-10 stsp return err;
358 649fc316 2018-11-05 stsp err = detect_changed_path(changed, commit, commit_id, graph->path,
361 31cedeaf 2018-09-15 stsp if (err->code == GOT_ERR_NO_OBJ) {
363 31cedeaf 2018-09-15 stsp * History of the path stops here on the current
364 31cedeaf 2018-09-15 stsp * branch. Keep going on other branches.
366 31cedeaf 2018-09-15 stsp err = NULL;
367 1bf85b22 2018-11-07 stsp *branch_done = 1;
369 45f209d7 2018-11-18 stsp got_object_idset_remove(NULL, graph->node_ids,
370 45f209d7 2018-11-18 stsp &node->id);
371 7a62478b 2018-11-18 stsp free(node);
372 31cedeaf 2018-09-15 stsp return err;
376 ce95c694 2018-11-18 stsp if (*changed)
377 ce95c694 2018-11-18 stsp add_node_to_iter_list(graph, node, child_node);
378 ce95c694 2018-11-18 stsp *new_node = node;
379 ce95c694 2018-11-18 stsp return NULL;
382 c4d7a9c4 2018-06-11 stsp const struct got_error *
383 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
384 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
385 31cedeaf 2018-09-15 stsp int first_parent_traversal, struct got_repository *repo)
387 c4d7a9c4 2018-06-11 stsp const struct got_error *err = NULL;
388 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
389 1bf85b22 2018-11-07 stsp int changed, branch_done;
391 c4d7a9c4 2018-06-11 stsp *graph = NULL;
393 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
395 372ccdbb 2018-06-10 stsp return err;
397 31cedeaf 2018-09-15 stsp /* The path must exist in our initial commit. */
398 31cedeaf 2018-09-15 stsp if (!got_path_is_root_dir(path)) {
399 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
400 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
402 31cedeaf 2018-09-15 stsp return err;
403 31cedeaf 2018-09-15 stsp free(obj_id);
406 31cedeaf 2018-09-15 stsp *graph = alloc_graph(path);
407 372ccdbb 2018-06-10 stsp if (*graph == NULL) {
408 202329ae 2019-08-11 stsp err = got_error_from_errno("alloc_graph");
409 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
410 202329ae 2019-08-11 stsp return err;
413 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
414 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
416 1bf85b22 2018-11-07 stsp err = add_node(&(*graph)->head_node, &changed, &branch_done, *graph,
417 1bf85b22 2018-11-07 stsp commit_id, commit, NULL, repo);
418 1bf85b22 2018-11-07 stsp if (err == NULL) {
419 1bf85b22 2018-11-07 stsp err = advance_branch(*graph, (*graph)->head_node, commit_id,
420 1bf85b22 2018-11-07 stsp commit, repo);
422 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
424 372ccdbb 2018-06-10 stsp got_commit_graph_close(*graph);
425 372ccdbb 2018-06-10 stsp *graph = NULL;
426 372ccdbb 2018-06-10 stsp return err;
429 372ccdbb 2018-06-10 stsp return NULL;
432 32777563 2018-11-07 stsp struct add_branch_tip_arg {
433 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
435 32777563 2018-11-07 stsp struct got_repository *repo;
436 32777563 2018-11-07 stsp struct got_commit_graph *graph;
439 cb103d04 2018-11-07 stsp static const struct got_error *
440 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
442 32777563 2018-11-07 stsp const struct got_error *err;
443 32777563 2018-11-07 stsp struct got_commit_graph_node *child_node = data;
444 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
445 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
446 32777563 2018-11-07 stsp struct got_commit_object *commit;
447 32777563 2018-11-07 stsp int changed, branch_done;
449 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
451 32777563 2018-11-07 stsp return err;
453 32777563 2018-11-07 stsp err = add_node(&new_node, &changed, &branch_done, a->graph,
454 32777563 2018-11-07 stsp commit_id, commit, child_node, a->repo);
456 32777563 2018-11-07 stsp return err;
458 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
459 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
460 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
461 32777563 2018-11-07 stsp a->tips[a->ntips].changed = changed;
462 32777563 2018-11-07 stsp a->tips[a->ntips].branch_done = branch_done;
463 b565f6f8 2018-07-23 stsp a->ntips++;
465 cb103d04 2018-11-07 stsp return NULL;
468 1142eae9 2018-06-11 stsp static const struct got_error *
469 32777563 2018-11-07 stsp fetch_commits_from_open_branches(int *nfetched,
470 31cedeaf 2018-09-15 stsp struct got_object_id **changed_id, struct got_commit_graph *graph,
471 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
473 372ccdbb 2018-06-10 stsp const struct got_error *err;
474 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
475 32777563 2018-11-07 stsp int i, ntips;
477 32777563 2018-11-07 stsp *nfetched = 0;
478 818c7501 2019-07-11 stsp if (changed_id)
479 818c7501 2019-07-11 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 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
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 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
511 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
516 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
517 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
518 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
519 32777563 2018-11-07 stsp branch_done = arg.tips[i].branch_done;
520 32777563 2018-11-07 stsp changed = arg.tips[i].changed;
522 1bf85b22 2018-11-07 stsp if (branch_done)
523 1bf85b22 2018-11-07 stsp err = close_branch(graph, commit_id);
525 1bf85b22 2018-11-07 stsp err = advance_branch(graph, new_node, commit_id,
526 1bf85b22 2018-11-07 stsp commit, repo);
529 818c7501 2019-07-11 stsp if (changed && changed_id && *changed_id == NULL)
530 32777563 2018-11-07 stsp *changed_id = commit_id;
533 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
534 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
535 32777563 2018-11-07 stsp (*nfetched) = arg.ntips;
536 372ccdbb 2018-06-10 stsp return err;
539 372ccdbb 2018-06-10 stsp const struct got_error *
540 31cedeaf 2018-09-15 stsp got_commit_graph_fetch_commits(struct got_commit_graph *graph, int limit,
541 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
543 372ccdbb 2018-06-10 stsp const struct got_error *err;
544 31cedeaf 2018-09-15 stsp int nfetched = 0, ncommits;
545 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
547 31cedeaf 2018-09-15 stsp while (nfetched < limit) {
548 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
549 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
551 6fb7cd11 2019-08-22 stsp return err;
553 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
554 6fb7cd11 2019-08-22 stsp &changed_id, graph, repo, cancel_cb, cancel_arg);
556 372ccdbb 2018-06-10 stsp return err;
557 372ccdbb 2018-06-10 stsp if (ncommits == 0)
559 31cedeaf 2018-09-15 stsp if (changed_id)
560 31cedeaf 2018-09-15 stsp nfetched += ncommits;
563 372ccdbb 2018-06-10 stsp return NULL;
566 cb103d04 2018-11-07 stsp static const struct got_error *
567 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
569 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
570 7a62478b 2018-11-18 stsp free(node);
571 cb103d04 2018-11-07 stsp return NULL;
575 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
577 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->open_branches);
578 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
579 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
580 b565f6f8 2018-07-23 stsp free(graph->tips);
581 31cedeaf 2018-09-15 stsp free(graph->path);
582 372ccdbb 2018-06-10 stsp free(graph);
585 372ccdbb 2018-06-10 stsp const struct got_error *
586 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
587 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
588 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
590 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
591 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
592 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
593 31cedeaf 2018-09-15 stsp int changed;
595 372ccdbb 2018-06-10 stsp start_node = got_object_idset_get(graph->node_ids, id);
596 818c7501 2019-07-11 stsp while (start_node == NULL) {
597 818c7501 2019-07-11 stsp int ncommits;
598 818c7501 2019-07-11 stsp err = fetch_commits_from_open_branches(&ncommits, NULL, graph,
599 6fb7cd11 2019-08-22 stsp repo, cancel_cb, cancel_arg);
601 818c7501 2019-07-11 stsp return err;
602 818c7501 2019-07-11 stsp if (ncommits == 0)
603 818c7501 2019-07-11 stsp return got_error_no_obj(id);
604 818c7501 2019-07-11 stsp start_node = got_object_idset_get(graph->node_ids, id);
607 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, &start_node->id);
609 31cedeaf 2018-09-15 stsp return err;
611 31cedeaf 2018-09-15 stsp err = detect_changed_path(&changed, commit, &start_node->id,
612 31cedeaf 2018-09-15 stsp graph->path, repo);
614 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
615 31cedeaf 2018-09-15 stsp return err;
618 31cedeaf 2018-09-15 stsp if (!changed) {
619 31cedeaf 2018-09-15 stsp /* Locate first commit which changed graph->path. */
620 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
621 31cedeaf 2018-09-15 stsp while (changed_id == NULL) {
622 31cedeaf 2018-09-15 stsp int ncommits;
623 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
624 6fb7cd11 2019-08-22 stsp &changed_id, graph, repo, cancel_cb, cancel_arg);
626 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
627 31cedeaf 2018-09-15 stsp return err;
630 31cedeaf 2018-09-15 stsp start_node = got_object_idset_get(graph->node_ids, changed_id);
632 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
634 372ccdbb 2018-06-10 stsp graph->iter_node = start_node;
635 372ccdbb 2018-06-10 stsp return NULL;
638 372ccdbb 2018-06-10 stsp const struct got_error *
639 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
640 b43fbaa0 2018-06-11 stsp struct got_commit_graph *graph)
642 9ba79e04 2018-06-11 stsp *id = NULL;
644 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
645 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
646 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
649 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
650 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
651 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
652 2c7f8870 2018-09-19 stsp /* We are done iterating. */
653 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
654 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
655 6bc66952 2018-09-19 stsp return NULL;
658 9ba79e04 2018-06-11 stsp if (TAILQ_NEXT(graph->iter_node, entry) == NULL)
659 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_ITER_NEED_MORE);
661 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
662 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
663 372ccdbb 2018-06-10 stsp return NULL;
666 a9833bc9 2019-05-13 stsp const struct got_error *
667 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
668 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
669 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
671 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
672 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
673 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
674 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
676 a9833bc9 2019-05-13 stsp *yca_id = NULL;
678 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
679 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
680 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
682 a9833bc9 2019-05-13 stsp err = got_commit_graph_open(&graph, commit_id, "/", 1, repo);
686 a9833bc9 2019-05-13 stsp err = got_commit_graph_open(&graph2, commit_id2, "/", 1, repo);
690 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
691 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
695 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
696 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
701 a9833bc9 2019-05-13 stsp struct got_object_id *id, *id2;
703 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
704 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
709 a9833bc9 2019-05-13 stsp if (!completed) {
710 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_next(&id, graph);
712 a9833bc9 2019-05-13 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
713 a9833bc9 2019-05-13 stsp completed = 1;
714 a9833bc9 2019-05-13 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
716 a9833bc9 2019-05-13 stsp err = got_commit_graph_fetch_commits(graph, 1,
717 6fb7cd11 2019-08-22 stsp repo, cancel_cb, cancel_arg);
723 a9833bc9 2019-05-13 stsp if (!completed2) {
724 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_next(&id2, graph2);
726 a9833bc9 2019-05-13 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
727 a9833bc9 2019-05-13 stsp completed2 = 1;
728 a9833bc9 2019-05-13 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
730 a9833bc9 2019-05-13 stsp err = got_commit_graph_fetch_commits(graph2, 1,
731 6fb7cd11 2019-08-22 stsp repo, cancel_cb, cancel_arg);
738 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id)) {
739 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
740 a9833bc9 2019-05-13 stsp if (*yca_id)
742 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
746 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id, id);
751 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id2)) {
752 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
753 a9833bc9 2019-05-13 stsp if (*yca_id)
755 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
759 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id2, id2);
764 a9833bc9 2019-05-13 stsp if (completed && completed2) {
765 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
771 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
773 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
774 a9833bc9 2019-05-13 stsp if (graph2)
775 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
776 a9833bc9 2019-05-13 stsp return err;
