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 372ccdbb 2018-06-10 stsp #include <stdio.h>
23 372ccdbb 2018-06-10 stsp #include <stdlib.h>
24 372ccdbb 2018-06-10 stsp #include <string.h>
25 372ccdbb 2018-06-10 stsp #include <sha1.h>
26 372ccdbb 2018-06-10 stsp #include <zlib.h>
27 372ccdbb 2018-06-10 stsp #include <ctype.h>
29 372ccdbb 2018-06-10 stsp #include "got_error.h"
30 372ccdbb 2018-06-10 stsp #include "got_object.h"
31 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
32 324d37e7 2019-05-11 stsp #include "got_path.h"
34 372ccdbb 2018-06-10 stsp #include "got_lib_delta.h"
35 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
36 372ccdbb 2018-06-10 stsp #include "got_lib_object.h"
37 372ccdbb 2018-06-10 stsp #include "got_lib_object_idset.h"
39 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
40 372ccdbb 2018-06-10 stsp struct got_object_id id;
41 73026088 2018-11-18 stsp time_t timestamp;
43 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
44 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
47 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
49 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip {
50 32777563 2018-11-07 stsp struct got_object_id *commit_id;
51 32777563 2018-11-07 stsp struct got_commit_object *commit;
52 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
53 32777563 2018-11-07 stsp int changed;
54 32777563 2018-11-07 stsp int branch_done;
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;
61 372ccdbb 2018-06-10 stsp /* The commit at which traversal began (youngest commit in node_ids). */
62 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *head_node;
65 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
68 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
69 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
70 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
71 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
72 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
74 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
75 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
76 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
78 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
79 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
80 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
82 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
84 32777563 2018-11-07 stsp /* Array of branch tips for fetch_commits_from_open_branches(). */
85 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
88 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
91 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
92 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
94 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
95 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
98 372ccdbb 2018-06-10 stsp static struct got_commit_graph *
99 31cedeaf 2018-09-15 stsp alloc_graph(const char *path)
101 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
103 372ccdbb 2018-06-10 stsp graph = calloc(1, sizeof(*graph));
104 372ccdbb 2018-06-10 stsp if (graph == NULL)
105 372ccdbb 2018-06-10 stsp return NULL;
107 31cedeaf 2018-09-15 stsp graph->path = strdup(path);
108 31cedeaf 2018-09-15 stsp if (graph->path == NULL) {
109 31cedeaf 2018-09-15 stsp free(graph);
110 31cedeaf 2018-09-15 stsp return NULL;
113 60f2eee1 2018-07-08 stsp graph->node_ids = got_object_idset_alloc();
114 372ccdbb 2018-06-10 stsp if (graph->node_ids == NULL) {
115 31cedeaf 2018-09-15 stsp free(graph->path);
116 372ccdbb 2018-06-10 stsp free(graph);
117 372ccdbb 2018-06-10 stsp return NULL;
120 60f2eee1 2018-07-08 stsp graph->open_branches = got_object_idset_alloc();
121 372ccdbb 2018-06-10 stsp if (graph->open_branches == NULL) {
122 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
123 31cedeaf 2018-09-15 stsp free(graph->path);
124 372ccdbb 2018-06-10 stsp free(graph);
125 372ccdbb 2018-06-10 stsp return NULL;
128 31920504 2018-06-11 stsp TAILQ_INIT(&graph->iter_list);
129 372ccdbb 2018-06-10 stsp return graph;
132 31cedeaf 2018-09-15 stsp static const struct got_error *
133 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
134 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
135 31cedeaf 2018-09-15 stsp struct got_repository *repo)
137 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
138 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
139 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
140 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
142 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
143 31cedeaf 2018-09-15 stsp *changed = 1;
144 31cedeaf 2018-09-15 stsp return NULL;
147 31cedeaf 2018-09-15 stsp *changed = 0;
149 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
150 31cedeaf 2018-09-15 stsp if (pid == NULL) {
151 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
152 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
154 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
155 fd1d2703 2018-11-04 stsp err = NULL;
157 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
158 31cedeaf 2018-09-15 stsp free(obj_id);
159 0e9101d5 2018-11-18 stsp return err;
162 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
164 0e9101d5 2018-11-18 stsp return err;
166 0e9101d5 2018-11-18 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
170 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
174 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
177 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
179 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
180 31cedeaf 2018-09-15 stsp if (pcommit)
181 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
182 31cedeaf 2018-09-15 stsp return err;
185 4626e416 2018-06-10 stsp static void
186 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
187 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *node,
188 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *child_node)
190 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
192 31920504 2018-06-11 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
193 bee6b577 2018-09-19 stsp TAILQ_INSERT_HEAD(&graph->iter_list, node, entry);
194 bee6b577 2018-09-19 stsp graph->iter_node = node;
198 bee6b577 2018-09-19 stsp n = graph->iter_node;
199 fe8df4c2 2018-06-16 stsp /* Ensure that an iteration in progress will see this new commit. */
200 bee6b577 2018-09-19 stsp while (n) {
201 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
202 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
203 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
208 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
211 0ed6ed4c 2018-06-13 stsp static const struct got_error *
212 31cedeaf 2018-09-15 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
214 31cedeaf 2018-09-15 stsp const struct got_error *err;
216 31cedeaf 2018-09-15 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
217 31cedeaf 2018-09-15 stsp if (err && err->code != GOT_ERR_NO_OBJ)
218 31cedeaf 2018-09-15 stsp return err;
219 31cedeaf 2018-09-15 stsp return NULL;
222 31cedeaf 2018-09-15 stsp static const struct got_error *
223 31cedeaf 2018-09-15 stsp advance_branch(struct got_commit_graph *graph,
224 0ed6ed4c 2018-06-13 stsp struct got_commit_graph_node *node,
225 41fa1437 2018-11-05 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
226 bee6b577 2018-09-19 stsp struct got_repository *repo)
228 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
229 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
231 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
233 0ed6ed4c 2018-06-13 stsp return err;
235 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
236 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
237 9b88e78c 2018-11-18 stsp if (qid == NULL ||
238 9b88e78c 2018-11-18 stsp got_object_idset_get(graph->open_branches, qid->id))
239 0ed6ed4c 2018-06-13 stsp return NULL;
240 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
241 9b88e78c 2018-11-18 stsp qid->id, node);
245 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
246 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
248 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
249 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
250 bee6b577 2018-09-19 stsp int branches_differ = 0;
252 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
253 bee6b577 2018-09-19 stsp graph->path);
255 bee6b577 2018-09-19 stsp return err;
257 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
258 6dcdad08 2018-11-18 stsp struct got_object_id *id;
260 9b88e78c 2018-11-18 stsp if (got_object_idset_get(graph->open_branches, qid->id))
263 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
264 bee6b577 2018-09-19 stsp graph->path);
266 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
267 bee6b577 2018-09-19 stsp branches_differ = 1;
270 6dcdad08 2018-11-18 stsp free(merged_id);
271 6dcdad08 2018-11-18 stsp free(prev_id);
272 bee6b577 2018-09-19 stsp return err;
275 bee6b577 2018-09-19 stsp if (prev_id) {
276 bee6b577 2018-09-19 stsp if (!branches_differ &&
277 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
278 bee6b577 2018-09-19 stsp branches_differ = 1;
279 6dcdad08 2018-11-18 stsp free(prev_id);
281 6dcdad08 2018-11-18 stsp prev_id = id;
284 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
285 bee6b577 2018-09-19 stsp * skip any other branches.
287 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
288 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
289 b36429ab 2018-11-05 stsp qid->id, node);
290 6dcdad08 2018-11-18 stsp free(merged_id);
292 b36429ab 2018-11-05 stsp return err;
296 6dcdad08 2018-11-18 stsp free(prev_id);
297 6dcdad08 2018-11-18 stsp prev_id = NULL;
298 6dcdad08 2018-11-18 stsp free(merged_id);
299 6dcdad08 2018-11-18 stsp merged_id = NULL;
302 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
303 bee6b577 2018-09-19 stsp * follow the first parent only.
305 bee6b577 2018-09-19 stsp if (!branches_differ) {
306 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
307 bee6b577 2018-09-19 stsp if (qid == NULL)
308 bee6b577 2018-09-19 stsp return NULL;
309 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
310 b36429ab 2018-11-05 stsp return NULL;
311 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
312 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
313 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
314 b36429ab 2018-11-05 stsp qid->id, node);
318 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
319 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
321 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
322 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
323 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
325 0ed6ed4c 2018-06-13 stsp return err;
328 b43fbaa0 2018-06-11 stsp return NULL;
331 b43fbaa0 2018-06-11 stsp static const struct got_error *
332 649fc316 2018-11-05 stsp add_node(struct got_commit_graph_node **new_node, int *changed,
333 1bf85b22 2018-11-07 stsp int *branch_done, struct got_commit_graph *graph,
334 1bf85b22 2018-11-07 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
335 1bf85b22 2018-11-07 stsp struct got_commit_graph_node *child_node, struct got_repository *repo)
337 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
338 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
340 372ccdbb 2018-06-10 stsp *new_node = NULL;
341 649fc316 2018-11-05 stsp *changed = 0;
342 1bf85b22 2018-11-07 stsp *branch_done = 0;
344 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
345 372ccdbb 2018-06-10 stsp if (node == NULL)
346 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
348 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
349 73026088 2018-11-18 stsp node->timestamp = commit->committer_time;
351 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->node_ids, &node->id, node);
353 7a62478b 2018-11-18 stsp free(node);
354 372ccdbb 2018-06-10 stsp return err;
357 649fc316 2018-11-05 stsp err = detect_changed_path(changed, commit, commit_id, graph->path,
360 31cedeaf 2018-09-15 stsp if (err->code == GOT_ERR_NO_OBJ) {
362 31cedeaf 2018-09-15 stsp * History of the path stops here on the current
363 31cedeaf 2018-09-15 stsp * branch. Keep going on other branches.
365 31cedeaf 2018-09-15 stsp err = NULL;
366 1bf85b22 2018-11-07 stsp *branch_done = 1;
368 45f209d7 2018-11-18 stsp got_object_idset_remove(NULL, graph->node_ids,
369 45f209d7 2018-11-18 stsp &node->id);
370 7a62478b 2018-11-18 stsp free(node);
371 31cedeaf 2018-09-15 stsp return err;
375 ce95c694 2018-11-18 stsp if (*changed)
376 ce95c694 2018-11-18 stsp add_node_to_iter_list(graph, node, child_node);
377 ce95c694 2018-11-18 stsp *new_node = node;
378 ce95c694 2018-11-18 stsp return NULL;
381 c4d7a9c4 2018-06-11 stsp const struct got_error *
382 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
383 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
384 31cedeaf 2018-09-15 stsp int first_parent_traversal, struct got_repository *repo)
386 c4d7a9c4 2018-06-11 stsp const struct got_error *err = NULL;
387 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
388 1bf85b22 2018-11-07 stsp int changed, branch_done;
390 c4d7a9c4 2018-06-11 stsp *graph = NULL;
392 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
394 372ccdbb 2018-06-10 stsp return err;
396 31cedeaf 2018-09-15 stsp /* The path must exist in our initial commit. */
397 31cedeaf 2018-09-15 stsp if (!got_path_is_root_dir(path)) {
398 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
399 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
401 31cedeaf 2018-09-15 stsp return err;
402 31cedeaf 2018-09-15 stsp free(obj_id);
405 31cedeaf 2018-09-15 stsp *graph = alloc_graph(path);
406 372ccdbb 2018-06-10 stsp if (*graph == NULL) {
407 202329ae 2019-08-11 stsp err = got_error_from_errno("alloc_graph");
408 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
409 202329ae 2019-08-11 stsp return err;
412 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
413 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
415 1bf85b22 2018-11-07 stsp err = add_node(&(*graph)->head_node, &changed, &branch_done, *graph,
416 1bf85b22 2018-11-07 stsp commit_id, commit, NULL, repo);
417 1bf85b22 2018-11-07 stsp if (err == NULL) {
418 1bf85b22 2018-11-07 stsp err = advance_branch(*graph, (*graph)->head_node, commit_id,
419 1bf85b22 2018-11-07 stsp commit, repo);
421 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
423 372ccdbb 2018-06-10 stsp got_commit_graph_close(*graph);
424 372ccdbb 2018-06-10 stsp *graph = NULL;
425 372ccdbb 2018-06-10 stsp return err;
428 372ccdbb 2018-06-10 stsp return NULL;
431 32777563 2018-11-07 stsp struct add_branch_tip_arg {
432 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
434 32777563 2018-11-07 stsp struct got_repository *repo;
435 32777563 2018-11-07 stsp struct got_commit_graph *graph;
438 cb103d04 2018-11-07 stsp static const struct got_error *
439 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
441 32777563 2018-11-07 stsp const struct got_error *err;
442 32777563 2018-11-07 stsp struct got_commit_graph_node *child_node = data;
443 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
444 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
445 32777563 2018-11-07 stsp struct got_commit_object *commit;
446 32777563 2018-11-07 stsp int changed, branch_done;
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 32777563 2018-11-07 stsp err = add_node(&new_node, &changed, &branch_done, a->graph,
453 32777563 2018-11-07 stsp commit_id, commit, child_node, a->repo);
455 32777563 2018-11-07 stsp return err;
457 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
458 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
459 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
460 32777563 2018-11-07 stsp a->tips[a->ntips].changed = changed;
461 32777563 2018-11-07 stsp a->tips[a->ntips].branch_done = branch_done;
462 b565f6f8 2018-07-23 stsp a->ntips++;
464 cb103d04 2018-11-07 stsp return NULL;
467 1142eae9 2018-06-11 stsp static const struct got_error *
468 32777563 2018-11-07 stsp fetch_commits_from_open_branches(int *nfetched,
469 31cedeaf 2018-09-15 stsp struct got_object_id **changed_id, struct got_commit_graph *graph,
470 644e44ed 2018-11-04 stsp struct got_repository *repo)
472 372ccdbb 2018-06-10 stsp const struct got_error *err;
473 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
474 32777563 2018-11-07 stsp int i, ntips;
476 32777563 2018-11-07 stsp *nfetched = 0;
477 818c7501 2019-07-11 stsp if (changed_id)
478 818c7501 2019-07-11 stsp *changed_id = NULL;
480 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
481 32777563 2018-11-07 stsp if (ntips == 0)
482 372ccdbb 2018-06-10 stsp return NULL;
484 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
485 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
486 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
487 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
488 5e50c36a 2018-11-08 stsp sizeof(*tips));
489 b565f6f8 2018-07-23 stsp if (tips == NULL)
490 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
491 b565f6f8 2018-07-23 stsp graph->tips = tips;
492 32777563 2018-11-07 stsp graph->ntips = ntips;
494 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
495 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
496 32777563 2018-11-07 stsp arg.repo = repo;
497 32777563 2018-11-07 stsp arg.graph = graph;
498 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
503 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
504 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
505 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
506 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
507 32777563 2018-11-07 stsp int branch_done, changed;
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;
512 32777563 2018-11-07 stsp branch_done = arg.tips[i].branch_done;
513 32777563 2018-11-07 stsp changed = arg.tips[i].changed;
515 1bf85b22 2018-11-07 stsp if (branch_done)
516 1bf85b22 2018-11-07 stsp err = close_branch(graph, commit_id);
518 1bf85b22 2018-11-07 stsp err = advance_branch(graph, new_node, commit_id,
519 1bf85b22 2018-11-07 stsp commit, repo);
522 818c7501 2019-07-11 stsp if (changed && changed_id && *changed_id == NULL)
523 32777563 2018-11-07 stsp *changed_id = commit_id;
526 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
527 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
528 32777563 2018-11-07 stsp (*nfetched) = arg.ntips;
529 372ccdbb 2018-06-10 stsp return err;
532 372ccdbb 2018-06-10 stsp const struct got_error *
533 31cedeaf 2018-09-15 stsp got_commit_graph_fetch_commits(struct got_commit_graph *graph, int limit,
534 31cedeaf 2018-09-15 stsp struct got_repository *repo)
536 372ccdbb 2018-06-10 stsp const struct got_error *err;
537 31cedeaf 2018-09-15 stsp int nfetched = 0, ncommits;
538 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
540 31cedeaf 2018-09-15 stsp while (nfetched < limit) {
541 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
542 644e44ed 2018-11-04 stsp &changed_id, graph, repo);
544 372ccdbb 2018-06-10 stsp return err;
545 372ccdbb 2018-06-10 stsp if (ncommits == 0)
547 31cedeaf 2018-09-15 stsp if (changed_id)
548 31cedeaf 2018-09-15 stsp nfetched += ncommits;
551 372ccdbb 2018-06-10 stsp return NULL;
554 cb103d04 2018-11-07 stsp static const struct got_error *
555 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
557 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
558 7a62478b 2018-11-18 stsp free(node);
559 cb103d04 2018-11-07 stsp return NULL;
563 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
565 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->open_branches);
566 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
567 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
568 b565f6f8 2018-07-23 stsp free(graph->tips);
569 31cedeaf 2018-09-15 stsp free(graph->path);
570 372ccdbb 2018-06-10 stsp free(graph);
573 372ccdbb 2018-06-10 stsp const struct got_error *
574 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
575 31cedeaf 2018-09-15 stsp struct got_object_id *id, struct got_repository *repo)
577 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
578 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
579 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
580 31cedeaf 2018-09-15 stsp int changed;
582 372ccdbb 2018-06-10 stsp start_node = got_object_idset_get(graph->node_ids, id);
583 818c7501 2019-07-11 stsp while (start_node == NULL) {
584 818c7501 2019-07-11 stsp int ncommits;
585 818c7501 2019-07-11 stsp err = fetch_commits_from_open_branches(&ncommits, NULL, graph,
588 818c7501 2019-07-11 stsp return err;
589 818c7501 2019-07-11 stsp if (ncommits == 0)
590 818c7501 2019-07-11 stsp return got_error_no_obj(id);
591 818c7501 2019-07-11 stsp start_node = got_object_idset_get(graph->node_ids, id);
594 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, &start_node->id);
596 31cedeaf 2018-09-15 stsp return err;
598 31cedeaf 2018-09-15 stsp err = detect_changed_path(&changed, commit, &start_node->id,
599 31cedeaf 2018-09-15 stsp graph->path, repo);
601 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
602 31cedeaf 2018-09-15 stsp return err;
605 31cedeaf 2018-09-15 stsp if (!changed) {
606 31cedeaf 2018-09-15 stsp /* Locate first commit which changed graph->path. */
607 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
608 31cedeaf 2018-09-15 stsp while (changed_id == NULL) {
609 31cedeaf 2018-09-15 stsp int ncommits;
610 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
611 644e44ed 2018-11-04 stsp &changed_id, graph, repo);
613 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
614 31cedeaf 2018-09-15 stsp return err;
617 31cedeaf 2018-09-15 stsp start_node = got_object_idset_get(graph->node_ids, changed_id);
619 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
621 372ccdbb 2018-06-10 stsp graph->iter_node = start_node;
622 372ccdbb 2018-06-10 stsp return NULL;
625 372ccdbb 2018-06-10 stsp const struct got_error *
626 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
627 b43fbaa0 2018-06-11 stsp struct got_commit_graph *graph)
629 9ba79e04 2018-06-11 stsp *id = NULL;
631 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
632 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
633 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
636 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
637 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
638 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
639 2c7f8870 2018-09-19 stsp /* We are done iterating. */
640 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
641 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
642 6bc66952 2018-09-19 stsp return NULL;
645 9ba79e04 2018-06-11 stsp if (TAILQ_NEXT(graph->iter_node, entry) == NULL)
646 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_ITER_NEED_MORE);
648 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
649 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
650 372ccdbb 2018-06-10 stsp return NULL;
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 a9833bc9 2019-05-13 stsp struct got_repository *repo)
658 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
659 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
660 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
661 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
663 a9833bc9 2019-05-13 stsp *yca_id = NULL;
665 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
666 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
667 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
669 a9833bc9 2019-05-13 stsp err = got_commit_graph_open(&graph, commit_id, "/", 1, repo);
673 a9833bc9 2019-05-13 stsp err = got_commit_graph_open(&graph2, commit_id2, "/", 1, repo);
677 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_start(graph, commit_id, repo);
681 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo);
686 a9833bc9 2019-05-13 stsp struct got_object_id *id, *id2;
688 a9833bc9 2019-05-13 stsp if (!completed) {
689 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_next(&id, graph);
691 a9833bc9 2019-05-13 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
692 a9833bc9 2019-05-13 stsp completed = 1;
693 a9833bc9 2019-05-13 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
695 a9833bc9 2019-05-13 stsp err = got_commit_graph_fetch_commits(graph, 1,
702 a9833bc9 2019-05-13 stsp if (!completed2) {
703 a9833bc9 2019-05-13 stsp err = got_commit_graph_iter_next(&id2, graph2);
705 a9833bc9 2019-05-13 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
706 a9833bc9 2019-05-13 stsp completed2 = 1;
707 a9833bc9 2019-05-13 stsp else if (err->code != GOT_ERR_ITER_NEED_MORE)
709 a9833bc9 2019-05-13 stsp err = got_commit_graph_fetch_commits(graph2, 1,
717 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id)) {
718 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
719 a9833bc9 2019-05-13 stsp if (*yca_id)
721 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
725 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id, id);
730 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id2)) {
731 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
732 a9833bc9 2019-05-13 stsp if (*yca_id)
734 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
738 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id2, id2);
743 a9833bc9 2019-05-13 stsp if (completed && completed2) {
744 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
750 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
752 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
753 a9833bc9 2019-05-13 stsp if (graph2)
754 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
755 a9833bc9 2019-05-13 stsp return err;
