2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 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;
44 ca6e02ac 2020-01-07 stsp /* Used only during iteration. */
45 ca6e02ac 2020-01-07 stsp time_t timestamp;
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 e15c42de 2022-09-05 op * Temporary storage for the id returned by
96 e15c42de 2022-09-05 op * got_commit_graph_iter_next.
98 e15c42de 2022-09-05 op struct got_object_id id;
101 31cedeaf 2018-09-15 stsp static const struct got_error *
102 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
103 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
104 31cedeaf 2018-09-15 stsp struct got_repository *repo)
106 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
107 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
108 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
109 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
111 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
112 31cedeaf 2018-09-15 stsp *changed = 1;
113 31cedeaf 2018-09-15 stsp return NULL;
116 31cedeaf 2018-09-15 stsp *changed = 0;
118 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(&commit->parent_ids);
119 31cedeaf 2018-09-15 stsp if (pid == NULL) {
120 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
121 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&obj_id, repo, commit, path);
123 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
124 fd1d2703 2018-11-04 stsp err = NULL;
126 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
127 31cedeaf 2018-09-15 stsp free(obj_id);
128 0e9101d5 2018-11-18 stsp return err;
131 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
133 0e9101d5 2018-11-18 stsp return err;
135 d7b5a0e8 2022-04-20 stsp err = got_object_open_as_commit(&pcommit, repo, &pid->id);
139 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
143 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
146 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
148 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
149 31cedeaf 2018-09-15 stsp if (pcommit)
150 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
151 31cedeaf 2018-09-15 stsp return err;
154 4626e416 2018-06-10 stsp static void
155 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
156 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node, time_t committer_time)
158 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
160 ca6e02ac 2020-01-07 stsp node->timestamp = committer_time;
162 94489f7d 2020-01-04 stsp n = TAILQ_FIRST(&graph->iter_list);
163 bee6b577 2018-09-19 stsp while (n) {
164 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
165 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
166 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
171 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
174 0ed6ed4c 2018-06-13 stsp static const struct got_error *
175 ca6e02ac 2020-01-07 stsp add_node(struct got_commit_graph_node **new_node,
176 ca6e02ac 2020-01-07 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
177 ca6e02ac 2020-01-07 stsp struct got_repository *repo)
179 ca6e02ac 2020-01-07 stsp const struct got_error *err = NULL;
180 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node;
182 ca6e02ac 2020-01-07 stsp *new_node = NULL;
184 ca6e02ac 2020-01-07 stsp node = calloc(1, sizeof(*node));
185 ca6e02ac 2020-01-07 stsp if (node == NULL)
186 ca6e02ac 2020-01-07 stsp return got_error_from_errno("calloc");
188 ca6e02ac 2020-01-07 stsp memcpy(&node->id, commit_id, sizeof(node->id));
189 ca6e02ac 2020-01-07 stsp err = got_object_idset_add(graph->node_ids, &node->id, NULL);
191 ca6e02ac 2020-01-07 stsp free(node);
193 ca6e02ac 2020-01-07 stsp *new_node = node;
194 ca6e02ac 2020-01-07 stsp return err;
198 ca6e02ac 2020-01-07 stsp * Ask got-read-pack to traverse first-parent history until a commit is
199 ca6e02ac 2020-01-07 stsp * encountered which modified graph->path, or until the pack file runs
200 ca6e02ac 2020-01-07 stsp * out of relevant commits. This is faster than sending an individual
201 ca6e02ac 2020-01-07 stsp * request for each commit stored in the pack file.
203 ca6e02ac 2020-01-07 stsp static const struct got_error *
204 ca6e02ac 2020-01-07 stsp packed_first_parent_traversal(int *ncommits_traversed,
205 ca6e02ac 2020-01-07 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
206 ca6e02ac 2020-01-07 stsp struct got_repository *repo)
208 ca6e02ac 2020-01-07 stsp const struct got_error *err = NULL;
209 ca6e02ac 2020-01-07 stsp struct got_object_id_queue traversed_commits;
210 ca6e02ac 2020-01-07 stsp struct got_object_qid *qid;
212 dbdddfee 2021-06-23 naddy STAILQ_INIT(&traversed_commits);
213 ca6e02ac 2020-01-07 stsp *ncommits_traversed = 0;
215 ca6e02ac 2020-01-07 stsp err = got_traverse_packed_commits(&traversed_commits,
216 ca6e02ac 2020-01-07 stsp commit_id, graph->path, repo);
218 ca6e02ac 2020-01-07 stsp return err;
220 ca6e02ac 2020-01-07 stsp /* Add all traversed commits to the graph... */
221 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &traversed_commits, entry) {
222 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->open_branches, &qid->id))
224 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->node_ids, &qid->id))
227 ca6e02ac 2020-01-07 stsp (*ncommits_traversed)++;
229 ca6e02ac 2020-01-07 stsp /* ... except the last commit is the new branch tip. */
230 dbdddfee 2021-06-23 naddy if (STAILQ_NEXT(qid, entry) == NULL) {
231 ca6e02ac 2020-01-07 stsp err = got_object_idset_add(graph->open_branches,
232 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
236 932b646a 2022-09-05 stsp err = got_object_idset_add(graph->node_ids, &qid->id, NULL);
241 ca6e02ac 2020-01-07 stsp got_object_id_queue_free(&traversed_commits);
242 ca6e02ac 2020-01-07 stsp return err;
245 ca6e02ac 2020-01-07 stsp static const struct got_error *
246 32c85d2c 2020-01-06 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
248 32c85d2c 2020-01-06 stsp const struct got_error *err;
250 32c85d2c 2020-01-06 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
251 32c85d2c 2020-01-06 stsp if (err && err->code != GOT_ERR_NO_OBJ)
252 32c85d2c 2020-01-06 stsp return err;
253 32c85d2c 2020-01-06 stsp return NULL;
256 32c85d2c 2020-01-06 stsp static const struct got_error *
257 14159a7b 2020-01-04 stsp advance_branch(struct got_commit_graph *graph, struct got_object_id *commit_id,
258 14159a7b 2020-01-04 stsp struct got_commit_object *commit, struct got_repository *repo)
260 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
261 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
263 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
265 32c85d2c 2020-01-06 stsp return err;
267 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
268 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&commit->parent_ids);
269 9b88e78c 2018-11-18 stsp if (qid == NULL ||
270 d7b5a0e8 2022-04-20 stsp got_object_idset_contains(graph->open_branches, &qid->id))
271 0ed6ed4c 2018-06-13 stsp return NULL;
273 ca6e02ac 2020-01-07 stsp * The root directory always changes by definition, and when
274 ca6e02ac 2020-01-07 stsp * logging the root we want to traverse consecutive commits
275 ca6e02ac 2020-01-07 stsp * even if they point at the same tree.
276 ca6e02ac 2020-01-07 stsp * But if we are looking for a specific path then we can avoid
277 ca6e02ac 2020-01-07 stsp * fetching packed commits which did not modify the path and
278 ca6e02ac 2020-01-07 stsp * only fetch their IDs. This speeds up 'got blame'.
280 ca6e02ac 2020-01-07 stsp if (!got_path_is_root_dir(graph->path) &&
281 ca6e02ac 2020-01-07 stsp (commit->flags & GOT_COMMIT_FLAG_PACKED)) {
282 ca6e02ac 2020-01-07 stsp int ncommits = 0;
283 ca6e02ac 2020-01-07 stsp err = packed_first_parent_traversal(&ncommits,
284 d7b5a0e8 2022-04-20 stsp graph, &qid->id, repo);
285 ca6e02ac 2020-01-07 stsp if (err || ncommits > 0)
286 ca6e02ac 2020-01-07 stsp return err;
288 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
289 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
293 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
294 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
296 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
297 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
298 bee6b577 2018-09-19 stsp int branches_differ = 0;
300 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&merged_id, repo, commit,
301 bee6b577 2018-09-19 stsp graph->path);
303 bee6b577 2018-09-19 stsp return err;
305 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
306 a44927cc 2022-04-07 stsp struct got_object_id *id = NULL;
307 a44927cc 2022-04-07 stsp struct got_commit_object *pcommit = NULL;
309 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
313 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&pcommit, repo,
316 a44927cc 2022-04-07 stsp free(merged_id);
317 a44927cc 2022-04-07 stsp free(prev_id);
318 a44927cc 2022-04-07 stsp return err;
320 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, pcommit,
321 bee6b577 2018-09-19 stsp graph->path);
322 a44927cc 2022-04-07 stsp got_object_commit_close(pcommit);
323 a44927cc 2022-04-07 stsp pcommit = NULL;
325 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
326 bee6b577 2018-09-19 stsp branches_differ = 1;
329 6dcdad08 2018-11-18 stsp free(merged_id);
330 6dcdad08 2018-11-18 stsp free(prev_id);
331 bee6b577 2018-09-19 stsp return err;
334 bee6b577 2018-09-19 stsp if (prev_id) {
335 bee6b577 2018-09-19 stsp if (!branches_differ &&
336 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
337 bee6b577 2018-09-19 stsp branches_differ = 1;
338 6dcdad08 2018-11-18 stsp free(prev_id);
340 6dcdad08 2018-11-18 stsp prev_id = id;
343 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
344 bee6b577 2018-09-19 stsp * skip any other branches.
346 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
347 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
348 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
349 6dcdad08 2018-11-18 stsp free(merged_id);
351 b36429ab 2018-11-05 stsp return err;
355 6dcdad08 2018-11-18 stsp free(prev_id);
356 6dcdad08 2018-11-18 stsp prev_id = NULL;
357 6dcdad08 2018-11-18 stsp free(merged_id);
358 6dcdad08 2018-11-18 stsp merged_id = NULL;
361 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
362 bee6b577 2018-09-19 stsp * follow the first parent only.
364 bee6b577 2018-09-19 stsp if (!branches_differ) {
365 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&commit->parent_ids);
366 bee6b577 2018-09-19 stsp if (qid == NULL)
367 bee6b577 2018-09-19 stsp return NULL;
368 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
370 b36429ab 2018-11-05 stsp return NULL;
371 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids,
373 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
374 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
375 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
379 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
380 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->open_branches, &qid->id))
382 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->node_ids, &qid->id))
383 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
384 d7b5a0e8 2022-04-20 stsp err = got_object_idset_add(graph->open_branches, &qid->id,
387 0ed6ed4c 2018-06-13 stsp return err;
390 b43fbaa0 2018-06-11 stsp return NULL;
393 de56b2d7 2020-01-04 stsp const struct got_error *
394 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
395 3d509237 2020-01-04 stsp const char *path, int first_parent_traversal)
397 22220781 2020-01-04 stsp const struct got_error *err = NULL;
399 3ddcebf3 2020-01-04 stsp *graph = calloc(1, sizeof(**graph));
400 3d509237 2020-01-04 stsp if (*graph == NULL)
401 3ddcebf3 2020-01-04 stsp return got_error_from_errno("calloc");
403 88cdb9c6 2020-01-04 stsp TAILQ_INIT(&(*graph)->iter_list);
405 3ddcebf3 2020-01-04 stsp (*graph)->path = strdup(path);
406 3ddcebf3 2020-01-04 stsp if ((*graph)->path == NULL) {
407 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("strdup");
411 3ddcebf3 2020-01-04 stsp (*graph)->node_ids = got_object_idset_alloc();
412 3ddcebf3 2020-01-04 stsp if ((*graph)->node_ids == NULL) {
413 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
417 3ddcebf3 2020-01-04 stsp (*graph)->open_branches = got_object_idset_alloc();
418 3ddcebf3 2020-01-04 stsp if ((*graph)->open_branches == NULL) {
419 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
423 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
424 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
427 22220781 2020-01-04 stsp got_commit_graph_close(*graph);
428 22220781 2020-01-04 stsp *graph = NULL;
430 22220781 2020-01-04 stsp return err;
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 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;
448 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
450 32777563 2018-11-07 stsp return err;
452 ca6e02ac 2020-01-07 stsp err = add_node(&new_node, a->graph, commit_id, a->repo);
454 c877c437 2022-09-04 op got_object_commit_close(commit);
455 32777563 2018-11-07 stsp return err;
458 c877c437 2022-09-04 op a->tips[a->ntips].commit_id = &new_node->id;
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 b565f6f8 2018-07-23 stsp a->ntips++;
463 cb103d04 2018-11-07 stsp return NULL;
466 1142eae9 2018-06-11 stsp static const struct got_error *
467 57eecd46 2020-01-04 stsp fetch_commits_from_open_branches(struct got_commit_graph *graph,
468 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
470 372ccdbb 2018-06-10 stsp const struct got_error *err;
471 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
472 32777563 2018-11-07 stsp int i, ntips;
474 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
475 32777563 2018-11-07 stsp if (ntips == 0)
476 372ccdbb 2018-06-10 stsp return NULL;
478 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
479 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
480 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
481 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
482 5e50c36a 2018-11-08 stsp sizeof(*tips));
483 b565f6f8 2018-07-23 stsp if (tips == NULL)
484 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
485 b565f6f8 2018-07-23 stsp graph->tips = tips;
486 32777563 2018-11-07 stsp graph->ntips = ntips;
488 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
489 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
490 32777563 2018-11-07 stsp arg.repo = repo;
491 32777563 2018-11-07 stsp arg.graph = graph;
492 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
497 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
498 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
499 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
500 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
501 13a851c1 2020-01-04 stsp int changed;
503 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
504 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
509 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
510 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
511 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
513 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, commit_id,
514 13a851c1 2020-01-04 stsp graph->path, repo);
516 13a851c1 2020-01-04 stsp if (err->code != GOT_ERR_NO_OBJ)
519 13a851c1 2020-01-04 stsp * History of the path stops here on the current
520 13a851c1 2020-01-04 stsp * branch. Keep going on other branches.
522 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
527 85a99d1e 2022-09-04 op if (changed) {
528 ca6e02ac 2020-01-07 stsp add_node_to_iter_list(graph, new_node,
529 ca6e02ac 2020-01-07 stsp got_object_commit_get_committer_time(commit));
530 85a99d1e 2022-09-04 op arg.tips[i].new_node = NULL;
532 14159a7b 2020-01-04 stsp err = advance_branch(graph, commit_id, commit, repo);
537 85a99d1e 2022-09-04 op for (i = 0; i < arg.ntips; i++) {
538 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
539 85a99d1e 2022-09-04 op free(arg.tips[i].new_node);
541 372ccdbb 2018-06-10 stsp return err;
545 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
547 9aae7366 2022-09-04 op struct got_commit_graph_node *node;
549 9aae7366 2022-09-04 op while ((node = TAILQ_FIRST(&graph->iter_list))) {
550 9aae7366 2022-09-04 op TAILQ_REMOVE(&graph->iter_list, node, entry);
554 22220781 2020-01-04 stsp if (graph->open_branches)
555 22220781 2020-01-04 stsp got_object_idset_free(graph->open_branches);
556 22220781 2020-01-04 stsp if (graph->node_ids)
557 22220781 2020-01-04 stsp got_object_idset_free(graph->node_ids);
558 b565f6f8 2018-07-23 stsp free(graph->tips);
559 31cedeaf 2018-09-15 stsp free(graph->path);
560 372ccdbb 2018-06-10 stsp free(graph);
563 372ccdbb 2018-06-10 stsp const struct got_error *
564 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
565 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
566 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
568 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
570 3d509237 2020-01-04 stsp if (!TAILQ_EMPTY(&graph->iter_list))
571 3d509237 2020-01-04 stsp return got_error(GOT_ERR_ITER_BUSY);
573 3ff3126d 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, id, NULL);
575 7e33c8c5 2020-01-04 stsp return err;
577 3ff3126d 2020-01-04 stsp /* Locate first commit which changed graph->path. */
578 94489f7d 2020-01-04 stsp while (TAILQ_EMPTY(&graph->iter_list) &&
579 3ff3126d 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
580 3ff3126d 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
581 3ff3126d 2020-01-04 stsp cancel_cb, cancel_arg);
583 7e33c8c5 2020-01-04 stsp return err;
586 94489f7d 2020-01-04 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
587 5175b31a 2020-01-04 stsp const char *path;
588 5175b31a 2020-01-04 stsp if (got_path_is_root_dir(graph->path))
589 5175b31a 2020-01-04 stsp return got_error_no_obj(id);
590 5175b31a 2020-01-04 stsp path = graph->path;
591 5175b31a 2020-01-04 stsp while (path[0] == '/')
593 5175b31a 2020-01-04 stsp return got_error_path(path, GOT_ERR_NO_TREE_ENTRY);
596 7e33c8c5 2020-01-04 stsp return NULL;
599 372ccdbb 2018-06-10 stsp const struct got_error *
600 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
601 ee780d5c 2020-01-04 stsp struct got_commit_graph *graph, struct got_repository *repo,
602 ee780d5c 2020-01-04 stsp got_cancel_cb cancel_cb, void *cancel_arg)
604 ee780d5c 2020-01-04 stsp const struct got_error *err = NULL;
605 94489f7d 2020-01-04 stsp struct got_commit_graph_node *node;
607 9ba79e04 2018-06-11 stsp *id = NULL;
609 df8cd9c6 2020-01-05 stsp node = TAILQ_FIRST(&graph->iter_list);
610 df8cd9c6 2020-01-05 stsp if (node == NULL) {
611 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
612 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
615 94489f7d 2020-01-04 stsp while (TAILQ_NEXT(node, entry) == NULL &&
616 ee780d5c 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
617 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
618 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
620 ee780d5c 2020-01-04 stsp return err;
623 e15c42de 2022-09-05 op memcpy(&graph->id, &node->id, sizeof(graph->id));
624 e15c42de 2022-09-05 op *id = &graph->id;
626 94489f7d 2020-01-04 stsp TAILQ_REMOVE(&graph->iter_list, node, entry);
628 372ccdbb 2018-06-10 stsp return NULL;
631 a9833bc9 2019-05-13 stsp const struct got_error *
632 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
633 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
634 4e91ef15 2021-09-26 stsp int first_parent_traversal,
635 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
637 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
638 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
639 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
640 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
642 a9833bc9 2019-05-13 stsp *yca_id = NULL;
644 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
645 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
646 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
648 4e91ef15 2021-09-26 stsp err = got_commit_graph_open(&graph, "/", first_parent_traversal);
652 4e91ef15 2021-09-26 stsp err = got_commit_graph_open(&graph2, "/", first_parent_traversal);
656 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
657 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
661 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
662 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
667 ee780d5c 2020-01-04 stsp struct got_object_id *id = NULL, *id2 = NULL;
669 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
670 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
675 a9833bc9 2019-05-13 stsp if (!completed) {
676 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
677 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
679 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
681 ee780d5c 2020-01-04 stsp err = NULL;
682 ee780d5c 2020-01-04 stsp completed = 1;
686 a9833bc9 2019-05-13 stsp if (!completed2) {
687 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id2, graph2, repo,
688 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
690 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
692 ee780d5c 2020-01-04 stsp err = NULL;
693 ee780d5c 2020-01-04 stsp completed2 = 1;
698 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id)) {
699 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
700 a9833bc9 2019-05-13 stsp if (*yca_id)
702 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
706 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id, NULL);
711 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id2)) {
712 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
713 a9833bc9 2019-05-13 stsp if (*yca_id)
715 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
719 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id2, NULL);
724 a9833bc9 2019-05-13 stsp if (completed && completed2) {
725 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
731 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
733 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
734 a9833bc9 2019-05-13 stsp if (graph2)
735 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
736 a9833bc9 2019-05-13 stsp return err;
