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;
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;
62 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
65 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
66 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
67 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
68 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
69 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
71 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
72 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
73 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
75 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
76 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
77 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
79 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
81 32777563 2018-11-07 stsp /* Array of branch tips for fetch_commits_from_open_branches(). */
82 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
85 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
89 94489f7d 2020-01-04 stsp * Nodes which will be passed to the API user next, sorted by
90 94489f7d 2020-01-04 stsp * commit timestmap.
92 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
95 31cedeaf 2018-09-15 stsp static const struct got_error *
96 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
97 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
98 31cedeaf 2018-09-15 stsp struct got_repository *repo)
100 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
101 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
102 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
103 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
105 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
106 31cedeaf 2018-09-15 stsp *changed = 1;
107 31cedeaf 2018-09-15 stsp return NULL;
110 31cedeaf 2018-09-15 stsp *changed = 0;
112 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
113 31cedeaf 2018-09-15 stsp if (pid == NULL) {
114 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
115 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
117 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
118 fd1d2703 2018-11-04 stsp err = NULL;
120 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
121 31cedeaf 2018-09-15 stsp free(obj_id);
122 0e9101d5 2018-11-18 stsp return err;
125 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
127 0e9101d5 2018-11-18 stsp return err;
129 0e9101d5 2018-11-18 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
133 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
137 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
140 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
142 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
143 31cedeaf 2018-09-15 stsp if (pcommit)
144 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
145 31cedeaf 2018-09-15 stsp return err;
148 4626e416 2018-06-10 stsp static void
149 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
150 de56b2d7 2020-01-04 stsp struct got_commit_graph_node *node)
152 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
154 94489f7d 2020-01-04 stsp n = TAILQ_FIRST(&graph->iter_list);
155 bee6b577 2018-09-19 stsp while (n) {
156 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
157 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
158 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
163 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
166 0ed6ed4c 2018-06-13 stsp static const struct got_error *
167 32c85d2c 2020-01-06 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
169 32c85d2c 2020-01-06 stsp const struct got_error *err;
171 32c85d2c 2020-01-06 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
172 32c85d2c 2020-01-06 stsp if (err && err->code != GOT_ERR_NO_OBJ)
173 32c85d2c 2020-01-06 stsp return err;
174 32c85d2c 2020-01-06 stsp return NULL;
177 32c85d2c 2020-01-06 stsp static const struct got_error *
178 14159a7b 2020-01-04 stsp advance_branch(struct got_commit_graph *graph, struct got_object_id *commit_id,
179 14159a7b 2020-01-04 stsp struct got_commit_object *commit, struct got_repository *repo)
181 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
182 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
184 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
186 32c85d2c 2020-01-06 stsp return err;
188 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
189 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
190 9b88e78c 2018-11-18 stsp if (qid == NULL ||
191 8e291695 2020-01-04 stsp got_object_idset_contains(graph->open_branches, qid->id))
192 0ed6ed4c 2018-06-13 stsp return NULL;
193 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
194 8e291695 2020-01-04 stsp qid->id, NULL);
198 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
199 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
201 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
202 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
203 bee6b577 2018-09-19 stsp int branches_differ = 0;
205 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
206 bee6b577 2018-09-19 stsp graph->path);
208 bee6b577 2018-09-19 stsp return err;
210 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
211 6dcdad08 2018-11-18 stsp struct got_object_id *id;
213 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
217 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
218 bee6b577 2018-09-19 stsp graph->path);
220 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
221 bee6b577 2018-09-19 stsp branches_differ = 1;
224 6dcdad08 2018-11-18 stsp free(merged_id);
225 6dcdad08 2018-11-18 stsp free(prev_id);
226 bee6b577 2018-09-19 stsp return err;
229 bee6b577 2018-09-19 stsp if (prev_id) {
230 bee6b577 2018-09-19 stsp if (!branches_differ &&
231 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
232 bee6b577 2018-09-19 stsp branches_differ = 1;
233 6dcdad08 2018-11-18 stsp free(prev_id);
235 6dcdad08 2018-11-18 stsp prev_id = id;
238 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
239 bee6b577 2018-09-19 stsp * skip any other branches.
241 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
242 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
243 8e291695 2020-01-04 stsp qid->id, NULL);
244 6dcdad08 2018-11-18 stsp free(merged_id);
246 b36429ab 2018-11-05 stsp return err;
250 6dcdad08 2018-11-18 stsp free(prev_id);
251 6dcdad08 2018-11-18 stsp prev_id = NULL;
252 6dcdad08 2018-11-18 stsp free(merged_id);
253 6dcdad08 2018-11-18 stsp merged_id = NULL;
256 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
257 bee6b577 2018-09-19 stsp * follow the first parent only.
259 bee6b577 2018-09-19 stsp if (!branches_differ) {
260 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
261 bee6b577 2018-09-19 stsp if (qid == NULL)
262 bee6b577 2018-09-19 stsp return NULL;
263 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
265 b36429ab 2018-11-05 stsp return NULL;
266 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids,
268 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
269 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
270 8e291695 2020-01-04 stsp qid->id, NULL);
274 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
275 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches, qid->id))
277 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids, qid->id))
278 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
279 8e291695 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, qid->id, NULL);
281 0ed6ed4c 2018-06-13 stsp return err;
284 b43fbaa0 2018-06-11 stsp return NULL;
287 b43fbaa0 2018-06-11 stsp static const struct got_error *
288 de56b2d7 2020-01-04 stsp add_node(struct got_commit_graph_node **new_node,
289 de56b2d7 2020-01-04 stsp struct got_commit_graph *graph,
290 de56b2d7 2020-01-04 stsp struct got_object_id *commit_id,
291 de56b2d7 2020-01-04 stsp struct got_commit_object *commit,
292 de56b2d7 2020-01-04 stsp struct got_repository *repo)
294 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
295 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
297 372ccdbb 2018-06-10 stsp *new_node = NULL;
299 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
300 372ccdbb 2018-06-10 stsp if (node == NULL)
301 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
303 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
304 73026088 2018-11-18 stsp node->timestamp = commit->committer_time;
306 8e291695 2020-01-04 stsp err = got_object_idset_add(graph->node_ids, &node->id, NULL);
308 7a62478b 2018-11-18 stsp free(node);
310 de56b2d7 2020-01-04 stsp *new_node = node;
311 de56b2d7 2020-01-04 stsp return err;
314 de56b2d7 2020-01-04 stsp const struct got_error *
315 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
316 3d509237 2020-01-04 stsp const char *path, int first_parent_traversal)
318 22220781 2020-01-04 stsp const struct got_error *err = NULL;
320 3ddcebf3 2020-01-04 stsp *graph = calloc(1, sizeof(**graph));
321 3d509237 2020-01-04 stsp if (*graph == NULL)
322 3ddcebf3 2020-01-04 stsp return got_error_from_errno("calloc");
324 88cdb9c6 2020-01-04 stsp TAILQ_INIT(&(*graph)->iter_list);
326 3ddcebf3 2020-01-04 stsp (*graph)->path = strdup(path);
327 3ddcebf3 2020-01-04 stsp if ((*graph)->path == NULL) {
328 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("strdup");
332 3ddcebf3 2020-01-04 stsp (*graph)->node_ids = got_object_idset_alloc();
333 3ddcebf3 2020-01-04 stsp if ((*graph)->node_ids == NULL) {
334 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
338 3ddcebf3 2020-01-04 stsp (*graph)->open_branches = got_object_idset_alloc();
339 3ddcebf3 2020-01-04 stsp if ((*graph)->open_branches == NULL) {
340 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
344 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
345 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
348 22220781 2020-01-04 stsp got_commit_graph_close(*graph);
349 22220781 2020-01-04 stsp *graph = NULL;
351 22220781 2020-01-04 stsp return err;
354 32777563 2018-11-07 stsp struct add_branch_tip_arg {
355 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
357 32777563 2018-11-07 stsp struct got_repository *repo;
358 32777563 2018-11-07 stsp struct got_commit_graph *graph;
361 cb103d04 2018-11-07 stsp static const struct got_error *
362 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
364 32777563 2018-11-07 stsp const struct got_error *err;
365 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
366 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
367 32777563 2018-11-07 stsp struct got_commit_object *commit;
369 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
371 32777563 2018-11-07 stsp return err;
373 de56b2d7 2020-01-04 stsp err = add_node(&new_node, a->graph, commit_id, commit, a->repo);
375 32777563 2018-11-07 stsp return err;
377 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
378 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
379 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
380 b565f6f8 2018-07-23 stsp a->ntips++;
382 cb103d04 2018-11-07 stsp return NULL;
385 1142eae9 2018-06-11 stsp static const struct got_error *
386 57eecd46 2020-01-04 stsp fetch_commits_from_open_branches(struct got_commit_graph *graph,
387 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
389 372ccdbb 2018-06-10 stsp const struct got_error *err;
390 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
391 32777563 2018-11-07 stsp int i, ntips;
393 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
394 32777563 2018-11-07 stsp if (ntips == 0)
395 372ccdbb 2018-06-10 stsp return NULL;
397 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
398 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
399 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
400 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
401 5e50c36a 2018-11-08 stsp sizeof(*tips));
402 b565f6f8 2018-07-23 stsp if (tips == NULL)
403 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
404 b565f6f8 2018-07-23 stsp graph->tips = tips;
405 32777563 2018-11-07 stsp graph->ntips = ntips;
407 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
408 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
409 32777563 2018-11-07 stsp arg.repo = repo;
410 32777563 2018-11-07 stsp arg.graph = graph;
411 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
416 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
417 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
418 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
419 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
420 13a851c1 2020-01-04 stsp int changed;
422 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
423 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
428 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
429 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
430 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
432 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, commit_id,
433 13a851c1 2020-01-04 stsp graph->path, repo);
435 13a851c1 2020-01-04 stsp if (err->code != GOT_ERR_NO_OBJ)
438 13a851c1 2020-01-04 stsp * History of the path stops here on the current
439 13a851c1 2020-01-04 stsp * branch. Keep going on other branches.
441 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
446 57eecd46 2020-01-04 stsp if (changed)
447 de56b2d7 2020-01-04 stsp add_node_to_iter_list(graph, new_node);
448 14159a7b 2020-01-04 stsp err = advance_branch(graph, commit_id, commit, repo);
453 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
454 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
455 372ccdbb 2018-06-10 stsp return err;
459 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
461 22220781 2020-01-04 stsp if (graph->open_branches)
462 22220781 2020-01-04 stsp got_object_idset_free(graph->open_branches);
463 22220781 2020-01-04 stsp if (graph->node_ids)
464 22220781 2020-01-04 stsp got_object_idset_free(graph->node_ids);
465 b565f6f8 2018-07-23 stsp free(graph->tips);
466 31cedeaf 2018-09-15 stsp free(graph->path);
467 372ccdbb 2018-06-10 stsp free(graph);
470 372ccdbb 2018-06-10 stsp const struct got_error *
471 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
472 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
473 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
475 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
477 3d509237 2020-01-04 stsp if (!TAILQ_EMPTY(&graph->iter_list))
478 3d509237 2020-01-04 stsp return got_error(GOT_ERR_ITER_BUSY);
480 3ff3126d 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, id, NULL);
482 7e33c8c5 2020-01-04 stsp return err;
484 3ff3126d 2020-01-04 stsp /* Locate first commit which changed graph->path. */
485 94489f7d 2020-01-04 stsp while (TAILQ_EMPTY(&graph->iter_list) &&
486 3ff3126d 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
487 3ff3126d 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
488 3ff3126d 2020-01-04 stsp cancel_cb, cancel_arg);
490 7e33c8c5 2020-01-04 stsp return err;
493 94489f7d 2020-01-04 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
494 5175b31a 2020-01-04 stsp const char *path;
495 5175b31a 2020-01-04 stsp if (got_path_is_root_dir(graph->path))
496 5175b31a 2020-01-04 stsp return got_error_no_obj(id);
497 5175b31a 2020-01-04 stsp path = graph->path;
498 5175b31a 2020-01-04 stsp while (path[0] == '/')
500 5175b31a 2020-01-04 stsp return got_error_path(path, GOT_ERR_NO_TREE_ENTRY);
503 7e33c8c5 2020-01-04 stsp return NULL;
506 372ccdbb 2018-06-10 stsp const struct got_error *
507 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
508 ee780d5c 2020-01-04 stsp struct got_commit_graph *graph, struct got_repository *repo,
509 ee780d5c 2020-01-04 stsp got_cancel_cb cancel_cb, void *cancel_arg)
511 ee780d5c 2020-01-04 stsp const struct got_error *err = NULL;
512 94489f7d 2020-01-04 stsp struct got_commit_graph_node *node;
514 9ba79e04 2018-06-11 stsp *id = NULL;
516 df8cd9c6 2020-01-05 stsp node = TAILQ_FIRST(&graph->iter_list);
517 df8cd9c6 2020-01-05 stsp if (node == NULL) {
518 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
519 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
522 94489f7d 2020-01-04 stsp while (TAILQ_NEXT(node, entry) == NULL &&
523 ee780d5c 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
524 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
525 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
527 ee780d5c 2020-01-04 stsp return err;
530 94489f7d 2020-01-04 stsp *id = &node->id;
531 94489f7d 2020-01-04 stsp TAILQ_REMOVE(&graph->iter_list, node, entry);
532 372ccdbb 2018-06-10 stsp return NULL;
535 a9833bc9 2019-05-13 stsp const struct got_error *
536 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
537 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
538 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
540 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
541 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
542 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
543 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
545 a9833bc9 2019-05-13 stsp *yca_id = NULL;
547 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
548 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
549 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
551 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
555 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph2, "/", 1);
559 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
560 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
564 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
565 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
570 ee780d5c 2020-01-04 stsp struct got_object_id *id = NULL, *id2 = NULL;
572 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
573 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
578 a9833bc9 2019-05-13 stsp if (!completed) {
579 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
580 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
582 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
584 ee780d5c 2020-01-04 stsp err = NULL;
585 ee780d5c 2020-01-04 stsp completed = 1;
589 a9833bc9 2019-05-13 stsp if (!completed2) {
590 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id2, graph2, repo,
591 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
593 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
595 ee780d5c 2020-01-04 stsp err = NULL;
596 ee780d5c 2020-01-04 stsp completed2 = 1;
601 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id)) {
602 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
603 a9833bc9 2019-05-13 stsp if (*yca_id)
605 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
609 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id, NULL);
614 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id2)) {
615 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
616 a9833bc9 2019-05-13 stsp if (*yca_id)
618 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
622 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id2, NULL);
627 a9833bc9 2019-05-13 stsp if (completed && completed2) {
628 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
634 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
636 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
637 a9833bc9 2019-05-13 stsp if (graph2)
638 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
639 a9833bc9 2019-05-13 stsp return err;