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 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>
28 372ccdbb 2018-06-10 stsp
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 372ccdbb 2018-06-10 stsp
33 372ccdbb 2018-06-10 stsp #include "got_lib_delta.h"
34 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
35 372ccdbb 2018-06-10 stsp #include "got_lib_object.h"
36 372ccdbb 2018-06-10 stsp #include "got_lib_object_idset.h"
37 31cedeaf 2018-09-15 stsp #include "got_lib_path.h"
38 372ccdbb 2018-06-10 stsp
39 372ccdbb 2018-06-10 stsp struct got_commit_graph_node {
40 372ccdbb 2018-06-10 stsp struct got_object_id id;
41 372ccdbb 2018-06-10 stsp
42 372ccdbb 2018-06-10 stsp /*
43 372ccdbb 2018-06-10 stsp * Each graph node corresponds to a commit object.
44 f4ceb45e 2018-07-23 stsp * Graph vertices are modelled with an adjacency list.
45 f4ceb45e 2018-07-23 stsp * Adjacencies of a graph node are parent (older) commits.
46 372ccdbb 2018-06-10 stsp */
47 b43fbaa0 2018-06-11 stsp int nparents;
48 79f35eb3 2018-06-11 stsp struct got_object_id_queue parent_ids;
49 372ccdbb 2018-06-10 stsp
50 b43fbaa0 2018-06-11 stsp time_t commit_timestamp;
51 b43fbaa0 2018-06-11 stsp
52 372ccdbb 2018-06-10 stsp /* Used during graph iteration. */
53 372ccdbb 2018-06-10 stsp TAILQ_ENTRY(got_commit_graph_node) entry;
54 372ccdbb 2018-06-10 stsp };
55 372ccdbb 2018-06-10 stsp
56 9ba79e04 2018-06-11 stsp TAILQ_HEAD(got_commit_graph_iter_list, got_commit_graph_node);
57 9ba79e04 2018-06-11 stsp
58 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip {
59 b565f6f8 2018-07-23 stsp struct got_object_id id;
60 b565f6f8 2018-07-23 stsp struct got_commit_graph_node *node;
61 b565f6f8 2018-07-23 stsp };
62 b565f6f8 2018-07-23 stsp
63 372ccdbb 2018-06-10 stsp struct got_commit_graph {
64 372ccdbb 2018-06-10 stsp /* The set of all commits we have traversed. */
65 372ccdbb 2018-06-10 stsp struct got_object_idset *node_ids;
66 372ccdbb 2018-06-10 stsp
67 372ccdbb 2018-06-10 stsp /* The commit at which traversal began (youngest commit in node_ids). */
68 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *head_node;
69 372ccdbb 2018-06-10 stsp
70 0ed6ed4c 2018-06-13 stsp int flags;
71 0ed6ed4c 2018-06-13 stsp #define GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL 0x01
72 0ed6ed4c 2018-06-13 stsp
73 372ccdbb 2018-06-10 stsp /*
74 372ccdbb 2018-06-10 stsp * A set of object IDs of known parent commits which we have not yet
75 372ccdbb 2018-06-10 stsp * traversed. Each commit ID in this set represents a branch in commit
76 372ccdbb 2018-06-10 stsp * history: Either the first-parent branch of the head node, or another
77 372ccdbb 2018-06-10 stsp * branch corresponding to a traversed merge commit for which we have
78 372ccdbb 2018-06-10 stsp * not traversed a branch point commit yet.
79 372ccdbb 2018-06-10 stsp *
80 372ccdbb 2018-06-10 stsp * Whenever we add a commit with a matching ID to the graph, we remove
81 372ccdbb 2018-06-10 stsp * its corresponding element from this set, and add new elements for
82 372ccdbb 2018-06-10 stsp * each of that commit's parent commits which were not traversed yet.
83 372ccdbb 2018-06-10 stsp *
84 372ccdbb 2018-06-10 stsp * When API users ask us to fetch more commits, we fetch commits from
85 372ccdbb 2018-06-10 stsp * all currently open branches. This allows API users to process
86 372ccdbb 2018-06-10 stsp * commits in linear order even though the history contains branches.
87 372ccdbb 2018-06-10 stsp */
88 372ccdbb 2018-06-10 stsp struct got_object_idset *open_branches;
89 b565f6f8 2018-07-23 stsp
90 b565f6f8 2018-07-23 stsp /* Copy of known branch tips for fetch_commits_from_open_branches(). */
91 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
92 b565f6f8 2018-07-23 stsp size_t ntips;
93 8d49203e 2018-09-20 stsp #define GOT_COMMIT_GRAPH_MIN_TIPS 10 /* minimum amount of tips to allocate */
94 372ccdbb 2018-06-10 stsp
95 31cedeaf 2018-09-15 stsp /* Path of tree entry of interest to the API user. */
96 31cedeaf 2018-09-15 stsp char *path;
97 31cedeaf 2018-09-15 stsp
98 372ccdbb 2018-06-10 stsp /* The next commit to return when the API user asks for one. */
99 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *iter_node;
100 372ccdbb 2018-06-10 stsp
101 9ba79e04 2018-06-11 stsp /* The graph iteration list contains all nodes in sorted order. */
102 9ba79e04 2018-06-11 stsp struct got_commit_graph_iter_list iter_list;
103 372ccdbb 2018-06-10 stsp };
104 372ccdbb 2018-06-10 stsp
105 372ccdbb 2018-06-10 stsp static struct got_commit_graph *
106 31cedeaf 2018-09-15 stsp alloc_graph(const char *path)
107 372ccdbb 2018-06-10 stsp {
108 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
109 372ccdbb 2018-06-10 stsp
110 372ccdbb 2018-06-10 stsp graph = calloc(1, sizeof(*graph));
111 372ccdbb 2018-06-10 stsp if (graph == NULL)
112 372ccdbb 2018-06-10 stsp return NULL;
113 372ccdbb 2018-06-10 stsp
114 31cedeaf 2018-09-15 stsp graph->path = strdup(path);
115 31cedeaf 2018-09-15 stsp if (graph->path == NULL) {
116 31cedeaf 2018-09-15 stsp free(graph);
117 31cedeaf 2018-09-15 stsp return NULL;
118 31cedeaf 2018-09-15 stsp }
119 31cedeaf 2018-09-15 stsp
120 60f2eee1 2018-07-08 stsp graph->node_ids = got_object_idset_alloc();
121 372ccdbb 2018-06-10 stsp if (graph->node_ids == NULL) {
122 31cedeaf 2018-09-15 stsp free(graph->path);
123 372ccdbb 2018-06-10 stsp free(graph);
124 372ccdbb 2018-06-10 stsp return NULL;
125 372ccdbb 2018-06-10 stsp }
126 372ccdbb 2018-06-10 stsp
127 60f2eee1 2018-07-08 stsp graph->open_branches = got_object_idset_alloc();
128 372ccdbb 2018-06-10 stsp if (graph->open_branches == NULL) {
129 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
130 31cedeaf 2018-09-15 stsp free(graph->path);
131 372ccdbb 2018-06-10 stsp free(graph);
132 372ccdbb 2018-06-10 stsp return NULL;
133 372ccdbb 2018-06-10 stsp }
134 372ccdbb 2018-06-10 stsp
135 31920504 2018-06-11 stsp TAILQ_INIT(&graph->iter_list);
136 372ccdbb 2018-06-10 stsp return graph;
137 372ccdbb 2018-06-10 stsp }
138 372ccdbb 2018-06-10 stsp
139 372ccdbb 2018-06-10 stsp #if 0
140 372ccdbb 2018-06-10 stsp static int
141 372ccdbb 2018-06-10 stsp is_head_node(struct got_commit_graph_node *node)
142 372ccdbb 2018-06-10 stsp {
143 372ccdbb 2018-06-10 stsp return node->nchildren == 0;
144 372ccdbb 2018-06-10 stsp }
145 372ccdbb 2018-06-10 stsp
146 372ccdbb 2018-06-10 stsp int
147 372ccdbb 2018-06-10 stsp is_branch_point(struct got_commit_graph_node *node)
148 372ccdbb 2018-06-10 stsp {
149 372ccdbb 2018-06-10 stsp return node->nchildren > 1;
150 372ccdbb 2018-06-10 stsp }
151 372ccdbb 2018-06-10 stsp
152 372ccdbb 2018-06-10 stsp static int
153 372ccdbb 2018-06-10 stsp is_root_node(struct got_commit_graph_node *node)
154 372ccdbb 2018-06-10 stsp {
155 b43fbaa0 2018-06-11 stsp return node->nparents == 0;
156 372ccdbb 2018-06-10 stsp }
157 9ba79e04 2018-06-11 stsp #endif
158 31cedeaf 2018-09-15 stsp
159 bee6b577 2018-09-19 stsp static int
160 bee6b577 2018-09-19 stsp is_merge_point(struct got_commit_graph_node *node)
161 bee6b577 2018-09-19 stsp {
162 bee6b577 2018-09-19 stsp return node->nparents > 1;
163 bee6b577 2018-09-19 stsp }
164 bee6b577 2018-09-19 stsp
165 31cedeaf 2018-09-15 stsp static const struct got_error *
166 41fa1437 2018-11-05 stsp detect_changed_path(int *changed, struct got_commit_object *commit,
167 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
168 31cedeaf 2018-09-15 stsp struct got_repository *repo)
169 31cedeaf 2018-09-15 stsp {
170 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
171 41fa1437 2018-11-05 stsp struct got_commit_object *pcommit = NULL;
172 31cedeaf 2018-09-15 stsp struct got_tree_object *tree = NULL, *ptree = NULL;
173 31cedeaf 2018-09-15 stsp struct got_object_qid *pid;
174 31cedeaf 2018-09-15 stsp
175 31cedeaf 2018-09-15 stsp if (got_path_is_root_dir(path)) {
176 31cedeaf 2018-09-15 stsp *changed = 1;
177 31cedeaf 2018-09-15 stsp return NULL;
178 31cedeaf 2018-09-15 stsp }
179 31cedeaf 2018-09-15 stsp
180 31cedeaf 2018-09-15 stsp *changed = 0;
181 31cedeaf 2018-09-15 stsp
182 31cedeaf 2018-09-15 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
183 31cedeaf 2018-09-15 stsp if (err)
184 31cedeaf 2018-09-15 stsp return err;
185 31cedeaf 2018-09-15 stsp
186 31cedeaf 2018-09-15 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
187 31cedeaf 2018-09-15 stsp if (pid == NULL) {
188 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
189 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
190 fd1d2703 2018-11-04 stsp if (err) {
191 fd1d2703 2018-11-04 stsp if (err->code == GOT_ERR_NO_OBJ)
192 fd1d2703 2018-11-04 stsp err = NULL;
193 fd1d2703 2018-11-04 stsp } else
194 fd1d2703 2018-11-04 stsp *changed = 1; /* The path was created in this commit. */
195 31cedeaf 2018-09-15 stsp free(obj_id);
196 fd1d2703 2018-11-04 stsp } else {
197 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&pcommit, repo, pid->id);
198 fd1d2703 2018-11-04 stsp if (err)
199 fd1d2703 2018-11-04 stsp goto done;
200 31cedeaf 2018-09-15 stsp
201 fd1d2703 2018-11-04 stsp err = got_object_open_as_tree(&ptree, repo, pcommit->tree_id);
202 fd1d2703 2018-11-04 stsp if (err)
203 fd1d2703 2018-11-04 stsp goto done;
204 372ccdbb 2018-06-10 stsp
205 fd1d2703 2018-11-04 stsp err = got_object_tree_path_changed(changed, tree, ptree, path,
206 fd1d2703 2018-11-04 stsp repo);
207 fd1d2703 2018-11-04 stsp }
208 31cedeaf 2018-09-15 stsp done:
209 31cedeaf 2018-09-15 stsp if (tree)
210 31cedeaf 2018-09-15 stsp got_object_tree_close(tree);
211 31cedeaf 2018-09-15 stsp if (ptree)
212 31cedeaf 2018-09-15 stsp got_object_tree_close(ptree);
213 31cedeaf 2018-09-15 stsp if (pcommit)
214 41fa1437 2018-11-05 stsp got_object_commit_close(pcommit);
215 31cedeaf 2018-09-15 stsp return err;
216 31cedeaf 2018-09-15 stsp }
217 31cedeaf 2018-09-15 stsp
218 4626e416 2018-06-10 stsp static void
219 9ba79e04 2018-06-11 stsp add_node_to_iter_list(struct got_commit_graph *graph,
220 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *node,
221 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *child_node)
222 372ccdbb 2018-06-10 stsp {
223 4bd3f2bb 2018-06-10 stsp struct got_commit_graph_node *n, *next;
224 1c7a5dcb 2018-09-15 stsp
225 31920504 2018-06-11 stsp if (TAILQ_EMPTY(&graph->iter_list)) {
226 bee6b577 2018-09-19 stsp TAILQ_INSERT_HEAD(&graph->iter_list, node, entry);
227 bee6b577 2018-09-19 stsp graph->iter_node = node;
228 4626e416 2018-06-10 stsp return;
229 372ccdbb 2018-06-10 stsp }
230 372ccdbb 2018-06-10 stsp
231 bee6b577 2018-09-19 stsp n = graph->iter_node;
232 fe8df4c2 2018-06-16 stsp /* Ensure that an iteration in progress will see this new commit. */
233 bee6b577 2018-09-19 stsp while (n) {
234 bee6b577 2018-09-19 stsp next = TAILQ_NEXT(n, entry);
235 bee6b577 2018-09-19 stsp if (next && node->commit_timestamp >= next->commit_timestamp) {
236 bee6b577 2018-09-19 stsp TAILQ_INSERT_BEFORE(next, node, entry);
237 bee6b577 2018-09-19 stsp return;
238 fe8df4c2 2018-06-16 stsp }
239 bee6b577 2018-09-19 stsp n = next;
240 fe8df4c2 2018-06-16 stsp }
241 93e45b7c 2018-09-24 stsp TAILQ_INSERT_TAIL(&graph->iter_list, node, entry);
242 372ccdbb 2018-06-10 stsp }
243 372ccdbb 2018-06-10 stsp
244 372ccdbb 2018-06-10 stsp static const struct got_error *
245 79f35eb3 2018-06-11 stsp add_vertex(struct got_object_id_queue *ids, struct got_object_id *id)
246 b43fbaa0 2018-06-11 stsp {
247 5df4932d 2018-11-05 stsp const struct got_error *err = NULL;
248 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
249 b43fbaa0 2018-06-11 stsp
250 5df4932d 2018-11-05 stsp err = got_object_qid_alloc(&qid, id);
251 5df4932d 2018-11-05 stsp if (err)
252 b43fbaa0 2018-06-11 stsp return err;
253 b43fbaa0 2018-06-11 stsp
254 79f35eb3 2018-06-11 stsp SIMPLEQ_INSERT_TAIL(ids, qid, entry);
255 0ed6ed4c 2018-06-13 stsp return NULL;
256 0ed6ed4c 2018-06-13 stsp }
257 0ed6ed4c 2018-06-13 stsp
258 0ed6ed4c 2018-06-13 stsp static const struct got_error *
259 31cedeaf 2018-09-15 stsp close_branch(struct got_commit_graph *graph, struct got_object_id *commit_id)
260 31cedeaf 2018-09-15 stsp {
261 31cedeaf 2018-09-15 stsp const struct got_error *err;
262 31cedeaf 2018-09-15 stsp
263 31cedeaf 2018-09-15 stsp err = got_object_idset_remove(NULL, graph->open_branches, commit_id);
264 31cedeaf 2018-09-15 stsp if (err && err->code != GOT_ERR_NO_OBJ)
265 31cedeaf 2018-09-15 stsp return err;
266 31cedeaf 2018-09-15 stsp return NULL;
267 31cedeaf 2018-09-15 stsp }
268 31cedeaf 2018-09-15 stsp
269 31cedeaf 2018-09-15 stsp static const struct got_error *
270 31cedeaf 2018-09-15 stsp advance_branch(struct got_commit_graph *graph,
271 0ed6ed4c 2018-06-13 stsp struct got_commit_graph_node *node,
272 41fa1437 2018-11-05 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
273 bee6b577 2018-09-19 stsp struct got_repository *repo)
274 0ed6ed4c 2018-06-13 stsp {
275 0ed6ed4c 2018-06-13 stsp const struct got_error *err;
276 0ed6ed4c 2018-06-13 stsp struct got_object_qid *qid;
277 0ed6ed4c 2018-06-13 stsp
278 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
279 31cedeaf 2018-09-15 stsp if (err)
280 0ed6ed4c 2018-06-13 stsp return err;
281 0ed6ed4c 2018-06-13 stsp
282 0ed6ed4c 2018-06-13 stsp if (graph->flags & GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL) {
283 0ed6ed4c 2018-06-13 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
284 0ed6ed4c 2018-06-13 stsp if (qid == NULL)
285 0ed6ed4c 2018-06-13 stsp return NULL;
286 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
287 b36429ab 2018-11-05 stsp return err;
288 bee6b577 2018-09-19 stsp }
289 bee6b577 2018-09-19 stsp
290 bee6b577 2018-09-19 stsp /*
291 bee6b577 2018-09-19 stsp * If we are graphing commits for a specific path, skip branches
292 bee6b577 2018-09-19 stsp * which do not contribute any content to this path.
293 bee6b577 2018-09-19 stsp */
294 bee6b577 2018-09-19 stsp if (is_merge_point(node) && !got_path_is_root_dir(graph->path)) {
295 bee6b577 2018-09-19 stsp struct got_object_id *id, *merged_id, *prev_id = NULL;
296 bee6b577 2018-09-19 stsp int branches_differ = 0;
297 bee6b577 2018-09-19 stsp
298 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&merged_id, repo, commit_id,
299 bee6b577 2018-09-19 stsp graph->path);
300 bee6b577 2018-09-19 stsp if (err)
301 bee6b577 2018-09-19 stsp return err;
302 bee6b577 2018-09-19 stsp
303 bee6b577 2018-09-19 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
304 bee6b577 2018-09-19 stsp if (got_object_idset_get(graph->node_ids, qid->id))
305 bee6b577 2018-09-19 stsp continue; /* parent already traversed */
306 bee6b577 2018-09-19 stsp
307 bee6b577 2018-09-19 stsp err = got_object_id_by_path(&id, repo, qid->id,
308 bee6b577 2018-09-19 stsp graph->path);
309 bee6b577 2018-09-19 stsp if (err) {
310 bee6b577 2018-09-19 stsp if (err->code == GOT_ERR_NO_OBJ) {
311 bee6b577 2018-09-19 stsp branches_differ = 1;
312 bee6b577 2018-09-19 stsp continue;
313 bee6b577 2018-09-19 stsp }
314 bee6b577 2018-09-19 stsp return err;
315 bee6b577 2018-09-19 stsp }
316 bee6b577 2018-09-19 stsp
317 bee6b577 2018-09-19 stsp if (prev_id) {
318 bee6b577 2018-09-19 stsp if (!branches_differ &&
319 bee6b577 2018-09-19 stsp got_object_id_cmp(merged_id, prev_id) != 0)
320 bee6b577 2018-09-19 stsp branches_differ = 1;
321 bee6b577 2018-09-19 stsp } else
322 bee6b577 2018-09-19 stsp prev_id = id;
323 bee6b577 2018-09-19 stsp
324 bee6b577 2018-09-19 stsp /*
325 bee6b577 2018-09-19 stsp * If a branch has created the merged content we can
326 bee6b577 2018-09-19 stsp * skip any other branches.
327 bee6b577 2018-09-19 stsp */
328 bee6b577 2018-09-19 stsp if (got_object_id_cmp(merged_id, id) == 0) {
329 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches,
330 b36429ab 2018-11-05 stsp qid->id, node);
331 b36429ab 2018-11-05 stsp return err;
332 bee6b577 2018-09-19 stsp }
333 bee6b577 2018-09-19 stsp }
334 bee6b577 2018-09-19 stsp
335 bee6b577 2018-09-19 stsp /*
336 bee6b577 2018-09-19 stsp * If the path's content is the same on all branches,
337 bee6b577 2018-09-19 stsp * follow the first parent only.
338 bee6b577 2018-09-19 stsp */
339 bee6b577 2018-09-19 stsp if (!branches_differ) {
340 bee6b577 2018-09-19 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
341 bee6b577 2018-09-19 stsp if (qid == NULL)
342 bee6b577 2018-09-19 stsp return NULL;
343 bee6b577 2018-09-19 stsp if (got_object_idset_get(graph->node_ids, qid->id))
344 bee6b577 2018-09-19 stsp return NULL; /* parent already traversed */
345 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
346 b36429ab 2018-11-05 stsp return NULL;
347 b36429ab 2018-11-05 stsp return got_object_idset_add(graph->open_branches,
348 b36429ab 2018-11-05 stsp qid->id, node);
349 bee6b577 2018-09-19 stsp }
350 0ed6ed4c 2018-06-13 stsp }
351 0ed6ed4c 2018-06-13 stsp
352 0ed6ed4c 2018-06-13 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
353 0ed6ed4c 2018-06-13 stsp if (got_object_idset_get(graph->node_ids, qid->id))
354 0ed6ed4c 2018-06-13 stsp continue; /* parent already traversed */
355 b36429ab 2018-11-05 stsp if (got_object_idset_get(graph->open_branches, qid->id))
356 b36429ab 2018-11-05 stsp continue;
357 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->open_branches, qid->id, node);
358 b36429ab 2018-11-05 stsp if (err)
359 0ed6ed4c 2018-06-13 stsp return err;
360 0ed6ed4c 2018-06-13 stsp }
361 0ed6ed4c 2018-06-13 stsp
362 b43fbaa0 2018-06-11 stsp return NULL;
363 b43fbaa0 2018-06-11 stsp }
364 b43fbaa0 2018-06-11 stsp
365 fb5b9d5a 2018-07-23 stsp static void
366 fb5b9d5a 2018-07-23 stsp free_node(struct got_commit_graph_node *node)
367 fb5b9d5a 2018-07-23 stsp {
368 fb5b9d5a 2018-07-23 stsp while (!SIMPLEQ_EMPTY(&node->parent_ids)) {
369 fb5b9d5a 2018-07-23 stsp struct got_object_qid *pid = SIMPLEQ_FIRST(&node->parent_ids);
370 fb5b9d5a 2018-07-23 stsp SIMPLEQ_REMOVE_HEAD(&node->parent_ids, entry);
371 fa2f6902 2018-07-23 stsp got_object_qid_free(pid);
372 fb5b9d5a 2018-07-23 stsp }
373 fb5b9d5a 2018-07-23 stsp free(node);
374 fb5b9d5a 2018-07-23 stsp }
375 fb5b9d5a 2018-07-23 stsp
376 b43fbaa0 2018-06-11 stsp static const struct got_error *
377 649fc316 2018-11-05 stsp add_node(struct got_commit_graph_node **new_node, int *changed,
378 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph, struct got_object_id *commit_id,
379 41fa1437 2018-11-05 stsp struct got_commit_object *commit, struct got_commit_graph_node *child_node,
380 41fa1437 2018-11-05 stsp struct got_repository *repo)
381 372ccdbb 2018-06-10 stsp {
382 372ccdbb 2018-06-10 stsp const struct got_error *err = NULL;
383 f4ceb45e 2018-07-23 stsp struct got_commit_graph_node *node;
384 fa2f6902 2018-07-23 stsp struct got_object_qid *pid;
385 649fc316 2018-11-05 stsp int branch_done = 0;
386 372ccdbb 2018-06-10 stsp
387 372ccdbb 2018-06-10 stsp *new_node = NULL;
388 649fc316 2018-11-05 stsp *changed = 0;
389 372ccdbb 2018-06-10 stsp
390 372ccdbb 2018-06-10 stsp node = calloc(1, sizeof(*node));
391 372ccdbb 2018-06-10 stsp if (node == NULL)
392 372ccdbb 2018-06-10 stsp return got_error_from_errno();
393 372ccdbb 2018-06-10 stsp
394 372ccdbb 2018-06-10 stsp memcpy(&node->id, commit_id, sizeof(node->id));
395 b43fbaa0 2018-06-11 stsp SIMPLEQ_INIT(&node->parent_ids);
396 fa2f6902 2018-07-23 stsp SIMPLEQ_FOREACH(pid, &commit->parent_ids, entry) {
397 fa2f6902 2018-07-23 stsp err = add_vertex(&node->parent_ids, pid->id);
398 4e845d01 2018-07-22 stsp if (err) {
399 fb5b9d5a 2018-07-23 stsp free_node(node);
400 b43fbaa0 2018-06-11 stsp return err;
401 4e845d01 2018-07-22 stsp }
402 b43fbaa0 2018-06-11 stsp node->nparents++;
403 b43fbaa0 2018-06-11 stsp }
404 bfd1f6da 2018-11-05 stsp node->commit_timestamp = commit->committer_time;
405 372ccdbb 2018-06-10 stsp
406 b36429ab 2018-11-05 stsp err = got_object_idset_add(graph->node_ids, &node->id, node);
407 f4ceb45e 2018-07-23 stsp if (err) {
408 fb5b9d5a 2018-07-23 stsp free_node(node);
409 372ccdbb 2018-06-10 stsp return err;
410 372ccdbb 2018-06-10 stsp }
411 372ccdbb 2018-06-10 stsp
412 649fc316 2018-11-05 stsp err = detect_changed_path(changed, commit, commit_id, graph->path,
413 31cedeaf 2018-09-15 stsp repo);
414 31cedeaf 2018-09-15 stsp if (err) {
415 31cedeaf 2018-09-15 stsp if (err->code == GOT_ERR_NO_OBJ) {
416 31cedeaf 2018-09-15 stsp /*
417 31cedeaf 2018-09-15 stsp * History of the path stops here on the current
418 31cedeaf 2018-09-15 stsp * branch. Keep going on other branches.
419 31cedeaf 2018-09-15 stsp */
420 31cedeaf 2018-09-15 stsp err = NULL;
421 31cedeaf 2018-09-15 stsp branch_done = 1;
422 31cedeaf 2018-09-15 stsp } else {
423 31cedeaf 2018-09-15 stsp free_node(node);
424 31cedeaf 2018-09-15 stsp return err;
425 31cedeaf 2018-09-15 stsp }
426 31cedeaf 2018-09-15 stsp }
427 31cedeaf 2018-09-15 stsp
428 649fc316 2018-11-05 stsp if (*changed)
429 bee6b577 2018-09-19 stsp add_node_to_iter_list(graph, node, child_node);
430 bee6b577 2018-09-19 stsp
431 31cedeaf 2018-09-15 stsp if (branch_done)
432 31cedeaf 2018-09-15 stsp err = close_branch(graph, commit_id);
433 31cedeaf 2018-09-15 stsp else
434 bee6b577 2018-09-19 stsp err = advance_branch(graph, node, commit_id, commit, repo);
435 f4ceb45e 2018-07-23 stsp if (err)
436 f4ceb45e 2018-07-23 stsp free_node(node);
437 f4ceb45e 2018-07-23 stsp else
438 f4ceb45e 2018-07-23 stsp *new_node = node;
439 372ccdbb 2018-06-10 stsp
440 c4d7a9c4 2018-06-11 stsp return err;
441 c4d7a9c4 2018-06-11 stsp }
442 c4d7a9c4 2018-06-11 stsp
443 c4d7a9c4 2018-06-11 stsp const struct got_error *
444 c4d7a9c4 2018-06-11 stsp got_commit_graph_open(struct got_commit_graph **graph,
445 31cedeaf 2018-09-15 stsp struct got_object_id *commit_id, const char *path,
446 31cedeaf 2018-09-15 stsp int first_parent_traversal, struct got_repository *repo)
447 c4d7a9c4 2018-06-11 stsp {
448 c4d7a9c4 2018-06-11 stsp const struct got_error *err = NULL;
449 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
450 649fc316 2018-11-05 stsp int changed;
451 c4d7a9c4 2018-06-11 stsp
452 c4d7a9c4 2018-06-11 stsp *graph = NULL;
453 c4d7a9c4 2018-06-11 stsp
454 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
455 372ccdbb 2018-06-10 stsp if (err)
456 372ccdbb 2018-06-10 stsp return err;
457 372ccdbb 2018-06-10 stsp
458 31cedeaf 2018-09-15 stsp /* The path must exist in our initial commit. */
459 31cedeaf 2018-09-15 stsp if (!got_path_is_root_dir(path)) {
460 31cedeaf 2018-09-15 stsp struct got_object_id *obj_id;
461 31cedeaf 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
462 31cedeaf 2018-09-15 stsp if (err)
463 31cedeaf 2018-09-15 stsp return err;
464 31cedeaf 2018-09-15 stsp free(obj_id);
465 31cedeaf 2018-09-15 stsp }
466 31cedeaf 2018-09-15 stsp
467 31cedeaf 2018-09-15 stsp *graph = alloc_graph(path);
468 372ccdbb 2018-06-10 stsp if (*graph == NULL) {
469 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
470 372ccdbb 2018-06-10 stsp return got_error_from_errno();
471 372ccdbb 2018-06-10 stsp }
472 372ccdbb 2018-06-10 stsp
473 0ed6ed4c 2018-06-13 stsp if (first_parent_traversal)
474 0ed6ed4c 2018-06-13 stsp (*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
475 0ed6ed4c 2018-06-13 stsp
476 649fc316 2018-11-05 stsp err = add_node(&(*graph)->head_node, &changed, *graph, commit_id,
477 649fc316 2018-11-05 stsp commit, NULL, repo);
478 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
479 372ccdbb 2018-06-10 stsp if (err) {
480 372ccdbb 2018-06-10 stsp got_commit_graph_close(*graph);
481 372ccdbb 2018-06-10 stsp *graph = NULL;
482 372ccdbb 2018-06-10 stsp return err;
483 372ccdbb 2018-06-10 stsp }
484 372ccdbb 2018-06-10 stsp
485 372ccdbb 2018-06-10 stsp return NULL;
486 372ccdbb 2018-06-10 stsp }
487 372ccdbb 2018-06-10 stsp
488 b565f6f8 2018-07-23 stsp struct gather_branch_tips_arg {
489 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
490 b565f6f8 2018-07-23 stsp int ntips;
491 372ccdbb 2018-06-10 stsp };
492 372ccdbb 2018-06-10 stsp
493 372ccdbb 2018-06-10 stsp static void
494 b565f6f8 2018-07-23 stsp gather_branch_tips(struct got_object_id *id, void *data, void *arg)
495 372ccdbb 2018-06-10 stsp {
496 b565f6f8 2018-07-23 stsp struct gather_branch_tips_arg *a = arg;
497 b565f6f8 2018-07-23 stsp memcpy(&a->tips[a->ntips].id, id, sizeof(*id));
498 b565f6f8 2018-07-23 stsp a->tips[a->ntips].node = data;
499 b565f6f8 2018-07-23 stsp a->ntips++;
500 372ccdbb 2018-06-10 stsp }
501 372ccdbb 2018-06-10 stsp
502 1142eae9 2018-06-11 stsp static const struct got_error *
503 644e44ed 2018-11-04 stsp fetch_commits_from_open_branches(int *ncommits,
504 31cedeaf 2018-09-15 stsp struct got_object_id **changed_id, struct got_commit_graph *graph,
505 644e44ed 2018-11-04 stsp struct got_repository *repo)
506 372ccdbb 2018-06-10 stsp {
507 372ccdbb 2018-06-10 stsp const struct got_error *err;
508 b565f6f8 2018-07-23 stsp struct gather_branch_tips_arg arg;
509 372ccdbb 2018-06-10 stsp int i;
510 372ccdbb 2018-06-10 stsp
511 372ccdbb 2018-06-10 stsp *ncommits = 0;
512 649fc316 2018-11-05 stsp *changed_id = NULL;
513 372ccdbb 2018-06-10 stsp
514 b565f6f8 2018-07-23 stsp arg.ntips = got_object_idset_num_elements(graph->open_branches);
515 b565f6f8 2018-07-23 stsp if (arg.ntips == 0)
516 372ccdbb 2018-06-10 stsp return NULL;
517 372ccdbb 2018-06-10 stsp
518 372ccdbb 2018-06-10 stsp /*
519 372ccdbb 2018-06-10 stsp * Adding nodes to the graph might change the graph's open
520 372ccdbb 2018-06-10 stsp * branches state. Create a local copy of the current state.
521 372ccdbb 2018-06-10 stsp */
522 b565f6f8 2018-07-23 stsp if (graph->ntips < arg.ntips) {
523 b565f6f8 2018-07-23 stsp struct got_commit_graph_branch_tip *tips;
524 b565f6f8 2018-07-23 stsp if (arg.ntips < GOT_COMMIT_GRAPH_MIN_TIPS)
525 b565f6f8 2018-07-23 stsp arg.ntips = GOT_COMMIT_GRAPH_MIN_TIPS;
526 b565f6f8 2018-07-23 stsp tips = reallocarray(graph->tips, arg.ntips, sizeof(*tips));
527 b565f6f8 2018-07-23 stsp if (tips == NULL)
528 b565f6f8 2018-07-23 stsp return got_error_from_errno();
529 b565f6f8 2018-07-23 stsp graph->tips = tips;
530 b565f6f8 2018-07-23 stsp graph->ntips = arg.ntips;
531 b565f6f8 2018-07-23 stsp }
532 b565f6f8 2018-07-23 stsp arg.ntips = 0; /* reset; gather_branch_tips() will increment */
533 b565f6f8 2018-07-23 stsp arg.tips = graph->tips;
534 b565f6f8 2018-07-23 stsp got_object_idset_for_each(graph->open_branches,
535 b565f6f8 2018-07-23 stsp gather_branch_tips, &arg);
536 372ccdbb 2018-06-10 stsp
537 b565f6f8 2018-07-23 stsp for (i = 0; i < arg.ntips; i++) {
538 372ccdbb 2018-06-10 stsp struct got_object_id *commit_id;
539 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *child_node, *new_node;
540 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
541 31cedeaf 2018-09-15 stsp int changed;
542 372ccdbb 2018-06-10 stsp
543 b565f6f8 2018-07-23 stsp commit_id = &graph->tips[i].id;
544 b565f6f8 2018-07-23 stsp child_node = graph->tips[i].node;
545 372ccdbb 2018-06-10 stsp
546 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
547 372ccdbb 2018-06-10 stsp if (err)
548 372ccdbb 2018-06-10 stsp break;
549 372ccdbb 2018-06-10 stsp
550 649fc316 2018-11-05 stsp err = add_node(&new_node, &changed, graph, commit_id, commit,
551 649fc316 2018-11-05 stsp child_node, repo);
552 649fc316 2018-11-05 stsp if (changed && *changed_id == NULL)
553 31cedeaf 2018-09-15 stsp *changed_id = commit_id;
554 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
555 cb352812 2018-07-22 stsp if (err)
556 cb352812 2018-07-22 stsp break;
557 372ccdbb 2018-06-10 stsp if (new_node)
558 372ccdbb 2018-06-10 stsp (*ncommits)++;
559 372ccdbb 2018-06-10 stsp }
560 372ccdbb 2018-06-10 stsp
561 372ccdbb 2018-06-10 stsp return err;
562 372ccdbb 2018-06-10 stsp }
563 372ccdbb 2018-06-10 stsp
564 372ccdbb 2018-06-10 stsp const struct got_error *
565 31cedeaf 2018-09-15 stsp got_commit_graph_fetch_commits(struct got_commit_graph *graph, int limit,
566 31cedeaf 2018-09-15 stsp struct got_repository *repo)
567 372ccdbb 2018-06-10 stsp {
568 372ccdbb 2018-06-10 stsp const struct got_error *err;
569 31cedeaf 2018-09-15 stsp int nfetched = 0, ncommits;
570 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
571 372ccdbb 2018-06-10 stsp
572 31cedeaf 2018-09-15 stsp while (nfetched < limit) {
573 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
574 644e44ed 2018-11-04 stsp &changed_id, graph, repo);
575 372ccdbb 2018-06-10 stsp if (err)
576 372ccdbb 2018-06-10 stsp return err;
577 372ccdbb 2018-06-10 stsp if (ncommits == 0)
578 372ccdbb 2018-06-10 stsp break;
579 31cedeaf 2018-09-15 stsp if (changed_id)
580 31cedeaf 2018-09-15 stsp nfetched += ncommits;
581 372ccdbb 2018-06-10 stsp }
582 372ccdbb 2018-06-10 stsp
583 372ccdbb 2018-06-10 stsp return NULL;
584 372ccdbb 2018-06-10 stsp }
585 1142eae9 2018-06-11 stsp
586 372ccdbb 2018-06-10 stsp static void
587 fb5b9d5a 2018-07-23 stsp free_node_iter(struct got_object_id *id, void *data, void *arg)
588 372ccdbb 2018-06-10 stsp {
589 372ccdbb 2018-06-10 stsp struct got_commit_graph_node *node = data;
590 fb5b9d5a 2018-07-23 stsp free_node(node);
591 372ccdbb 2018-06-10 stsp }
592 372ccdbb 2018-06-10 stsp
593 372ccdbb 2018-06-10 stsp void
594 372ccdbb 2018-06-10 stsp got_commit_graph_close(struct got_commit_graph *graph)
595 372ccdbb 2018-06-10 stsp {
596 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->open_branches);
597 fb5b9d5a 2018-07-23 stsp got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
598 372ccdbb 2018-06-10 stsp got_object_idset_free(graph->node_ids);
599 b565f6f8 2018-07-23 stsp free(graph->tips);
600 31cedeaf 2018-09-15 stsp free(graph->path);
601 372ccdbb 2018-06-10 stsp free(graph);
602 372ccdbb 2018-06-10 stsp }
603 372ccdbb 2018-06-10 stsp
604 372ccdbb 2018-06-10 stsp const struct got_error *
605 372ccdbb 2018-06-10 stsp got_commit_graph_iter_start(struct got_commit_graph *graph,
606 31cedeaf 2018-09-15 stsp struct got_object_id *id, struct got_repository *repo)
607 372ccdbb 2018-06-10 stsp {
608 31cedeaf 2018-09-15 stsp const struct got_error *err = NULL;
609 9ba79e04 2018-06-11 stsp struct got_commit_graph_node *start_node;
610 41fa1437 2018-11-05 stsp struct got_commit_object *commit;
611 31cedeaf 2018-09-15 stsp int changed;
612 372ccdbb 2018-06-10 stsp
613 372ccdbb 2018-06-10 stsp start_node = got_object_idset_get(graph->node_ids, id);
614 372ccdbb 2018-06-10 stsp if (start_node == NULL)
615 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_NO_OBJ);
616 372ccdbb 2018-06-10 stsp
617 41fa1437 2018-11-05 stsp err = got_object_open_as_commit(&commit, repo, &start_node->id);
618 31cedeaf 2018-09-15 stsp if (err)
619 31cedeaf 2018-09-15 stsp return err;
620 31cedeaf 2018-09-15 stsp
621 31cedeaf 2018-09-15 stsp err = detect_changed_path(&changed, commit, &start_node->id,
622 31cedeaf 2018-09-15 stsp graph->path, repo);
623 31cedeaf 2018-09-15 stsp if (err) {
624 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
625 31cedeaf 2018-09-15 stsp return err;
626 31cedeaf 2018-09-15 stsp }
627 31cedeaf 2018-09-15 stsp
628 31cedeaf 2018-09-15 stsp if (!changed) {
629 31cedeaf 2018-09-15 stsp /* Locate first commit which changed graph->path. */
630 31cedeaf 2018-09-15 stsp struct got_object_id *changed_id = NULL;
631 31cedeaf 2018-09-15 stsp while (changed_id == NULL) {
632 31cedeaf 2018-09-15 stsp int ncommits;
633 644e44ed 2018-11-04 stsp err = fetch_commits_from_open_branches(&ncommits,
634 644e44ed 2018-11-04 stsp &changed_id, graph, repo);
635 31cedeaf 2018-09-15 stsp if (err) {
636 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
637 31cedeaf 2018-09-15 stsp return err;
638 31cedeaf 2018-09-15 stsp }
639 31cedeaf 2018-09-15 stsp }
640 31cedeaf 2018-09-15 stsp start_node = got_object_idset_get(graph->node_ids, changed_id);
641 31cedeaf 2018-09-15 stsp }
642 41fa1437 2018-11-05 stsp got_object_commit_close(commit);
643 31cedeaf 2018-09-15 stsp
644 372ccdbb 2018-06-10 stsp graph->iter_node = start_node;
645 372ccdbb 2018-06-10 stsp return NULL;
646 372ccdbb 2018-06-10 stsp }
647 372ccdbb 2018-06-10 stsp
648 372ccdbb 2018-06-10 stsp const struct got_error *
649 b43fbaa0 2018-06-11 stsp got_commit_graph_iter_next(struct got_object_id **id,
650 b43fbaa0 2018-06-11 stsp struct got_commit_graph *graph)
651 372ccdbb 2018-06-10 stsp {
652 9ba79e04 2018-06-11 stsp *id = NULL;
653 372ccdbb 2018-06-10 stsp
654 372ccdbb 2018-06-10 stsp if (graph->iter_node == NULL) {
655 2c7f8870 2018-09-19 stsp /* We are done iterating, or iteration was not started. */
656 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_ITER_COMPLETED);
657 9ba79e04 2018-06-11 stsp }
658 9ba79e04 2018-06-11 stsp
659 9ba79e04 2018-06-11 stsp if (graph->iter_node ==
660 9ba79e04 2018-06-11 stsp TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) &&
661 9ba79e04 2018-06-11 stsp got_object_idset_num_elements(graph->open_branches) == 0) {
662 2c7f8870 2018-09-19 stsp /* We are done iterating. */
663 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
664 9ba79e04 2018-06-11 stsp graph->iter_node = NULL;
665 6bc66952 2018-09-19 stsp return NULL;
666 372ccdbb 2018-06-10 stsp }
667 372ccdbb 2018-06-10 stsp
668 9ba79e04 2018-06-11 stsp if (TAILQ_NEXT(graph->iter_node, entry) == NULL)
669 372ccdbb 2018-06-10 stsp return got_error(GOT_ERR_ITER_NEED_MORE);
670 372ccdbb 2018-06-10 stsp
671 6bc66952 2018-09-19 stsp *id = &graph->iter_node->id;
672 6bc66952 2018-09-19 stsp graph->iter_node = TAILQ_NEXT(graph->iter_node, entry);
673 372ccdbb 2018-06-10 stsp return NULL;
674 372ccdbb 2018-06-10 stsp }