Blame


1 372ccdbb 2018-06-10 stsp /*
2 372ccdbb 2018-06-10 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
3 372ccdbb 2018-06-10 stsp *
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.
7 372ccdbb 2018-06-10 stsp *
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.
15 372ccdbb 2018-06-10 stsp */
16 372ccdbb 2018-06-10 stsp
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>
21 372ccdbb 2018-06-10 stsp
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>
29 372ccdbb 2018-06-10 stsp
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"
35 372ccdbb 2018-06-10 stsp
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"
40 372ccdbb 2018-06-10 stsp
41 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
42 372ccdbb 2018-06-10 stsp struct got_object_id id;
43 73026088 2018-11-18 stsp time_t timestamp;
44 b43fbaa0 2018-06-11 stsp
45 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
46 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
47 372ccdbb 2018-06-10 stsp };
48 372ccdbb 2018-06-10 stsp
49 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
50 9ba79e04 2018-06-11 stsp
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;
55 b565f6f8 2018-07-23 stsp };
56 b565f6f8 2018-07-23 stsp
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;
60 372ccdbb 2018-06-10 stsp
61 0ed6ed4c 2018-06-13 stsp int flags;
62 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
63 0ed6ed4c 2018-06-13 stsp
64 372ccdbb 2018-06-10 stsp /*
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.
70 372ccdbb 2018-06-10 stsp *
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.
74 372ccdbb 2018-06-10 stsp *
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.
78 372ccdbb 2018-06-10 stsp */
79 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
80 b565f6f8 2018-07-23 stsp
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;
83 5e50c36a 2018-11-08 stsp int ntips;
84 372ccdbb 2018-06-10 stsp
85 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
86 31cedeaf 2018-09-15 stsp char *path;
87 31cedeaf 2018-09-15 stsp
88 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
89 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
90 372ccdbb 2018-06-10 stsp
91 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
92 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
93 372ccdbb 2018-06-10 stsp };
94 372ccdbb 2018-06-10 stsp
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)
99 31cedeaf 2018-09-15 stsp {
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;
104 31cedeaf 2018-09-15 stsp
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;
108 31cedeaf 2018-09-15 stsp }
109 31cedeaf 2018-09-15 stsp
110 31cedeaf 2018-09-15 stsp *changed = 0;
111 31cedeaf 2018-09-15 stsp
112 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
113 31cedeaf 2018-09-15 stsp if (pid == NULL) {
114 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
115 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
116 fd1d2703 2018-11-04 stsp if (err) {
117 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
118 fd1d2703 2018-11-04 stsp err = NULL;
119 fd1d2703 2018-11-04 stsp } else
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;
123 0e9101d5 2018-11-18 stsp }
124 7310c1c3 2018-11-18 stsp
125 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
126 0e9101d5 2018-11-18 stsp if (err)
127 0e9101d5 2018-11-18 stsp return err;
128 372ccdbb 2018-06-10 stsp
129 0e9101d5 2018-11-18 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
130 0e9101d5 2018-11-18 stsp if (err)
131 0e9101d5 2018-11-18 stsp goto done;
132 0e9101d5 2018-11-18 stsp
133 0e9101d5 2018-11-18 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
134 0e9101d5 2018-11-18 stsp if (err)
135 0e9101d5 2018-11-18 stsp goto done;
136 0e9101d5 2018-11-18 stsp
137 81a966c0 2018-11-18 stsp err = got_object_tree_path_changed(changed, tree, ptree, path, repo);
138 31cedeaf 2018-09-15 stsp done:
139 31cedeaf 2018-09-15 stsp if (tree)
140 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
141 31cedeaf 2018-09-15 stsp if (ptree)
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;
146 31cedeaf 2018-09-15 stsp }
147 31cedeaf 2018-09-15 stsp
148 4626e416 2018-06-10 stsp static void
149 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
150 de56b2d7 2020-01-04 stsp struct got_commit_graph_node *node)
151 372ccdbb 2018-06-10 stsp {
152 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
153 1c7a5dcb 2018-09-15 stsp
154 31920504 2018-06-11 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
155 bee6b577 2018-09-19 stsp TAILQ_INSERT_HEAD(&graph->iter_list, node, entry);
156 bee6b577 2018-09-19 stsp graph->iter_node = node;
157 4626e416 2018-06-10 stsp return;
158 372ccdbb 2018-06-10 stsp }
159 372ccdbb 2018-06-10 stsp
160 bee6b577 2018-09-19 stsp n = graph->iter_node;
161 fe8df4c2 2018-06-16 stsp /* Ensure that an iteration in progress will see this new commit. */
162 bee6b577 2018-09-19 stsp while (n) {
163 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
164 73026088 2018-11-18 stsp if (next && node->timestamp >= next->timestamp) {
165 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
166 bee6b577 2018-09-19 stsp return;
167 fe8df4c2 2018-06-16 stsp }
168 bee6b577 2018-09-19 stsp n = next;
169 fe8df4c2 2018-06-16 stsp }
170 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
171 0ed6ed4c 2018-06-13 stsp }
172 0ed6ed4c 2018-06-13 stsp
173 0ed6ed4c 2018-06-13 stsp static const struct got_error *
174 31cedeaf 2018-09-15 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
175 31cedeaf 2018-09-15 stsp {
176 31cedeaf 2018-09-15 stsp const struct got_error *err;
177 31cedeaf 2018-09-15 stsp
178 31cedeaf 2018-09-15 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
179 31cedeaf 2018-09-15 stsp if (err && err->code != GOT_ERR_NO_OBJ)
180 31cedeaf 2018-09-15 stsp return err;
181 31cedeaf 2018-09-15 stsp return NULL;
182 31cedeaf 2018-09-15 stsp }
183 31cedeaf 2018-09-15 stsp
184 31cedeaf 2018-09-15 stsp static const struct got_error *
185 31cedeaf 2018-09-15 stsp advance_branch(struct got_commit_graph *graph,
186 0ed6ed4c 2018-06-13 stsp struct got_commit_graph_node *node,
187 41fa1437 2018-11-05 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
188 bee6b577 2018-09-19 stsp struct got_repository *repo)
189 0ed6ed4c 2018-06-13 stsp {
190 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
191 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
192 0ed6ed4c 2018-06-13 stsp
193 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
194 31cedeaf 2018-09-15 stsp if (err)
195 0ed6ed4c 2018-06-13 stsp return err;
196 0ed6ed4c 2018-06-13 stsp
197 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
198 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
199 9b88e78c 2018-11-18 stsp if (qid == NULL ||
200 9b88e78c 2018-11-18 stsp got_object_idset_get(graph->open_branches, qid->id))
201 0ed6ed4c 2018-06-13 stsp return NULL;
202 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
203 9b88e78c 2018-11-18 stsp qid->id, node);
204 bee6b577 2018-09-19 stsp }
205 bee6b577 2018-09-19 stsp
206 bee6b577 2018-09-19 stsp /*
207 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
208 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
209 bee6b577 2018-09-19 stsp */
210 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
211 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
212 bee6b577 2018-09-19 stsp int branches_differ = 0;
213 bee6b577 2018-09-19 stsp
214 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
215 bee6b577 2018-09-19 stsp graph->path);
216 bee6b577 2018-09-19 stsp if (err)
217 bee6b577 2018-09-19 stsp return err;
218 bee6b577 2018-09-19 stsp
219 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
220 6dcdad08 2018-11-18 stsp struct got_object_id *id;
221 6dcdad08 2018-11-18 stsp
222 9b88e78c 2018-11-18 stsp if (got_object_idset_get(graph->open_branches, qid->id))
223 9b88e78c 2018-11-18 stsp continue;
224 bee6b577 2018-09-19 stsp
225 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
226 bee6b577 2018-09-19 stsp graph->path);
227 bee6b577 2018-09-19 stsp if (err) {
228 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
229 bee6b577 2018-09-19 stsp branches_differ = 1;
230 bee6b577 2018-09-19 stsp continue;
231 bee6b577 2018-09-19 stsp }
232 6dcdad08 2018-11-18 stsp free(merged_id);
233 6dcdad08 2018-11-18 stsp free(prev_id);
234 bee6b577 2018-09-19 stsp return err;
235 bee6b577 2018-09-19 stsp }
236 bee6b577 2018-09-19 stsp
237 bee6b577 2018-09-19 stsp if (prev_id) {
238 bee6b577 2018-09-19 stsp if (!branches_differ &&
239 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
240 bee6b577 2018-09-19 stsp branches_differ = 1;
241 6dcdad08 2018-11-18 stsp free(prev_id);
242 6dcdad08 2018-11-18 stsp }
243 6dcdad08 2018-11-18 stsp prev_id = id;
244 bee6b577 2018-09-19 stsp
245 bee6b577 2018-09-19 stsp /*
246 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
247 bee6b577 2018-09-19 stsp * skip any other branches.
248 bee6b577 2018-09-19 stsp */
249 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
250 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
251 b36429ab 2018-11-05 stsp qid->id, node);
252 6dcdad08 2018-11-18 stsp free(merged_id);
253 6dcdad08 2018-11-18 stsp free(id);
254 b36429ab 2018-11-05 stsp return err;
255 bee6b577 2018-09-19 stsp }
256 bee6b577 2018-09-19 stsp }
257 6dcdad08 2018-11-18 stsp
258 6dcdad08 2018-11-18 stsp free(prev_id);
259 6dcdad08 2018-11-18 stsp prev_id = NULL;
260 6dcdad08 2018-11-18 stsp free(merged_id);
261 6dcdad08 2018-11-18 stsp merged_id = NULL;
262 bee6b577 2018-09-19 stsp
263 bee6b577 2018-09-19 stsp /*
264 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
265 bee6b577 2018-09-19 stsp * follow the first parent only.
266 bee6b577 2018-09-19 stsp */
267 bee6b577 2018-09-19 stsp if (!branches_differ) {
268 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
269 bee6b577 2018-09-19 stsp if (qid == NULL)
270 bee6b577 2018-09-19 stsp return NULL;
271 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
272 b36429ab 2018-11-05 stsp return NULL;
273 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
274 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
275 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
276 b36429ab 2018-11-05 stsp qid->id, node);
277 bee6b577 2018-09-19 stsp }
278 0ed6ed4c 2018-06-13 stsp }
279 0ed6ed4c 2018-06-13 stsp
280 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
281 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
282 b36429ab 2018-11-05 stsp continue;
283 998ff57f 2018-11-18 stsp if (got_object_idset_get(graph->node_ids, qid->id))
284 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
285 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
286 b36429ab 2018-11-05 stsp if (err)
287 0ed6ed4c 2018-06-13 stsp return err;
288 0ed6ed4c 2018-06-13 stsp }
289 0ed6ed4c 2018-06-13 stsp
290 b43fbaa0 2018-06-11 stsp return NULL;
291 fb5b9d5a 2018-07-23 stsp }
292 fb5b9d5a 2018-07-23 stsp
293 b43fbaa0 2018-06-11 stsp static const struct got_error *
294 de56b2d7 2020-01-04 stsp add_node(struct got_commit_graph_node **new_node,
295 de56b2d7 2020-01-04 stsp struct got_commit_graph *graph,
296 de56b2d7 2020-01-04 stsp struct got_object_id *commit_id,
297 de56b2d7 2020-01-04 stsp struct got_commit_object *commit,
298 de56b2d7 2020-01-04 stsp struct got_repository *repo)
299 372ccdbb 2018-06-10 stsp {
300 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
301 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
302 372ccdbb 2018-06-10 stsp
303 372ccdbb 2018-06-10 stsp *new_node = NULL;
304 372ccdbb 2018-06-10 stsp
305 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
306 372ccdbb 2018-06-10 stsp if (node == NULL)
307 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
308 372ccdbb 2018-06-10 stsp
309 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
310 73026088 2018-11-18 stsp node->timestamp = commit->committer_time;
311 372ccdbb 2018-06-10 stsp
312 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->node_ids, &node->id, node);
313 de56b2d7 2020-01-04 stsp if (err)
314 7a62478b 2018-11-18 stsp free(node);
315 de56b2d7 2020-01-04 stsp else
316 de56b2d7 2020-01-04 stsp *new_node = node;
317 de56b2d7 2020-01-04 stsp return err;
318 de56b2d7 2020-01-04 stsp }
319 372ccdbb 2018-06-10 stsp
320 de56b2d7 2020-01-04 stsp const struct got_error *
321 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
322 3d509237 2020-01-04 stsp const char *path, int first_parent_traversal)
323 3d509237 2020-01-04 stsp {
324 22220781 2020-01-04 stsp const struct got_error *err = NULL;
325 3ddcebf3 2020-01-04 stsp
326 3ddcebf3 2020-01-04 stsp *graph = calloc(1, sizeof(**graph));
327 3d509237 2020-01-04 stsp if (*graph == NULL)
328 3ddcebf3 2020-01-04 stsp return got_error_from_errno("calloc");
329 88cdb9c6 2020-01-04 stsp
330 88cdb9c6 2020-01-04 stsp TAILQ_INIT(&(*graph)->iter_list);
331 3ddcebf3 2020-01-04 stsp
332 3ddcebf3 2020-01-04 stsp (*graph)->path = strdup(path);
333 3ddcebf3 2020-01-04 stsp if ((*graph)->path == NULL) {
334 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("strdup");
335 22220781 2020-01-04 stsp goto done;
336 3ddcebf3 2020-01-04 stsp }
337 3ddcebf3 2020-01-04 stsp
338 3ddcebf3 2020-01-04 stsp (*graph)->node_ids = got_object_idset_alloc();
339 3ddcebf3 2020-01-04 stsp if ((*graph)->node_ids == NULL) {
340 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
341 22220781 2020-01-04 stsp goto done;
342 3ddcebf3 2020-01-04 stsp }
343 372ccdbb 2018-06-10 stsp
344 3ddcebf3 2020-01-04 stsp (*graph)->open_branches = got_object_idset_alloc();
345 3ddcebf3 2020-01-04 stsp if ((*graph)->open_branches == NULL) {
346 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
347 22220781 2020-01-04 stsp goto done;
348 3ddcebf3 2020-01-04 stsp }
349 3ddcebf3 2020-01-04 stsp
350 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
351 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
352 22220781 2020-01-04 stsp done:
353 22220781 2020-01-04 stsp if (err) {
354 22220781 2020-01-04 stsp got_commit_graph_close(*graph);
355 22220781 2020-01-04 stsp *graph = NULL;
356 22220781 2020-01-04 stsp }
357 22220781 2020-01-04 stsp return err;
358 372ccdbb 2018-06-10 stsp }
359 372ccdbb 2018-06-10 stsp
360 32777563 2018-11-07 stsp struct add_branch_tip_arg {
361 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
362 b565f6f8 2018-07-23 stsp int ntips;
363 32777563 2018-11-07 stsp struct got_repository *repo;
364 32777563 2018-11-07 stsp struct got_commit_graph *graph;
365 372ccdbb 2018-06-10 stsp };
366 372ccdbb 2018-06-10 stsp
367 cb103d04 2018-11-07 stsp static const struct got_error *
368 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
369 372ccdbb 2018-06-10 stsp {
370 32777563 2018-11-07 stsp const struct got_error *err;
371 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
372 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
373 32777563 2018-11-07 stsp struct got_commit_object *commit;
374 32777563 2018-11-07 stsp
375 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
376 32777563 2018-11-07 stsp if (err)
377 32777563 2018-11-07 stsp return err;
378 32777563 2018-11-07 stsp
379 de56b2d7 2020-01-04 stsp err = add_node(&new_node, a->graph, commit_id, commit, a->repo);
380 32777563 2018-11-07 stsp if (err)
381 32777563 2018-11-07 stsp return err;
382 32777563 2018-11-07 stsp
383 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
384 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
385 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
386 b565f6f8 2018-07-23 stsp a->ntips++;
387 32777563 2018-11-07 stsp
388 cb103d04 2018-11-07 stsp return NULL;
389 372ccdbb 2018-06-10 stsp }
390 372ccdbb 2018-06-10 stsp
391 1142eae9 2018-06-11 stsp static const struct got_error *
392 57eecd46 2020-01-04 stsp fetch_commits_from_open_branches(struct got_commit_graph *graph,
393 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
394 372ccdbb 2018-06-10 stsp {
395 372ccdbb 2018-06-10 stsp const struct got_error *err;
396 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
397 32777563 2018-11-07 stsp int i, ntips;
398 372ccdbb 2018-06-10 stsp
399 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
400 32777563 2018-11-07 stsp if (ntips == 0)
401 372ccdbb 2018-06-10 stsp return NULL;
402 372ccdbb 2018-06-10 stsp
403 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
404 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
405 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
406 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
407 5e50c36a 2018-11-08 stsp sizeof(*tips));
408 b565f6f8 2018-07-23 stsp if (tips == NULL)
409 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
410 b565f6f8 2018-07-23 stsp graph->tips = tips;
411 32777563 2018-11-07 stsp graph->ntips = ntips;
412 b565f6f8 2018-07-23 stsp }
413 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
414 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
415 32777563 2018-11-07 stsp arg.repo = repo;
416 32777563 2018-11-07 stsp arg.graph = graph;
417 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
418 32777563 2018-11-07 stsp &arg);
419 cb103d04 2018-11-07 stsp if (err)
420 32777563 2018-11-07 stsp goto done;
421 372ccdbb 2018-06-10 stsp
422 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
423 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
424 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
425 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
426 13a851c1 2020-01-04 stsp int changed;
427 372ccdbb 2018-06-10 stsp
428 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
429 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
430 6fb7cd11 2019-08-22 stsp if (err)
431 6fb7cd11 2019-08-22 stsp break;
432 6fb7cd11 2019-08-22 stsp }
433 6fb7cd11 2019-08-22 stsp
434 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
435 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
436 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
437 de56b2d7 2020-01-04 stsp
438 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, commit_id,
439 13a851c1 2020-01-04 stsp graph->path, repo);
440 13a851c1 2020-01-04 stsp if (err) {
441 13a851c1 2020-01-04 stsp if (err->code != GOT_ERR_NO_OBJ)
442 13a851c1 2020-01-04 stsp break;
443 13a851c1 2020-01-04 stsp /*
444 13a851c1 2020-01-04 stsp * History of the path stops here on the current
445 13a851c1 2020-01-04 stsp * branch. Keep going on other branches.
446 13a851c1 2020-01-04 stsp */
447 13a851c1 2020-01-04 stsp err = close_branch(graph, commit_id);
448 ec1904dc 2020-01-04 stsp if (err)
449 ec1904dc 2020-01-04 stsp break;
450 ec1904dc 2020-01-04 stsp continue;
451 13a851c1 2020-01-04 stsp }
452 57eecd46 2020-01-04 stsp if (changed)
453 de56b2d7 2020-01-04 stsp add_node_to_iter_list(graph, new_node);
454 13a851c1 2020-01-04 stsp err = advance_branch(graph, new_node, commit_id,
455 13a851c1 2020-01-04 stsp commit, repo);
456 cb352812 2018-07-22 stsp if (err)
457 cb352812 2018-07-22 stsp break;
458 372ccdbb 2018-06-10 stsp }
459 32777563 2018-11-07 stsp done:
460 246e1c78 2018-11-08 stsp for (i = 0; i < arg.ntips; i++)
461 32777563 2018-11-07 stsp got_object_commit_close(arg.tips[i].commit);
462 372ccdbb 2018-06-10 stsp return err;
463 372ccdbb 2018-06-10 stsp }
464 372ccdbb 2018-06-10 stsp
465 cb103d04 2018-11-07 stsp static const struct got_error *
466 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
467 372ccdbb 2018-06-10 stsp {
468 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
469 7a62478b 2018-11-18 stsp free(node);
470 cb103d04 2018-11-07 stsp return NULL;
471 372ccdbb 2018-06-10 stsp }
472 372ccdbb 2018-06-10 stsp
473 372ccdbb 2018-06-10 stsp void
474 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
475 372ccdbb 2018-06-10 stsp {
476 22220781 2020-01-04 stsp if (graph->open_branches)
477 22220781 2020-01-04 stsp got_object_idset_free(graph->open_branches);
478 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
479 22220781 2020-01-04 stsp if (graph->node_ids)
480 22220781 2020-01-04 stsp got_object_idset_free(graph->node_ids);
481 b565f6f8 2018-07-23 stsp free(graph->tips);
482 31cedeaf 2018-09-15 stsp free(graph->path);
483 372ccdbb 2018-06-10 stsp free(graph);
484 372ccdbb 2018-06-10 stsp }
485 372ccdbb 2018-06-10 stsp
486 372ccdbb 2018-06-10 stsp const struct got_error *
487 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
488 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
489 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
490 372ccdbb 2018-06-10 stsp {
491 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
492 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
493 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
494 13a851c1 2020-01-04 stsp int changed;
495 372ccdbb 2018-06-10 stsp
496 3d509237 2020-01-04 stsp if (!TAILQ_EMPTY(&graph->iter_list))
497 3d509237 2020-01-04 stsp return got_error(GOT_ERR_ITER_BUSY);
498 372ccdbb 2018-06-10 stsp
499 3d509237 2020-01-04 stsp err = got_object_open_as_commit(&commit, repo, id);
500 31cedeaf 2018-09-15 stsp if (err)
501 31cedeaf 2018-09-15 stsp return err;
502 31cedeaf 2018-09-15 stsp
503 de56b2d7 2020-01-04 stsp err = add_node(&start_node, graph, id, commit, repo);
504 3d509237 2020-01-04 stsp if (err)
505 3d509237 2020-01-04 stsp goto done;
506 3d509237 2020-01-04 stsp
507 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, id, graph->path, repo);
508 de56b2d7 2020-01-04 stsp if (err)
509 de56b2d7 2020-01-04 stsp goto done;
510 de56b2d7 2020-01-04 stsp if (changed)
511 de56b2d7 2020-01-04 stsp add_node_to_iter_list(graph, start_node);
512 de56b2d7 2020-01-04 stsp
513 3d509237 2020-01-04 stsp err = advance_branch(graph, start_node, id, commit, repo);
514 3d509237 2020-01-04 stsp if (err)
515 3d509237 2020-01-04 stsp goto done;
516 3d509237 2020-01-04 stsp
517 31cedeaf 2018-09-15 stsp if (!changed) {
518 31cedeaf 2018-09-15 stsp /* Locate first commit which changed graph->path. */
519 57eecd46 2020-01-04 stsp while (graph->iter_node == NULL &&
520 57eecd46 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
521 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
522 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
523 57eecd46 2020-01-04 stsp if (err)
524 57eecd46 2020-01-04 stsp break;
525 31cedeaf 2018-09-15 stsp }
526 31cedeaf 2018-09-15 stsp }
527 3d509237 2020-01-04 stsp done:
528 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
529 3d509237 2020-01-04 stsp return err;
530 372ccdbb 2018-06-10 stsp }
531 372ccdbb 2018-06-10 stsp
532 372ccdbb 2018-06-10 stsp const struct got_error *
533 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
534 ee780d5c 2020-01-04 stsp struct got_commit_graph *graph, struct got_repository *repo,
535 ee780d5c 2020-01-04 stsp got_cancel_cb cancel_cb, void *cancel_arg)
536 372ccdbb 2018-06-10 stsp {
537 ee780d5c 2020-01-04 stsp const struct got_error *err = NULL;
538 ee780d5c 2020-01-04 stsp
539 9ba79e04 2018-06-11 stsp *id = NULL;
540 372ccdbb 2018-06-10 stsp
541 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
542 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
543 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
544 9ba79e04 2018-06-11 stsp }
545 9ba79e04 2018-06-11 stsp
546 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
547 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
548 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
549 2c7f8870 2018-09-19 stsp /* We are done iterating. */
550 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
551 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
552 6bc66952 2018-09-19 stsp return NULL;
553 372ccdbb 2018-06-10 stsp }
554 372ccdbb 2018-06-10 stsp
555 ee780d5c 2020-01-04 stsp while (TAILQ_NEXT(graph->iter_node, entry) == NULL &&
556 ee780d5c 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
557 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
558 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
559 ee780d5c 2020-01-04 stsp if (err)
560 ee780d5c 2020-01-04 stsp return err;
561 ee780d5c 2020-01-04 stsp }
562 372ccdbb 2018-06-10 stsp
563 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
564 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
565 372ccdbb 2018-06-10 stsp return NULL;
566 372ccdbb 2018-06-10 stsp }
567 a9833bc9 2019-05-13 stsp
568 a9833bc9 2019-05-13 stsp const struct got_error *
569 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
570 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
571 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
572 a9833bc9 2019-05-13 stsp {
573 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
574 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
575 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
576 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
577 a9833bc9 2019-05-13 stsp
578 a9833bc9 2019-05-13 stsp *yca_id = NULL;
579 a9833bc9 2019-05-13 stsp
580 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
581 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
582 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
583 a9833bc9 2019-05-13 stsp
584 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
585 a9833bc9 2019-05-13 stsp if (err)
586 a9833bc9 2019-05-13 stsp goto done;
587 a9833bc9 2019-05-13 stsp
588 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph2, "/", 1);
589 a9833bc9 2019-05-13 stsp if (err)
590 a9833bc9 2019-05-13 stsp goto done;
591 a9833bc9 2019-05-13 stsp
592 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
593 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
594 a9833bc9 2019-05-13 stsp if (err)
595 a9833bc9 2019-05-13 stsp goto done;
596 a9833bc9 2019-05-13 stsp
597 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
598 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
599 a9833bc9 2019-05-13 stsp if (err)
600 a9833bc9 2019-05-13 stsp goto done;
601 a9833bc9 2019-05-13 stsp
602 a9833bc9 2019-05-13 stsp for (;;) {
603 ee780d5c 2020-01-04 stsp struct got_object_id *id = NULL, *id2 = NULL;
604 a9833bc9 2019-05-13 stsp
605 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
606 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
607 6fb7cd11 2019-08-22 stsp if (err)
608 6fb7cd11 2019-08-22 stsp break;
609 6fb7cd11 2019-08-22 stsp }
610 6fb7cd11 2019-08-22 stsp
611 a9833bc9 2019-05-13 stsp if (!completed) {
612 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
613 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
614 a9833bc9 2019-05-13 stsp if (err) {
615 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
616 a9833bc9 2019-05-13 stsp break;
617 ee780d5c 2020-01-04 stsp err = NULL;
618 ee780d5c 2020-01-04 stsp completed = 1;
619 a9833bc9 2019-05-13 stsp }
620 a9833bc9 2019-05-13 stsp }
621 a9833bc9 2019-05-13 stsp
622 a9833bc9 2019-05-13 stsp if (!completed2) {
623 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id2, graph2, repo,
624 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
625 a9833bc9 2019-05-13 stsp if (err) {
626 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
627 a9833bc9 2019-05-13 stsp break;
628 ee780d5c 2020-01-04 stsp err = NULL;
629 ee780d5c 2020-01-04 stsp completed2 = 1;
630 a9833bc9 2019-05-13 stsp }
631 a9833bc9 2019-05-13 stsp }
632 a9833bc9 2019-05-13 stsp
633 a9833bc9 2019-05-13 stsp if (id) {
634 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id)) {
635 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
636 a9833bc9 2019-05-13 stsp if (*yca_id)
637 a9833bc9 2019-05-13 stsp break;
638 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
639 a9833bc9 2019-05-13 stsp break;
640 a9833bc9 2019-05-13 stsp
641 a9833bc9 2019-05-13 stsp }
642 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id, id);
643 a9833bc9 2019-05-13 stsp if (err)
644 a9833bc9 2019-05-13 stsp break;
645 a9833bc9 2019-05-13 stsp }
646 a9833bc9 2019-05-13 stsp if (id2) {
647 a9833bc9 2019-05-13 stsp if (got_object_idset_get(commit_ids, id2)) {
648 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
649 a9833bc9 2019-05-13 stsp if (*yca_id)
650 a9833bc9 2019-05-13 stsp break;
651 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
652 a9833bc9 2019-05-13 stsp break;
653 a9833bc9 2019-05-13 stsp
654 a9833bc9 2019-05-13 stsp }
655 a9833bc9 2019-05-13 stsp err = got_object_idset_add(commit_ids, id2, id2);
656 a9833bc9 2019-05-13 stsp if (err)
657 a9833bc9 2019-05-13 stsp break;
658 a9833bc9 2019-05-13 stsp }
659 a9833bc9 2019-05-13 stsp
660 a9833bc9 2019-05-13 stsp if (completed && completed2) {
661 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
662 a9833bc9 2019-05-13 stsp break;
663 a9833bc9 2019-05-13 stsp }
664 a9833bc9 2019-05-13 stsp
665 a9833bc9 2019-05-13 stsp }
666 a9833bc9 2019-05-13 stsp done:
667 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
668 a9833bc9 2019-05-13 stsp if (graph)
669 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
670 a9833bc9 2019-05-13 stsp if (graph2)
671 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
672 a9833bc9 2019-05-13 stsp return err;
673 a9833bc9 2019-05-13 stsp }