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 5822e79e 2023-02-23 op #include <sha2.h>
28 372ccdbb 2018-06-10 stsp #include <zlib.h>
29 372ccdbb 2018-06-10 stsp #include <ctype.h>
31 372ccdbb 2018-06-10 stsp #include "got_error.h"
32 372ccdbb 2018-06-10 stsp #include "got_object.h"
33 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
34 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
35 324d37e7 2019-05-11 stsp #include "got_path.h"
37 372ccdbb 2018-06-10 stsp #include "got_lib_delta.h"
38 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
39 372ccdbb 2018-06-10 stsp #include "got_lib_object.h"
40 372ccdbb 2018-06-10 stsp #include "got_lib_object_idset.h"
42 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
43 372ccdbb 2018-06-10 stsp struct got_object_id id;
45 ca6e02ac 2020-01-07 stsp /* Used only during iteration. */
46 ca6e02ac 2020-01-07 stsp time_t timestamp;
47 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
50 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
52 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip {
53 32777563 2018-11-07 stsp struct got_object_id *commit_id;
54 32777563 2018-11-07 stsp struct got_commit_object *commit;
55 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
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;
63 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
66 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
67 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
68 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
69 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
70 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
72 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
73 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
74 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
76 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
77 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
78 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
80 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
82 32777563 2018-11-07 stsp /* Array of branch tips for fetch_commits_from_open_branches(). */
83 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
86 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
90 94489f7d 2020-01-04 stsp * Nodes which will be passed to the API user next, sorted by
91 94489f7d 2020-01-04 stsp * commit timestmap.
93 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
96 31cedeaf 2018-09-15 stsp static const struct got_error *
97 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
98 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
99 31cedeaf 2018-09-15 stsp struct got_repository *repo)
101 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
102 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
103 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
104 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
106 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
107 31cedeaf 2018-09-15 stsp *changed = 1;
108 31cedeaf 2018-09-15 stsp return NULL;
111 31cedeaf 2018-09-15 stsp *changed = 0;
113 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(&commit->parent_ids);
114 31cedeaf 2018-09-15 stsp if (pid == NULL) {
115 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
116 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&obj_id, repo, commit, path);
118 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
119 fd1d2703 2018-11-04 stsp err = NULL;
121 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
122 31cedeaf 2018-09-15 stsp free(obj_id);
123 0e9101d5 2018-11-18 stsp return err;
126 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
128 0e9101d5 2018-11-18 stsp return err;
130 d7b5a0e8 2022-04-20 stsp err = got_object_open_as_commit(&pcommit, repo, &pid->id);
134 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
138 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
141 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
143 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
144 31cedeaf 2018-09-15 stsp if (pcommit)
145 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
146 31cedeaf 2018-09-15 stsp return err;
149 4626e416 2018-06-10 stsp static void
150 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
151 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node, time_t committer_time)
153 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
155 ca6e02ac 2020-01-07 stsp node->timestamp = committer_time;
157 94489f7d 2020-01-04 stsp n = TAILQ_FIRST(&graph->iter_list);
158 bee6b577 2018-09-19 stsp while (n) {
159 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
160 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
161 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
166 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
169 0ed6ed4c 2018-06-13 stsp static const struct got_error *
170 ca6e02ac 2020-01-07 stsp add_node(struct got_commit_graph_node **new_node,
171 ca6e02ac 2020-01-07 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
172 ca6e02ac 2020-01-07 stsp struct got_repository *repo)
174 ca6e02ac 2020-01-07 stsp const struct got_error *err = NULL;
175 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node;
177 ca6e02ac 2020-01-07 stsp *new_node = NULL;
179 ca6e02ac 2020-01-07 stsp node = calloc(1, sizeof(*node));
180 ca6e02ac 2020-01-07 stsp if (node == NULL)
181 ca6e02ac 2020-01-07 stsp return got_error_from_errno("calloc");
183 ca6e02ac 2020-01-07 stsp memcpy(&node->id, commit_id, sizeof(node->id));
184 ca6e02ac 2020-01-07 stsp err = got_object_idset_add(graph->node_ids, &node->id, NULL);
186 ca6e02ac 2020-01-07 stsp free(node);
188 ca6e02ac 2020-01-07 stsp *new_node = node;
189 ca6e02ac 2020-01-07 stsp return err;
193 ca6e02ac 2020-01-07 stsp * Ask got-read-pack to traverse first-parent history until a commit is
194 ca6e02ac 2020-01-07 stsp * encountered which modified graph->path, or until the pack file runs
195 ca6e02ac 2020-01-07 stsp * out of relevant commits. This is faster than sending an individual
196 ca6e02ac 2020-01-07 stsp * request for each commit stored in the pack file.
198 ca6e02ac 2020-01-07 stsp static const struct got_error *
199 ca6e02ac 2020-01-07 stsp packed_first_parent_traversal(int *ncommits_traversed,
200 ca6e02ac 2020-01-07 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
201 ca6e02ac 2020-01-07 stsp struct got_repository *repo)
203 ca6e02ac 2020-01-07 stsp const struct got_error *err = NULL;
204 ca6e02ac 2020-01-07 stsp struct got_object_id_queue traversed_commits;
205 ca6e02ac 2020-01-07 stsp struct got_object_qid *qid;
207 dbdddfee 2021-06-23 naddy STAILQ_INIT(&traversed_commits);
208 ca6e02ac 2020-01-07 stsp *ncommits_traversed = 0;
210 ca6e02ac 2020-01-07 stsp err = got_traverse_packed_commits(&traversed_commits,
211 ca6e02ac 2020-01-07 stsp commit_id, graph->path, repo);
213 ca6e02ac 2020-01-07 stsp return err;
215 ca6e02ac 2020-01-07 stsp /* Add all traversed commits to the graph... */
216 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &traversed_commits, entry) {
217 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->open_branches, &qid->id))
219 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->node_ids, &qid->id))
222 ca6e02ac 2020-01-07 stsp (*ncommits_traversed)++;
224 ca6e02ac 2020-01-07 stsp /* ... except the last commit is the new branch tip. */
225 dbdddfee 2021-06-23 naddy if (STAILQ_NEXT(qid, entry) == NULL) {
226 ca6e02ac 2020-01-07 stsp err = got_object_idset_add(graph->open_branches,
227 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
231 932b646a 2022-09-05 stsp err = got_object_idset_add(graph->node_ids, &qid->id, NULL);
236 ca6e02ac 2020-01-07 stsp got_object_id_queue_free(&traversed_commits);
237 ca6e02ac 2020-01-07 stsp return err;
240 ca6e02ac 2020-01-07 stsp static const struct got_error *
241 32c85d2c 2020-01-06 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
243 32c85d2c 2020-01-06 stsp const struct got_error *err;
245 32c85d2c 2020-01-06 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
246 32c85d2c 2020-01-06 stsp if (err && err->code != GOT_ERR_NO_OBJ)
247 32c85d2c 2020-01-06 stsp return err;
248 32c85d2c 2020-01-06 stsp return NULL;
251 32c85d2c 2020-01-06 stsp static const struct got_error *
252 14159a7b 2020-01-04 stsp advance_branch(struct got_commit_graph *graph, struct got_object_id *commit_id,
253 14159a7b 2020-01-04 stsp struct got_commit_object *commit, struct got_repository *repo)
255 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
256 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
258 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
260 32c85d2c 2020-01-06 stsp return err;
262 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
263 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&commit->parent_ids);
264 9b88e78c 2018-11-18 stsp if (qid == NULL ||
265 d7b5a0e8 2022-04-20 stsp got_object_idset_contains(graph->open_branches, &qid->id))
266 0ed6ed4c 2018-06-13 stsp return NULL;
268 ca6e02ac 2020-01-07 stsp * The root directory always changes by definition, and when
269 ca6e02ac 2020-01-07 stsp * logging the root we want to traverse consecutive commits
270 ca6e02ac 2020-01-07 stsp * even if they point at the same tree.
271 ca6e02ac 2020-01-07 stsp * But if we are looking for a specific path then we can avoid
272 ca6e02ac 2020-01-07 stsp * fetching packed commits which did not modify the path and
273 ca6e02ac 2020-01-07 stsp * only fetch their IDs. This speeds up 'got blame'.
275 ca6e02ac 2020-01-07 stsp if (!got_path_is_root_dir(graph->path) &&
276 ca6e02ac 2020-01-07 stsp (commit->flags & GOT_COMMIT_FLAG_PACKED)) {
277 ca6e02ac 2020-01-07 stsp int ncommits = 0;
278 ca6e02ac 2020-01-07 stsp err = packed_first_parent_traversal(&ncommits,
279 d7b5a0e8 2022-04-20 stsp graph, &qid->id, repo);
280 ca6e02ac 2020-01-07 stsp if (err || ncommits > 0)
281 ca6e02ac 2020-01-07 stsp return err;
283 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
284 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
288 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
289 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
291 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
292 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
293 bee6b577 2018-09-19 stsp int branches_differ = 0;
295 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&merged_id, repo, commit,
296 bee6b577 2018-09-19 stsp graph->path);
298 bee6b577 2018-09-19 stsp return err;
300 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
301 a44927cc 2022-04-07 stsp struct got_object_id *id = NULL;
302 a44927cc 2022-04-07 stsp struct got_commit_object *pcommit = NULL;
304 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
308 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&pcommit, repo,
311 a44927cc 2022-04-07 stsp free(merged_id);
312 a44927cc 2022-04-07 stsp free(prev_id);
313 a44927cc 2022-04-07 stsp return err;
315 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, pcommit,
316 bee6b577 2018-09-19 stsp graph->path);
317 a44927cc 2022-04-07 stsp got_object_commit_close(pcommit);
318 a44927cc 2022-04-07 stsp pcommit = NULL;
320 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
321 bee6b577 2018-09-19 stsp branches_differ = 1;
324 6dcdad08 2018-11-18 stsp free(merged_id);
325 6dcdad08 2018-11-18 stsp free(prev_id);
326 bee6b577 2018-09-19 stsp return err;
329 bee6b577 2018-09-19 stsp if (prev_id) {
330 bee6b577 2018-09-19 stsp if (!branches_differ &&
331 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
332 bee6b577 2018-09-19 stsp branches_differ = 1;
333 6dcdad08 2018-11-18 stsp free(prev_id);
335 6dcdad08 2018-11-18 stsp prev_id = id;
338 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
339 bee6b577 2018-09-19 stsp * skip any other branches.
341 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
342 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
343 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
344 6dcdad08 2018-11-18 stsp free(merged_id);
346 b36429ab 2018-11-05 stsp return err;
350 6dcdad08 2018-11-18 stsp free(prev_id);
351 6dcdad08 2018-11-18 stsp prev_id = NULL;
352 6dcdad08 2018-11-18 stsp free(merged_id);
353 6dcdad08 2018-11-18 stsp merged_id = NULL;
356 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
357 bee6b577 2018-09-19 stsp * follow the first parent only.
359 bee6b577 2018-09-19 stsp if (!branches_differ) {
360 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&commit->parent_ids);
361 bee6b577 2018-09-19 stsp if (qid == NULL)
362 bee6b577 2018-09-19 stsp return NULL;
363 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
365 b36429ab 2018-11-05 stsp return NULL;
366 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids,
368 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
369 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
370 d7b5a0e8 2022-04-20 stsp &qid->id, NULL);
374 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
375 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->open_branches, &qid->id))
377 d7b5a0e8 2022-04-20 stsp if (got_object_idset_contains(graph->node_ids, &qid->id))
378 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
379 d7b5a0e8 2022-04-20 stsp err = got_object_idset_add(graph->open_branches, &qid->id,
382 0ed6ed4c 2018-06-13 stsp return err;
385 b43fbaa0 2018-06-11 stsp return NULL;
388 de56b2d7 2020-01-04 stsp const struct got_error *
389 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
390 3d509237 2020-01-04 stsp const char *path, int first_parent_traversal)
392 22220781 2020-01-04 stsp const struct got_error *err = NULL;
394 3ddcebf3 2020-01-04 stsp *graph = calloc(1, sizeof(**graph));
395 3d509237 2020-01-04 stsp if (*graph == NULL)
396 3ddcebf3 2020-01-04 stsp return got_error_from_errno("calloc");
398 88cdb9c6 2020-01-04 stsp TAILQ_INIT(&(*graph)->iter_list);
400 3ddcebf3 2020-01-04 stsp (*graph)->path = strdup(path);
401 3ddcebf3 2020-01-04 stsp if ((*graph)->path == NULL) {
402 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("strdup");
406 3ddcebf3 2020-01-04 stsp (*graph)->node_ids = got_object_idset_alloc();
407 3ddcebf3 2020-01-04 stsp if ((*graph)->node_ids == NULL) {
408 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
412 3ddcebf3 2020-01-04 stsp (*graph)->open_branches = got_object_idset_alloc();
413 3ddcebf3 2020-01-04 stsp if ((*graph)->open_branches == NULL) {
414 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
418 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
419 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
422 22220781 2020-01-04 stsp got_commit_graph_close(*graph);
423 22220781 2020-01-04 stsp *graph = NULL;
425 22220781 2020-01-04 stsp return err;
428 32777563 2018-11-07 stsp struct add_branch_tip_arg {
429 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
431 32777563 2018-11-07 stsp struct got_repository *repo;
432 32777563 2018-11-07 stsp struct got_commit_graph *graph;
435 cb103d04 2018-11-07 stsp static const struct got_error *
436 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
438 32777563 2018-11-07 stsp const struct got_error *err;
439 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
440 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
441 32777563 2018-11-07 stsp struct got_commit_object *commit;
443 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
445 32777563 2018-11-07 stsp return err;
447 ca6e02ac 2020-01-07 stsp err = add_node(&new_node, a->graph, commit_id, a->repo);
449 c877c437 2022-09-04 op got_object_commit_close(commit);
450 32777563 2018-11-07 stsp return err;
453 c877c437 2022-09-04 op a->tips[a->ntips].commit_id = &new_node->id;
454 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
455 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
456 b565f6f8 2018-07-23 stsp a->ntips++;
458 cb103d04 2018-11-07 stsp return NULL;
461 1142eae9 2018-06-11 stsp static const struct got_error *
462 57eecd46 2020-01-04 stsp fetch_commits_from_open_branches(struct got_commit_graph *graph,
463 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
465 372ccdbb 2018-06-10 stsp const struct got_error *err;
466 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
467 32777563 2018-11-07 stsp int i, ntips;
469 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
470 32777563 2018-11-07 stsp if (ntips == 0)
471 372ccdbb 2018-06-10 stsp return NULL;
473 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
474 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
475 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
476 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
477 5e50c36a 2018-11-08 stsp sizeof(*tips));
478 b565f6f8 2018-07-23 stsp if (tips == NULL)
479 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
480 b565f6f8 2018-07-23 stsp graph->tips = tips;
481 32777563 2018-11-07 stsp graph->ntips = ntips;
483 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
484 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
485 32777563 2018-11-07 stsp arg.repo = repo;
486 32777563 2018-11-07 stsp arg.graph = graph;
487 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
492 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
493 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
494 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
495 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
496 13a851c1 2020-01-04 stsp int changed;
498 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
499 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
504 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
505 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
506 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
508 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, commit_id,
509 13a851c1 2020-01-04 stsp graph->path, repo);
511 13a851c1 2020-01-04 stsp if (err->code != GOT_ERR_NO_OBJ)
514 13a851c1 2020-01-04 stsp * History of the path stops here on the current
515 13a851c1 2020-01-04 stsp * branch. Keep going on other branches.
517 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
522 85a99d1e 2022-09-04 op if (changed) {
523 ca6e02ac 2020-01-07 stsp add_node_to_iter_list(graph, new_node,
524 ca6e02ac 2020-01-07 stsp got_object_commit_get_committer_time(commit));
525 85a99d1e 2022-09-04 op arg.tips[i].new_node = NULL;
527 14159a7b 2020-01-04 stsp err = advance_branch(graph, commit_id, commit, repo);
532 85a99d1e 2022-09-04 op for (i = 0; i < arg.ntips; i++) {
533 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
534 85a99d1e 2022-09-04 op free(arg.tips[i].new_node);
536 372ccdbb 2018-06-10 stsp return err;
540 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
542 9aae7366 2022-09-04 op struct got_commit_graph_node *node;
544 9aae7366 2022-09-04 op while ((node = TAILQ_FIRST(&graph->iter_list))) {
545 9aae7366 2022-09-04 op TAILQ_REMOVE(&graph->iter_list, node, entry);
549 22220781 2020-01-04 stsp if (graph->open_branches)
550 22220781 2020-01-04 stsp got_object_idset_free(graph->open_branches);
551 22220781 2020-01-04 stsp if (graph->node_ids)
552 22220781 2020-01-04 stsp got_object_idset_free(graph->node_ids);
553 b565f6f8 2018-07-23 stsp free(graph->tips);
554 31cedeaf 2018-09-15 stsp free(graph->path);
555 372ccdbb 2018-06-10 stsp free(graph);
558 372ccdbb 2018-06-10 stsp const struct got_error *
559 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
560 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
561 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
563 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
565 3d509237 2020-01-04 stsp if (!TAILQ_EMPTY(&graph->iter_list))
566 3d509237 2020-01-04 stsp return got_error(GOT_ERR_ITER_BUSY);
568 3ff3126d 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, id, NULL);
570 7e33c8c5 2020-01-04 stsp return err;
572 3ff3126d 2020-01-04 stsp /* Locate first commit which changed graph->path. */
573 94489f7d 2020-01-04 stsp while (TAILQ_EMPTY(&graph->iter_list) &&
574 3ff3126d 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
575 3ff3126d 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
576 3ff3126d 2020-01-04 stsp cancel_cb, cancel_arg);
578 7e33c8c5 2020-01-04 stsp return err;
581 94489f7d 2020-01-04 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
582 5175b31a 2020-01-04 stsp const char *path;
583 5175b31a 2020-01-04 stsp if (got_path_is_root_dir(graph->path))
584 5175b31a 2020-01-04 stsp return got_error_no_obj(id);
585 5175b31a 2020-01-04 stsp path = graph->path;
586 5175b31a 2020-01-04 stsp while (path[0] == '/')
588 5175b31a 2020-01-04 stsp return got_error_path(path, GOT_ERR_NO_TREE_ENTRY);
591 7e33c8c5 2020-01-04 stsp return NULL;
594 372ccdbb 2018-06-10 stsp const struct got_error *
595 d9787ed8 2022-09-10 op got_commit_graph_iter_next(struct got_object_id *id,
596 ee780d5c 2020-01-04 stsp struct got_commit_graph *graph, struct got_repository *repo,
597 ee780d5c 2020-01-04 stsp got_cancel_cb cancel_cb, void *cancel_arg)
599 ee780d5c 2020-01-04 stsp const struct got_error *err = NULL;
600 94489f7d 2020-01-04 stsp struct got_commit_graph_node *node;
602 df8cd9c6 2020-01-05 stsp node = TAILQ_FIRST(&graph->iter_list);
603 df8cd9c6 2020-01-05 stsp if (node == NULL) {
604 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
605 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
608 94489f7d 2020-01-04 stsp while (TAILQ_NEXT(node, entry) == NULL &&
609 ee780d5c 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
610 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
611 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
613 ee780d5c 2020-01-04 stsp return err;
616 d9787ed8 2022-09-10 op memcpy(id, &node->id, sizeof(*id));
618 94489f7d 2020-01-04 stsp TAILQ_REMOVE(&graph->iter_list, node, entry);
620 372ccdbb 2018-06-10 stsp return NULL;
623 d9787ed8 2022-09-10 op static const struct got_error *
624 d9787ed8 2022-09-10 op find_yca_add_id(struct got_object_id **yca_id, struct got_commit_graph *graph,
625 d9787ed8 2022-09-10 op struct got_object_idset *commit_ids, struct got_repository *repo,
626 d9787ed8 2022-09-10 op got_cancel_cb cancel_cb, void *cancel_arg)
628 d9787ed8 2022-09-10 op const struct got_error *err = NULL;
629 d9787ed8 2022-09-10 op struct got_object_id id;
631 d9787ed8 2022-09-10 op err = got_commit_graph_iter_next(&id, graph, repo, cancel_cb,
636 d9787ed8 2022-09-10 op if (got_object_idset_contains(commit_ids, &id)) {
637 d9787ed8 2022-09-10 op *yca_id = got_object_id_dup(&id);
638 d9787ed8 2022-09-10 op if (*yca_id == NULL)
639 d9787ed8 2022-09-10 op err = got_error_from_errno("got_object_id_dup");
643 d9787ed8 2022-09-10 op return got_object_idset_add(commit_ids, &id, NULL);
647 ad575c3a 2023-05-25 stsp * Sets *yca_id to the youngest common ancestor of commit_id and
648 ad575c3a 2023-05-25 stsp * commit_id2. Returns got_error(GOT_ERR_ANCESTRY) if they have no
649 ad575c3a 2023-05-25 stsp * common ancestors.
651 ad575c3a 2023-05-25 stsp * If first_parent_traversal is nonzero, only linear history is considered.
653 a9833bc9 2019-05-13 stsp const struct got_error *
654 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
655 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
656 4e91ef15 2021-09-26 stsp int first_parent_traversal,
657 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
659 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
660 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
661 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
662 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
664 a9833bc9 2019-05-13 stsp *yca_id = NULL;
666 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
667 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
668 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
670 4e91ef15 2021-09-26 stsp err = got_commit_graph_open(&graph, "/", first_parent_traversal);
674 4e91ef15 2021-09-26 stsp err = got_commit_graph_open(&graph2, "/", first_parent_traversal);
678 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
679 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
683 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
684 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
689 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
690 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
695 a9833bc9 2019-05-13 stsp if (!completed) {
696 d9787ed8 2022-09-10 op err = find_yca_add_id(yca_id, graph, commit_ids, repo,
697 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
699 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
701 ee780d5c 2020-01-04 stsp err = NULL;
702 ee780d5c 2020-01-04 stsp completed = 1;
708 a9833bc9 2019-05-13 stsp if (!completed2) {
709 d9787ed8 2022-09-10 op err = find_yca_add_id(yca_id, graph2, commit_ids, repo,
710 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
712 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
714 ee780d5c 2020-01-04 stsp err = NULL;
715 ee780d5c 2020-01-04 stsp completed2 = 1;
721 a9833bc9 2019-05-13 stsp if (completed && completed2) {
722 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
727 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
729 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
730 a9833bc9 2019-05-13 stsp if (graph2)
731 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
732 a9833bc9 2019-05-13 stsp return err;
