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 14159a7b 2020-01-04 stsp advance_branch(struct got_commit_graph *graph, struct got_object_id *commit_id,
186 14159a7b 2020-01-04 stsp struct got_commit_object *commit, struct got_repository *repo)
187 0ed6ed4c 2018-06-13 stsp {
188 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
189 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
190 0ed6ed4c 2018-06-13 stsp
191 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
192 31cedeaf 2018-09-15 stsp if (err)
193 0ed6ed4c 2018-06-13 stsp return err;
194 0ed6ed4c 2018-06-13 stsp
195 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
196 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
197 9b88e78c 2018-11-18 stsp if (qid == NULL ||
198 8e291695 2020-01-04 stsp got_object_idset_contains(graph->open_branches, qid->id))
199 0ed6ed4c 2018-06-13 stsp return NULL;
200 9b88e78c 2018-11-18 stsp return got_object_idset_add(graph->open_branches,
201 8e291695 2020-01-04 stsp qid->id, NULL);
202 bee6b577 2018-09-19 stsp }
203 bee6b577 2018-09-19 stsp
204 bee6b577 2018-09-19 stsp /*
205 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
206 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
207 bee6b577 2018-09-19 stsp */
208 7a62478b 2018-11-18 stsp if (commit->nparents > 1 && !got_path_is_root_dir(graph->path)) {
209 6dcdad08 2018-11-18 stsp struct got_object_id *merged_id, *prev_id = NULL;
210 bee6b577 2018-09-19 stsp int branches_differ = 0;
211 bee6b577 2018-09-19 stsp
212 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
213 bee6b577 2018-09-19 stsp graph->path);
214 bee6b577 2018-09-19 stsp if (err)
215 bee6b577 2018-09-19 stsp return err;
216 bee6b577 2018-09-19 stsp
217 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
218 6dcdad08 2018-11-18 stsp struct got_object_id *id;
219 6dcdad08 2018-11-18 stsp
220 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
221 8e291695 2020-01-04 stsp qid->id))
222 9b88e78c 2018-11-18 stsp continue;
223 bee6b577 2018-09-19 stsp
224 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
225 bee6b577 2018-09-19 stsp graph->path);
226 bee6b577 2018-09-19 stsp if (err) {
227 d1451975 2018-11-11 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY) {
228 bee6b577 2018-09-19 stsp branches_differ = 1;
229 bee6b577 2018-09-19 stsp continue;
230 bee6b577 2018-09-19 stsp }
231 6dcdad08 2018-11-18 stsp free(merged_id);
232 6dcdad08 2018-11-18 stsp free(prev_id);
233 bee6b577 2018-09-19 stsp return err;
234 bee6b577 2018-09-19 stsp }
235 bee6b577 2018-09-19 stsp
236 bee6b577 2018-09-19 stsp if (prev_id) {
237 bee6b577 2018-09-19 stsp if (!branches_differ &&
238 d2c2d781 2018-11-18 stsp got_object_id_cmp(id, prev_id) != 0)
239 bee6b577 2018-09-19 stsp branches_differ = 1;
240 6dcdad08 2018-11-18 stsp free(prev_id);
241 6dcdad08 2018-11-18 stsp }
242 6dcdad08 2018-11-18 stsp prev_id = id;
243 bee6b577 2018-09-19 stsp
244 bee6b577 2018-09-19 stsp /*
245 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
246 bee6b577 2018-09-19 stsp * skip any other branches.
247 bee6b577 2018-09-19 stsp */
248 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
249 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
250 8e291695 2020-01-04 stsp qid->id, NULL);
251 6dcdad08 2018-11-18 stsp free(merged_id);
252 6dcdad08 2018-11-18 stsp free(id);
253 b36429ab 2018-11-05 stsp return err;
254 bee6b577 2018-09-19 stsp }
255 bee6b577 2018-09-19 stsp }
256 6dcdad08 2018-11-18 stsp
257 6dcdad08 2018-11-18 stsp free(prev_id);
258 6dcdad08 2018-11-18 stsp prev_id = NULL;
259 6dcdad08 2018-11-18 stsp free(merged_id);
260 6dcdad08 2018-11-18 stsp merged_id = NULL;
261 bee6b577 2018-09-19 stsp
262 bee6b577 2018-09-19 stsp /*
263 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
264 bee6b577 2018-09-19 stsp * follow the first parent only.
265 bee6b577 2018-09-19 stsp */
266 bee6b577 2018-09-19 stsp if (!branches_differ) {
267 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
268 bee6b577 2018-09-19 stsp if (qid == NULL)
269 bee6b577 2018-09-19 stsp return NULL;
270 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches,
271 8e291695 2020-01-04 stsp qid->id))
272 b36429ab 2018-11-05 stsp return NULL;
273 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids,
274 8e291695 2020-01-04 stsp qid->id))
275 998ff57f 2018-11-18 stsp return NULL; /* parent already traversed */
276 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
277 8e291695 2020-01-04 stsp qid->id, NULL);
278 bee6b577 2018-09-19 stsp }
279 0ed6ed4c 2018-06-13 stsp }
280 0ed6ed4c 2018-06-13 stsp
281 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
282 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->open_branches, qid->id))
283 b36429ab 2018-11-05 stsp continue;
284 8e291695 2020-01-04 stsp if (got_object_idset_contains(graph->node_ids, qid->id))
285 998ff57f 2018-11-18 stsp continue; /* parent already traversed */
286 8e291695 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, qid->id, NULL);
287 b36429ab 2018-11-05 stsp if (err)
288 0ed6ed4c 2018-06-13 stsp return err;
289 0ed6ed4c 2018-06-13 stsp }
290 0ed6ed4c 2018-06-13 stsp
291 b43fbaa0 2018-06-11 stsp return NULL;
292 fb5b9d5a 2018-07-23 stsp }
293 fb5b9d5a 2018-07-23 stsp
294 b43fbaa0 2018-06-11 stsp static const struct got_error *
295 de56b2d7 2020-01-04 stsp add_node(struct got_commit_graph_node **new_node,
296 de56b2d7 2020-01-04 stsp struct got_commit_graph *graph,
297 de56b2d7 2020-01-04 stsp struct got_object_id *commit_id,
298 de56b2d7 2020-01-04 stsp struct got_commit_object *commit,
299 de56b2d7 2020-01-04 stsp struct got_repository *repo)
300 372ccdbb 2018-06-10 stsp {
301 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
302 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
303 372ccdbb 2018-06-10 stsp
304 372ccdbb 2018-06-10 stsp *new_node = NULL;
305 372ccdbb 2018-06-10 stsp
306 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
307 372ccdbb 2018-06-10 stsp if (node == NULL)
308 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
309 372ccdbb 2018-06-10 stsp
310 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
311 73026088 2018-11-18 stsp node->timestamp = commit->committer_time;
312 372ccdbb 2018-06-10 stsp
313 8e291695 2020-01-04 stsp err = got_object_idset_add(graph->node_ids, &node->id, NULL);
314 de56b2d7 2020-01-04 stsp if (err)
315 7a62478b 2018-11-18 stsp free(node);
316 de56b2d7 2020-01-04 stsp else
317 de56b2d7 2020-01-04 stsp *new_node = node;
318 de56b2d7 2020-01-04 stsp return err;
319 de56b2d7 2020-01-04 stsp }
320 372ccdbb 2018-06-10 stsp
321 de56b2d7 2020-01-04 stsp const struct got_error *
322 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
323 3d509237 2020-01-04 stsp const char *path, int first_parent_traversal)
324 3d509237 2020-01-04 stsp {
325 22220781 2020-01-04 stsp const struct got_error *err = NULL;
326 3ddcebf3 2020-01-04 stsp
327 3ddcebf3 2020-01-04 stsp *graph = calloc(1, sizeof(**graph));
328 3d509237 2020-01-04 stsp if (*graph == NULL)
329 3ddcebf3 2020-01-04 stsp return got_error_from_errno("calloc");
330 88cdb9c6 2020-01-04 stsp
331 88cdb9c6 2020-01-04 stsp TAILQ_INIT(&(*graph)->iter_list);
332 3ddcebf3 2020-01-04 stsp
333 3ddcebf3 2020-01-04 stsp (*graph)->path = strdup(path);
334 3ddcebf3 2020-01-04 stsp if ((*graph)->path == NULL) {
335 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("strdup");
336 22220781 2020-01-04 stsp goto done;
337 3ddcebf3 2020-01-04 stsp }
338 3ddcebf3 2020-01-04 stsp
339 3ddcebf3 2020-01-04 stsp (*graph)->node_ids = got_object_idset_alloc();
340 3ddcebf3 2020-01-04 stsp if ((*graph)->node_ids == NULL) {
341 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
342 22220781 2020-01-04 stsp goto done;
343 3ddcebf3 2020-01-04 stsp }
344 372ccdbb 2018-06-10 stsp
345 3ddcebf3 2020-01-04 stsp (*graph)->open_branches = got_object_idset_alloc();
346 3ddcebf3 2020-01-04 stsp if ((*graph)->open_branches == NULL) {
347 3ddcebf3 2020-01-04 stsp err = got_error_from_errno("got_object_idset_alloc");
348 22220781 2020-01-04 stsp goto done;
349 3ddcebf3 2020-01-04 stsp }
350 3ddcebf3 2020-01-04 stsp
351 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
352 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
353 22220781 2020-01-04 stsp done:
354 22220781 2020-01-04 stsp if (err) {
355 22220781 2020-01-04 stsp got_commit_graph_close(*graph);
356 22220781 2020-01-04 stsp *graph = NULL;
357 22220781 2020-01-04 stsp }
358 22220781 2020-01-04 stsp return err;
359 372ccdbb 2018-06-10 stsp }
360 372ccdbb 2018-06-10 stsp
361 32777563 2018-11-07 stsp struct add_branch_tip_arg {
362 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
363 b565f6f8 2018-07-23 stsp int ntips;
364 32777563 2018-11-07 stsp struct got_repository *repo;
365 32777563 2018-11-07 stsp struct got_commit_graph *graph;
366 372ccdbb 2018-06-10 stsp };
367 372ccdbb 2018-06-10 stsp
368 cb103d04 2018-11-07 stsp static const struct got_error *
369 32777563 2018-11-07 stsp add_branch_tip(struct got_object_id *commit_id, void *data, void *arg)
370 372ccdbb 2018-06-10 stsp {
371 32777563 2018-11-07 stsp const struct got_error *err;
372 32777563 2018-11-07 stsp struct add_branch_tip_arg *a = arg;
373 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
374 32777563 2018-11-07 stsp struct got_commit_object *commit;
375 32777563 2018-11-07 stsp
376 32777563 2018-11-07 stsp err = got_object_open_as_commit(&commit, a->repo, commit_id);
377 32777563 2018-11-07 stsp if (err)
378 32777563 2018-11-07 stsp return err;
379 32777563 2018-11-07 stsp
380 de56b2d7 2020-01-04 stsp err = add_node(&new_node, a->graph, commit_id, commit, a->repo);
381 32777563 2018-11-07 stsp if (err)
382 32777563 2018-11-07 stsp return err;
383 32777563 2018-11-07 stsp
384 32777563 2018-11-07 stsp a->tips[a->ntips].commit_id = new_node ? &new_node->id : NULL;
385 32777563 2018-11-07 stsp a->tips[a->ntips].commit = commit;
386 32777563 2018-11-07 stsp a->tips[a->ntips].new_node = new_node;
387 b565f6f8 2018-07-23 stsp a->ntips++;
388 32777563 2018-11-07 stsp
389 cb103d04 2018-11-07 stsp return NULL;
390 372ccdbb 2018-06-10 stsp }
391 372ccdbb 2018-06-10 stsp
392 1142eae9 2018-06-11 stsp static const struct got_error *
393 57eecd46 2020-01-04 stsp fetch_commits_from_open_branches(struct got_commit_graph *graph,
394 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
395 372ccdbb 2018-06-10 stsp {
396 372ccdbb 2018-06-10 stsp const struct got_error *err;
397 32777563 2018-11-07 stsp struct add_branch_tip_arg arg;
398 32777563 2018-11-07 stsp int i, ntips;
399 372ccdbb 2018-06-10 stsp
400 32777563 2018-11-07 stsp ntips = got_object_idset_num_elements(graph->open_branches);
401 32777563 2018-11-07 stsp if (ntips == 0)
402 372ccdbb 2018-06-10 stsp return NULL;
403 372ccdbb 2018-06-10 stsp
404 32777563 2018-11-07 stsp /* (Re-)allocate branch tips array if necessary. */
405 32777563 2018-11-07 stsp if (graph->ntips < ntips) {
406 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
407 5e50c36a 2018-11-08 stsp tips = recallocarray(graph->tips, graph->ntips, ntips,
408 5e50c36a 2018-11-08 stsp sizeof(*tips));
409 b565f6f8 2018-07-23 stsp if (tips == NULL)
410 638f9024 2019-05-13 stsp return got_error_from_errno("recallocarray");
411 b565f6f8 2018-07-23 stsp graph->tips = tips;
412 32777563 2018-11-07 stsp graph->ntips = ntips;
413 b565f6f8 2018-07-23 stsp }
414 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
415 32777563 2018-11-07 stsp arg.ntips = 0; /* add_branch_tip() will increment */
416 32777563 2018-11-07 stsp arg.repo = repo;
417 32777563 2018-11-07 stsp arg.graph = graph;
418 32777563 2018-11-07 stsp err = got_object_idset_for_each(graph->open_branches, add_branch_tip,
419 32777563 2018-11-07 stsp &arg);
420 cb103d04 2018-11-07 stsp if (err)
421 32777563 2018-11-07 stsp goto done;
422 372ccdbb 2018-06-10 stsp
423 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
424 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
425 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
426 32777563 2018-11-07 stsp struct got_commit_graph_node *new_node;
427 13a851c1 2020-01-04 stsp int changed;
428 372ccdbb 2018-06-10 stsp
429 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
430 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
431 6fb7cd11 2019-08-22 stsp if (err)
432 6fb7cd11 2019-08-22 stsp break;
433 6fb7cd11 2019-08-22 stsp }
434 6fb7cd11 2019-08-22 stsp
435 32777563 2018-11-07 stsp commit_id = arg.tips[i].commit_id;
436 32777563 2018-11-07 stsp commit = arg.tips[i].commit;
437 32777563 2018-11-07 stsp new_node = arg.tips[i].new_node;
438 de56b2d7 2020-01-04 stsp
439 13a851c1 2020-01-04 stsp err = detect_changed_path(&changed, commit, commit_id,
440 13a851c1 2020-01-04 stsp graph->path, repo);
441 13a851c1 2020-01-04 stsp if (err) {
442 13a851c1 2020-01-04 stsp if (err->code != GOT_ERR_NO_OBJ)
443 13a851c1 2020-01-04 stsp break;
444 13a851c1 2020-01-04 stsp /*
445 13a851c1 2020-01-04 stsp * History of the path stops here on the current
446 13a851c1 2020-01-04 stsp * branch. Keep going on other branches.
447 13a851c1 2020-01-04 stsp */
448 13a851c1 2020-01-04 stsp err = close_branch(graph, commit_id);
449 ec1904dc 2020-01-04 stsp if (err)
450 ec1904dc 2020-01-04 stsp break;
451 ec1904dc 2020-01-04 stsp continue;
452 13a851c1 2020-01-04 stsp }
453 57eecd46 2020-01-04 stsp if (changed)
454 de56b2d7 2020-01-04 stsp add_node_to_iter_list(graph, new_node);
455 14159a7b 2020-01-04 stsp err = advance_branch(graph, commit_id, 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 372ccdbb 2018-06-10 stsp void
466 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
467 372ccdbb 2018-06-10 stsp {
468 22220781 2020-01-04 stsp if (graph->open_branches)
469 22220781 2020-01-04 stsp got_object_idset_free(graph->open_branches);
470 22220781 2020-01-04 stsp if (graph->node_ids)
471 22220781 2020-01-04 stsp got_object_idset_free(graph->node_ids);
472 b565f6f8 2018-07-23 stsp free(graph->tips);
473 31cedeaf 2018-09-15 stsp free(graph->path);
474 372ccdbb 2018-06-10 stsp free(graph);
475 372ccdbb 2018-06-10 stsp }
476 372ccdbb 2018-06-10 stsp
477 372ccdbb 2018-06-10 stsp const struct got_error *
478 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
479 6fb7cd11 2019-08-22 stsp struct got_object_id *id, struct got_repository *repo,
480 6fb7cd11 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
481 372ccdbb 2018-06-10 stsp {
482 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
483 372ccdbb 2018-06-10 stsp
484 3d509237 2020-01-04 stsp if (!TAILQ_EMPTY(&graph->iter_list))
485 3d509237 2020-01-04 stsp return got_error(GOT_ERR_ITER_BUSY);
486 31cedeaf 2018-09-15 stsp
487 3ff3126d 2020-01-04 stsp err = got_object_idset_add(graph->open_branches, id, NULL);
488 3d509237 2020-01-04 stsp if (err)
489 7e33c8c5 2020-01-04 stsp return err;
490 3d509237 2020-01-04 stsp
491 3ff3126d 2020-01-04 stsp /* Locate first commit which changed graph->path. */
492 3ff3126d 2020-01-04 stsp while (graph->iter_node == NULL &&
493 3ff3126d 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
494 3ff3126d 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
495 3ff3126d 2020-01-04 stsp cancel_cb, cancel_arg);
496 3ff3126d 2020-01-04 stsp if (err)
497 7e33c8c5 2020-01-04 stsp return err;
498 5175b31a 2020-01-04 stsp }
499 5175b31a 2020-01-04 stsp
500 5175b31a 2020-01-04 stsp if (graph->iter_node == NULL) {
501 5175b31a 2020-01-04 stsp const char *path;
502 5175b31a 2020-01-04 stsp if (got_path_is_root_dir(graph->path))
503 5175b31a 2020-01-04 stsp return got_error_no_obj(id);
504 5175b31a 2020-01-04 stsp path = graph->path;
505 5175b31a 2020-01-04 stsp while (path[0] == '/')
506 5175b31a 2020-01-04 stsp path++;
507 5175b31a 2020-01-04 stsp return got_error_path(path, GOT_ERR_NO_TREE_ENTRY);
508 31cedeaf 2018-09-15 stsp }
509 7e33c8c5 2020-01-04 stsp
510 7e33c8c5 2020-01-04 stsp return NULL;
511 372ccdbb 2018-06-10 stsp }
512 372ccdbb 2018-06-10 stsp
513 372ccdbb 2018-06-10 stsp const struct got_error *
514 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
515 ee780d5c 2020-01-04 stsp struct got_commit_graph *graph, struct got_repository *repo,
516 ee780d5c 2020-01-04 stsp got_cancel_cb cancel_cb, void *cancel_arg)
517 372ccdbb 2018-06-10 stsp {
518 ee780d5c 2020-01-04 stsp const struct got_error *err = NULL;
519 ee780d5c 2020-01-04 stsp
520 9ba79e04 2018-06-11 stsp *id = NULL;
521 372ccdbb 2018-06-10 stsp
522 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
523 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
524 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
525 9ba79e04 2018-06-11 stsp }
526 9ba79e04 2018-06-11 stsp
527 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
528 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
529 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
530 2c7f8870 2018-09-19 stsp /* We are done iterating. */
531 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
532 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
533 6bc66952 2018-09-19 stsp return NULL;
534 372ccdbb 2018-06-10 stsp }
535 372ccdbb 2018-06-10 stsp
536 ee780d5c 2020-01-04 stsp while (TAILQ_NEXT(graph->iter_node, entry) == NULL &&
537 ee780d5c 2020-01-04 stsp got_object_idset_num_elements(graph->open_branches) > 0) {
538 57eecd46 2020-01-04 stsp err = fetch_commits_from_open_branches(graph, repo,
539 57eecd46 2020-01-04 stsp cancel_cb, cancel_arg);
540 ee780d5c 2020-01-04 stsp if (err)
541 ee780d5c 2020-01-04 stsp return err;
542 ee780d5c 2020-01-04 stsp }
543 372ccdbb 2018-06-10 stsp
544 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
545 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
546 372ccdbb 2018-06-10 stsp return NULL;
547 372ccdbb 2018-06-10 stsp }
548 a9833bc9 2019-05-13 stsp
549 a9833bc9 2019-05-13 stsp const struct got_error *
550 a9833bc9 2019-05-13 stsp got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
551 a9833bc9 2019-05-13 stsp struct got_object_id *commit_id, struct got_object_id *commit_id2,
552 6fb7cd11 2019-08-22 stsp struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
553 a9833bc9 2019-05-13 stsp {
554 a9833bc9 2019-05-13 stsp const struct got_error *err = NULL;
555 a9833bc9 2019-05-13 stsp struct got_commit_graph *graph = NULL, *graph2 = NULL;
556 a9833bc9 2019-05-13 stsp int completed = 0, completed2 = 0;
557 a9833bc9 2019-05-13 stsp struct got_object_idset *commit_ids;
558 a9833bc9 2019-05-13 stsp
559 a9833bc9 2019-05-13 stsp *yca_id = NULL;
560 a9833bc9 2019-05-13 stsp
561 a9833bc9 2019-05-13 stsp commit_ids = got_object_idset_alloc();
562 a9833bc9 2019-05-13 stsp if (commit_ids == NULL)
563 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_idset_alloc");
564 a9833bc9 2019-05-13 stsp
565 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
566 a9833bc9 2019-05-13 stsp if (err)
567 a9833bc9 2019-05-13 stsp goto done;
568 a9833bc9 2019-05-13 stsp
569 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph2, "/", 1);
570 a9833bc9 2019-05-13 stsp if (err)
571 a9833bc9 2019-05-13 stsp goto done;
572 a9833bc9 2019-05-13 stsp
573 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, commit_id, repo,
574 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
575 a9833bc9 2019-05-13 stsp if (err)
576 a9833bc9 2019-05-13 stsp goto done;
577 a9833bc9 2019-05-13 stsp
578 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph2, commit_id2, repo,
579 6fb7cd11 2019-08-22 stsp cancel_cb, cancel_arg);
580 a9833bc9 2019-05-13 stsp if (err)
581 a9833bc9 2019-05-13 stsp goto done;
582 a9833bc9 2019-05-13 stsp
583 a9833bc9 2019-05-13 stsp for (;;) {
584 ee780d5c 2020-01-04 stsp struct got_object_id *id = NULL, *id2 = NULL;
585 a9833bc9 2019-05-13 stsp
586 6fb7cd11 2019-08-22 stsp if (cancel_cb) {
587 6fb7cd11 2019-08-22 stsp err = (*cancel_cb)(cancel_arg);
588 6fb7cd11 2019-08-22 stsp if (err)
589 6fb7cd11 2019-08-22 stsp break;
590 6fb7cd11 2019-08-22 stsp }
591 6fb7cd11 2019-08-22 stsp
592 a9833bc9 2019-05-13 stsp if (!completed) {
593 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
594 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
595 a9833bc9 2019-05-13 stsp if (err) {
596 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
597 a9833bc9 2019-05-13 stsp break;
598 ee780d5c 2020-01-04 stsp err = NULL;
599 ee780d5c 2020-01-04 stsp completed = 1;
600 a9833bc9 2019-05-13 stsp }
601 a9833bc9 2019-05-13 stsp }
602 a9833bc9 2019-05-13 stsp
603 a9833bc9 2019-05-13 stsp if (!completed2) {
604 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id2, graph2, repo,
605 ee780d5c 2020-01-04 stsp cancel_cb, cancel_arg);
606 a9833bc9 2019-05-13 stsp if (err) {
607 ee780d5c 2020-01-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
608 a9833bc9 2019-05-13 stsp break;
609 ee780d5c 2020-01-04 stsp err = NULL;
610 ee780d5c 2020-01-04 stsp completed2 = 1;
611 a9833bc9 2019-05-13 stsp }
612 a9833bc9 2019-05-13 stsp }
613 a9833bc9 2019-05-13 stsp
614 a9833bc9 2019-05-13 stsp if (id) {
615 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id)) {
616 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id);
617 a9833bc9 2019-05-13 stsp if (*yca_id)
618 a9833bc9 2019-05-13 stsp break;
619 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
620 a9833bc9 2019-05-13 stsp break;
621 a9833bc9 2019-05-13 stsp
622 a9833bc9 2019-05-13 stsp }
623 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id, NULL);
624 a9833bc9 2019-05-13 stsp if (err)
625 a9833bc9 2019-05-13 stsp break;
626 a9833bc9 2019-05-13 stsp }
627 a9833bc9 2019-05-13 stsp if (id2) {
628 8e291695 2020-01-04 stsp if (got_object_idset_contains(commit_ids, id2)) {
629 a9833bc9 2019-05-13 stsp *yca_id = got_object_id_dup(id2);
630 a9833bc9 2019-05-13 stsp if (*yca_id)
631 a9833bc9 2019-05-13 stsp break;
632 82751bc5 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
633 a9833bc9 2019-05-13 stsp break;
634 a9833bc9 2019-05-13 stsp
635 a9833bc9 2019-05-13 stsp }
636 8e291695 2020-01-04 stsp err = got_object_idset_add(commit_ids, id2, NULL);
637 a9833bc9 2019-05-13 stsp if (err)
638 a9833bc9 2019-05-13 stsp break;
639 a9833bc9 2019-05-13 stsp }
640 a9833bc9 2019-05-13 stsp
641 a9833bc9 2019-05-13 stsp if (completed && completed2) {
642 a9833bc9 2019-05-13 stsp err = got_error(GOT_ERR_ANCESTRY);
643 a9833bc9 2019-05-13 stsp break;
644 a9833bc9 2019-05-13 stsp }
645 a9833bc9 2019-05-13 stsp
646 a9833bc9 2019-05-13 stsp }
647 a9833bc9 2019-05-13 stsp done:
648 a9833bc9 2019-05-13 stsp got_object_idset_free(commit_ids);
649 a9833bc9 2019-05-13 stsp if (graph)
650 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph);
651 a9833bc9 2019-05-13 stsp if (graph2)
652 a9833bc9 2019-05-13 stsp got_commit_graph_close(graph2);
653 a9833bc9 2019-05-13 stsp return err;
654 a9833bc9 2019-05-13 stsp }