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 56e0773d 2019-11-28 stsp #include <limits.h>
23 372ccdbb 2018-06-10 stsp #include <stdio.h>
24 372ccdbb 2018-06-10 stsp #include <stdlib.h>
25 372ccdbb 2018-06-10 stsp #include <string.h>
26 372ccdbb 2018-06-10 stsp #include <sha1.h>
27 372ccdbb 2018-06-10 stsp #include <zlib.h>
28 372ccdbb 2018-06-10 stsp #include <ctype.h>
30 372ccdbb 2018-06-10 stsp #include "got_error.h"
31 372ccdbb 2018-06-10 stsp #include "got_object.h"
32 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
33 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
34 324d37e7 2019-05-11 stsp #include "got_path.h"
36 372ccdbb 2018-06-10 stsp #include "got_lib_delta.h"
37 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
38 372ccdbb 2018-06-10 stsp #include "got_lib_object.h"
39 372ccdbb 2018-06-10 stsp #include "got_lib_object_idset.h"
41 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
42 372ccdbb 2018-06-10 stsp struct got_object_id id;
43 73026088 2018-11-18 stsp time_t timestamp;
45 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
46 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
49 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
51 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip {
52 32777563 2018-11-07 stsp struct got_object_id *commit_id;
53 32777563 2018-11-07 stsp struct got_commit_object *commit;
54 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
55 32777563 2018-11-07 stsp int changed;
56 32777563 2018-11-07 stsp int branch_done;
59 372ccdbb 2018-06-10 stsp struct got_commit_graph {
60 372ccdbb 2018-06-10 stsp /* The set of all commits we have traversed. */
61 372ccdbb 2018-06-10 stsp struct got_object_idset *node_ids;
63 372ccdbb 2018-06-10 stsp /* The commit at which traversal began (youngest commit in node_ids). */
64 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *head_node;
67 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
70 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
71 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
72 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
73 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
74 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
76 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
77 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
78 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
80 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
81 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
82 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
84 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
86 32777563 2018-11-07 stsp /* Array of branch tips for fetch_commits_from_open_branches(). */
87 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
90 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
93 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
94 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
96 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
97 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
100 372ccdbb 2018-06-10 stsp static struct got_commit_graph *
101 31cedeaf 2018-09-15 stsp alloc_graph(const char *path)
103 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
105 372ccdbb 2018-06-10 stsp graph = calloc(1, sizeof(*graph));
106 372ccdbb 2018-06-10 stsp if (graph == NULL)
107 372ccdbb 2018-06-10 stsp return NULL;
109 31cedeaf 2018-09-15 stsp graph->path = strdup(path);
110 31cedeaf 2018-09-15 stsp if (graph->path == NULL) {
111 31cedeaf 2018-09-15 stsp free(graph);
112 31cedeaf 2018-09-15 stsp return NULL;
115 60f2eee1 2018-07-08 stsp graph->node_ids = got_object_idset_alloc();
116 372ccdbb 2018-06-10 stsp if (graph->node_ids == NULL) {
117 31cedeaf 2018-09-15 stsp free(graph->path);
118 372ccdbb 2018-06-10 stsp free(graph);
119 372ccdbb 2018-06-10 stsp return NULL;
122 60f2eee1 2018-07-08 stsp graph->open_branches = got_object_idset_alloc();
123 372ccdbb 2018-06-10 stsp if (graph->open_branches == NULL) {
124 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
125 31cedeaf 2018-09-15 stsp free(graph->path);
126 372ccdbb 2018-06-10 stsp free(graph);
127 372ccdbb 2018-06-10 stsp return NULL;
130 31920504 2018-06-11 stsp TAILQ_INIT(&graph->iter_list);
131 372ccdbb 2018-06-10 stsp return graph;
134 31cedeaf 2018-09-15 stsp static const struct got_error *
135 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
136 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
137 31cedeaf 2018-09-15 stsp struct got_repository *repo)
139 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
140 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
141 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
142 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
144 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
145 31cedeaf 2018-09-15 stsp *changed = 1;
146 31cedeaf 2018-09-15 stsp return NULL;
149 31cedeaf 2018-09-15 stsp *changed = 0;
151 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
152 31cedeaf 2018-09-15 stsp if (pid == NULL) {
153 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
154 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
156 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
157 fd1d2703 2018-11-04 stsp err = NULL;
159 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
160 31cedeaf 2018-09-15 stsp free(obj_id);
161 0e9101d5 2018-11-18 stsp return err;
164 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
166 0e9101d5 2018-11-18 stsp return err;
168 0e9101d5 2018-11-18 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
172 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
176 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
179 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
181 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
182 31cedeaf 2018-09-15 stsp if (pcommit)
183 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
184 31cedeaf 2018-09-15 stsp return err;
187 4626e416 2018-06-10 stsp static void
188 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
189 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *node,
190 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *child_node)
192 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
194 31920504 2018-06-11 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
195 bee6b577 2018-09-19 stsp TAILQ_INSERT_HEAD(&graph->iter_list, node, entry);
196 bee6b577 2018-09-19 stsp graph->iter_node = node;
200 bee6b577 2018-09-19 stsp n = graph->iter_node;
201 fe8df4c2 2018-06-16 stsp /* Ensure that an iteration in progress will see this new commit. */
202 bee6b577 2018-09-19 stsp while (n) {
203 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
204 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
205 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
210 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
213 0ed6ed4c 2018-06-13 stsp static const struct got_error *
214 31cedeaf 2018-09-15 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
216 31cedeaf 2018-09-15 stsp const struct got_error *err;
218 31cedeaf 2018-09-15 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
219 31cedeaf 2018-09-15 stsp if (err && err->code != GOT_ERR_NO_OBJ)
220 31cedeaf 2018-09-15 stsp return err;
221 31cedeaf 2018-09-15 stsp return NULL;
224 31cedeaf 2018-09-15 stsp static const struct got_error *
225 31cedeaf 2018-09-15 stsp advance_branch(struct got_commit_graph *graph,
226 0ed6ed4c 2018-06-13 stsp struct got_commit_graph_node *node,
227 41fa1437 2018-11-05 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
228 bee6b577 2018-09-19 stsp struct got_repository *repo)
230 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
231 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
233 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
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 9b88e78c 2018-11-18 stsp if (qid == NULL ||
240 9b88e78c 2018-11-18 stsp got_object_idset_get(graph->open_branches, qid->id))
241 0ed6ed4c 2018-06-13 stsp return NULL;
242 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
243 9b88e78c 2018-11-18 stsp qid->id, node);
247 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
248 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
250 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
251 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
252 bee6b577 2018-09-19 stsp int branches_differ = 0;
254 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
255 bee6b577 2018-09-19 stsp graph->path);
257 bee6b577 2018-09-19 stsp return err;
259 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
260 6dcdad08 2018-11-18 stsp struct got_object_id *id;
262 9b88e78c 2018-11-18 stsp if (got_object_idset_get(graph->open_branches, qid->id))
265 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
266 bee6b577 2018-09-19 stsp graph->path);
268 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
269 bee6b577 2018-09-19 stsp branches_differ = 1;
272 6dcdad08 2018-11-18 stsp free(merged_id);
273 6dcdad08 2018-11-18 stsp free(prev_id);
274 bee6b577 2018-09-19 stsp return err;
277 bee6b577 2018-09-19 stsp if (prev_id) {
278 bee6b577 2018-09-19 stsp if (!branches_differ &&
279 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
280 bee6b577 2018-09-19 stsp branches_differ = 1;
281 6dcdad08 2018-11-18 stsp free(prev_id);
283 6dcdad08 2018-11-18 stsp prev_id = id;
286 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
287 bee6b577 2018-09-19 stsp * skip any other branches.
289 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
290 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
291 b36429ab 2018-11-05 stsp qid->id, node);
292 6dcdad08 2018-11-18 stsp free(merged_id);
294 b36429ab 2018-11-05 stsp return err;
298 6dcdad08 2018-11-18 stsp free(prev_id);
299 6dcdad08 2018-11-18 stsp prev_id = NULL;
300 6dcdad08 2018-11-18 stsp free(merged_id);
301 6dcdad08 2018-11-18 stsp merged_id = NULL;
304 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
305 bee6b577 2018-09-19 stsp * follow the first parent only.
307 bee6b577 2018-09-19 stsp if (!branches_differ) {
308 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
309 bee6b577 2018-09-19 stsp if (qid == NULL)
310 bee6b577 2018-09-19 stsp return NULL;
311 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
312 b36429ab 2018-11-05 stsp return NULL;
313 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
314 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
315 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
316 b36429ab 2018-11-05 stsp qid->id, node);
320 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
321 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
323 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
324 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
325 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
327 0ed6ed4c 2018-06-13 stsp return err;
330 b43fbaa0 2018-06-11 stsp return NULL;
333 b43fbaa0 2018-06-11 stsp static const struct got_error *
334 649fc316 2018-11-05 stsp add_node(struct got_commit_graph_node **new_node, int *changed,
335 1bf85b22 2018-11-07 stsp int *branch_done, struct got_commit_graph *graph,
336 1bf85b22 2018-11-07 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
337 1bf85b22 2018-11-07 stsp struct got_commit_graph_node *child_node, struct got_repository *repo)
339 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
340 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
342 372ccdbb 2018-06-10 stsp *new_node = NULL;
343 649fc316 2018-11-05 stsp *changed = 0;
344 1bf85b22 2018-11-07 stsp *branch_done = 0;
346 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
347 372ccdbb 2018-06-10 stsp if (node == NULL)
348 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
350 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
351 73026088 2018-11-18 stsp node->timestamp = commit->committer_time;
353 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->node_ids, &node->id, node);
355 7a62478b 2018-11-18 stsp free(node);
356 372ccdbb 2018-06-10 stsp return err;
359 649fc316 2018-11-05 stsp err = detect_changed_path(changed, commit, commit_id, graph->path,
362 31cedeaf 2018-09-15 stsp if (err->code == GOT_ERR_NO_OBJ) {
364 31cedeaf 2018-09-15 stsp * History of the path stops here on the current
365 31cedeaf 2018-09-15 stsp * branch. Keep going on other branches.
367 31cedeaf 2018-09-15 stsp err = NULL;
368 1bf85b22 2018-11-07 stsp *branch_done = 1;
370 45f209d7 2018-11-18 stsp got_object_idset_remove(NULL, graph->node_ids,
371 45f209d7 2018-11-18 stsp &node->id);
372 7a62478b 2018-11-18 stsp free(node);
373 31cedeaf 2018-09-15 stsp return err;
377 ce95c694 2018-11-18 stsp if (*changed)
378 ce95c694 2018-11-18 stsp add_node_to_iter_list(graph, node, child_node);
379 ce95c694 2018-11-18 stsp *new_node = node;
380 ce95c694 2018-11-18 stsp return NULL;
383 c4d7a9c4 2018-06-11 stsp const struct got_error *
384 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
385 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
386 31cedeaf 2018-09-15 stsp int first_parent_traversal, struct got_repository *repo)
388 c4d7a9c4 2018-06-11 stsp const struct got_error *err = NULL;
389 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
390 1bf85b22 2018-11-07 stsp int changed, branch_done;
392 c4d7a9c4 2018-06-11 stsp *graph = NULL;
394 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
396 372ccdbb 2018-06-10 stsp return err;
398 31cedeaf 2018-09-15 stsp /* The path must exist in our initial commit. */
399 31cedeaf 2018-09-15 stsp if (!got_path_is_root_dir(path)) {
400 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
401 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
403 31cedeaf 2018-09-15 stsp return err;
404 31cedeaf 2018-09-15 stsp free(obj_id);
407 31cedeaf 2018-09-15 stsp *graph = alloc_graph(path);
408 372ccdbb 2018-06-10 stsp if (*graph == NULL) {
409 202329ae 2019-08-11 stsp err = got_error_from_errno("alloc_graph");
410 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
411 202329ae 2019-08-11 stsp return err;
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 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
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 818c7501 2019-07-11 stsp if (changed_id)
480 818c7501 2019-07-11 stsp *changed_id = NULL;
482 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
483 32777563 2018-11-07 stsp if (ntips == 0)
484 372ccdbb 2018-06-10 stsp return NULL;
486 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
487 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
488 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
489 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
490 5e50c36a 2018-11-08 stsp sizeof(*tips));
491 b565f6f8 2018-07-23 stsp if (tips == NULL)
492 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
493 b565f6f8 2018-07-23 stsp graph->tips = tips;
494 32777563 2018-11-07 stsp graph->ntips = ntips;
496 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
497 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
498 32777563 2018-11-07 stsp arg.repo = repo;
499 32777563 2018-11-07 stsp arg.graph = graph;
500 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
505 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
506 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
507 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
508 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
509 32777563 2018-11-07 stsp int branch_done, changed;
511 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
512 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
517 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
518 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
519 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
520 32777563 2018-11-07 stsp branch_done = arg.tips[i].branch_done;
521 32777563 2018-11-07 stsp changed = arg.tips[i].changed;
523 1bf85b22 2018-11-07 stsp if (branch_done)
524 1bf85b22 2018-11-07 stsp err = close_branch(graph, commit_id);
526 1bf85b22 2018-11-07 stsp err = advance_branch(graph, new_node, commit_id,
527 1bf85b22 2018-11-07 stsp commit, repo);
530 818c7501 2019-07-11 stsp if (changed && changed_id && *changed_id == NULL)
531 32777563 2018-11-07 stsp *changed_id = commit_id;
534 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
535 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
536 32777563 2018-11-07 stsp (*nfetched) = arg.ntips;
537 372ccdbb 2018-06-10 stsp return err;
540 372ccdbb 2018-06-10 stsp const struct got_error *
541 31cedeaf 2018-09-15 stsp got_commit_graph_fetch_commits(struct got_commit_graph *graph, int limit,
542 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
544 372ccdbb 2018-06-10 stsp const struct got_error *err;
545 31cedeaf 2018-09-15 stsp int nfetched = 0, ncommits;
546 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
548 31cedeaf 2018-09-15 stsp while (nfetched < limit) {
549 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
550 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
552 6fb7cd11 2019-08-22 stsp return err;
554 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
555 6fb7cd11 2019-08-22 stsp &changed_id, graph, repo, cancel_cb, cancel_arg);
557 372ccdbb 2018-06-10 stsp return err;
558 372ccdbb 2018-06-10 stsp if (ncommits == 0)
560 31cedeaf 2018-09-15 stsp if (changed_id)
561 31cedeaf 2018-09-15 stsp nfetched += ncommits;
564 372ccdbb 2018-06-10 stsp return NULL;
567 cb103d04 2018-11-07 stsp static const struct got_error *
568 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
570 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
571 7a62478b 2018-11-18 stsp free(node);
572 cb103d04 2018-11-07 stsp return NULL;
576 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
578 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->open_branches);
579 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
580 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
581 b565f6f8 2018-07-23 stsp free(graph->tips);
582 31cedeaf 2018-09-15 stsp free(graph->path);
583 372ccdbb 2018-06-10 stsp free(graph);
586 372ccdbb 2018-06-10 stsp const struct got_error *
587 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
588 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
589 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
591 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
592 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
593 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
594 31cedeaf 2018-09-15 stsp int changed;
596 372ccdbb 2018-06-10 stsp start_node = got_object_idset_get(graph->node_ids, id);
597 818c7501 2019-07-11 stsp while (start_node == NULL) {
598 818c7501 2019-07-11 stsp int ncommits;
599 818c7501 2019-07-11 stsp err = fetch_commits_from_open_branches(&ncommits, NULL, graph,
600 6fb7cd11 2019-08-22 stsp repo, cancel_cb, cancel_arg);
602 818c7501 2019-07-11 stsp return err;
603 818c7501 2019-07-11 stsp if (ncommits == 0)
604 818c7501 2019-07-11 stsp return got_error_no_obj(id);
605 818c7501 2019-07-11 stsp start_node = got_object_idset_get(graph->node_ids, id);
608 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, &start_node->id);
610 31cedeaf 2018-09-15 stsp return err;
612 31cedeaf 2018-09-15 stsp err = detect_changed_path(&changed, commit, &start_node->id,
613 31cedeaf 2018-09-15 stsp graph->path, repo);
615 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
616 31cedeaf 2018-09-15 stsp return err;
619 31cedeaf 2018-09-15 stsp if (!changed) {
620 31cedeaf 2018-09-15 stsp /* Locate first commit which changed graph->path. */
621 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
622 31cedeaf 2018-09-15 stsp while (changed_id == NULL) {
623 31cedeaf 2018-09-15 stsp int ncommits;
624 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
625 6fb7cd11 2019-08-22 stsp &changed_id, graph, repo, cancel_cb, cancel_arg);
627 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
628 31cedeaf 2018-09-15 stsp return err;
631 31cedeaf 2018-09-15 stsp start_node = got_object_idset_get(graph->node_ids, changed_id);
633 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
635 372ccdbb 2018-06-10 stsp graph->iter_node = start_node;
636 372ccdbb 2018-06-10 stsp return NULL;
639 372ccdbb 2018-06-10 stsp const struct got_error *
640 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
641 b43fbaa0 2018-06-11 stsp struct got_commit_graph *graph)
643 9ba79e04 2018-06-11 stsp *id = NULL;
645 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
646 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
647 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
650 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
651 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
652 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
653 2c7f8870 2018-09-19 stsp /* We are done iterating. */
654 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
655 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
656 6bc66952 2018-09-19 stsp return NULL;
659 9ba79e04 2018-06-11 stsp if (TAILQ_NEXT(graph->iter_node, entry) == NULL)
660 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_ITER_NEED_MORE);
662 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
663 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
664 372ccdbb 2018-06-10 stsp return NULL;
667 a9833bc9 2019-05-13 stsp const struct got_error *
668 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
669 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
670 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
672 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
673 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
674 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
675 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
677 a9833bc9 2019-05-13 stsp *yca_id = NULL;
679 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
680 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
681 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
683 a9833bc9 2019-05-13 stsp err = got_commit_graph_open(&graph, commit_id, "/", 1, repo);
687 a9833bc9 2019-05-13 stsp err = got_commit_graph_open(&graph2, commit_id2, "/", 1, repo);
691 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
692 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
696 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
697 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
702 a9833bc9 2019-05-13 stsp struct got_object_id *id, *id2;
704 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
705 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
710 a9833bc9 2019-05-13 stsp if (!completed) {
711 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_next(&id, graph);
713 a9833bc9 2019-05-13 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
714 a9833bc9 2019-05-13 stsp completed = 1;
715 a9833bc9 2019-05-13 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
717 a9833bc9 2019-05-13 stsp err = got_commit_graph_fetch_commits(graph, 1,
718 6fb7cd11 2019-08-22 stsp repo, cancel_cb, cancel_arg);
724 a9833bc9 2019-05-13 stsp if (!completed2) {
725 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_next(&id2, graph2);
727 a9833bc9 2019-05-13 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
728 a9833bc9 2019-05-13 stsp completed2 = 1;
729 a9833bc9 2019-05-13 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
731 a9833bc9 2019-05-13 stsp err = got_commit_graph_fetch_commits(graph2, 1,
732 6fb7cd11 2019-08-22 stsp repo, cancel_cb, cancel_arg);
739 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id)) {
740 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
741 a9833bc9 2019-05-13 stsp if (*yca_id)
743 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
747 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id, id);
752 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id2)) {
753 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
754 a9833bc9 2019-05-13 stsp if (*yca_id)
756 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
760 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id2, id2);
765 a9833bc9 2019-05-13 stsp if (completed && completed2) {
766 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
772 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
774 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
775 a9833bc9 2019-05-13 stsp if (graph2)
776 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
777 a9833bc9 2019-05-13 stsp return err;
