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 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 dbdddfee 2021-06-23 naddy pid = STAILQ_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 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node, time_t committer_time)
152 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
154 ca6e02ac 2020-01-07 stsp node->timestamp = committer_time;
156 94489f7d 2020-01-04 stsp n = TAILQ_FIRST(&graph->iter_list);
157 bee6b577 2018-09-19 stsp while (n) {
158 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
159 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
160 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
165 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
168 0ed6ed4c 2018-06-13 stsp static const struct got_error *
169 ca6e02ac 2020-01-07 stsp add_node(struct got_commit_graph_node **new_node,
170 ca6e02ac 2020-01-07 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
171 ca6e02ac 2020-01-07 stsp struct got_repository *repo)
173 ca6e02ac 2020-01-07 stsp const struct got_error *err = NULL;
174 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node;
176 ca6e02ac 2020-01-07 stsp *new_node = NULL;
178 ca6e02ac 2020-01-07 stsp node = calloc(1, sizeof(*node));
179 ca6e02ac 2020-01-07 stsp if (node == NULL)
180 ca6e02ac 2020-01-07 stsp return got_error_from_errno("calloc");
182 ca6e02ac 2020-01-07 stsp memcpy(&node->id, commit_id, sizeof(node->id));
183 ca6e02ac 2020-01-07 stsp err = got_object_idset_add(graph->node_ids, &node->id, NULL);
185 ca6e02ac 2020-01-07 stsp free(node);
187 ca6e02ac 2020-01-07 stsp *new_node = node;
188 ca6e02ac 2020-01-07 stsp return err;
192 ca6e02ac 2020-01-07 stsp * Ask got-read-pack to traverse first-parent history until a commit is
193 ca6e02ac 2020-01-07 stsp * encountered which modified graph->path, or until the pack file runs
194 ca6e02ac 2020-01-07 stsp * out of relevant commits. This is faster than sending an individual
195 ca6e02ac 2020-01-07 stsp * request for each commit stored in the pack file.
197 ca6e02ac 2020-01-07 stsp static const struct got_error *
198 ca6e02ac 2020-01-07 stsp packed_first_parent_traversal(int *ncommits_traversed,
199 ca6e02ac 2020-01-07 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
200 ca6e02ac 2020-01-07 stsp struct got_repository *repo)
202 ca6e02ac 2020-01-07 stsp const struct got_error *err = NULL;
203 ca6e02ac 2020-01-07 stsp struct got_object_id_queue traversed_commits;
204 ca6e02ac 2020-01-07 stsp struct got_object_qid *qid;
206 dbdddfee 2021-06-23 naddy STAILQ_INIT(&traversed_commits);
207 ca6e02ac 2020-01-07 stsp *ncommits_traversed = 0;
209 ca6e02ac 2020-01-07 stsp err = got_traverse_packed_commits(&traversed_commits,
210 ca6e02ac 2020-01-07 stsp commit_id, graph->path, repo);
212 ca6e02ac 2020-01-07 stsp return err;
214 ca6e02ac 2020-01-07 stsp /* Add all traversed commits to the graph... */
215 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &traversed_commits, entry) {
216 ca6e02ac 2020-01-07 stsp struct got_commit_graph_node *node;
218 ca6e02ac 2020-01-07 stsp if (got_object_idset_contains(graph->open_branches, qid->id))
220 ca6e02ac 2020-01-07 stsp if (got_object_idset_contains(graph->node_ids, qid->id))
223 ca6e02ac 2020-01-07 stsp (*ncommits_traversed)++;
225 ca6e02ac 2020-01-07 stsp /* ... except the last commit is the new branch tip. */
226 dbdddfee 2021-06-23 naddy if (STAILQ_NEXT(qid, entry) == NULL) {
227 ca6e02ac 2020-01-07 stsp err = got_object_idset_add(graph->open_branches,
228 ca6e02ac 2020-01-07 stsp qid->id, NULL);
232 ca6e02ac 2020-01-07 stsp err = add_node(&node, graph, qid->id, repo);
237 ca6e02ac 2020-01-07 stsp got_object_id_queue_free(&traversed_commits);
238 ca6e02ac 2020-01-07 stsp return err;
241 ca6e02ac 2020-01-07 stsp static const struct got_error *
242 32c85d2c 2020-01-06 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
244 32c85d2c 2020-01-06 stsp const struct got_error *err;
246 32c85d2c 2020-01-06 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
247 32c85d2c 2020-01-06 stsp if (err && err->code != GOT_ERR_NO_OBJ)
248 32c85d2c 2020-01-06 stsp return err;
249 32c85d2c 2020-01-06 stsp return NULL;
252 32c85d2c 2020-01-06 stsp static const struct got_error *
253 14159a7b 2020-01-04 stsp advance_branch(struct got_commit_graph *graph, struct got_object_id *commit_id,
254 14159a7b 2020-01-04 stsp struct got_commit_object *commit, struct got_repository *repo)
256 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
257 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
259 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
261 32c85d2c 2020-01-06 stsp return err;
263 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
264 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&commit->parent_ids);
265 9b88e78c 2018-11-18 stsp if (qid == NULL ||
266 8e291695 2020-01-04 stsp got_object_idset_contains(graph->open_branches, qid->id))
267 0ed6ed4c 2018-06-13 stsp return NULL;
269 ca6e02ac 2020-01-07 stsp * The root directory always changes by definition, and when
270 ca6e02ac 2020-01-07 stsp * logging the root we want to traverse consecutive commits
271 ca6e02ac 2020-01-07 stsp * even if they point at the same tree.
272 ca6e02ac 2020-01-07 stsp * But if we are looking for a specific path then we can avoid
273 ca6e02ac 2020-01-07 stsp * fetching packed commits which did not modify the path and
274 ca6e02ac 2020-01-07 stsp * only fetch their IDs. This speeds up 'got blame'.
276 ca6e02ac 2020-01-07 stsp if (!got_path_is_root_dir(graph->path) &&
277 ca6e02ac 2020-01-07 stsp (commit->flags & GOT_COMMIT_FLAG_PACKED)) {
278 ca6e02ac 2020-01-07 stsp int ncommits = 0;
279 ca6e02ac 2020-01-07 stsp err = packed_first_parent_traversal(&ncommits,
280 ca6e02ac 2020-01-07 stsp graph, qid->id, repo);
281 ca6e02ac 2020-01-07 stsp if (err || ncommits > 0)
282 ca6e02ac 2020-01-07 stsp return err;
284 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
285 8e291695 2020-01-04 stsp qid->id, NULL);
289 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
290 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
292 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
293 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
294 bee6b577 2018-09-19 stsp int branches_differ = 0;
296 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
297 bee6b577 2018-09-19 stsp graph->path);
299 bee6b577 2018-09-19 stsp return err;
301 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
302 6dcdad08 2018-11-18 stsp struct got_object_id *id;
304 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
308 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
309 bee6b577 2018-09-19 stsp graph->path);
311 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
312 bee6b577 2018-09-19 stsp branches_differ = 1;
315 6dcdad08 2018-11-18 stsp free(merged_id);
316 6dcdad08 2018-11-18 stsp free(prev_id);
317 bee6b577 2018-09-19 stsp return err;
320 bee6b577 2018-09-19 stsp if (prev_id) {
321 bee6b577 2018-09-19 stsp if (!branches_differ &&
322 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
323 bee6b577 2018-09-19 stsp branches_differ = 1;
324 6dcdad08 2018-11-18 stsp free(prev_id);
326 6dcdad08 2018-11-18 stsp prev_id = id;
329 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
330 bee6b577 2018-09-19 stsp * skip any other branches.
332 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
333 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
334 8e291695 2020-01-04 stsp qid->id, NULL);
335 6dcdad08 2018-11-18 stsp free(merged_id);
337 b36429ab 2018-11-05 stsp return err;
341 6dcdad08 2018-11-18 stsp free(prev_id);
342 6dcdad08 2018-11-18 stsp prev_id = NULL;
343 6dcdad08 2018-11-18 stsp free(merged_id);
344 6dcdad08 2018-11-18 stsp merged_id = NULL;
347 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
348 bee6b577 2018-09-19 stsp * follow the first parent only.
350 bee6b577 2018-09-19 stsp if (!branches_differ) {
351 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(&commit->parent_ids);
352 bee6b577 2018-09-19 stsp if (qid == NULL)
353 bee6b577 2018-09-19 stsp return NULL;
354 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
356 b36429ab 2018-11-05 stsp return NULL;
357 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids,
359 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
360 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
361 8e291695 2020-01-04 stsp qid->id, NULL);
365 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
366 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches, qid->id))
368 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids, qid->id))
369 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
370 8e291695 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, qid->id, NULL);
372 0ed6ed4c 2018-06-13 stsp return err;
375 b43fbaa0 2018-06-11 stsp return NULL;
378 de56b2d7 2020-01-04 stsp const struct got_error *
379 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
380 3d509237 2020-01-04 stsp const char *path, int first_parent_traversal)
382 22220781 2020-01-04 stsp const struct got_error *err = NULL;
384 3ddcebf3 2020-01-04 stsp *graph = calloc(1, sizeof(**graph));
385 3d509237 2020-01-04 stsp if (*graph == NULL)
386 3ddcebf3 2020-01-04 stsp return got_error_from_errno("calloc");
388 88cdb9c6 2020-01-04 stsp TAILQ_INIT(&(*graph)->iter_list);
390 3ddcebf3 2020-01-04 stsp (*graph)->path = strdup(path);
391 3ddcebf3 2020-01-04 stsp if ((*graph)->path == NULL) {
392 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("strdup");
396 3ddcebf3 2020-01-04 stsp (*graph)->node_ids = got_object_idset_alloc();
397 3ddcebf3 2020-01-04 stsp if ((*graph)->node_ids == NULL) {
398 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
402 3ddcebf3 2020-01-04 stsp (*graph)->open_branches = got_object_idset_alloc();
403 3ddcebf3 2020-01-04 stsp if ((*graph)->open_branches == NULL) {
404 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
408 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
409 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
412 22220781 2020-01-04 stsp got_commit_graph_close(*graph);
413 22220781 2020-01-04 stsp *graph = NULL;
415 22220781 2020-01-04 stsp return err;
418 32777563 2018-11-07 stsp struct add_branch_tip_arg {
419 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
421 32777563 2018-11-07 stsp struct got_repository *repo;
422 32777563 2018-11-07 stsp struct got_commit_graph *graph;
425 cb103d04 2018-11-07 stsp static const struct got_error *
426 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
428 32777563 2018-11-07 stsp const struct got_error *err;
429 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
430 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
431 32777563 2018-11-07 stsp struct got_commit_object *commit;
433 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
435 32777563 2018-11-07 stsp return err;
437 ca6e02ac 2020-01-07 stsp err = add_node(&new_node, a->graph, commit_id, a->repo);
439 32777563 2018-11-07 stsp return err;
441 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
442 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
443 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
444 b565f6f8 2018-07-23 stsp a->ntips++;
446 cb103d04 2018-11-07 stsp return NULL;
449 1142eae9 2018-06-11 stsp static const struct got_error *
450 57eecd46 2020-01-04 stsp fetch_commits_from_open_branches(struct got_commit_graph *graph,
451 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
453 372ccdbb 2018-06-10 stsp const struct got_error *err;
454 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
455 32777563 2018-11-07 stsp int i, ntips;
457 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
458 32777563 2018-11-07 stsp if (ntips == 0)
459 372ccdbb 2018-06-10 stsp return NULL;
461 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
462 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
463 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
464 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
465 5e50c36a 2018-11-08 stsp sizeof(*tips));
466 b565f6f8 2018-07-23 stsp if (tips == NULL)
467 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
468 b565f6f8 2018-07-23 stsp graph->tips = tips;
469 32777563 2018-11-07 stsp graph->ntips = ntips;
471 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
472 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
473 32777563 2018-11-07 stsp arg.repo = repo;
474 32777563 2018-11-07 stsp arg.graph = graph;
475 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
480 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
481 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
482 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
483 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
484 13a851c1 2020-01-04 stsp int changed;
486 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
487 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
492 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
493 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
494 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
496 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, commit_id,
497 13a851c1 2020-01-04 stsp graph->path, repo);
499 13a851c1 2020-01-04 stsp if (err->code != GOT_ERR_NO_OBJ)
502 13a851c1 2020-01-04 stsp * History of the path stops here on the current
503 13a851c1 2020-01-04 stsp * branch. Keep going on other branches.
505 32c85d2c 2020-01-06 stsp err = close_branch(graph, commit_id);
510 57eecd46 2020-01-04 stsp if (changed)
511 ca6e02ac 2020-01-07 stsp add_node_to_iter_list(graph, new_node,
512 ca6e02ac 2020-01-07 stsp got_object_commit_get_committer_time(commit));
513 14159a7b 2020-01-04 stsp err = advance_branch(graph, commit_id, commit, repo);
518 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
519 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
520 372ccdbb 2018-06-10 stsp return err;
524 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
526 22220781 2020-01-04 stsp if (graph->open_branches)
527 22220781 2020-01-04 stsp got_object_idset_free(graph->open_branches);
528 22220781 2020-01-04 stsp if (graph->node_ids)
529 22220781 2020-01-04 stsp got_object_idset_free(graph->node_ids);
530 b565f6f8 2018-07-23 stsp free(graph->tips);
531 31cedeaf 2018-09-15 stsp free(graph->path);
532 372ccdbb 2018-06-10 stsp free(graph);
535 372ccdbb 2018-06-10 stsp const struct got_error *
536 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
537 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
538 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
540 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
542 3d509237 2020-01-04 stsp if (!TAILQ_EMPTY(&graph->iter_list))
543 3d509237 2020-01-04 stsp return got_error(GOT_ERR_ITER_BUSY);
545 3ff3126d 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, id, NULL);
547 7e33c8c5 2020-01-04 stsp return err;
549 3ff3126d 2020-01-04 stsp /* Locate first commit which changed graph->path. */
550 94489f7d 2020-01-04 stsp while (TAILQ_EMPTY(&graph->iter_list) &&
551 3ff3126d 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
552 3ff3126d 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
553 3ff3126d 2020-01-04 stsp cancel_cb, cancel_arg);
555 7e33c8c5 2020-01-04 stsp return err;
558 94489f7d 2020-01-04 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
559 5175b31a 2020-01-04 stsp const char *path;
560 5175b31a 2020-01-04 stsp if (got_path_is_root_dir(graph->path))
561 5175b31a 2020-01-04 stsp return got_error_no_obj(id);
562 5175b31a 2020-01-04 stsp path = graph->path;
563 5175b31a 2020-01-04 stsp while (path[0] == '/')
565 5175b31a 2020-01-04 stsp return got_error_path(path, GOT_ERR_NO_TREE_ENTRY);
568 7e33c8c5 2020-01-04 stsp return NULL;
571 372ccdbb 2018-06-10 stsp const struct got_error *
572 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
573 ee780d5c 2020-01-04 stsp struct got_commit_graph *graph, struct got_repository *repo,
574 ee780d5c 2020-01-04 stsp got_cancel_cb cancel_cb, void *cancel_arg)
576 ee780d5c 2020-01-04 stsp const struct got_error *err = NULL;
577 94489f7d 2020-01-04 stsp struct got_commit_graph_node *node;
579 9ba79e04 2018-06-11 stsp *id = NULL;
581 df8cd9c6 2020-01-05 stsp node = TAILQ_FIRST(&graph->iter_list);
582 df8cd9c6 2020-01-05 stsp if (node == NULL) {
583 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
584 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
587 94489f7d 2020-01-04 stsp while (TAILQ_NEXT(node, entry) == NULL &&
588 ee780d5c 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
589 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
590 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
592 ee780d5c 2020-01-04 stsp return err;
595 94489f7d 2020-01-04 stsp *id = &node->id;
596 94489f7d 2020-01-04 stsp TAILQ_REMOVE(&graph->iter_list, node, entry);
597 372ccdbb 2018-06-10 stsp return NULL;
600 a9833bc9 2019-05-13 stsp const struct got_error *
601 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
602 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
603 4e91ef15 2021-09-26 stsp int first_parent_traversal,
604 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
606 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
607 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
608 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
609 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
611 a9833bc9 2019-05-13 stsp *yca_id = NULL;
613 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
614 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
615 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
617 4e91ef15 2021-09-26 stsp err = got_commit_graph_open(&graph, "/", first_parent_traversal);
621 4e91ef15 2021-09-26 stsp err = got_commit_graph_open(&graph2, "/", first_parent_traversal);
625 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
626 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
630 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
631 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
636 ee780d5c 2020-01-04 stsp struct got_object_id *id = NULL, *id2 = NULL;
638 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
639 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
644 a9833bc9 2019-05-13 stsp if (!completed) {
645 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
646 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
648 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
650 ee780d5c 2020-01-04 stsp err = NULL;
651 ee780d5c 2020-01-04 stsp completed = 1;
655 a9833bc9 2019-05-13 stsp if (!completed2) {
656 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id2, graph2, repo,
657 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
659 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
661 ee780d5c 2020-01-04 stsp err = NULL;
662 ee780d5c 2020-01-04 stsp completed2 = 1;
667 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id)) {
668 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
669 a9833bc9 2019-05-13 stsp if (*yca_id)
671 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
675 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id, NULL);
680 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id2)) {
681 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
682 a9833bc9 2019-05-13 stsp if (*yca_id)
684 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
688 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id2, NULL);
693 a9833bc9 2019-05-13 stsp if (completed && completed2) {
694 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
700 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
702 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
703 a9833bc9 2019-05-13 stsp if (graph2)
704 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
705 a9833bc9 2019-05-13 stsp return err;
