Blame


1 24df9a28 2023-07-08 jrick /*
2 24df9a28 2023-07-08 jrick * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 24df9a28 2023-07-08 jrick * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 24df9a28 2023-07-08 jrick * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
5 24df9a28 2023-07-08 jrick * Copyright (C) 2023 Josh Rickmar <jrick@zettaport.com>
6 24df9a28 2023-07-08 jrick *
7 24df9a28 2023-07-08 jrick * Permission to use, copy, modify, and distribute this software for any
8 24df9a28 2023-07-08 jrick * purpose with or without fee is hereby granted, provided that the above
9 24df9a28 2023-07-08 jrick * copyright notice and this permission notice appear in all copies.
10 24df9a28 2023-07-08 jrick *
11 24df9a28 2023-07-08 jrick * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 24df9a28 2023-07-08 jrick * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 24df9a28 2023-07-08 jrick * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 24df9a28 2023-07-08 jrick * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 24df9a28 2023-07-08 jrick * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 24df9a28 2023-07-08 jrick * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 24df9a28 2023-07-08 jrick * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 24df9a28 2023-07-08 jrick */
19 24df9a28 2023-07-08 jrick
20 24df9a28 2023-07-08 jrick #include <sys/queue.h>
21 24df9a28 2023-07-08 jrick #include <sys/time.h>
22 24df9a28 2023-07-08 jrick #include <sys/types.h>
23 24df9a28 2023-07-08 jrick #include <sys/stat.h>
24 24df9a28 2023-07-08 jrick #include <sys/wait.h>
25 24df9a28 2023-07-08 jrick
26 24df9a28 2023-07-08 jrick #include <err.h>
27 24df9a28 2023-07-08 jrick #include <errno.h>
28 24df9a28 2023-07-08 jrick #include <fcntl.h>
29 24df9a28 2023-07-08 jrick #include <limits.h>
30 24df9a28 2023-07-08 jrick #include <locale.h>
31 24df9a28 2023-07-08 jrick #include <ctype.h>
32 24df9a28 2023-07-08 jrick #include <sha1.h>
33 24df9a28 2023-07-08 jrick #include <sha2.h>
34 24df9a28 2023-07-08 jrick #include <signal.h>
35 24df9a28 2023-07-08 jrick #include <stdio.h>
36 24df9a28 2023-07-08 jrick #include <stdlib.h>
37 24df9a28 2023-07-08 jrick #include <string.h>
38 24df9a28 2023-07-08 jrick #include <unistd.h>
39 24df9a28 2023-07-08 jrick #include <libgen.h>
40 24df9a28 2023-07-08 jrick #include <time.h>
41 24df9a28 2023-07-08 jrick #include <paths.h>
42 24df9a28 2023-07-08 jrick #include <regex.h>
43 24df9a28 2023-07-08 jrick #include <getopt.h>
44 24df9a28 2023-07-08 jrick #include <util.h>
45 24df9a28 2023-07-08 jrick
46 24df9a28 2023-07-08 jrick #include "got_version.h"
47 24df9a28 2023-07-08 jrick #include "got_error.h"
48 24df9a28 2023-07-08 jrick #include "got_object.h"
49 24df9a28 2023-07-08 jrick #include "got_reference.h"
50 24df9a28 2023-07-08 jrick #include "got_repository.h"
51 24df9a28 2023-07-08 jrick #include "got_path.h"
52 24df9a28 2023-07-08 jrick #include "got_cancel.h"
53 24df9a28 2023-07-08 jrick #include "got_worktree.h"
54 24df9a28 2023-07-08 jrick #include "got_worktree_cvg.h"
55 24df9a28 2023-07-08 jrick #include "got_diff.h"
56 24df9a28 2023-07-08 jrick #include "got_commit_graph.h"
57 24df9a28 2023-07-08 jrick #include "got_fetch.h"
58 24df9a28 2023-07-08 jrick #include "got_send.h"
59 24df9a28 2023-07-08 jrick #include "got_blame.h"
60 24df9a28 2023-07-08 jrick #include "got_privsep.h"
61 24df9a28 2023-07-08 jrick #include "got_opentemp.h"
62 24df9a28 2023-07-08 jrick #include "got_gotconfig.h"
63 24df9a28 2023-07-08 jrick #include "got_dial.h"
64 24df9a28 2023-07-08 jrick #include "got_patch.h"
65 24df9a28 2023-07-08 jrick #include "got_sigs.h"
66 24df9a28 2023-07-08 jrick #include "got_date.h"
67 24df9a28 2023-07-08 jrick
68 24df9a28 2023-07-08 jrick #ifndef nitems
69 24df9a28 2023-07-08 jrick #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
70 24df9a28 2023-07-08 jrick #endif
71 24df9a28 2023-07-08 jrick
72 24df9a28 2023-07-08 jrick static volatile sig_atomic_t sigint_received;
73 24df9a28 2023-07-08 jrick static volatile sig_atomic_t sigpipe_received;
74 24df9a28 2023-07-08 jrick
75 24df9a28 2023-07-08 jrick static void
76 24df9a28 2023-07-08 jrick catch_sigint(int signo)
77 24df9a28 2023-07-08 jrick {
78 24df9a28 2023-07-08 jrick sigint_received = 1;
79 24df9a28 2023-07-08 jrick }
80 24df9a28 2023-07-08 jrick
81 24df9a28 2023-07-08 jrick static void
82 24df9a28 2023-07-08 jrick catch_sigpipe(int signo)
83 24df9a28 2023-07-08 jrick {
84 24df9a28 2023-07-08 jrick sigpipe_received = 1;
85 24df9a28 2023-07-08 jrick }
86 24df9a28 2023-07-08 jrick
87 24df9a28 2023-07-08 jrick
88 24df9a28 2023-07-08 jrick struct got_cmd {
89 24df9a28 2023-07-08 jrick const char *cmd_name;
90 24df9a28 2023-07-08 jrick const struct got_error *(*cmd_main)(int, char *[]);
91 24df9a28 2023-07-08 jrick void (*cmd_usage)(void);
92 24df9a28 2023-07-08 jrick const char *cmd_alias;
93 24df9a28 2023-07-08 jrick };
94 24df9a28 2023-07-08 jrick
95 24df9a28 2023-07-08 jrick __dead static void usage(int, int);
96 24df9a28 2023-07-08 jrick __dead static void usage_import(void);
97 24df9a28 2023-07-08 jrick __dead static void usage_clone(void);
98 24df9a28 2023-07-08 jrick __dead static void usage_checkout(void);
99 24df9a28 2023-07-08 jrick __dead static void usage_update(void);
100 24df9a28 2023-07-08 jrick __dead static void usage_log(void);
101 24df9a28 2023-07-08 jrick __dead static void usage_diff(void);
102 24df9a28 2023-07-08 jrick __dead static void usage_blame(void);
103 24df9a28 2023-07-08 jrick __dead static void usage_tree(void);
104 24df9a28 2023-07-08 jrick __dead static void usage_status(void);
105 24df9a28 2023-07-08 jrick __dead static void usage_ref(void);
106 24df9a28 2023-07-08 jrick __dead static void usage_tag(void);
107 24df9a28 2023-07-08 jrick __dead static void usage_add(void);
108 24df9a28 2023-07-08 jrick __dead static void usage_remove(void);
109 24df9a28 2023-07-08 jrick __dead static void usage_patch(void);
110 24df9a28 2023-07-08 jrick __dead static void usage_revert(void);
111 24df9a28 2023-07-08 jrick __dead static void usage_commit(void);
112 24df9a28 2023-07-08 jrick __dead static void usage_cherrypick(void);
113 24df9a28 2023-07-08 jrick __dead static void usage_backout(void);
114 24df9a28 2023-07-08 jrick __dead static void usage_cat(void);
115 24df9a28 2023-07-08 jrick __dead static void usage_info(void);
116 24df9a28 2023-07-08 jrick
117 24df9a28 2023-07-08 jrick static const struct got_error* cmd_import(int, char *[]);
118 24df9a28 2023-07-08 jrick static const struct got_error* cmd_clone(int, char *[]);
119 24df9a28 2023-07-08 jrick static const struct got_error* cmd_checkout(int, char *[]);
120 24df9a28 2023-07-08 jrick static const struct got_error* cmd_update(int, char *[]);
121 24df9a28 2023-07-08 jrick static const struct got_error* cmd_log(int, char *[]);
122 24df9a28 2023-07-08 jrick static const struct got_error* cmd_diff(int, char *[]);
123 24df9a28 2023-07-08 jrick static const struct got_error* cmd_blame(int, char *[]);
124 24df9a28 2023-07-08 jrick static const struct got_error* cmd_tree(int, char *[]);
125 24df9a28 2023-07-08 jrick static const struct got_error* cmd_status(int, char *[]);
126 24df9a28 2023-07-08 jrick static const struct got_error* cmd_ref(int, char *[]);
127 24df9a28 2023-07-08 jrick static const struct got_error* cmd_tag(int, char *[]);
128 24df9a28 2023-07-08 jrick static const struct got_error* cmd_add(int, char *[]);
129 24df9a28 2023-07-08 jrick static const struct got_error* cmd_remove(int, char *[]);
130 24df9a28 2023-07-08 jrick static const struct got_error* cmd_patch(int, char *[]);
131 24df9a28 2023-07-08 jrick static const struct got_error* cmd_revert(int, char *[]);
132 24df9a28 2023-07-08 jrick static const struct got_error* cmd_commit(int, char *[]);
133 24df9a28 2023-07-08 jrick static const struct got_error* cmd_cherrypick(int, char *[]);
134 24df9a28 2023-07-08 jrick static const struct got_error* cmd_backout(int, char *[]);
135 24df9a28 2023-07-08 jrick static const struct got_error* cmd_cat(int, char *[]);
136 24df9a28 2023-07-08 jrick static const struct got_error* cmd_info(int, char *[]);
137 24df9a28 2023-07-08 jrick
138 24df9a28 2023-07-08 jrick static const struct got_cmd got_commands[] = {
139 24df9a28 2023-07-08 jrick { "import", cmd_import, usage_import, "im" },
140 24df9a28 2023-07-08 jrick { "clone", cmd_clone, usage_clone, "cl" },
141 24df9a28 2023-07-08 jrick { "checkout", cmd_checkout, usage_checkout, "co" },
142 24df9a28 2023-07-08 jrick { "update", cmd_update, usage_update, "up" },
143 24df9a28 2023-07-08 jrick { "log", cmd_log, usage_log, "" },
144 24df9a28 2023-07-08 jrick { "diff", cmd_diff, usage_diff, "di" },
145 24df9a28 2023-07-08 jrick { "blame", cmd_blame, usage_blame, "bl" },
146 24df9a28 2023-07-08 jrick { "tree", cmd_tree, usage_tree, "tr" },
147 24df9a28 2023-07-08 jrick { "status", cmd_status, usage_status, "st" },
148 24df9a28 2023-07-08 jrick { "ref", cmd_ref, usage_ref, "" },
149 24df9a28 2023-07-08 jrick { "tag", cmd_tag, usage_tag, "" },
150 24df9a28 2023-07-08 jrick { "add", cmd_add, usage_add, "" },
151 24df9a28 2023-07-08 jrick { "remove", cmd_remove, usage_remove, "rm" },
152 24df9a28 2023-07-08 jrick { "patch", cmd_patch, usage_patch, "pa" },
153 24df9a28 2023-07-08 jrick { "revert", cmd_revert, usage_revert, "rv" },
154 24df9a28 2023-07-08 jrick { "commit", cmd_commit, usage_commit, "ci" },
155 24df9a28 2023-07-08 jrick { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
156 24df9a28 2023-07-08 jrick { "backout", cmd_backout, usage_backout, "bo" },
157 24df9a28 2023-07-08 jrick { "cat", cmd_cat, usage_cat, "" },
158 24df9a28 2023-07-08 jrick { "info", cmd_info, usage_info, "" },
159 24df9a28 2023-07-08 jrick };
160 24df9a28 2023-07-08 jrick
161 24df9a28 2023-07-08 jrick static void
162 24df9a28 2023-07-08 jrick list_commands(FILE *fp)
163 24df9a28 2023-07-08 jrick {
164 24df9a28 2023-07-08 jrick size_t i;
165 24df9a28 2023-07-08 jrick
166 24df9a28 2023-07-08 jrick fprintf(fp, "commands:");
167 24df9a28 2023-07-08 jrick for (i = 0; i < nitems(got_commands); i++) {
168 24df9a28 2023-07-08 jrick const struct got_cmd *cmd = &got_commands[i];
169 24df9a28 2023-07-08 jrick fprintf(fp, " %s", cmd->cmd_name);
170 24df9a28 2023-07-08 jrick }
171 24df9a28 2023-07-08 jrick fputc('\n', fp);
172 24df9a28 2023-07-08 jrick }
173 24df9a28 2023-07-08 jrick
174 24df9a28 2023-07-08 jrick __dead static void
175 24df9a28 2023-07-08 jrick option_conflict(char a, char b)
176 24df9a28 2023-07-08 jrick {
177 24df9a28 2023-07-08 jrick errx(1, "-%c and -%c options are mutually exclusive", a, b);
178 24df9a28 2023-07-08 jrick }
179 24df9a28 2023-07-08 jrick
180 24df9a28 2023-07-08 jrick int
181 24df9a28 2023-07-08 jrick main(int argc, char *argv[])
182 24df9a28 2023-07-08 jrick {
183 24df9a28 2023-07-08 jrick const struct got_cmd *cmd;
184 24df9a28 2023-07-08 jrick size_t i;
185 24df9a28 2023-07-08 jrick int ch;
186 24df9a28 2023-07-08 jrick int hflag = 0, Vflag = 0;
187 24df9a28 2023-07-08 jrick static const struct option longopts[] = {
188 24df9a28 2023-07-08 jrick { "version", no_argument, NULL, 'V' },
189 24df9a28 2023-07-08 jrick { NULL, 0, NULL, 0 }
190 24df9a28 2023-07-08 jrick };
191 24df9a28 2023-07-08 jrick
192 24df9a28 2023-07-08 jrick setlocale(LC_CTYPE, "");
193 24df9a28 2023-07-08 jrick
194 24df9a28 2023-07-08 jrick while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
195 24df9a28 2023-07-08 jrick switch (ch) {
196 24df9a28 2023-07-08 jrick case 'h':
197 24df9a28 2023-07-08 jrick hflag = 1;
198 24df9a28 2023-07-08 jrick break;
199 24df9a28 2023-07-08 jrick case 'V':
200 24df9a28 2023-07-08 jrick Vflag = 1;
201 24df9a28 2023-07-08 jrick break;
202 24df9a28 2023-07-08 jrick default:
203 24df9a28 2023-07-08 jrick usage(hflag, 1);
204 24df9a28 2023-07-08 jrick /* NOTREACHED */
205 24df9a28 2023-07-08 jrick }
206 24df9a28 2023-07-08 jrick }
207 24df9a28 2023-07-08 jrick
208 24df9a28 2023-07-08 jrick argc -= optind;
209 24df9a28 2023-07-08 jrick argv += optind;
210 24df9a28 2023-07-08 jrick optind = 1;
211 24df9a28 2023-07-08 jrick optreset = 1;
212 24df9a28 2023-07-08 jrick
213 24df9a28 2023-07-08 jrick if (Vflag) {
214 24df9a28 2023-07-08 jrick got_version_print_str();
215 24df9a28 2023-07-08 jrick return 0;
216 24df9a28 2023-07-08 jrick }
217 24df9a28 2023-07-08 jrick
218 24df9a28 2023-07-08 jrick if (argc <= 0)
219 24df9a28 2023-07-08 jrick usage(hflag, hflag ? 0 : 1);
220 24df9a28 2023-07-08 jrick
221 24df9a28 2023-07-08 jrick signal(SIGINT, catch_sigint);
222 24df9a28 2023-07-08 jrick signal(SIGPIPE, catch_sigpipe);
223 24df9a28 2023-07-08 jrick
224 24df9a28 2023-07-08 jrick for (i = 0; i < nitems(got_commands); i++) {
225 24df9a28 2023-07-08 jrick const struct got_error *error;
226 24df9a28 2023-07-08 jrick
227 24df9a28 2023-07-08 jrick cmd = &got_commands[i];
228 24df9a28 2023-07-08 jrick
229 24df9a28 2023-07-08 jrick if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
230 24df9a28 2023-07-08 jrick strcmp(cmd->cmd_alias, argv[0]) != 0)
231 24df9a28 2023-07-08 jrick continue;
232 24df9a28 2023-07-08 jrick
233 24df9a28 2023-07-08 jrick if (hflag)
234 24df9a28 2023-07-08 jrick cmd->cmd_usage();
235 24df9a28 2023-07-08 jrick
236 24df9a28 2023-07-08 jrick error = cmd->cmd_main(argc, argv);
237 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_CANCELLED &&
238 24df9a28 2023-07-08 jrick error->code != GOT_ERR_PRIVSEP_EXIT &&
239 24df9a28 2023-07-08 jrick !(sigpipe_received &&
240 24df9a28 2023-07-08 jrick error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
241 24df9a28 2023-07-08 jrick !(sigint_received &&
242 24df9a28 2023-07-08 jrick error->code == GOT_ERR_ERRNO && errno == EINTR)) {
243 24df9a28 2023-07-08 jrick fflush(stdout);
244 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
245 24df9a28 2023-07-08 jrick return 1;
246 24df9a28 2023-07-08 jrick }
247 24df9a28 2023-07-08 jrick
248 24df9a28 2023-07-08 jrick return 0;
249 24df9a28 2023-07-08 jrick }
250 24df9a28 2023-07-08 jrick
251 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
252 24df9a28 2023-07-08 jrick list_commands(stderr);
253 24df9a28 2023-07-08 jrick return 1;
254 24df9a28 2023-07-08 jrick }
255 24df9a28 2023-07-08 jrick
256 24df9a28 2023-07-08 jrick __dead static void
257 24df9a28 2023-07-08 jrick usage(int hflag, int status)
258 24df9a28 2023-07-08 jrick {
259 24df9a28 2023-07-08 jrick FILE *fp = (status == 0) ? stdout : stderr;
260 24df9a28 2023-07-08 jrick
261 24df9a28 2023-07-08 jrick fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
262 24df9a28 2023-07-08 jrick getprogname());
263 24df9a28 2023-07-08 jrick if (hflag)
264 24df9a28 2023-07-08 jrick list_commands(fp);
265 24df9a28 2023-07-08 jrick exit(status);
266 24df9a28 2023-07-08 jrick }
267 24df9a28 2023-07-08 jrick
268 24df9a28 2023-07-08 jrick static const struct got_error *
269 24df9a28 2023-07-08 jrick get_editor(char **abspath)
270 24df9a28 2023-07-08 jrick {
271 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
272 24df9a28 2023-07-08 jrick const char *editor;
273 24df9a28 2023-07-08 jrick
274 24df9a28 2023-07-08 jrick *abspath = NULL;
275 24df9a28 2023-07-08 jrick
276 24df9a28 2023-07-08 jrick editor = getenv("VISUAL");
277 24df9a28 2023-07-08 jrick if (editor == NULL)
278 24df9a28 2023-07-08 jrick editor = getenv("EDITOR");
279 24df9a28 2023-07-08 jrick
280 24df9a28 2023-07-08 jrick if (editor) {
281 24df9a28 2023-07-08 jrick err = got_path_find_prog(abspath, editor);
282 24df9a28 2023-07-08 jrick if (err)
283 24df9a28 2023-07-08 jrick return err;
284 24df9a28 2023-07-08 jrick }
285 24df9a28 2023-07-08 jrick
286 24df9a28 2023-07-08 jrick if (*abspath == NULL) {
287 24df9a28 2023-07-08 jrick *abspath = strdup("/usr/bin/vi");
288 24df9a28 2023-07-08 jrick if (*abspath == NULL)
289 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
290 24df9a28 2023-07-08 jrick }
291 24df9a28 2023-07-08 jrick
292 24df9a28 2023-07-08 jrick return NULL;
293 24df9a28 2023-07-08 jrick }
294 24df9a28 2023-07-08 jrick
295 24df9a28 2023-07-08 jrick static const struct got_error *
296 24df9a28 2023-07-08 jrick apply_unveil(const char *repo_path, int repo_read_only,
297 24df9a28 2023-07-08 jrick const char *worktree_path)
298 24df9a28 2023-07-08 jrick {
299 24df9a28 2023-07-08 jrick const struct got_error *err;
300 24df9a28 2023-07-08 jrick
301 24df9a28 2023-07-08 jrick #ifdef PROFILE
302 24df9a28 2023-07-08 jrick if (unveil("gmon.out", "rwc") != 0)
303 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", "gmon.out");
304 24df9a28 2023-07-08 jrick #endif
305 24df9a28 2023-07-08 jrick if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
306 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", repo_path);
307 24df9a28 2023-07-08 jrick
308 24df9a28 2023-07-08 jrick if (worktree_path && unveil(worktree_path, "rwc") != 0)
309 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", worktree_path);
310 24df9a28 2023-07-08 jrick
311 24df9a28 2023-07-08 jrick if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
312 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
313 24df9a28 2023-07-08 jrick
314 24df9a28 2023-07-08 jrick err = got_privsep_unveil_exec_helpers();
315 24df9a28 2023-07-08 jrick if (err != NULL)
316 24df9a28 2023-07-08 jrick return err;
317 24df9a28 2023-07-08 jrick
318 24df9a28 2023-07-08 jrick if (unveil(NULL, NULL) != 0)
319 24df9a28 2023-07-08 jrick return got_error_from_errno("unveil");
320 24df9a28 2023-07-08 jrick
321 24df9a28 2023-07-08 jrick return NULL;
322 24df9a28 2023-07-08 jrick }
323 24df9a28 2023-07-08 jrick
324 24df9a28 2023-07-08 jrick __dead static void
325 24df9a28 2023-07-08 jrick usage_import(void)
326 24df9a28 2023-07-08 jrick {
327 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
328 24df9a28 2023-07-08 jrick "[-r repository-path] directory\n", getprogname());
329 24df9a28 2023-07-08 jrick exit(1);
330 24df9a28 2023-07-08 jrick }
331 24df9a28 2023-07-08 jrick
332 24df9a28 2023-07-08 jrick static int
333 24df9a28 2023-07-08 jrick spawn_editor(const char *editor, const char *file)
334 24df9a28 2023-07-08 jrick {
335 24df9a28 2023-07-08 jrick pid_t pid;
336 24df9a28 2023-07-08 jrick sig_t sighup, sigint, sigquit;
337 24df9a28 2023-07-08 jrick int st = -1;
338 24df9a28 2023-07-08 jrick
339 24df9a28 2023-07-08 jrick sighup = signal(SIGHUP, SIG_IGN);
340 24df9a28 2023-07-08 jrick sigint = signal(SIGINT, SIG_IGN);
341 24df9a28 2023-07-08 jrick sigquit = signal(SIGQUIT, SIG_IGN);
342 24df9a28 2023-07-08 jrick
343 24df9a28 2023-07-08 jrick switch (pid = fork()) {
344 24df9a28 2023-07-08 jrick case -1:
345 24df9a28 2023-07-08 jrick goto doneediting;
346 24df9a28 2023-07-08 jrick case 0:
347 24df9a28 2023-07-08 jrick execl(editor, editor, file, (char *)NULL);
348 24df9a28 2023-07-08 jrick _exit(127);
349 24df9a28 2023-07-08 jrick }
350 24df9a28 2023-07-08 jrick
351 24df9a28 2023-07-08 jrick while (waitpid(pid, &st, 0) == -1)
352 24df9a28 2023-07-08 jrick if (errno != EINTR)
353 24df9a28 2023-07-08 jrick break;
354 24df9a28 2023-07-08 jrick
355 24df9a28 2023-07-08 jrick doneediting:
356 24df9a28 2023-07-08 jrick (void)signal(SIGHUP, sighup);
357 24df9a28 2023-07-08 jrick (void)signal(SIGINT, sigint);
358 24df9a28 2023-07-08 jrick (void)signal(SIGQUIT, sigquit);
359 24df9a28 2023-07-08 jrick
360 24df9a28 2023-07-08 jrick if (!WIFEXITED(st)) {
361 24df9a28 2023-07-08 jrick errno = EINTR;
362 24df9a28 2023-07-08 jrick return -1;
363 24df9a28 2023-07-08 jrick }
364 24df9a28 2023-07-08 jrick
365 24df9a28 2023-07-08 jrick return WEXITSTATUS(st);
366 24df9a28 2023-07-08 jrick }
367 24df9a28 2023-07-08 jrick
368 24df9a28 2023-07-08 jrick static const struct got_error *
369 24df9a28 2023-07-08 jrick read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
370 24df9a28 2023-07-08 jrick {
371 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
372 24df9a28 2023-07-08 jrick char *line = NULL;
373 24df9a28 2023-07-08 jrick size_t linesize = 0;
374 24df9a28 2023-07-08 jrick
375 24df9a28 2023-07-08 jrick *logmsg = NULL;
376 24df9a28 2023-07-08 jrick *len = 0;
377 24df9a28 2023-07-08 jrick
378 24df9a28 2023-07-08 jrick if (fseeko(fp, 0L, SEEK_SET) == -1)
379 24df9a28 2023-07-08 jrick return got_error_from_errno("fseeko");
380 24df9a28 2023-07-08 jrick
381 24df9a28 2023-07-08 jrick *logmsg = malloc(filesize + 1);
382 24df9a28 2023-07-08 jrick if (*logmsg == NULL)
383 24df9a28 2023-07-08 jrick return got_error_from_errno("malloc");
384 24df9a28 2023-07-08 jrick (*logmsg)[0] = '\0';
385 24df9a28 2023-07-08 jrick
386 24df9a28 2023-07-08 jrick while (getline(&line, &linesize, fp) != -1) {
387 24df9a28 2023-07-08 jrick if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
388 24df9a28 2023-07-08 jrick continue; /* remove comments and leading empty lines */
389 24df9a28 2023-07-08 jrick *len = strlcat(*logmsg, line, filesize + 1);
390 24df9a28 2023-07-08 jrick if (*len >= filesize + 1) {
391 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
392 24df9a28 2023-07-08 jrick goto done;
393 24df9a28 2023-07-08 jrick }
394 24df9a28 2023-07-08 jrick }
395 24df9a28 2023-07-08 jrick if (ferror(fp)) {
396 24df9a28 2023-07-08 jrick err = got_ferror(fp, GOT_ERR_IO);
397 24df9a28 2023-07-08 jrick goto done;
398 24df9a28 2023-07-08 jrick }
399 24df9a28 2023-07-08 jrick
400 24df9a28 2023-07-08 jrick while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
401 24df9a28 2023-07-08 jrick (*logmsg)[*len - 1] = '\0';
402 24df9a28 2023-07-08 jrick (*len)--;
403 24df9a28 2023-07-08 jrick }
404 24df9a28 2023-07-08 jrick done:
405 24df9a28 2023-07-08 jrick free(line);
406 24df9a28 2023-07-08 jrick if (err) {
407 24df9a28 2023-07-08 jrick free(*logmsg);
408 24df9a28 2023-07-08 jrick *logmsg = NULL;
409 24df9a28 2023-07-08 jrick *len = 0;
410 24df9a28 2023-07-08 jrick }
411 24df9a28 2023-07-08 jrick return err;
412 24df9a28 2023-07-08 jrick }
413 24df9a28 2023-07-08 jrick
414 24df9a28 2023-07-08 jrick static const struct got_error *
415 24df9a28 2023-07-08 jrick edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
416 24df9a28 2023-07-08 jrick const char *initial_content, size_t initial_content_len,
417 24df9a28 2023-07-08 jrick int require_modification)
418 24df9a28 2023-07-08 jrick {
419 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
420 24df9a28 2023-07-08 jrick struct stat st, st2;
421 24df9a28 2023-07-08 jrick FILE *fp = NULL;
422 24df9a28 2023-07-08 jrick size_t logmsg_len;
423 24df9a28 2023-07-08 jrick
424 24df9a28 2023-07-08 jrick *logmsg = NULL;
425 24df9a28 2023-07-08 jrick
426 24df9a28 2023-07-08 jrick if (stat(logmsg_path, &st) == -1)
427 24df9a28 2023-07-08 jrick return got_error_from_errno2("stat", logmsg_path);
428 24df9a28 2023-07-08 jrick
429 24df9a28 2023-07-08 jrick if (spawn_editor(editor, logmsg_path) == -1)
430 24df9a28 2023-07-08 jrick return got_error_from_errno("failed spawning editor");
431 24df9a28 2023-07-08 jrick
432 24df9a28 2023-07-08 jrick if (require_modification) {
433 24df9a28 2023-07-08 jrick struct timespec timeout;
434 24df9a28 2023-07-08 jrick
435 24df9a28 2023-07-08 jrick timeout.tv_sec = 0;
436 24df9a28 2023-07-08 jrick timeout.tv_nsec = 1;
437 24df9a28 2023-07-08 jrick nanosleep(&timeout, NULL);
438 24df9a28 2023-07-08 jrick }
439 24df9a28 2023-07-08 jrick
440 24df9a28 2023-07-08 jrick if (stat(logmsg_path, &st2) == -1)
441 24df9a28 2023-07-08 jrick return got_error_from_errno("stat");
442 24df9a28 2023-07-08 jrick
443 24df9a28 2023-07-08 jrick if (require_modification && st.st_size == st2.st_size &&
444 24df9a28 2023-07-08 jrick timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
445 24df9a28 2023-07-08 jrick return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
446 24df9a28 2023-07-08 jrick "no changes made to commit message, aborting");
447 24df9a28 2023-07-08 jrick
448 24df9a28 2023-07-08 jrick fp = fopen(logmsg_path, "re");
449 24df9a28 2023-07-08 jrick if (fp == NULL) {
450 24df9a28 2023-07-08 jrick err = got_error_from_errno("fopen");
451 24df9a28 2023-07-08 jrick goto done;
452 24df9a28 2023-07-08 jrick }
453 24df9a28 2023-07-08 jrick
454 24df9a28 2023-07-08 jrick /* strip comments and leading/trailing newlines */
455 24df9a28 2023-07-08 jrick err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
456 24df9a28 2023-07-08 jrick if (err)
457 24df9a28 2023-07-08 jrick goto done;
458 24df9a28 2023-07-08 jrick if (logmsg_len == 0) {
459 24df9a28 2023-07-08 jrick err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
460 24df9a28 2023-07-08 jrick "commit message cannot be empty, aborting");
461 24df9a28 2023-07-08 jrick goto done;
462 24df9a28 2023-07-08 jrick }
463 24df9a28 2023-07-08 jrick done:
464 24df9a28 2023-07-08 jrick if (fp && fclose(fp) == EOF && err == NULL)
465 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
466 24df9a28 2023-07-08 jrick if (err) {
467 24df9a28 2023-07-08 jrick free(*logmsg);
468 24df9a28 2023-07-08 jrick *logmsg = NULL;
469 24df9a28 2023-07-08 jrick }
470 24df9a28 2023-07-08 jrick return err;
471 24df9a28 2023-07-08 jrick }
472 24df9a28 2023-07-08 jrick
473 24df9a28 2023-07-08 jrick static const struct got_error *
474 24df9a28 2023-07-08 jrick collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
475 24df9a28 2023-07-08 jrick const char *path_dir, const char *branch_name)
476 24df9a28 2023-07-08 jrick {
477 24df9a28 2023-07-08 jrick char *initial_content = NULL;
478 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
479 24df9a28 2023-07-08 jrick int initial_content_len;
480 24df9a28 2023-07-08 jrick int fd = -1;
481 24df9a28 2023-07-08 jrick
482 24df9a28 2023-07-08 jrick initial_content_len = asprintf(&initial_content,
483 24df9a28 2023-07-08 jrick "\n# %s to be imported to branch %s\n", path_dir,
484 24df9a28 2023-07-08 jrick branch_name);
485 24df9a28 2023-07-08 jrick if (initial_content_len == -1)
486 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
487 24df9a28 2023-07-08 jrick
488 24df9a28 2023-07-08 jrick err = got_opentemp_named_fd(logmsg_path, &fd,
489 24df9a28 2023-07-08 jrick GOT_TMPDIR_STR "/got-importmsg", "");
490 24df9a28 2023-07-08 jrick if (err)
491 24df9a28 2023-07-08 jrick goto done;
492 24df9a28 2023-07-08 jrick
493 24df9a28 2023-07-08 jrick if (write(fd, initial_content, initial_content_len) == -1) {
494 24df9a28 2023-07-08 jrick err = got_error_from_errno2("write", *logmsg_path);
495 24df9a28 2023-07-08 jrick goto done;
496 24df9a28 2023-07-08 jrick }
497 24df9a28 2023-07-08 jrick if (close(fd) == -1) {
498 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *logmsg_path);
499 24df9a28 2023-07-08 jrick goto done;
500 24df9a28 2023-07-08 jrick }
501 24df9a28 2023-07-08 jrick fd = -1;
502 24df9a28 2023-07-08 jrick
503 24df9a28 2023-07-08 jrick err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
504 24df9a28 2023-07-08 jrick initial_content_len, 1);
505 24df9a28 2023-07-08 jrick done:
506 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
507 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *logmsg_path);
508 24df9a28 2023-07-08 jrick free(initial_content);
509 24df9a28 2023-07-08 jrick if (err) {
510 24df9a28 2023-07-08 jrick free(*logmsg_path);
511 24df9a28 2023-07-08 jrick *logmsg_path = NULL;
512 24df9a28 2023-07-08 jrick }
513 24df9a28 2023-07-08 jrick return err;
514 24df9a28 2023-07-08 jrick }
515 24df9a28 2023-07-08 jrick
516 24df9a28 2023-07-08 jrick static const struct got_error *
517 24df9a28 2023-07-08 jrick import_progress(void *arg, const char *path)
518 24df9a28 2023-07-08 jrick {
519 24df9a28 2023-07-08 jrick printf("A %s\n", path);
520 24df9a28 2023-07-08 jrick return NULL;
521 24df9a28 2023-07-08 jrick }
522 24df9a28 2023-07-08 jrick
523 24df9a28 2023-07-08 jrick static const struct got_error *
524 24df9a28 2023-07-08 jrick valid_author(const char *author)
525 24df9a28 2023-07-08 jrick {
526 24df9a28 2023-07-08 jrick const char *email = author;
527 24df9a28 2023-07-08 jrick
528 24df9a28 2023-07-08 jrick /*
529 24df9a28 2023-07-08 jrick * Git' expects the author (or committer) to be in the form
530 24df9a28 2023-07-08 jrick * "name <email>", which are mostly free form (see the
531 24df9a28 2023-07-08 jrick * "committer" description in git-fast-import(1)). We're only
532 24df9a28 2023-07-08 jrick * doing this to avoid git's object parser breaking on commits
533 24df9a28 2023-07-08 jrick * we create.
534 24df9a28 2023-07-08 jrick */
535 24df9a28 2023-07-08 jrick
536 24df9a28 2023-07-08 jrick while (*author && *author != '\n' && *author != '<' && *author != '>')
537 24df9a28 2023-07-08 jrick author++;
538 24df9a28 2023-07-08 jrick if (author != email && *author == '<' && *(author - 1) != ' ')
539 24df9a28 2023-07-08 jrick return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
540 24df9a28 2023-07-08 jrick "between author name and email required", email);
541 24df9a28 2023-07-08 jrick if (*author++ != '<')
542 24df9a28 2023-07-08 jrick return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
543 24df9a28 2023-07-08 jrick while (*author && *author != '\n' && *author != '<' && *author != '>')
544 24df9a28 2023-07-08 jrick author++;
545 24df9a28 2023-07-08 jrick if (strcmp(author, ">") != 0)
546 24df9a28 2023-07-08 jrick return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
547 24df9a28 2023-07-08 jrick return NULL;
548 24df9a28 2023-07-08 jrick }
549 24df9a28 2023-07-08 jrick
550 24df9a28 2023-07-08 jrick static const struct got_error *
551 24df9a28 2023-07-08 jrick get_author(char **author, struct got_repository *repo,
552 24df9a28 2023-07-08 jrick struct got_worktree *worktree)
553 24df9a28 2023-07-08 jrick {
554 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
555 24df9a28 2023-07-08 jrick const char *got_author = NULL, *name, *email;
556 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
557 24df9a28 2023-07-08 jrick
558 24df9a28 2023-07-08 jrick *author = NULL;
559 24df9a28 2023-07-08 jrick
560 24df9a28 2023-07-08 jrick if (worktree)
561 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
562 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
563 24df9a28 2023-07-08 jrick
564 24df9a28 2023-07-08 jrick /*
565 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
566 24df9a28 2023-07-08 jrick * significant to least significant:
567 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
568 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
569 24df9a28 2023-07-08 jrick * 3) repository's git config file
570 24df9a28 2023-07-08 jrick * 4) environment variables
571 24df9a28 2023-07-08 jrick * 5) global git config files (in user's home directory or /etc)
572 24df9a28 2023-07-08 jrick */
573 24df9a28 2023-07-08 jrick
574 24df9a28 2023-07-08 jrick if (worktree_conf)
575 24df9a28 2023-07-08 jrick got_author = got_gotconfig_get_author(worktree_conf);
576 24df9a28 2023-07-08 jrick if (got_author == NULL)
577 24df9a28 2023-07-08 jrick got_author = got_gotconfig_get_author(repo_conf);
578 24df9a28 2023-07-08 jrick if (got_author == NULL) {
579 24df9a28 2023-07-08 jrick name = got_repo_get_gitconfig_author_name(repo);
580 24df9a28 2023-07-08 jrick email = got_repo_get_gitconfig_author_email(repo);
581 24df9a28 2023-07-08 jrick if (name && email) {
582 24df9a28 2023-07-08 jrick if (asprintf(author, "%s <%s>", name, email) == -1)
583 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
584 24df9a28 2023-07-08 jrick return NULL;
585 24df9a28 2023-07-08 jrick }
586 24df9a28 2023-07-08 jrick
587 24df9a28 2023-07-08 jrick got_author = getenv("GOT_AUTHOR");
588 24df9a28 2023-07-08 jrick if (got_author == NULL) {
589 24df9a28 2023-07-08 jrick name = got_repo_get_global_gitconfig_author_name(repo);
590 24df9a28 2023-07-08 jrick email = got_repo_get_global_gitconfig_author_email(
591 24df9a28 2023-07-08 jrick repo);
592 24df9a28 2023-07-08 jrick if (name && email) {
593 24df9a28 2023-07-08 jrick if (asprintf(author, "%s <%s>", name, email)
594 24df9a28 2023-07-08 jrick == -1)
595 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
596 24df9a28 2023-07-08 jrick return NULL;
597 24df9a28 2023-07-08 jrick }
598 24df9a28 2023-07-08 jrick /* TODO: Look up user in password database? */
599 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
600 24df9a28 2023-07-08 jrick }
601 24df9a28 2023-07-08 jrick }
602 24df9a28 2023-07-08 jrick
603 24df9a28 2023-07-08 jrick *author = strdup(got_author);
604 24df9a28 2023-07-08 jrick if (*author == NULL)
605 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
606 24df9a28 2023-07-08 jrick
607 24df9a28 2023-07-08 jrick err = valid_author(*author);
608 24df9a28 2023-07-08 jrick if (err) {
609 24df9a28 2023-07-08 jrick free(*author);
610 24df9a28 2023-07-08 jrick *author = NULL;
611 24df9a28 2023-07-08 jrick }
612 24df9a28 2023-07-08 jrick return err;
613 24df9a28 2023-07-08 jrick }
614 24df9a28 2023-07-08 jrick
615 24df9a28 2023-07-08 jrick static const struct got_error *
616 24df9a28 2023-07-08 jrick get_allowed_signers(char **allowed_signers, struct got_repository *repo,
617 24df9a28 2023-07-08 jrick struct got_worktree *worktree)
618 24df9a28 2023-07-08 jrick {
619 24df9a28 2023-07-08 jrick const char *got_allowed_signers = NULL;
620 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
621 24df9a28 2023-07-08 jrick
622 24df9a28 2023-07-08 jrick *allowed_signers = NULL;
623 24df9a28 2023-07-08 jrick
624 24df9a28 2023-07-08 jrick if (worktree)
625 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
626 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
627 24df9a28 2023-07-08 jrick
628 24df9a28 2023-07-08 jrick /*
629 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
630 24df9a28 2023-07-08 jrick * significant to least significant:
631 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
632 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
633 24df9a28 2023-07-08 jrick */
634 24df9a28 2023-07-08 jrick
635 24df9a28 2023-07-08 jrick if (worktree_conf)
636 24df9a28 2023-07-08 jrick got_allowed_signers = got_gotconfig_get_allowed_signers_file(
637 24df9a28 2023-07-08 jrick worktree_conf);
638 24df9a28 2023-07-08 jrick if (got_allowed_signers == NULL)
639 24df9a28 2023-07-08 jrick got_allowed_signers = got_gotconfig_get_allowed_signers_file(
640 24df9a28 2023-07-08 jrick repo_conf);
641 24df9a28 2023-07-08 jrick
642 24df9a28 2023-07-08 jrick if (got_allowed_signers) {
643 24df9a28 2023-07-08 jrick *allowed_signers = strdup(got_allowed_signers);
644 24df9a28 2023-07-08 jrick if (*allowed_signers == NULL)
645 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
646 24df9a28 2023-07-08 jrick }
647 24df9a28 2023-07-08 jrick return NULL;
648 24df9a28 2023-07-08 jrick }
649 24df9a28 2023-07-08 jrick
650 24df9a28 2023-07-08 jrick static const struct got_error *
651 24df9a28 2023-07-08 jrick get_revoked_signers(char **revoked_signers, struct got_repository *repo,
652 24df9a28 2023-07-08 jrick struct got_worktree *worktree)
653 24df9a28 2023-07-08 jrick {
654 24df9a28 2023-07-08 jrick const char *got_revoked_signers = NULL;
655 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
656 24df9a28 2023-07-08 jrick
657 24df9a28 2023-07-08 jrick *revoked_signers = NULL;
658 24df9a28 2023-07-08 jrick
659 24df9a28 2023-07-08 jrick if (worktree)
660 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
661 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
662 24df9a28 2023-07-08 jrick
663 24df9a28 2023-07-08 jrick /*
664 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
665 24df9a28 2023-07-08 jrick * significant to least significant:
666 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
667 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
668 24df9a28 2023-07-08 jrick */
669 24df9a28 2023-07-08 jrick
670 24df9a28 2023-07-08 jrick if (worktree_conf)
671 24df9a28 2023-07-08 jrick got_revoked_signers = got_gotconfig_get_revoked_signers_file(
672 24df9a28 2023-07-08 jrick worktree_conf);
673 24df9a28 2023-07-08 jrick if (got_revoked_signers == NULL)
674 24df9a28 2023-07-08 jrick got_revoked_signers = got_gotconfig_get_revoked_signers_file(
675 24df9a28 2023-07-08 jrick repo_conf);
676 24df9a28 2023-07-08 jrick
677 24df9a28 2023-07-08 jrick if (got_revoked_signers) {
678 24df9a28 2023-07-08 jrick *revoked_signers = strdup(got_revoked_signers);
679 24df9a28 2023-07-08 jrick if (*revoked_signers == NULL)
680 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
681 24df9a28 2023-07-08 jrick }
682 24df9a28 2023-07-08 jrick return NULL;
683 24df9a28 2023-07-08 jrick }
684 24df9a28 2023-07-08 jrick
685 24df9a28 2023-07-08 jrick static const char *
686 24df9a28 2023-07-08 jrick get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
687 24df9a28 2023-07-08 jrick {
688 24df9a28 2023-07-08 jrick const char *got_signer_id = NULL;
689 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
690 24df9a28 2023-07-08 jrick
691 24df9a28 2023-07-08 jrick if (worktree)
692 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
693 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
694 24df9a28 2023-07-08 jrick
695 24df9a28 2023-07-08 jrick /*
696 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
697 24df9a28 2023-07-08 jrick * significant to least significant:
698 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
699 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
700 24df9a28 2023-07-08 jrick */
701 24df9a28 2023-07-08 jrick
702 24df9a28 2023-07-08 jrick if (worktree_conf)
703 24df9a28 2023-07-08 jrick got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
704 24df9a28 2023-07-08 jrick if (got_signer_id == NULL)
705 24df9a28 2023-07-08 jrick got_signer_id = got_gotconfig_get_signer_id(repo_conf);
706 24df9a28 2023-07-08 jrick
707 24df9a28 2023-07-08 jrick return got_signer_id;
708 24df9a28 2023-07-08 jrick }
709 24df9a28 2023-07-08 jrick
710 24df9a28 2023-07-08 jrick static const struct got_error *
711 24df9a28 2023-07-08 jrick get_gitconfig_path(char **gitconfig_path)
712 24df9a28 2023-07-08 jrick {
713 24df9a28 2023-07-08 jrick const char *homedir = getenv("HOME");
714 24df9a28 2023-07-08 jrick
715 24df9a28 2023-07-08 jrick *gitconfig_path = NULL;
716 24df9a28 2023-07-08 jrick if (homedir) {
717 24df9a28 2023-07-08 jrick if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
718 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
719 24df9a28 2023-07-08 jrick
720 24df9a28 2023-07-08 jrick }
721 24df9a28 2023-07-08 jrick return NULL;
722 24df9a28 2023-07-08 jrick }
723 24df9a28 2023-07-08 jrick
724 24df9a28 2023-07-08 jrick static const struct got_error *
725 24df9a28 2023-07-08 jrick cmd_import(int argc, char *argv[])
726 24df9a28 2023-07-08 jrick {
727 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
728 24df9a28 2023-07-08 jrick char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
729 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
730 24df9a28 2023-07-08 jrick const char *branch_name = NULL;
731 24df9a28 2023-07-08 jrick char *id_str = NULL, *logmsg_path = NULL;
732 24df9a28 2023-07-08 jrick char refname[PATH_MAX] = "refs/heads/";
733 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
734 24df9a28 2023-07-08 jrick struct got_reference *branch_ref = NULL, *head_ref = NULL;
735 24df9a28 2023-07-08 jrick struct got_object_id *new_commit_id = NULL;
736 24df9a28 2023-07-08 jrick int ch, n = 0;
737 24df9a28 2023-07-08 jrick struct got_pathlist_head ignores;
738 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
739 24df9a28 2023-07-08 jrick int preserve_logmsg = 0;
740 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
741 24df9a28 2023-07-08 jrick
742 24df9a28 2023-07-08 jrick TAILQ_INIT(&ignores);
743 24df9a28 2023-07-08 jrick
744 24df9a28 2023-07-08 jrick #ifndef PROFILE
745 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
746 24df9a28 2023-07-08 jrick "unveil",
747 24df9a28 2023-07-08 jrick NULL) == -1)
748 24df9a28 2023-07-08 jrick err(1, "pledge");
749 24df9a28 2023-07-08 jrick #endif
750 24df9a28 2023-07-08 jrick
751 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
752 24df9a28 2023-07-08 jrick switch (ch) {
753 24df9a28 2023-07-08 jrick case 'b':
754 24df9a28 2023-07-08 jrick branch_name = optarg;
755 24df9a28 2023-07-08 jrick break;
756 24df9a28 2023-07-08 jrick case 'I':
757 24df9a28 2023-07-08 jrick if (optarg[0] == '\0')
758 24df9a28 2023-07-08 jrick break;
759 24df9a28 2023-07-08 jrick error = got_pathlist_insert(&pe, &ignores, optarg,
760 24df9a28 2023-07-08 jrick NULL);
761 24df9a28 2023-07-08 jrick if (error)
762 24df9a28 2023-07-08 jrick goto done;
763 24df9a28 2023-07-08 jrick break;
764 24df9a28 2023-07-08 jrick case 'm':
765 24df9a28 2023-07-08 jrick logmsg = strdup(optarg);
766 24df9a28 2023-07-08 jrick if (logmsg == NULL) {
767 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
768 24df9a28 2023-07-08 jrick goto done;
769 24df9a28 2023-07-08 jrick }
770 24df9a28 2023-07-08 jrick break;
771 24df9a28 2023-07-08 jrick case 'r':
772 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
773 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
774 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath",
775 24df9a28 2023-07-08 jrick optarg);
776 24df9a28 2023-07-08 jrick goto done;
777 24df9a28 2023-07-08 jrick }
778 24df9a28 2023-07-08 jrick break;
779 24df9a28 2023-07-08 jrick default:
780 24df9a28 2023-07-08 jrick usage_import();
781 24df9a28 2023-07-08 jrick /* NOTREACHED */
782 24df9a28 2023-07-08 jrick }
783 24df9a28 2023-07-08 jrick }
784 24df9a28 2023-07-08 jrick
785 24df9a28 2023-07-08 jrick argc -= optind;
786 24df9a28 2023-07-08 jrick argv += optind;
787 24df9a28 2023-07-08 jrick
788 24df9a28 2023-07-08 jrick if (argc != 1)
789 24df9a28 2023-07-08 jrick usage_import();
790 24df9a28 2023-07-08 jrick
791 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
792 24df9a28 2023-07-08 jrick repo_path = getcwd(NULL, 0);
793 24df9a28 2023-07-08 jrick if (repo_path == NULL)
794 24df9a28 2023-07-08 jrick return got_error_from_errno("getcwd");
795 24df9a28 2023-07-08 jrick }
796 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
797 24df9a28 2023-07-08 jrick error = get_gitconfig_path(&gitconfig_path);
798 24df9a28 2023-07-08 jrick if (error)
799 24df9a28 2023-07-08 jrick goto done;
800 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
801 24df9a28 2023-07-08 jrick if (error != NULL)
802 24df9a28 2023-07-08 jrick goto done;
803 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
804 24df9a28 2023-07-08 jrick if (error)
805 24df9a28 2023-07-08 jrick goto done;
806 24df9a28 2023-07-08 jrick
807 24df9a28 2023-07-08 jrick error = get_author(&author, repo, NULL);
808 24df9a28 2023-07-08 jrick if (error)
809 24df9a28 2023-07-08 jrick return error;
810 24df9a28 2023-07-08 jrick
811 24df9a28 2023-07-08 jrick /*
812 24df9a28 2023-07-08 jrick * Don't let the user create a branch name with a leading '-'.
813 24df9a28 2023-07-08 jrick * While technically a valid reference name, this case is usually
814 24df9a28 2023-07-08 jrick * an unintended typo.
815 24df9a28 2023-07-08 jrick */
816 24df9a28 2023-07-08 jrick if (branch_name && branch_name[0] == '-')
817 24df9a28 2023-07-08 jrick return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
818 24df9a28 2023-07-08 jrick
819 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
820 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_REF)
821 24df9a28 2023-07-08 jrick goto done;
822 24df9a28 2023-07-08 jrick
823 24df9a28 2023-07-08 jrick if (branch_name)
824 24df9a28 2023-07-08 jrick n = strlcat(refname, branch_name, sizeof(refname));
825 24df9a28 2023-07-08 jrick else if (head_ref && got_ref_is_symbolic(head_ref))
826 24df9a28 2023-07-08 jrick n = strlcpy(refname, got_ref_get_symref_target(head_ref),
827 24df9a28 2023-07-08 jrick sizeof(refname));
828 24df9a28 2023-07-08 jrick else
829 24df9a28 2023-07-08 jrick n = strlcat(refname, "main", sizeof(refname));
830 24df9a28 2023-07-08 jrick if (n >= sizeof(refname)) {
831 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_NO_SPACE);
832 24df9a28 2023-07-08 jrick goto done;
833 24df9a28 2023-07-08 jrick }
834 24df9a28 2023-07-08 jrick
835 24df9a28 2023-07-08 jrick error = got_ref_open(&branch_ref, repo, refname, 0);
836 24df9a28 2023-07-08 jrick if (error) {
837 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF)
838 24df9a28 2023-07-08 jrick goto done;
839 24df9a28 2023-07-08 jrick } else {
840 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
841 24df9a28 2023-07-08 jrick "import target branch already exists");
842 24df9a28 2023-07-08 jrick goto done;
843 24df9a28 2023-07-08 jrick }
844 24df9a28 2023-07-08 jrick
845 24df9a28 2023-07-08 jrick path_dir = realpath(argv[0], NULL);
846 24df9a28 2023-07-08 jrick if (path_dir == NULL) {
847 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath", argv[0]);
848 24df9a28 2023-07-08 jrick goto done;
849 24df9a28 2023-07-08 jrick }
850 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(path_dir);
851 24df9a28 2023-07-08 jrick
852 24df9a28 2023-07-08 jrick /*
853 24df9a28 2023-07-08 jrick * unveil(2) traverses exec(2); if an editor is used we have
854 24df9a28 2023-07-08 jrick * to apply unveil after the log message has been written.
855 24df9a28 2023-07-08 jrick */
856 24df9a28 2023-07-08 jrick if (logmsg == NULL || *logmsg == '\0') {
857 24df9a28 2023-07-08 jrick error = get_editor(&editor);
858 24df9a28 2023-07-08 jrick if (error)
859 24df9a28 2023-07-08 jrick goto done;
860 24df9a28 2023-07-08 jrick free(logmsg);
861 24df9a28 2023-07-08 jrick error = collect_import_msg(&logmsg, &logmsg_path, editor,
862 24df9a28 2023-07-08 jrick path_dir, refname);
863 24df9a28 2023-07-08 jrick if (error) {
864 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
865 24df9a28 2023-07-08 jrick logmsg_path != NULL)
866 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
867 24df9a28 2023-07-08 jrick goto done;
868 24df9a28 2023-07-08 jrick }
869 24df9a28 2023-07-08 jrick }
870 24df9a28 2023-07-08 jrick
871 24df9a28 2023-07-08 jrick if (unveil(path_dir, "r") != 0) {
872 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unveil", path_dir);
873 24df9a28 2023-07-08 jrick if (logmsg_path)
874 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
875 24df9a28 2023-07-08 jrick goto done;
876 24df9a28 2023-07-08 jrick }
877 24df9a28 2023-07-08 jrick
878 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0, NULL);
879 24df9a28 2023-07-08 jrick if (error) {
880 24df9a28 2023-07-08 jrick if (logmsg_path)
881 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
882 24df9a28 2023-07-08 jrick goto done;
883 24df9a28 2023-07-08 jrick }
884 24df9a28 2023-07-08 jrick
885 24df9a28 2023-07-08 jrick error = got_repo_import(&new_commit_id, path_dir, logmsg,
886 24df9a28 2023-07-08 jrick author, &ignores, repo, import_progress, NULL);
887 24df9a28 2023-07-08 jrick if (error) {
888 24df9a28 2023-07-08 jrick if (logmsg_path)
889 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
890 24df9a28 2023-07-08 jrick goto done;
891 24df9a28 2023-07-08 jrick }
892 24df9a28 2023-07-08 jrick
893 24df9a28 2023-07-08 jrick error = got_ref_alloc(&branch_ref, refname, new_commit_id);
894 24df9a28 2023-07-08 jrick if (error) {
895 24df9a28 2023-07-08 jrick if (logmsg_path)
896 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
897 24df9a28 2023-07-08 jrick goto done;
898 24df9a28 2023-07-08 jrick }
899 24df9a28 2023-07-08 jrick
900 24df9a28 2023-07-08 jrick error = got_ref_write(branch_ref, repo);
901 24df9a28 2023-07-08 jrick if (error) {
902 24df9a28 2023-07-08 jrick if (logmsg_path)
903 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
904 24df9a28 2023-07-08 jrick goto done;
905 24df9a28 2023-07-08 jrick }
906 24df9a28 2023-07-08 jrick
907 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, new_commit_id);
908 24df9a28 2023-07-08 jrick if (error) {
909 24df9a28 2023-07-08 jrick if (logmsg_path)
910 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
911 24df9a28 2023-07-08 jrick goto done;
912 24df9a28 2023-07-08 jrick }
913 24df9a28 2023-07-08 jrick
914 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
915 24df9a28 2023-07-08 jrick if (error) {
916 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF) {
917 24df9a28 2023-07-08 jrick if (logmsg_path)
918 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
919 24df9a28 2023-07-08 jrick goto done;
920 24df9a28 2023-07-08 jrick }
921 24df9a28 2023-07-08 jrick
922 24df9a28 2023-07-08 jrick error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
923 24df9a28 2023-07-08 jrick branch_ref);
924 24df9a28 2023-07-08 jrick if (error) {
925 24df9a28 2023-07-08 jrick if (logmsg_path)
926 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
927 24df9a28 2023-07-08 jrick goto done;
928 24df9a28 2023-07-08 jrick }
929 24df9a28 2023-07-08 jrick
930 24df9a28 2023-07-08 jrick error = got_ref_write(head_ref, repo);
931 24df9a28 2023-07-08 jrick if (error) {
932 24df9a28 2023-07-08 jrick if (logmsg_path)
933 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
934 24df9a28 2023-07-08 jrick goto done;
935 24df9a28 2023-07-08 jrick }
936 24df9a28 2023-07-08 jrick }
937 24df9a28 2023-07-08 jrick
938 24df9a28 2023-07-08 jrick printf("Created branch %s with commit %s\n",
939 24df9a28 2023-07-08 jrick got_ref_get_name(branch_ref), id_str);
940 24df9a28 2023-07-08 jrick done:
941 24df9a28 2023-07-08 jrick if (pack_fds) {
942 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
943 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
944 24df9a28 2023-07-08 jrick if (error == NULL)
945 24df9a28 2023-07-08 jrick error = pack_err;
946 24df9a28 2023-07-08 jrick }
947 24df9a28 2023-07-08 jrick if (repo) {
948 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
949 24df9a28 2023-07-08 jrick if (error == NULL)
950 24df9a28 2023-07-08 jrick error = close_err;
951 24df9a28 2023-07-08 jrick }
952 24df9a28 2023-07-08 jrick if (preserve_logmsg) {
953 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: log message preserved in %s\n",
954 24df9a28 2023-07-08 jrick getprogname(), logmsg_path);
955 24df9a28 2023-07-08 jrick } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
956 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unlink", logmsg_path);
957 24df9a28 2023-07-08 jrick free(logmsg);
958 24df9a28 2023-07-08 jrick free(logmsg_path);
959 24df9a28 2023-07-08 jrick free(repo_path);
960 24df9a28 2023-07-08 jrick free(editor);
961 24df9a28 2023-07-08 jrick free(new_commit_id);
962 24df9a28 2023-07-08 jrick free(id_str);
963 24df9a28 2023-07-08 jrick free(author);
964 24df9a28 2023-07-08 jrick free(gitconfig_path);
965 24df9a28 2023-07-08 jrick if (branch_ref)
966 24df9a28 2023-07-08 jrick got_ref_close(branch_ref);
967 24df9a28 2023-07-08 jrick if (head_ref)
968 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
969 24df9a28 2023-07-08 jrick return error;
970 24df9a28 2023-07-08 jrick }
971 24df9a28 2023-07-08 jrick
972 24df9a28 2023-07-08 jrick __dead static void
973 24df9a28 2023-07-08 jrick usage_clone(void)
974 24df9a28 2023-07-08 jrick {
975 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
976 24df9a28 2023-07-08 jrick "repository-URL [directory]\n", getprogname());
977 24df9a28 2023-07-08 jrick exit(1);
978 24df9a28 2023-07-08 jrick }
979 24df9a28 2023-07-08 jrick
980 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg {
981 24df9a28 2023-07-08 jrick char last_scaled_size[FMT_SCALED_STRSIZE];
982 24df9a28 2023-07-08 jrick int last_p_indexed;
983 24df9a28 2023-07-08 jrick int last_p_resolved;
984 24df9a28 2023-07-08 jrick int verbosity;
985 24df9a28 2023-07-08 jrick
986 24df9a28 2023-07-08 jrick struct got_repository *repo;
987 24df9a28 2023-07-08 jrick
988 24df9a28 2023-07-08 jrick int create_configs;
989 24df9a28 2023-07-08 jrick int configs_created;
990 24df9a28 2023-07-08 jrick struct {
991 24df9a28 2023-07-08 jrick struct got_pathlist_head *symrefs;
992 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_branches;
993 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs;
994 24df9a28 2023-07-08 jrick const char *proto;
995 24df9a28 2023-07-08 jrick const char *host;
996 24df9a28 2023-07-08 jrick const char *port;
997 24df9a28 2023-07-08 jrick const char *remote_repo_path;
998 24df9a28 2023-07-08 jrick const char *git_url;
999 24df9a28 2023-07-08 jrick int fetch_all_branches;
1000 24df9a28 2023-07-08 jrick int mirror_references;
1001 24df9a28 2023-07-08 jrick } config_info;
1002 24df9a28 2023-07-08 jrick };
1003 24df9a28 2023-07-08 jrick
1004 24df9a28 2023-07-08 jrick /* XXX forward declaration */
1005 24df9a28 2023-07-08 jrick static const struct got_error *
1006 24df9a28 2023-07-08 jrick create_config_files(const char *proto, const char *host, const char *port,
1007 24df9a28 2023-07-08 jrick const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1008 24df9a28 2023-07-08 jrick int mirror_references, struct got_pathlist_head *symrefs,
1009 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_branches,
1010 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1011 24df9a28 2023-07-08 jrick
1012 24df9a28 2023-07-08 jrick static const struct got_error *
1013 24df9a28 2023-07-08 jrick fetch_progress(void *arg, const char *message, off_t packfile_size,
1014 24df9a28 2023-07-08 jrick int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1015 24df9a28 2023-07-08 jrick {
1016 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1017 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg *a = arg;
1018 24df9a28 2023-07-08 jrick char scaled_size[FMT_SCALED_STRSIZE];
1019 24df9a28 2023-07-08 jrick int p_indexed, p_resolved;
1020 24df9a28 2023-07-08 jrick int print_size = 0, print_indexed = 0, print_resolved = 0;
1021 24df9a28 2023-07-08 jrick
1022 24df9a28 2023-07-08 jrick /*
1023 24df9a28 2023-07-08 jrick * In order to allow a failed clone to be resumed with 'got fetch'
1024 24df9a28 2023-07-08 jrick * we try to create configuration files as soon as possible.
1025 24df9a28 2023-07-08 jrick * Once the server has sent information about its default branch
1026 24df9a28 2023-07-08 jrick * we have all required information.
1027 24df9a28 2023-07-08 jrick */
1028 24df9a28 2023-07-08 jrick if (a->create_configs && !a->configs_created &&
1029 24df9a28 2023-07-08 jrick !TAILQ_EMPTY(a->config_info.symrefs)) {
1030 24df9a28 2023-07-08 jrick err = create_config_files(a->config_info.proto,
1031 24df9a28 2023-07-08 jrick a->config_info.host, a->config_info.port,
1032 24df9a28 2023-07-08 jrick a->config_info.remote_repo_path,
1033 24df9a28 2023-07-08 jrick a->config_info.git_url,
1034 24df9a28 2023-07-08 jrick a->config_info.fetch_all_branches,
1035 24df9a28 2023-07-08 jrick a->config_info.mirror_references,
1036 24df9a28 2023-07-08 jrick a->config_info.symrefs,
1037 24df9a28 2023-07-08 jrick a->config_info.wanted_branches,
1038 24df9a28 2023-07-08 jrick a->config_info.wanted_refs, a->repo);
1039 24df9a28 2023-07-08 jrick if (err)
1040 24df9a28 2023-07-08 jrick return err;
1041 24df9a28 2023-07-08 jrick a->configs_created = 1;
1042 24df9a28 2023-07-08 jrick }
1043 24df9a28 2023-07-08 jrick
1044 24df9a28 2023-07-08 jrick if (a->verbosity < 0)
1045 24df9a28 2023-07-08 jrick return NULL;
1046 24df9a28 2023-07-08 jrick
1047 24df9a28 2023-07-08 jrick if (message && message[0] != '\0') {
1048 24df9a28 2023-07-08 jrick printf("\rserver: %s", message);
1049 24df9a28 2023-07-08 jrick fflush(stdout);
1050 24df9a28 2023-07-08 jrick return NULL;
1051 24df9a28 2023-07-08 jrick }
1052 24df9a28 2023-07-08 jrick
1053 24df9a28 2023-07-08 jrick if (packfile_size > 0 || nobj_indexed > 0) {
1054 24df9a28 2023-07-08 jrick if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1055 24df9a28 2023-07-08 jrick (a->last_scaled_size[0] == '\0' ||
1056 24df9a28 2023-07-08 jrick strcmp(scaled_size, a->last_scaled_size)) != 0) {
1057 24df9a28 2023-07-08 jrick print_size = 1;
1058 24df9a28 2023-07-08 jrick if (strlcpy(a->last_scaled_size, scaled_size,
1059 24df9a28 2023-07-08 jrick FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1060 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
1061 24df9a28 2023-07-08 jrick }
1062 24df9a28 2023-07-08 jrick if (nobj_indexed > 0) {
1063 24df9a28 2023-07-08 jrick p_indexed = (nobj_indexed * 100) / nobj_total;
1064 24df9a28 2023-07-08 jrick if (p_indexed != a->last_p_indexed) {
1065 24df9a28 2023-07-08 jrick a->last_p_indexed = p_indexed;
1066 24df9a28 2023-07-08 jrick print_indexed = 1;
1067 24df9a28 2023-07-08 jrick print_size = 1;
1068 24df9a28 2023-07-08 jrick }
1069 24df9a28 2023-07-08 jrick }
1070 24df9a28 2023-07-08 jrick if (nobj_resolved > 0) {
1071 24df9a28 2023-07-08 jrick p_resolved = (nobj_resolved * 100) /
1072 24df9a28 2023-07-08 jrick (nobj_total - nobj_loose);
1073 24df9a28 2023-07-08 jrick if (p_resolved != a->last_p_resolved) {
1074 24df9a28 2023-07-08 jrick a->last_p_resolved = p_resolved;
1075 24df9a28 2023-07-08 jrick print_resolved = 1;
1076 24df9a28 2023-07-08 jrick print_indexed = 1;
1077 24df9a28 2023-07-08 jrick print_size = 1;
1078 24df9a28 2023-07-08 jrick }
1079 24df9a28 2023-07-08 jrick }
1080 24df9a28 2023-07-08 jrick
1081 24df9a28 2023-07-08 jrick }
1082 24df9a28 2023-07-08 jrick if (print_size || print_indexed || print_resolved)
1083 24df9a28 2023-07-08 jrick printf("\r");
1084 24df9a28 2023-07-08 jrick if (print_size)
1085 24df9a28 2023-07-08 jrick printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1086 24df9a28 2023-07-08 jrick if (print_indexed)
1087 24df9a28 2023-07-08 jrick printf("; indexing %d%%", p_indexed);
1088 24df9a28 2023-07-08 jrick if (print_resolved)
1089 24df9a28 2023-07-08 jrick printf("; resolving deltas %d%%", p_resolved);
1090 24df9a28 2023-07-08 jrick if (print_size || print_indexed || print_resolved)
1091 24df9a28 2023-07-08 jrick fflush(stdout);
1092 24df9a28 2023-07-08 jrick
1093 24df9a28 2023-07-08 jrick return NULL;
1094 24df9a28 2023-07-08 jrick }
1095 24df9a28 2023-07-08 jrick
1096 24df9a28 2023-07-08 jrick static const struct got_error *
1097 24df9a28 2023-07-08 jrick create_symref(const char *refname, struct got_reference *target_ref,
1098 24df9a28 2023-07-08 jrick int verbosity, struct got_repository *repo)
1099 24df9a28 2023-07-08 jrick {
1100 24df9a28 2023-07-08 jrick const struct got_error *err;
1101 24df9a28 2023-07-08 jrick struct got_reference *head_symref;
1102 24df9a28 2023-07-08 jrick
1103 24df9a28 2023-07-08 jrick err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1104 24df9a28 2023-07-08 jrick if (err)
1105 24df9a28 2023-07-08 jrick return err;
1106 24df9a28 2023-07-08 jrick
1107 24df9a28 2023-07-08 jrick err = got_ref_write(head_symref, repo);
1108 24df9a28 2023-07-08 jrick if (err == NULL && verbosity > 0) {
1109 24df9a28 2023-07-08 jrick printf("Created reference %s: %s\n", GOT_REF_HEAD,
1110 24df9a28 2023-07-08 jrick got_ref_get_name(target_ref));
1111 24df9a28 2023-07-08 jrick }
1112 24df9a28 2023-07-08 jrick got_ref_close(head_symref);
1113 24df9a28 2023-07-08 jrick return err;
1114 24df9a28 2023-07-08 jrick }
1115 24df9a28 2023-07-08 jrick
1116 24df9a28 2023-07-08 jrick static const struct got_error *
1117 24df9a28 2023-07-08 jrick list_remote_refs(struct got_pathlist_head *symrefs,
1118 24df9a28 2023-07-08 jrick struct got_pathlist_head *refs)
1119 24df9a28 2023-07-08 jrick {
1120 24df9a28 2023-07-08 jrick const struct got_error *err;
1121 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1122 24df9a28 2023-07-08 jrick
1123 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, symrefs, entry) {
1124 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1125 24df9a28 2023-07-08 jrick const char *targetref = pe->data;
1126 24df9a28 2023-07-08 jrick
1127 24df9a28 2023-07-08 jrick printf("%s: %s\n", refname, targetref);
1128 24df9a28 2023-07-08 jrick }
1129 24df9a28 2023-07-08 jrick
1130 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, refs, entry) {
1131 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1132 24df9a28 2023-07-08 jrick struct got_object_id *id = pe->data;
1133 24df9a28 2023-07-08 jrick char *id_str;
1134 24df9a28 2023-07-08 jrick
1135 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
1136 24df9a28 2023-07-08 jrick if (err)
1137 24df9a28 2023-07-08 jrick return err;
1138 24df9a28 2023-07-08 jrick printf("%s: %s\n", refname, id_str);
1139 24df9a28 2023-07-08 jrick free(id_str);
1140 24df9a28 2023-07-08 jrick }
1141 24df9a28 2023-07-08 jrick
1142 24df9a28 2023-07-08 jrick return NULL;
1143 24df9a28 2023-07-08 jrick }
1144 24df9a28 2023-07-08 jrick
1145 24df9a28 2023-07-08 jrick static const struct got_error *
1146 24df9a28 2023-07-08 jrick create_ref(const char *refname, struct got_object_id *id,
1147 24df9a28 2023-07-08 jrick int verbosity, struct got_repository *repo)
1148 24df9a28 2023-07-08 jrick {
1149 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1150 24df9a28 2023-07-08 jrick struct got_reference *ref;
1151 24df9a28 2023-07-08 jrick char *id_str;
1152 24df9a28 2023-07-08 jrick
1153 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
1154 24df9a28 2023-07-08 jrick if (err)
1155 24df9a28 2023-07-08 jrick return err;
1156 24df9a28 2023-07-08 jrick
1157 24df9a28 2023-07-08 jrick err = got_ref_alloc(&ref, refname, id);
1158 24df9a28 2023-07-08 jrick if (err)
1159 24df9a28 2023-07-08 jrick goto done;
1160 24df9a28 2023-07-08 jrick
1161 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
1162 24df9a28 2023-07-08 jrick got_ref_close(ref);
1163 24df9a28 2023-07-08 jrick
1164 24df9a28 2023-07-08 jrick if (err == NULL && verbosity >= 0)
1165 24df9a28 2023-07-08 jrick printf("Created reference %s: %s\n", refname, id_str);
1166 24df9a28 2023-07-08 jrick done:
1167 24df9a28 2023-07-08 jrick free(id_str);
1168 24df9a28 2023-07-08 jrick return err;
1169 24df9a28 2023-07-08 jrick }
1170 24df9a28 2023-07-08 jrick
1171 24df9a28 2023-07-08 jrick static int
1172 24df9a28 2023-07-08 jrick match_wanted_ref(const char *refname, const char *wanted_ref)
1173 24df9a28 2023-07-08 jrick {
1174 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/", 5) != 0)
1175 24df9a28 2023-07-08 jrick return 0;
1176 24df9a28 2023-07-08 jrick refname += 5;
1177 24df9a28 2023-07-08 jrick
1178 24df9a28 2023-07-08 jrick /*
1179 24df9a28 2023-07-08 jrick * Prevent fetching of references that won't make any
1180 24df9a28 2023-07-08 jrick * sense outside of the remote repository's context.
1181 24df9a28 2023-07-08 jrick */
1182 24df9a28 2023-07-08 jrick if (strncmp(refname, "got/", 4) == 0)
1183 24df9a28 2023-07-08 jrick return 0;
1184 24df9a28 2023-07-08 jrick if (strncmp(refname, "remotes/", 8) == 0)
1185 24df9a28 2023-07-08 jrick return 0;
1186 24df9a28 2023-07-08 jrick
1187 24df9a28 2023-07-08 jrick if (strncmp(wanted_ref, "refs/", 5) == 0)
1188 24df9a28 2023-07-08 jrick wanted_ref += 5;
1189 24df9a28 2023-07-08 jrick
1190 24df9a28 2023-07-08 jrick /* Allow prefix match. */
1191 24df9a28 2023-07-08 jrick if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1192 24df9a28 2023-07-08 jrick return 1;
1193 24df9a28 2023-07-08 jrick
1194 24df9a28 2023-07-08 jrick /* Allow exact match. */
1195 24df9a28 2023-07-08 jrick return (strcmp(refname, wanted_ref) == 0);
1196 24df9a28 2023-07-08 jrick }
1197 24df9a28 2023-07-08 jrick
1198 24df9a28 2023-07-08 jrick static int
1199 24df9a28 2023-07-08 jrick is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1200 24df9a28 2023-07-08 jrick {
1201 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1202 24df9a28 2023-07-08 jrick
1203 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_refs, entry) {
1204 24df9a28 2023-07-08 jrick if (match_wanted_ref(refname, pe->path))
1205 24df9a28 2023-07-08 jrick return 1;
1206 24df9a28 2023-07-08 jrick }
1207 24df9a28 2023-07-08 jrick
1208 24df9a28 2023-07-08 jrick return 0;
1209 24df9a28 2023-07-08 jrick }
1210 24df9a28 2023-07-08 jrick
1211 24df9a28 2023-07-08 jrick static const struct got_error *
1212 24df9a28 2023-07-08 jrick create_wanted_ref(const char *refname, struct got_object_id *id,
1213 24df9a28 2023-07-08 jrick const char *remote_repo_name, int verbosity, struct got_repository *repo)
1214 24df9a28 2023-07-08 jrick {
1215 24df9a28 2023-07-08 jrick const struct got_error *err;
1216 24df9a28 2023-07-08 jrick char *remote_refname;
1217 24df9a28 2023-07-08 jrick
1218 24df9a28 2023-07-08 jrick if (strncmp("refs/", refname, 5) == 0)
1219 24df9a28 2023-07-08 jrick refname += 5;
1220 24df9a28 2023-07-08 jrick
1221 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1222 24df9a28 2023-07-08 jrick remote_repo_name, refname) == -1)
1223 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
1224 24df9a28 2023-07-08 jrick
1225 24df9a28 2023-07-08 jrick err = create_ref(remote_refname, id, verbosity, repo);
1226 24df9a28 2023-07-08 jrick free(remote_refname);
1227 24df9a28 2023-07-08 jrick return err;
1228 24df9a28 2023-07-08 jrick }
1229 24df9a28 2023-07-08 jrick
1230 24df9a28 2023-07-08 jrick static const struct got_error *
1231 24df9a28 2023-07-08 jrick create_gotconfig(const char *proto, const char *host, const char *port,
1232 24df9a28 2023-07-08 jrick const char *remote_repo_path, const char *default_branch,
1233 24df9a28 2023-07-08 jrick int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1234 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, int mirror_references,
1235 24df9a28 2023-07-08 jrick struct got_repository *repo)
1236 24df9a28 2023-07-08 jrick {
1237 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1238 24df9a28 2023-07-08 jrick char *gotconfig_path = NULL;
1239 24df9a28 2023-07-08 jrick char *gotconfig = NULL;
1240 24df9a28 2023-07-08 jrick FILE *gotconfig_file = NULL;
1241 24df9a28 2023-07-08 jrick const char *branchname = NULL;
1242 24df9a28 2023-07-08 jrick char *branches = NULL, *refs = NULL;
1243 24df9a28 2023-07-08 jrick ssize_t n;
1244 24df9a28 2023-07-08 jrick
1245 24df9a28 2023-07-08 jrick if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1246 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1247 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_branches, entry) {
1248 24df9a28 2023-07-08 jrick char *s;
1249 24df9a28 2023-07-08 jrick branchname = pe->path;
1250 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1251 24df9a28 2023-07-08 jrick branchname += 11;
1252 24df9a28 2023-07-08 jrick if (asprintf(&s, "%s\"%s\" ",
1253 24df9a28 2023-07-08 jrick branches ? branches : "", branchname) == -1) {
1254 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1255 24df9a28 2023-07-08 jrick goto done;
1256 24df9a28 2023-07-08 jrick }
1257 24df9a28 2023-07-08 jrick free(branches);
1258 24df9a28 2023-07-08 jrick branches = s;
1259 24df9a28 2023-07-08 jrick }
1260 24df9a28 2023-07-08 jrick } else if (!fetch_all_branches && default_branch) {
1261 24df9a28 2023-07-08 jrick branchname = default_branch;
1262 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1263 24df9a28 2023-07-08 jrick branchname += 11;
1264 24df9a28 2023-07-08 jrick if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1265 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1266 24df9a28 2023-07-08 jrick goto done;
1267 24df9a28 2023-07-08 jrick }
1268 24df9a28 2023-07-08 jrick }
1269 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(wanted_refs)) {
1270 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1271 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_refs, entry) {
1272 24df9a28 2023-07-08 jrick char *s;
1273 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1274 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/", 5) == 0)
1275 24df9a28 2023-07-08 jrick branchname += 5;
1276 24df9a28 2023-07-08 jrick if (asprintf(&s, "%s\"%s\" ",
1277 24df9a28 2023-07-08 jrick refs ? refs : "", refname) == -1) {
1278 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1279 24df9a28 2023-07-08 jrick goto done;
1280 24df9a28 2023-07-08 jrick }
1281 24df9a28 2023-07-08 jrick free(refs);
1282 24df9a28 2023-07-08 jrick refs = s;
1283 24df9a28 2023-07-08 jrick }
1284 24df9a28 2023-07-08 jrick }
1285 24df9a28 2023-07-08 jrick
1286 24df9a28 2023-07-08 jrick /* Create got.conf(5). */
1287 24df9a28 2023-07-08 jrick gotconfig_path = got_repo_get_path_gotconfig(repo);
1288 24df9a28 2023-07-08 jrick if (gotconfig_path == NULL) {
1289 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_repo_get_path_gotconfig");
1290 24df9a28 2023-07-08 jrick goto done;
1291 24df9a28 2023-07-08 jrick }
1292 24df9a28 2023-07-08 jrick gotconfig_file = fopen(gotconfig_path, "ae");
1293 24df9a28 2023-07-08 jrick if (gotconfig_file == NULL) {
1294 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fopen", gotconfig_path);
1295 24df9a28 2023-07-08 jrick goto done;
1296 24df9a28 2023-07-08 jrick }
1297 24df9a28 2023-07-08 jrick if (asprintf(&gotconfig,
1298 24df9a28 2023-07-08 jrick "remote \"%s\" {\n"
1299 24df9a28 2023-07-08 jrick "\tserver %s\n"
1300 24df9a28 2023-07-08 jrick "\tprotocol %s\n"
1301 24df9a28 2023-07-08 jrick "%s%s%s"
1302 24df9a28 2023-07-08 jrick "\trepository \"%s\"\n"
1303 24df9a28 2023-07-08 jrick "%s%s%s"
1304 24df9a28 2023-07-08 jrick "%s%s%s"
1305 24df9a28 2023-07-08 jrick "%s"
1306 24df9a28 2023-07-08 jrick "%s"
1307 24df9a28 2023-07-08 jrick "}\n",
1308 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1309 24df9a28 2023-07-08 jrick port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1310 24df9a28 2023-07-08 jrick remote_repo_path, branches ? "\tbranch { " : "",
1311 24df9a28 2023-07-08 jrick branches ? branches : "", branches ? "}\n" : "",
1312 24df9a28 2023-07-08 jrick refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1313 24df9a28 2023-07-08 jrick mirror_references ? "\tmirror_references yes\n" : "",
1314 24df9a28 2023-07-08 jrick fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1315 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1316 24df9a28 2023-07-08 jrick goto done;
1317 24df9a28 2023-07-08 jrick }
1318 24df9a28 2023-07-08 jrick n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1319 24df9a28 2023-07-08 jrick if (n != strlen(gotconfig)) {
1320 24df9a28 2023-07-08 jrick err = got_ferror(gotconfig_file, GOT_ERR_IO);
1321 24df9a28 2023-07-08 jrick goto done;
1322 24df9a28 2023-07-08 jrick }
1323 24df9a28 2023-07-08 jrick
1324 24df9a28 2023-07-08 jrick done:
1325 24df9a28 2023-07-08 jrick if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1326 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fclose", gotconfig_path);
1327 24df9a28 2023-07-08 jrick free(gotconfig_path);
1328 24df9a28 2023-07-08 jrick free(branches);
1329 24df9a28 2023-07-08 jrick return err;
1330 24df9a28 2023-07-08 jrick }
1331 24df9a28 2023-07-08 jrick
1332 24df9a28 2023-07-08 jrick static const struct got_error *
1333 24df9a28 2023-07-08 jrick create_gitconfig(const char *git_url, const char *default_branch,
1334 24df9a28 2023-07-08 jrick int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1335 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, int mirror_references,
1336 24df9a28 2023-07-08 jrick struct got_repository *repo)
1337 24df9a28 2023-07-08 jrick {
1338 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1339 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL;
1340 24df9a28 2023-07-08 jrick char *gitconfig = NULL;
1341 24df9a28 2023-07-08 jrick FILE *gitconfig_file = NULL;
1342 24df9a28 2023-07-08 jrick char *branches = NULL, *refs = NULL;
1343 24df9a28 2023-07-08 jrick const char *branchname;
1344 24df9a28 2023-07-08 jrick ssize_t n;
1345 24df9a28 2023-07-08 jrick
1346 24df9a28 2023-07-08 jrick /* Create a config file Git can understand. */
1347 24df9a28 2023-07-08 jrick gitconfig_path = got_repo_get_path_gitconfig(repo);
1348 24df9a28 2023-07-08 jrick if (gitconfig_path == NULL) {
1349 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_repo_get_path_gitconfig");
1350 24df9a28 2023-07-08 jrick goto done;
1351 24df9a28 2023-07-08 jrick }
1352 24df9a28 2023-07-08 jrick gitconfig_file = fopen(gitconfig_path, "ae");
1353 24df9a28 2023-07-08 jrick if (gitconfig_file == NULL) {
1354 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fopen", gitconfig_path);
1355 24df9a28 2023-07-08 jrick goto done;
1356 24df9a28 2023-07-08 jrick }
1357 24df9a28 2023-07-08 jrick if (fetch_all_branches) {
1358 24df9a28 2023-07-08 jrick if (mirror_references) {
1359 24df9a28 2023-07-08 jrick if (asprintf(&branches,
1360 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1361 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1362 24df9a28 2023-07-08 jrick goto done;
1363 24df9a28 2023-07-08 jrick }
1364 24df9a28 2023-07-08 jrick } else if (asprintf(&branches,
1365 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1366 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1367 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1368 24df9a28 2023-07-08 jrick goto done;
1369 24df9a28 2023-07-08 jrick }
1370 24df9a28 2023-07-08 jrick } else if (!TAILQ_EMPTY(wanted_branches)) {
1371 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1372 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_branches, entry) {
1373 24df9a28 2023-07-08 jrick char *s;
1374 24df9a28 2023-07-08 jrick branchname = pe->path;
1375 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1376 24df9a28 2023-07-08 jrick branchname += 11;
1377 24df9a28 2023-07-08 jrick if (mirror_references) {
1378 24df9a28 2023-07-08 jrick if (asprintf(&s,
1379 24df9a28 2023-07-08 jrick "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1380 24df9a28 2023-07-08 jrick branches ? branches : "",
1381 24df9a28 2023-07-08 jrick branchname, branchname) == -1) {
1382 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1383 24df9a28 2023-07-08 jrick goto done;
1384 24df9a28 2023-07-08 jrick }
1385 24df9a28 2023-07-08 jrick } else if (asprintf(&s,
1386 24df9a28 2023-07-08 jrick "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1387 24df9a28 2023-07-08 jrick branches ? branches : "",
1388 24df9a28 2023-07-08 jrick branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1389 24df9a28 2023-07-08 jrick branchname) == -1) {
1390 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1391 24df9a28 2023-07-08 jrick goto done;
1392 24df9a28 2023-07-08 jrick }
1393 24df9a28 2023-07-08 jrick free(branches);
1394 24df9a28 2023-07-08 jrick branches = s;
1395 24df9a28 2023-07-08 jrick }
1396 24df9a28 2023-07-08 jrick } else {
1397 24df9a28 2023-07-08 jrick /*
1398 24df9a28 2023-07-08 jrick * If the server specified a default branch, use just that one.
1399 24df9a28 2023-07-08 jrick * Otherwise fall back to fetching all branches on next fetch.
1400 24df9a28 2023-07-08 jrick */
1401 24df9a28 2023-07-08 jrick if (default_branch) {
1402 24df9a28 2023-07-08 jrick branchname = default_branch;
1403 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1404 24df9a28 2023-07-08 jrick branchname += 11;
1405 24df9a28 2023-07-08 jrick } else
1406 24df9a28 2023-07-08 jrick branchname = "*"; /* fall back to all branches */
1407 24df9a28 2023-07-08 jrick if (mirror_references) {
1408 24df9a28 2023-07-08 jrick if (asprintf(&branches,
1409 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/%s:refs/heads/%s\n",
1410 24df9a28 2023-07-08 jrick branchname, branchname) == -1) {
1411 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1412 24df9a28 2023-07-08 jrick goto done;
1413 24df9a28 2023-07-08 jrick }
1414 24df9a28 2023-07-08 jrick } else if (asprintf(&branches,
1415 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1416 24df9a28 2023-07-08 jrick branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1417 24df9a28 2023-07-08 jrick branchname) == -1) {
1418 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1419 24df9a28 2023-07-08 jrick goto done;
1420 24df9a28 2023-07-08 jrick }
1421 24df9a28 2023-07-08 jrick }
1422 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(wanted_refs)) {
1423 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1424 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_refs, entry) {
1425 24df9a28 2023-07-08 jrick char *s;
1426 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1427 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/", 5) == 0)
1428 24df9a28 2023-07-08 jrick refname += 5;
1429 24df9a28 2023-07-08 jrick if (mirror_references) {
1430 24df9a28 2023-07-08 jrick if (asprintf(&s,
1431 24df9a28 2023-07-08 jrick "%s\tfetch = refs/%s:refs/%s\n",
1432 24df9a28 2023-07-08 jrick refs ? refs : "", refname, refname) == -1) {
1433 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1434 24df9a28 2023-07-08 jrick goto done;
1435 24df9a28 2023-07-08 jrick }
1436 24df9a28 2023-07-08 jrick } else if (asprintf(&s,
1437 24df9a28 2023-07-08 jrick "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1438 24df9a28 2023-07-08 jrick refs ? refs : "",
1439 24df9a28 2023-07-08 jrick refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1440 24df9a28 2023-07-08 jrick refname) == -1) {
1441 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1442 24df9a28 2023-07-08 jrick goto done;
1443 24df9a28 2023-07-08 jrick }
1444 24df9a28 2023-07-08 jrick free(refs);
1445 24df9a28 2023-07-08 jrick refs = s;
1446 24df9a28 2023-07-08 jrick }
1447 24df9a28 2023-07-08 jrick }
1448 24df9a28 2023-07-08 jrick
1449 24df9a28 2023-07-08 jrick if (asprintf(&gitconfig,
1450 24df9a28 2023-07-08 jrick "[remote \"%s\"]\n"
1451 24df9a28 2023-07-08 jrick "\turl = %s\n"
1452 24df9a28 2023-07-08 jrick "%s"
1453 24df9a28 2023-07-08 jrick "%s"
1454 24df9a28 2023-07-08 jrick "\tfetch = refs/tags/*:refs/tags/*\n",
1455 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1456 24df9a28 2023-07-08 jrick refs ? refs : "") == -1) {
1457 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1458 24df9a28 2023-07-08 jrick goto done;
1459 24df9a28 2023-07-08 jrick }
1460 24df9a28 2023-07-08 jrick n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1461 24df9a28 2023-07-08 jrick if (n != strlen(gitconfig)) {
1462 24df9a28 2023-07-08 jrick err = got_ferror(gitconfig_file, GOT_ERR_IO);
1463 24df9a28 2023-07-08 jrick goto done;
1464 24df9a28 2023-07-08 jrick }
1465 24df9a28 2023-07-08 jrick done:
1466 24df9a28 2023-07-08 jrick if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1467 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fclose", gitconfig_path);
1468 24df9a28 2023-07-08 jrick free(gitconfig_path);
1469 24df9a28 2023-07-08 jrick free(branches);
1470 24df9a28 2023-07-08 jrick return err;
1471 24df9a28 2023-07-08 jrick }
1472 24df9a28 2023-07-08 jrick
1473 24df9a28 2023-07-08 jrick static const struct got_error *
1474 24df9a28 2023-07-08 jrick create_config_files(const char *proto, const char *host, const char *port,
1475 24df9a28 2023-07-08 jrick const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1476 24df9a28 2023-07-08 jrick int mirror_references, struct got_pathlist_head *symrefs,
1477 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_branches,
1478 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1479 24df9a28 2023-07-08 jrick {
1480 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1481 24df9a28 2023-07-08 jrick const char *default_branch = NULL;
1482 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1483 24df9a28 2023-07-08 jrick
1484 24df9a28 2023-07-08 jrick /*
1485 24df9a28 2023-07-08 jrick * If we asked for a set of wanted branches then use the first
1486 24df9a28 2023-07-08 jrick * one of those.
1487 24df9a28 2023-07-08 jrick */
1488 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(wanted_branches)) {
1489 24df9a28 2023-07-08 jrick pe = TAILQ_FIRST(wanted_branches);
1490 24df9a28 2023-07-08 jrick default_branch = pe->path;
1491 24df9a28 2023-07-08 jrick } else {
1492 24df9a28 2023-07-08 jrick /* First HEAD ref listed by server is the default branch. */
1493 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, symrefs, entry) {
1494 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1495 24df9a28 2023-07-08 jrick const char *target = pe->data;
1496 24df9a28 2023-07-08 jrick
1497 24df9a28 2023-07-08 jrick if (strcmp(refname, GOT_REF_HEAD) != 0)
1498 24df9a28 2023-07-08 jrick continue;
1499 24df9a28 2023-07-08 jrick
1500 24df9a28 2023-07-08 jrick default_branch = target;
1501 24df9a28 2023-07-08 jrick break;
1502 24df9a28 2023-07-08 jrick }
1503 24df9a28 2023-07-08 jrick }
1504 24df9a28 2023-07-08 jrick
1505 24df9a28 2023-07-08 jrick /* Create got.conf(5). */
1506 24df9a28 2023-07-08 jrick err = create_gotconfig(proto, host, port, remote_repo_path,
1507 24df9a28 2023-07-08 jrick default_branch, fetch_all_branches, wanted_branches,
1508 24df9a28 2023-07-08 jrick wanted_refs, mirror_references, repo);
1509 24df9a28 2023-07-08 jrick if (err)
1510 24df9a28 2023-07-08 jrick return err;
1511 24df9a28 2023-07-08 jrick
1512 24df9a28 2023-07-08 jrick /* Create a config file Git can understand. */
1513 24df9a28 2023-07-08 jrick return create_gitconfig(git_url, default_branch, fetch_all_branches,
1514 24df9a28 2023-07-08 jrick wanted_branches, wanted_refs, mirror_references, repo);
1515 24df9a28 2023-07-08 jrick }
1516 24df9a28 2023-07-08 jrick
1517 24df9a28 2023-07-08 jrick static const struct got_error *
1518 24df9a28 2023-07-08 jrick cmd_clone(int argc, char *argv[])
1519 24df9a28 2023-07-08 jrick {
1520 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
1521 24df9a28 2023-07-08 jrick const char *uri, *dirname;
1522 24df9a28 2023-07-08 jrick char *proto, *host, *port, *repo_name, *server_path;
1523 24df9a28 2023-07-08 jrick char *default_destdir = NULL, *id_str = NULL;
1524 24df9a28 2023-07-08 jrick const char *repo_path;
1525 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
1526 24df9a28 2023-07-08 jrick struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1527 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1528 24df9a28 2023-07-08 jrick struct got_object_id *pack_hash = NULL;
1529 24df9a28 2023-07-08 jrick int ch, fetchfd = -1, fetchstatus;
1530 24df9a28 2023-07-08 jrick pid_t fetchpid = -1;
1531 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg fpa;
1532 24df9a28 2023-07-08 jrick char *git_url = NULL;
1533 24df9a28 2023-07-08 jrick int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1534 24df9a28 2023-07-08 jrick int bflag = 0, list_refs_only = 0;
1535 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
1536 24df9a28 2023-07-08 jrick
1537 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
1538 24df9a28 2023-07-08 jrick TAILQ_INIT(&symrefs);
1539 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_branches);
1540 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_refs);
1541 24df9a28 2023-07-08 jrick
1542 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1543 24df9a28 2023-07-08 jrick switch (ch) {
1544 24df9a28 2023-07-08 jrick case 'a':
1545 24df9a28 2023-07-08 jrick fetch_all_branches = 1;
1546 24df9a28 2023-07-08 jrick break;
1547 24df9a28 2023-07-08 jrick case 'b':
1548 24df9a28 2023-07-08 jrick error = got_pathlist_append(&wanted_branches,
1549 24df9a28 2023-07-08 jrick optarg, NULL);
1550 24df9a28 2023-07-08 jrick if (error)
1551 24df9a28 2023-07-08 jrick return error;
1552 24df9a28 2023-07-08 jrick bflag = 1;
1553 24df9a28 2023-07-08 jrick break;
1554 24df9a28 2023-07-08 jrick case 'l':
1555 24df9a28 2023-07-08 jrick list_refs_only = 1;
1556 24df9a28 2023-07-08 jrick break;
1557 24df9a28 2023-07-08 jrick case 'm':
1558 24df9a28 2023-07-08 jrick mirror_references = 1;
1559 24df9a28 2023-07-08 jrick break;
1560 24df9a28 2023-07-08 jrick case 'q':
1561 24df9a28 2023-07-08 jrick verbosity = -1;
1562 24df9a28 2023-07-08 jrick break;
1563 24df9a28 2023-07-08 jrick case 'R':
1564 24df9a28 2023-07-08 jrick error = got_pathlist_append(&wanted_refs,
1565 24df9a28 2023-07-08 jrick optarg, NULL);
1566 24df9a28 2023-07-08 jrick if (error)
1567 24df9a28 2023-07-08 jrick return error;
1568 24df9a28 2023-07-08 jrick break;
1569 24df9a28 2023-07-08 jrick case 'v':
1570 24df9a28 2023-07-08 jrick if (verbosity < 0)
1571 24df9a28 2023-07-08 jrick verbosity = 0;
1572 24df9a28 2023-07-08 jrick else if (verbosity < 3)
1573 24df9a28 2023-07-08 jrick verbosity++;
1574 24df9a28 2023-07-08 jrick break;
1575 24df9a28 2023-07-08 jrick default:
1576 24df9a28 2023-07-08 jrick usage_clone();
1577 24df9a28 2023-07-08 jrick break;
1578 24df9a28 2023-07-08 jrick }
1579 24df9a28 2023-07-08 jrick }
1580 24df9a28 2023-07-08 jrick argc -= optind;
1581 24df9a28 2023-07-08 jrick argv += optind;
1582 24df9a28 2023-07-08 jrick
1583 24df9a28 2023-07-08 jrick if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1584 24df9a28 2023-07-08 jrick option_conflict('a', 'b');
1585 24df9a28 2023-07-08 jrick if (list_refs_only) {
1586 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(&wanted_branches))
1587 24df9a28 2023-07-08 jrick option_conflict('l', 'b');
1588 24df9a28 2023-07-08 jrick if (fetch_all_branches)
1589 24df9a28 2023-07-08 jrick option_conflict('l', 'a');
1590 24df9a28 2023-07-08 jrick if (mirror_references)
1591 24df9a28 2023-07-08 jrick option_conflict('l', 'm');
1592 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(&wanted_refs))
1593 24df9a28 2023-07-08 jrick option_conflict('l', 'R');
1594 24df9a28 2023-07-08 jrick }
1595 24df9a28 2023-07-08 jrick
1596 24df9a28 2023-07-08 jrick uri = argv[0];
1597 24df9a28 2023-07-08 jrick
1598 24df9a28 2023-07-08 jrick if (argc == 1)
1599 24df9a28 2023-07-08 jrick dirname = NULL;
1600 24df9a28 2023-07-08 jrick else if (argc == 2)
1601 24df9a28 2023-07-08 jrick dirname = argv[1];
1602 24df9a28 2023-07-08 jrick else
1603 24df9a28 2023-07-08 jrick usage_clone();
1604 24df9a28 2023-07-08 jrick
1605 24df9a28 2023-07-08 jrick error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1606 24df9a28 2023-07-08 jrick &repo_name, uri);
1607 24df9a28 2023-07-08 jrick if (error)
1608 24df9a28 2023-07-08 jrick goto done;
1609 24df9a28 2023-07-08 jrick
1610 24df9a28 2023-07-08 jrick if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1611 24df9a28 2023-07-08 jrick host, port ? ":" : "", port ? port : "",
1612 24df9a28 2023-07-08 jrick server_path[0] != '/' ? "/" : "", server_path) == -1) {
1613 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1614 24df9a28 2023-07-08 jrick goto done;
1615 24df9a28 2023-07-08 jrick }
1616 24df9a28 2023-07-08 jrick
1617 24df9a28 2023-07-08 jrick if (strcmp(proto, "git") == 0) {
1618 24df9a28 2023-07-08 jrick #ifndef PROFILE
1619 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1620 24df9a28 2023-07-08 jrick "sendfd dns inet unveil", NULL) == -1)
1621 24df9a28 2023-07-08 jrick err(1, "pledge");
1622 24df9a28 2023-07-08 jrick #endif
1623 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "git+ssh") == 0 ||
1624 24df9a28 2023-07-08 jrick strcmp(proto, "ssh") == 0) {
1625 24df9a28 2023-07-08 jrick #ifndef PROFILE
1626 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1627 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
1628 24df9a28 2023-07-08 jrick err(1, "pledge");
1629 24df9a28 2023-07-08 jrick #endif
1630 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "http") == 0 ||
1631 24df9a28 2023-07-08 jrick strcmp(proto, "git+http") == 0) {
1632 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1633 24df9a28 2023-07-08 jrick goto done;
1634 24df9a28 2023-07-08 jrick } else {
1635 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1636 24df9a28 2023-07-08 jrick goto done;
1637 24df9a28 2023-07-08 jrick }
1638 24df9a28 2023-07-08 jrick if (dirname == NULL) {
1639 24df9a28 2023-07-08 jrick if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1640 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1641 24df9a28 2023-07-08 jrick goto done;
1642 24df9a28 2023-07-08 jrick }
1643 24df9a28 2023-07-08 jrick repo_path = default_destdir;
1644 24df9a28 2023-07-08 jrick } else
1645 24df9a28 2023-07-08 jrick repo_path = dirname;
1646 24df9a28 2023-07-08 jrick
1647 24df9a28 2023-07-08 jrick if (!list_refs_only) {
1648 24df9a28 2023-07-08 jrick error = got_path_mkdir(repo_path);
1649 24df9a28 2023-07-08 jrick if (error &&
1650 24df9a28 2023-07-08 jrick (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1651 24df9a28 2023-07-08 jrick !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1652 24df9a28 2023-07-08 jrick goto done;
1653 24df9a28 2023-07-08 jrick if (!got_path_dir_is_empty(repo_path)) {
1654 24df9a28 2023-07-08 jrick error = got_error_path(repo_path,
1655 24df9a28 2023-07-08 jrick GOT_ERR_DIR_NOT_EMPTY);
1656 24df9a28 2023-07-08 jrick goto done;
1657 24df9a28 2023-07-08 jrick }
1658 24df9a28 2023-07-08 jrick }
1659 24df9a28 2023-07-08 jrick
1660 24df9a28 2023-07-08 jrick error = got_dial_apply_unveil(proto);
1661 24df9a28 2023-07-08 jrick if (error)
1662 24df9a28 2023-07-08 jrick goto done;
1663 24df9a28 2023-07-08 jrick
1664 24df9a28 2023-07-08 jrick error = apply_unveil(repo_path, 0, NULL);
1665 24df9a28 2023-07-08 jrick if (error)
1666 24df9a28 2023-07-08 jrick goto done;
1667 24df9a28 2023-07-08 jrick
1668 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1669 24df9a28 2023-07-08 jrick printf("Connecting to %s\n", git_url);
1670 24df9a28 2023-07-08 jrick
1671 24df9a28 2023-07-08 jrick error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1672 24df9a28 2023-07-08 jrick server_path, verbosity);
1673 24df9a28 2023-07-08 jrick if (error)
1674 24df9a28 2023-07-08 jrick goto done;
1675 24df9a28 2023-07-08 jrick
1676 24df9a28 2023-07-08 jrick if (!list_refs_only) {
1677 24df9a28 2023-07-08 jrick error = got_repo_init(repo_path, NULL);
1678 24df9a28 2023-07-08 jrick if (error)
1679 24df9a28 2023-07-08 jrick goto done;
1680 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
1681 24df9a28 2023-07-08 jrick if (error != NULL)
1682 24df9a28 2023-07-08 jrick goto done;
1683 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1684 24df9a28 2023-07-08 jrick if (error)
1685 24df9a28 2023-07-08 jrick goto done;
1686 24df9a28 2023-07-08 jrick }
1687 24df9a28 2023-07-08 jrick
1688 24df9a28 2023-07-08 jrick fpa.last_scaled_size[0] = '\0';
1689 24df9a28 2023-07-08 jrick fpa.last_p_indexed = -1;
1690 24df9a28 2023-07-08 jrick fpa.last_p_resolved = -1;
1691 24df9a28 2023-07-08 jrick fpa.verbosity = verbosity;
1692 24df9a28 2023-07-08 jrick fpa.create_configs = 1;
1693 24df9a28 2023-07-08 jrick fpa.configs_created = 0;
1694 24df9a28 2023-07-08 jrick fpa.repo = repo;
1695 24df9a28 2023-07-08 jrick fpa.config_info.symrefs = &symrefs;
1696 24df9a28 2023-07-08 jrick fpa.config_info.wanted_branches = &wanted_branches;
1697 24df9a28 2023-07-08 jrick fpa.config_info.wanted_refs = &wanted_refs;
1698 24df9a28 2023-07-08 jrick fpa.config_info.proto = proto;
1699 24df9a28 2023-07-08 jrick fpa.config_info.host = host;
1700 24df9a28 2023-07-08 jrick fpa.config_info.port = port;
1701 24df9a28 2023-07-08 jrick fpa.config_info.remote_repo_path = server_path;
1702 24df9a28 2023-07-08 jrick fpa.config_info.git_url = git_url;
1703 24df9a28 2023-07-08 jrick fpa.config_info.fetch_all_branches = fetch_all_branches;
1704 24df9a28 2023-07-08 jrick fpa.config_info.mirror_references = mirror_references;
1705 24df9a28 2023-07-08 jrick error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1706 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1707 24df9a28 2023-07-08 jrick fetch_all_branches, &wanted_branches, &wanted_refs,
1708 24df9a28 2023-07-08 jrick list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1709 24df9a28 2023-07-08 jrick fetch_progress, &fpa);
1710 24df9a28 2023-07-08 jrick if (error)
1711 24df9a28 2023-07-08 jrick goto done;
1712 24df9a28 2023-07-08 jrick
1713 24df9a28 2023-07-08 jrick if (list_refs_only) {
1714 24df9a28 2023-07-08 jrick error = list_remote_refs(&symrefs, &refs);
1715 24df9a28 2023-07-08 jrick goto done;
1716 24df9a28 2023-07-08 jrick }
1717 24df9a28 2023-07-08 jrick
1718 24df9a28 2023-07-08 jrick if (pack_hash == NULL) {
1719 24df9a28 2023-07-08 jrick error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1720 24df9a28 2023-07-08 jrick "server sent an empty pack file");
1721 24df9a28 2023-07-08 jrick goto done;
1722 24df9a28 2023-07-08 jrick }
1723 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, pack_hash);
1724 24df9a28 2023-07-08 jrick if (error)
1725 24df9a28 2023-07-08 jrick goto done;
1726 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1727 24df9a28 2023-07-08 jrick printf("\nFetched %s.pack\n", id_str);
1728 24df9a28 2023-07-08 jrick free(id_str);
1729 24df9a28 2023-07-08 jrick
1730 24df9a28 2023-07-08 jrick /* Set up references provided with the pack file. */
1731 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &refs, entry) {
1732 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1733 24df9a28 2023-07-08 jrick struct got_object_id *id = pe->data;
1734 24df9a28 2023-07-08 jrick char *remote_refname;
1735 24df9a28 2023-07-08 jrick
1736 24df9a28 2023-07-08 jrick if (is_wanted_ref(&wanted_refs, refname) &&
1737 24df9a28 2023-07-08 jrick !mirror_references) {
1738 24df9a28 2023-07-08 jrick error = create_wanted_ref(refname, id,
1739 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME,
1740 24df9a28 2023-07-08 jrick verbosity - 1, repo);
1741 24df9a28 2023-07-08 jrick if (error)
1742 24df9a28 2023-07-08 jrick goto done;
1743 24df9a28 2023-07-08 jrick continue;
1744 24df9a28 2023-07-08 jrick }
1745 24df9a28 2023-07-08 jrick
1746 24df9a28 2023-07-08 jrick error = create_ref(refname, id, verbosity - 1, repo);
1747 24df9a28 2023-07-08 jrick if (error)
1748 24df9a28 2023-07-08 jrick goto done;
1749 24df9a28 2023-07-08 jrick
1750 24df9a28 2023-07-08 jrick if (mirror_references)
1751 24df9a28 2023-07-08 jrick continue;
1752 24df9a28 2023-07-08 jrick
1753 24df9a28 2023-07-08 jrick if (strncmp("refs/heads/", refname, 11) != 0)
1754 24df9a28 2023-07-08 jrick continue;
1755 24df9a28 2023-07-08 jrick
1756 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname,
1757 24df9a28 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1758 24df9a28 2023-07-08 jrick refname + 11) == -1) {
1759 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1760 24df9a28 2023-07-08 jrick goto done;
1761 24df9a28 2023-07-08 jrick }
1762 24df9a28 2023-07-08 jrick error = create_ref(remote_refname, id, verbosity - 1, repo);
1763 24df9a28 2023-07-08 jrick free(remote_refname);
1764 24df9a28 2023-07-08 jrick if (error)
1765 24df9a28 2023-07-08 jrick goto done;
1766 24df9a28 2023-07-08 jrick }
1767 24df9a28 2023-07-08 jrick
1768 24df9a28 2023-07-08 jrick /* Set the HEAD reference if the server provided one. */
1769 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &symrefs, entry) {
1770 24df9a28 2023-07-08 jrick struct got_reference *target_ref;
1771 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1772 24df9a28 2023-07-08 jrick const char *target = pe->data;
1773 24df9a28 2023-07-08 jrick char *remote_refname = NULL, *remote_target = NULL;
1774 24df9a28 2023-07-08 jrick
1775 24df9a28 2023-07-08 jrick if (strcmp(refname, GOT_REF_HEAD) != 0)
1776 24df9a28 2023-07-08 jrick continue;
1777 24df9a28 2023-07-08 jrick
1778 24df9a28 2023-07-08 jrick error = got_ref_open(&target_ref, repo, target, 0);
1779 24df9a28 2023-07-08 jrick if (error) {
1780 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_REF) {
1781 24df9a28 2023-07-08 jrick error = NULL;
1782 24df9a28 2023-07-08 jrick continue;
1783 24df9a28 2023-07-08 jrick }
1784 24df9a28 2023-07-08 jrick goto done;
1785 24df9a28 2023-07-08 jrick }
1786 24df9a28 2023-07-08 jrick
1787 24df9a28 2023-07-08 jrick error = create_symref(refname, target_ref, verbosity, repo);
1788 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
1789 24df9a28 2023-07-08 jrick if (error)
1790 24df9a28 2023-07-08 jrick goto done;
1791 24df9a28 2023-07-08 jrick
1792 24df9a28 2023-07-08 jrick if (mirror_references)
1793 24df9a28 2023-07-08 jrick continue;
1794 24df9a28 2023-07-08 jrick
1795 24df9a28 2023-07-08 jrick if (strncmp("refs/heads/", target, 11) != 0)
1796 24df9a28 2023-07-08 jrick continue;
1797 24df9a28 2023-07-08 jrick
1798 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname,
1799 24df9a28 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1800 24df9a28 2023-07-08 jrick refname) == -1) {
1801 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1802 24df9a28 2023-07-08 jrick goto done;
1803 24df9a28 2023-07-08 jrick }
1804 24df9a28 2023-07-08 jrick if (asprintf(&remote_target,
1805 24df9a28 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1806 24df9a28 2023-07-08 jrick target + 11) == -1) {
1807 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1808 24df9a28 2023-07-08 jrick free(remote_refname);
1809 24df9a28 2023-07-08 jrick goto done;
1810 24df9a28 2023-07-08 jrick }
1811 24df9a28 2023-07-08 jrick error = got_ref_open(&target_ref, repo, remote_target, 0);
1812 24df9a28 2023-07-08 jrick if (error) {
1813 24df9a28 2023-07-08 jrick free(remote_refname);
1814 24df9a28 2023-07-08 jrick free(remote_target);
1815 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_REF) {
1816 24df9a28 2023-07-08 jrick error = NULL;
1817 24df9a28 2023-07-08 jrick continue;
1818 24df9a28 2023-07-08 jrick }
1819 24df9a28 2023-07-08 jrick goto done;
1820 24df9a28 2023-07-08 jrick }
1821 24df9a28 2023-07-08 jrick error = create_symref(remote_refname, target_ref,
1822 24df9a28 2023-07-08 jrick verbosity - 1, repo);
1823 24df9a28 2023-07-08 jrick free(remote_refname);
1824 24df9a28 2023-07-08 jrick free(remote_target);
1825 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
1826 24df9a28 2023-07-08 jrick if (error)
1827 24df9a28 2023-07-08 jrick goto done;
1828 24df9a28 2023-07-08 jrick }
1829 24df9a28 2023-07-08 jrick if (pe == NULL) {
1830 24df9a28 2023-07-08 jrick /*
1831 24df9a28 2023-07-08 jrick * We failed to set the HEAD reference. If we asked for
1832 24df9a28 2023-07-08 jrick * a set of wanted branches use the first of one of those
1833 24df9a28 2023-07-08 jrick * which could be fetched instead.
1834 24df9a28 2023-07-08 jrick */
1835 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &wanted_branches, entry) {
1836 24df9a28 2023-07-08 jrick const char *target = pe->path;
1837 24df9a28 2023-07-08 jrick struct got_reference *target_ref;
1838 24df9a28 2023-07-08 jrick
1839 24df9a28 2023-07-08 jrick error = got_ref_open(&target_ref, repo, target, 0);
1840 24df9a28 2023-07-08 jrick if (error) {
1841 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_REF) {
1842 24df9a28 2023-07-08 jrick error = NULL;
1843 24df9a28 2023-07-08 jrick continue;
1844 24df9a28 2023-07-08 jrick }
1845 24df9a28 2023-07-08 jrick goto done;
1846 24df9a28 2023-07-08 jrick }
1847 24df9a28 2023-07-08 jrick
1848 24df9a28 2023-07-08 jrick error = create_symref(GOT_REF_HEAD, target_ref,
1849 24df9a28 2023-07-08 jrick verbosity, repo);
1850 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
1851 24df9a28 2023-07-08 jrick if (error)
1852 24df9a28 2023-07-08 jrick goto done;
1853 24df9a28 2023-07-08 jrick break;
1854 24df9a28 2023-07-08 jrick }
1855 24df9a28 2023-07-08 jrick
1856 24df9a28 2023-07-08 jrick if (!fpa.configs_created && pe != NULL) {
1857 24df9a28 2023-07-08 jrick error = create_config_files(fpa.config_info.proto,
1858 24df9a28 2023-07-08 jrick fpa.config_info.host, fpa.config_info.port,
1859 24df9a28 2023-07-08 jrick fpa.config_info.remote_repo_path,
1860 24df9a28 2023-07-08 jrick fpa.config_info.git_url,
1861 24df9a28 2023-07-08 jrick fpa.config_info.fetch_all_branches,
1862 24df9a28 2023-07-08 jrick fpa.config_info.mirror_references,
1863 24df9a28 2023-07-08 jrick fpa.config_info.symrefs,
1864 24df9a28 2023-07-08 jrick fpa.config_info.wanted_branches,
1865 24df9a28 2023-07-08 jrick fpa.config_info.wanted_refs, fpa.repo);
1866 24df9a28 2023-07-08 jrick if (error)
1867 24df9a28 2023-07-08 jrick goto done;
1868 24df9a28 2023-07-08 jrick }
1869 24df9a28 2023-07-08 jrick }
1870 24df9a28 2023-07-08 jrick
1871 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1872 24df9a28 2023-07-08 jrick printf("Created %s repository '%s'\n",
1873 24df9a28 2023-07-08 jrick mirror_references ? "mirrored" : "cloned", repo_path);
1874 24df9a28 2023-07-08 jrick done:
1875 24df9a28 2023-07-08 jrick if (pack_fds) {
1876 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
1877 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
1878 24df9a28 2023-07-08 jrick if (error == NULL)
1879 24df9a28 2023-07-08 jrick error = pack_err;
1880 24df9a28 2023-07-08 jrick }
1881 24df9a28 2023-07-08 jrick if (fetchpid > 0) {
1882 24df9a28 2023-07-08 jrick if (kill(fetchpid, SIGTERM) == -1)
1883 24df9a28 2023-07-08 jrick error = got_error_from_errno("kill");
1884 24df9a28 2023-07-08 jrick if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1885 24df9a28 2023-07-08 jrick error = got_error_from_errno("waitpid");
1886 24df9a28 2023-07-08 jrick }
1887 24df9a28 2023-07-08 jrick if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1888 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
1889 24df9a28 2023-07-08 jrick if (repo) {
1890 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
1891 24df9a28 2023-07-08 jrick if (error == NULL)
1892 24df9a28 2023-07-08 jrick error = close_err;
1893 24df9a28 2023-07-08 jrick }
1894 24df9a28 2023-07-08 jrick got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1895 24df9a28 2023-07-08 jrick got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1896 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1897 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1898 24df9a28 2023-07-08 jrick free(pack_hash);
1899 24df9a28 2023-07-08 jrick free(proto);
1900 24df9a28 2023-07-08 jrick free(host);
1901 24df9a28 2023-07-08 jrick free(port);
1902 24df9a28 2023-07-08 jrick free(server_path);
1903 24df9a28 2023-07-08 jrick free(repo_name);
1904 24df9a28 2023-07-08 jrick free(default_destdir);
1905 24df9a28 2023-07-08 jrick free(git_url);
1906 24df9a28 2023-07-08 jrick return error;
1907 24df9a28 2023-07-08 jrick }
1908 24df9a28 2023-07-08 jrick
1909 24df9a28 2023-07-08 jrick static const struct got_error *
1910 24df9a28 2023-07-08 jrick update_ref(struct got_reference *ref, struct got_object_id *new_id,
1911 24df9a28 2023-07-08 jrick int replace_tags, int verbosity, struct got_repository *repo)
1912 24df9a28 2023-07-08 jrick {
1913 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1914 24df9a28 2023-07-08 jrick char *new_id_str = NULL;
1915 24df9a28 2023-07-08 jrick struct got_object_id *old_id = NULL;
1916 24df9a28 2023-07-08 jrick
1917 24df9a28 2023-07-08 jrick err = got_object_id_str(&new_id_str, new_id);
1918 24df9a28 2023-07-08 jrick if (err)
1919 24df9a28 2023-07-08 jrick goto done;
1920 24df9a28 2023-07-08 jrick
1921 24df9a28 2023-07-08 jrick if (!replace_tags &&
1922 24df9a28 2023-07-08 jrick strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1923 24df9a28 2023-07-08 jrick err = got_ref_resolve(&old_id, repo, ref);
1924 24df9a28 2023-07-08 jrick if (err)
1925 24df9a28 2023-07-08 jrick goto done;
1926 24df9a28 2023-07-08 jrick if (got_object_id_cmp(old_id, new_id) == 0)
1927 24df9a28 2023-07-08 jrick goto done;
1928 24df9a28 2023-07-08 jrick if (verbosity >= 0) {
1929 24df9a28 2023-07-08 jrick printf("Rejecting update of existing tag %s: %s\n",
1930 24df9a28 2023-07-08 jrick got_ref_get_name(ref), new_id_str);
1931 24df9a28 2023-07-08 jrick }
1932 24df9a28 2023-07-08 jrick goto done;
1933 24df9a28 2023-07-08 jrick }
1934 24df9a28 2023-07-08 jrick
1935 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(ref)) {
1936 24df9a28 2023-07-08 jrick if (verbosity >= 0) {
1937 24df9a28 2023-07-08 jrick printf("Replacing reference %s: %s\n",
1938 24df9a28 2023-07-08 jrick got_ref_get_name(ref),
1939 24df9a28 2023-07-08 jrick got_ref_get_symref_target(ref));
1940 24df9a28 2023-07-08 jrick }
1941 24df9a28 2023-07-08 jrick err = got_ref_change_symref_to_ref(ref, new_id);
1942 24df9a28 2023-07-08 jrick if (err)
1943 24df9a28 2023-07-08 jrick goto done;
1944 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
1945 24df9a28 2023-07-08 jrick if (err)
1946 24df9a28 2023-07-08 jrick goto done;
1947 24df9a28 2023-07-08 jrick } else {
1948 24df9a28 2023-07-08 jrick err = got_ref_resolve(&old_id, repo, ref);
1949 24df9a28 2023-07-08 jrick if (err)
1950 24df9a28 2023-07-08 jrick goto done;
1951 24df9a28 2023-07-08 jrick if (got_object_id_cmp(old_id, new_id) == 0)
1952 24df9a28 2023-07-08 jrick goto done;
1953 24df9a28 2023-07-08 jrick
1954 24df9a28 2023-07-08 jrick err = got_ref_change_ref(ref, new_id);
1955 24df9a28 2023-07-08 jrick if (err)
1956 24df9a28 2023-07-08 jrick goto done;
1957 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
1958 24df9a28 2023-07-08 jrick if (err)
1959 24df9a28 2023-07-08 jrick goto done;
1960 24df9a28 2023-07-08 jrick }
1961 24df9a28 2023-07-08 jrick
1962 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1963 24df9a28 2023-07-08 jrick printf("Updated %s: %s\n", got_ref_get_name(ref),
1964 24df9a28 2023-07-08 jrick new_id_str);
1965 24df9a28 2023-07-08 jrick done:
1966 24df9a28 2023-07-08 jrick free(old_id);
1967 24df9a28 2023-07-08 jrick free(new_id_str);
1968 24df9a28 2023-07-08 jrick return err;
1969 24df9a28 2023-07-08 jrick }
1970 24df9a28 2023-07-08 jrick
1971 24df9a28 2023-07-08 jrick static const struct got_error *
1972 24df9a28 2023-07-08 jrick update_wanted_ref(const char *refname, struct got_object_id *id,
1973 24df9a28 2023-07-08 jrick const char *remote_repo_name, int verbosity, struct got_repository *repo)
1974 24df9a28 2023-07-08 jrick {
1975 24df9a28 2023-07-08 jrick const struct got_error *err, *unlock_err;
1976 24df9a28 2023-07-08 jrick char *remote_refname;
1977 24df9a28 2023-07-08 jrick struct got_reference *ref;
1978 24df9a28 2023-07-08 jrick
1979 24df9a28 2023-07-08 jrick if (strncmp("refs/", refname, 5) == 0)
1980 24df9a28 2023-07-08 jrick refname += 5;
1981 24df9a28 2023-07-08 jrick
1982 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1983 24df9a28 2023-07-08 jrick remote_repo_name, refname) == -1)
1984 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
1985 24df9a28 2023-07-08 jrick
1986 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, remote_refname, 1);
1987 24df9a28 2023-07-08 jrick if (err) {
1988 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_NOT_REF)
1989 24df9a28 2023-07-08 jrick goto done;
1990 24df9a28 2023-07-08 jrick err = create_ref(remote_refname, id, verbosity, repo);
1991 24df9a28 2023-07-08 jrick } else {
1992 24df9a28 2023-07-08 jrick err = update_ref(ref, id, 0, verbosity, repo);
1993 24df9a28 2023-07-08 jrick unlock_err = got_ref_unlock(ref);
1994 24df9a28 2023-07-08 jrick if (unlock_err && err == NULL)
1995 24df9a28 2023-07-08 jrick err = unlock_err;
1996 24df9a28 2023-07-08 jrick got_ref_close(ref);
1997 24df9a28 2023-07-08 jrick }
1998 24df9a28 2023-07-08 jrick done:
1999 24df9a28 2023-07-08 jrick free(remote_refname);
2000 24df9a28 2023-07-08 jrick return err;
2001 24df9a28 2023-07-08 jrick }
2002 24df9a28 2023-07-08 jrick
2003 24df9a28 2023-07-08 jrick static const struct got_error *
2004 24df9a28 2023-07-08 jrick delete_ref(struct got_repository *repo, struct got_reference *ref)
2005 24df9a28 2023-07-08 jrick {
2006 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2007 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
2008 24df9a28 2023-07-08 jrick char *id_str = NULL;
2009 24df9a28 2023-07-08 jrick const char *target;
2010 24df9a28 2023-07-08 jrick
2011 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(ref)) {
2012 24df9a28 2023-07-08 jrick target = got_ref_get_symref_target(ref);
2013 24df9a28 2023-07-08 jrick } else {
2014 24df9a28 2023-07-08 jrick err = got_ref_resolve(&id, repo, ref);
2015 24df9a28 2023-07-08 jrick if (err)
2016 24df9a28 2023-07-08 jrick goto done;
2017 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
2018 24df9a28 2023-07-08 jrick if (err)
2019 24df9a28 2023-07-08 jrick goto done;
2020 24df9a28 2023-07-08 jrick target = id_str;
2021 24df9a28 2023-07-08 jrick }
2022 24df9a28 2023-07-08 jrick
2023 24df9a28 2023-07-08 jrick err = got_ref_delete(ref, repo);
2024 24df9a28 2023-07-08 jrick if (err)
2025 24df9a28 2023-07-08 jrick goto done;
2026 24df9a28 2023-07-08 jrick
2027 24df9a28 2023-07-08 jrick printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2028 24df9a28 2023-07-08 jrick done:
2029 24df9a28 2023-07-08 jrick free(id);
2030 24df9a28 2023-07-08 jrick free(id_str);
2031 24df9a28 2023-07-08 jrick return err;
2032 24df9a28 2023-07-08 jrick }
2033 24df9a28 2023-07-08 jrick
2034 24df9a28 2023-07-08 jrick __dead static void
2035 24df9a28 2023-07-08 jrick usage_checkout(void)
2036 24df9a28 2023-07-08 jrick {
2037 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2038 24df9a28 2023-07-08 jrick "[-p path-prefix] repository-path [work-tree-path]\n",
2039 24df9a28 2023-07-08 jrick getprogname());
2040 24df9a28 2023-07-08 jrick exit(1);
2041 24df9a28 2023-07-08 jrick }
2042 24df9a28 2023-07-08 jrick
2043 24df9a28 2023-07-08 jrick static void
2044 24df9a28 2023-07-08 jrick show_worktree_base_ref_warning(void)
2045 24df9a28 2023-07-08 jrick {
2046 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: warning: could not create a reference "
2047 24df9a28 2023-07-08 jrick "to the work tree's base commit; the commit could be "
2048 24df9a28 2023-07-08 jrick "garbage-collected by Git or 'gotadmin cleanup'; making the "
2049 24df9a28 2023-07-08 jrick "repository writable and running 'got update' will prevent this\n",
2050 24df9a28 2023-07-08 jrick getprogname());
2051 24df9a28 2023-07-08 jrick }
2052 24df9a28 2023-07-08 jrick
2053 24df9a28 2023-07-08 jrick struct got_checkout_progress_arg {
2054 24df9a28 2023-07-08 jrick const char *worktree_path;
2055 24df9a28 2023-07-08 jrick int had_base_commit_ref_error;
2056 24df9a28 2023-07-08 jrick int verbosity;
2057 24df9a28 2023-07-08 jrick };
2058 24df9a28 2023-07-08 jrick
2059 24df9a28 2023-07-08 jrick static const struct got_error *
2060 24df9a28 2023-07-08 jrick checkout_progress(void *arg, unsigned char status, const char *path)
2061 24df9a28 2023-07-08 jrick {
2062 24df9a28 2023-07-08 jrick struct got_checkout_progress_arg *a = arg;
2063 24df9a28 2023-07-08 jrick
2064 24df9a28 2023-07-08 jrick /* Base commit bump happens silently. */
2065 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_BUMP_BASE)
2066 24df9a28 2023-07-08 jrick return NULL;
2067 24df9a28 2023-07-08 jrick
2068 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_BASE_REF_ERR) {
2069 24df9a28 2023-07-08 jrick a->had_base_commit_ref_error = 1;
2070 24df9a28 2023-07-08 jrick return NULL;
2071 24df9a28 2023-07-08 jrick }
2072 24df9a28 2023-07-08 jrick
2073 24df9a28 2023-07-08 jrick while (path[0] == '/')
2074 24df9a28 2023-07-08 jrick path++;
2075 24df9a28 2023-07-08 jrick
2076 24df9a28 2023-07-08 jrick if (a->verbosity >= 0)
2077 24df9a28 2023-07-08 jrick printf("%c %s/%s\n", status, a->worktree_path, path);
2078 24df9a28 2023-07-08 jrick
2079 24df9a28 2023-07-08 jrick return NULL;
2080 24df9a28 2023-07-08 jrick }
2081 24df9a28 2023-07-08 jrick
2082 24df9a28 2023-07-08 jrick static const struct got_error *
2083 24df9a28 2023-07-08 jrick check_cancelled(void *arg)
2084 24df9a28 2023-07-08 jrick {
2085 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
2086 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_CANCELLED);
2087 24df9a28 2023-07-08 jrick return NULL;
2088 24df9a28 2023-07-08 jrick }
2089 24df9a28 2023-07-08 jrick
2090 24df9a28 2023-07-08 jrick static const struct got_error *
2091 24df9a28 2023-07-08 jrick check_linear_ancestry(struct got_object_id *commit_id,
2092 24df9a28 2023-07-08 jrick struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2093 24df9a28 2023-07-08 jrick struct got_repository *repo)
2094 24df9a28 2023-07-08 jrick {
2095 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2096 24df9a28 2023-07-08 jrick struct got_object_id *yca_id;
2097 24df9a28 2023-07-08 jrick
2098 24df9a28 2023-07-08 jrick err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2099 24df9a28 2023-07-08 jrick commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2100 24df9a28 2023-07-08 jrick if (err)
2101 24df9a28 2023-07-08 jrick return err;
2102 24df9a28 2023-07-08 jrick
2103 24df9a28 2023-07-08 jrick if (yca_id == NULL)
2104 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ANCESTRY);
2105 24df9a28 2023-07-08 jrick
2106 24df9a28 2023-07-08 jrick /*
2107 24df9a28 2023-07-08 jrick * Require a straight line of history between the target commit
2108 24df9a28 2023-07-08 jrick * and the work tree's base commit.
2109 24df9a28 2023-07-08 jrick *
2110 24df9a28 2023-07-08 jrick * Non-linear situations such as this require a rebase:
2111 24df9a28 2023-07-08 jrick *
2112 24df9a28 2023-07-08 jrick * (commit) D F (base_commit)
2113 24df9a28 2023-07-08 jrick * \ /
2114 24df9a28 2023-07-08 jrick * C E
2115 24df9a28 2023-07-08 jrick * \ /
2116 24df9a28 2023-07-08 jrick * B (yca)
2117 24df9a28 2023-07-08 jrick * |
2118 24df9a28 2023-07-08 jrick * A
2119 24df9a28 2023-07-08 jrick *
2120 24df9a28 2023-07-08 jrick * 'got update' only handles linear cases:
2121 24df9a28 2023-07-08 jrick * Update forwards in time: A (base/yca) - B - C - D (commit)
2122 24df9a28 2023-07-08 jrick * Update backwards in time: D (base) - C - B - A (commit/yca)
2123 24df9a28 2023-07-08 jrick */
2124 24df9a28 2023-07-08 jrick if (allow_forwards_in_time_only) {
2125 24df9a28 2023-07-08 jrick if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2126 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ANCESTRY);
2127 24df9a28 2023-07-08 jrick } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2128 24df9a28 2023-07-08 jrick got_object_id_cmp(base_commit_id, yca_id) != 0)
2129 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ANCESTRY);
2130 24df9a28 2023-07-08 jrick
2131 24df9a28 2023-07-08 jrick free(yca_id);
2132 24df9a28 2023-07-08 jrick return NULL;
2133 24df9a28 2023-07-08 jrick }
2134 24df9a28 2023-07-08 jrick
2135 24df9a28 2023-07-08 jrick static const struct got_error *
2136 24df9a28 2023-07-08 jrick check_same_branch(struct got_object_id *commit_id,
2137 24df9a28 2023-07-08 jrick struct got_reference *head_ref, struct got_repository *repo)
2138 24df9a28 2023-07-08 jrick {
2139 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2140 24df9a28 2023-07-08 jrick struct got_commit_graph *graph = NULL;
2141 24df9a28 2023-07-08 jrick struct got_object_id *head_commit_id = NULL;
2142 24df9a28 2023-07-08 jrick
2143 24df9a28 2023-07-08 jrick err = got_ref_resolve(&head_commit_id, repo, head_ref);
2144 24df9a28 2023-07-08 jrick if (err)
2145 24df9a28 2023-07-08 jrick goto done;
2146 24df9a28 2023-07-08 jrick
2147 24df9a28 2023-07-08 jrick if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2148 24df9a28 2023-07-08 jrick goto done;
2149 24df9a28 2023-07-08 jrick
2150 24df9a28 2023-07-08 jrick err = got_commit_graph_open(&graph, "/", 1);
2151 24df9a28 2023-07-08 jrick if (err)
2152 24df9a28 2023-07-08 jrick goto done;
2153 24df9a28 2023-07-08 jrick
2154 24df9a28 2023-07-08 jrick err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2155 24df9a28 2023-07-08 jrick check_cancelled, NULL);
2156 24df9a28 2023-07-08 jrick if (err)
2157 24df9a28 2023-07-08 jrick goto done;
2158 24df9a28 2023-07-08 jrick
2159 24df9a28 2023-07-08 jrick for (;;) {
2160 24df9a28 2023-07-08 jrick struct got_object_id id;
2161 24df9a28 2023-07-08 jrick
2162 24df9a28 2023-07-08 jrick err = got_commit_graph_iter_next(&id, graph, repo,
2163 24df9a28 2023-07-08 jrick check_cancelled, NULL);
2164 24df9a28 2023-07-08 jrick if (err) {
2165 24df9a28 2023-07-08 jrick if (err->code == GOT_ERR_ITER_COMPLETED)
2166 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_ANCESTRY);
2167 24df9a28 2023-07-08 jrick break;
2168 24df9a28 2023-07-08 jrick }
2169 24df9a28 2023-07-08 jrick
2170 24df9a28 2023-07-08 jrick if (got_object_id_cmp(&id, commit_id) == 0)
2171 24df9a28 2023-07-08 jrick break;
2172 24df9a28 2023-07-08 jrick }
2173 24df9a28 2023-07-08 jrick done:
2174 24df9a28 2023-07-08 jrick if (graph)
2175 24df9a28 2023-07-08 jrick got_commit_graph_close(graph);
2176 24df9a28 2023-07-08 jrick free(head_commit_id);
2177 24df9a28 2023-07-08 jrick return err;
2178 24df9a28 2023-07-08 jrick }
2179 24df9a28 2023-07-08 jrick
2180 24df9a28 2023-07-08 jrick static const struct got_error *
2181 24df9a28 2023-07-08 jrick checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2182 24df9a28 2023-07-08 jrick {
2183 24df9a28 2023-07-08 jrick static char msg[512];
2184 24df9a28 2023-07-08 jrick const char *branch_name;
2185 24df9a28 2023-07-08 jrick
2186 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(ref))
2187 24df9a28 2023-07-08 jrick branch_name = got_ref_get_symref_target(ref);
2188 24df9a28 2023-07-08 jrick else
2189 24df9a28 2023-07-08 jrick branch_name = got_ref_get_name(ref);
2190 24df9a28 2023-07-08 jrick
2191 24df9a28 2023-07-08 jrick if (strncmp("refs/heads/", branch_name, 11) == 0)
2192 24df9a28 2023-07-08 jrick branch_name += 11;
2193 24df9a28 2023-07-08 jrick
2194 24df9a28 2023-07-08 jrick snprintf(msg, sizeof(msg),
2195 24df9a28 2023-07-08 jrick "target commit is not contained in branch '%s'; "
2196 24df9a28 2023-07-08 jrick "the branch to use must be specified with -b; "
2197 24df9a28 2023-07-08 jrick "if necessary a new branch can be created for "
2198 24df9a28 2023-07-08 jrick "this commit with 'got branch -c %s BRANCH_NAME'",
2199 24df9a28 2023-07-08 jrick branch_name, commit_id_str);
2200 24df9a28 2023-07-08 jrick
2201 24df9a28 2023-07-08 jrick return got_error_msg(GOT_ERR_ANCESTRY, msg);
2202 24df9a28 2023-07-08 jrick }
2203 24df9a28 2023-07-08 jrick
2204 24df9a28 2023-07-08 jrick static const struct got_error *
2205 24df9a28 2023-07-08 jrick cmd_checkout(int argc, char *argv[])
2206 24df9a28 2023-07-08 jrick {
2207 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
2208 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
2209 24df9a28 2023-07-08 jrick struct got_reference *head_ref = NULL, *ref = NULL;
2210 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
2211 24df9a28 2023-07-08 jrick char *repo_path = NULL;
2212 24df9a28 2023-07-08 jrick char *worktree_path = NULL;
2213 24df9a28 2023-07-08 jrick const char *path_prefix = "";
2214 24df9a28 2023-07-08 jrick const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2215 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
2216 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
2217 24df9a28 2023-07-08 jrick char *cwd = NULL;
2218 24df9a28 2023-07-08 jrick int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2219 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
2220 24df9a28 2023-07-08 jrick struct got_checkout_progress_arg cpa;
2221 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
2222 24df9a28 2023-07-08 jrick
2223 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
2224 24df9a28 2023-07-08 jrick
2225 24df9a28 2023-07-08 jrick #ifndef PROFILE
2226 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2227 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
2228 24df9a28 2023-07-08 jrick err(1, "pledge");
2229 24df9a28 2023-07-08 jrick #endif
2230 24df9a28 2023-07-08 jrick
2231 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2232 24df9a28 2023-07-08 jrick switch (ch) {
2233 24df9a28 2023-07-08 jrick case 'b':
2234 24df9a28 2023-07-08 jrick branch_name = optarg;
2235 24df9a28 2023-07-08 jrick break;
2236 24df9a28 2023-07-08 jrick case 'c':
2237 24df9a28 2023-07-08 jrick commit_id_str = strdup(optarg);
2238 24df9a28 2023-07-08 jrick if (commit_id_str == NULL)
2239 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
2240 24df9a28 2023-07-08 jrick break;
2241 24df9a28 2023-07-08 jrick case 'E':
2242 24df9a28 2023-07-08 jrick allow_nonempty = 1;
2243 24df9a28 2023-07-08 jrick break;
2244 24df9a28 2023-07-08 jrick case 'p':
2245 24df9a28 2023-07-08 jrick path_prefix = optarg;
2246 24df9a28 2023-07-08 jrick break;
2247 24df9a28 2023-07-08 jrick case 'q':
2248 24df9a28 2023-07-08 jrick verbosity = -1;
2249 24df9a28 2023-07-08 jrick break;
2250 24df9a28 2023-07-08 jrick default:
2251 24df9a28 2023-07-08 jrick usage_checkout();
2252 24df9a28 2023-07-08 jrick /* NOTREACHED */
2253 24df9a28 2023-07-08 jrick }
2254 24df9a28 2023-07-08 jrick }
2255 24df9a28 2023-07-08 jrick
2256 24df9a28 2023-07-08 jrick argc -= optind;
2257 24df9a28 2023-07-08 jrick argv += optind;
2258 24df9a28 2023-07-08 jrick
2259 24df9a28 2023-07-08 jrick if (argc == 1) {
2260 24df9a28 2023-07-08 jrick char *base, *dotgit;
2261 24df9a28 2023-07-08 jrick const char *path;
2262 24df9a28 2023-07-08 jrick repo_path = realpath(argv[0], NULL);
2263 24df9a28 2023-07-08 jrick if (repo_path == NULL)
2264 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath", argv[0]);
2265 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
2266 24df9a28 2023-07-08 jrick if (cwd == NULL) {
2267 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
2268 24df9a28 2023-07-08 jrick goto done;
2269 24df9a28 2023-07-08 jrick }
2270 24df9a28 2023-07-08 jrick if (path_prefix[0])
2271 24df9a28 2023-07-08 jrick path = path_prefix;
2272 24df9a28 2023-07-08 jrick else
2273 24df9a28 2023-07-08 jrick path = repo_path;
2274 24df9a28 2023-07-08 jrick error = got_path_basename(&base, path);
2275 24df9a28 2023-07-08 jrick if (error)
2276 24df9a28 2023-07-08 jrick goto done;
2277 24df9a28 2023-07-08 jrick dotgit = strstr(base, ".git");
2278 24df9a28 2023-07-08 jrick if (dotgit)
2279 24df9a28 2023-07-08 jrick *dotgit = '\0';
2280 24df9a28 2023-07-08 jrick if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2281 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
2282 24df9a28 2023-07-08 jrick free(base);
2283 24df9a28 2023-07-08 jrick goto done;
2284 24df9a28 2023-07-08 jrick }
2285 24df9a28 2023-07-08 jrick free(base);
2286 24df9a28 2023-07-08 jrick } else if (argc == 2) {
2287 24df9a28 2023-07-08 jrick repo_path = realpath(argv[0], NULL);
2288 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
2289 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath", argv[0]);
2290 24df9a28 2023-07-08 jrick goto done;
2291 24df9a28 2023-07-08 jrick }
2292 24df9a28 2023-07-08 jrick worktree_path = realpath(argv[1], NULL);
2293 24df9a28 2023-07-08 jrick if (worktree_path == NULL) {
2294 24df9a28 2023-07-08 jrick if (errno != ENOENT) {
2295 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath",
2296 24df9a28 2023-07-08 jrick argv[1]);
2297 24df9a28 2023-07-08 jrick goto done;
2298 24df9a28 2023-07-08 jrick }
2299 24df9a28 2023-07-08 jrick worktree_path = strdup(argv[1]);
2300 24df9a28 2023-07-08 jrick if (worktree_path == NULL) {
2301 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
2302 24df9a28 2023-07-08 jrick goto done;
2303 24df9a28 2023-07-08 jrick }
2304 24df9a28 2023-07-08 jrick }
2305 24df9a28 2023-07-08 jrick } else
2306 24df9a28 2023-07-08 jrick usage_checkout();
2307 24df9a28 2023-07-08 jrick
2308 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
2309 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(worktree_path);
2310 24df9a28 2023-07-08 jrick
2311 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
2312 24df9a28 2023-07-08 jrick if (error != NULL)
2313 24df9a28 2023-07-08 jrick goto done;
2314 24df9a28 2023-07-08 jrick
2315 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2316 24df9a28 2023-07-08 jrick if (error != NULL)
2317 24df9a28 2023-07-08 jrick goto done;
2318 24df9a28 2023-07-08 jrick
2319 24df9a28 2023-07-08 jrick /* Pre-create work tree path for unveil(2) */
2320 24df9a28 2023-07-08 jrick error = got_path_mkdir(worktree_path);
2321 24df9a28 2023-07-08 jrick if (error) {
2322 24df9a28 2023-07-08 jrick if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2323 24df9a28 2023-07-08 jrick !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2324 24df9a28 2023-07-08 jrick goto done;
2325 24df9a28 2023-07-08 jrick if (!allow_nonempty &&
2326 24df9a28 2023-07-08 jrick !got_path_dir_is_empty(worktree_path)) {
2327 24df9a28 2023-07-08 jrick error = got_error_path(worktree_path,
2328 24df9a28 2023-07-08 jrick GOT_ERR_DIR_NOT_EMPTY);
2329 24df9a28 2023-07-08 jrick goto done;
2330 24df9a28 2023-07-08 jrick }
2331 24df9a28 2023-07-08 jrick }
2332 24df9a28 2023-07-08 jrick
2333 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2334 24df9a28 2023-07-08 jrick if (error)
2335 24df9a28 2023-07-08 jrick goto done;
2336 24df9a28 2023-07-08 jrick
2337 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, branch_name, 0);
2338 24df9a28 2023-07-08 jrick if (error != NULL)
2339 24df9a28 2023-07-08 jrick goto done;
2340 24df9a28 2023-07-08 jrick
2341 24df9a28 2023-07-08 jrick error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2342 24df9a28 2023-07-08 jrick if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2343 24df9a28 2023-07-08 jrick goto done;
2344 24df9a28 2023-07-08 jrick
2345 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, worktree_path);
2346 24df9a28 2023-07-08 jrick if (error != NULL)
2347 24df9a28 2023-07-08 jrick goto done;
2348 24df9a28 2023-07-08 jrick
2349 24df9a28 2023-07-08 jrick error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2350 24df9a28 2023-07-08 jrick path_prefix);
2351 24df9a28 2023-07-08 jrick if (error != NULL)
2352 24df9a28 2023-07-08 jrick goto done;
2353 24df9a28 2023-07-08 jrick if (!same_path_prefix) {
2354 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_PATH_PREFIX);
2355 24df9a28 2023-07-08 jrick goto done;
2356 24df9a28 2023-07-08 jrick }
2357 24df9a28 2023-07-08 jrick
2358 24df9a28 2023-07-08 jrick if (commit_id_str) {
2359 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
2360 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
2361 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2362 24df9a28 2023-07-08 jrick NULL);
2363 24df9a28 2023-07-08 jrick if (error)
2364 24df9a28 2023-07-08 jrick goto done;
2365 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
2366 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2367 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
2368 24df9a28 2023-07-08 jrick if (error)
2369 24df9a28 2023-07-08 jrick goto done;
2370 24df9a28 2023-07-08 jrick error = check_linear_ancestry(commit_id,
2371 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree), 0, repo);
2372 24df9a28 2023-07-08 jrick if (error != NULL) {
2373 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_ANCESTRY) {
2374 24df9a28 2023-07-08 jrick error = checkout_ancestry_error(
2375 24df9a28 2023-07-08 jrick head_ref, commit_id_str);
2376 24df9a28 2023-07-08 jrick }
2377 24df9a28 2023-07-08 jrick goto done;
2378 24df9a28 2023-07-08 jrick }
2379 24df9a28 2023-07-08 jrick error = check_same_branch(commit_id, head_ref, repo);
2380 24df9a28 2023-07-08 jrick if (error) {
2381 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_ANCESTRY) {
2382 24df9a28 2023-07-08 jrick error = checkout_ancestry_error(
2383 24df9a28 2023-07-08 jrick head_ref, commit_id_str);
2384 24df9a28 2023-07-08 jrick }
2385 24df9a28 2023-07-08 jrick goto done;
2386 24df9a28 2023-07-08 jrick }
2387 24df9a28 2023-07-08 jrick error = got_worktree_set_base_commit_id(worktree, repo,
2388 24df9a28 2023-07-08 jrick commit_id);
2389 24df9a28 2023-07-08 jrick if (error)
2390 24df9a28 2023-07-08 jrick goto done;
2391 24df9a28 2023-07-08 jrick /* Expand potentially abbreviated commit ID string. */
2392 24df9a28 2023-07-08 jrick free(commit_id_str);
2393 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2394 24df9a28 2023-07-08 jrick if (error)
2395 24df9a28 2023-07-08 jrick goto done;
2396 24df9a28 2023-07-08 jrick } else {
2397 24df9a28 2023-07-08 jrick commit_id = got_object_id_dup(
2398 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree));
2399 24df9a28 2023-07-08 jrick if (commit_id == NULL) {
2400 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_object_id_dup");
2401 24df9a28 2023-07-08 jrick goto done;
2402 24df9a28 2023-07-08 jrick }
2403 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2404 24df9a28 2023-07-08 jrick if (error)
2405 24df9a28 2023-07-08 jrick goto done;
2406 24df9a28 2023-07-08 jrick }
2407 24df9a28 2023-07-08 jrick
2408 24df9a28 2023-07-08 jrick error = got_pathlist_append(&paths, "", NULL);
2409 24df9a28 2023-07-08 jrick if (error)
2410 24df9a28 2023-07-08 jrick goto done;
2411 24df9a28 2023-07-08 jrick cpa.worktree_path = worktree_path;
2412 24df9a28 2023-07-08 jrick cpa.had_base_commit_ref_error = 0;
2413 24df9a28 2023-07-08 jrick cpa.verbosity = verbosity;
2414 24df9a28 2023-07-08 jrick error = got_worktree_checkout_files(worktree, &paths, repo,
2415 24df9a28 2023-07-08 jrick checkout_progress, &cpa, check_cancelled, NULL);
2416 24df9a28 2023-07-08 jrick if (error != NULL)
2417 24df9a28 2023-07-08 jrick goto done;
2418 24df9a28 2023-07-08 jrick
2419 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(head_ref)) {
2420 24df9a28 2023-07-08 jrick error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2421 24df9a28 2023-07-08 jrick if (error)
2422 24df9a28 2023-07-08 jrick goto done;
2423 24df9a28 2023-07-08 jrick refname = got_ref_get_name(ref);
2424 24df9a28 2023-07-08 jrick } else
2425 24df9a28 2023-07-08 jrick refname = got_ref_get_name(head_ref);
2426 24df9a28 2023-07-08 jrick printf("Checked out %s: %s\n", refname, commit_id_str);
2427 24df9a28 2023-07-08 jrick printf("Now shut up and hack\n");
2428 24df9a28 2023-07-08 jrick if (cpa.had_base_commit_ref_error)
2429 24df9a28 2023-07-08 jrick show_worktree_base_ref_warning();
2430 24df9a28 2023-07-08 jrick done:
2431 24df9a28 2023-07-08 jrick if (pack_fds) {
2432 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
2433 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
2434 24df9a28 2023-07-08 jrick if (error == NULL)
2435 24df9a28 2023-07-08 jrick error = pack_err;
2436 24df9a28 2023-07-08 jrick }
2437 24df9a28 2023-07-08 jrick if (head_ref)
2438 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
2439 24df9a28 2023-07-08 jrick if (ref)
2440 24df9a28 2023-07-08 jrick got_ref_close(ref);
2441 24df9a28 2023-07-08 jrick if (repo) {
2442 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
2443 24df9a28 2023-07-08 jrick if (error == NULL)
2444 24df9a28 2023-07-08 jrick error = close_err;
2445 24df9a28 2023-07-08 jrick }
2446 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2447 24df9a28 2023-07-08 jrick free(commit_id_str);
2448 24df9a28 2023-07-08 jrick free(commit_id);
2449 24df9a28 2023-07-08 jrick free(repo_path);
2450 24df9a28 2023-07-08 jrick free(worktree_path);
2451 24df9a28 2023-07-08 jrick free(cwd);
2452 24df9a28 2023-07-08 jrick return error;
2453 24df9a28 2023-07-08 jrick }
2454 24df9a28 2023-07-08 jrick
2455 24df9a28 2023-07-08 jrick struct got_update_progress_arg {
2456 24df9a28 2023-07-08 jrick int did_something;
2457 24df9a28 2023-07-08 jrick int conflicts;
2458 24df9a28 2023-07-08 jrick int obstructed;
2459 24df9a28 2023-07-08 jrick int not_updated;
2460 24df9a28 2023-07-08 jrick int missing;
2461 24df9a28 2023-07-08 jrick int not_deleted;
2462 24df9a28 2023-07-08 jrick int unversioned;
2463 24df9a28 2023-07-08 jrick int verbosity;
2464 24df9a28 2023-07-08 jrick };
2465 24df9a28 2023-07-08 jrick
2466 24df9a28 2023-07-08 jrick static void
2467 24df9a28 2023-07-08 jrick print_update_progress_stats(struct got_update_progress_arg *upa)
2468 24df9a28 2023-07-08 jrick {
2469 24df9a28 2023-07-08 jrick if (!upa->did_something)
2470 24df9a28 2023-07-08 jrick return;
2471 24df9a28 2023-07-08 jrick
2472 24df9a28 2023-07-08 jrick if (upa->conflicts > 0)
2473 24df9a28 2023-07-08 jrick printf("Files with new merge conflicts: %d\n", upa->conflicts);
2474 24df9a28 2023-07-08 jrick if (upa->obstructed > 0)
2475 24df9a28 2023-07-08 jrick printf("File paths obstructed by a non-regular file: %d\n",
2476 24df9a28 2023-07-08 jrick upa->obstructed);
2477 24df9a28 2023-07-08 jrick if (upa->not_updated > 0)
2478 24df9a28 2023-07-08 jrick printf("Files not updated because of existing merge "
2479 24df9a28 2023-07-08 jrick "conflicts: %d\n", upa->not_updated);
2480 24df9a28 2023-07-08 jrick }
2481 24df9a28 2023-07-08 jrick
2482 24df9a28 2023-07-08 jrick /*
2483 24df9a28 2023-07-08 jrick * The meaning of some status codes differs between merge-style operations and
2484 24df9a28 2023-07-08 jrick * update operations. For example, the ! status code means "file was missing"
2485 24df9a28 2023-07-08 jrick * if changes were merged into the work tree, and "missing file was restored"
2486 24df9a28 2023-07-08 jrick * if the work tree was updated. This function should be used by any operation
2487 24df9a28 2023-07-08 jrick * which merges changes into the work tree without updating the work tree.
2488 24df9a28 2023-07-08 jrick */
2489 24df9a28 2023-07-08 jrick static void
2490 24df9a28 2023-07-08 jrick print_merge_progress_stats(struct got_update_progress_arg *upa)
2491 24df9a28 2023-07-08 jrick {
2492 24df9a28 2023-07-08 jrick if (!upa->did_something)
2493 24df9a28 2023-07-08 jrick return;
2494 24df9a28 2023-07-08 jrick
2495 24df9a28 2023-07-08 jrick if (upa->conflicts > 0)
2496 24df9a28 2023-07-08 jrick printf("Files with new merge conflicts: %d\n", upa->conflicts);
2497 24df9a28 2023-07-08 jrick if (upa->obstructed > 0)
2498 24df9a28 2023-07-08 jrick printf("File paths obstructed by a non-regular file: %d\n",
2499 24df9a28 2023-07-08 jrick upa->obstructed);
2500 24df9a28 2023-07-08 jrick if (upa->missing > 0)
2501 24df9a28 2023-07-08 jrick printf("Files which had incoming changes but could not be "
2502 24df9a28 2023-07-08 jrick "found in the work tree: %d\n", upa->missing);
2503 24df9a28 2023-07-08 jrick if (upa->not_deleted > 0)
2504 24df9a28 2023-07-08 jrick printf("Files not deleted due to differences in deleted "
2505 24df9a28 2023-07-08 jrick "content: %d\n", upa->not_deleted);
2506 24df9a28 2023-07-08 jrick if (upa->unversioned > 0)
2507 24df9a28 2023-07-08 jrick printf("Files not merged because an unversioned file was "
2508 24df9a28 2023-07-08 jrick "found in the work tree: %d\n", upa->unversioned);
2509 24df9a28 2023-07-08 jrick }
2510 24df9a28 2023-07-08 jrick
2511 24df9a28 2023-07-08 jrick __dead static void
2512 24df9a28 2023-07-08 jrick usage_update(void)
2513 24df9a28 2023-07-08 jrick {
2514 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2515 24df9a28 2023-07-08 jrick "[path ...]\n", getprogname());
2516 24df9a28 2023-07-08 jrick exit(1);
2517 24df9a28 2023-07-08 jrick }
2518 24df9a28 2023-07-08 jrick
2519 24df9a28 2023-07-08 jrick static const struct got_error *
2520 24df9a28 2023-07-08 jrick update_progress(void *arg, unsigned char status, const char *path)
2521 24df9a28 2023-07-08 jrick {
2522 24df9a28 2023-07-08 jrick struct got_update_progress_arg *upa = arg;
2523 24df9a28 2023-07-08 jrick
2524 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_EXISTS ||
2525 24df9a28 2023-07-08 jrick status == GOT_STATUS_BASE_REF_ERR)
2526 24df9a28 2023-07-08 jrick return NULL;
2527 24df9a28 2023-07-08 jrick
2528 24df9a28 2023-07-08 jrick upa->did_something = 1;
2529 24df9a28 2023-07-08 jrick
2530 24df9a28 2023-07-08 jrick /* Base commit bump happens silently. */
2531 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_BUMP_BASE)
2532 24df9a28 2023-07-08 jrick return NULL;
2533 24df9a28 2023-07-08 jrick
2534 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CONFLICT)
2535 24df9a28 2023-07-08 jrick upa->conflicts++;
2536 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_OBSTRUCTED)
2537 24df9a28 2023-07-08 jrick upa->obstructed++;
2538 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CANNOT_UPDATE)
2539 24df9a28 2023-07-08 jrick upa->not_updated++;
2540 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_MISSING)
2541 24df9a28 2023-07-08 jrick upa->missing++;
2542 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CANNOT_DELETE)
2543 24df9a28 2023-07-08 jrick upa->not_deleted++;
2544 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_UNVERSIONED)
2545 24df9a28 2023-07-08 jrick upa->unversioned++;
2546 24df9a28 2023-07-08 jrick
2547 24df9a28 2023-07-08 jrick while (path[0] == '/')
2548 24df9a28 2023-07-08 jrick path++;
2549 24df9a28 2023-07-08 jrick if (upa->verbosity >= 0)
2550 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
2551 24df9a28 2023-07-08 jrick
2552 24df9a28 2023-07-08 jrick return NULL;
2553 24df9a28 2023-07-08 jrick }
2554 24df9a28 2023-07-08 jrick
2555 24df9a28 2023-07-08 jrick static const struct got_error *
2556 24df9a28 2023-07-08 jrick check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2557 24df9a28 2023-07-08 jrick {
2558 24df9a28 2023-07-08 jrick const struct got_error *err;
2559 24df9a28 2023-07-08 jrick int in_progress;
2560 24df9a28 2023-07-08 jrick
2561 24df9a28 2023-07-08 jrick err = got_worktree_rebase_in_progress(&in_progress, worktree);
2562 24df9a28 2023-07-08 jrick if (err)
2563 24df9a28 2023-07-08 jrick return err;
2564 24df9a28 2023-07-08 jrick if (in_progress)
2565 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_REBASING);
2566 24df9a28 2023-07-08 jrick
2567 24df9a28 2023-07-08 jrick err = got_worktree_histedit_in_progress(&in_progress, worktree);
2568 24df9a28 2023-07-08 jrick if (err)
2569 24df9a28 2023-07-08 jrick return err;
2570 24df9a28 2023-07-08 jrick if (in_progress)
2571 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_HISTEDIT_BUSY);
2572 24df9a28 2023-07-08 jrick
2573 24df9a28 2023-07-08 jrick return NULL;
2574 24df9a28 2023-07-08 jrick }
2575 24df9a28 2023-07-08 jrick
2576 24df9a28 2023-07-08 jrick static const struct got_error *
2577 24df9a28 2023-07-08 jrick check_merge_in_progress(struct got_worktree *worktree,
2578 24df9a28 2023-07-08 jrick struct got_repository *repo)
2579 24df9a28 2023-07-08 jrick {
2580 24df9a28 2023-07-08 jrick const struct got_error *err;
2581 24df9a28 2023-07-08 jrick int in_progress;
2582 24df9a28 2023-07-08 jrick
2583 24df9a28 2023-07-08 jrick err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2584 24df9a28 2023-07-08 jrick if (err)
2585 24df9a28 2023-07-08 jrick return err;
2586 24df9a28 2023-07-08 jrick if (in_progress)
2587 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_MERGE_BUSY);
2588 24df9a28 2023-07-08 jrick
2589 24df9a28 2023-07-08 jrick return NULL;
2590 24df9a28 2023-07-08 jrick }
2591 24df9a28 2023-07-08 jrick
2592 24df9a28 2023-07-08 jrick static const struct got_error *
2593 24df9a28 2023-07-08 jrick get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2594 24df9a28 2023-07-08 jrick char *argv[], struct got_worktree *worktree)
2595 24df9a28 2023-07-08 jrick {
2596 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2597 24df9a28 2023-07-08 jrick char *path;
2598 24df9a28 2023-07-08 jrick struct got_pathlist_entry *new;
2599 24df9a28 2023-07-08 jrick int i;
2600 24df9a28 2023-07-08 jrick
2601 24df9a28 2023-07-08 jrick if (argc == 0) {
2602 24df9a28 2023-07-08 jrick path = strdup("");
2603 24df9a28 2023-07-08 jrick if (path == NULL)
2604 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
2605 24df9a28 2023-07-08 jrick return got_pathlist_append(paths, path, NULL);
2606 24df9a28 2023-07-08 jrick }
2607 24df9a28 2023-07-08 jrick
2608 24df9a28 2023-07-08 jrick for (i = 0; i < argc; i++) {
2609 24df9a28 2023-07-08 jrick err = got_worktree_resolve_path(&path, worktree, argv[i]);
2610 24df9a28 2023-07-08 jrick if (err)
2611 24df9a28 2023-07-08 jrick break;
2612 24df9a28 2023-07-08 jrick err = got_pathlist_insert(&new, paths, path, NULL);
2613 24df9a28 2023-07-08 jrick if (err || new == NULL /* duplicate */) {
2614 24df9a28 2023-07-08 jrick free(path);
2615 24df9a28 2023-07-08 jrick if (err)
2616 24df9a28 2023-07-08 jrick break;
2617 24df9a28 2023-07-08 jrick }
2618 24df9a28 2023-07-08 jrick }
2619 24df9a28 2023-07-08 jrick
2620 24df9a28 2023-07-08 jrick return err;
2621 24df9a28 2023-07-08 jrick }
2622 24df9a28 2023-07-08 jrick
2623 24df9a28 2023-07-08 jrick static const struct got_error *
2624 24df9a28 2023-07-08 jrick wrap_not_worktree_error(const struct got_error *orig_err,
2625 24df9a28 2023-07-08 jrick const char *cmdname, const char *path)
2626 24df9a28 2023-07-08 jrick {
2627 24df9a28 2023-07-08 jrick const struct got_error *err;
2628 24df9a28 2023-07-08 jrick struct got_repository *repo;
2629 24df9a28 2023-07-08 jrick static char msg[512];
2630 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
2631 24df9a28 2023-07-08 jrick
2632 24df9a28 2023-07-08 jrick err = got_repo_pack_fds_open(&pack_fds);
2633 24df9a28 2023-07-08 jrick if (err)
2634 24df9a28 2023-07-08 jrick return err;
2635 24df9a28 2023-07-08 jrick
2636 24df9a28 2023-07-08 jrick err = got_repo_open(&repo, path, NULL, pack_fds);
2637 24df9a28 2023-07-08 jrick if (err)
2638 24df9a28 2023-07-08 jrick return orig_err;
2639 24df9a28 2023-07-08 jrick
2640 24df9a28 2023-07-08 jrick snprintf(msg, sizeof(msg),
2641 24df9a28 2023-07-08 jrick "'got %s' needs a work tree in addition to a git repository\n"
2642 24df9a28 2023-07-08 jrick "Work trees can be checked out from this Git repository with "
2643 24df9a28 2023-07-08 jrick "'got checkout'.\n"
2644 24df9a28 2023-07-08 jrick "The got(1) manual page contains more information.", cmdname);
2645 24df9a28 2023-07-08 jrick err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2646 24df9a28 2023-07-08 jrick if (repo) {
2647 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
2648 24df9a28 2023-07-08 jrick if (err == NULL)
2649 24df9a28 2023-07-08 jrick err = close_err;
2650 24df9a28 2023-07-08 jrick }
2651 24df9a28 2023-07-08 jrick if (pack_fds) {
2652 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
2653 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
2654 24df9a28 2023-07-08 jrick if (err == NULL)
2655 24df9a28 2023-07-08 jrick err = pack_err;
2656 24df9a28 2023-07-08 jrick }
2657 24df9a28 2023-07-08 jrick return err;
2658 24df9a28 2023-07-08 jrick }
2659 24df9a28 2023-07-08 jrick
2660 24df9a28 2023-07-08 jrick static const struct got_error *
2661 24df9a28 2023-07-08 jrick cmd_update(int argc, char *argv[])
2662 24df9a28 2023-07-08 jrick {
2663 24df9a28 2023-07-08 jrick const struct got_error *error = NULL, *unlock_err;
2664 24df9a28 2023-07-08 jrick char *worktree_path = NULL;
2665 24df9a28 2023-07-08 jrick const char *repo_path = NULL;
2666 24df9a28 2023-07-08 jrick const char *remote_name = NULL;
2667 24df9a28 2023-07-08 jrick char *proto = NULL, *host = NULL, *port = NULL;
2668 24df9a28 2023-07-08 jrick char *repo_name = NULL, *server_path = NULL;
2669 24df9a28 2023-07-08 jrick const struct got_remote_repo *remotes, *remote = NULL;
2670 24df9a28 2023-07-08 jrick int nremotes;
2671 24df9a28 2023-07-08 jrick char *id_str = NULL;
2672 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
2673 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
2674 24df9a28 2023-07-08 jrick const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2675 24df9a28 2023-07-08 jrick struct got_pathlist_head paths, refs, symrefs;
2676 24df9a28 2023-07-08 jrick struct got_pathlist_head wanted_branches, wanted_refs;
2677 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
2678 24df9a28 2023-07-08 jrick struct got_reflist_head remote_refs;
2679 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
2680 24df9a28 2023-07-08 jrick struct got_object_id *pack_hash = NULL;
2681 24df9a28 2023-07-08 jrick int i, ch, fetchfd = -1, fetchstatus;
2682 24df9a28 2023-07-08 jrick pid_t fetchpid = -1;
2683 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg fpa;
2684 24df9a28 2023-07-08 jrick struct got_update_progress_arg upa;
2685 24df9a28 2023-07-08 jrick int verbosity = 0;
2686 24df9a28 2023-07-08 jrick int delete_remote = 0;
2687 24df9a28 2023-07-08 jrick int replace_tags = 0;
2688 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
2689 24df9a28 2023-07-08 jrick const char *remote_head = NULL, *worktree_branch = NULL;
2690 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
2691 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
2692 24df9a28 2023-07-08 jrick const char *refname;
2693 24df9a28 2023-07-08 jrick struct got_reference *head_ref = NULL;
2694 24df9a28 2023-07-08 jrick
2695 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
2696 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
2697 24df9a28 2023-07-08 jrick TAILQ_INIT(&symrefs);
2698 24df9a28 2023-07-08 jrick TAILQ_INIT(&remote_refs);
2699 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_branches);
2700 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_refs);
2701 24df9a28 2023-07-08 jrick
2702 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2703 24df9a28 2023-07-08 jrick switch (ch) {
2704 24df9a28 2023-07-08 jrick case 'c':
2705 24df9a28 2023-07-08 jrick commit_id_str = strdup(optarg);
2706 24df9a28 2023-07-08 jrick if (commit_id_str == NULL)
2707 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
2708 24df9a28 2023-07-08 jrick break;
2709 24df9a28 2023-07-08 jrick case 't':
2710 24df9a28 2023-07-08 jrick replace_tags = 1;
2711 24df9a28 2023-07-08 jrick break;
2712 24df9a28 2023-07-08 jrick case 'q':
2713 24df9a28 2023-07-08 jrick verbosity = -1;
2714 24df9a28 2023-07-08 jrick break;
2715 24df9a28 2023-07-08 jrick case 'r':
2716 24df9a28 2023-07-08 jrick remote_name = optarg;
2717 24df9a28 2023-07-08 jrick break;
2718 24df9a28 2023-07-08 jrick case 'v':
2719 24df9a28 2023-07-08 jrick if (verbosity < 0)
2720 24df9a28 2023-07-08 jrick verbosity = 0;
2721 24df9a28 2023-07-08 jrick else if (verbosity < 3)
2722 24df9a28 2023-07-08 jrick verbosity++;
2723 24df9a28 2023-07-08 jrick break;
2724 24df9a28 2023-07-08 jrick case 'X':
2725 24df9a28 2023-07-08 jrick delete_remote = 1;
2726 24df9a28 2023-07-08 jrick break;
2727 24df9a28 2023-07-08 jrick default:
2728 24df9a28 2023-07-08 jrick usage_update();
2729 24df9a28 2023-07-08 jrick break;
2730 24df9a28 2023-07-08 jrick }
2731 24df9a28 2023-07-08 jrick }
2732 24df9a28 2023-07-08 jrick argc -= optind;
2733 24df9a28 2023-07-08 jrick argv += optind;
2734 24df9a28 2023-07-08 jrick
2735 24df9a28 2023-07-08 jrick if (delete_remote) {
2736 24df9a28 2023-07-08 jrick if (replace_tags)
2737 24df9a28 2023-07-08 jrick option_conflict('X', 't');
2738 24df9a28 2023-07-08 jrick if (remote_name == NULL)
2739 24df9a28 2023-07-08 jrick errx(1, "-X option requires a remote name");
2740 24df9a28 2023-07-08 jrick }
2741 24df9a28 2023-07-08 jrick if (remote_name == NULL)
2742 24df9a28 2023-07-08 jrick remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2743 24df9a28 2023-07-08 jrick
2744 24df9a28 2023-07-08 jrick worktree_path = getcwd(NULL, 0);
2745 24df9a28 2023-07-08 jrick if (worktree_path == NULL) {
2746 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
2747 24df9a28 2023-07-08 jrick goto done;
2748 24df9a28 2023-07-08 jrick }
2749 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, worktree_path);
2750 24df9a28 2023-07-08 jrick if (error) {
2751 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
2752 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "update",
2753 24df9a28 2023-07-08 jrick worktree_path);
2754 24df9a28 2023-07-08 jrick goto done;
2755 24df9a28 2023-07-08 jrick }
2756 24df9a28 2023-07-08 jrick repo_path = got_worktree_get_repo_path(worktree);
2757 24df9a28 2023-07-08 jrick
2758 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
2759 24df9a28 2023-07-08 jrick if (error != NULL)
2760 24df9a28 2023-07-08 jrick goto done;
2761 24df9a28 2023-07-08 jrick
2762 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2763 24df9a28 2023-07-08 jrick if (error)
2764 24df9a28 2023-07-08 jrick goto done;
2765 24df9a28 2023-07-08 jrick
2766 24df9a28 2023-07-08 jrick error = check_rebase_or_histedit_in_progress(worktree);
2767 24df9a28 2023-07-08 jrick if (error)
2768 24df9a28 2023-07-08 jrick goto done;
2769 24df9a28 2023-07-08 jrick error = check_merge_in_progress(worktree, repo);
2770 24df9a28 2023-07-08 jrick if (error)
2771 24df9a28 2023-07-08 jrick goto done;
2772 24df9a28 2023-07-08 jrick
2773 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2774 24df9a28 2023-07-08 jrick if (error)
2775 24df9a28 2023-07-08 jrick goto done;
2776 24df9a28 2023-07-08 jrick
2777 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
2778 24df9a28 2023-07-08 jrick if (worktree_conf) {
2779 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
2780 24df9a28 2023-07-08 jrick worktree_conf);
2781 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
2782 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
2783 24df9a28 2023-07-08 jrick remote = &remotes[i];
2784 24df9a28 2023-07-08 jrick break;
2785 24df9a28 2023-07-08 jrick }
2786 24df9a28 2023-07-08 jrick }
2787 24df9a28 2023-07-08 jrick }
2788 24df9a28 2023-07-08 jrick
2789 24df9a28 2023-07-08 jrick if (remote == NULL) {
2790 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
2791 24df9a28 2023-07-08 jrick if (repo_conf) {
2792 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
2793 24df9a28 2023-07-08 jrick repo_conf);
2794 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
2795 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
2796 24df9a28 2023-07-08 jrick remote = &remotes[i];
2797 24df9a28 2023-07-08 jrick break;
2798 24df9a28 2023-07-08 jrick }
2799 24df9a28 2023-07-08 jrick }
2800 24df9a28 2023-07-08 jrick }
2801 24df9a28 2023-07-08 jrick }
2802 24df9a28 2023-07-08 jrick if (remote == NULL) {
2803 24df9a28 2023-07-08 jrick got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2804 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
2805 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
2806 24df9a28 2023-07-08 jrick remote = &remotes[i];
2807 24df9a28 2023-07-08 jrick break;
2808 24df9a28 2023-07-08 jrick }
2809 24df9a28 2023-07-08 jrick }
2810 24df9a28 2023-07-08 jrick }
2811 24df9a28 2023-07-08 jrick if (remote == NULL) {
2812 24df9a28 2023-07-08 jrick error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2813 24df9a28 2023-07-08 jrick goto done;
2814 24df9a28 2023-07-08 jrick }
2815 24df9a28 2023-07-08 jrick
2816 24df9a28 2023-07-08 jrick error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2817 24df9a28 2023-07-08 jrick &repo_name, remote->fetch_url);
2818 24df9a28 2023-07-08 jrick if (error)
2819 24df9a28 2023-07-08 jrick goto done;
2820 24df9a28 2023-07-08 jrick
2821 24df9a28 2023-07-08 jrick if (strcmp(proto, "git") == 0) {
2822 24df9a28 2023-07-08 jrick #ifndef PROFILE
2823 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2824 24df9a28 2023-07-08 jrick "sendfd dns inet unveil", NULL) == -1)
2825 24df9a28 2023-07-08 jrick err(1, "pledge");
2826 24df9a28 2023-07-08 jrick #endif
2827 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "git+ssh") == 0 ||
2828 24df9a28 2023-07-08 jrick strcmp(proto, "ssh") == 0) {
2829 24df9a28 2023-07-08 jrick #ifndef PROFILE
2830 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2831 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
2832 24df9a28 2023-07-08 jrick err(1, "pledge");
2833 24df9a28 2023-07-08 jrick #endif
2834 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "http") == 0 ||
2835 24df9a28 2023-07-08 jrick strcmp(proto, "git+http") == 0) {
2836 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2837 24df9a28 2023-07-08 jrick goto done;
2838 24df9a28 2023-07-08 jrick } else {
2839 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2840 24df9a28 2023-07-08 jrick goto done;
2841 24df9a28 2023-07-08 jrick }
2842 24df9a28 2023-07-08 jrick
2843 24df9a28 2023-07-08 jrick error = got_dial_apply_unveil(proto);
2844 24df9a28 2023-07-08 jrick if (error)
2845 24df9a28 2023-07-08 jrick goto done;
2846 24df9a28 2023-07-08 jrick
2847 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
2848 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
2849 24df9a28 2023-07-08 jrick if (error)
2850 24df9a28 2023-07-08 jrick goto done;
2851 24df9a28 2023-07-08 jrick
2852 24df9a28 2023-07-08 jrick if (verbosity >= 0) {
2853 24df9a28 2023-07-08 jrick printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2854 24df9a28 2023-07-08 jrick remote->name, proto, host,
2855 24df9a28 2023-07-08 jrick port ? ":" : "", port ? port : "",
2856 24df9a28 2023-07-08 jrick *server_path == '/' ? "" : "/", server_path);
2857 24df9a28 2023-07-08 jrick }
2858 24df9a28 2023-07-08 jrick
2859 24df9a28 2023-07-08 jrick error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2860 24df9a28 2023-07-08 jrick server_path, verbosity);
2861 24df9a28 2023-07-08 jrick if (error)
2862 24df9a28 2023-07-08 jrick goto done;
2863 24df9a28 2023-07-08 jrick
2864 24df9a28 2023-07-08 jrick /*
2865 24df9a28 2023-07-08 jrick * If set, get this remote's HEAD ref target so
2866 24df9a28 2023-07-08 jrick * if it has changed on the server we can fetch it.
2867 24df9a28 2023-07-08 jrick */
2868 24df9a28 2023-07-08 jrick error = got_ref_list(&remote_refs, repo, "refs/remotes",
2869 24df9a28 2023-07-08 jrick got_ref_cmp_by_name, repo);
2870 24df9a28 2023-07-08 jrick if (error)
2871 24df9a28 2023-07-08 jrick goto done;
2872 24df9a28 2023-07-08 jrick
2873 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &remote_refs, entry) {
2874 24df9a28 2023-07-08 jrick const char *remote_refname, *remote_target;
2875 24df9a28 2023-07-08 jrick size_t remote_name_len;
2876 24df9a28 2023-07-08 jrick
2877 24df9a28 2023-07-08 jrick if (!got_ref_is_symbolic(re->ref))
2878 24df9a28 2023-07-08 jrick continue;
2879 24df9a28 2023-07-08 jrick
2880 24df9a28 2023-07-08 jrick remote_name_len = strlen(remote->name);
2881 24df9a28 2023-07-08 jrick remote_refname = got_ref_get_name(re->ref);
2882 24df9a28 2023-07-08 jrick
2883 24df9a28 2023-07-08 jrick /* we only want refs/remotes/$remote->name/HEAD */
2884 24df9a28 2023-07-08 jrick if (strncmp(remote_refname + 13, remote->name,
2885 24df9a28 2023-07-08 jrick remote_name_len) != 0)
2886 24df9a28 2023-07-08 jrick continue;
2887 24df9a28 2023-07-08 jrick
2888 24df9a28 2023-07-08 jrick if (strcmp(remote_refname + remote_name_len + 14,
2889 24df9a28 2023-07-08 jrick GOT_REF_HEAD) != 0)
2890 24df9a28 2023-07-08 jrick continue;
2891 24df9a28 2023-07-08 jrick
2892 24df9a28 2023-07-08 jrick /*
2893 24df9a28 2023-07-08 jrick * Take the name itself because we already
2894 24df9a28 2023-07-08 jrick * only match with refs/heads/ in fetch_pack().
2895 24df9a28 2023-07-08 jrick */
2896 24df9a28 2023-07-08 jrick remote_target = got_ref_get_symref_target(re->ref);
2897 24df9a28 2023-07-08 jrick remote_head = remote_target + remote_name_len + 14;
2898 24df9a28 2023-07-08 jrick break;
2899 24df9a28 2023-07-08 jrick }
2900 24df9a28 2023-07-08 jrick
2901 24df9a28 2023-07-08 jrick refname = got_worktree_get_head_ref_name(worktree);
2902 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/heads/", 11) == 0)
2903 24df9a28 2023-07-08 jrick worktree_branch = refname;
2904 24df9a28 2023-07-08 jrick
2905 24df9a28 2023-07-08 jrick fpa.last_scaled_size[0] = '\0';
2906 24df9a28 2023-07-08 jrick fpa.last_p_indexed = -1;
2907 24df9a28 2023-07-08 jrick fpa.last_p_resolved = -1;
2908 24df9a28 2023-07-08 jrick fpa.verbosity = verbosity;
2909 24df9a28 2023-07-08 jrick fpa.repo = repo;
2910 24df9a28 2023-07-08 jrick fpa.create_configs = 0;
2911 24df9a28 2023-07-08 jrick fpa.configs_created = 0;
2912 24df9a28 2023-07-08 jrick memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2913 24df9a28 2023-07-08 jrick
2914 24df9a28 2023-07-08 jrick error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2915 24df9a28 2023-07-08 jrick remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2916 24df9a28 2023-07-08 jrick 0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2917 24df9a28 2023-07-08 jrick 0, fetch_progress, &fpa);
2918 24df9a28 2023-07-08 jrick if (error)
2919 24df9a28 2023-07-08 jrick goto done;
2920 24df9a28 2023-07-08 jrick
2921 24df9a28 2023-07-08 jrick if (pack_hash != NULL && verbosity >= 0) {
2922 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, pack_hash);
2923 24df9a28 2023-07-08 jrick if (error)
2924 24df9a28 2023-07-08 jrick goto done;
2925 24df9a28 2023-07-08 jrick printf("\nFetched %s.pack\n", id_str);
2926 24df9a28 2023-07-08 jrick free(id_str);
2927 24df9a28 2023-07-08 jrick id_str = NULL;
2928 24df9a28 2023-07-08 jrick }
2929 24df9a28 2023-07-08 jrick
2930 24df9a28 2023-07-08 jrick /* Update references provided with the pack file. */
2931 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &refs, entry) {
2932 24df9a28 2023-07-08 jrick const char *refname = pe->path;
2933 24df9a28 2023-07-08 jrick struct got_object_id *id = pe->data;
2934 24df9a28 2023-07-08 jrick struct got_reference *ref;
2935 24df9a28 2023-07-08 jrick
2936 24df9a28 2023-07-08 jrick if (is_wanted_ref(&wanted_refs, refname)) {
2937 24df9a28 2023-07-08 jrick error = update_wanted_ref(refname, id,
2938 24df9a28 2023-07-08 jrick remote->name, verbosity, repo);
2939 24df9a28 2023-07-08 jrick if (error)
2940 24df9a28 2023-07-08 jrick goto done;
2941 24df9a28 2023-07-08 jrick continue;
2942 24df9a28 2023-07-08 jrick }
2943 24df9a28 2023-07-08 jrick
2944 24df9a28 2023-07-08 jrick error = got_ref_open(&ref, repo, refname, 1);
2945 24df9a28 2023-07-08 jrick if (error) {
2946 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF)
2947 24df9a28 2023-07-08 jrick goto done;
2948 24df9a28 2023-07-08 jrick error = create_ref(refname, id, verbosity,
2949 24df9a28 2023-07-08 jrick repo);
2950 24df9a28 2023-07-08 jrick if (error)
2951 24df9a28 2023-07-08 jrick goto done;
2952 24df9a28 2023-07-08 jrick } else {
2953 24df9a28 2023-07-08 jrick error = update_ref(ref, id, replace_tags,
2954 24df9a28 2023-07-08 jrick verbosity-1, repo);
2955 24df9a28 2023-07-08 jrick unlock_err = got_ref_unlock(ref);
2956 24df9a28 2023-07-08 jrick if (unlock_err && error == NULL)
2957 24df9a28 2023-07-08 jrick error = unlock_err;
2958 24df9a28 2023-07-08 jrick got_ref_close(ref);
2959 24df9a28 2023-07-08 jrick if (error)
2960 24df9a28 2023-07-08 jrick goto done;
2961 24df9a28 2023-07-08 jrick }
2962 24df9a28 2023-07-08 jrick }
2963 24df9a28 2023-07-08 jrick
2964 24df9a28 2023-07-08 jrick /* Update worktree */
2965 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo,
2966 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree), 0);
2967 24df9a28 2023-07-08 jrick if (error != NULL)
2968 24df9a28 2023-07-08 jrick goto done;
2969 24df9a28 2023-07-08 jrick if (commit_id_str == NULL) {
2970 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
2971 24df9a28 2023-07-08 jrick if (error != NULL)
2972 24df9a28 2023-07-08 jrick goto done;
2973 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2974 24df9a28 2023-07-08 jrick if (error != NULL)
2975 24df9a28 2023-07-08 jrick goto done;
2976 24df9a28 2023-07-08 jrick } else {
2977 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
2978 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
2979 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2980 24df9a28 2023-07-08 jrick NULL);
2981 24df9a28 2023-07-08 jrick if (error)
2982 24df9a28 2023-07-08 jrick goto done;
2983 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
2984 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2985 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
2986 24df9a28 2023-07-08 jrick free(commit_id_str);
2987 24df9a28 2023-07-08 jrick commit_id_str = NULL;
2988 24df9a28 2023-07-08 jrick if (error)
2989 24df9a28 2023-07-08 jrick goto done;
2990 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2991 24df9a28 2023-07-08 jrick if (error)
2992 24df9a28 2023-07-08 jrick goto done;
2993 24df9a28 2023-07-08 jrick }
2994 24df9a28 2023-07-08 jrick
2995 24df9a28 2023-07-08 jrick
2996 24df9a28 2023-07-08 jrick error = check_linear_ancestry(commit_id,
2997 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree), 0, repo);
2998 24df9a28 2023-07-08 jrick if (error != NULL) {
2999 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_ANCESTRY)
3000 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_BRANCH_MOVED);
3001 24df9a28 2023-07-08 jrick goto done;
3002 24df9a28 2023-07-08 jrick }
3003 24df9a28 2023-07-08 jrick error = check_same_branch(commit_id, head_ref, repo);
3004 24df9a28 2023-07-08 jrick if (error)
3005 24df9a28 2023-07-08 jrick goto done;
3006 24df9a28 2023-07-08 jrick
3007 24df9a28 2023-07-08 jrick if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3008 24df9a28 2023-07-08 jrick commit_id) != 0) {
3009 24df9a28 2023-07-08 jrick error = got_worktree_set_base_commit_id(worktree, repo,
3010 24df9a28 2023-07-08 jrick commit_id);
3011 24df9a28 2023-07-08 jrick if (error)
3012 24df9a28 2023-07-08 jrick goto done;
3013 24df9a28 2023-07-08 jrick }
3014 24df9a28 2023-07-08 jrick
3015 24df9a28 2023-07-08 jrick memset(&upa, 0, sizeof(upa));
3016 24df9a28 2023-07-08 jrick upa.verbosity = verbosity;
3017 24df9a28 2023-07-08 jrick error = got_worktree_checkout_files(worktree, &paths, repo,
3018 24df9a28 2023-07-08 jrick update_progress, &upa, check_cancelled, NULL);
3019 24df9a28 2023-07-08 jrick if (error != NULL)
3020 24df9a28 2023-07-08 jrick goto done;
3021 24df9a28 2023-07-08 jrick
3022 24df9a28 2023-07-08 jrick if (upa.did_something) {
3023 24df9a28 2023-07-08 jrick printf("Updated to %s: %s\n",
3024 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree), commit_id_str);
3025 24df9a28 2023-07-08 jrick } else
3026 24df9a28 2023-07-08 jrick printf("Already up-to-date\n");
3027 24df9a28 2023-07-08 jrick
3028 24df9a28 2023-07-08 jrick print_update_progress_stats(&upa);
3029 24df9a28 2023-07-08 jrick done:
3030 24df9a28 2023-07-08 jrick if (fetchpid > 0) {
3031 24df9a28 2023-07-08 jrick if (kill(fetchpid, SIGTERM) == -1)
3032 24df9a28 2023-07-08 jrick error = got_error_from_errno("kill");
3033 24df9a28 2023-07-08 jrick if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
3034 24df9a28 2023-07-08 jrick error = got_error_from_errno("waitpid");
3035 24df9a28 2023-07-08 jrick }
3036 24df9a28 2023-07-08 jrick if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3037 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
3038 24df9a28 2023-07-08 jrick if (repo) {
3039 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
3040 24df9a28 2023-07-08 jrick if (error == NULL)
3041 24df9a28 2023-07-08 jrick error = close_err;
3042 24df9a28 2023-07-08 jrick }
3043 24df9a28 2023-07-08 jrick if (worktree)
3044 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
3045 24df9a28 2023-07-08 jrick if (pack_fds) {
3046 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
3047 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
3048 24df9a28 2023-07-08 jrick if (error == NULL)
3049 24df9a28 2023-07-08 jrick error = pack_err;
3050 24df9a28 2023-07-08 jrick }
3051 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3052 24df9a28 2023-07-08 jrick got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3053 24df9a28 2023-07-08 jrick got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3054 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3055 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3056 24df9a28 2023-07-08 jrick got_ref_list_free(&remote_refs);
3057 24df9a28 2023-07-08 jrick free(id_str);
3058 24df9a28 2023-07-08 jrick free(worktree_path);
3059 24df9a28 2023-07-08 jrick free(pack_hash);
3060 24df9a28 2023-07-08 jrick free(proto);
3061 24df9a28 2023-07-08 jrick free(host);
3062 24df9a28 2023-07-08 jrick free(port);
3063 24df9a28 2023-07-08 jrick free(server_path);
3064 24df9a28 2023-07-08 jrick free(repo_name);
3065 24df9a28 2023-07-08 jrick free(commit_id);
3066 24df9a28 2023-07-08 jrick free(commit_id_str);
3067 24df9a28 2023-07-08 jrick return error;
3068 24df9a28 2023-07-08 jrick }
3069 24df9a28 2023-07-08 jrick
3070 24df9a28 2023-07-08 jrick static const struct got_error *
3071 24df9a28 2023-07-08 jrick diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3072 24df9a28 2023-07-08 jrick const char *path, int diff_context, int ignore_whitespace,
3073 24df9a28 2023-07-08 jrick int force_text_diff, struct got_diffstat_cb_arg *dsa,
3074 24df9a28 2023-07-08 jrick struct got_repository *repo, FILE *outfile)
3075 24df9a28 2023-07-08 jrick {
3076 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3077 24df9a28 2023-07-08 jrick struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3078 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
3079 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
3080 24df9a28 2023-07-08 jrick
3081 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
3082 24df9a28 2023-07-08 jrick if (fd1 == -1)
3083 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
3084 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
3085 24df9a28 2023-07-08 jrick if (fd2 == -1) {
3086 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3087 24df9a28 2023-07-08 jrick goto done;
3088 24df9a28 2023-07-08 jrick }
3089 24df9a28 2023-07-08 jrick
3090 24df9a28 2023-07-08 jrick if (blob_id1) {
3091 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3092 24df9a28 2023-07-08 jrick fd1);
3093 24df9a28 2023-07-08 jrick if (err)
3094 24df9a28 2023-07-08 jrick goto done;
3095 24df9a28 2023-07-08 jrick }
3096 24df9a28 2023-07-08 jrick
3097 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3098 24df9a28 2023-07-08 jrick if (err)
3099 24df9a28 2023-07-08 jrick goto done;
3100 24df9a28 2023-07-08 jrick
3101 24df9a28 2023-07-08 jrick f1 = got_opentemp();
3102 24df9a28 2023-07-08 jrick if (f1 == NULL) {
3103 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3104 24df9a28 2023-07-08 jrick goto done;
3105 24df9a28 2023-07-08 jrick }
3106 24df9a28 2023-07-08 jrick f2 = got_opentemp();
3107 24df9a28 2023-07-08 jrick if (f2 == NULL) {
3108 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3109 24df9a28 2023-07-08 jrick goto done;
3110 24df9a28 2023-07-08 jrick }
3111 24df9a28 2023-07-08 jrick
3112 24df9a28 2023-07-08 jrick while (path[0] == '/')
3113 24df9a28 2023-07-08 jrick path++;
3114 24df9a28 2023-07-08 jrick err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3115 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3116 24df9a28 2023-07-08 jrick force_text_diff, dsa, outfile);
3117 24df9a28 2023-07-08 jrick done:
3118 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3119 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3120 24df9a28 2023-07-08 jrick if (blob1)
3121 24df9a28 2023-07-08 jrick got_object_blob_close(blob1);
3122 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3123 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3124 24df9a28 2023-07-08 jrick if (blob2)
3125 24df9a28 2023-07-08 jrick got_object_blob_close(blob2);
3126 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && err == NULL)
3127 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3128 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
3129 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3130 24df9a28 2023-07-08 jrick return err;
3131 24df9a28 2023-07-08 jrick }
3132 24df9a28 2023-07-08 jrick
3133 24df9a28 2023-07-08 jrick static const struct got_error *
3134 24df9a28 2023-07-08 jrick diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3135 24df9a28 2023-07-08 jrick const char *path, int diff_context, int ignore_whitespace,
3136 24df9a28 2023-07-08 jrick int force_text_diff, struct got_diffstat_cb_arg *dsa,
3137 24df9a28 2023-07-08 jrick struct got_repository *repo, FILE *outfile)
3138 24df9a28 2023-07-08 jrick {
3139 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3140 24df9a28 2023-07-08 jrick struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3141 24df9a28 2023-07-08 jrick struct got_diff_blob_output_unidiff_arg arg;
3142 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
3143 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
3144 24df9a28 2023-07-08 jrick
3145 24df9a28 2023-07-08 jrick if (tree_id1) {
3146 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree1, repo, tree_id1);
3147 24df9a28 2023-07-08 jrick if (err)
3148 24df9a28 2023-07-08 jrick goto done;
3149 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
3150 24df9a28 2023-07-08 jrick if (fd1 == -1) {
3151 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3152 24df9a28 2023-07-08 jrick goto done;
3153 24df9a28 2023-07-08 jrick }
3154 24df9a28 2023-07-08 jrick }
3155 24df9a28 2023-07-08 jrick
3156 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree2, repo, tree_id2);
3157 24df9a28 2023-07-08 jrick if (err)
3158 24df9a28 2023-07-08 jrick goto done;
3159 24df9a28 2023-07-08 jrick
3160 24df9a28 2023-07-08 jrick f1 = got_opentemp();
3161 24df9a28 2023-07-08 jrick if (f1 == NULL) {
3162 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3163 24df9a28 2023-07-08 jrick goto done;
3164 24df9a28 2023-07-08 jrick }
3165 24df9a28 2023-07-08 jrick
3166 24df9a28 2023-07-08 jrick f2 = got_opentemp();
3167 24df9a28 2023-07-08 jrick if (f2 == NULL) {
3168 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3169 24df9a28 2023-07-08 jrick goto done;
3170 24df9a28 2023-07-08 jrick }
3171 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
3172 24df9a28 2023-07-08 jrick if (fd2 == -1) {
3173 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3174 24df9a28 2023-07-08 jrick goto done;
3175 24df9a28 2023-07-08 jrick }
3176 24df9a28 2023-07-08 jrick arg.diff_context = diff_context;
3177 24df9a28 2023-07-08 jrick arg.ignore_whitespace = ignore_whitespace;
3178 24df9a28 2023-07-08 jrick arg.force_text_diff = force_text_diff;
3179 24df9a28 2023-07-08 jrick arg.diffstat = dsa;
3180 24df9a28 2023-07-08 jrick arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3181 24df9a28 2023-07-08 jrick arg.outfile = outfile;
3182 24df9a28 2023-07-08 jrick arg.lines = NULL;
3183 24df9a28 2023-07-08 jrick arg.nlines = 0;
3184 24df9a28 2023-07-08 jrick while (path[0] == '/')
3185 24df9a28 2023-07-08 jrick path++;
3186 24df9a28 2023-07-08 jrick err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3187 24df9a28 2023-07-08 jrick got_diff_blob_output_unidiff, &arg, 1);
3188 24df9a28 2023-07-08 jrick done:
3189 24df9a28 2023-07-08 jrick if (tree1)
3190 24df9a28 2023-07-08 jrick got_object_tree_close(tree1);
3191 24df9a28 2023-07-08 jrick if (tree2)
3192 24df9a28 2023-07-08 jrick got_object_tree_close(tree2);
3193 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && err == NULL)
3194 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3195 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
3196 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3197 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3198 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3199 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3200 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3201 24df9a28 2023-07-08 jrick return err;
3202 24df9a28 2023-07-08 jrick }
3203 24df9a28 2023-07-08 jrick
3204 24df9a28 2023-07-08 jrick static const struct got_error *
3205 24df9a28 2023-07-08 jrick get_changed_paths(struct got_pathlist_head *paths,
3206 24df9a28 2023-07-08 jrick struct got_commit_object *commit, struct got_repository *repo,
3207 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg *dsa)
3208 24df9a28 2023-07-08 jrick {
3209 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3210 24df9a28 2023-07-08 jrick struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3211 24df9a28 2023-07-08 jrick struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3212 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3213 24df9a28 2023-07-08 jrick got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3214 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
3215 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
3216 24df9a28 2023-07-08 jrick
3217 24df9a28 2023-07-08 jrick if (dsa) {
3218 24df9a28 2023-07-08 jrick cb = got_diff_tree_compute_diffstat;
3219 24df9a28 2023-07-08 jrick
3220 24df9a28 2023-07-08 jrick f1 = got_opentemp();
3221 24df9a28 2023-07-08 jrick if (f1 == NULL) {
3222 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3223 24df9a28 2023-07-08 jrick goto done;
3224 24df9a28 2023-07-08 jrick }
3225 24df9a28 2023-07-08 jrick f2 = got_opentemp();
3226 24df9a28 2023-07-08 jrick if (f2 == NULL) {
3227 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3228 24df9a28 2023-07-08 jrick goto done;
3229 24df9a28 2023-07-08 jrick }
3230 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
3231 24df9a28 2023-07-08 jrick if (fd1 == -1) {
3232 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3233 24df9a28 2023-07-08 jrick goto done;
3234 24df9a28 2023-07-08 jrick }
3235 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
3236 24df9a28 2023-07-08 jrick if (fd2 == -1) {
3237 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3238 24df9a28 2023-07-08 jrick goto done;
3239 24df9a28 2023-07-08 jrick }
3240 24df9a28 2023-07-08 jrick }
3241 24df9a28 2023-07-08 jrick
3242 24df9a28 2023-07-08 jrick qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3243 24df9a28 2023-07-08 jrick if (qid != NULL) {
3244 24df9a28 2023-07-08 jrick struct got_commit_object *pcommit;
3245 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&pcommit, repo,
3246 24df9a28 2023-07-08 jrick &qid->id);
3247 24df9a28 2023-07-08 jrick if (err)
3248 24df9a28 2023-07-08 jrick return err;
3249 24df9a28 2023-07-08 jrick
3250 24df9a28 2023-07-08 jrick tree_id1 = got_object_id_dup(
3251 24df9a28 2023-07-08 jrick got_object_commit_get_tree_id(pcommit));
3252 24df9a28 2023-07-08 jrick if (tree_id1 == NULL) {
3253 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
3254 24df9a28 2023-07-08 jrick return got_error_from_errno("got_object_id_dup");
3255 24df9a28 2023-07-08 jrick }
3256 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
3257 24df9a28 2023-07-08 jrick
3258 24df9a28 2023-07-08 jrick }
3259 24df9a28 2023-07-08 jrick
3260 24df9a28 2023-07-08 jrick if (tree_id1) {
3261 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree1, repo, tree_id1);
3262 24df9a28 2023-07-08 jrick if (err)
3263 24df9a28 2023-07-08 jrick goto done;
3264 24df9a28 2023-07-08 jrick }
3265 24df9a28 2023-07-08 jrick
3266 24df9a28 2023-07-08 jrick tree_id2 = got_object_commit_get_tree_id(commit);
3267 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree2, repo, tree_id2);
3268 24df9a28 2023-07-08 jrick if (err)
3269 24df9a28 2023-07-08 jrick goto done;
3270 24df9a28 2023-07-08 jrick
3271 24df9a28 2023-07-08 jrick err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3272 24df9a28 2023-07-08 jrick cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3273 24df9a28 2023-07-08 jrick done:
3274 24df9a28 2023-07-08 jrick if (tree1)
3275 24df9a28 2023-07-08 jrick got_object_tree_close(tree1);
3276 24df9a28 2023-07-08 jrick if (tree2)
3277 24df9a28 2023-07-08 jrick got_object_tree_close(tree2);
3278 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3279 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3280 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3281 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3282 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && err == NULL)
3283 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3284 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
3285 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3286 24df9a28 2023-07-08 jrick free(tree_id1);
3287 24df9a28 2023-07-08 jrick return err;
3288 24df9a28 2023-07-08 jrick }
3289 24df9a28 2023-07-08 jrick
3290 24df9a28 2023-07-08 jrick static const struct got_error *
3291 24df9a28 2023-07-08 jrick print_patch(struct got_commit_object *commit, struct got_object_id *id,
3292 24df9a28 2023-07-08 jrick const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3293 24df9a28 2023-07-08 jrick struct got_repository *repo, FILE *outfile)
3294 24df9a28 2023-07-08 jrick {
3295 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3296 24df9a28 2023-07-08 jrick struct got_commit_object *pcommit = NULL;
3297 24df9a28 2023-07-08 jrick char *id_str1 = NULL, *id_str2 = NULL;
3298 24df9a28 2023-07-08 jrick struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3299 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3300 24df9a28 2023-07-08 jrick
3301 24df9a28 2023-07-08 jrick qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3302 24df9a28 2023-07-08 jrick if (qid != NULL) {
3303 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&pcommit, repo,
3304 24df9a28 2023-07-08 jrick &qid->id);
3305 24df9a28 2023-07-08 jrick if (err)
3306 24df9a28 2023-07-08 jrick return err;
3307 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str1, &qid->id);
3308 24df9a28 2023-07-08 jrick if (err)
3309 24df9a28 2023-07-08 jrick goto done;
3310 24df9a28 2023-07-08 jrick }
3311 24df9a28 2023-07-08 jrick
3312 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str2, id);
3313 24df9a28 2023-07-08 jrick if (err)
3314 24df9a28 2023-07-08 jrick goto done;
3315 24df9a28 2023-07-08 jrick
3316 24df9a28 2023-07-08 jrick if (path && path[0] != '\0') {
3317 24df9a28 2023-07-08 jrick int obj_type;
3318 24df9a28 2023-07-08 jrick err = got_object_id_by_path(&obj_id2, repo, commit, path);
3319 24df9a28 2023-07-08 jrick if (err)
3320 24df9a28 2023-07-08 jrick goto done;
3321 24df9a28 2023-07-08 jrick if (pcommit) {
3322 24df9a28 2023-07-08 jrick err = got_object_id_by_path(&obj_id1, repo,
3323 24df9a28 2023-07-08 jrick pcommit, path);
3324 24df9a28 2023-07-08 jrick if (err) {
3325 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3326 24df9a28 2023-07-08 jrick free(obj_id2);
3327 24df9a28 2023-07-08 jrick goto done;
3328 24df9a28 2023-07-08 jrick }
3329 24df9a28 2023-07-08 jrick }
3330 24df9a28 2023-07-08 jrick }
3331 24df9a28 2023-07-08 jrick err = got_object_get_type(&obj_type, repo, obj_id2);
3332 24df9a28 2023-07-08 jrick if (err) {
3333 24df9a28 2023-07-08 jrick free(obj_id2);
3334 24df9a28 2023-07-08 jrick goto done;
3335 24df9a28 2023-07-08 jrick }
3336 24df9a28 2023-07-08 jrick fprintf(outfile,
3337 24df9a28 2023-07-08 jrick "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3338 24df9a28 2023-07-08 jrick fprintf(outfile, "commit - %s\n",
3339 24df9a28 2023-07-08 jrick id_str1 ? id_str1 : "/dev/null");
3340 24df9a28 2023-07-08 jrick fprintf(outfile, "commit + %s\n", id_str2);
3341 24df9a28 2023-07-08 jrick switch (obj_type) {
3342 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
3343 24df9a28 2023-07-08 jrick err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3344 24df9a28 2023-07-08 jrick 0, 0, dsa, repo, outfile);
3345 24df9a28 2023-07-08 jrick break;
3346 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
3347 24df9a28 2023-07-08 jrick err = diff_trees(obj_id1, obj_id2, path, diff_context,
3348 24df9a28 2023-07-08 jrick 0, 0, dsa, repo, outfile);
3349 24df9a28 2023-07-08 jrick break;
3350 24df9a28 2023-07-08 jrick default:
3351 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_OBJ_TYPE);
3352 24df9a28 2023-07-08 jrick break;
3353 24df9a28 2023-07-08 jrick }
3354 24df9a28 2023-07-08 jrick free(obj_id1);
3355 24df9a28 2023-07-08 jrick free(obj_id2);
3356 24df9a28 2023-07-08 jrick } else {
3357 24df9a28 2023-07-08 jrick obj_id2 = got_object_commit_get_tree_id(commit);
3358 24df9a28 2023-07-08 jrick if (pcommit)
3359 24df9a28 2023-07-08 jrick obj_id1 = got_object_commit_get_tree_id(pcommit);
3360 24df9a28 2023-07-08 jrick fprintf(outfile,
3361 24df9a28 2023-07-08 jrick "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3362 24df9a28 2023-07-08 jrick fprintf(outfile, "commit - %s\n",
3363 24df9a28 2023-07-08 jrick id_str1 ? id_str1 : "/dev/null");
3364 24df9a28 2023-07-08 jrick fprintf(outfile, "commit + %s\n", id_str2);
3365 24df9a28 2023-07-08 jrick err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3366 24df9a28 2023-07-08 jrick dsa, repo, outfile);
3367 24df9a28 2023-07-08 jrick }
3368 24df9a28 2023-07-08 jrick done:
3369 24df9a28 2023-07-08 jrick free(id_str1);
3370 24df9a28 2023-07-08 jrick free(id_str2);
3371 24df9a28 2023-07-08 jrick if (pcommit)
3372 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
3373 24df9a28 2023-07-08 jrick return err;
3374 24df9a28 2023-07-08 jrick }
3375 24df9a28 2023-07-08 jrick
3376 24df9a28 2023-07-08 jrick static char *
3377 24df9a28 2023-07-08 jrick get_datestr(time_t *time, char *datebuf)
3378 24df9a28 2023-07-08 jrick {
3379 24df9a28 2023-07-08 jrick struct tm mytm, *tm;
3380 24df9a28 2023-07-08 jrick char *p, *s;
3381 24df9a28 2023-07-08 jrick
3382 24df9a28 2023-07-08 jrick tm = gmtime_r(time, &mytm);
3383 24df9a28 2023-07-08 jrick if (tm == NULL)
3384 24df9a28 2023-07-08 jrick return NULL;
3385 24df9a28 2023-07-08 jrick s = asctime_r(tm, datebuf);
3386 24df9a28 2023-07-08 jrick if (s == NULL)
3387 24df9a28 2023-07-08 jrick return NULL;
3388 24df9a28 2023-07-08 jrick p = strchr(s, '\n');
3389 24df9a28 2023-07-08 jrick if (p)
3390 24df9a28 2023-07-08 jrick *p = '\0';
3391 24df9a28 2023-07-08 jrick return s;
3392 24df9a28 2023-07-08 jrick }
3393 24df9a28 2023-07-08 jrick
3394 24df9a28 2023-07-08 jrick static const struct got_error *
3395 24df9a28 2023-07-08 jrick match_commit(int *have_match, struct got_object_id *id,
3396 24df9a28 2023-07-08 jrick struct got_commit_object *commit, regex_t *regex)
3397 24df9a28 2023-07-08 jrick {
3398 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3399 24df9a28 2023-07-08 jrick regmatch_t regmatch;
3400 24df9a28 2023-07-08 jrick char *id_str = NULL, *logmsg = NULL;
3401 24df9a28 2023-07-08 jrick
3402 24df9a28 2023-07-08 jrick *have_match = 0;
3403 24df9a28 2023-07-08 jrick
3404 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
3405 24df9a28 2023-07-08 jrick if (err)
3406 24df9a28 2023-07-08 jrick return err;
3407 24df9a28 2023-07-08 jrick
3408 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg, commit);
3409 24df9a28 2023-07-08 jrick if (err)
3410 24df9a28 2023-07-08 jrick goto done;
3411 24df9a28 2023-07-08 jrick
3412 24df9a28 2023-07-08 jrick if (regexec(regex, got_object_commit_get_author(commit), 1,
3413 24df9a28 2023-07-08 jrick &regmatch, 0) == 0 ||
3414 24df9a28 2023-07-08 jrick regexec(regex, got_object_commit_get_committer(commit), 1,
3415 24df9a28 2023-07-08 jrick &regmatch, 0) == 0 ||
3416 24df9a28 2023-07-08 jrick regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
3417 24df9a28 2023-07-08 jrick regexec(regex, logmsg, 1, &regmatch, 0) == 0)
3418 24df9a28 2023-07-08 jrick *have_match = 1;
3419 24df9a28 2023-07-08 jrick done:
3420 24df9a28 2023-07-08 jrick free(id_str);
3421 24df9a28 2023-07-08 jrick free(logmsg);
3422 24df9a28 2023-07-08 jrick return err;
3423 24df9a28 2023-07-08 jrick }
3424 24df9a28 2023-07-08 jrick
3425 24df9a28 2023-07-08 jrick static void
3426 24df9a28 2023-07-08 jrick match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3427 24df9a28 2023-07-08 jrick regex_t *regex)
3428 24df9a28 2023-07-08 jrick {
3429 24df9a28 2023-07-08 jrick regmatch_t regmatch;
3430 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
3431 24df9a28 2023-07-08 jrick
3432 24df9a28 2023-07-08 jrick *have_match = 0;
3433 24df9a28 2023-07-08 jrick
3434 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, changed_paths, entry) {
3435 24df9a28 2023-07-08 jrick if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
3436 24df9a28 2023-07-08 jrick *have_match = 1;
3437 24df9a28 2023-07-08 jrick break;
3438 24df9a28 2023-07-08 jrick }
3439 24df9a28 2023-07-08 jrick }
3440 24df9a28 2023-07-08 jrick }
3441 24df9a28 2023-07-08 jrick
3442 24df9a28 2023-07-08 jrick static const struct got_error *
3443 24df9a28 2023-07-08 jrick match_patch(int *have_match, struct got_commit_object *commit,
3444 24df9a28 2023-07-08 jrick struct got_object_id *id, const char *path, int diff_context,
3445 24df9a28 2023-07-08 jrick struct got_repository *repo, regex_t *regex, FILE *f)
3446 24df9a28 2023-07-08 jrick {
3447 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3448 24df9a28 2023-07-08 jrick char *line = NULL;
3449 24df9a28 2023-07-08 jrick size_t linesize = 0;
3450 24df9a28 2023-07-08 jrick regmatch_t regmatch;
3451 24df9a28 2023-07-08 jrick
3452 24df9a28 2023-07-08 jrick *have_match = 0;
3453 24df9a28 2023-07-08 jrick
3454 24df9a28 2023-07-08 jrick err = got_opentemp_truncate(f);
3455 24df9a28 2023-07-08 jrick if (err)
3456 24df9a28 2023-07-08 jrick return err;
3457 24df9a28 2023-07-08 jrick
3458 24df9a28 2023-07-08 jrick err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3459 24df9a28 2023-07-08 jrick if (err)
3460 24df9a28 2023-07-08 jrick goto done;
3461 24df9a28 2023-07-08 jrick
3462 24df9a28 2023-07-08 jrick if (fseeko(f, 0L, SEEK_SET) == -1) {
3463 24df9a28 2023-07-08 jrick err = got_error_from_errno("fseeko");
3464 24df9a28 2023-07-08 jrick goto done;
3465 24df9a28 2023-07-08 jrick }
3466 24df9a28 2023-07-08 jrick
3467 24df9a28 2023-07-08 jrick while (getline(&line, &linesize, f) != -1) {
3468 24df9a28 2023-07-08 jrick if (regexec(regex, line, 1, &regmatch, 0) == 0) {
3469 24df9a28 2023-07-08 jrick *have_match = 1;
3470 24df9a28 2023-07-08 jrick break;
3471 24df9a28 2023-07-08 jrick }
3472 24df9a28 2023-07-08 jrick }
3473 24df9a28 2023-07-08 jrick done:
3474 24df9a28 2023-07-08 jrick free(line);
3475 24df9a28 2023-07-08 jrick return err;
3476 24df9a28 2023-07-08 jrick }
3477 24df9a28 2023-07-08 jrick
3478 24df9a28 2023-07-08 jrick #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3479 24df9a28 2023-07-08 jrick
3480 24df9a28 2023-07-08 jrick static const struct got_error*
3481 24df9a28 2023-07-08 jrick build_refs_str(char **refs_str, struct got_reflist_head *refs,
3482 24df9a28 2023-07-08 jrick struct got_object_id *id, struct got_repository *repo,
3483 24df9a28 2023-07-08 jrick int local_only)
3484 24df9a28 2023-07-08 jrick {
3485 24df9a28 2023-07-08 jrick static const struct got_error *err = NULL;
3486 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
3487 24df9a28 2023-07-08 jrick char *s;
3488 24df9a28 2023-07-08 jrick const char *name;
3489 24df9a28 2023-07-08 jrick
3490 24df9a28 2023-07-08 jrick *refs_str = NULL;
3491 24df9a28 2023-07-08 jrick
3492 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, refs, entry) {
3493 24df9a28 2023-07-08 jrick struct got_tag_object *tag = NULL;
3494 24df9a28 2023-07-08 jrick struct got_object_id *ref_id;
3495 24df9a28 2023-07-08 jrick int cmp;
3496 24df9a28 2023-07-08 jrick
3497 24df9a28 2023-07-08 jrick name = got_ref_get_name(re->ref);
3498 24df9a28 2023-07-08 jrick if (strcmp(name, GOT_REF_HEAD) == 0)
3499 24df9a28 2023-07-08 jrick continue;
3500 24df9a28 2023-07-08 jrick if (strncmp(name, "refs/", 5) == 0)
3501 24df9a28 2023-07-08 jrick name += 5;
3502 24df9a28 2023-07-08 jrick if (strncmp(name, "got/", 4) == 0)
3503 24df9a28 2023-07-08 jrick continue;
3504 24df9a28 2023-07-08 jrick if (strncmp(name, "heads/", 6) == 0)
3505 24df9a28 2023-07-08 jrick name += 6;
3506 24df9a28 2023-07-08 jrick if (strncmp(name, "remotes/", 8) == 0) {
3507 24df9a28 2023-07-08 jrick if (local_only)
3508 24df9a28 2023-07-08 jrick continue;
3509 24df9a28 2023-07-08 jrick name += 8;
3510 24df9a28 2023-07-08 jrick s = strstr(name, "/" GOT_REF_HEAD);
3511 24df9a28 2023-07-08 jrick if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3512 24df9a28 2023-07-08 jrick continue;
3513 24df9a28 2023-07-08 jrick }
3514 24df9a28 2023-07-08 jrick err = got_ref_resolve(&ref_id, repo, re->ref);
3515 24df9a28 2023-07-08 jrick if (err)
3516 24df9a28 2023-07-08 jrick break;
3517 24df9a28 2023-07-08 jrick if (strncmp(name, "tags/", 5) == 0) {
3518 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&tag, repo, ref_id);
3519 24df9a28 2023-07-08 jrick if (err) {
3520 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_OBJ_TYPE) {
3521 24df9a28 2023-07-08 jrick free(ref_id);
3522 24df9a28 2023-07-08 jrick break;
3523 24df9a28 2023-07-08 jrick }
3524 24df9a28 2023-07-08 jrick /* Ref points at something other than a tag. */
3525 24df9a28 2023-07-08 jrick err = NULL;
3526 24df9a28 2023-07-08 jrick tag = NULL;
3527 24df9a28 2023-07-08 jrick }
3528 24df9a28 2023-07-08 jrick }
3529 24df9a28 2023-07-08 jrick cmp = got_object_id_cmp(tag ?
3530 24df9a28 2023-07-08 jrick got_object_tag_get_object_id(tag) : ref_id, id);
3531 24df9a28 2023-07-08 jrick free(ref_id);
3532 24df9a28 2023-07-08 jrick if (tag)
3533 24df9a28 2023-07-08 jrick got_object_tag_close(tag);
3534 24df9a28 2023-07-08 jrick if (cmp != 0)
3535 24df9a28 2023-07-08 jrick continue;
3536 24df9a28 2023-07-08 jrick s = *refs_str;
3537 24df9a28 2023-07-08 jrick if (asprintf(refs_str, "%s%s%s", s ? s : "",
3538 24df9a28 2023-07-08 jrick s ? ", " : "", name) == -1) {
3539 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
3540 24df9a28 2023-07-08 jrick free(s);
3541 24df9a28 2023-07-08 jrick *refs_str = NULL;
3542 24df9a28 2023-07-08 jrick break;
3543 24df9a28 2023-07-08 jrick }
3544 24df9a28 2023-07-08 jrick free(s);
3545 24df9a28 2023-07-08 jrick }
3546 24df9a28 2023-07-08 jrick
3547 24df9a28 2023-07-08 jrick return err;
3548 24df9a28 2023-07-08 jrick }
3549 24df9a28 2023-07-08 jrick
3550 24df9a28 2023-07-08 jrick static const struct got_error *
3551 24df9a28 2023-07-08 jrick print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3552 24df9a28 2023-07-08 jrick struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3553 24df9a28 2023-07-08 jrick {
3554 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3555 24df9a28 2023-07-08 jrick char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3556 24df9a28 2023-07-08 jrick char *comma, *s, *nl;
3557 24df9a28 2023-07-08 jrick struct got_reflist_head *refs;
3558 24df9a28 2023-07-08 jrick char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3559 24df9a28 2023-07-08 jrick struct tm tm;
3560 24df9a28 2023-07-08 jrick time_t committer_time;
3561 24df9a28 2023-07-08 jrick
3562 24df9a28 2023-07-08 jrick refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3563 24df9a28 2023-07-08 jrick if (refs) {
3564 24df9a28 2023-07-08 jrick err = build_refs_str(&ref_str, refs, id, repo, 1);
3565 24df9a28 2023-07-08 jrick if (err)
3566 24df9a28 2023-07-08 jrick return err;
3567 24df9a28 2023-07-08 jrick
3568 24df9a28 2023-07-08 jrick /* Display the first matching ref only. */
3569 24df9a28 2023-07-08 jrick if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3570 24df9a28 2023-07-08 jrick *comma = '\0';
3571 24df9a28 2023-07-08 jrick }
3572 24df9a28 2023-07-08 jrick
3573 24df9a28 2023-07-08 jrick if (ref_str == NULL) {
3574 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
3575 24df9a28 2023-07-08 jrick if (err)
3576 24df9a28 2023-07-08 jrick return err;
3577 24df9a28 2023-07-08 jrick }
3578 24df9a28 2023-07-08 jrick
3579 24df9a28 2023-07-08 jrick committer_time = got_object_commit_get_committer_time(commit);
3580 24df9a28 2023-07-08 jrick if (gmtime_r(&committer_time, &tm) == NULL) {
3581 24df9a28 2023-07-08 jrick err = got_error_from_errno("gmtime_r");
3582 24df9a28 2023-07-08 jrick goto done;
3583 24df9a28 2023-07-08 jrick }
3584 24df9a28 2023-07-08 jrick if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3585 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
3586 24df9a28 2023-07-08 jrick goto done;
3587 24df9a28 2023-07-08 jrick }
3588 24df9a28 2023-07-08 jrick
3589 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg0, commit);
3590 24df9a28 2023-07-08 jrick if (err)
3591 24df9a28 2023-07-08 jrick goto done;
3592 24df9a28 2023-07-08 jrick
3593 24df9a28 2023-07-08 jrick s = logmsg0;
3594 24df9a28 2023-07-08 jrick while (isspace((unsigned char)s[0]))
3595 24df9a28 2023-07-08 jrick s++;
3596 24df9a28 2023-07-08 jrick
3597 24df9a28 2023-07-08 jrick nl = strchr(s, '\n');
3598 24df9a28 2023-07-08 jrick if (nl) {
3599 24df9a28 2023-07-08 jrick *nl = '\0';
3600 24df9a28 2023-07-08 jrick }
3601 24df9a28 2023-07-08 jrick
3602 24df9a28 2023-07-08 jrick if (ref_str)
3603 24df9a28 2023-07-08 jrick printf("%s%-7s %s\n", datebuf, ref_str, s);
3604 24df9a28 2023-07-08 jrick else
3605 24df9a28 2023-07-08 jrick printf("%s%.7s %s\n", datebuf, id_str, s);
3606 24df9a28 2023-07-08 jrick
3607 24df9a28 2023-07-08 jrick if (fflush(stdout) != 0 && err == NULL)
3608 24df9a28 2023-07-08 jrick err = got_error_from_errno("fflush");
3609 24df9a28 2023-07-08 jrick done:
3610 24df9a28 2023-07-08 jrick free(id_str);
3611 24df9a28 2023-07-08 jrick free(ref_str);
3612 24df9a28 2023-07-08 jrick free(logmsg0);
3613 24df9a28 2023-07-08 jrick return err;
3614 24df9a28 2023-07-08 jrick }
3615 24df9a28 2023-07-08 jrick
3616 24df9a28 2023-07-08 jrick static const struct got_error *
3617 24df9a28 2023-07-08 jrick print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3618 24df9a28 2023-07-08 jrick {
3619 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
3620 24df9a28 2023-07-08 jrick
3621 24df9a28 2023-07-08 jrick if (header != NULL)
3622 24df9a28 2023-07-08 jrick printf("%s\n", header);
3623 24df9a28 2023-07-08 jrick
3624 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, dsa->paths, entry) {
3625 24df9a28 2023-07-08 jrick struct got_diff_changed_path *cp = pe->data;
3626 24df9a28 2023-07-08 jrick int pad = dsa->max_path_len - pe->path_len + 1;
3627 24df9a28 2023-07-08 jrick
3628 24df9a28 2023-07-08 jrick printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3629 24df9a28 2023-07-08 jrick ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3630 24df9a28 2023-07-08 jrick }
3631 24df9a28 2023-07-08 jrick printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3632 24df9a28 2023-07-08 jrick dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3633 24df9a28 2023-07-08 jrick dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3634 24df9a28 2023-07-08 jrick
3635 24df9a28 2023-07-08 jrick if (fflush(stdout) != 0)
3636 24df9a28 2023-07-08 jrick return got_error_from_errno("fflush");
3637 24df9a28 2023-07-08 jrick
3638 24df9a28 2023-07-08 jrick return NULL;
3639 24df9a28 2023-07-08 jrick }
3640 24df9a28 2023-07-08 jrick
3641 24df9a28 2023-07-08 jrick static const struct got_error *
3642 24df9a28 2023-07-08 jrick printfile(FILE *f)
3643 24df9a28 2023-07-08 jrick {
3644 24df9a28 2023-07-08 jrick char buf[8192];
3645 24df9a28 2023-07-08 jrick size_t r;
3646 24df9a28 2023-07-08 jrick
3647 24df9a28 2023-07-08 jrick if (fseeko(f, 0L, SEEK_SET) == -1)
3648 24df9a28 2023-07-08 jrick return got_error_from_errno("fseek");
3649 24df9a28 2023-07-08 jrick
3650 24df9a28 2023-07-08 jrick for (;;) {
3651 24df9a28 2023-07-08 jrick r = fread(buf, 1, sizeof(buf), f);
3652 24df9a28 2023-07-08 jrick if (r == 0) {
3653 24df9a28 2023-07-08 jrick if (ferror(f))
3654 24df9a28 2023-07-08 jrick return got_error_from_errno("fread");
3655 24df9a28 2023-07-08 jrick if (feof(f))
3656 24df9a28 2023-07-08 jrick break;
3657 24df9a28 2023-07-08 jrick }
3658 24df9a28 2023-07-08 jrick if (fwrite(buf, 1, r, stdout) != r)
3659 24df9a28 2023-07-08 jrick return got_ferror(stdout, GOT_ERR_IO);
3660 24df9a28 2023-07-08 jrick }
3661 24df9a28 2023-07-08 jrick
3662 24df9a28 2023-07-08 jrick return NULL;
3663 24df9a28 2023-07-08 jrick }
3664 24df9a28 2023-07-08 jrick
3665 24df9a28 2023-07-08 jrick static const struct got_error *
3666 24df9a28 2023-07-08 jrick print_commit(struct got_commit_object *commit, struct got_object_id *id,
3667 24df9a28 2023-07-08 jrick struct got_repository *repo, const char *path,
3668 24df9a28 2023-07-08 jrick struct got_pathlist_head *changed_paths,
3669 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3670 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3671 24df9a28 2023-07-08 jrick const char *prefix)
3672 24df9a28 2023-07-08 jrick {
3673 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3674 24df9a28 2023-07-08 jrick FILE *f = NULL;
3675 24df9a28 2023-07-08 jrick char *id_str, *datestr, *logmsg0, *logmsg, *line;
3676 24df9a28 2023-07-08 jrick char datebuf[26];
3677 24df9a28 2023-07-08 jrick time_t committer_time;
3678 24df9a28 2023-07-08 jrick const char *author, *committer;
3679 24df9a28 2023-07-08 jrick char *refs_str = NULL;
3680 24df9a28 2023-07-08 jrick
3681 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
3682 24df9a28 2023-07-08 jrick if (err)
3683 24df9a28 2023-07-08 jrick return err;
3684 24df9a28 2023-07-08 jrick
3685 24df9a28 2023-07-08 jrick if (custom_refs_str == NULL) {
3686 24df9a28 2023-07-08 jrick struct got_reflist_head *refs;
3687 24df9a28 2023-07-08 jrick refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3688 24df9a28 2023-07-08 jrick if (refs) {
3689 24df9a28 2023-07-08 jrick err = build_refs_str(&refs_str, refs, id, repo, 0);
3690 24df9a28 2023-07-08 jrick if (err)
3691 24df9a28 2023-07-08 jrick goto done;
3692 24df9a28 2023-07-08 jrick }
3693 24df9a28 2023-07-08 jrick }
3694 24df9a28 2023-07-08 jrick
3695 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
3696 24df9a28 2023-07-08 jrick if (custom_refs_str)
3697 24df9a28 2023-07-08 jrick printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3698 24df9a28 2023-07-08 jrick custom_refs_str);
3699 24df9a28 2023-07-08 jrick else
3700 24df9a28 2023-07-08 jrick printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3701 24df9a28 2023-07-08 jrick refs_str ? " (" : "", refs_str ? refs_str : "",
3702 24df9a28 2023-07-08 jrick refs_str ? ")" : "");
3703 24df9a28 2023-07-08 jrick free(id_str);
3704 24df9a28 2023-07-08 jrick id_str = NULL;
3705 24df9a28 2023-07-08 jrick free(refs_str);
3706 24df9a28 2023-07-08 jrick refs_str = NULL;
3707 24df9a28 2023-07-08 jrick printf("from: %s\n", got_object_commit_get_author(commit));
3708 24df9a28 2023-07-08 jrick author = got_object_commit_get_author(commit);
3709 24df9a28 2023-07-08 jrick committer = got_object_commit_get_committer(commit);
3710 24df9a28 2023-07-08 jrick if (strcmp(author, committer) != 0)
3711 24df9a28 2023-07-08 jrick printf("via: %s\n", committer);
3712 24df9a28 2023-07-08 jrick committer_time = got_object_commit_get_committer_time(commit);
3713 24df9a28 2023-07-08 jrick datestr = get_datestr(&committer_time, datebuf);
3714 24df9a28 2023-07-08 jrick if (datestr)
3715 24df9a28 2023-07-08 jrick printf("date: %s UTC\n", datestr);
3716 24df9a28 2023-07-08 jrick if (got_object_commit_get_nparents(commit) > 1) {
3717 24df9a28 2023-07-08 jrick const struct got_object_id_queue *parent_ids;
3718 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3719 24df9a28 2023-07-08 jrick int n = 1;
3720 24df9a28 2023-07-08 jrick parent_ids = got_object_commit_get_parent_ids(commit);
3721 24df9a28 2023-07-08 jrick STAILQ_FOREACH(qid, parent_ids, entry) {
3722 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, &qid->id);
3723 24df9a28 2023-07-08 jrick if (err)
3724 24df9a28 2023-07-08 jrick goto done;
3725 24df9a28 2023-07-08 jrick printf("parent %d: %s\n", n++, id_str);
3726 24df9a28 2023-07-08 jrick free(id_str);
3727 24df9a28 2023-07-08 jrick id_str = NULL;
3728 24df9a28 2023-07-08 jrick }
3729 24df9a28 2023-07-08 jrick }
3730 24df9a28 2023-07-08 jrick
3731 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg0, commit);
3732 24df9a28 2023-07-08 jrick if (err)
3733 24df9a28 2023-07-08 jrick goto done;
3734 24df9a28 2023-07-08 jrick
3735 24df9a28 2023-07-08 jrick logmsg = logmsg0;
3736 24df9a28 2023-07-08 jrick do {
3737 24df9a28 2023-07-08 jrick line = strsep(&logmsg, "\n");
3738 24df9a28 2023-07-08 jrick if (line)
3739 24df9a28 2023-07-08 jrick printf(" %s\n", line);
3740 24df9a28 2023-07-08 jrick } while (line);
3741 24df9a28 2023-07-08 jrick free(logmsg0);
3742 24df9a28 2023-07-08 jrick
3743 24df9a28 2023-07-08 jrick if (changed_paths && diffstat == NULL) {
3744 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
3745 24df9a28 2023-07-08 jrick
3746 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, changed_paths, entry) {
3747 24df9a28 2023-07-08 jrick struct got_diff_changed_path *cp = pe->data;
3748 24df9a28 2023-07-08 jrick
3749 24df9a28 2023-07-08 jrick printf(" %c %s\n", cp->status, pe->path);
3750 24df9a28 2023-07-08 jrick }
3751 24df9a28 2023-07-08 jrick printf("\n");
3752 24df9a28 2023-07-08 jrick }
3753 24df9a28 2023-07-08 jrick if (show_patch) {
3754 24df9a28 2023-07-08 jrick if (diffstat) {
3755 24df9a28 2023-07-08 jrick f = got_opentemp();
3756 24df9a28 2023-07-08 jrick if (f == NULL) {
3757 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3758 24df9a28 2023-07-08 jrick goto done;
3759 24df9a28 2023-07-08 jrick }
3760 24df9a28 2023-07-08 jrick }
3761 24df9a28 2023-07-08 jrick
3762 24df9a28 2023-07-08 jrick err = print_patch(commit, id, path, diff_context, diffstat,
3763 24df9a28 2023-07-08 jrick repo, diffstat == NULL ? stdout : f);
3764 24df9a28 2023-07-08 jrick if (err)
3765 24df9a28 2023-07-08 jrick goto done;
3766 24df9a28 2023-07-08 jrick }
3767 24df9a28 2023-07-08 jrick if (diffstat) {
3768 24df9a28 2023-07-08 jrick err = print_diffstat(diffstat, NULL);
3769 24df9a28 2023-07-08 jrick if (err)
3770 24df9a28 2023-07-08 jrick goto done;
3771 24df9a28 2023-07-08 jrick if (show_patch) {
3772 24df9a28 2023-07-08 jrick err = printfile(f);
3773 24df9a28 2023-07-08 jrick if (err)
3774 24df9a28 2023-07-08 jrick goto done;
3775 24df9a28 2023-07-08 jrick }
3776 24df9a28 2023-07-08 jrick }
3777 24df9a28 2023-07-08 jrick if (show_patch)
3778 24df9a28 2023-07-08 jrick printf("\n");
3779 24df9a28 2023-07-08 jrick
3780 24df9a28 2023-07-08 jrick if (fflush(stdout) != 0 && err == NULL)
3781 24df9a28 2023-07-08 jrick err = got_error_from_errno("fflush");
3782 24df9a28 2023-07-08 jrick done:
3783 24df9a28 2023-07-08 jrick if (f && fclose(f) == EOF && err == NULL)
3784 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3785 24df9a28 2023-07-08 jrick free(id_str);
3786 24df9a28 2023-07-08 jrick free(refs_str);
3787 24df9a28 2023-07-08 jrick return err;
3788 24df9a28 2023-07-08 jrick }
3789 24df9a28 2023-07-08 jrick
3790 24df9a28 2023-07-08 jrick static const struct got_error *
3791 24df9a28 2023-07-08 jrick print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3792 24df9a28 2023-07-08 jrick struct got_repository *repo, const char *path, int show_changed_paths,
3793 24df9a28 2023-07-08 jrick int show_diffstat, int show_patch, const char *search_pattern,
3794 24df9a28 2023-07-08 jrick int diff_context, int limit, int log_branches, int reverse_display_order,
3795 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap, int one_line,
3796 24df9a28 2023-07-08 jrick FILE *tmpfile)
3797 24df9a28 2023-07-08 jrick {
3798 24df9a28 2023-07-08 jrick const struct got_error *err;
3799 24df9a28 2023-07-08 jrick struct got_commit_graph *graph;
3800 24df9a28 2023-07-08 jrick regex_t regex;
3801 24df9a28 2023-07-08 jrick int have_match;
3802 24df9a28 2023-07-08 jrick struct got_object_id_queue reversed_commits;
3803 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3804 24df9a28 2023-07-08 jrick struct got_commit_object *commit;
3805 24df9a28 2023-07-08 jrick struct got_pathlist_head changed_paths;
3806 24df9a28 2023-07-08 jrick
3807 24df9a28 2023-07-08 jrick STAILQ_INIT(&reversed_commits);
3808 24df9a28 2023-07-08 jrick TAILQ_INIT(&changed_paths);
3809 24df9a28 2023-07-08 jrick
3810 24df9a28 2023-07-08 jrick if (search_pattern && regcomp(&regex, search_pattern,
3811 24df9a28 2023-07-08 jrick REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3812 24df9a28 2023-07-08 jrick return got_error_msg(GOT_ERR_REGEX, search_pattern);
3813 24df9a28 2023-07-08 jrick
3814 24df9a28 2023-07-08 jrick err = got_commit_graph_open(&graph, path, !log_branches);
3815 24df9a28 2023-07-08 jrick if (err)
3816 24df9a28 2023-07-08 jrick return err;
3817 24df9a28 2023-07-08 jrick err = got_commit_graph_iter_start(graph, root_id, repo,
3818 24df9a28 2023-07-08 jrick check_cancelled, NULL);
3819 24df9a28 2023-07-08 jrick if (err)
3820 24df9a28 2023-07-08 jrick goto done;
3821 24df9a28 2023-07-08 jrick for (;;) {
3822 24df9a28 2023-07-08 jrick struct got_object_id id;
3823 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3824 24df9a28 2023-07-08 jrick &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3825 24df9a28 2023-07-08 jrick
3826 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
3827 24df9a28 2023-07-08 jrick break;
3828 24df9a28 2023-07-08 jrick
3829 24df9a28 2023-07-08 jrick err = got_commit_graph_iter_next(&id, graph, repo,
3830 24df9a28 2023-07-08 jrick check_cancelled, NULL);
3831 24df9a28 2023-07-08 jrick if (err) {
3832 24df9a28 2023-07-08 jrick if (err->code == GOT_ERR_ITER_COMPLETED)
3833 24df9a28 2023-07-08 jrick err = NULL;
3834 24df9a28 2023-07-08 jrick break;
3835 24df9a28 2023-07-08 jrick }
3836 24df9a28 2023-07-08 jrick
3837 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, &id);
3838 24df9a28 2023-07-08 jrick if (err)
3839 24df9a28 2023-07-08 jrick break;
3840 24df9a28 2023-07-08 jrick
3841 24df9a28 2023-07-08 jrick if ((show_changed_paths || (show_diffstat && !show_patch))
3842 24df9a28 2023-07-08 jrick && !reverse_display_order) {
3843 24df9a28 2023-07-08 jrick err = get_changed_paths(&changed_paths, commit, repo,
3844 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL);
3845 24df9a28 2023-07-08 jrick if (err)
3846 24df9a28 2023-07-08 jrick break;
3847 24df9a28 2023-07-08 jrick }
3848 24df9a28 2023-07-08 jrick
3849 24df9a28 2023-07-08 jrick if (search_pattern) {
3850 24df9a28 2023-07-08 jrick err = match_commit(&have_match, &id, commit, &regex);
3851 24df9a28 2023-07-08 jrick if (err) {
3852 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3853 24df9a28 2023-07-08 jrick break;
3854 24df9a28 2023-07-08 jrick }
3855 24df9a28 2023-07-08 jrick if (have_match == 0 && show_changed_paths)
3856 24df9a28 2023-07-08 jrick match_changed_paths(&have_match,
3857 24df9a28 2023-07-08 jrick &changed_paths, &regex);
3858 24df9a28 2023-07-08 jrick if (have_match == 0 && show_patch) {
3859 24df9a28 2023-07-08 jrick err = match_patch(&have_match, commit, &id,
3860 24df9a28 2023-07-08 jrick path, diff_context, repo, &regex, tmpfile);
3861 24df9a28 2023-07-08 jrick if (err)
3862 24df9a28 2023-07-08 jrick break;
3863 24df9a28 2023-07-08 jrick }
3864 24df9a28 2023-07-08 jrick if (have_match == 0) {
3865 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3866 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths,
3867 24df9a28 2023-07-08 jrick GOT_PATHLIST_FREE_ALL);
3868 24df9a28 2023-07-08 jrick continue;
3869 24df9a28 2023-07-08 jrick }
3870 24df9a28 2023-07-08 jrick }
3871 24df9a28 2023-07-08 jrick
3872 24df9a28 2023-07-08 jrick if (reverse_display_order) {
3873 24df9a28 2023-07-08 jrick err = got_object_qid_alloc(&qid, &id);
3874 24df9a28 2023-07-08 jrick if (err)
3875 24df9a28 2023-07-08 jrick break;
3876 24df9a28 2023-07-08 jrick STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3877 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3878 24df9a28 2023-07-08 jrick } else {
3879 24df9a28 2023-07-08 jrick if (one_line)
3880 24df9a28 2023-07-08 jrick err = print_commit_oneline(commit, &id,
3881 24df9a28 2023-07-08 jrick repo, refs_idmap);
3882 24df9a28 2023-07-08 jrick else
3883 24df9a28 2023-07-08 jrick err = print_commit(commit, &id, repo, path,
3884 24df9a28 2023-07-08 jrick (show_changed_paths || show_diffstat) ?
3885 24df9a28 2023-07-08 jrick &changed_paths : NULL,
3886 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, show_patch,
3887 24df9a28 2023-07-08 jrick diff_context, refs_idmap, NULL, NULL);
3888 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3889 24df9a28 2023-07-08 jrick if (err)
3890 24df9a28 2023-07-08 jrick break;
3891 24df9a28 2023-07-08 jrick }
3892 24df9a28 2023-07-08 jrick if ((limit && --limit == 0) ||
3893 24df9a28 2023-07-08 jrick (end_id && got_object_id_cmp(&id, end_id) == 0))
3894 24df9a28 2023-07-08 jrick break;
3895 24df9a28 2023-07-08 jrick
3896 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3897 24df9a28 2023-07-08 jrick }
3898 24df9a28 2023-07-08 jrick if (reverse_display_order) {
3899 24df9a28 2023-07-08 jrick STAILQ_FOREACH(qid, &reversed_commits, entry) {
3900 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3901 24df9a28 2023-07-08 jrick &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3902 24df9a28 2023-07-08 jrick
3903 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo,
3904 24df9a28 2023-07-08 jrick &qid->id);
3905 24df9a28 2023-07-08 jrick if (err)
3906 24df9a28 2023-07-08 jrick break;
3907 24df9a28 2023-07-08 jrick if (show_changed_paths ||
3908 24df9a28 2023-07-08 jrick (show_diffstat && !show_patch)) {
3909 24df9a28 2023-07-08 jrick err = get_changed_paths(&changed_paths, commit,
3910 24df9a28 2023-07-08 jrick repo, show_diffstat ? &dsa : NULL);
3911 24df9a28 2023-07-08 jrick if (err)
3912 24df9a28 2023-07-08 jrick break;
3913 24df9a28 2023-07-08 jrick }
3914 24df9a28 2023-07-08 jrick if (one_line)
3915 24df9a28 2023-07-08 jrick err = print_commit_oneline(commit, &qid->id,
3916 24df9a28 2023-07-08 jrick repo, refs_idmap);
3917 24df9a28 2023-07-08 jrick else
3918 24df9a28 2023-07-08 jrick err = print_commit(commit, &qid->id, repo, path,
3919 24df9a28 2023-07-08 jrick (show_changed_paths || show_diffstat) ?
3920 24df9a28 2023-07-08 jrick &changed_paths : NULL,
3921 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, show_patch,
3922 24df9a28 2023-07-08 jrick diff_context, refs_idmap, NULL, NULL);
3923 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3924 24df9a28 2023-07-08 jrick if (err)
3925 24df9a28 2023-07-08 jrick break;
3926 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3927 24df9a28 2023-07-08 jrick }
3928 24df9a28 2023-07-08 jrick }
3929 24df9a28 2023-07-08 jrick done:
3930 24df9a28 2023-07-08 jrick while (!STAILQ_EMPTY(&reversed_commits)) {
3931 24df9a28 2023-07-08 jrick qid = STAILQ_FIRST(&reversed_commits);
3932 24df9a28 2023-07-08 jrick STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3933 24df9a28 2023-07-08 jrick got_object_qid_free(qid);
3934 24df9a28 2023-07-08 jrick }
3935 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3936 24df9a28 2023-07-08 jrick if (search_pattern)
3937 24df9a28 2023-07-08 jrick regfree(&regex);
3938 24df9a28 2023-07-08 jrick got_commit_graph_close(graph);
3939 24df9a28 2023-07-08 jrick return err;
3940 24df9a28 2023-07-08 jrick }
3941 24df9a28 2023-07-08 jrick
3942 24df9a28 2023-07-08 jrick __dead static void
3943 24df9a28 2023-07-08 jrick usage_log(void)
3944 24df9a28 2023-07-08 jrick {
3945 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3946 24df9a28 2023-07-08 jrick "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3947 24df9a28 2023-07-08 jrick "[path]\n", getprogname());
3948 24df9a28 2023-07-08 jrick exit(1);
3949 24df9a28 2023-07-08 jrick }
3950 24df9a28 2023-07-08 jrick
3951 24df9a28 2023-07-08 jrick static int
3952 24df9a28 2023-07-08 jrick get_default_log_limit(void)
3953 24df9a28 2023-07-08 jrick {
3954 24df9a28 2023-07-08 jrick const char *got_default_log_limit;
3955 24df9a28 2023-07-08 jrick long long n;
3956 24df9a28 2023-07-08 jrick const char *errstr;
3957 24df9a28 2023-07-08 jrick
3958 24df9a28 2023-07-08 jrick got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3959 24df9a28 2023-07-08 jrick if (got_default_log_limit == NULL)
3960 24df9a28 2023-07-08 jrick return 0;
3961 24df9a28 2023-07-08 jrick n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3962 24df9a28 2023-07-08 jrick if (errstr != NULL)
3963 24df9a28 2023-07-08 jrick return 0;
3964 24df9a28 2023-07-08 jrick return n;
3965 24df9a28 2023-07-08 jrick }
3966 24df9a28 2023-07-08 jrick
3967 24df9a28 2023-07-08 jrick static const struct got_error *
3968 24df9a28 2023-07-08 jrick cmd_log(int argc, char *argv[])
3969 24df9a28 2023-07-08 jrick {
3970 24df9a28 2023-07-08 jrick const struct got_error *error;
3971 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
3972 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
3973 24df9a28 2023-07-08 jrick struct got_object_id *start_id = NULL, *end_id = NULL;
3974 24df9a28 2023-07-08 jrick char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3975 24df9a28 2023-07-08 jrick const char *start_commit = NULL, *end_commit = NULL;
3976 24df9a28 2023-07-08 jrick const char *search_pattern = NULL;
3977 24df9a28 2023-07-08 jrick int diff_context = -1, ch;
3978 24df9a28 2023-07-08 jrick int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3979 24df9a28 2023-07-08 jrick int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3980 24df9a28 2023-07-08 jrick const char *errstr;
3981 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
3982 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap = NULL;
3983 24df9a28 2023-07-08 jrick FILE *tmpfile = NULL;
3984 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
3985 24df9a28 2023-07-08 jrick
3986 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
3987 24df9a28 2023-07-08 jrick
3988 24df9a28 2023-07-08 jrick #ifndef PROFILE
3989 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3990 24df9a28 2023-07-08 jrick NULL)
3991 24df9a28 2023-07-08 jrick == -1)
3992 24df9a28 2023-07-08 jrick err(1, "pledge");
3993 24df9a28 2023-07-08 jrick #endif
3994 24df9a28 2023-07-08 jrick
3995 24df9a28 2023-07-08 jrick limit = get_default_log_limit();
3996 24df9a28 2023-07-08 jrick
3997 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3998 24df9a28 2023-07-08 jrick switch (ch) {
3999 24df9a28 2023-07-08 jrick case 'b':
4000 24df9a28 2023-07-08 jrick log_branches = 1;
4001 24df9a28 2023-07-08 jrick break;
4002 24df9a28 2023-07-08 jrick case 'C':
4003 24df9a28 2023-07-08 jrick diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4004 24df9a28 2023-07-08 jrick &errstr);
4005 24df9a28 2023-07-08 jrick if (errstr != NULL)
4006 24df9a28 2023-07-08 jrick errx(1, "number of context lines is %s: %s",
4007 24df9a28 2023-07-08 jrick errstr, optarg);
4008 24df9a28 2023-07-08 jrick break;
4009 24df9a28 2023-07-08 jrick case 'c':
4010 24df9a28 2023-07-08 jrick start_commit = optarg;
4011 24df9a28 2023-07-08 jrick break;
4012 24df9a28 2023-07-08 jrick case 'd':
4013 24df9a28 2023-07-08 jrick show_diffstat = 1;
4014 24df9a28 2023-07-08 jrick break;
4015 24df9a28 2023-07-08 jrick case 'l':
4016 24df9a28 2023-07-08 jrick limit = strtonum(optarg, 0, INT_MAX, &errstr);
4017 24df9a28 2023-07-08 jrick if (errstr != NULL)
4018 24df9a28 2023-07-08 jrick errx(1, "number of commits is %s: %s",
4019 24df9a28 2023-07-08 jrick errstr, optarg);
4020 24df9a28 2023-07-08 jrick break;
4021 24df9a28 2023-07-08 jrick case 'P':
4022 24df9a28 2023-07-08 jrick show_changed_paths = 1;
4023 24df9a28 2023-07-08 jrick break;
4024 24df9a28 2023-07-08 jrick case 'p':
4025 24df9a28 2023-07-08 jrick show_patch = 1;
4026 24df9a28 2023-07-08 jrick break;
4027 24df9a28 2023-07-08 jrick case 'R':
4028 24df9a28 2023-07-08 jrick reverse_display_order = 1;
4029 24df9a28 2023-07-08 jrick break;
4030 24df9a28 2023-07-08 jrick case 'r':
4031 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
4032 24df9a28 2023-07-08 jrick if (repo_path == NULL)
4033 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
4034 24df9a28 2023-07-08 jrick optarg);
4035 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
4036 24df9a28 2023-07-08 jrick break;
4037 24df9a28 2023-07-08 jrick case 'S':
4038 24df9a28 2023-07-08 jrick search_pattern = optarg;
4039 24df9a28 2023-07-08 jrick break;
4040 24df9a28 2023-07-08 jrick case 's':
4041 24df9a28 2023-07-08 jrick one_line = 1;
4042 24df9a28 2023-07-08 jrick break;
4043 24df9a28 2023-07-08 jrick case 'x':
4044 24df9a28 2023-07-08 jrick end_commit = optarg;
4045 24df9a28 2023-07-08 jrick break;
4046 24df9a28 2023-07-08 jrick default:
4047 24df9a28 2023-07-08 jrick usage_log();
4048 24df9a28 2023-07-08 jrick /* NOTREACHED */
4049 24df9a28 2023-07-08 jrick }
4050 24df9a28 2023-07-08 jrick }
4051 24df9a28 2023-07-08 jrick
4052 24df9a28 2023-07-08 jrick argc -= optind;
4053 24df9a28 2023-07-08 jrick argv += optind;
4054 24df9a28 2023-07-08 jrick
4055 24df9a28 2023-07-08 jrick if (diff_context == -1)
4056 24df9a28 2023-07-08 jrick diff_context = 3;
4057 24df9a28 2023-07-08 jrick else if (!show_patch)
4058 24df9a28 2023-07-08 jrick errx(1, "-C requires -p");
4059 24df9a28 2023-07-08 jrick
4060 24df9a28 2023-07-08 jrick if (one_line && (show_patch || show_changed_paths || show_diffstat))
4061 24df9a28 2023-07-08 jrick errx(1, "cannot use -s with -d, -p or -P");
4062 24df9a28 2023-07-08 jrick
4063 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
4064 24df9a28 2023-07-08 jrick if (cwd == NULL) {
4065 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
4066 24df9a28 2023-07-08 jrick goto done;
4067 24df9a28 2023-07-08 jrick }
4068 24df9a28 2023-07-08 jrick
4069 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
4070 24df9a28 2023-07-08 jrick if (error != NULL)
4071 24df9a28 2023-07-08 jrick goto done;
4072 24df9a28 2023-07-08 jrick
4073 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4074 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
4075 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
4076 24df9a28 2023-07-08 jrick goto done;
4077 24df9a28 2023-07-08 jrick error = NULL;
4078 24df9a28 2023-07-08 jrick }
4079 24df9a28 2023-07-08 jrick
4080 24df9a28 2023-07-08 jrick if (argc == 1) {
4081 24df9a28 2023-07-08 jrick if (worktree) {
4082 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&path, worktree,
4083 24df9a28 2023-07-08 jrick argv[0]);
4084 24df9a28 2023-07-08 jrick if (error)
4085 24df9a28 2023-07-08 jrick goto done;
4086 24df9a28 2023-07-08 jrick } else {
4087 24df9a28 2023-07-08 jrick path = strdup(argv[0]);
4088 24df9a28 2023-07-08 jrick if (path == NULL) {
4089 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4090 24df9a28 2023-07-08 jrick goto done;
4091 24df9a28 2023-07-08 jrick }
4092 24df9a28 2023-07-08 jrick }
4093 24df9a28 2023-07-08 jrick } else if (argc != 0)
4094 24df9a28 2023-07-08 jrick usage_log();
4095 24df9a28 2023-07-08 jrick
4096 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4097 24df9a28 2023-07-08 jrick repo_path = worktree ?
4098 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4099 24df9a28 2023-07-08 jrick }
4100 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4101 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4102 24df9a28 2023-07-08 jrick goto done;
4103 24df9a28 2023-07-08 jrick }
4104 24df9a28 2023-07-08 jrick
4105 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4106 24df9a28 2023-07-08 jrick if (error != NULL)
4107 24df9a28 2023-07-08 jrick goto done;
4108 24df9a28 2023-07-08 jrick
4109 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
4110 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
4111 24df9a28 2023-07-08 jrick if (error)
4112 24df9a28 2023-07-08 jrick goto done;
4113 24df9a28 2023-07-08 jrick
4114 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4115 24df9a28 2023-07-08 jrick if (error)
4116 24df9a28 2023-07-08 jrick goto done;
4117 24df9a28 2023-07-08 jrick
4118 24df9a28 2023-07-08 jrick error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4119 24df9a28 2023-07-08 jrick if (error)
4120 24df9a28 2023-07-08 jrick goto done;
4121 24df9a28 2023-07-08 jrick
4122 24df9a28 2023-07-08 jrick if (start_commit == NULL) {
4123 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
4124 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
4125 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo,
4126 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_head_ref_name(worktree)
4127 24df9a28 2023-07-08 jrick : GOT_REF_HEAD, 0);
4128 24df9a28 2023-07-08 jrick if (error != NULL)
4129 24df9a28 2023-07-08 jrick goto done;
4130 24df9a28 2023-07-08 jrick error = got_ref_resolve(&start_id, repo, head_ref);
4131 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
4132 24df9a28 2023-07-08 jrick if (error != NULL)
4133 24df9a28 2023-07-08 jrick goto done;
4134 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo,
4135 24df9a28 2023-07-08 jrick start_id);
4136 24df9a28 2023-07-08 jrick if (error != NULL)
4137 24df9a28 2023-07-08 jrick goto done;
4138 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4139 24df9a28 2023-07-08 jrick } else {
4140 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&start_id, NULL,
4141 24df9a28 2023-07-08 jrick start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4142 24df9a28 2023-07-08 jrick if (error != NULL)
4143 24df9a28 2023-07-08 jrick goto done;
4144 24df9a28 2023-07-08 jrick }
4145 24df9a28 2023-07-08 jrick if (end_commit != NULL) {
4146 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&end_id, NULL,
4147 24df9a28 2023-07-08 jrick end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4148 24df9a28 2023-07-08 jrick if (error != NULL)
4149 24df9a28 2023-07-08 jrick goto done;
4150 24df9a28 2023-07-08 jrick }
4151 24df9a28 2023-07-08 jrick
4152 24df9a28 2023-07-08 jrick if (worktree) {
4153 24df9a28 2023-07-08 jrick /*
4154 24df9a28 2023-07-08 jrick * If a path was specified on the command line it was resolved
4155 24df9a28 2023-07-08 jrick * to a path in the work tree above. Prepend the work tree's
4156 24df9a28 2023-07-08 jrick * path prefix to obtain the corresponding in-repository path.
4157 24df9a28 2023-07-08 jrick */
4158 24df9a28 2023-07-08 jrick if (path) {
4159 24df9a28 2023-07-08 jrick const char *prefix;
4160 24df9a28 2023-07-08 jrick prefix = got_worktree_get_path_prefix(worktree);
4161 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
4162 24df9a28 2023-07-08 jrick (path[0] != '\0') ? "/" : "", path) == -1) {
4163 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4164 24df9a28 2023-07-08 jrick goto done;
4165 24df9a28 2023-07-08 jrick }
4166 24df9a28 2023-07-08 jrick }
4167 24df9a28 2023-07-08 jrick } else
4168 24df9a28 2023-07-08 jrick error = got_repo_map_path(&in_repo_path, repo,
4169 24df9a28 2023-07-08 jrick path ? path : "");
4170 24df9a28 2023-07-08 jrick if (error != NULL)
4171 24df9a28 2023-07-08 jrick goto done;
4172 24df9a28 2023-07-08 jrick if (in_repo_path) {
4173 24df9a28 2023-07-08 jrick free(path);
4174 24df9a28 2023-07-08 jrick path = in_repo_path;
4175 24df9a28 2023-07-08 jrick }
4176 24df9a28 2023-07-08 jrick
4177 24df9a28 2023-07-08 jrick if (worktree) {
4178 24df9a28 2023-07-08 jrick /* Release work tree lock. */
4179 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4180 24df9a28 2023-07-08 jrick worktree = NULL;
4181 24df9a28 2023-07-08 jrick }
4182 24df9a28 2023-07-08 jrick
4183 24df9a28 2023-07-08 jrick if (search_pattern && show_patch) {
4184 24df9a28 2023-07-08 jrick tmpfile = got_opentemp();
4185 24df9a28 2023-07-08 jrick if (tmpfile == NULL) {
4186 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4187 24df9a28 2023-07-08 jrick goto done;
4188 24df9a28 2023-07-08 jrick }
4189 24df9a28 2023-07-08 jrick }
4190 24df9a28 2023-07-08 jrick
4191 24df9a28 2023-07-08 jrick error = print_commits(start_id, end_id, repo, path ? path : "",
4192 24df9a28 2023-07-08 jrick show_changed_paths, show_diffstat, show_patch, search_pattern,
4193 24df9a28 2023-07-08 jrick diff_context, limit, log_branches, reverse_display_order,
4194 24df9a28 2023-07-08 jrick refs_idmap, one_line, tmpfile);
4195 24df9a28 2023-07-08 jrick done:
4196 24df9a28 2023-07-08 jrick free(path);
4197 24df9a28 2023-07-08 jrick free(repo_path);
4198 24df9a28 2023-07-08 jrick free(cwd);
4199 24df9a28 2023-07-08 jrick if (worktree)
4200 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4201 24df9a28 2023-07-08 jrick if (repo) {
4202 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
4203 24df9a28 2023-07-08 jrick if (error == NULL)
4204 24df9a28 2023-07-08 jrick error = close_err;
4205 24df9a28 2023-07-08 jrick }
4206 24df9a28 2023-07-08 jrick if (pack_fds) {
4207 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
4208 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
4209 24df9a28 2023-07-08 jrick if (error == NULL)
4210 24df9a28 2023-07-08 jrick error = pack_err;
4211 24df9a28 2023-07-08 jrick }
4212 24df9a28 2023-07-08 jrick if (refs_idmap)
4213 24df9a28 2023-07-08 jrick got_reflist_object_id_map_free(refs_idmap);
4214 24df9a28 2023-07-08 jrick if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4215 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4216 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
4217 24df9a28 2023-07-08 jrick return error;
4218 24df9a28 2023-07-08 jrick }
4219 24df9a28 2023-07-08 jrick
4220 24df9a28 2023-07-08 jrick __dead static void
4221 24df9a28 2023-07-08 jrick usage_diff(void)
4222 24df9a28 2023-07-08 jrick {
4223 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4224 24df9a28 2023-07-08 jrick "[-r repository-path] [object1 object2 | path ...]\n",
4225 24df9a28 2023-07-08 jrick getprogname());
4226 24df9a28 2023-07-08 jrick exit(1);
4227 24df9a28 2023-07-08 jrick }
4228 24df9a28 2023-07-08 jrick
4229 24df9a28 2023-07-08 jrick struct print_diff_arg {
4230 24df9a28 2023-07-08 jrick struct got_repository *repo;
4231 24df9a28 2023-07-08 jrick struct got_worktree *worktree;
4232 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg *diffstat;
4233 24df9a28 2023-07-08 jrick int diff_context;
4234 24df9a28 2023-07-08 jrick const char *id_str;
4235 24df9a28 2023-07-08 jrick int header_shown;
4236 24df9a28 2023-07-08 jrick int diff_staged;
4237 24df9a28 2023-07-08 jrick enum got_diff_algorithm diff_algo;
4238 24df9a28 2023-07-08 jrick int ignore_whitespace;
4239 24df9a28 2023-07-08 jrick int force_text_diff;
4240 24df9a28 2023-07-08 jrick FILE *f1;
4241 24df9a28 2023-07-08 jrick FILE *f2;
4242 24df9a28 2023-07-08 jrick FILE *outfile;
4243 24df9a28 2023-07-08 jrick };
4244 24df9a28 2023-07-08 jrick
4245 24df9a28 2023-07-08 jrick /*
4246 24df9a28 2023-07-08 jrick * Create a file which contains the target path of a symlink so we can feed
4247 24df9a28 2023-07-08 jrick * it as content to the diff engine.
4248 24df9a28 2023-07-08 jrick */
4249 24df9a28 2023-07-08 jrick static const struct got_error *
4250 24df9a28 2023-07-08 jrick get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4251 24df9a28 2023-07-08 jrick const char *abspath)
4252 24df9a28 2023-07-08 jrick {
4253 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
4254 24df9a28 2023-07-08 jrick char target_path[PATH_MAX];
4255 24df9a28 2023-07-08 jrick ssize_t target_len, outlen;
4256 24df9a28 2023-07-08 jrick
4257 24df9a28 2023-07-08 jrick *fd = -1;
4258 24df9a28 2023-07-08 jrick
4259 24df9a28 2023-07-08 jrick if (dirfd != -1) {
4260 24df9a28 2023-07-08 jrick target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4261 24df9a28 2023-07-08 jrick if (target_len == -1)
4262 24df9a28 2023-07-08 jrick return got_error_from_errno2("readlinkat", abspath);
4263 24df9a28 2023-07-08 jrick } else {
4264 24df9a28 2023-07-08 jrick target_len = readlink(abspath, target_path, PATH_MAX);
4265 24df9a28 2023-07-08 jrick if (target_len == -1)
4266 24df9a28 2023-07-08 jrick return got_error_from_errno2("readlink", abspath);
4267 24df9a28 2023-07-08 jrick }
4268 24df9a28 2023-07-08 jrick
4269 24df9a28 2023-07-08 jrick *fd = got_opentempfd();
4270 24df9a28 2023-07-08 jrick if (*fd == -1)
4271 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
4272 24df9a28 2023-07-08 jrick
4273 24df9a28 2023-07-08 jrick outlen = write(*fd, target_path, target_len);
4274 24df9a28 2023-07-08 jrick if (outlen == -1) {
4275 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4276 24df9a28 2023-07-08 jrick goto done;
4277 24df9a28 2023-07-08 jrick }
4278 24df9a28 2023-07-08 jrick
4279 24df9a28 2023-07-08 jrick if (lseek(*fd, 0, SEEK_SET) == -1) {
4280 24df9a28 2023-07-08 jrick err = got_error_from_errno2("lseek", abspath);
4281 24df9a28 2023-07-08 jrick goto done;
4282 24df9a28 2023-07-08 jrick }
4283 24df9a28 2023-07-08 jrick done:
4284 24df9a28 2023-07-08 jrick if (err) {
4285 24df9a28 2023-07-08 jrick close(*fd);
4286 24df9a28 2023-07-08 jrick *fd = -1;
4287 24df9a28 2023-07-08 jrick }
4288 24df9a28 2023-07-08 jrick return err;
4289 24df9a28 2023-07-08 jrick }
4290 24df9a28 2023-07-08 jrick
4291 24df9a28 2023-07-08 jrick static const struct got_error *
4292 24df9a28 2023-07-08 jrick print_diff(void *arg, unsigned char status, unsigned char staged_status,
4293 24df9a28 2023-07-08 jrick const char *path, struct got_object_id *blob_id,
4294 24df9a28 2023-07-08 jrick struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4295 24df9a28 2023-07-08 jrick int dirfd, const char *de_name)
4296 24df9a28 2023-07-08 jrick {
4297 24df9a28 2023-07-08 jrick struct print_diff_arg *a = arg;
4298 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
4299 24df9a28 2023-07-08 jrick struct got_blob_object *blob1 = NULL;
4300 24df9a28 2023-07-08 jrick int fd = -1, fd1 = -1, fd2 = -1;
4301 24df9a28 2023-07-08 jrick FILE *f2 = NULL;
4302 24df9a28 2023-07-08 jrick char *abspath = NULL, *label1 = NULL;
4303 24df9a28 2023-07-08 jrick struct stat sb;
4304 24df9a28 2023-07-08 jrick off_t size1 = 0;
4305 24df9a28 2023-07-08 jrick int f2_exists = 0;
4306 24df9a28 2023-07-08 jrick
4307 24df9a28 2023-07-08 jrick memset(&sb, 0, sizeof(sb));
4308 24df9a28 2023-07-08 jrick
4309 24df9a28 2023-07-08 jrick if (a->diff_staged) {
4310 24df9a28 2023-07-08 jrick if (staged_status != GOT_STATUS_MODIFY &&
4311 24df9a28 2023-07-08 jrick staged_status != GOT_STATUS_ADD &&
4312 24df9a28 2023-07-08 jrick staged_status != GOT_STATUS_DELETE)
4313 24df9a28 2023-07-08 jrick return NULL;
4314 24df9a28 2023-07-08 jrick } else {
4315 24df9a28 2023-07-08 jrick if (staged_status == GOT_STATUS_DELETE)
4316 24df9a28 2023-07-08 jrick return NULL;
4317 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_NONEXISTENT)
4318 24df9a28 2023-07-08 jrick return got_error_set_errno(ENOENT, path);
4319 24df9a28 2023-07-08 jrick if (status != GOT_STATUS_MODIFY &&
4320 24df9a28 2023-07-08 jrick status != GOT_STATUS_ADD &&
4321 24df9a28 2023-07-08 jrick status != GOT_STATUS_DELETE &&
4322 24df9a28 2023-07-08 jrick status != GOT_STATUS_CONFLICT)
4323 24df9a28 2023-07-08 jrick return NULL;
4324 24df9a28 2023-07-08 jrick }
4325 24df9a28 2023-07-08 jrick
4326 24df9a28 2023-07-08 jrick err = got_opentemp_truncate(a->f1);
4327 24df9a28 2023-07-08 jrick if (err)
4328 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentemp_truncate");
4329 24df9a28 2023-07-08 jrick err = got_opentemp_truncate(a->f2);
4330 24df9a28 2023-07-08 jrick if (err)
4331 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentemp_truncate");
4332 24df9a28 2023-07-08 jrick
4333 24df9a28 2023-07-08 jrick if (!a->header_shown) {
4334 24df9a28 2023-07-08 jrick if (fprintf(a->outfile, "diff %s%s\n",
4335 24df9a28 2023-07-08 jrick a->diff_staged ? "-s " : "",
4336 24df9a28 2023-07-08 jrick got_worktree_get_root_path(a->worktree)) < 0) {
4337 24df9a28 2023-07-08 jrick err = got_error_from_errno("fprintf");
4338 24df9a28 2023-07-08 jrick goto done;
4339 24df9a28 2023-07-08 jrick }
4340 24df9a28 2023-07-08 jrick if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4341 24df9a28 2023-07-08 jrick err = got_error_from_errno("fprintf");
4342 24df9a28 2023-07-08 jrick goto done;
4343 24df9a28 2023-07-08 jrick }
4344 24df9a28 2023-07-08 jrick if (fprintf(a->outfile, "path + %s%s\n",
4345 24df9a28 2023-07-08 jrick got_worktree_get_root_path(a->worktree),
4346 24df9a28 2023-07-08 jrick a->diff_staged ? " (staged changes)" : "") < 0) {
4347 24df9a28 2023-07-08 jrick err = got_error_from_errno("fprintf");
4348 24df9a28 2023-07-08 jrick goto done;
4349 24df9a28 2023-07-08 jrick }
4350 24df9a28 2023-07-08 jrick a->header_shown = 1;
4351 24df9a28 2023-07-08 jrick }
4352 24df9a28 2023-07-08 jrick
4353 24df9a28 2023-07-08 jrick if (a->diff_staged) {
4354 24df9a28 2023-07-08 jrick const char *label1 = NULL, *label2 = NULL;
4355 24df9a28 2023-07-08 jrick switch (staged_status) {
4356 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
4357 24df9a28 2023-07-08 jrick label1 = path;
4358 24df9a28 2023-07-08 jrick label2 = path;
4359 24df9a28 2023-07-08 jrick break;
4360 24df9a28 2023-07-08 jrick case GOT_STATUS_ADD:
4361 24df9a28 2023-07-08 jrick label2 = path;
4362 24df9a28 2023-07-08 jrick break;
4363 24df9a28 2023-07-08 jrick case GOT_STATUS_DELETE:
4364 24df9a28 2023-07-08 jrick label1 = path;
4365 24df9a28 2023-07-08 jrick break;
4366 24df9a28 2023-07-08 jrick default:
4367 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_FILE_STATUS);
4368 24df9a28 2023-07-08 jrick }
4369 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
4370 24df9a28 2023-07-08 jrick if (fd1 == -1) {
4371 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4372 24df9a28 2023-07-08 jrick goto done;
4373 24df9a28 2023-07-08 jrick }
4374 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
4375 24df9a28 2023-07-08 jrick if (fd2 == -1) {
4376 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4377 24df9a28 2023-07-08 jrick goto done;
4378 24df9a28 2023-07-08 jrick }
4379 24df9a28 2023-07-08 jrick err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4380 24df9a28 2023-07-08 jrick fd1, fd2, blob_id, staged_blob_id, label1, label2,
4381 24df9a28 2023-07-08 jrick a->diff_algo, a->diff_context, a->ignore_whitespace,
4382 24df9a28 2023-07-08 jrick a->force_text_diff, a->diffstat, a->repo, a->outfile);
4383 24df9a28 2023-07-08 jrick goto done;
4384 24df9a28 2023-07-08 jrick }
4385 24df9a28 2023-07-08 jrick
4386 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
4387 24df9a28 2023-07-08 jrick if (fd1 == -1) {
4388 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4389 24df9a28 2023-07-08 jrick goto done;
4390 24df9a28 2023-07-08 jrick }
4391 24df9a28 2023-07-08 jrick
4392 24df9a28 2023-07-08 jrick if (staged_status == GOT_STATUS_ADD ||
4393 24df9a28 2023-07-08 jrick staged_status == GOT_STATUS_MODIFY) {
4394 24df9a28 2023-07-08 jrick char *id_str;
4395 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4396 24df9a28 2023-07-08 jrick 8192, fd1);
4397 24df9a28 2023-07-08 jrick if (err)
4398 24df9a28 2023-07-08 jrick goto done;
4399 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, staged_blob_id);
4400 24df9a28 2023-07-08 jrick if (err)
4401 24df9a28 2023-07-08 jrick goto done;
4402 24df9a28 2023-07-08 jrick if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4403 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
4404 24df9a28 2023-07-08 jrick free(id_str);
4405 24df9a28 2023-07-08 jrick goto done;
4406 24df9a28 2023-07-08 jrick }
4407 24df9a28 2023-07-08 jrick free(id_str);
4408 24df9a28 2023-07-08 jrick } else if (status != GOT_STATUS_ADD) {
4409 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4410 24df9a28 2023-07-08 jrick fd1);
4411 24df9a28 2023-07-08 jrick if (err)
4412 24df9a28 2023-07-08 jrick goto done;
4413 24df9a28 2023-07-08 jrick }
4414 24df9a28 2023-07-08 jrick
4415 24df9a28 2023-07-08 jrick if (status != GOT_STATUS_DELETE) {
4416 24df9a28 2023-07-08 jrick if (asprintf(&abspath, "%s/%s",
4417 24df9a28 2023-07-08 jrick got_worktree_get_root_path(a->worktree), path) == -1) {
4418 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
4419 24df9a28 2023-07-08 jrick goto done;
4420 24df9a28 2023-07-08 jrick }
4421 24df9a28 2023-07-08 jrick
4422 24df9a28 2023-07-08 jrick if (dirfd != -1) {
4423 24df9a28 2023-07-08 jrick fd = openat(dirfd, de_name,
4424 24df9a28 2023-07-08 jrick O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4425 24df9a28 2023-07-08 jrick if (fd == -1) {
4426 24df9a28 2023-07-08 jrick if (!got_err_open_nofollow_on_symlink()) {
4427 24df9a28 2023-07-08 jrick err = got_error_from_errno2("openat",
4428 24df9a28 2023-07-08 jrick abspath);
4429 24df9a28 2023-07-08 jrick goto done;
4430 24df9a28 2023-07-08 jrick }
4431 24df9a28 2023-07-08 jrick err = get_symlink_target_file(&fd, dirfd,
4432 24df9a28 2023-07-08 jrick de_name, abspath);
4433 24df9a28 2023-07-08 jrick if (err)
4434 24df9a28 2023-07-08 jrick goto done;
4435 24df9a28 2023-07-08 jrick }
4436 24df9a28 2023-07-08 jrick } else {
4437 24df9a28 2023-07-08 jrick fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4438 24df9a28 2023-07-08 jrick if (fd == -1) {
4439 24df9a28 2023-07-08 jrick if (!got_err_open_nofollow_on_symlink()) {
4440 24df9a28 2023-07-08 jrick err = got_error_from_errno2("open",
4441 24df9a28 2023-07-08 jrick abspath);
4442 24df9a28 2023-07-08 jrick goto done;
4443 24df9a28 2023-07-08 jrick }
4444 24df9a28 2023-07-08 jrick err = get_symlink_target_file(&fd, dirfd,
4445 24df9a28 2023-07-08 jrick de_name, abspath);
4446 24df9a28 2023-07-08 jrick if (err)
4447 24df9a28 2023-07-08 jrick goto done;
4448 24df9a28 2023-07-08 jrick }
4449 24df9a28 2023-07-08 jrick }
4450 24df9a28 2023-07-08 jrick if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4451 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fstatat", abspath);
4452 24df9a28 2023-07-08 jrick goto done;
4453 24df9a28 2023-07-08 jrick }
4454 24df9a28 2023-07-08 jrick f2 = fdopen(fd, "r");
4455 24df9a28 2023-07-08 jrick if (f2 == NULL) {
4456 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fdopen", abspath);
4457 24df9a28 2023-07-08 jrick goto done;
4458 24df9a28 2023-07-08 jrick }
4459 24df9a28 2023-07-08 jrick fd = -1;
4460 24df9a28 2023-07-08 jrick f2_exists = 1;
4461 24df9a28 2023-07-08 jrick }
4462 24df9a28 2023-07-08 jrick
4463 24df9a28 2023-07-08 jrick if (blob1) {
4464 24df9a28 2023-07-08 jrick err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4465 24df9a28 2023-07-08 jrick a->f1, blob1);
4466 24df9a28 2023-07-08 jrick if (err)
4467 24df9a28 2023-07-08 jrick goto done;
4468 24df9a28 2023-07-08 jrick }
4469 24df9a28 2023-07-08 jrick
4470 24df9a28 2023-07-08 jrick err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4471 24df9a28 2023-07-08 jrick f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4472 24df9a28 2023-07-08 jrick a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
4473 24df9a28 2023-07-08 jrick done:
4474 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4475 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
4476 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4477 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
4478 24df9a28 2023-07-08 jrick if (blob1)
4479 24df9a28 2023-07-08 jrick got_object_blob_close(blob1);
4480 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
4481 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
4482 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
4483 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
4484 24df9a28 2023-07-08 jrick free(abspath);
4485 24df9a28 2023-07-08 jrick return err;
4486 24df9a28 2023-07-08 jrick }
4487 24df9a28 2023-07-08 jrick
4488 24df9a28 2023-07-08 jrick static const struct got_error *
4489 24df9a28 2023-07-08 jrick cmd_diff(int argc, char *argv[])
4490 24df9a28 2023-07-08 jrick {
4491 24df9a28 2023-07-08 jrick const struct got_error *error;
4492 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
4493 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
4494 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL;
4495 24df9a28 2023-07-08 jrick const char *commit_args[2] = { NULL, NULL };
4496 24df9a28 2023-07-08 jrick int ncommit_args = 0;
4497 24df9a28 2023-07-08 jrick struct got_object_id *ids[2] = { NULL, NULL };
4498 24df9a28 2023-07-08 jrick char *labels[2] = { NULL, NULL };
4499 24df9a28 2023-07-08 jrick int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4500 24df9a28 2023-07-08 jrick int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4501 24df9a28 2023-07-08 jrick int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
4502 24df9a28 2023-07-08 jrick const char *errstr;
4503 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
4504 24df9a28 2023-07-08 jrick struct got_pathlist_head diffstat_paths, paths;
4505 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4506 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
4507 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
4508 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg dsa;
4509 24df9a28 2023-07-08 jrick
4510 24df9a28 2023-07-08 jrick memset(&dsa, 0, sizeof(dsa));
4511 24df9a28 2023-07-08 jrick
4512 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
4513 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
4514 24df9a28 2023-07-08 jrick TAILQ_INIT(&diffstat_paths);
4515 24df9a28 2023-07-08 jrick
4516 24df9a28 2023-07-08 jrick #ifndef PROFILE
4517 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4518 24df9a28 2023-07-08 jrick NULL) == -1)
4519 24df9a28 2023-07-08 jrick err(1, "pledge");
4520 24df9a28 2023-07-08 jrick #endif
4521 24df9a28 2023-07-08 jrick
4522 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
4523 24df9a28 2023-07-08 jrick switch (ch) {
4524 24df9a28 2023-07-08 jrick case 'a':
4525 24df9a28 2023-07-08 jrick force_text_diff = 1;
4526 24df9a28 2023-07-08 jrick break;
4527 24df9a28 2023-07-08 jrick case 'C':
4528 24df9a28 2023-07-08 jrick diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4529 24df9a28 2023-07-08 jrick &errstr);
4530 24df9a28 2023-07-08 jrick if (errstr != NULL)
4531 24df9a28 2023-07-08 jrick errx(1, "number of context lines is %s: %s",
4532 24df9a28 2023-07-08 jrick errstr, optarg);
4533 24df9a28 2023-07-08 jrick break;
4534 24df9a28 2023-07-08 jrick case 'c':
4535 24df9a28 2023-07-08 jrick if (ncommit_args >= 2)
4536 24df9a28 2023-07-08 jrick errx(1, "too many -c options used");
4537 24df9a28 2023-07-08 jrick commit_args[ncommit_args++] = optarg;
4538 24df9a28 2023-07-08 jrick break;
4539 24df9a28 2023-07-08 jrick case 'd':
4540 24df9a28 2023-07-08 jrick show_diffstat = 1;
4541 24df9a28 2023-07-08 jrick break;
4542 24df9a28 2023-07-08 jrick case 'P':
4543 24df9a28 2023-07-08 jrick force_path = 1;
4544 24df9a28 2023-07-08 jrick break;
4545 24df9a28 2023-07-08 jrick case 'r':
4546 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
4547 24df9a28 2023-07-08 jrick if (repo_path == NULL)
4548 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
4549 24df9a28 2023-07-08 jrick optarg);
4550 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
4551 24df9a28 2023-07-08 jrick rflag = 1;
4552 24df9a28 2023-07-08 jrick break;
4553 24df9a28 2023-07-08 jrick case 's':
4554 24df9a28 2023-07-08 jrick diff_staged = 1;
4555 24df9a28 2023-07-08 jrick break;
4556 24df9a28 2023-07-08 jrick case 'w':
4557 24df9a28 2023-07-08 jrick ignore_whitespace = 1;
4558 24df9a28 2023-07-08 jrick break;
4559 24df9a28 2023-07-08 jrick default:
4560 24df9a28 2023-07-08 jrick usage_diff();
4561 24df9a28 2023-07-08 jrick /* NOTREACHED */
4562 24df9a28 2023-07-08 jrick }
4563 24df9a28 2023-07-08 jrick }
4564 24df9a28 2023-07-08 jrick
4565 24df9a28 2023-07-08 jrick argc -= optind;
4566 24df9a28 2023-07-08 jrick argv += optind;
4567 24df9a28 2023-07-08 jrick
4568 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
4569 24df9a28 2023-07-08 jrick if (cwd == NULL) {
4570 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
4571 24df9a28 2023-07-08 jrick goto done;
4572 24df9a28 2023-07-08 jrick }
4573 24df9a28 2023-07-08 jrick
4574 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
4575 24df9a28 2023-07-08 jrick if (error != NULL)
4576 24df9a28 2023-07-08 jrick goto done;
4577 24df9a28 2023-07-08 jrick
4578 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4579 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
4580 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
4581 24df9a28 2023-07-08 jrick goto done;
4582 24df9a28 2023-07-08 jrick else
4583 24df9a28 2023-07-08 jrick error = NULL;
4584 24df9a28 2023-07-08 jrick if (worktree) {
4585 24df9a28 2023-07-08 jrick repo_path =
4586 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
4587 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4588 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4589 24df9a28 2023-07-08 jrick goto done;
4590 24df9a28 2023-07-08 jrick }
4591 24df9a28 2023-07-08 jrick } else {
4592 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
4593 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4594 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4595 24df9a28 2023-07-08 jrick goto done;
4596 24df9a28 2023-07-08 jrick }
4597 24df9a28 2023-07-08 jrick }
4598 24df9a28 2023-07-08 jrick }
4599 24df9a28 2023-07-08 jrick
4600 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4601 24df9a28 2023-07-08 jrick free(repo_path);
4602 24df9a28 2023-07-08 jrick if (error != NULL)
4603 24df9a28 2023-07-08 jrick goto done;
4604 24df9a28 2023-07-08 jrick
4605 24df9a28 2023-07-08 jrick if (show_diffstat) {
4606 24df9a28 2023-07-08 jrick dsa.paths = &diffstat_paths;
4607 24df9a28 2023-07-08 jrick dsa.force_text = force_text_diff;
4608 24df9a28 2023-07-08 jrick dsa.ignore_ws = ignore_whitespace;
4609 24df9a28 2023-07-08 jrick dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4610 24df9a28 2023-07-08 jrick }
4611 24df9a28 2023-07-08 jrick
4612 24df9a28 2023-07-08 jrick if (rflag || worktree == NULL || ncommit_args > 0) {
4613 24df9a28 2023-07-08 jrick if (force_path) {
4614 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_NOT_IMPL,
4615 24df9a28 2023-07-08 jrick "-P option can only be used when diffing "
4616 24df9a28 2023-07-08 jrick "a work tree");
4617 24df9a28 2023-07-08 jrick goto done;
4618 24df9a28 2023-07-08 jrick }
4619 24df9a28 2023-07-08 jrick if (diff_staged) {
4620 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_NOT_IMPL,
4621 24df9a28 2023-07-08 jrick "-s option can only be used when diffing "
4622 24df9a28 2023-07-08 jrick "a work tree");
4623 24df9a28 2023-07-08 jrick goto done;
4624 24df9a28 2023-07-08 jrick }
4625 24df9a28 2023-07-08 jrick }
4626 24df9a28 2023-07-08 jrick
4627 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
4628 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
4629 24df9a28 2023-07-08 jrick if (error)
4630 24df9a28 2023-07-08 jrick goto done;
4631 24df9a28 2023-07-08 jrick
4632 24df9a28 2023-07-08 jrick if ((!force_path && argc == 2) || ncommit_args > 0) {
4633 24df9a28 2023-07-08 jrick int obj_type = (ncommit_args > 0 ?
4634 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4635 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4636 24df9a28 2023-07-08 jrick NULL);
4637 24df9a28 2023-07-08 jrick if (error)
4638 24df9a28 2023-07-08 jrick goto done;
4639 24df9a28 2023-07-08 jrick for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4640 24df9a28 2023-07-08 jrick const char *arg;
4641 24df9a28 2023-07-08 jrick if (ncommit_args > 0)
4642 24df9a28 2023-07-08 jrick arg = commit_args[i];
4643 24df9a28 2023-07-08 jrick else
4644 24df9a28 2023-07-08 jrick arg = argv[i];
4645 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&ids[i], &labels[i],
4646 24df9a28 2023-07-08 jrick arg, obj_type, &refs, repo);
4647 24df9a28 2023-07-08 jrick if (error) {
4648 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF &&
4649 24df9a28 2023-07-08 jrick error->code != GOT_ERR_NO_OBJ)
4650 24df9a28 2023-07-08 jrick goto done;
4651 24df9a28 2023-07-08 jrick if (ncommit_args > 0)
4652 24df9a28 2023-07-08 jrick goto done;
4653 24df9a28 2023-07-08 jrick error = NULL;
4654 24df9a28 2023-07-08 jrick break;
4655 24df9a28 2023-07-08 jrick }
4656 24df9a28 2023-07-08 jrick }
4657 24df9a28 2023-07-08 jrick }
4658 24df9a28 2023-07-08 jrick
4659 24df9a28 2023-07-08 jrick f1 = got_opentemp();
4660 24df9a28 2023-07-08 jrick if (f1 == NULL) {
4661 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4662 24df9a28 2023-07-08 jrick goto done;
4663 24df9a28 2023-07-08 jrick }
4664 24df9a28 2023-07-08 jrick
4665 24df9a28 2023-07-08 jrick f2 = got_opentemp();
4666 24df9a28 2023-07-08 jrick if (f2 == NULL) {
4667 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4668 24df9a28 2023-07-08 jrick goto done;
4669 24df9a28 2023-07-08 jrick }
4670 24df9a28 2023-07-08 jrick
4671 24df9a28 2023-07-08 jrick outfile = got_opentemp();
4672 24df9a28 2023-07-08 jrick if (outfile == NULL) {
4673 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4674 24df9a28 2023-07-08 jrick goto done;
4675 24df9a28 2023-07-08 jrick }
4676 24df9a28 2023-07-08 jrick
4677 24df9a28 2023-07-08 jrick if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4678 24df9a28 2023-07-08 jrick struct print_diff_arg arg;
4679 24df9a28 2023-07-08 jrick char *id_str;
4680 24df9a28 2023-07-08 jrick
4681 24df9a28 2023-07-08 jrick if (worktree == NULL) {
4682 24df9a28 2023-07-08 jrick if (argc == 2 && ids[0] == NULL) {
4683 24df9a28 2023-07-08 jrick error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4684 24df9a28 2023-07-08 jrick goto done;
4685 24df9a28 2023-07-08 jrick } else if (argc == 2 && ids[1] == NULL) {
4686 24df9a28 2023-07-08 jrick error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4687 24df9a28 2023-07-08 jrick goto done;
4688 24df9a28 2023-07-08 jrick } else if (argc > 0) {
4689 24df9a28 2023-07-08 jrick error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4690 24df9a28 2023-07-08 jrick "%s", "specified paths cannot be resolved");
4691 24df9a28 2023-07-08 jrick goto done;
4692 24df9a28 2023-07-08 jrick } else {
4693 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_NOT_WORKTREE);
4694 24df9a28 2023-07-08 jrick goto done;
4695 24df9a28 2023-07-08 jrick }
4696 24df9a28 2023-07-08 jrick }
4697 24df9a28 2023-07-08 jrick
4698 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv,
4699 24df9a28 2023-07-08 jrick worktree);
4700 24df9a28 2023-07-08 jrick if (error)
4701 24df9a28 2023-07-08 jrick goto done;
4702 24df9a28 2023-07-08 jrick
4703 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str,
4704 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree));
4705 24df9a28 2023-07-08 jrick if (error)
4706 24df9a28 2023-07-08 jrick goto done;
4707 24df9a28 2023-07-08 jrick arg.repo = repo;
4708 24df9a28 2023-07-08 jrick arg.worktree = worktree;
4709 24df9a28 2023-07-08 jrick arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4710 24df9a28 2023-07-08 jrick arg.diff_context = diff_context;
4711 24df9a28 2023-07-08 jrick arg.id_str = id_str;
4712 24df9a28 2023-07-08 jrick arg.header_shown = 0;
4713 24df9a28 2023-07-08 jrick arg.diff_staged = diff_staged;
4714 24df9a28 2023-07-08 jrick arg.ignore_whitespace = ignore_whitespace;
4715 24df9a28 2023-07-08 jrick arg.force_text_diff = force_text_diff;
4716 24df9a28 2023-07-08 jrick arg.diffstat = show_diffstat ? &dsa : NULL;
4717 24df9a28 2023-07-08 jrick arg.f1 = f1;
4718 24df9a28 2023-07-08 jrick arg.f2 = f2;
4719 24df9a28 2023-07-08 jrick arg.outfile = outfile;
4720 24df9a28 2023-07-08 jrick
4721 24df9a28 2023-07-08 jrick error = got_worktree_status(worktree, &paths, repo, 0,
4722 24df9a28 2023-07-08 jrick print_diff, &arg, check_cancelled, NULL);
4723 24df9a28 2023-07-08 jrick free(id_str);
4724 24df9a28 2023-07-08 jrick if (error)
4725 24df9a28 2023-07-08 jrick goto done;
4726 24df9a28 2023-07-08 jrick
4727 24df9a28 2023-07-08 jrick if (show_diffstat && dsa.nfiles > 0) {
4728 24df9a28 2023-07-08 jrick char *header;
4729 24df9a28 2023-07-08 jrick
4730 24df9a28 2023-07-08 jrick if (asprintf(&header, "diffstat %s%s",
4731 24df9a28 2023-07-08 jrick diff_staged ? "-s " : "",
4732 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree)) == -1) {
4733 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4734 24df9a28 2023-07-08 jrick goto done;
4735 24df9a28 2023-07-08 jrick }
4736 24df9a28 2023-07-08 jrick
4737 24df9a28 2023-07-08 jrick error = print_diffstat(&dsa, header);
4738 24df9a28 2023-07-08 jrick free(header);
4739 24df9a28 2023-07-08 jrick if (error)
4740 24df9a28 2023-07-08 jrick goto done;
4741 24df9a28 2023-07-08 jrick }
4742 24df9a28 2023-07-08 jrick
4743 24df9a28 2023-07-08 jrick error = printfile(outfile);
4744 24df9a28 2023-07-08 jrick goto done;
4745 24df9a28 2023-07-08 jrick }
4746 24df9a28 2023-07-08 jrick
4747 24df9a28 2023-07-08 jrick if (ncommit_args == 1) {
4748 24df9a28 2023-07-08 jrick struct got_commit_object *commit;
4749 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, ids[0]);
4750 24df9a28 2023-07-08 jrick if (error)
4751 24df9a28 2023-07-08 jrick goto done;
4752 24df9a28 2023-07-08 jrick
4753 24df9a28 2023-07-08 jrick labels[1] = labels[0];
4754 24df9a28 2023-07-08 jrick ids[1] = ids[0];
4755 24df9a28 2023-07-08 jrick if (got_object_commit_get_nparents(commit) > 0) {
4756 24df9a28 2023-07-08 jrick const struct got_object_id_queue *pids;
4757 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
4758 24df9a28 2023-07-08 jrick pids = got_object_commit_get_parent_ids(commit);
4759 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(pids);
4760 24df9a28 2023-07-08 jrick ids[0] = got_object_id_dup(&pid->id);
4761 24df9a28 2023-07-08 jrick if (ids[0] == NULL) {
4762 24df9a28 2023-07-08 jrick error = got_error_from_errno(
4763 24df9a28 2023-07-08 jrick "got_object_id_dup");
4764 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4765 24df9a28 2023-07-08 jrick goto done;
4766 24df9a28 2023-07-08 jrick }
4767 24df9a28 2023-07-08 jrick error = got_object_id_str(&labels[0], ids[0]);
4768 24df9a28 2023-07-08 jrick if (error) {
4769 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4770 24df9a28 2023-07-08 jrick goto done;
4771 24df9a28 2023-07-08 jrick }
4772 24df9a28 2023-07-08 jrick } else {
4773 24df9a28 2023-07-08 jrick ids[0] = NULL;
4774 24df9a28 2023-07-08 jrick labels[0] = strdup("/dev/null");
4775 24df9a28 2023-07-08 jrick if (labels[0] == NULL) {
4776 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4777 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4778 24df9a28 2023-07-08 jrick goto done;
4779 24df9a28 2023-07-08 jrick }
4780 24df9a28 2023-07-08 jrick }
4781 24df9a28 2023-07-08 jrick
4782 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4783 24df9a28 2023-07-08 jrick }
4784 24df9a28 2023-07-08 jrick
4785 24df9a28 2023-07-08 jrick if (ncommit_args == 0 && argc > 2) {
4786 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
4787 24df9a28 2023-07-08 jrick "path arguments cannot be used when diffing two objects");
4788 24df9a28 2023-07-08 jrick goto done;
4789 24df9a28 2023-07-08 jrick }
4790 24df9a28 2023-07-08 jrick
4791 24df9a28 2023-07-08 jrick if (ids[0]) {
4792 24df9a28 2023-07-08 jrick error = got_object_get_type(&type1, repo, ids[0]);
4793 24df9a28 2023-07-08 jrick if (error)
4794 24df9a28 2023-07-08 jrick goto done;
4795 24df9a28 2023-07-08 jrick }
4796 24df9a28 2023-07-08 jrick
4797 24df9a28 2023-07-08 jrick error = got_object_get_type(&type2, repo, ids[1]);
4798 24df9a28 2023-07-08 jrick if (error)
4799 24df9a28 2023-07-08 jrick goto done;
4800 24df9a28 2023-07-08 jrick if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4801 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_OBJ_TYPE);
4802 24df9a28 2023-07-08 jrick goto done;
4803 24df9a28 2023-07-08 jrick }
4804 24df9a28 2023-07-08 jrick if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
4805 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_OBJ_TYPE,
4806 24df9a28 2023-07-08 jrick "path arguments cannot be used when diffing blobs");
4807 24df9a28 2023-07-08 jrick goto done;
4808 24df9a28 2023-07-08 jrick }
4809 24df9a28 2023-07-08 jrick
4810 24df9a28 2023-07-08 jrick for (i = 0; ncommit_args > 0 && i < argc; i++) {
4811 24df9a28 2023-07-08 jrick char *in_repo_path;
4812 24df9a28 2023-07-08 jrick struct got_pathlist_entry *new;
4813 24df9a28 2023-07-08 jrick if (worktree) {
4814 24df9a28 2023-07-08 jrick const char *prefix;
4815 24df9a28 2023-07-08 jrick char *p;
4816 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&p, worktree,
4817 24df9a28 2023-07-08 jrick argv[i]);
4818 24df9a28 2023-07-08 jrick if (error)
4819 24df9a28 2023-07-08 jrick goto done;
4820 24df9a28 2023-07-08 jrick prefix = got_worktree_get_path_prefix(worktree);
4821 24df9a28 2023-07-08 jrick while (prefix[0] == '/')
4822 24df9a28 2023-07-08 jrick prefix++;
4823 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
4824 24df9a28 2023-07-08 jrick (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4825 24df9a28 2023-07-08 jrick p) == -1) {
4826 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4827 24df9a28 2023-07-08 jrick free(p);
4828 24df9a28 2023-07-08 jrick goto done;
4829 24df9a28 2023-07-08 jrick }
4830 24df9a28 2023-07-08 jrick free(p);
4831 24df9a28 2023-07-08 jrick } else {
4832 24df9a28 2023-07-08 jrick char *mapped_path, *s;
4833 24df9a28 2023-07-08 jrick error = got_repo_map_path(&mapped_path, repo, argv[i]);
4834 24df9a28 2023-07-08 jrick if (error)
4835 24df9a28 2023-07-08 jrick goto done;
4836 24df9a28 2023-07-08 jrick s = mapped_path;
4837 24df9a28 2023-07-08 jrick while (s[0] == '/')
4838 24df9a28 2023-07-08 jrick s++;
4839 24df9a28 2023-07-08 jrick in_repo_path = strdup(s);
4840 24df9a28 2023-07-08 jrick if (in_repo_path == NULL) {
4841 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4842 24df9a28 2023-07-08 jrick free(mapped_path);
4843 24df9a28 2023-07-08 jrick goto done;
4844 24df9a28 2023-07-08 jrick }
4845 24df9a28 2023-07-08 jrick free(mapped_path);
4846 24df9a28 2023-07-08 jrick
4847 24df9a28 2023-07-08 jrick }
4848 24df9a28 2023-07-08 jrick error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4849 24df9a28 2023-07-08 jrick if (error || new == NULL /* duplicate */)
4850 24df9a28 2023-07-08 jrick free(in_repo_path);
4851 24df9a28 2023-07-08 jrick if (error)
4852 24df9a28 2023-07-08 jrick goto done;
4853 24df9a28 2023-07-08 jrick }
4854 24df9a28 2023-07-08 jrick
4855 24df9a28 2023-07-08 jrick if (worktree) {
4856 24df9a28 2023-07-08 jrick /* Release work tree lock. */
4857 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4858 24df9a28 2023-07-08 jrick worktree = NULL;
4859 24df9a28 2023-07-08 jrick }
4860 24df9a28 2023-07-08 jrick
4861 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
4862 24df9a28 2023-07-08 jrick if (fd1 == -1) {
4863 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
4864 24df9a28 2023-07-08 jrick goto done;
4865 24df9a28 2023-07-08 jrick }
4866 24df9a28 2023-07-08 jrick
4867 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
4868 24df9a28 2023-07-08 jrick if (fd2 == -1) {
4869 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
4870 24df9a28 2023-07-08 jrick goto done;
4871 24df9a28 2023-07-08 jrick }
4872 24df9a28 2023-07-08 jrick
4873 24df9a28 2023-07-08 jrick switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4874 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
4875 24df9a28 2023-07-08 jrick error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4876 24df9a28 2023-07-08 jrick fd1, fd2, ids[0], ids[1], NULL, NULL,
4877 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4878 24df9a28 2023-07-08 jrick ignore_whitespace, force_text_diff,
4879 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, repo, outfile);
4880 24df9a28 2023-07-08 jrick break;
4881 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
4882 24df9a28 2023-07-08 jrick error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
4883 24df9a28 2023-07-08 jrick ids[0], ids[1], &paths, "", "",
4884 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4885 24df9a28 2023-07-08 jrick ignore_whitespace, force_text_diff,
4886 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, repo, outfile);
4887 24df9a28 2023-07-08 jrick break;
4888 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
4889 24df9a28 2023-07-08 jrick fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
4890 24df9a28 2023-07-08 jrick error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4891 24df9a28 2023-07-08 jrick fd1, fd2, ids[0], ids[1], &paths,
4892 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4893 24df9a28 2023-07-08 jrick ignore_whitespace, force_text_diff,
4894 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, repo, outfile);
4895 24df9a28 2023-07-08 jrick break;
4896 24df9a28 2023-07-08 jrick default:
4897 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_OBJ_TYPE);
4898 24df9a28 2023-07-08 jrick }
4899 24df9a28 2023-07-08 jrick if (error)
4900 24df9a28 2023-07-08 jrick goto done;
4901 24df9a28 2023-07-08 jrick
4902 24df9a28 2023-07-08 jrick if (show_diffstat && dsa.nfiles > 0) {
4903 24df9a28 2023-07-08 jrick char *header = NULL;
4904 24df9a28 2023-07-08 jrick
4905 24df9a28 2023-07-08 jrick if (asprintf(&header, "diffstat %s %s",
4906 24df9a28 2023-07-08 jrick labels[0], labels[1]) == -1) {
4907 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4908 24df9a28 2023-07-08 jrick goto done;
4909 24df9a28 2023-07-08 jrick }
4910 24df9a28 2023-07-08 jrick
4911 24df9a28 2023-07-08 jrick error = print_diffstat(&dsa, header);
4912 24df9a28 2023-07-08 jrick free(header);
4913 24df9a28 2023-07-08 jrick if (error)
4914 24df9a28 2023-07-08 jrick goto done;
4915 24df9a28 2023-07-08 jrick }
4916 24df9a28 2023-07-08 jrick
4917 24df9a28 2023-07-08 jrick error = printfile(outfile);
4918 24df9a28 2023-07-08 jrick
4919 24df9a28 2023-07-08 jrick done:
4920 24df9a28 2023-07-08 jrick free(labels[0]);
4921 24df9a28 2023-07-08 jrick free(labels[1]);
4922 24df9a28 2023-07-08 jrick free(ids[0]);
4923 24df9a28 2023-07-08 jrick free(ids[1]);
4924 24df9a28 2023-07-08 jrick if (worktree)
4925 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4926 24df9a28 2023-07-08 jrick if (repo) {
4927 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
4928 24df9a28 2023-07-08 jrick if (error == NULL)
4929 24df9a28 2023-07-08 jrick error = close_err;
4930 24df9a28 2023-07-08 jrick }
4931 24df9a28 2023-07-08 jrick if (pack_fds) {
4932 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
4933 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
4934 24df9a28 2023-07-08 jrick if (error == NULL)
4935 24df9a28 2023-07-08 jrick error = pack_err;
4936 24df9a28 2023-07-08 jrick }
4937 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
4938 24df9a28 2023-07-08 jrick got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
4939 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
4940 24df9a28 2023-07-08 jrick if (outfile && fclose(outfile) == EOF && error == NULL)
4941 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4942 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && error == NULL)
4943 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4944 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && error == NULL)
4945 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4946 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && error == NULL)
4947 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
4948 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && error == NULL)
4949 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
4950 24df9a28 2023-07-08 jrick return error;
4951 24df9a28 2023-07-08 jrick }
4952 24df9a28 2023-07-08 jrick
4953 24df9a28 2023-07-08 jrick __dead static void
4954 24df9a28 2023-07-08 jrick usage_blame(void)
4955 24df9a28 2023-07-08 jrick {
4956 24df9a28 2023-07-08 jrick fprintf(stderr,
4957 24df9a28 2023-07-08 jrick "usage: %s blame [-c commit] [-r repository-path] path\n",
4958 24df9a28 2023-07-08 jrick getprogname());
4959 24df9a28 2023-07-08 jrick exit(1);
4960 24df9a28 2023-07-08 jrick }
4961 24df9a28 2023-07-08 jrick
4962 24df9a28 2023-07-08 jrick struct blame_line {
4963 24df9a28 2023-07-08 jrick int annotated;
4964 24df9a28 2023-07-08 jrick char *id_str;
4965 24df9a28 2023-07-08 jrick char *committer;
4966 24df9a28 2023-07-08 jrick char datebuf[11]; /* YYYY-MM-DD + NUL */
4967 24df9a28 2023-07-08 jrick };
4968 24df9a28 2023-07-08 jrick
4969 24df9a28 2023-07-08 jrick struct blame_cb_args {
4970 24df9a28 2023-07-08 jrick struct blame_line *lines;
4971 24df9a28 2023-07-08 jrick int nlines;
4972 24df9a28 2023-07-08 jrick int nlines_prec;
4973 24df9a28 2023-07-08 jrick int lineno_cur;
4974 24df9a28 2023-07-08 jrick off_t *line_offsets;
4975 24df9a28 2023-07-08 jrick FILE *f;
4976 24df9a28 2023-07-08 jrick struct got_repository *repo;
4977 24df9a28 2023-07-08 jrick };
4978 24df9a28 2023-07-08 jrick
4979 24df9a28 2023-07-08 jrick static const struct got_error *
4980 24df9a28 2023-07-08 jrick blame_cb(void *arg, int nlines, int lineno,
4981 24df9a28 2023-07-08 jrick struct got_commit_object *commit, struct got_object_id *id)
4982 24df9a28 2023-07-08 jrick {
4983 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
4984 24df9a28 2023-07-08 jrick struct blame_cb_args *a = arg;
4985 24df9a28 2023-07-08 jrick struct blame_line *bline;
4986 24df9a28 2023-07-08 jrick char *line = NULL;
4987 24df9a28 2023-07-08 jrick size_t linesize = 0;
4988 24df9a28 2023-07-08 jrick off_t offset;
4989 24df9a28 2023-07-08 jrick struct tm tm;
4990 24df9a28 2023-07-08 jrick time_t committer_time;
4991 24df9a28 2023-07-08 jrick
4992 24df9a28 2023-07-08 jrick if (nlines != a->nlines ||
4993 24df9a28 2023-07-08 jrick (lineno != -1 && lineno < 1) || lineno > a->nlines)
4994 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_RANGE);
4995 24df9a28 2023-07-08 jrick
4996 24df9a28 2023-07-08 jrick if (sigint_received)
4997 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ITER_COMPLETED);
4998 24df9a28 2023-07-08 jrick
4999 24df9a28 2023-07-08 jrick if (lineno == -1)
5000 24df9a28 2023-07-08 jrick return NULL; /* no change in this commit */
5001 24df9a28 2023-07-08 jrick
5002 24df9a28 2023-07-08 jrick /* Annotate this line. */
5003 24df9a28 2023-07-08 jrick bline = &a->lines[lineno - 1];
5004 24df9a28 2023-07-08 jrick if (bline->annotated)
5005 24df9a28 2023-07-08 jrick return NULL;
5006 24df9a28 2023-07-08 jrick err = got_object_id_str(&bline->id_str, id);
5007 24df9a28 2023-07-08 jrick if (err)
5008 24df9a28 2023-07-08 jrick return err;
5009 24df9a28 2023-07-08 jrick
5010 24df9a28 2023-07-08 jrick bline->committer = strdup(got_object_commit_get_committer(commit));
5011 24df9a28 2023-07-08 jrick if (bline->committer == NULL) {
5012 24df9a28 2023-07-08 jrick err = got_error_from_errno("strdup");
5013 24df9a28 2023-07-08 jrick goto done;
5014 24df9a28 2023-07-08 jrick }
5015 24df9a28 2023-07-08 jrick
5016 24df9a28 2023-07-08 jrick committer_time = got_object_commit_get_committer_time(commit);
5017 24df9a28 2023-07-08 jrick if (gmtime_r(&committer_time, &tm) == NULL)
5018 24df9a28 2023-07-08 jrick return got_error_from_errno("gmtime_r");
5019 24df9a28 2023-07-08 jrick if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5020 24df9a28 2023-07-08 jrick &tm) == 0) {
5021 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
5022 24df9a28 2023-07-08 jrick goto done;
5023 24df9a28 2023-07-08 jrick }
5024 24df9a28 2023-07-08 jrick bline->annotated = 1;
5025 24df9a28 2023-07-08 jrick
5026 24df9a28 2023-07-08 jrick /* Print lines annotated so far. */
5027 24df9a28 2023-07-08 jrick bline = &a->lines[a->lineno_cur - 1];
5028 24df9a28 2023-07-08 jrick if (!bline->annotated)
5029 24df9a28 2023-07-08 jrick goto done;
5030 24df9a28 2023-07-08 jrick
5031 24df9a28 2023-07-08 jrick offset = a->line_offsets[a->lineno_cur - 1];
5032 24df9a28 2023-07-08 jrick if (fseeko(a->f, offset, SEEK_SET) == -1) {
5033 24df9a28 2023-07-08 jrick err = got_error_from_errno("fseeko");
5034 24df9a28 2023-07-08 jrick goto done;
5035 24df9a28 2023-07-08 jrick }
5036 24df9a28 2023-07-08 jrick
5037 24df9a28 2023-07-08 jrick while (a->lineno_cur <= a->nlines && bline->annotated) {
5038 24df9a28 2023-07-08 jrick char *smallerthan, *at, *nl, *committer;
5039 24df9a28 2023-07-08 jrick size_t len;
5040 24df9a28 2023-07-08 jrick
5041 24df9a28 2023-07-08 jrick if (getline(&line, &linesize, a->f) == -1) {
5042 24df9a28 2023-07-08 jrick if (ferror(a->f))
5043 24df9a28 2023-07-08 jrick err = got_error_from_errno("getline");
5044 24df9a28 2023-07-08 jrick break;
5045 24df9a28 2023-07-08 jrick }
5046 24df9a28 2023-07-08 jrick
5047 24df9a28 2023-07-08 jrick committer = bline->committer;
5048 24df9a28 2023-07-08 jrick smallerthan = strchr(committer, '<');
5049 24df9a28 2023-07-08 jrick if (smallerthan && smallerthan[1] != '\0')
5050 24df9a28 2023-07-08 jrick committer = smallerthan + 1;
5051 24df9a28 2023-07-08 jrick at = strchr(committer, '@');
5052 24df9a28 2023-07-08 jrick if (at)
5053 24df9a28 2023-07-08 jrick *at = '\0';
5054 24df9a28 2023-07-08 jrick len = strlen(committer);
5055 24df9a28 2023-07-08 jrick if (len >= 9)
5056 24df9a28 2023-07-08 jrick committer[8] = '\0';
5057 24df9a28 2023-07-08 jrick
5058 24df9a28 2023-07-08 jrick nl = strchr(line, '\n');
5059 24df9a28 2023-07-08 jrick if (nl)
5060 24df9a28 2023-07-08 jrick *nl = '\0';
5061 24df9a28 2023-07-08 jrick printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5062 24df9a28 2023-07-08 jrick bline->id_str, bline->datebuf, committer, line);
5063 24df9a28 2023-07-08 jrick
5064 24df9a28 2023-07-08 jrick a->lineno_cur++;
5065 24df9a28 2023-07-08 jrick bline = &a->lines[a->lineno_cur - 1];
5066 24df9a28 2023-07-08 jrick }
5067 24df9a28 2023-07-08 jrick done:
5068 24df9a28 2023-07-08 jrick free(line);
5069 24df9a28 2023-07-08 jrick return err;
5070 24df9a28 2023-07-08 jrick }
5071 24df9a28 2023-07-08 jrick
5072 24df9a28 2023-07-08 jrick static const struct got_error *
5073 24df9a28 2023-07-08 jrick cmd_blame(int argc, char *argv[])
5074 24df9a28 2023-07-08 jrick {
5075 24df9a28 2023-07-08 jrick const struct got_error *error;
5076 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5077 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5078 24df9a28 2023-07-08 jrick char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5079 24df9a28 2023-07-08 jrick char *link_target = NULL;
5080 24df9a28 2023-07-08 jrick struct got_object_id *obj_id = NULL;
5081 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
5082 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
5083 24df9a28 2023-07-08 jrick struct got_blob_object *blob = NULL;
5084 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
5085 24df9a28 2023-07-08 jrick struct blame_cb_args bca;
5086 24df9a28 2023-07-08 jrick int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5087 24df9a28 2023-07-08 jrick off_t filesize;
5088 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5089 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
5090 24df9a28 2023-07-08 jrick
5091 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
5092 24df9a28 2023-07-08 jrick if (fd1 == -1)
5093 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
5094 24df9a28 2023-07-08 jrick
5095 24df9a28 2023-07-08 jrick memset(&bca, 0, sizeof(bca));
5096 24df9a28 2023-07-08 jrick
5097 24df9a28 2023-07-08 jrick #ifndef PROFILE
5098 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5099 24df9a28 2023-07-08 jrick NULL) == -1)
5100 24df9a28 2023-07-08 jrick err(1, "pledge");
5101 24df9a28 2023-07-08 jrick #endif
5102 24df9a28 2023-07-08 jrick
5103 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5104 24df9a28 2023-07-08 jrick switch (ch) {
5105 24df9a28 2023-07-08 jrick case 'c':
5106 24df9a28 2023-07-08 jrick commit_id_str = optarg;
5107 24df9a28 2023-07-08 jrick break;
5108 24df9a28 2023-07-08 jrick case 'r':
5109 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
5110 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5111 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
5112 24df9a28 2023-07-08 jrick optarg);
5113 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
5114 24df9a28 2023-07-08 jrick break;
5115 24df9a28 2023-07-08 jrick default:
5116 24df9a28 2023-07-08 jrick usage_blame();
5117 24df9a28 2023-07-08 jrick /* NOTREACHED */
5118 24df9a28 2023-07-08 jrick }
5119 24df9a28 2023-07-08 jrick }
5120 24df9a28 2023-07-08 jrick
5121 24df9a28 2023-07-08 jrick argc -= optind;
5122 24df9a28 2023-07-08 jrick argv += optind;
5123 24df9a28 2023-07-08 jrick
5124 24df9a28 2023-07-08 jrick if (argc == 1)
5125 24df9a28 2023-07-08 jrick path = argv[0];
5126 24df9a28 2023-07-08 jrick else
5127 24df9a28 2023-07-08 jrick usage_blame();
5128 24df9a28 2023-07-08 jrick
5129 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
5130 24df9a28 2023-07-08 jrick if (cwd == NULL) {
5131 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
5132 24df9a28 2023-07-08 jrick goto done;
5133 24df9a28 2023-07-08 jrick }
5134 24df9a28 2023-07-08 jrick
5135 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
5136 24df9a28 2023-07-08 jrick if (error != NULL)
5137 24df9a28 2023-07-08 jrick goto done;
5138 24df9a28 2023-07-08 jrick
5139 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5140 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
5141 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
5142 24df9a28 2023-07-08 jrick goto done;
5143 24df9a28 2023-07-08 jrick else
5144 24df9a28 2023-07-08 jrick error = NULL;
5145 24df9a28 2023-07-08 jrick if (worktree) {
5146 24df9a28 2023-07-08 jrick repo_path =
5147 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
5148 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5149 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5150 24df9a28 2023-07-08 jrick if (error)
5151 24df9a28 2023-07-08 jrick goto done;
5152 24df9a28 2023-07-08 jrick }
5153 24df9a28 2023-07-08 jrick } else {
5154 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
5155 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5156 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5157 24df9a28 2023-07-08 jrick goto done;
5158 24df9a28 2023-07-08 jrick }
5159 24df9a28 2023-07-08 jrick }
5160 24df9a28 2023-07-08 jrick }
5161 24df9a28 2023-07-08 jrick
5162 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5163 24df9a28 2023-07-08 jrick if (error != NULL)
5164 24df9a28 2023-07-08 jrick goto done;
5165 24df9a28 2023-07-08 jrick
5166 24df9a28 2023-07-08 jrick if (worktree) {
5167 24df9a28 2023-07-08 jrick const char *prefix = got_worktree_get_path_prefix(worktree);
5168 24df9a28 2023-07-08 jrick char *p;
5169 24df9a28 2023-07-08 jrick
5170 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&p, worktree, path);
5171 24df9a28 2023-07-08 jrick if (error)
5172 24df9a28 2023-07-08 jrick goto done;
5173 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
5174 24df9a28 2023-07-08 jrick (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5175 24df9a28 2023-07-08 jrick p) == -1) {
5176 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
5177 24df9a28 2023-07-08 jrick free(p);
5178 24df9a28 2023-07-08 jrick goto done;
5179 24df9a28 2023-07-08 jrick }
5180 24df9a28 2023-07-08 jrick free(p);
5181 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5182 24df9a28 2023-07-08 jrick } else {
5183 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5184 24df9a28 2023-07-08 jrick if (error)
5185 24df9a28 2023-07-08 jrick goto done;
5186 24df9a28 2023-07-08 jrick error = got_repo_map_path(&in_repo_path, repo, path);
5187 24df9a28 2023-07-08 jrick }
5188 24df9a28 2023-07-08 jrick if (error)
5189 24df9a28 2023-07-08 jrick goto done;
5190 24df9a28 2023-07-08 jrick
5191 24df9a28 2023-07-08 jrick if (commit_id_str == NULL) {
5192 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
5193 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, worktree ?
5194 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5195 24df9a28 2023-07-08 jrick if (error != NULL)
5196 24df9a28 2023-07-08 jrick goto done;
5197 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
5198 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
5199 24df9a28 2023-07-08 jrick if (error != NULL)
5200 24df9a28 2023-07-08 jrick goto done;
5201 24df9a28 2023-07-08 jrick } else {
5202 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5203 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5204 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5205 24df9a28 2023-07-08 jrick NULL);
5206 24df9a28 2023-07-08 jrick if (error)
5207 24df9a28 2023-07-08 jrick goto done;
5208 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
5209 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5210 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
5211 24df9a28 2023-07-08 jrick if (error)
5212 24df9a28 2023-07-08 jrick goto done;
5213 24df9a28 2023-07-08 jrick }
5214 24df9a28 2023-07-08 jrick
5215 24df9a28 2023-07-08 jrick if (worktree) {
5216 24df9a28 2023-07-08 jrick /* Release work tree lock. */
5217 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5218 24df9a28 2023-07-08 jrick worktree = NULL;
5219 24df9a28 2023-07-08 jrick }
5220 24df9a28 2023-07-08 jrick
5221 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
5222 24df9a28 2023-07-08 jrick if (error)
5223 24df9a28 2023-07-08 jrick goto done;
5224 24df9a28 2023-07-08 jrick
5225 24df9a28 2023-07-08 jrick error = got_object_resolve_symlinks(&link_target, in_repo_path,
5226 24df9a28 2023-07-08 jrick commit, repo);
5227 24df9a28 2023-07-08 jrick if (error)
5228 24df9a28 2023-07-08 jrick goto done;
5229 24df9a28 2023-07-08 jrick
5230 24df9a28 2023-07-08 jrick error = got_object_id_by_path(&obj_id, repo, commit,
5231 24df9a28 2023-07-08 jrick link_target ? link_target : in_repo_path);
5232 24df9a28 2023-07-08 jrick if (error)
5233 24df9a28 2023-07-08 jrick goto done;
5234 24df9a28 2023-07-08 jrick
5235 24df9a28 2023-07-08 jrick error = got_object_get_type(&obj_type, repo, obj_id);
5236 24df9a28 2023-07-08 jrick if (error)
5237 24df9a28 2023-07-08 jrick goto done;
5238 24df9a28 2023-07-08 jrick
5239 24df9a28 2023-07-08 jrick if (obj_type != GOT_OBJ_TYPE_BLOB) {
5240 24df9a28 2023-07-08 jrick error = got_error_path(link_target ? link_target : in_repo_path,
5241 24df9a28 2023-07-08 jrick GOT_ERR_OBJ_TYPE);
5242 24df9a28 2023-07-08 jrick goto done;
5243 24df9a28 2023-07-08 jrick }
5244 24df9a28 2023-07-08 jrick
5245 24df9a28 2023-07-08 jrick error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5246 24df9a28 2023-07-08 jrick if (error)
5247 24df9a28 2023-07-08 jrick goto done;
5248 24df9a28 2023-07-08 jrick bca.f = got_opentemp();
5249 24df9a28 2023-07-08 jrick if (bca.f == NULL) {
5250 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
5251 24df9a28 2023-07-08 jrick goto done;
5252 24df9a28 2023-07-08 jrick }
5253 24df9a28 2023-07-08 jrick error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5254 24df9a28 2023-07-08 jrick &bca.line_offsets, bca.f, blob);
5255 24df9a28 2023-07-08 jrick if (error || bca.nlines == 0)
5256 24df9a28 2023-07-08 jrick goto done;
5257 24df9a28 2023-07-08 jrick
5258 24df9a28 2023-07-08 jrick /* Don't include \n at EOF in the blame line count. */
5259 24df9a28 2023-07-08 jrick if (bca.line_offsets[bca.nlines - 1] == filesize)
5260 24df9a28 2023-07-08 jrick bca.nlines--;
5261 24df9a28 2023-07-08 jrick
5262 24df9a28 2023-07-08 jrick bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5263 24df9a28 2023-07-08 jrick if (bca.lines == NULL) {
5264 24df9a28 2023-07-08 jrick error = got_error_from_errno("calloc");
5265 24df9a28 2023-07-08 jrick goto done;
5266 24df9a28 2023-07-08 jrick }
5267 24df9a28 2023-07-08 jrick bca.lineno_cur = 1;
5268 24df9a28 2023-07-08 jrick bca.nlines_prec = 0;
5269 24df9a28 2023-07-08 jrick i = bca.nlines;
5270 24df9a28 2023-07-08 jrick while (i > 0) {
5271 24df9a28 2023-07-08 jrick i /= 10;
5272 24df9a28 2023-07-08 jrick bca.nlines_prec++;
5273 24df9a28 2023-07-08 jrick }
5274 24df9a28 2023-07-08 jrick bca.repo = repo;
5275 24df9a28 2023-07-08 jrick
5276 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
5277 24df9a28 2023-07-08 jrick if (fd2 == -1) {
5278 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
5279 24df9a28 2023-07-08 jrick goto done;
5280 24df9a28 2023-07-08 jrick }
5281 24df9a28 2023-07-08 jrick fd3 = got_opentempfd();
5282 24df9a28 2023-07-08 jrick if (fd3 == -1) {
5283 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
5284 24df9a28 2023-07-08 jrick goto done;
5285 24df9a28 2023-07-08 jrick }
5286 24df9a28 2023-07-08 jrick f1 = got_opentemp();
5287 24df9a28 2023-07-08 jrick if (f1 == NULL) {
5288 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
5289 24df9a28 2023-07-08 jrick goto done;
5290 24df9a28 2023-07-08 jrick }
5291 24df9a28 2023-07-08 jrick f2 = got_opentemp();
5292 24df9a28 2023-07-08 jrick if (f2 == NULL) {
5293 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
5294 24df9a28 2023-07-08 jrick goto done;
5295 24df9a28 2023-07-08 jrick }
5296 24df9a28 2023-07-08 jrick error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5297 24df9a28 2023-07-08 jrick repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5298 24df9a28 2023-07-08 jrick check_cancelled, NULL, fd2, fd3, f1, f2);
5299 24df9a28 2023-07-08 jrick done:
5300 24df9a28 2023-07-08 jrick free(in_repo_path);
5301 24df9a28 2023-07-08 jrick free(link_target);
5302 24df9a28 2023-07-08 jrick free(repo_path);
5303 24df9a28 2023-07-08 jrick free(cwd);
5304 24df9a28 2023-07-08 jrick free(commit_id);
5305 24df9a28 2023-07-08 jrick free(obj_id);
5306 24df9a28 2023-07-08 jrick if (commit)
5307 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
5308 24df9a28 2023-07-08 jrick
5309 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5310 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
5311 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5312 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
5313 24df9a28 2023-07-08 jrick if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5314 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
5315 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && error == NULL)
5316 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
5317 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && error == NULL)
5318 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
5319 24df9a28 2023-07-08 jrick
5320 24df9a28 2023-07-08 jrick if (blob)
5321 24df9a28 2023-07-08 jrick got_object_blob_close(blob);
5322 24df9a28 2023-07-08 jrick if (worktree)
5323 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5324 24df9a28 2023-07-08 jrick if (repo) {
5325 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
5326 24df9a28 2023-07-08 jrick if (error == NULL)
5327 24df9a28 2023-07-08 jrick error = close_err;
5328 24df9a28 2023-07-08 jrick }
5329 24df9a28 2023-07-08 jrick if (pack_fds) {
5330 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
5331 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
5332 24df9a28 2023-07-08 jrick if (error == NULL)
5333 24df9a28 2023-07-08 jrick error = pack_err;
5334 24df9a28 2023-07-08 jrick }
5335 24df9a28 2023-07-08 jrick if (bca.lines) {
5336 24df9a28 2023-07-08 jrick for (i = 0; i < bca.nlines; i++) {
5337 24df9a28 2023-07-08 jrick struct blame_line *bline = &bca.lines[i];
5338 24df9a28 2023-07-08 jrick free(bline->id_str);
5339 24df9a28 2023-07-08 jrick free(bline->committer);
5340 24df9a28 2023-07-08 jrick }
5341 24df9a28 2023-07-08 jrick free(bca.lines);
5342 24df9a28 2023-07-08 jrick }
5343 24df9a28 2023-07-08 jrick free(bca.line_offsets);
5344 24df9a28 2023-07-08 jrick if (bca.f && fclose(bca.f) == EOF && error == NULL)
5345 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
5346 24df9a28 2023-07-08 jrick return error;
5347 24df9a28 2023-07-08 jrick }
5348 24df9a28 2023-07-08 jrick
5349 24df9a28 2023-07-08 jrick __dead static void
5350 24df9a28 2023-07-08 jrick usage_tree(void)
5351 24df9a28 2023-07-08 jrick {
5352 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5353 24df9a28 2023-07-08 jrick "[path]\n", getprogname());
5354 24df9a28 2023-07-08 jrick exit(1);
5355 24df9a28 2023-07-08 jrick }
5356 24df9a28 2023-07-08 jrick
5357 24df9a28 2023-07-08 jrick static const struct got_error *
5358 24df9a28 2023-07-08 jrick print_entry(struct got_tree_entry *te, const char *id, const char *path,
5359 24df9a28 2023-07-08 jrick const char *root_path, struct got_repository *repo)
5360 24df9a28 2023-07-08 jrick {
5361 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5362 24df9a28 2023-07-08 jrick int is_root_path = (strcmp(path, root_path) == 0);
5363 24df9a28 2023-07-08 jrick const char *modestr = "";
5364 24df9a28 2023-07-08 jrick mode_t mode = got_tree_entry_get_mode(te);
5365 24df9a28 2023-07-08 jrick char *link_target = NULL;
5366 24df9a28 2023-07-08 jrick
5367 24df9a28 2023-07-08 jrick path += strlen(root_path);
5368 24df9a28 2023-07-08 jrick while (path[0] == '/')
5369 24df9a28 2023-07-08 jrick path++;
5370 24df9a28 2023-07-08 jrick
5371 24df9a28 2023-07-08 jrick if (got_object_tree_entry_is_submodule(te))
5372 24df9a28 2023-07-08 jrick modestr = "$";
5373 24df9a28 2023-07-08 jrick else if (S_ISLNK(mode)) {
5374 24df9a28 2023-07-08 jrick int i;
5375 24df9a28 2023-07-08 jrick
5376 24df9a28 2023-07-08 jrick err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5377 24df9a28 2023-07-08 jrick if (err)
5378 24df9a28 2023-07-08 jrick return err;
5379 24df9a28 2023-07-08 jrick for (i = 0; link_target[i] != '\0'; i++) {
5380 24df9a28 2023-07-08 jrick if (!isprint((unsigned char)link_target[i]))
5381 24df9a28 2023-07-08 jrick link_target[i] = '?';
5382 24df9a28 2023-07-08 jrick }
5383 24df9a28 2023-07-08 jrick
5384 24df9a28 2023-07-08 jrick modestr = "@";
5385 24df9a28 2023-07-08 jrick }
5386 24df9a28 2023-07-08 jrick else if (S_ISDIR(mode))
5387 24df9a28 2023-07-08 jrick modestr = "/";
5388 24df9a28 2023-07-08 jrick else if (mode & S_IXUSR)
5389 24df9a28 2023-07-08 jrick modestr = "*";
5390 24df9a28 2023-07-08 jrick
5391 24df9a28 2023-07-08 jrick printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5392 24df9a28 2023-07-08 jrick is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5393 24df9a28 2023-07-08 jrick link_target ? " -> ": "", link_target ? link_target : "");
5394 24df9a28 2023-07-08 jrick
5395 24df9a28 2023-07-08 jrick free(link_target);
5396 24df9a28 2023-07-08 jrick return NULL;
5397 24df9a28 2023-07-08 jrick }
5398 24df9a28 2023-07-08 jrick
5399 24df9a28 2023-07-08 jrick static const struct got_error *
5400 24df9a28 2023-07-08 jrick print_tree(const char *path, struct got_commit_object *commit,
5401 24df9a28 2023-07-08 jrick int show_ids, int recurse, const char *root_path,
5402 24df9a28 2023-07-08 jrick struct got_repository *repo)
5403 24df9a28 2023-07-08 jrick {
5404 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5405 24df9a28 2023-07-08 jrick struct got_object_id *tree_id = NULL;
5406 24df9a28 2023-07-08 jrick struct got_tree_object *tree = NULL;
5407 24df9a28 2023-07-08 jrick int nentries, i;
5408 24df9a28 2023-07-08 jrick
5409 24df9a28 2023-07-08 jrick err = got_object_id_by_path(&tree_id, repo, commit, path);
5410 24df9a28 2023-07-08 jrick if (err)
5411 24df9a28 2023-07-08 jrick goto done;
5412 24df9a28 2023-07-08 jrick
5413 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree, repo, tree_id);
5414 24df9a28 2023-07-08 jrick if (err)
5415 24df9a28 2023-07-08 jrick goto done;
5416 24df9a28 2023-07-08 jrick nentries = got_object_tree_get_nentries(tree);
5417 24df9a28 2023-07-08 jrick for (i = 0; i < nentries; i++) {
5418 24df9a28 2023-07-08 jrick struct got_tree_entry *te;
5419 24df9a28 2023-07-08 jrick char *id = NULL;
5420 24df9a28 2023-07-08 jrick
5421 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
5422 24df9a28 2023-07-08 jrick break;
5423 24df9a28 2023-07-08 jrick
5424 24df9a28 2023-07-08 jrick te = got_object_tree_get_entry(tree, i);
5425 24df9a28 2023-07-08 jrick if (show_ids) {
5426 24df9a28 2023-07-08 jrick char *id_str;
5427 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str,
5428 24df9a28 2023-07-08 jrick got_tree_entry_get_id(te));
5429 24df9a28 2023-07-08 jrick if (err)
5430 24df9a28 2023-07-08 jrick goto done;
5431 24df9a28 2023-07-08 jrick if (asprintf(&id, "%s ", id_str) == -1) {
5432 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
5433 24df9a28 2023-07-08 jrick free(id_str);
5434 24df9a28 2023-07-08 jrick goto done;
5435 24df9a28 2023-07-08 jrick }
5436 24df9a28 2023-07-08 jrick free(id_str);
5437 24df9a28 2023-07-08 jrick }
5438 24df9a28 2023-07-08 jrick err = print_entry(te, id, path, root_path, repo);
5439 24df9a28 2023-07-08 jrick free(id);
5440 24df9a28 2023-07-08 jrick if (err)
5441 24df9a28 2023-07-08 jrick goto done;
5442 24df9a28 2023-07-08 jrick
5443 24df9a28 2023-07-08 jrick if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5444 24df9a28 2023-07-08 jrick char *child_path;
5445 24df9a28 2023-07-08 jrick if (asprintf(&child_path, "%s%s%s", path,
5446 24df9a28 2023-07-08 jrick path[0] == '/' && path[1] == '\0' ? "" : "/",
5447 24df9a28 2023-07-08 jrick got_tree_entry_get_name(te)) == -1) {
5448 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
5449 24df9a28 2023-07-08 jrick goto done;
5450 24df9a28 2023-07-08 jrick }
5451 24df9a28 2023-07-08 jrick err = print_tree(child_path, commit, show_ids, 1,
5452 24df9a28 2023-07-08 jrick root_path, repo);
5453 24df9a28 2023-07-08 jrick free(child_path);
5454 24df9a28 2023-07-08 jrick if (err)
5455 24df9a28 2023-07-08 jrick goto done;
5456 24df9a28 2023-07-08 jrick }
5457 24df9a28 2023-07-08 jrick }
5458 24df9a28 2023-07-08 jrick done:
5459 24df9a28 2023-07-08 jrick if (tree)
5460 24df9a28 2023-07-08 jrick got_object_tree_close(tree);
5461 24df9a28 2023-07-08 jrick free(tree_id);
5462 24df9a28 2023-07-08 jrick return err;
5463 24df9a28 2023-07-08 jrick }
5464 24df9a28 2023-07-08 jrick
5465 24df9a28 2023-07-08 jrick static const struct got_error *
5466 24df9a28 2023-07-08 jrick cmd_tree(int argc, char *argv[])
5467 24df9a28 2023-07-08 jrick {
5468 24df9a28 2023-07-08 jrick const struct got_error *error;
5469 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5470 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5471 24df9a28 2023-07-08 jrick const char *path, *refname = NULL;
5472 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5473 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
5474 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
5475 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
5476 24df9a28 2023-07-08 jrick int show_ids = 0, recurse = 0;
5477 24df9a28 2023-07-08 jrick int ch;
5478 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5479 24df9a28 2023-07-08 jrick
5480 24df9a28 2023-07-08 jrick #ifndef PROFILE
5481 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5482 24df9a28 2023-07-08 jrick NULL) == -1)
5483 24df9a28 2023-07-08 jrick err(1, "pledge");
5484 24df9a28 2023-07-08 jrick #endif
5485 24df9a28 2023-07-08 jrick
5486 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5487 24df9a28 2023-07-08 jrick switch (ch) {
5488 24df9a28 2023-07-08 jrick case 'c':
5489 24df9a28 2023-07-08 jrick commit_id_str = optarg;
5490 24df9a28 2023-07-08 jrick break;
5491 24df9a28 2023-07-08 jrick case 'i':
5492 24df9a28 2023-07-08 jrick show_ids = 1;
5493 24df9a28 2023-07-08 jrick break;
5494 24df9a28 2023-07-08 jrick case 'R':
5495 24df9a28 2023-07-08 jrick recurse = 1;
5496 24df9a28 2023-07-08 jrick break;
5497 24df9a28 2023-07-08 jrick case 'r':
5498 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
5499 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5500 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
5501 24df9a28 2023-07-08 jrick optarg);
5502 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
5503 24df9a28 2023-07-08 jrick break;
5504 24df9a28 2023-07-08 jrick default:
5505 24df9a28 2023-07-08 jrick usage_tree();
5506 24df9a28 2023-07-08 jrick /* NOTREACHED */
5507 24df9a28 2023-07-08 jrick }
5508 24df9a28 2023-07-08 jrick }
5509 24df9a28 2023-07-08 jrick
5510 24df9a28 2023-07-08 jrick argc -= optind;
5511 24df9a28 2023-07-08 jrick argv += optind;
5512 24df9a28 2023-07-08 jrick
5513 24df9a28 2023-07-08 jrick if (argc == 1)
5514 24df9a28 2023-07-08 jrick path = argv[0];
5515 24df9a28 2023-07-08 jrick else if (argc > 1)
5516 24df9a28 2023-07-08 jrick usage_tree();
5517 24df9a28 2023-07-08 jrick else
5518 24df9a28 2023-07-08 jrick path = NULL;
5519 24df9a28 2023-07-08 jrick
5520 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
5521 24df9a28 2023-07-08 jrick if (cwd == NULL) {
5522 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
5523 24df9a28 2023-07-08 jrick goto done;
5524 24df9a28 2023-07-08 jrick }
5525 24df9a28 2023-07-08 jrick
5526 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
5527 24df9a28 2023-07-08 jrick if (error != NULL)
5528 24df9a28 2023-07-08 jrick goto done;
5529 24df9a28 2023-07-08 jrick
5530 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5531 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
5532 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
5533 24df9a28 2023-07-08 jrick goto done;
5534 24df9a28 2023-07-08 jrick else
5535 24df9a28 2023-07-08 jrick error = NULL;
5536 24df9a28 2023-07-08 jrick if (worktree) {
5537 24df9a28 2023-07-08 jrick repo_path =
5538 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
5539 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5540 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5541 24df9a28 2023-07-08 jrick if (error)
5542 24df9a28 2023-07-08 jrick goto done;
5543 24df9a28 2023-07-08 jrick } else {
5544 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
5545 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5546 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5547 24df9a28 2023-07-08 jrick goto done;
5548 24df9a28 2023-07-08 jrick }
5549 24df9a28 2023-07-08 jrick }
5550 24df9a28 2023-07-08 jrick }
5551 24df9a28 2023-07-08 jrick
5552 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5553 24df9a28 2023-07-08 jrick if (error != NULL)
5554 24df9a28 2023-07-08 jrick goto done;
5555 24df9a28 2023-07-08 jrick
5556 24df9a28 2023-07-08 jrick if (worktree) {
5557 24df9a28 2023-07-08 jrick const char *prefix = got_worktree_get_path_prefix(worktree);
5558 24df9a28 2023-07-08 jrick char *p;
5559 24df9a28 2023-07-08 jrick
5560 24df9a28 2023-07-08 jrick if (path == NULL || got_path_is_root_dir(path))
5561 24df9a28 2023-07-08 jrick path = "";
5562 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&p, worktree, path);
5563 24df9a28 2023-07-08 jrick if (error)
5564 24df9a28 2023-07-08 jrick goto done;
5565 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
5566 24df9a28 2023-07-08 jrick (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5567 24df9a28 2023-07-08 jrick p) == -1) {
5568 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
5569 24df9a28 2023-07-08 jrick free(p);
5570 24df9a28 2023-07-08 jrick goto done;
5571 24df9a28 2023-07-08 jrick }
5572 24df9a28 2023-07-08 jrick free(p);
5573 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5574 24df9a28 2023-07-08 jrick if (error)
5575 24df9a28 2023-07-08 jrick goto done;
5576 24df9a28 2023-07-08 jrick } else {
5577 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5578 24df9a28 2023-07-08 jrick if (error)
5579 24df9a28 2023-07-08 jrick goto done;
5580 24df9a28 2023-07-08 jrick if (path == NULL)
5581 24df9a28 2023-07-08 jrick path = "/";
5582 24df9a28 2023-07-08 jrick error = got_repo_map_path(&in_repo_path, repo, path);
5583 24df9a28 2023-07-08 jrick if (error != NULL)
5584 24df9a28 2023-07-08 jrick goto done;
5585 24df9a28 2023-07-08 jrick }
5586 24df9a28 2023-07-08 jrick
5587 24df9a28 2023-07-08 jrick if (commit_id_str == NULL) {
5588 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
5589 24df9a28 2023-07-08 jrick if (worktree)
5590 24df9a28 2023-07-08 jrick refname = got_worktree_get_head_ref_name(worktree);
5591 24df9a28 2023-07-08 jrick else
5592 24df9a28 2023-07-08 jrick refname = GOT_REF_HEAD;
5593 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, refname, 0);
5594 24df9a28 2023-07-08 jrick if (error != NULL)
5595 24df9a28 2023-07-08 jrick goto done;
5596 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
5597 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
5598 24df9a28 2023-07-08 jrick if (error != NULL)
5599 24df9a28 2023-07-08 jrick goto done;
5600 24df9a28 2023-07-08 jrick } else {
5601 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5602 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5603 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5604 24df9a28 2023-07-08 jrick NULL);
5605 24df9a28 2023-07-08 jrick if (error)
5606 24df9a28 2023-07-08 jrick goto done;
5607 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
5608 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5609 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
5610 24df9a28 2023-07-08 jrick if (error)
5611 24df9a28 2023-07-08 jrick goto done;
5612 24df9a28 2023-07-08 jrick }
5613 24df9a28 2023-07-08 jrick
5614 24df9a28 2023-07-08 jrick if (worktree) {
5615 24df9a28 2023-07-08 jrick /* Release work tree lock. */
5616 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5617 24df9a28 2023-07-08 jrick worktree = NULL;
5618 24df9a28 2023-07-08 jrick }
5619 24df9a28 2023-07-08 jrick
5620 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
5621 24df9a28 2023-07-08 jrick if (error)
5622 24df9a28 2023-07-08 jrick goto done;
5623 24df9a28 2023-07-08 jrick
5624 24df9a28 2023-07-08 jrick error = print_tree(in_repo_path, commit, show_ids, recurse,
5625 24df9a28 2023-07-08 jrick in_repo_path, repo);
5626 24df9a28 2023-07-08 jrick done:
5627 24df9a28 2023-07-08 jrick free(in_repo_path);
5628 24df9a28 2023-07-08 jrick free(repo_path);
5629 24df9a28 2023-07-08 jrick free(cwd);
5630 24df9a28 2023-07-08 jrick free(commit_id);
5631 24df9a28 2023-07-08 jrick if (commit)
5632 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
5633 24df9a28 2023-07-08 jrick if (worktree)
5634 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5635 24df9a28 2023-07-08 jrick if (repo) {
5636 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
5637 24df9a28 2023-07-08 jrick if (error == NULL)
5638 24df9a28 2023-07-08 jrick error = close_err;
5639 24df9a28 2023-07-08 jrick }
5640 24df9a28 2023-07-08 jrick if (pack_fds) {
5641 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
5642 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
5643 24df9a28 2023-07-08 jrick if (error == NULL)
5644 24df9a28 2023-07-08 jrick error = pack_err;
5645 24df9a28 2023-07-08 jrick }
5646 24df9a28 2023-07-08 jrick return error;
5647 24df9a28 2023-07-08 jrick }
5648 24df9a28 2023-07-08 jrick
5649 24df9a28 2023-07-08 jrick __dead static void
5650 24df9a28 2023-07-08 jrick usage_status(void)
5651 24df9a28 2023-07-08 jrick {
5652 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5653 24df9a28 2023-07-08 jrick "[-s status-codes] [path ...]\n", getprogname());
5654 24df9a28 2023-07-08 jrick exit(1);
5655 24df9a28 2023-07-08 jrick }
5656 24df9a28 2023-07-08 jrick
5657 24df9a28 2023-07-08 jrick struct got_status_arg {
5658 24df9a28 2023-07-08 jrick char *status_codes;
5659 24df9a28 2023-07-08 jrick int suppress;
5660 24df9a28 2023-07-08 jrick };
5661 24df9a28 2023-07-08 jrick
5662 24df9a28 2023-07-08 jrick static const struct got_error *
5663 24df9a28 2023-07-08 jrick print_status(void *arg, unsigned char status, unsigned char staged_status,
5664 24df9a28 2023-07-08 jrick const char *path, struct got_object_id *blob_id,
5665 24df9a28 2023-07-08 jrick struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5666 24df9a28 2023-07-08 jrick int dirfd, const char *de_name)
5667 24df9a28 2023-07-08 jrick {
5668 24df9a28 2023-07-08 jrick struct got_status_arg *st = arg;
5669 24df9a28 2023-07-08 jrick
5670 24df9a28 2023-07-08 jrick if (status == staged_status && (status == GOT_STATUS_DELETE))
5671 24df9a28 2023-07-08 jrick status = GOT_STATUS_NO_CHANGE;
5672 24df9a28 2023-07-08 jrick if (st != NULL && st->status_codes) {
5673 24df9a28 2023-07-08 jrick size_t ncodes = strlen(st->status_codes);
5674 24df9a28 2023-07-08 jrick int i, j = 0;
5675 24df9a28 2023-07-08 jrick
5676 24df9a28 2023-07-08 jrick for (i = 0; i < ncodes ; i++) {
5677 24df9a28 2023-07-08 jrick if (st->suppress) {
5678 24df9a28 2023-07-08 jrick if (status == st->status_codes[i] ||
5679 24df9a28 2023-07-08 jrick staged_status == st->status_codes[i]) {
5680 24df9a28 2023-07-08 jrick j++;
5681 24df9a28 2023-07-08 jrick continue;
5682 24df9a28 2023-07-08 jrick }
5683 24df9a28 2023-07-08 jrick } else {
5684 24df9a28 2023-07-08 jrick if (status == st->status_codes[i] ||
5685 24df9a28 2023-07-08 jrick staged_status == st->status_codes[i])
5686 24df9a28 2023-07-08 jrick break;
5687 24df9a28 2023-07-08 jrick }
5688 24df9a28 2023-07-08 jrick }
5689 24df9a28 2023-07-08 jrick
5690 24df9a28 2023-07-08 jrick if (st->suppress && j == 0)
5691 24df9a28 2023-07-08 jrick goto print;
5692 24df9a28 2023-07-08 jrick
5693 24df9a28 2023-07-08 jrick if (i == ncodes)
5694 24df9a28 2023-07-08 jrick return NULL;
5695 24df9a28 2023-07-08 jrick }
5696 24df9a28 2023-07-08 jrick print:
5697 24df9a28 2023-07-08 jrick printf("%c%c %s\n", status, staged_status, path);
5698 24df9a28 2023-07-08 jrick return NULL;
5699 24df9a28 2023-07-08 jrick }
5700 24df9a28 2023-07-08 jrick
5701 24df9a28 2023-07-08 jrick static const struct got_error *
5702 24df9a28 2023-07-08 jrick cmd_status(int argc, char *argv[])
5703 24df9a28 2023-07-08 jrick {
5704 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
5705 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5706 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5707 24df9a28 2023-07-08 jrick struct got_status_arg st;
5708 24df9a28 2023-07-08 jrick char *cwd = NULL;
5709 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
5710 24df9a28 2023-07-08 jrick int ch, i, no_ignores = 0;
5711 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5712 24df9a28 2023-07-08 jrick
5713 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
5714 24df9a28 2023-07-08 jrick
5715 24df9a28 2023-07-08 jrick memset(&st, 0, sizeof(st));
5716 24df9a28 2023-07-08 jrick st.status_codes = NULL;
5717 24df9a28 2023-07-08 jrick st.suppress = 0;
5718 24df9a28 2023-07-08 jrick
5719 24df9a28 2023-07-08 jrick #ifndef PROFILE
5720 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5721 24df9a28 2023-07-08 jrick NULL) == -1)
5722 24df9a28 2023-07-08 jrick err(1, "pledge");
5723 24df9a28 2023-07-08 jrick #endif
5724 24df9a28 2023-07-08 jrick
5725 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
5726 24df9a28 2023-07-08 jrick switch (ch) {
5727 24df9a28 2023-07-08 jrick case 'I':
5728 24df9a28 2023-07-08 jrick no_ignores = 1;
5729 24df9a28 2023-07-08 jrick break;
5730 24df9a28 2023-07-08 jrick case 'S':
5731 24df9a28 2023-07-08 jrick if (st.status_codes != NULL && st.suppress == 0)
5732 24df9a28 2023-07-08 jrick option_conflict('S', 's');
5733 24df9a28 2023-07-08 jrick st.suppress = 1;
5734 24df9a28 2023-07-08 jrick /* fallthrough */
5735 24df9a28 2023-07-08 jrick case 's':
5736 24df9a28 2023-07-08 jrick for (i = 0; optarg[i] != '\0'; i++) {
5737 24df9a28 2023-07-08 jrick switch (optarg[i]) {
5738 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
5739 24df9a28 2023-07-08 jrick case GOT_STATUS_ADD:
5740 24df9a28 2023-07-08 jrick case GOT_STATUS_DELETE:
5741 24df9a28 2023-07-08 jrick case GOT_STATUS_CONFLICT:
5742 24df9a28 2023-07-08 jrick case GOT_STATUS_MISSING:
5743 24df9a28 2023-07-08 jrick case GOT_STATUS_OBSTRUCTED:
5744 24df9a28 2023-07-08 jrick case GOT_STATUS_UNVERSIONED:
5745 24df9a28 2023-07-08 jrick case GOT_STATUS_MODE_CHANGE:
5746 24df9a28 2023-07-08 jrick case GOT_STATUS_NONEXISTENT:
5747 24df9a28 2023-07-08 jrick break;
5748 24df9a28 2023-07-08 jrick default:
5749 24df9a28 2023-07-08 jrick errx(1, "invalid status code '%c'",
5750 24df9a28 2023-07-08 jrick optarg[i]);
5751 24df9a28 2023-07-08 jrick }
5752 24df9a28 2023-07-08 jrick }
5753 24df9a28 2023-07-08 jrick if (ch == 's' && st.suppress)
5754 24df9a28 2023-07-08 jrick option_conflict('s', 'S');
5755 24df9a28 2023-07-08 jrick st.status_codes = optarg;
5756 24df9a28 2023-07-08 jrick break;
5757 24df9a28 2023-07-08 jrick default:
5758 24df9a28 2023-07-08 jrick usage_status();
5759 24df9a28 2023-07-08 jrick /* NOTREACHED */
5760 24df9a28 2023-07-08 jrick }
5761 24df9a28 2023-07-08 jrick }
5762 24df9a28 2023-07-08 jrick
5763 24df9a28 2023-07-08 jrick argc -= optind;
5764 24df9a28 2023-07-08 jrick argv += optind;
5765 24df9a28 2023-07-08 jrick
5766 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
5767 24df9a28 2023-07-08 jrick if (cwd == NULL) {
5768 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
5769 24df9a28 2023-07-08 jrick goto done;
5770 24df9a28 2023-07-08 jrick }
5771 24df9a28 2023-07-08 jrick
5772 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
5773 24df9a28 2023-07-08 jrick if (error != NULL)
5774 24df9a28 2023-07-08 jrick goto done;
5775 24df9a28 2023-07-08 jrick
5776 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
5777 24df9a28 2023-07-08 jrick if (error) {
5778 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
5779 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "status", cwd);
5780 24df9a28 2023-07-08 jrick goto done;
5781 24df9a28 2023-07-08 jrick }
5782 24df9a28 2023-07-08 jrick
5783 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5784 24df9a28 2023-07-08 jrick NULL, pack_fds);
5785 24df9a28 2023-07-08 jrick if (error != NULL)
5786 24df9a28 2023-07-08 jrick goto done;
5787 24df9a28 2023-07-08 jrick
5788 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
5789 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
5790 24df9a28 2023-07-08 jrick if (error)
5791 24df9a28 2023-07-08 jrick goto done;
5792 24df9a28 2023-07-08 jrick
5793 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5794 24df9a28 2023-07-08 jrick if (error)
5795 24df9a28 2023-07-08 jrick goto done;
5796 24df9a28 2023-07-08 jrick
5797 24df9a28 2023-07-08 jrick error = got_worktree_status(worktree, &paths, repo, no_ignores,
5798 24df9a28 2023-07-08 jrick print_status, &st, check_cancelled, NULL);
5799 24df9a28 2023-07-08 jrick done:
5800 24df9a28 2023-07-08 jrick if (pack_fds) {
5801 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
5802 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
5803 24df9a28 2023-07-08 jrick if (error == NULL)
5804 24df9a28 2023-07-08 jrick error = pack_err;
5805 24df9a28 2023-07-08 jrick }
5806 24df9a28 2023-07-08 jrick if (repo) {
5807 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
5808 24df9a28 2023-07-08 jrick if (error == NULL)
5809 24df9a28 2023-07-08 jrick error = close_err;
5810 24df9a28 2023-07-08 jrick }
5811 24df9a28 2023-07-08 jrick
5812 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5813 24df9a28 2023-07-08 jrick free(cwd);
5814 24df9a28 2023-07-08 jrick return error;
5815 24df9a28 2023-07-08 jrick }
5816 24df9a28 2023-07-08 jrick
5817 24df9a28 2023-07-08 jrick __dead static void
5818 24df9a28 2023-07-08 jrick usage_ref(void)
5819 24df9a28 2023-07-08 jrick {
5820 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
5821 24df9a28 2023-07-08 jrick "[-s reference] [name]\n", getprogname());
5822 24df9a28 2023-07-08 jrick exit(1);
5823 24df9a28 2023-07-08 jrick }
5824 24df9a28 2023-07-08 jrick
5825 24df9a28 2023-07-08 jrick static const struct got_error *
5826 24df9a28 2023-07-08 jrick list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5827 24df9a28 2023-07-08 jrick {
5828 24df9a28 2023-07-08 jrick static const struct got_error *err = NULL;
5829 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5830 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
5831 24df9a28 2023-07-08 jrick
5832 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5833 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, refname, sort_by_time ?
5834 24df9a28 2023-07-08 jrick got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5835 24df9a28 2023-07-08 jrick repo);
5836 24df9a28 2023-07-08 jrick if (err)
5837 24df9a28 2023-07-08 jrick return err;
5838 24df9a28 2023-07-08 jrick
5839 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
5840 24df9a28 2023-07-08 jrick char *refstr;
5841 24df9a28 2023-07-08 jrick refstr = got_ref_to_str(re->ref);
5842 24df9a28 2023-07-08 jrick if (refstr == NULL) {
5843 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_ref_to_str");
5844 24df9a28 2023-07-08 jrick break;
5845 24df9a28 2023-07-08 jrick }
5846 24df9a28 2023-07-08 jrick printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5847 24df9a28 2023-07-08 jrick free(refstr);
5848 24df9a28 2023-07-08 jrick }
5849 24df9a28 2023-07-08 jrick
5850 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
5851 24df9a28 2023-07-08 jrick return err;
5852 24df9a28 2023-07-08 jrick }
5853 24df9a28 2023-07-08 jrick
5854 24df9a28 2023-07-08 jrick static const struct got_error *
5855 24df9a28 2023-07-08 jrick delete_ref_by_name(struct got_repository *repo, const char *refname)
5856 24df9a28 2023-07-08 jrick {
5857 24df9a28 2023-07-08 jrick const struct got_error *err;
5858 24df9a28 2023-07-08 jrick struct got_reference *ref;
5859 24df9a28 2023-07-08 jrick
5860 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, refname, 0);
5861 24df9a28 2023-07-08 jrick if (err)
5862 24df9a28 2023-07-08 jrick return err;
5863 24df9a28 2023-07-08 jrick
5864 24df9a28 2023-07-08 jrick err = delete_ref(repo, ref);
5865 24df9a28 2023-07-08 jrick got_ref_close(ref);
5866 24df9a28 2023-07-08 jrick return err;
5867 24df9a28 2023-07-08 jrick }
5868 24df9a28 2023-07-08 jrick
5869 24df9a28 2023-07-08 jrick static const struct got_error *
5870 24df9a28 2023-07-08 jrick add_ref(struct got_repository *repo, const char *refname, const char *target)
5871 24df9a28 2023-07-08 jrick {
5872 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5873 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
5874 24df9a28 2023-07-08 jrick struct got_reference *ref = NULL;
5875 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5876 24df9a28 2023-07-08 jrick
5877 24df9a28 2023-07-08 jrick /*
5878 24df9a28 2023-07-08 jrick * Don't let the user create a reference name with a leading '-'.
5879 24df9a28 2023-07-08 jrick * While technically a valid reference name, this case is usually
5880 24df9a28 2023-07-08 jrick * an unintended typo.
5881 24df9a28 2023-07-08 jrick */
5882 24df9a28 2023-07-08 jrick if (refname[0] == '-')
5883 24df9a28 2023-07-08 jrick return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5884 24df9a28 2023-07-08 jrick
5885 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5886 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5887 24df9a28 2023-07-08 jrick if (err)
5888 24df9a28 2023-07-08 jrick goto done;
5889 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
5890 24df9a28 2023-07-08 jrick &refs, repo);
5891 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
5892 24df9a28 2023-07-08 jrick if (err)
5893 24df9a28 2023-07-08 jrick goto done;
5894 24df9a28 2023-07-08 jrick
5895 24df9a28 2023-07-08 jrick err = got_ref_alloc(&ref, refname, id);
5896 24df9a28 2023-07-08 jrick if (err)
5897 24df9a28 2023-07-08 jrick goto done;
5898 24df9a28 2023-07-08 jrick
5899 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
5900 24df9a28 2023-07-08 jrick done:
5901 24df9a28 2023-07-08 jrick if (ref)
5902 24df9a28 2023-07-08 jrick got_ref_close(ref);
5903 24df9a28 2023-07-08 jrick free(id);
5904 24df9a28 2023-07-08 jrick return err;
5905 24df9a28 2023-07-08 jrick }
5906 24df9a28 2023-07-08 jrick
5907 24df9a28 2023-07-08 jrick static const struct got_error *
5908 24df9a28 2023-07-08 jrick add_symref(struct got_repository *repo, const char *refname, const char *target)
5909 24df9a28 2023-07-08 jrick {
5910 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5911 24df9a28 2023-07-08 jrick struct got_reference *ref = NULL;
5912 24df9a28 2023-07-08 jrick struct got_reference *target_ref = NULL;
5913 24df9a28 2023-07-08 jrick
5914 24df9a28 2023-07-08 jrick /*
5915 24df9a28 2023-07-08 jrick * Don't let the user create a reference name with a leading '-'.
5916 24df9a28 2023-07-08 jrick * While technically a valid reference name, this case is usually
5917 24df9a28 2023-07-08 jrick * an unintended typo.
5918 24df9a28 2023-07-08 jrick */
5919 24df9a28 2023-07-08 jrick if (refname[0] == '-')
5920 24df9a28 2023-07-08 jrick return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5921 24df9a28 2023-07-08 jrick
5922 24df9a28 2023-07-08 jrick err = got_ref_open(&target_ref, repo, target, 0);
5923 24df9a28 2023-07-08 jrick if (err)
5924 24df9a28 2023-07-08 jrick return err;
5925 24df9a28 2023-07-08 jrick
5926 24df9a28 2023-07-08 jrick err = got_ref_alloc_symref(&ref, refname, target_ref);
5927 24df9a28 2023-07-08 jrick if (err)
5928 24df9a28 2023-07-08 jrick goto done;
5929 24df9a28 2023-07-08 jrick
5930 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
5931 24df9a28 2023-07-08 jrick done:
5932 24df9a28 2023-07-08 jrick if (target_ref)
5933 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
5934 24df9a28 2023-07-08 jrick if (ref)
5935 24df9a28 2023-07-08 jrick got_ref_close(ref);
5936 24df9a28 2023-07-08 jrick return err;
5937 24df9a28 2023-07-08 jrick }
5938 24df9a28 2023-07-08 jrick
5939 24df9a28 2023-07-08 jrick static const struct got_error *
5940 24df9a28 2023-07-08 jrick cmd_ref(int argc, char *argv[])
5941 24df9a28 2023-07-08 jrick {
5942 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
5943 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5944 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5945 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL;
5946 24df9a28 2023-07-08 jrick int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
5947 24df9a28 2023-07-08 jrick const char *obj_arg = NULL, *symref_target= NULL;
5948 24df9a28 2023-07-08 jrick char *refname = NULL;
5949 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5950 24df9a28 2023-07-08 jrick
5951 24df9a28 2023-07-08 jrick #ifndef PROFILE
5952 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5953 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
5954 24df9a28 2023-07-08 jrick err(1, "pledge");
5955 24df9a28 2023-07-08 jrick #endif
5956 24df9a28 2023-07-08 jrick
5957 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
5958 24df9a28 2023-07-08 jrick switch (ch) {
5959 24df9a28 2023-07-08 jrick case 'c':
5960 24df9a28 2023-07-08 jrick obj_arg = optarg;
5961 24df9a28 2023-07-08 jrick break;
5962 24df9a28 2023-07-08 jrick case 'd':
5963 24df9a28 2023-07-08 jrick do_delete = 1;
5964 24df9a28 2023-07-08 jrick break;
5965 24df9a28 2023-07-08 jrick case 'l':
5966 24df9a28 2023-07-08 jrick do_list = 1;
5967 24df9a28 2023-07-08 jrick break;
5968 24df9a28 2023-07-08 jrick case 'r':
5969 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
5970 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5971 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
5972 24df9a28 2023-07-08 jrick optarg);
5973 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
5974 24df9a28 2023-07-08 jrick break;
5975 24df9a28 2023-07-08 jrick case 's':
5976 24df9a28 2023-07-08 jrick symref_target = optarg;
5977 24df9a28 2023-07-08 jrick break;
5978 24df9a28 2023-07-08 jrick case 't':
5979 24df9a28 2023-07-08 jrick sort_by_time = 1;
5980 24df9a28 2023-07-08 jrick break;
5981 24df9a28 2023-07-08 jrick default:
5982 24df9a28 2023-07-08 jrick usage_ref();
5983 24df9a28 2023-07-08 jrick /* NOTREACHED */
5984 24df9a28 2023-07-08 jrick }
5985 24df9a28 2023-07-08 jrick }
5986 24df9a28 2023-07-08 jrick
5987 24df9a28 2023-07-08 jrick if (obj_arg && do_list)
5988 24df9a28 2023-07-08 jrick option_conflict('c', 'l');
5989 24df9a28 2023-07-08 jrick if (obj_arg && do_delete)
5990 24df9a28 2023-07-08 jrick option_conflict('c', 'd');
5991 24df9a28 2023-07-08 jrick if (obj_arg && symref_target)
5992 24df9a28 2023-07-08 jrick option_conflict('c', 's');
5993 24df9a28 2023-07-08 jrick if (symref_target && do_delete)
5994 24df9a28 2023-07-08 jrick option_conflict('s', 'd');
5995 24df9a28 2023-07-08 jrick if (symref_target && do_list)
5996 24df9a28 2023-07-08 jrick option_conflict('s', 'l');
5997 24df9a28 2023-07-08 jrick if (do_delete && do_list)
5998 24df9a28 2023-07-08 jrick option_conflict('d', 'l');
5999 24df9a28 2023-07-08 jrick if (sort_by_time && !do_list)
6000 24df9a28 2023-07-08 jrick errx(1, "-t option requires -l option");
6001 24df9a28 2023-07-08 jrick
6002 24df9a28 2023-07-08 jrick argc -= optind;
6003 24df9a28 2023-07-08 jrick argv += optind;
6004 24df9a28 2023-07-08 jrick
6005 24df9a28 2023-07-08 jrick if (do_list) {
6006 24df9a28 2023-07-08 jrick if (argc != 0 && argc != 1)
6007 24df9a28 2023-07-08 jrick usage_ref();
6008 24df9a28 2023-07-08 jrick if (argc == 1) {
6009 24df9a28 2023-07-08 jrick refname = strdup(argv[0]);
6010 24df9a28 2023-07-08 jrick if (refname == NULL) {
6011 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6012 24df9a28 2023-07-08 jrick goto done;
6013 24df9a28 2023-07-08 jrick }
6014 24df9a28 2023-07-08 jrick }
6015 24df9a28 2023-07-08 jrick } else {
6016 24df9a28 2023-07-08 jrick if (argc != 1)
6017 24df9a28 2023-07-08 jrick usage_ref();
6018 24df9a28 2023-07-08 jrick refname = strdup(argv[0]);
6019 24df9a28 2023-07-08 jrick if (refname == NULL) {
6020 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6021 24df9a28 2023-07-08 jrick goto done;
6022 24df9a28 2023-07-08 jrick }
6023 24df9a28 2023-07-08 jrick }
6024 24df9a28 2023-07-08 jrick
6025 24df9a28 2023-07-08 jrick if (refname)
6026 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(refname);
6027 24df9a28 2023-07-08 jrick
6028 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6029 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6030 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6031 24df9a28 2023-07-08 jrick goto done;
6032 24df9a28 2023-07-08 jrick }
6033 24df9a28 2023-07-08 jrick
6034 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6035 24df9a28 2023-07-08 jrick if (error != NULL)
6036 24df9a28 2023-07-08 jrick goto done;
6037 24df9a28 2023-07-08 jrick
6038 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6039 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
6040 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
6041 24df9a28 2023-07-08 jrick goto done;
6042 24df9a28 2023-07-08 jrick else
6043 24df9a28 2023-07-08 jrick error = NULL;
6044 24df9a28 2023-07-08 jrick if (worktree) {
6045 24df9a28 2023-07-08 jrick repo_path =
6046 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
6047 24df9a28 2023-07-08 jrick if (repo_path == NULL)
6048 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6049 24df9a28 2023-07-08 jrick if (error)
6050 24df9a28 2023-07-08 jrick goto done;
6051 24df9a28 2023-07-08 jrick } else {
6052 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
6053 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6054 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6055 24df9a28 2023-07-08 jrick goto done;
6056 24df9a28 2023-07-08 jrick }
6057 24df9a28 2023-07-08 jrick }
6058 24df9a28 2023-07-08 jrick }
6059 24df9a28 2023-07-08 jrick
6060 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6061 24df9a28 2023-07-08 jrick if (error != NULL)
6062 24df9a28 2023-07-08 jrick goto done;
6063 24df9a28 2023-07-08 jrick
6064 24df9a28 2023-07-08 jrick #ifndef PROFILE
6065 24df9a28 2023-07-08 jrick if (do_list) {
6066 24df9a28 2023-07-08 jrick /* Remove "cpath" promise. */
6067 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6068 24df9a28 2023-07-08 jrick NULL) == -1)
6069 24df9a28 2023-07-08 jrick err(1, "pledge");
6070 24df9a28 2023-07-08 jrick }
6071 24df9a28 2023-07-08 jrick #endif
6072 24df9a28 2023-07-08 jrick
6073 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), do_list,
6074 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
6075 24df9a28 2023-07-08 jrick if (error)
6076 24df9a28 2023-07-08 jrick goto done;
6077 24df9a28 2023-07-08 jrick
6078 24df9a28 2023-07-08 jrick if (do_list)
6079 24df9a28 2023-07-08 jrick error = list_refs(repo, refname, sort_by_time);
6080 24df9a28 2023-07-08 jrick else if (do_delete)
6081 24df9a28 2023-07-08 jrick error = delete_ref_by_name(repo, refname);
6082 24df9a28 2023-07-08 jrick else if (symref_target)
6083 24df9a28 2023-07-08 jrick error = add_symref(repo, refname, symref_target);
6084 24df9a28 2023-07-08 jrick else {
6085 24df9a28 2023-07-08 jrick if (obj_arg == NULL)
6086 24df9a28 2023-07-08 jrick usage_ref();
6087 24df9a28 2023-07-08 jrick error = add_ref(repo, refname, obj_arg);
6088 24df9a28 2023-07-08 jrick }
6089 24df9a28 2023-07-08 jrick done:
6090 24df9a28 2023-07-08 jrick free(refname);
6091 24df9a28 2023-07-08 jrick if (repo) {
6092 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
6093 24df9a28 2023-07-08 jrick if (error == NULL)
6094 24df9a28 2023-07-08 jrick error = close_err;
6095 24df9a28 2023-07-08 jrick }
6096 24df9a28 2023-07-08 jrick if (worktree)
6097 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6098 24df9a28 2023-07-08 jrick if (pack_fds) {
6099 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6100 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6101 24df9a28 2023-07-08 jrick if (error == NULL)
6102 24df9a28 2023-07-08 jrick error = pack_err;
6103 24df9a28 2023-07-08 jrick }
6104 24df9a28 2023-07-08 jrick free(cwd);
6105 24df9a28 2023-07-08 jrick free(repo_path);
6106 24df9a28 2023-07-08 jrick return error;
6107 24df9a28 2023-07-08 jrick }
6108 24df9a28 2023-07-08 jrick
6109 24df9a28 2023-07-08 jrick __dead static void
6110 24df9a28 2023-07-08 jrick usage_tag(void)
6111 24df9a28 2023-07-08 jrick {
6112 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
6113 24df9a28 2023-07-08 jrick "[-r repository-path] [-s signer-id] name\n", getprogname());
6114 24df9a28 2023-07-08 jrick exit(1);
6115 24df9a28 2023-07-08 jrick }
6116 24df9a28 2023-07-08 jrick
6117 24df9a28 2023-07-08 jrick #if 0
6118 24df9a28 2023-07-08 jrick static const struct got_error *
6119 24df9a28 2023-07-08 jrick sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6120 24df9a28 2023-07-08 jrick {
6121 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
6122 24df9a28 2023-07-08 jrick struct got_reflist_entry *re, *se, *new;
6123 24df9a28 2023-07-08 jrick struct got_object_id *re_id, *se_id;
6124 24df9a28 2023-07-08 jrick struct got_tag_object *re_tag, *se_tag;
6125 24df9a28 2023-07-08 jrick time_t re_time, se_time;
6126 24df9a28 2023-07-08 jrick
6127 24df9a28 2023-07-08 jrick STAILQ_FOREACH(re, tags, entry) {
6128 24df9a28 2023-07-08 jrick se = STAILQ_FIRST(sorted);
6129 24df9a28 2023-07-08 jrick if (se == NULL) {
6130 24df9a28 2023-07-08 jrick err = got_reflist_entry_dup(&new, re);
6131 24df9a28 2023-07-08 jrick if (err)
6132 24df9a28 2023-07-08 jrick return err;
6133 24df9a28 2023-07-08 jrick STAILQ_INSERT_HEAD(sorted, new, entry);
6134 24df9a28 2023-07-08 jrick continue;
6135 24df9a28 2023-07-08 jrick } else {
6136 24df9a28 2023-07-08 jrick err = got_ref_resolve(&re_id, repo, re->ref);
6137 24df9a28 2023-07-08 jrick if (err)
6138 24df9a28 2023-07-08 jrick break;
6139 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&re_tag, repo, re_id);
6140 24df9a28 2023-07-08 jrick free(re_id);
6141 24df9a28 2023-07-08 jrick if (err)
6142 24df9a28 2023-07-08 jrick break;
6143 24df9a28 2023-07-08 jrick re_time = got_object_tag_get_tagger_time(re_tag);
6144 24df9a28 2023-07-08 jrick got_object_tag_close(re_tag);
6145 24df9a28 2023-07-08 jrick }
6146 24df9a28 2023-07-08 jrick
6147 24df9a28 2023-07-08 jrick while (se) {
6148 24df9a28 2023-07-08 jrick err = got_ref_resolve(&se_id, repo, re->ref);
6149 24df9a28 2023-07-08 jrick if (err)
6150 24df9a28 2023-07-08 jrick break;
6151 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&se_tag, repo, se_id);
6152 24df9a28 2023-07-08 jrick free(se_id);
6153 24df9a28 2023-07-08 jrick if (err)
6154 24df9a28 2023-07-08 jrick break;
6155 24df9a28 2023-07-08 jrick se_time = got_object_tag_get_tagger_time(se_tag);
6156 24df9a28 2023-07-08 jrick got_object_tag_close(se_tag);
6157 24df9a28 2023-07-08 jrick
6158 24df9a28 2023-07-08 jrick if (se_time > re_time) {
6159 24df9a28 2023-07-08 jrick err = got_reflist_entry_dup(&new, re);
6160 24df9a28 2023-07-08 jrick if (err)
6161 24df9a28 2023-07-08 jrick return err;
6162 24df9a28 2023-07-08 jrick STAILQ_INSERT_AFTER(sorted, se, new, entry);
6163 24df9a28 2023-07-08 jrick break;
6164 24df9a28 2023-07-08 jrick }
6165 24df9a28 2023-07-08 jrick se = STAILQ_NEXT(se, entry);
6166 24df9a28 2023-07-08 jrick continue;
6167 24df9a28 2023-07-08 jrick }
6168 24df9a28 2023-07-08 jrick }
6169 24df9a28 2023-07-08 jrick done:
6170 24df9a28 2023-07-08 jrick return err;
6171 24df9a28 2023-07-08 jrick }
6172 24df9a28 2023-07-08 jrick #endif
6173 24df9a28 2023-07-08 jrick
6174 24df9a28 2023-07-08 jrick static const struct got_error *
6175 24df9a28 2023-07-08 jrick get_tag_refname(char **refname, const char *tag_name)
6176 24df9a28 2023-07-08 jrick {
6177 24df9a28 2023-07-08 jrick const struct got_error *err;
6178 24df9a28 2023-07-08 jrick
6179 24df9a28 2023-07-08 jrick if (strncmp("refs/tags/", tag_name, 10) == 0) {
6180 24df9a28 2023-07-08 jrick *refname = strdup(tag_name);
6181 24df9a28 2023-07-08 jrick if (*refname == NULL)
6182 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
6183 24df9a28 2023-07-08 jrick } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
6184 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
6185 24df9a28 2023-07-08 jrick *refname = NULL;
6186 24df9a28 2023-07-08 jrick return err;
6187 24df9a28 2023-07-08 jrick }
6188 24df9a28 2023-07-08 jrick
6189 24df9a28 2023-07-08 jrick return NULL;
6190 24df9a28 2023-07-08 jrick }
6191 24df9a28 2023-07-08 jrick
6192 24df9a28 2023-07-08 jrick static const struct got_error *
6193 24df9a28 2023-07-08 jrick list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
6194 24df9a28 2023-07-08 jrick const char *allowed_signers, const char *revoked_signers, int verbosity)
6195 24df9a28 2023-07-08 jrick {
6196 24df9a28 2023-07-08 jrick static const struct got_error *err = NULL;
6197 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
6198 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
6199 24df9a28 2023-07-08 jrick char *wanted_refname = NULL;
6200 24df9a28 2023-07-08 jrick int bad_sigs = 0;
6201 24df9a28 2023-07-08 jrick
6202 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
6203 24df9a28 2023-07-08 jrick
6204 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6205 24df9a28 2023-07-08 jrick if (err)
6206 24df9a28 2023-07-08 jrick return err;
6207 24df9a28 2023-07-08 jrick
6208 24df9a28 2023-07-08 jrick if (tag_name) {
6209 24df9a28 2023-07-08 jrick struct got_reference *ref;
6210 24df9a28 2023-07-08 jrick err = get_tag_refname(&wanted_refname, tag_name);
6211 24df9a28 2023-07-08 jrick if (err)
6212 24df9a28 2023-07-08 jrick goto done;
6213 24df9a28 2023-07-08 jrick /* Wanted tag reference should exist. */
6214 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, wanted_refname, 0);
6215 24df9a28 2023-07-08 jrick if (err)
6216 24df9a28 2023-07-08 jrick goto done;
6217 24df9a28 2023-07-08 jrick got_ref_close(ref);
6218 24df9a28 2023-07-08 jrick }
6219 24df9a28 2023-07-08 jrick
6220 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
6221 24df9a28 2023-07-08 jrick const char *refname;
6222 24df9a28 2023-07-08 jrick char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6223 24df9a28 2023-07-08 jrick char datebuf[26];
6224 24df9a28 2023-07-08 jrick const char *tagger, *ssh_sig = NULL;
6225 24df9a28 2023-07-08 jrick char *sig_msg = NULL;
6226 24df9a28 2023-07-08 jrick time_t tagger_time;
6227 24df9a28 2023-07-08 jrick struct got_object_id *id;
6228 24df9a28 2023-07-08 jrick struct got_tag_object *tag;
6229 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
6230 24df9a28 2023-07-08 jrick
6231 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
6232 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/tags/", 10) != 0 ||
6233 24df9a28 2023-07-08 jrick (wanted_refname && strcmp(refname, wanted_refname) != 0))
6234 24df9a28 2023-07-08 jrick continue;
6235 24df9a28 2023-07-08 jrick refname += 10;
6236 24df9a28 2023-07-08 jrick refstr = got_ref_to_str(re->ref);
6237 24df9a28 2023-07-08 jrick if (refstr == NULL) {
6238 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_ref_to_str");
6239 24df9a28 2023-07-08 jrick break;
6240 24df9a28 2023-07-08 jrick }
6241 24df9a28 2023-07-08 jrick
6242 24df9a28 2023-07-08 jrick err = got_ref_resolve(&id, repo, re->ref);
6243 24df9a28 2023-07-08 jrick if (err)
6244 24df9a28 2023-07-08 jrick break;
6245 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&tag, repo, id);
6246 24df9a28 2023-07-08 jrick if (err) {
6247 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_OBJ_TYPE) {
6248 24df9a28 2023-07-08 jrick free(id);
6249 24df9a28 2023-07-08 jrick break;
6250 24df9a28 2023-07-08 jrick }
6251 24df9a28 2023-07-08 jrick /* "lightweight" tag */
6252 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
6253 24df9a28 2023-07-08 jrick if (err) {
6254 24df9a28 2023-07-08 jrick free(id);
6255 24df9a28 2023-07-08 jrick break;
6256 24df9a28 2023-07-08 jrick }
6257 24df9a28 2023-07-08 jrick tagger = got_object_commit_get_committer(commit);
6258 24df9a28 2023-07-08 jrick tagger_time =
6259 24df9a28 2023-07-08 jrick got_object_commit_get_committer_time(commit);
6260 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
6261 24df9a28 2023-07-08 jrick free(id);
6262 24df9a28 2023-07-08 jrick if (err)
6263 24df9a28 2023-07-08 jrick break;
6264 24df9a28 2023-07-08 jrick } else {
6265 24df9a28 2023-07-08 jrick free(id);
6266 24df9a28 2023-07-08 jrick tagger = got_object_tag_get_tagger(tag);
6267 24df9a28 2023-07-08 jrick tagger_time = got_object_tag_get_tagger_time(tag);
6268 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str,
6269 24df9a28 2023-07-08 jrick got_object_tag_get_object_id(tag));
6270 24df9a28 2023-07-08 jrick if (err)
6271 24df9a28 2023-07-08 jrick break;
6272 24df9a28 2023-07-08 jrick }
6273 24df9a28 2023-07-08 jrick
6274 24df9a28 2023-07-08 jrick if (tag && verify_tags) {
6275 24df9a28 2023-07-08 jrick ssh_sig = got_sigs_get_tagmsg_ssh_signature(
6276 24df9a28 2023-07-08 jrick got_object_tag_get_message(tag));
6277 24df9a28 2023-07-08 jrick if (ssh_sig && allowed_signers == NULL) {
6278 24df9a28 2023-07-08 jrick err = got_error_msg(
6279 24df9a28 2023-07-08 jrick GOT_ERR_VERIFY_TAG_SIGNATURE,
6280 24df9a28 2023-07-08 jrick "SSH signature verification requires "
6281 24df9a28 2023-07-08 jrick "setting allowed_signers in "
6282 24df9a28 2023-07-08 jrick "got.conf(5)");
6283 24df9a28 2023-07-08 jrick break;
6284 24df9a28 2023-07-08 jrick }
6285 24df9a28 2023-07-08 jrick }
6286 24df9a28 2023-07-08 jrick
6287 24df9a28 2023-07-08 jrick printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6288 24df9a28 2023-07-08 jrick free(refstr);
6289 24df9a28 2023-07-08 jrick printf("from: %s\n", tagger);
6290 24df9a28 2023-07-08 jrick datestr = get_datestr(&tagger_time, datebuf);
6291 24df9a28 2023-07-08 jrick if (datestr)
6292 24df9a28 2023-07-08 jrick printf("date: %s UTC\n", datestr);
6293 24df9a28 2023-07-08 jrick if (commit)
6294 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6295 24df9a28 2023-07-08 jrick else {
6296 24df9a28 2023-07-08 jrick switch (got_object_tag_get_object_type(tag)) {
6297 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
6298 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6299 24df9a28 2023-07-08 jrick id_str);
6300 24df9a28 2023-07-08 jrick break;
6301 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
6302 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6303 24df9a28 2023-07-08 jrick id_str);
6304 24df9a28 2023-07-08 jrick break;
6305 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
6306 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6307 24df9a28 2023-07-08 jrick id_str);
6308 24df9a28 2023-07-08 jrick break;
6309 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TAG:
6310 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6311 24df9a28 2023-07-08 jrick id_str);
6312 24df9a28 2023-07-08 jrick break;
6313 24df9a28 2023-07-08 jrick default:
6314 24df9a28 2023-07-08 jrick break;
6315 24df9a28 2023-07-08 jrick }
6316 24df9a28 2023-07-08 jrick }
6317 24df9a28 2023-07-08 jrick free(id_str);
6318 24df9a28 2023-07-08 jrick
6319 24df9a28 2023-07-08 jrick if (ssh_sig) {
6320 24df9a28 2023-07-08 jrick err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
6321 24df9a28 2023-07-08 jrick allowed_signers, revoked_signers, verbosity);
6322 24df9a28 2023-07-08 jrick if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
6323 24df9a28 2023-07-08 jrick bad_sigs = 1;
6324 24df9a28 2023-07-08 jrick else if (err)
6325 24df9a28 2023-07-08 jrick break;
6326 24df9a28 2023-07-08 jrick printf("signature: %s", sig_msg);
6327 24df9a28 2023-07-08 jrick free(sig_msg);
6328 24df9a28 2023-07-08 jrick sig_msg = NULL;
6329 24df9a28 2023-07-08 jrick }
6330 24df9a28 2023-07-08 jrick
6331 24df9a28 2023-07-08 jrick if (commit) {
6332 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&tagmsg0, commit);
6333 24df9a28 2023-07-08 jrick if (err)
6334 24df9a28 2023-07-08 jrick break;
6335 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
6336 24df9a28 2023-07-08 jrick } else {
6337 24df9a28 2023-07-08 jrick tagmsg0 = strdup(got_object_tag_get_message(tag));
6338 24df9a28 2023-07-08 jrick got_object_tag_close(tag);
6339 24df9a28 2023-07-08 jrick if (tagmsg0 == NULL) {
6340 24df9a28 2023-07-08 jrick err = got_error_from_errno("strdup");
6341 24df9a28 2023-07-08 jrick break;
6342 24df9a28 2023-07-08 jrick }
6343 24df9a28 2023-07-08 jrick }
6344 24df9a28 2023-07-08 jrick
6345 24df9a28 2023-07-08 jrick tagmsg = tagmsg0;
6346 24df9a28 2023-07-08 jrick do {
6347 24df9a28 2023-07-08 jrick line = strsep(&tagmsg, "\n");
6348 24df9a28 2023-07-08 jrick if (line)
6349 24df9a28 2023-07-08 jrick printf(" %s\n", line);
6350 24df9a28 2023-07-08 jrick } while (line);
6351 24df9a28 2023-07-08 jrick free(tagmsg0);
6352 24df9a28 2023-07-08 jrick }
6353 24df9a28 2023-07-08 jrick done:
6354 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
6355 24df9a28 2023-07-08 jrick free(wanted_refname);
6356 24df9a28 2023-07-08 jrick
6357 24df9a28 2023-07-08 jrick if (err == NULL && bad_sigs)
6358 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
6359 24df9a28 2023-07-08 jrick return err;
6360 24df9a28 2023-07-08 jrick }
6361 24df9a28 2023-07-08 jrick
6362 24df9a28 2023-07-08 jrick static const struct got_error *
6363 24df9a28 2023-07-08 jrick get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6364 24df9a28 2023-07-08 jrick const char *tag_name, const char *repo_path)
6365 24df9a28 2023-07-08 jrick {
6366 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
6367 24df9a28 2023-07-08 jrick char *template = NULL, *initial_content = NULL;
6368 24df9a28 2023-07-08 jrick char *editor = NULL;
6369 24df9a28 2023-07-08 jrick int initial_content_len;
6370 24df9a28 2023-07-08 jrick int fd = -1;
6371 24df9a28 2023-07-08 jrick
6372 24df9a28 2023-07-08 jrick if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6373 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
6374 24df9a28 2023-07-08 jrick goto done;
6375 24df9a28 2023-07-08 jrick }
6376 24df9a28 2023-07-08 jrick
6377 24df9a28 2023-07-08 jrick initial_content_len = asprintf(&initial_content,
6378 24df9a28 2023-07-08 jrick "\n# tagging commit %s as %s\n",
6379 24df9a28 2023-07-08 jrick commit_id_str, tag_name);
6380 24df9a28 2023-07-08 jrick if (initial_content_len == -1) {
6381 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
6382 24df9a28 2023-07-08 jrick goto done;
6383 24df9a28 2023-07-08 jrick }
6384 24df9a28 2023-07-08 jrick
6385 24df9a28 2023-07-08 jrick err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
6386 24df9a28 2023-07-08 jrick if (err)
6387 24df9a28 2023-07-08 jrick goto done;
6388 24df9a28 2023-07-08 jrick
6389 24df9a28 2023-07-08 jrick if (write(fd, initial_content, initial_content_len) == -1) {
6390 24df9a28 2023-07-08 jrick err = got_error_from_errno2("write", *tagmsg_path);
6391 24df9a28 2023-07-08 jrick goto done;
6392 24df9a28 2023-07-08 jrick }
6393 24df9a28 2023-07-08 jrick if (close(fd) == -1) {
6394 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *tagmsg_path);
6395 24df9a28 2023-07-08 jrick goto done;
6396 24df9a28 2023-07-08 jrick }
6397 24df9a28 2023-07-08 jrick fd = -1;
6398 24df9a28 2023-07-08 jrick
6399 24df9a28 2023-07-08 jrick err = get_editor(&editor);
6400 24df9a28 2023-07-08 jrick if (err)
6401 24df9a28 2023-07-08 jrick goto done;
6402 24df9a28 2023-07-08 jrick err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6403 24df9a28 2023-07-08 jrick initial_content_len, 1);
6404 24df9a28 2023-07-08 jrick done:
6405 24df9a28 2023-07-08 jrick free(initial_content);
6406 24df9a28 2023-07-08 jrick free(template);
6407 24df9a28 2023-07-08 jrick free(editor);
6408 24df9a28 2023-07-08 jrick
6409 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
6410 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *tagmsg_path);
6411 24df9a28 2023-07-08 jrick
6412 24df9a28 2023-07-08 jrick if (err) {
6413 24df9a28 2023-07-08 jrick free(*tagmsg);
6414 24df9a28 2023-07-08 jrick *tagmsg = NULL;
6415 24df9a28 2023-07-08 jrick }
6416 24df9a28 2023-07-08 jrick return err;
6417 24df9a28 2023-07-08 jrick }
6418 24df9a28 2023-07-08 jrick
6419 24df9a28 2023-07-08 jrick static const struct got_error *
6420 24df9a28 2023-07-08 jrick add_tag(struct got_repository *repo, const char *tagger,
6421 24df9a28 2023-07-08 jrick const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
6422 24df9a28 2023-07-08 jrick const char *signer_id, int verbosity)
6423 24df9a28 2023-07-08 jrick {
6424 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
6425 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL, *tag_id = NULL;
6426 24df9a28 2023-07-08 jrick char *label = NULL, *commit_id_str = NULL;
6427 24df9a28 2023-07-08 jrick struct got_reference *ref = NULL;
6428 24df9a28 2023-07-08 jrick char *refname = NULL, *tagmsg = NULL;
6429 24df9a28 2023-07-08 jrick char *tagmsg_path = NULL, *tag_id_str = NULL;
6430 24df9a28 2023-07-08 jrick int preserve_tagmsg = 0;
6431 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
6432 24df9a28 2023-07-08 jrick
6433 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
6434 24df9a28 2023-07-08 jrick
6435 24df9a28 2023-07-08 jrick /*
6436 24df9a28 2023-07-08 jrick * Don't let the user create a tag name with a leading '-'.
6437 24df9a28 2023-07-08 jrick * While technically a valid reference name, this case is usually
6438 24df9a28 2023-07-08 jrick * an unintended typo.
6439 24df9a28 2023-07-08 jrick */
6440 24df9a28 2023-07-08 jrick if (tag_name[0] == '-')
6441 24df9a28 2023-07-08 jrick return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6442 24df9a28 2023-07-08 jrick
6443 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6444 24df9a28 2023-07-08 jrick if (err)
6445 24df9a28 2023-07-08 jrick goto done;
6446 24df9a28 2023-07-08 jrick
6447 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6448 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, &refs, repo);
6449 24df9a28 2023-07-08 jrick if (err)
6450 24df9a28 2023-07-08 jrick goto done;
6451 24df9a28 2023-07-08 jrick
6452 24df9a28 2023-07-08 jrick err = got_object_id_str(&commit_id_str, commit_id);
6453 24df9a28 2023-07-08 jrick if (err)
6454 24df9a28 2023-07-08 jrick goto done;
6455 24df9a28 2023-07-08 jrick
6456 24df9a28 2023-07-08 jrick err = get_tag_refname(&refname, tag_name);
6457 24df9a28 2023-07-08 jrick if (err)
6458 24df9a28 2023-07-08 jrick goto done;
6459 24df9a28 2023-07-08 jrick if (strncmp("refs/tags/", tag_name, 10) == 0)
6460 24df9a28 2023-07-08 jrick tag_name += 10;
6461 24df9a28 2023-07-08 jrick
6462 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, refname, 0);
6463 24df9a28 2023-07-08 jrick if (err == NULL) {
6464 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_TAG_EXISTS);
6465 24df9a28 2023-07-08 jrick goto done;
6466 24df9a28 2023-07-08 jrick } else if (err->code != GOT_ERR_NOT_REF)
6467 24df9a28 2023-07-08 jrick goto done;
6468 24df9a28 2023-07-08 jrick
6469 24df9a28 2023-07-08 jrick if (tagmsg_arg == NULL) {
6470 24df9a28 2023-07-08 jrick err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6471 24df9a28 2023-07-08 jrick tag_name, got_repo_get_path(repo));
6472 24df9a28 2023-07-08 jrick if (err) {
6473 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6474 24df9a28 2023-07-08 jrick tagmsg_path != NULL)
6475 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6476 24df9a28 2023-07-08 jrick goto done;
6477 24df9a28 2023-07-08 jrick }
6478 24df9a28 2023-07-08 jrick /* Editor is done; we can now apply unveil(2) */
6479 24df9a28 2023-07-08 jrick err = got_sigs_apply_unveil();
6480 24df9a28 2023-07-08 jrick if (err)
6481 24df9a28 2023-07-08 jrick goto done;
6482 24df9a28 2023-07-08 jrick err = apply_unveil(got_repo_get_path(repo), 0, NULL);
6483 24df9a28 2023-07-08 jrick if (err)
6484 24df9a28 2023-07-08 jrick goto done;
6485 24df9a28 2023-07-08 jrick }
6486 24df9a28 2023-07-08 jrick
6487 24df9a28 2023-07-08 jrick err = got_object_tag_create(&tag_id, tag_name, commit_id,
6488 24df9a28 2023-07-08 jrick tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
6489 24df9a28 2023-07-08 jrick verbosity);
6490 24df9a28 2023-07-08 jrick if (err) {
6491 24df9a28 2023-07-08 jrick if (tagmsg_path)
6492 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6493 24df9a28 2023-07-08 jrick goto done;
6494 24df9a28 2023-07-08 jrick }
6495 24df9a28 2023-07-08 jrick
6496 24df9a28 2023-07-08 jrick err = got_ref_alloc(&ref, refname, tag_id);
6497 24df9a28 2023-07-08 jrick if (err) {
6498 24df9a28 2023-07-08 jrick if (tagmsg_path)
6499 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6500 24df9a28 2023-07-08 jrick goto done;
6501 24df9a28 2023-07-08 jrick }
6502 24df9a28 2023-07-08 jrick
6503 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
6504 24df9a28 2023-07-08 jrick if (err) {
6505 24df9a28 2023-07-08 jrick if (tagmsg_path)
6506 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6507 24df9a28 2023-07-08 jrick goto done;
6508 24df9a28 2023-07-08 jrick }
6509 24df9a28 2023-07-08 jrick
6510 24df9a28 2023-07-08 jrick err = got_object_id_str(&tag_id_str, tag_id);
6511 24df9a28 2023-07-08 jrick if (err) {
6512 24df9a28 2023-07-08 jrick if (tagmsg_path)
6513 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6514 24df9a28 2023-07-08 jrick goto done;
6515 24df9a28 2023-07-08 jrick }
6516 24df9a28 2023-07-08 jrick printf("Created tag %s\n", tag_id_str);
6517 24df9a28 2023-07-08 jrick done:
6518 24df9a28 2023-07-08 jrick if (preserve_tagmsg) {
6519 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: tag message preserved in %s\n",
6520 24df9a28 2023-07-08 jrick getprogname(), tagmsg_path);
6521 24df9a28 2023-07-08 jrick } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6522 24df9a28 2023-07-08 jrick err = got_error_from_errno2("unlink", tagmsg_path);
6523 24df9a28 2023-07-08 jrick free(tag_id_str);
6524 24df9a28 2023-07-08 jrick if (ref)
6525 24df9a28 2023-07-08 jrick got_ref_close(ref);
6526 24df9a28 2023-07-08 jrick free(commit_id);
6527 24df9a28 2023-07-08 jrick free(commit_id_str);
6528 24df9a28 2023-07-08 jrick free(refname);
6529 24df9a28 2023-07-08 jrick free(tagmsg);
6530 24df9a28 2023-07-08 jrick free(tagmsg_path);
6531 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
6532 24df9a28 2023-07-08 jrick return err;
6533 24df9a28 2023-07-08 jrick }
6534 24df9a28 2023-07-08 jrick
6535 24df9a28 2023-07-08 jrick static const struct got_error *
6536 24df9a28 2023-07-08 jrick cmd_tag(int argc, char *argv[])
6537 24df9a28 2023-07-08 jrick {
6538 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
6539 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6540 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6541 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6542 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL, *tagger = NULL;
6543 24df9a28 2023-07-08 jrick char *allowed_signers = NULL, *revoked_signers = NULL;
6544 24df9a28 2023-07-08 jrick const char *signer_id = NULL;
6545 24df9a28 2023-07-08 jrick const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
6546 24df9a28 2023-07-08 jrick int ch, do_list = 0, verify_tags = 0, verbosity = 0;
6547 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6548 24df9a28 2023-07-08 jrick
6549 24df9a28 2023-07-08 jrick #ifndef PROFILE
6550 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6551 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
6552 24df9a28 2023-07-08 jrick err(1, "pledge");
6553 24df9a28 2023-07-08 jrick #endif
6554 24df9a28 2023-07-08 jrick
6555 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
6556 24df9a28 2023-07-08 jrick switch (ch) {
6557 24df9a28 2023-07-08 jrick case 'c':
6558 24df9a28 2023-07-08 jrick commit_id_arg = optarg;
6559 24df9a28 2023-07-08 jrick break;
6560 24df9a28 2023-07-08 jrick case 'l':
6561 24df9a28 2023-07-08 jrick do_list = 1;
6562 24df9a28 2023-07-08 jrick break;
6563 24df9a28 2023-07-08 jrick case 'm':
6564 24df9a28 2023-07-08 jrick tagmsg = optarg;
6565 24df9a28 2023-07-08 jrick break;
6566 24df9a28 2023-07-08 jrick case 'r':
6567 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
6568 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6569 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath",
6570 24df9a28 2023-07-08 jrick optarg);
6571 24df9a28 2023-07-08 jrick goto done;
6572 24df9a28 2023-07-08 jrick }
6573 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
6574 24df9a28 2023-07-08 jrick break;
6575 24df9a28 2023-07-08 jrick case 's':
6576 24df9a28 2023-07-08 jrick signer_id = optarg;
6577 24df9a28 2023-07-08 jrick break;
6578 24df9a28 2023-07-08 jrick case 'V':
6579 24df9a28 2023-07-08 jrick verify_tags = 1;
6580 24df9a28 2023-07-08 jrick break;
6581 24df9a28 2023-07-08 jrick case 'v':
6582 24df9a28 2023-07-08 jrick if (verbosity < 0)
6583 24df9a28 2023-07-08 jrick verbosity = 0;
6584 24df9a28 2023-07-08 jrick else if (verbosity < 3)
6585 24df9a28 2023-07-08 jrick verbosity++;
6586 24df9a28 2023-07-08 jrick break;
6587 24df9a28 2023-07-08 jrick default:
6588 24df9a28 2023-07-08 jrick usage_tag();
6589 24df9a28 2023-07-08 jrick /* NOTREACHED */
6590 24df9a28 2023-07-08 jrick }
6591 24df9a28 2023-07-08 jrick }
6592 24df9a28 2023-07-08 jrick
6593 24df9a28 2023-07-08 jrick argc -= optind;
6594 24df9a28 2023-07-08 jrick argv += optind;
6595 24df9a28 2023-07-08 jrick
6596 24df9a28 2023-07-08 jrick if (do_list || verify_tags) {
6597 24df9a28 2023-07-08 jrick if (commit_id_arg != NULL)
6598 24df9a28 2023-07-08 jrick errx(1,
6599 24df9a28 2023-07-08 jrick "-c option can only be used when creating a tag");
6600 24df9a28 2023-07-08 jrick if (tagmsg) {
6601 24df9a28 2023-07-08 jrick if (do_list)
6602 24df9a28 2023-07-08 jrick option_conflict('l', 'm');
6603 24df9a28 2023-07-08 jrick else
6604 24df9a28 2023-07-08 jrick option_conflict('V', 'm');
6605 24df9a28 2023-07-08 jrick }
6606 24df9a28 2023-07-08 jrick if (signer_id) {
6607 24df9a28 2023-07-08 jrick if (do_list)
6608 24df9a28 2023-07-08 jrick option_conflict('l', 's');
6609 24df9a28 2023-07-08 jrick else
6610 24df9a28 2023-07-08 jrick option_conflict('V', 's');
6611 24df9a28 2023-07-08 jrick }
6612 24df9a28 2023-07-08 jrick if (argc > 1)
6613 24df9a28 2023-07-08 jrick usage_tag();
6614 24df9a28 2023-07-08 jrick } else if (argc != 1)
6615 24df9a28 2023-07-08 jrick usage_tag();
6616 24df9a28 2023-07-08 jrick
6617 24df9a28 2023-07-08 jrick if (argc == 1)
6618 24df9a28 2023-07-08 jrick tag_name = argv[0];
6619 24df9a28 2023-07-08 jrick
6620 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6621 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6622 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6623 24df9a28 2023-07-08 jrick goto done;
6624 24df9a28 2023-07-08 jrick }
6625 24df9a28 2023-07-08 jrick
6626 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6627 24df9a28 2023-07-08 jrick if (error != NULL)
6628 24df9a28 2023-07-08 jrick goto done;
6629 24df9a28 2023-07-08 jrick
6630 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6631 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
6632 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
6633 24df9a28 2023-07-08 jrick goto done;
6634 24df9a28 2023-07-08 jrick else
6635 24df9a28 2023-07-08 jrick error = NULL;
6636 24df9a28 2023-07-08 jrick if (worktree) {
6637 24df9a28 2023-07-08 jrick repo_path =
6638 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
6639 24df9a28 2023-07-08 jrick if (repo_path == NULL)
6640 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6641 24df9a28 2023-07-08 jrick if (error)
6642 24df9a28 2023-07-08 jrick goto done;
6643 24df9a28 2023-07-08 jrick } else {
6644 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
6645 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6646 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6647 24df9a28 2023-07-08 jrick goto done;
6648 24df9a28 2023-07-08 jrick }
6649 24df9a28 2023-07-08 jrick }
6650 24df9a28 2023-07-08 jrick }
6651 24df9a28 2023-07-08 jrick
6652 24df9a28 2023-07-08 jrick if (do_list || verify_tags) {
6653 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6654 24df9a28 2023-07-08 jrick if (error != NULL)
6655 24df9a28 2023-07-08 jrick goto done;
6656 24df9a28 2023-07-08 jrick error = get_allowed_signers(&allowed_signers, repo, worktree);
6657 24df9a28 2023-07-08 jrick if (error)
6658 24df9a28 2023-07-08 jrick goto done;
6659 24df9a28 2023-07-08 jrick error = get_revoked_signers(&revoked_signers, repo, worktree);
6660 24df9a28 2023-07-08 jrick if (error)
6661 24df9a28 2023-07-08 jrick goto done;
6662 24df9a28 2023-07-08 jrick if (worktree) {
6663 24df9a28 2023-07-08 jrick /* Release work tree lock. */
6664 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6665 24df9a28 2023-07-08 jrick worktree = NULL;
6666 24df9a28 2023-07-08 jrick }
6667 24df9a28 2023-07-08 jrick
6668 24df9a28 2023-07-08 jrick /*
6669 24df9a28 2023-07-08 jrick * Remove "cpath" promise unless needed for signature tmpfile
6670 24df9a28 2023-07-08 jrick * creation.
6671 24df9a28 2023-07-08 jrick */
6672 24df9a28 2023-07-08 jrick if (verify_tags)
6673 24df9a28 2023-07-08 jrick got_sigs_apply_unveil();
6674 24df9a28 2023-07-08 jrick else {
6675 24df9a28 2023-07-08 jrick #ifndef PROFILE
6676 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath flock proc exec sendfd "
6677 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
6678 24df9a28 2023-07-08 jrick err(1, "pledge");
6679 24df9a28 2023-07-08 jrick #endif
6680 24df9a28 2023-07-08 jrick }
6681 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6682 24df9a28 2023-07-08 jrick if (error)
6683 24df9a28 2023-07-08 jrick goto done;
6684 24df9a28 2023-07-08 jrick error = list_tags(repo, tag_name, verify_tags, allowed_signers,
6685 24df9a28 2023-07-08 jrick revoked_signers, verbosity);
6686 24df9a28 2023-07-08 jrick } else {
6687 24df9a28 2023-07-08 jrick error = get_gitconfig_path(&gitconfig_path);
6688 24df9a28 2023-07-08 jrick if (error)
6689 24df9a28 2023-07-08 jrick goto done;
6690 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, gitconfig_path,
6691 24df9a28 2023-07-08 jrick pack_fds);
6692 24df9a28 2023-07-08 jrick if (error != NULL)
6693 24df9a28 2023-07-08 jrick goto done;
6694 24df9a28 2023-07-08 jrick
6695 24df9a28 2023-07-08 jrick error = get_author(&tagger, repo, worktree);
6696 24df9a28 2023-07-08 jrick if (error)
6697 24df9a28 2023-07-08 jrick goto done;
6698 24df9a28 2023-07-08 jrick if (signer_id == NULL)
6699 24df9a28 2023-07-08 jrick signer_id = get_signer_id(repo, worktree);
6700 24df9a28 2023-07-08 jrick
6701 24df9a28 2023-07-08 jrick if (tagmsg) {
6702 24df9a28 2023-07-08 jrick if (signer_id) {
6703 24df9a28 2023-07-08 jrick error = got_sigs_apply_unveil();
6704 24df9a28 2023-07-08 jrick if (error)
6705 24df9a28 2023-07-08 jrick goto done;
6706 24df9a28 2023-07-08 jrick }
6707 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6708 24df9a28 2023-07-08 jrick if (error)
6709 24df9a28 2023-07-08 jrick goto done;
6710 24df9a28 2023-07-08 jrick }
6711 24df9a28 2023-07-08 jrick
6712 24df9a28 2023-07-08 jrick if (commit_id_arg == NULL) {
6713 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
6714 24df9a28 2023-07-08 jrick struct got_object_id *commit_id;
6715 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo,
6716 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_head_ref_name(worktree)
6717 24df9a28 2023-07-08 jrick : GOT_REF_HEAD, 0);
6718 24df9a28 2023-07-08 jrick if (error)
6719 24df9a28 2023-07-08 jrick goto done;
6720 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
6721 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
6722 24df9a28 2023-07-08 jrick if (error)
6723 24df9a28 2023-07-08 jrick goto done;
6724 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
6725 24df9a28 2023-07-08 jrick free(commit_id);
6726 24df9a28 2023-07-08 jrick if (error)
6727 24df9a28 2023-07-08 jrick goto done;
6728 24df9a28 2023-07-08 jrick }
6729 24df9a28 2023-07-08 jrick
6730 24df9a28 2023-07-08 jrick if (worktree) {
6731 24df9a28 2023-07-08 jrick /* Release work tree lock. */
6732 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6733 24df9a28 2023-07-08 jrick worktree = NULL;
6734 24df9a28 2023-07-08 jrick }
6735 24df9a28 2023-07-08 jrick
6736 24df9a28 2023-07-08 jrick error = add_tag(repo, tagger, tag_name,
6737 24df9a28 2023-07-08 jrick commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
6738 24df9a28 2023-07-08 jrick signer_id, verbosity);
6739 24df9a28 2023-07-08 jrick }
6740 24df9a28 2023-07-08 jrick done:
6741 24df9a28 2023-07-08 jrick if (repo) {
6742 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
6743 24df9a28 2023-07-08 jrick if (error == NULL)
6744 24df9a28 2023-07-08 jrick error = close_err;
6745 24df9a28 2023-07-08 jrick }
6746 24df9a28 2023-07-08 jrick if (worktree)
6747 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6748 24df9a28 2023-07-08 jrick if (pack_fds) {
6749 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6750 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6751 24df9a28 2023-07-08 jrick if (error == NULL)
6752 24df9a28 2023-07-08 jrick error = pack_err;
6753 24df9a28 2023-07-08 jrick }
6754 24df9a28 2023-07-08 jrick free(cwd);
6755 24df9a28 2023-07-08 jrick free(repo_path);
6756 24df9a28 2023-07-08 jrick free(gitconfig_path);
6757 24df9a28 2023-07-08 jrick free(commit_id_str);
6758 24df9a28 2023-07-08 jrick free(tagger);
6759 24df9a28 2023-07-08 jrick free(allowed_signers);
6760 24df9a28 2023-07-08 jrick free(revoked_signers);
6761 24df9a28 2023-07-08 jrick return error;
6762 24df9a28 2023-07-08 jrick }
6763 24df9a28 2023-07-08 jrick
6764 24df9a28 2023-07-08 jrick __dead static void
6765 24df9a28 2023-07-08 jrick usage_add(void)
6766 24df9a28 2023-07-08 jrick {
6767 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
6768 24df9a28 2023-07-08 jrick exit(1);
6769 24df9a28 2023-07-08 jrick }
6770 24df9a28 2023-07-08 jrick
6771 24df9a28 2023-07-08 jrick static const struct got_error *
6772 24df9a28 2023-07-08 jrick add_progress(void *arg, unsigned char status, const char *path)
6773 24df9a28 2023-07-08 jrick {
6774 24df9a28 2023-07-08 jrick while (path[0] == '/')
6775 24df9a28 2023-07-08 jrick path++;
6776 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
6777 24df9a28 2023-07-08 jrick return NULL;
6778 24df9a28 2023-07-08 jrick }
6779 24df9a28 2023-07-08 jrick
6780 24df9a28 2023-07-08 jrick static const struct got_error *
6781 24df9a28 2023-07-08 jrick cmd_add(int argc, char *argv[])
6782 24df9a28 2023-07-08 jrick {
6783 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
6784 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6785 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6786 24df9a28 2023-07-08 jrick char *cwd = NULL;
6787 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
6788 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
6789 24df9a28 2023-07-08 jrick int ch, can_recurse = 0, no_ignores = 0;
6790 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6791 24df9a28 2023-07-08 jrick
6792 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
6793 24df9a28 2023-07-08 jrick
6794 24df9a28 2023-07-08 jrick #ifndef PROFILE
6795 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6796 24df9a28 2023-07-08 jrick NULL) == -1)
6797 24df9a28 2023-07-08 jrick err(1, "pledge");
6798 24df9a28 2023-07-08 jrick #endif
6799 24df9a28 2023-07-08 jrick
6800 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "IR")) != -1) {
6801 24df9a28 2023-07-08 jrick switch (ch) {
6802 24df9a28 2023-07-08 jrick case 'I':
6803 24df9a28 2023-07-08 jrick no_ignores = 1;
6804 24df9a28 2023-07-08 jrick break;
6805 24df9a28 2023-07-08 jrick case 'R':
6806 24df9a28 2023-07-08 jrick can_recurse = 1;
6807 24df9a28 2023-07-08 jrick break;
6808 24df9a28 2023-07-08 jrick default:
6809 24df9a28 2023-07-08 jrick usage_add();
6810 24df9a28 2023-07-08 jrick /* NOTREACHED */
6811 24df9a28 2023-07-08 jrick }
6812 24df9a28 2023-07-08 jrick }
6813 24df9a28 2023-07-08 jrick
6814 24df9a28 2023-07-08 jrick argc -= optind;
6815 24df9a28 2023-07-08 jrick argv += optind;
6816 24df9a28 2023-07-08 jrick
6817 24df9a28 2023-07-08 jrick if (argc < 1)
6818 24df9a28 2023-07-08 jrick usage_add();
6819 24df9a28 2023-07-08 jrick
6820 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6821 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6822 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6823 24df9a28 2023-07-08 jrick goto done;
6824 24df9a28 2023-07-08 jrick }
6825 24df9a28 2023-07-08 jrick
6826 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6827 24df9a28 2023-07-08 jrick if (error != NULL)
6828 24df9a28 2023-07-08 jrick goto done;
6829 24df9a28 2023-07-08 jrick
6830 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
6831 24df9a28 2023-07-08 jrick if (error) {
6832 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
6833 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "add", cwd);
6834 24df9a28 2023-07-08 jrick goto done;
6835 24df9a28 2023-07-08 jrick }
6836 24df9a28 2023-07-08 jrick
6837 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6838 24df9a28 2023-07-08 jrick NULL, pack_fds);
6839 24df9a28 2023-07-08 jrick if (error != NULL)
6840 24df9a28 2023-07-08 jrick goto done;
6841 24df9a28 2023-07-08 jrick
6842 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
6843 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
6844 24df9a28 2023-07-08 jrick if (error)
6845 24df9a28 2023-07-08 jrick goto done;
6846 24df9a28 2023-07-08 jrick
6847 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6848 24df9a28 2023-07-08 jrick if (error)
6849 24df9a28 2023-07-08 jrick goto done;
6850 24df9a28 2023-07-08 jrick
6851 24df9a28 2023-07-08 jrick if (!can_recurse) {
6852 24df9a28 2023-07-08 jrick char *ondisk_path;
6853 24df9a28 2023-07-08 jrick struct stat sb;
6854 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
6855 24df9a28 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
6856 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree),
6857 24df9a28 2023-07-08 jrick pe->path) == -1) {
6858 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
6859 24df9a28 2023-07-08 jrick goto done;
6860 24df9a28 2023-07-08 jrick }
6861 24df9a28 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
6862 24df9a28 2023-07-08 jrick if (errno == ENOENT) {
6863 24df9a28 2023-07-08 jrick free(ondisk_path);
6864 24df9a28 2023-07-08 jrick continue;
6865 24df9a28 2023-07-08 jrick }
6866 24df9a28 2023-07-08 jrick error = got_error_from_errno2("lstat",
6867 24df9a28 2023-07-08 jrick ondisk_path);
6868 24df9a28 2023-07-08 jrick free(ondisk_path);
6869 24df9a28 2023-07-08 jrick goto done;
6870 24df9a28 2023-07-08 jrick }
6871 24df9a28 2023-07-08 jrick free(ondisk_path);
6872 24df9a28 2023-07-08 jrick if (S_ISDIR(sb.st_mode)) {
6873 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
6874 24df9a28 2023-07-08 jrick "adding directories requires -R option");
6875 24df9a28 2023-07-08 jrick goto done;
6876 24df9a28 2023-07-08 jrick }
6877 24df9a28 2023-07-08 jrick }
6878 24df9a28 2023-07-08 jrick }
6879 24df9a28 2023-07-08 jrick
6880 24df9a28 2023-07-08 jrick error = got_worktree_schedule_add(worktree, &paths, add_progress,
6881 24df9a28 2023-07-08 jrick NULL, repo, no_ignores);
6882 24df9a28 2023-07-08 jrick done:
6883 24df9a28 2023-07-08 jrick if (repo) {
6884 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
6885 24df9a28 2023-07-08 jrick if (error == NULL)
6886 24df9a28 2023-07-08 jrick error = close_err;
6887 24df9a28 2023-07-08 jrick }
6888 24df9a28 2023-07-08 jrick if (worktree)
6889 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6890 24df9a28 2023-07-08 jrick if (pack_fds) {
6891 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6892 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6893 24df9a28 2023-07-08 jrick if (error == NULL)
6894 24df9a28 2023-07-08 jrick error = pack_err;
6895 24df9a28 2023-07-08 jrick }
6896 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6897 24df9a28 2023-07-08 jrick free(cwd);
6898 24df9a28 2023-07-08 jrick return error;
6899 24df9a28 2023-07-08 jrick }
6900 24df9a28 2023-07-08 jrick
6901 24df9a28 2023-07-08 jrick __dead static void
6902 24df9a28 2023-07-08 jrick usage_remove(void)
6903 24df9a28 2023-07-08 jrick {
6904 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
6905 24df9a28 2023-07-08 jrick getprogname());
6906 24df9a28 2023-07-08 jrick exit(1);
6907 24df9a28 2023-07-08 jrick }
6908 24df9a28 2023-07-08 jrick
6909 24df9a28 2023-07-08 jrick static const struct got_error *
6910 24df9a28 2023-07-08 jrick print_remove_status(void *arg, unsigned char status,
6911 24df9a28 2023-07-08 jrick unsigned char staged_status, const char *path)
6912 24df9a28 2023-07-08 jrick {
6913 24df9a28 2023-07-08 jrick while (path[0] == '/')
6914 24df9a28 2023-07-08 jrick path++;
6915 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_NONEXISTENT)
6916 24df9a28 2023-07-08 jrick return NULL;
6917 24df9a28 2023-07-08 jrick if (status == staged_status && (status == GOT_STATUS_DELETE))
6918 24df9a28 2023-07-08 jrick status = GOT_STATUS_NO_CHANGE;
6919 24df9a28 2023-07-08 jrick printf("%c%c %s\n", status, staged_status, path);
6920 24df9a28 2023-07-08 jrick return NULL;
6921 24df9a28 2023-07-08 jrick }
6922 24df9a28 2023-07-08 jrick
6923 24df9a28 2023-07-08 jrick static const struct got_error *
6924 24df9a28 2023-07-08 jrick cmd_remove(int argc, char *argv[])
6925 24df9a28 2023-07-08 jrick {
6926 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
6927 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6928 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6929 24df9a28 2023-07-08 jrick const char *status_codes = NULL;
6930 24df9a28 2023-07-08 jrick char *cwd = NULL;
6931 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
6932 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
6933 24df9a28 2023-07-08 jrick int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6934 24df9a28 2023-07-08 jrick int ignore_missing_paths = 0;
6935 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6936 24df9a28 2023-07-08 jrick
6937 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
6938 24df9a28 2023-07-08 jrick
6939 24df9a28 2023-07-08 jrick #ifndef PROFILE
6940 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6941 24df9a28 2023-07-08 jrick NULL) == -1)
6942 24df9a28 2023-07-08 jrick err(1, "pledge");
6943 24df9a28 2023-07-08 jrick #endif
6944 24df9a28 2023-07-08 jrick
6945 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6946 24df9a28 2023-07-08 jrick switch (ch) {
6947 24df9a28 2023-07-08 jrick case 'f':
6948 24df9a28 2023-07-08 jrick delete_local_mods = 1;
6949 24df9a28 2023-07-08 jrick ignore_missing_paths = 1;
6950 24df9a28 2023-07-08 jrick break;
6951 24df9a28 2023-07-08 jrick case 'k':
6952 24df9a28 2023-07-08 jrick keep_on_disk = 1;
6953 24df9a28 2023-07-08 jrick break;
6954 24df9a28 2023-07-08 jrick case 'R':
6955 24df9a28 2023-07-08 jrick can_recurse = 1;
6956 24df9a28 2023-07-08 jrick break;
6957 24df9a28 2023-07-08 jrick case 's':
6958 24df9a28 2023-07-08 jrick for (i = 0; optarg[i] != '\0'; i++) {
6959 24df9a28 2023-07-08 jrick switch (optarg[i]) {
6960 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
6961 24df9a28 2023-07-08 jrick delete_local_mods = 1;
6962 24df9a28 2023-07-08 jrick break;
6963 24df9a28 2023-07-08 jrick case GOT_STATUS_MISSING:
6964 24df9a28 2023-07-08 jrick ignore_missing_paths = 1;
6965 24df9a28 2023-07-08 jrick break;
6966 24df9a28 2023-07-08 jrick default:
6967 24df9a28 2023-07-08 jrick errx(1, "invalid status code '%c'",
6968 24df9a28 2023-07-08 jrick optarg[i]);
6969 24df9a28 2023-07-08 jrick }
6970 24df9a28 2023-07-08 jrick }
6971 24df9a28 2023-07-08 jrick status_codes = optarg;
6972 24df9a28 2023-07-08 jrick break;
6973 24df9a28 2023-07-08 jrick default:
6974 24df9a28 2023-07-08 jrick usage_remove();
6975 24df9a28 2023-07-08 jrick /* NOTREACHED */
6976 24df9a28 2023-07-08 jrick }
6977 24df9a28 2023-07-08 jrick }
6978 24df9a28 2023-07-08 jrick
6979 24df9a28 2023-07-08 jrick argc -= optind;
6980 24df9a28 2023-07-08 jrick argv += optind;
6981 24df9a28 2023-07-08 jrick
6982 24df9a28 2023-07-08 jrick if (argc < 1)
6983 24df9a28 2023-07-08 jrick usage_remove();
6984 24df9a28 2023-07-08 jrick
6985 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6986 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6987 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6988 24df9a28 2023-07-08 jrick goto done;
6989 24df9a28 2023-07-08 jrick }
6990 24df9a28 2023-07-08 jrick
6991 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6992 24df9a28 2023-07-08 jrick if (error != NULL)
6993 24df9a28 2023-07-08 jrick goto done;
6994 24df9a28 2023-07-08 jrick
6995 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
6996 24df9a28 2023-07-08 jrick if (error) {
6997 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
6998 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "remove", cwd);
6999 24df9a28 2023-07-08 jrick goto done;
7000 24df9a28 2023-07-08 jrick }
7001 24df9a28 2023-07-08 jrick
7002 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7003 24df9a28 2023-07-08 jrick NULL, pack_fds);
7004 24df9a28 2023-07-08 jrick if (error)
7005 24df9a28 2023-07-08 jrick goto done;
7006 24df9a28 2023-07-08 jrick
7007 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
7008 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
7009 24df9a28 2023-07-08 jrick if (error)
7010 24df9a28 2023-07-08 jrick goto done;
7011 24df9a28 2023-07-08 jrick
7012 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7013 24df9a28 2023-07-08 jrick if (error)
7014 24df9a28 2023-07-08 jrick goto done;
7015 24df9a28 2023-07-08 jrick
7016 24df9a28 2023-07-08 jrick if (!can_recurse) {
7017 24df9a28 2023-07-08 jrick char *ondisk_path;
7018 24df9a28 2023-07-08 jrick struct stat sb;
7019 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
7020 24df9a28 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
7021 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree),
7022 24df9a28 2023-07-08 jrick pe->path) == -1) {
7023 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
7024 24df9a28 2023-07-08 jrick goto done;
7025 24df9a28 2023-07-08 jrick }
7026 24df9a28 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
7027 24df9a28 2023-07-08 jrick if (errno == ENOENT) {
7028 24df9a28 2023-07-08 jrick free(ondisk_path);
7029 24df9a28 2023-07-08 jrick continue;
7030 24df9a28 2023-07-08 jrick }
7031 24df9a28 2023-07-08 jrick error = got_error_from_errno2("lstat",
7032 24df9a28 2023-07-08 jrick ondisk_path);
7033 24df9a28 2023-07-08 jrick free(ondisk_path);
7034 24df9a28 2023-07-08 jrick goto done;
7035 24df9a28 2023-07-08 jrick }
7036 24df9a28 2023-07-08 jrick free(ondisk_path);
7037 24df9a28 2023-07-08 jrick if (S_ISDIR(sb.st_mode)) {
7038 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
7039 24df9a28 2023-07-08 jrick "removing directories requires -R option");
7040 24df9a28 2023-07-08 jrick goto done;
7041 24df9a28 2023-07-08 jrick }
7042 24df9a28 2023-07-08 jrick }
7043 24df9a28 2023-07-08 jrick }
7044 24df9a28 2023-07-08 jrick
7045 24df9a28 2023-07-08 jrick error = got_worktree_schedule_delete(worktree, &paths,
7046 24df9a28 2023-07-08 jrick delete_local_mods, status_codes, print_remove_status, NULL,
7047 24df9a28 2023-07-08 jrick repo, keep_on_disk, ignore_missing_paths);
7048 24df9a28 2023-07-08 jrick done:
7049 24df9a28 2023-07-08 jrick if (repo) {
7050 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
7051 24df9a28 2023-07-08 jrick if (error == NULL)
7052 24df9a28 2023-07-08 jrick error = close_err;
7053 24df9a28 2023-07-08 jrick }
7054 24df9a28 2023-07-08 jrick if (worktree)
7055 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
7056 24df9a28 2023-07-08 jrick if (pack_fds) {
7057 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
7058 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
7059 24df9a28 2023-07-08 jrick if (error == NULL)
7060 24df9a28 2023-07-08 jrick error = pack_err;
7061 24df9a28 2023-07-08 jrick }
7062 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7063 24df9a28 2023-07-08 jrick free(cwd);
7064 24df9a28 2023-07-08 jrick return error;
7065 24df9a28 2023-07-08 jrick }
7066 24df9a28 2023-07-08 jrick
7067 24df9a28 2023-07-08 jrick __dead static void
7068 24df9a28 2023-07-08 jrick usage_patch(void)
7069 24df9a28 2023-07-08 jrick {
7070 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
7071 24df9a28 2023-07-08 jrick "[patchfile]\n", getprogname());
7072 24df9a28 2023-07-08 jrick exit(1);
7073 24df9a28 2023-07-08 jrick }
7074 24df9a28 2023-07-08 jrick
7075 24df9a28 2023-07-08 jrick static const struct got_error *
7076 24df9a28 2023-07-08 jrick patch_from_stdin(int *patchfd)
7077 24df9a28 2023-07-08 jrick {
7078 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7079 24df9a28 2023-07-08 jrick ssize_t r;
7080 24df9a28 2023-07-08 jrick char buf[BUFSIZ];
7081 24df9a28 2023-07-08 jrick sig_t sighup, sigint, sigquit;
7082 24df9a28 2023-07-08 jrick
7083 24df9a28 2023-07-08 jrick *patchfd = got_opentempfd();
7084 24df9a28 2023-07-08 jrick if (*patchfd == -1)
7085 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
7086 24df9a28 2023-07-08 jrick
7087 24df9a28 2023-07-08 jrick sighup = signal(SIGHUP, SIG_DFL);
7088 24df9a28 2023-07-08 jrick sigint = signal(SIGINT, SIG_DFL);
7089 24df9a28 2023-07-08 jrick sigquit = signal(SIGQUIT, SIG_DFL);
7090 24df9a28 2023-07-08 jrick
7091 24df9a28 2023-07-08 jrick for (;;) {
7092 24df9a28 2023-07-08 jrick r = read(0, buf, sizeof(buf));
7093 24df9a28 2023-07-08 jrick if (r == -1) {
7094 24df9a28 2023-07-08 jrick err = got_error_from_errno("read");
7095 24df9a28 2023-07-08 jrick break;
7096 24df9a28 2023-07-08 jrick }
7097 24df9a28 2023-07-08 jrick if (r == 0)
7098 24df9a28 2023-07-08 jrick break;
7099 24df9a28 2023-07-08 jrick if (write(*patchfd, buf, r) == -1) {
7100 24df9a28 2023-07-08 jrick err = got_error_from_errno("write");
7101 24df9a28 2023-07-08 jrick break;
7102 24df9a28 2023-07-08 jrick }
7103 24df9a28 2023-07-08 jrick }
7104 24df9a28 2023-07-08 jrick
7105 24df9a28 2023-07-08 jrick signal(SIGHUP, sighup);
7106 24df9a28 2023-07-08 jrick signal(SIGINT, sigint);
7107 24df9a28 2023-07-08 jrick signal(SIGQUIT, sigquit);
7108 24df9a28 2023-07-08 jrick
7109 24df9a28 2023-07-08 jrick if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7110 24df9a28 2023-07-08 jrick err = got_error_from_errno("lseek");
7111 24df9a28 2023-07-08 jrick
7112 24df9a28 2023-07-08 jrick if (err != NULL) {
7113 24df9a28 2023-07-08 jrick close(*patchfd);
7114 24df9a28 2023-07-08 jrick *patchfd = -1;
7115 24df9a28 2023-07-08 jrick }
7116 24df9a28 2023-07-08 jrick
7117 24df9a28 2023-07-08 jrick return err;
7118 24df9a28 2023-07-08 jrick }
7119 24df9a28 2023-07-08 jrick
7120 24df9a28 2023-07-08 jrick struct got_patch_progress_arg {
7121 24df9a28 2023-07-08 jrick int did_something;
7122 24df9a28 2023-07-08 jrick int conflicts;
7123 24df9a28 2023-07-08 jrick int rejects;
7124 24df9a28 2023-07-08 jrick };
7125 24df9a28 2023-07-08 jrick
7126 24df9a28 2023-07-08 jrick static const struct got_error *
7127 24df9a28 2023-07-08 jrick patch_progress(void *arg, const char *old, const char *new,
7128 24df9a28 2023-07-08 jrick unsigned char status, const struct got_error *error, int old_from,
7129 24df9a28 2023-07-08 jrick int old_lines, int new_from, int new_lines, int offset,
7130 24df9a28 2023-07-08 jrick int ws_mangled, const struct got_error *hunk_err)
7131 24df9a28 2023-07-08 jrick {
7132 24df9a28 2023-07-08 jrick const char *path = new == NULL ? old : new;
7133 24df9a28 2023-07-08 jrick struct got_patch_progress_arg *a = arg;
7134 24df9a28 2023-07-08 jrick
7135 24df9a28 2023-07-08 jrick while (*path == '/')
7136 24df9a28 2023-07-08 jrick path++;
7137 24df9a28 2023-07-08 jrick
7138 24df9a28 2023-07-08 jrick if (status != GOT_STATUS_NO_CHANGE &&
7139 24df9a28 2023-07-08 jrick status != 0 /* per-hunk progress */) {
7140 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
7141 24df9a28 2023-07-08 jrick a->did_something = 1;
7142 24df9a28 2023-07-08 jrick }
7143 24df9a28 2023-07-08 jrick
7144 24df9a28 2023-07-08 jrick if (hunk_err == NULL) {
7145 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CANNOT_UPDATE)
7146 24df9a28 2023-07-08 jrick a->rejects++;
7147 24df9a28 2023-07-08 jrick else if (status == GOT_STATUS_CONFLICT)
7148 24df9a28 2023-07-08 jrick a->conflicts++;
7149 24df9a28 2023-07-08 jrick }
7150 24df9a28 2023-07-08 jrick
7151 24df9a28 2023-07-08 jrick if (error != NULL)
7152 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7153 24df9a28 2023-07-08 jrick
7154 24df9a28 2023-07-08 jrick if (offset != 0 || hunk_err != NULL || ws_mangled) {
7155 24df9a28 2023-07-08 jrick printf("@@ -%d,%d +%d,%d @@ ", old_from,
7156 24df9a28 2023-07-08 jrick old_lines, new_from, new_lines);
7157 24df9a28 2023-07-08 jrick if (hunk_err != NULL)
7158 24df9a28 2023-07-08 jrick printf("%s\n", hunk_err->msg);
7159 24df9a28 2023-07-08 jrick else if (offset != 0)
7160 24df9a28 2023-07-08 jrick printf("applied with offset %d\n", offset);
7161 24df9a28 2023-07-08 jrick else
7162 24df9a28 2023-07-08 jrick printf("hunk contains mangled whitespace\n");
7163 24df9a28 2023-07-08 jrick }
7164 24df9a28 2023-07-08 jrick
7165 24df9a28 2023-07-08 jrick return NULL;
7166 24df9a28 2023-07-08 jrick }
7167 24df9a28 2023-07-08 jrick
7168 24df9a28 2023-07-08 jrick static void
7169 24df9a28 2023-07-08 jrick print_patch_progress_stats(struct got_patch_progress_arg *ppa)
7170 24df9a28 2023-07-08 jrick {
7171 24df9a28 2023-07-08 jrick if (!ppa->did_something)
7172 24df9a28 2023-07-08 jrick return;
7173 24df9a28 2023-07-08 jrick
7174 24df9a28 2023-07-08 jrick if (ppa->conflicts > 0)
7175 24df9a28 2023-07-08 jrick printf("Files with merge conflicts: %d\n", ppa->conflicts);
7176 24df9a28 2023-07-08 jrick
7177 24df9a28 2023-07-08 jrick if (ppa->rejects > 0) {
7178 24df9a28 2023-07-08 jrick printf("Files where patch failed to apply: %d\n",
7179 24df9a28 2023-07-08 jrick ppa->rejects);
7180 24df9a28 2023-07-08 jrick }
7181 24df9a28 2023-07-08 jrick }
7182 24df9a28 2023-07-08 jrick
7183 24df9a28 2023-07-08 jrick static const struct got_error *
7184 24df9a28 2023-07-08 jrick cmd_patch(int argc, char *argv[])
7185 24df9a28 2023-07-08 jrick {
7186 24df9a28 2023-07-08 jrick const struct got_error *error = NULL, *close_error = NULL;
7187 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
7188 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
7189 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
7190 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
7191 24df9a28 2023-07-08 jrick const char *commit_id_str = NULL;
7192 24df9a28 2023-07-08 jrick struct stat sb;
7193 24df9a28 2023-07-08 jrick const char *errstr;
7194 24df9a28 2023-07-08 jrick char *cwd = NULL;
7195 24df9a28 2023-07-08 jrick int ch, nop = 0, strip = -1, reverse = 0;
7196 24df9a28 2023-07-08 jrick int patchfd;
7197 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
7198 24df9a28 2023-07-08 jrick struct got_patch_progress_arg ppa;
7199 24df9a28 2023-07-08 jrick
7200 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
7201 24df9a28 2023-07-08 jrick
7202 24df9a28 2023-07-08 jrick #ifndef PROFILE
7203 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
7204 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
7205 24df9a28 2023-07-08 jrick err(1, "pledge");
7206 24df9a28 2023-07-08 jrick #endif
7207 24df9a28 2023-07-08 jrick
7208 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
7209 24df9a28 2023-07-08 jrick switch (ch) {
7210 24df9a28 2023-07-08 jrick case 'c':
7211 24df9a28 2023-07-08 jrick commit_id_str = optarg;
7212 24df9a28 2023-07-08 jrick break;
7213 24df9a28 2023-07-08 jrick case 'n':
7214 24df9a28 2023-07-08 jrick nop = 1;
7215 24df9a28 2023-07-08 jrick break;
7216 24df9a28 2023-07-08 jrick case 'p':
7217 24df9a28 2023-07-08 jrick strip = strtonum(optarg, 0, INT_MAX, &errstr);
7218 24df9a28 2023-07-08 jrick if (errstr != NULL)
7219 24df9a28 2023-07-08 jrick errx(1, "pathname strip count is %s: %s",
7220 24df9a28 2023-07-08 jrick errstr, optarg);
7221 24df9a28 2023-07-08 jrick break;
7222 24df9a28 2023-07-08 jrick case 'R':
7223 24df9a28 2023-07-08 jrick reverse = 1;
7224 24df9a28 2023-07-08 jrick break;
7225 24df9a28 2023-07-08 jrick default:
7226 24df9a28 2023-07-08 jrick usage_patch();
7227 24df9a28 2023-07-08 jrick /* NOTREACHED */
7228 24df9a28 2023-07-08 jrick }
7229 24df9a28 2023-07-08 jrick }
7230 24df9a28 2023-07-08 jrick
7231 24df9a28 2023-07-08 jrick argc -= optind;
7232 24df9a28 2023-07-08 jrick argv += optind;
7233 24df9a28 2023-07-08 jrick
7234 24df9a28 2023-07-08 jrick if (argc == 0) {
7235 24df9a28 2023-07-08 jrick error = patch_from_stdin(&patchfd);
7236 24df9a28 2023-07-08 jrick if (error)
7237 24df9a28 2023-07-08 jrick return error;
7238 24df9a28 2023-07-08 jrick } else if (argc == 1) {
7239 24df9a28 2023-07-08 jrick patchfd = open(argv[0], O_RDONLY);
7240 24df9a28 2023-07-08 jrick if (patchfd == -1) {
7241 24df9a28 2023-07-08 jrick error = got_error_from_errno2("open", argv[0]);
7242 24df9a28 2023-07-08 jrick return error;
7243 24df9a28 2023-07-08 jrick }
7244 24df9a28 2023-07-08 jrick if (fstat(patchfd, &sb) == -1) {
7245 24df9a28 2023-07-08 jrick error = got_error_from_errno2("fstat", argv[0]);
7246 24df9a28 2023-07-08 jrick goto done;
7247 24df9a28 2023-07-08 jrick }
7248 24df9a28 2023-07-08 jrick if (!S_ISREG(sb.st_mode)) {
7249 24df9a28 2023-07-08 jrick error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
7250 24df9a28 2023-07-08 jrick goto done;
7251 24df9a28 2023-07-08 jrick }
7252 24df9a28 2023-07-08 jrick } else
7253 24df9a28 2023-07-08 jrick usage_patch();
7254 24df9a28 2023-07-08 jrick
7255 24df9a28 2023-07-08 jrick if ((cwd = getcwd(NULL, 0)) == NULL) {
7256 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
7257 24df9a28 2023-07-08 jrick goto done;
7258 24df9a28 2023-07-08 jrick }
7259 24df9a28 2023-07-08 jrick
7260 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
7261 24df9a28 2023-07-08 jrick if (error != NULL)
7262 24df9a28 2023-07-08 jrick goto done;
7263 24df9a28 2023-07-08 jrick
7264 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
7265 24df9a28 2023-07-08 jrick if (error != NULL)
7266 24df9a28 2023-07-08 jrick goto done;
7267 24df9a28 2023-07-08 jrick
7268 24df9a28 2023-07-08 jrick const char *repo_path = got_worktree_get_repo_path(worktree);
7269 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7270 24df9a28 2023-07-08 jrick if (error != NULL)
7271 24df9a28 2023-07-08 jrick goto done;
7272 24df9a28 2023-07-08 jrick
7273 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
7274 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
7275 24df9a28 2023-07-08 jrick if (error != NULL)
7276 24df9a28 2023-07-08 jrick goto done;
7277 24df9a28 2023-07-08 jrick
7278 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7279 24df9a28 2023-07-08 jrick if (error)
7280 24df9a28 2023-07-08 jrick goto done;
7281 24df9a28 2023-07-08 jrick
7282 24df9a28 2023-07-08 jrick if (commit_id_str != NULL) {
7283 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
7284 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7285 24df9a28 2023-07-08 jrick if (error)
7286 24df9a28 2023-07-08 jrick goto done;
7287 24df9a28 2023-07-08 jrick }
7288 24df9a28 2023-07-08 jrick
7289 24df9a28 2023-07-08 jrick memset(&ppa, 0, sizeof(ppa));
7290 24df9a28 2023-07-08 jrick error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
7291 24df9a28 2023-07-08 jrick commit_id, patch_progress, &ppa, check_cancelled, NULL);
7292 24df9a28 2023-07-08 jrick print_patch_progress_stats(&ppa);
7293 24df9a28 2023-07-08 jrick done:
7294 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
7295 24df9a28 2023-07-08 jrick free(commit_id);
7296 24df9a28 2023-07-08 jrick if (repo) {
7297 24df9a28 2023-07-08 jrick close_error = got_repo_close(repo);
7298 24df9a28 2023-07-08 jrick if (error == NULL)
7299 24df9a28 2023-07-08 jrick error = close_error;
7300 24df9a28 2023-07-08 jrick }
7301 24df9a28 2023-07-08 jrick if (worktree != NULL) {
7302 24df9a28 2023-07-08 jrick close_error = got_worktree_close(worktree);
7303 24df9a28 2023-07-08 jrick if (error == NULL)
7304 24df9a28 2023-07-08 jrick error = close_error;
7305 24df9a28 2023-07-08 jrick }
7306 24df9a28 2023-07-08 jrick if (pack_fds) {
7307 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
7308 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
7309 24df9a28 2023-07-08 jrick if (error == NULL)
7310 24df9a28 2023-07-08 jrick error = pack_err;
7311 24df9a28 2023-07-08 jrick }
7312 24df9a28 2023-07-08 jrick free(cwd);
7313 24df9a28 2023-07-08 jrick return error;
7314 24df9a28 2023-07-08 jrick }
7315 24df9a28 2023-07-08 jrick
7316 24df9a28 2023-07-08 jrick __dead static void
7317 24df9a28 2023-07-08 jrick usage_revert(void)
7318 24df9a28 2023-07-08 jrick {
7319 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
7320 24df9a28 2023-07-08 jrick getprogname());
7321 24df9a28 2023-07-08 jrick exit(1);
7322 24df9a28 2023-07-08 jrick }
7323 24df9a28 2023-07-08 jrick
7324 24df9a28 2023-07-08 jrick static const struct got_error *
7325 24df9a28 2023-07-08 jrick revert_progress(void *arg, unsigned char status, const char *path)
7326 24df9a28 2023-07-08 jrick {
7327 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_UNVERSIONED)
7328 24df9a28 2023-07-08 jrick return NULL;
7329 24df9a28 2023-07-08 jrick
7330 24df9a28 2023-07-08 jrick while (path[0] == '/')
7331 24df9a28 2023-07-08 jrick path++;
7332 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
7333 24df9a28 2023-07-08 jrick return NULL;
7334 24df9a28 2023-07-08 jrick }
7335 24df9a28 2023-07-08 jrick
7336 24df9a28 2023-07-08 jrick struct choose_patch_arg {
7337 24df9a28 2023-07-08 jrick FILE *patch_script_file;
7338 24df9a28 2023-07-08 jrick const char *action;
7339 24df9a28 2023-07-08 jrick };
7340 24df9a28 2023-07-08 jrick
7341 24df9a28 2023-07-08 jrick static const struct got_error *
7342 24df9a28 2023-07-08 jrick show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7343 24df9a28 2023-07-08 jrick int nchanges, const char *action)
7344 24df9a28 2023-07-08 jrick {
7345 24df9a28 2023-07-08 jrick const struct got_error *err;
7346 24df9a28 2023-07-08 jrick char *line = NULL;
7347 24df9a28 2023-07-08 jrick size_t linesize = 0;
7348 24df9a28 2023-07-08 jrick ssize_t linelen;
7349 24df9a28 2023-07-08 jrick
7350 24df9a28 2023-07-08 jrick switch (status) {
7351 24df9a28 2023-07-08 jrick case GOT_STATUS_ADD:
7352 24df9a28 2023-07-08 jrick printf("A %s\n%s this addition? [y/n] ", path, action);
7353 24df9a28 2023-07-08 jrick break;
7354 24df9a28 2023-07-08 jrick case GOT_STATUS_DELETE:
7355 24df9a28 2023-07-08 jrick printf("D %s\n%s this deletion? [y/n] ", path, action);
7356 24df9a28 2023-07-08 jrick break;
7357 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
7358 24df9a28 2023-07-08 jrick if (fseek(patch_file, 0L, SEEK_SET) == -1)
7359 24df9a28 2023-07-08 jrick return got_error_from_errno("fseek");
7360 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
7361 24df9a28 2023-07-08 jrick while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7362 24df9a28 2023-07-08 jrick printf("%s", line);
7363 24df9a28 2023-07-08 jrick if (linelen == -1 && ferror(patch_file)) {
7364 24df9a28 2023-07-08 jrick err = got_error_from_errno("getline");
7365 24df9a28 2023-07-08 jrick free(line);
7366 24df9a28 2023-07-08 jrick return err;
7367 24df9a28 2023-07-08 jrick }
7368 24df9a28 2023-07-08 jrick free(line);
7369 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
7370 24df9a28 2023-07-08 jrick printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7371 24df9a28 2023-07-08 jrick path, n, nchanges, action);
7372 24df9a28 2023-07-08 jrick break;
7373 24df9a28 2023-07-08 jrick default:
7374 24df9a28 2023-07-08 jrick return got_error_path(path, GOT_ERR_FILE_STATUS);
7375 24df9a28 2023-07-08 jrick }
7376 24df9a28 2023-07-08 jrick
7377 24df9a28 2023-07-08 jrick fflush(stdout);
7378 24df9a28 2023-07-08 jrick return NULL;
7379 24df9a28 2023-07-08 jrick }
7380 24df9a28 2023-07-08 jrick
7381 24df9a28 2023-07-08 jrick static const struct got_error *
7382 24df9a28 2023-07-08 jrick choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7383 24df9a28 2023-07-08 jrick FILE *patch_file, int n, int nchanges)
7384 24df9a28 2023-07-08 jrick {
7385 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7386 24df9a28 2023-07-08 jrick char *line = NULL;
7387 24df9a28 2023-07-08 jrick size_t linesize = 0;
7388 24df9a28 2023-07-08 jrick ssize_t linelen;
7389 24df9a28 2023-07-08 jrick int resp = ' ';
7390 24df9a28 2023-07-08 jrick struct choose_patch_arg *a = arg;
7391 24df9a28 2023-07-08 jrick
7392 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_NONE;
7393 24df9a28 2023-07-08 jrick
7394 24df9a28 2023-07-08 jrick if (a->patch_script_file) {
7395 24df9a28 2023-07-08 jrick char *nl;
7396 24df9a28 2023-07-08 jrick err = show_change(status, path, patch_file, n, nchanges,
7397 24df9a28 2023-07-08 jrick a->action);
7398 24df9a28 2023-07-08 jrick if (err)
7399 24df9a28 2023-07-08 jrick return err;
7400 24df9a28 2023-07-08 jrick linelen = getline(&line, &linesize, a->patch_script_file);
7401 24df9a28 2023-07-08 jrick if (linelen == -1) {
7402 24df9a28 2023-07-08 jrick if (ferror(a->patch_script_file))
7403 24df9a28 2023-07-08 jrick return got_error_from_errno("getline");
7404 24df9a28 2023-07-08 jrick return NULL;
7405 24df9a28 2023-07-08 jrick }
7406 24df9a28 2023-07-08 jrick nl = strchr(line, '\n');
7407 24df9a28 2023-07-08 jrick if (nl)
7408 24df9a28 2023-07-08 jrick *nl = '\0';
7409 24df9a28 2023-07-08 jrick if (strcmp(line, "y") == 0) {
7410 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_YES;
7411 24df9a28 2023-07-08 jrick printf("y\n");
7412 24df9a28 2023-07-08 jrick } else if (strcmp(line, "n") == 0) {
7413 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_NO;
7414 24df9a28 2023-07-08 jrick printf("n\n");
7415 24df9a28 2023-07-08 jrick } else if (strcmp(line, "q") == 0 &&
7416 24df9a28 2023-07-08 jrick status == GOT_STATUS_MODIFY) {
7417 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_QUIT;
7418 24df9a28 2023-07-08 jrick printf("q\n");
7419 24df9a28 2023-07-08 jrick } else
7420 24df9a28 2023-07-08 jrick printf("invalid response '%s'\n", line);
7421 24df9a28 2023-07-08 jrick free(line);
7422 24df9a28 2023-07-08 jrick return NULL;
7423 24df9a28 2023-07-08 jrick }
7424 24df9a28 2023-07-08 jrick
7425 24df9a28 2023-07-08 jrick while (resp != 'y' && resp != 'n' && resp != 'q') {
7426 24df9a28 2023-07-08 jrick err = show_change(status, path, patch_file, n, nchanges,
7427 24df9a28 2023-07-08 jrick a->action);
7428 24df9a28 2023-07-08 jrick if (err)
7429 24df9a28 2023-07-08 jrick return err;
7430 24df9a28 2023-07-08 jrick resp = getchar();
7431 24df9a28 2023-07-08 jrick if (resp == '\n')
7432 24df9a28 2023-07-08 jrick resp = getchar();
7433 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_MODIFY) {
7434 24df9a28 2023-07-08 jrick if (resp != 'y' && resp != 'n' && resp != 'q') {
7435 24df9a28 2023-07-08 jrick printf("invalid response '%c'\n", resp);
7436 24df9a28 2023-07-08 jrick resp = ' ';
7437 24df9a28 2023-07-08 jrick }
7438 24df9a28 2023-07-08 jrick } else if (resp != 'y' && resp != 'n') {
7439 24df9a28 2023-07-08 jrick printf("invalid response '%c'\n", resp);
7440 24df9a28 2023-07-08 jrick resp = ' ';
7441 24df9a28 2023-07-08 jrick }
7442 24df9a28 2023-07-08 jrick }
7443 24df9a28 2023-07-08 jrick
7444 24df9a28 2023-07-08 jrick if (resp == 'y')
7445 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_YES;
7446 24df9a28 2023-07-08 jrick else if (resp == 'n')
7447 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_NO;
7448 24df9a28 2023-07-08 jrick else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7449 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_QUIT;
7450 24df9a28 2023-07-08 jrick
7451 24df9a28 2023-07-08 jrick return NULL;
7452 24df9a28 2023-07-08 jrick }
7453 24df9a28 2023-07-08 jrick
7454 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg {
7455 24df9a28 2023-07-08 jrick struct got_pathlist_head *commit_paths;
7456 24df9a28 2023-07-08 jrick int *has_changes;
7457 24df9a28 2023-07-08 jrick };
7458 24df9a28 2023-07-08 jrick
7459 24df9a28 2023-07-08 jrick /*
7460 24df9a28 2023-07-08 jrick * Shortcut work tree status callback to determine if the set of paths scanned
7461 24df9a28 2023-07-08 jrick * has at least one versioned path that is being modified and, if not NULL, is
7462 24df9a28 2023-07-08 jrick * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
7463 24df9a28 2023-07-08 jrick * soon as a path is passed with a status that satisfies this criteria.
7464 24df9a28 2023-07-08 jrick */
7465 24df9a28 2023-07-08 jrick static const struct got_error *
7466 24df9a28 2023-07-08 jrick worktree_has_commitable_path(void *arg, unsigned char status,
7467 24df9a28 2023-07-08 jrick unsigned char staged_status, const char *path,
7468 24df9a28 2023-07-08 jrick struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7469 24df9a28 2023-07-08 jrick struct got_object_id *commit_id, int dirfd, const char *de_name)
7470 24df9a28 2023-07-08 jrick {
7471 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg *a = arg;
7472 24df9a28 2023-07-08 jrick
7473 24df9a28 2023-07-08 jrick if (status == staged_status && (status == GOT_STATUS_DELETE))
7474 24df9a28 2023-07-08 jrick status = GOT_STATUS_NO_CHANGE;
7475 24df9a28 2023-07-08 jrick
7476 24df9a28 2023-07-08 jrick if (!(status == GOT_STATUS_NO_CHANGE ||
7477 24df9a28 2023-07-08 jrick status == GOT_STATUS_UNVERSIONED) ||
7478 24df9a28 2023-07-08 jrick staged_status != GOT_STATUS_NO_CHANGE) {
7479 24df9a28 2023-07-08 jrick if (a->commit_paths != NULL) {
7480 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
7481 24df9a28 2023-07-08 jrick
7482 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, a->commit_paths, entry) {
7483 24df9a28 2023-07-08 jrick if (strncmp(path, pe->path,
7484 24df9a28 2023-07-08 jrick pe->path_len) == 0) {
7485 24df9a28 2023-07-08 jrick *a->has_changes = 1;
7486 24df9a28 2023-07-08 jrick break;
7487 24df9a28 2023-07-08 jrick }
7488 24df9a28 2023-07-08 jrick }
7489 24df9a28 2023-07-08 jrick } else
7490 24df9a28 2023-07-08 jrick *a->has_changes = 1;
7491 24df9a28 2023-07-08 jrick
7492 24df9a28 2023-07-08 jrick if (*a->has_changes)
7493 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_FILE_MODIFIED);
7494 24df9a28 2023-07-08 jrick }
7495 24df9a28 2023-07-08 jrick
7496 24df9a28 2023-07-08 jrick return NULL;
7497 24df9a28 2023-07-08 jrick }
7498 24df9a28 2023-07-08 jrick
7499 24df9a28 2023-07-08 jrick /*
7500 24df9a28 2023-07-08 jrick * Check that the changeset of the commit identified by id is
7501 24df9a28 2023-07-08 jrick * comprised of at least one modified path that is being committed.
7502 24df9a28 2023-07-08 jrick */
7503 24df9a28 2023-07-08 jrick static const struct got_error *
7504 24df9a28 2023-07-08 jrick commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
7505 24df9a28 2023-07-08 jrick struct got_object_id *id, struct got_worktree *worktree,
7506 24df9a28 2023-07-08 jrick struct got_repository *repo)
7507 24df9a28 2023-07-08 jrick {
7508 24df9a28 2023-07-08 jrick const struct got_error *err;
7509 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
7510 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL, *pcommit = NULL;
7511 24df9a28 2023-07-08 jrick struct got_tree_object *tree = NULL, *ptree = NULL;
7512 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
7513 24df9a28 2023-07-08 jrick
7514 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
7515 24df9a28 2023-07-08 jrick
7516 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
7517 24df9a28 2023-07-08 jrick if (err)
7518 24df9a28 2023-07-08 jrick goto done;
7519 24df9a28 2023-07-08 jrick
7520 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree, repo,
7521 24df9a28 2023-07-08 jrick got_object_commit_get_tree_id(commit));
7522 24df9a28 2023-07-08 jrick if (err)
7523 24df9a28 2023-07-08 jrick goto done;
7524 24df9a28 2023-07-08 jrick
7525 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7526 24df9a28 2023-07-08 jrick if (pid != NULL) {
7527 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&pcommit, repo, &pid->id);
7528 24df9a28 2023-07-08 jrick if (err)
7529 24df9a28 2023-07-08 jrick goto done;
7530 24df9a28 2023-07-08 jrick
7531 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&ptree, repo,
7532 24df9a28 2023-07-08 jrick got_object_commit_get_tree_id(pcommit));
7533 24df9a28 2023-07-08 jrick if (err)
7534 24df9a28 2023-07-08 jrick goto done;
7535 24df9a28 2023-07-08 jrick }
7536 24df9a28 2023-07-08 jrick
7537 24df9a28 2023-07-08 jrick err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
7538 24df9a28 2023-07-08 jrick got_diff_tree_collect_changed_paths, &paths, 0);
7539 24df9a28 2023-07-08 jrick if (err)
7540 24df9a28 2023-07-08 jrick goto done;
7541 24df9a28 2023-07-08 jrick
7542 24df9a28 2023-07-08 jrick err = got_worktree_status(worktree, &paths, repo, 0,
7543 24df9a28 2023-07-08 jrick worktree_has_commitable_path, wcpa, check_cancelled, NULL);
7544 24df9a28 2023-07-08 jrick if (err && err->code == GOT_ERR_FILE_MODIFIED) {
7545 24df9a28 2023-07-08 jrick /*
7546 24df9a28 2023-07-08 jrick * At least one changed path in the referenced commit is
7547 24df9a28 2023-07-08 jrick * modified in the work tree, that's all we need to know!
7548 24df9a28 2023-07-08 jrick */
7549 24df9a28 2023-07-08 jrick err = NULL;
7550 24df9a28 2023-07-08 jrick }
7551 24df9a28 2023-07-08 jrick
7552 24df9a28 2023-07-08 jrick done:
7553 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
7554 24df9a28 2023-07-08 jrick if (commit)
7555 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7556 24df9a28 2023-07-08 jrick if (pcommit)
7557 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
7558 24df9a28 2023-07-08 jrick if (tree)
7559 24df9a28 2023-07-08 jrick got_object_tree_close(tree);
7560 24df9a28 2023-07-08 jrick if (ptree)
7561 24df9a28 2023-07-08 jrick got_object_tree_close(ptree);
7562 24df9a28 2023-07-08 jrick return err;
7563 24df9a28 2023-07-08 jrick }
7564 24df9a28 2023-07-08 jrick
7565 24df9a28 2023-07-08 jrick /*
7566 24df9a28 2023-07-08 jrick * Remove any "logmsg" reference comprised entirely of paths that have
7567 24df9a28 2023-07-08 jrick * been reverted in this work tree. If any path in the logmsg ref changeset
7568 24df9a28 2023-07-08 jrick * remains in a changed state in the worktree, do not remove the reference.
7569 24df9a28 2023-07-08 jrick */
7570 24df9a28 2023-07-08 jrick static const struct got_error *
7571 24df9a28 2023-07-08 jrick rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
7572 24df9a28 2023-07-08 jrick {
7573 24df9a28 2023-07-08 jrick const struct got_error *err;
7574 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
7575 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
7576 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
7577 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
7578 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg wcpa;
7579 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
7580 24df9a28 2023-07-08 jrick
7581 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
7582 24df9a28 2023-07-08 jrick
7583 24df9a28 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
7584 24df9a28 2023-07-08 jrick if (err)
7585 24df9a28 2023-07-08 jrick goto done;
7586 24df9a28 2023-07-08 jrick
7587 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, "refs/got/worktree",
7588 24df9a28 2023-07-08 jrick got_ref_cmp_by_name, repo);
7589 24df9a28 2023-07-08 jrick if (err)
7590 24df9a28 2023-07-08 jrick goto done;
7591 24df9a28 2023-07-08 jrick
7592 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
7593 24df9a28 2023-07-08 jrick const char *refname;
7594 24df9a28 2023-07-08 jrick int has_changes = 0;
7595 24df9a28 2023-07-08 jrick
7596 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
7597 24df9a28 2023-07-08 jrick
7598 24df9a28 2023-07-08 jrick if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7599 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
7600 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7601 24df9a28 2023-07-08 jrick else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7602 24df9a28 2023-07-08 jrick GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
7603 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7604 24df9a28 2023-07-08 jrick else
7605 24df9a28 2023-07-08 jrick continue;
7606 24df9a28 2023-07-08 jrick
7607 24df9a28 2023-07-08 jrick if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7608 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7609 24df9a28 2023-07-08 jrick else
7610 24df9a28 2023-07-08 jrick continue;
7611 24df9a28 2023-07-08 jrick
7612 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&commit_id, NULL, refname,
7613 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
7614 24df9a28 2023-07-08 jrick if (err)
7615 24df9a28 2023-07-08 jrick goto done;
7616 24df9a28 2023-07-08 jrick
7617 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, commit_id);
7618 24df9a28 2023-07-08 jrick if (err)
7619 24df9a28 2023-07-08 jrick goto done;
7620 24df9a28 2023-07-08 jrick
7621 24df9a28 2023-07-08 jrick wcpa.commit_paths = NULL;
7622 24df9a28 2023-07-08 jrick wcpa.has_changes = &has_changes;
7623 24df9a28 2023-07-08 jrick
7624 24df9a28 2023-07-08 jrick err = commit_path_changed_in_worktree(&wcpa, commit_id,
7625 24df9a28 2023-07-08 jrick worktree, repo);
7626 24df9a28 2023-07-08 jrick if (err)
7627 24df9a28 2023-07-08 jrick goto done;
7628 24df9a28 2023-07-08 jrick
7629 24df9a28 2023-07-08 jrick if (!has_changes) {
7630 24df9a28 2023-07-08 jrick err = got_ref_delete(re->ref, repo);
7631 24df9a28 2023-07-08 jrick if (err)
7632 24df9a28 2023-07-08 jrick goto done;
7633 24df9a28 2023-07-08 jrick }
7634 24df9a28 2023-07-08 jrick
7635 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7636 24df9a28 2023-07-08 jrick commit = NULL;
7637 24df9a28 2023-07-08 jrick free(commit_id);
7638 24df9a28 2023-07-08 jrick commit_id = NULL;
7639 24df9a28 2023-07-08 jrick }
7640 24df9a28 2023-07-08 jrick
7641 24df9a28 2023-07-08 jrick done:
7642 24df9a28 2023-07-08 jrick free(uuidstr);
7643 24df9a28 2023-07-08 jrick free(commit_id);
7644 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
7645 24df9a28 2023-07-08 jrick if (commit)
7646 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7647 24df9a28 2023-07-08 jrick return err;
7648 24df9a28 2023-07-08 jrick }
7649 24df9a28 2023-07-08 jrick
7650 24df9a28 2023-07-08 jrick static const struct got_error *
7651 24df9a28 2023-07-08 jrick cmd_revert(int argc, char *argv[])
7652 24df9a28 2023-07-08 jrick {
7653 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
7654 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
7655 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
7656 24df9a28 2023-07-08 jrick char *cwd = NULL, *path = NULL;
7657 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
7658 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
7659 24df9a28 2023-07-08 jrick int ch, can_recurse = 0, pflag = 0;
7660 24df9a28 2023-07-08 jrick FILE *patch_script_file = NULL;
7661 24df9a28 2023-07-08 jrick const char *patch_script_path = NULL;
7662 24df9a28 2023-07-08 jrick struct choose_patch_arg cpa;
7663 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
7664 24df9a28 2023-07-08 jrick
7665 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
7666 24df9a28 2023-07-08 jrick
7667 24df9a28 2023-07-08 jrick #ifndef PROFILE
7668 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7669 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
7670 24df9a28 2023-07-08 jrick err(1, "pledge");
7671 24df9a28 2023-07-08 jrick #endif
7672 24df9a28 2023-07-08 jrick
7673 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "F:pR")) != -1) {
7674 24df9a28 2023-07-08 jrick switch (ch) {
7675 24df9a28 2023-07-08 jrick case 'F':
7676 24df9a28 2023-07-08 jrick patch_script_path = optarg;
7677 24df9a28 2023-07-08 jrick break;
7678 24df9a28 2023-07-08 jrick case 'p':
7679 24df9a28 2023-07-08 jrick pflag = 1;
7680 24df9a28 2023-07-08 jrick break;
7681 24df9a28 2023-07-08 jrick case 'R':
7682 24df9a28 2023-07-08 jrick can_recurse = 1;
7683 24df9a28 2023-07-08 jrick break;
7684 24df9a28 2023-07-08 jrick default:
7685 24df9a28 2023-07-08 jrick usage_revert();
7686 24df9a28 2023-07-08 jrick /* NOTREACHED */
7687 24df9a28 2023-07-08 jrick }
7688 24df9a28 2023-07-08 jrick }
7689 24df9a28 2023-07-08 jrick
7690 24df9a28 2023-07-08 jrick argc -= optind;
7691 24df9a28 2023-07-08 jrick argv += optind;
7692 24df9a28 2023-07-08 jrick
7693 24df9a28 2023-07-08 jrick if (argc < 1)
7694 24df9a28 2023-07-08 jrick usage_revert();
7695 24df9a28 2023-07-08 jrick if (patch_script_path && !pflag)
7696 24df9a28 2023-07-08 jrick errx(1, "-F option can only be used together with -p option");
7697 24df9a28 2023-07-08 jrick
7698 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
7699 24df9a28 2023-07-08 jrick if (cwd == NULL) {
7700 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
7701 24df9a28 2023-07-08 jrick goto done;
7702 24df9a28 2023-07-08 jrick }
7703 24df9a28 2023-07-08 jrick
7704 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
7705 24df9a28 2023-07-08 jrick if (error != NULL)
7706 24df9a28 2023-07-08 jrick goto done;
7707 24df9a28 2023-07-08 jrick
7708 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
7709 24df9a28 2023-07-08 jrick if (error) {
7710 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
7711 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "revert", cwd);
7712 24df9a28 2023-07-08 jrick goto done;
7713 24df9a28 2023-07-08 jrick }
7714 24df9a28 2023-07-08 jrick
7715 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7716 24df9a28 2023-07-08 jrick NULL, pack_fds);
7717 24df9a28 2023-07-08 jrick if (error != NULL)
7718 24df9a28 2023-07-08 jrick goto done;
7719 24df9a28 2023-07-08 jrick
7720 24df9a28 2023-07-08 jrick if (patch_script_path) {
7721 24df9a28 2023-07-08 jrick patch_script_file = fopen(patch_script_path, "re");
7722 24df9a28 2023-07-08 jrick if (patch_script_file == NULL) {
7723 24df9a28 2023-07-08 jrick error = got_error_from_errno2("fopen",
7724 24df9a28 2023-07-08 jrick patch_script_path);
7725 24df9a28 2023-07-08 jrick goto done;
7726 24df9a28 2023-07-08 jrick }
7727 24df9a28 2023-07-08 jrick }
7728 24df9a28 2023-07-08 jrick
7729 24df9a28 2023-07-08 jrick /*
7730 24df9a28 2023-07-08 jrick * XXX "c" perm needed on repo dir to delete merge references.
7731 24df9a28 2023-07-08 jrick */
7732 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
7733 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
7734 24df9a28 2023-07-08 jrick if (error)
7735 24df9a28 2023-07-08 jrick goto done;
7736 24df9a28 2023-07-08 jrick
7737 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7738 24df9a28 2023-07-08 jrick if (error)
7739 24df9a28 2023-07-08 jrick goto done;
7740 24df9a28 2023-07-08 jrick
7741 24df9a28 2023-07-08 jrick if (!can_recurse) {
7742 24df9a28 2023-07-08 jrick char *ondisk_path;
7743 24df9a28 2023-07-08 jrick struct stat sb;
7744 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
7745 24df9a28 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
7746 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree),
7747 24df9a28 2023-07-08 jrick pe->path) == -1) {
7748 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
7749 24df9a28 2023-07-08 jrick goto done;
7750 24df9a28 2023-07-08 jrick }
7751 24df9a28 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
7752 24df9a28 2023-07-08 jrick if (errno == ENOENT) {
7753 24df9a28 2023-07-08 jrick free(ondisk_path);
7754 24df9a28 2023-07-08 jrick continue;
7755 24df9a28 2023-07-08 jrick }
7756 24df9a28 2023-07-08 jrick error = got_error_from_errno2("lstat",
7757 24df9a28 2023-07-08 jrick ondisk_path);
7758 24df9a28 2023-07-08 jrick free(ondisk_path);
7759 24df9a28 2023-07-08 jrick goto done;
7760 24df9a28 2023-07-08 jrick }
7761 24df9a28 2023-07-08 jrick free(ondisk_path);
7762 24df9a28 2023-07-08 jrick if (S_ISDIR(sb.st_mode)) {
7763 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
7764 24df9a28 2023-07-08 jrick "reverting directories requires -R option");
7765 24df9a28 2023-07-08 jrick goto done;
7766 24df9a28 2023-07-08 jrick }
7767 24df9a28 2023-07-08 jrick }
7768 24df9a28 2023-07-08 jrick }
7769 24df9a28 2023-07-08 jrick
7770 24df9a28 2023-07-08 jrick cpa.patch_script_file = patch_script_file;
7771 24df9a28 2023-07-08 jrick cpa.action = "revert";
7772 24df9a28 2023-07-08 jrick error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7773 24df9a28 2023-07-08 jrick pflag ? choose_patch : NULL, &cpa, repo);
7774 24df9a28 2023-07-08 jrick
7775 24df9a28 2023-07-08 jrick error = rm_logmsg_ref(worktree, repo);
7776 24df9a28 2023-07-08 jrick done:
7777 24df9a28 2023-07-08 jrick if (patch_script_file && fclose(patch_script_file) == EOF &&
7778 24df9a28 2023-07-08 jrick error == NULL)
7779 24df9a28 2023-07-08 jrick error = got_error_from_errno2("fclose", patch_script_path);
7780 24df9a28 2023-07-08 jrick if (repo) {
7781 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
7782 24df9a28 2023-07-08 jrick if (error == NULL)
7783 24df9a28 2023-07-08 jrick error = close_err;
7784 24df9a28 2023-07-08 jrick }
7785 24df9a28 2023-07-08 jrick if (worktree)
7786 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
7787 24df9a28 2023-07-08 jrick if (pack_fds) {
7788 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
7789 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
7790 24df9a28 2023-07-08 jrick if (error == NULL)
7791 24df9a28 2023-07-08 jrick error = pack_err;
7792 24df9a28 2023-07-08 jrick }
7793 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7794 24df9a28 2023-07-08 jrick free(path);
7795 24df9a28 2023-07-08 jrick free(cwd);
7796 24df9a28 2023-07-08 jrick return error;
7797 24df9a28 2023-07-08 jrick }
7798 24df9a28 2023-07-08 jrick
7799 24df9a28 2023-07-08 jrick __dead static void
7800 24df9a28 2023-07-08 jrick usage_commit(void)
7801 24df9a28 2023-07-08 jrick {
7802 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
7803 24df9a28 2023-07-08 jrick "[-m message] [path ...]\n", getprogname());
7804 24df9a28 2023-07-08 jrick exit(1);
7805 24df9a28 2023-07-08 jrick }
7806 24df9a28 2023-07-08 jrick
7807 24df9a28 2023-07-08 jrick struct collect_commit_logmsg_arg {
7808 24df9a28 2023-07-08 jrick const char *cmdline_log;
7809 24df9a28 2023-07-08 jrick const char *prepared_log;
7810 24df9a28 2023-07-08 jrick const char *merged_log;
7811 24df9a28 2023-07-08 jrick int non_interactive;
7812 24df9a28 2023-07-08 jrick const char *editor;
7813 24df9a28 2023-07-08 jrick const char *worktree_path;
7814 24df9a28 2023-07-08 jrick const char *repo_path;
7815 24df9a28 2023-07-08 jrick const char *dial_proto;
7816 24df9a28 2023-07-08 jrick char *logmsg_path;
7817 24df9a28 2023-07-08 jrick };
7818 24df9a28 2023-07-08 jrick
7819 24df9a28 2023-07-08 jrick static const struct got_error *
7820 24df9a28 2023-07-08 jrick read_prepared_logmsg(char **logmsg, const char *path)
7821 24df9a28 2023-07-08 jrick {
7822 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7823 24df9a28 2023-07-08 jrick FILE *f = NULL;
7824 24df9a28 2023-07-08 jrick struct stat sb;
7825 24df9a28 2023-07-08 jrick size_t r;
7826 24df9a28 2023-07-08 jrick
7827 24df9a28 2023-07-08 jrick *logmsg = NULL;
7828 24df9a28 2023-07-08 jrick memset(&sb, 0, sizeof(sb));
7829 24df9a28 2023-07-08 jrick
7830 24df9a28 2023-07-08 jrick f = fopen(path, "re");
7831 24df9a28 2023-07-08 jrick if (f == NULL)
7832 24df9a28 2023-07-08 jrick return got_error_from_errno2("fopen", path);
7833 24df9a28 2023-07-08 jrick
7834 24df9a28 2023-07-08 jrick if (fstat(fileno(f), &sb) == -1) {
7835 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fstat", path);
7836 24df9a28 2023-07-08 jrick goto done;
7837 24df9a28 2023-07-08 jrick }
7838 24df9a28 2023-07-08 jrick if (sb.st_size == 0) {
7839 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7840 24df9a28 2023-07-08 jrick goto done;
7841 24df9a28 2023-07-08 jrick }
7842 24df9a28 2023-07-08 jrick
7843 24df9a28 2023-07-08 jrick *logmsg = malloc(sb.st_size + 1);
7844 24df9a28 2023-07-08 jrick if (*logmsg == NULL) {
7845 24df9a28 2023-07-08 jrick err = got_error_from_errno("malloc");
7846 24df9a28 2023-07-08 jrick goto done;
7847 24df9a28 2023-07-08 jrick }
7848 24df9a28 2023-07-08 jrick
7849 24df9a28 2023-07-08 jrick r = fread(*logmsg, 1, sb.st_size, f);
7850 24df9a28 2023-07-08 jrick if (r != sb.st_size) {
7851 24df9a28 2023-07-08 jrick if (ferror(f))
7852 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fread", path);
7853 24df9a28 2023-07-08 jrick else
7854 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_IO);
7855 24df9a28 2023-07-08 jrick goto done;
7856 24df9a28 2023-07-08 jrick }
7857 24df9a28 2023-07-08 jrick (*logmsg)[sb.st_size] = '\0';
7858 24df9a28 2023-07-08 jrick done:
7859 24df9a28 2023-07-08 jrick if (fclose(f) == EOF && err == NULL)
7860 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fclose", path);
7861 24df9a28 2023-07-08 jrick if (err) {
7862 24df9a28 2023-07-08 jrick free(*logmsg);
7863 24df9a28 2023-07-08 jrick *logmsg = NULL;
7864 24df9a28 2023-07-08 jrick }
7865 24df9a28 2023-07-08 jrick return err;
7866 24df9a28 2023-07-08 jrick }
7867 24df9a28 2023-07-08 jrick
7868 24df9a28 2023-07-08 jrick static const struct got_error *
7869 24df9a28 2023-07-08 jrick collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
7870 24df9a28 2023-07-08 jrick const char *diff_path, char **logmsg, void *arg)
7871 24df9a28 2023-07-08 jrick {
7872 24df9a28 2023-07-08 jrick char *initial_content = NULL;
7873 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
7874 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7875 24df9a28 2023-07-08 jrick char *template = NULL;
7876 24df9a28 2023-07-08 jrick char *prepared_msg = NULL, *merged_msg = NULL;
7877 24df9a28 2023-07-08 jrick struct collect_commit_logmsg_arg *a = arg;
7878 24df9a28 2023-07-08 jrick int initial_content_len;
7879 24df9a28 2023-07-08 jrick int fd = -1;
7880 24df9a28 2023-07-08 jrick size_t len;
7881 24df9a28 2023-07-08 jrick
7882 24df9a28 2023-07-08 jrick /* if a message was specified on the command line, just use it */
7883 24df9a28 2023-07-08 jrick if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
7884 24df9a28 2023-07-08 jrick len = strlen(a->cmdline_log) + 1;
7885 24df9a28 2023-07-08 jrick *logmsg = malloc(len + 1);
7886 24df9a28 2023-07-08 jrick if (*logmsg == NULL)
7887 24df9a28 2023-07-08 jrick return got_error_from_errno("malloc");
7888 24df9a28 2023-07-08 jrick strlcpy(*logmsg, a->cmdline_log, len);
7889 24df9a28 2023-07-08 jrick return NULL;
7890 24df9a28 2023-07-08 jrick } else if (a->prepared_log != NULL && a->non_interactive)
7891 24df9a28 2023-07-08 jrick return read_prepared_logmsg(logmsg, a->prepared_log);
7892 24df9a28 2023-07-08 jrick
7893 24df9a28 2023-07-08 jrick if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7894 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
7895 24df9a28 2023-07-08 jrick
7896 24df9a28 2023-07-08 jrick err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
7897 24df9a28 2023-07-08 jrick if (err)
7898 24df9a28 2023-07-08 jrick goto done;
7899 24df9a28 2023-07-08 jrick
7900 24df9a28 2023-07-08 jrick if (a->prepared_log) {
7901 24df9a28 2023-07-08 jrick err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
7902 24df9a28 2023-07-08 jrick if (err)
7903 24df9a28 2023-07-08 jrick goto done;
7904 24df9a28 2023-07-08 jrick } else if (a->merged_log) {
7905 24df9a28 2023-07-08 jrick err = read_prepared_logmsg(&merged_msg, a->merged_log);
7906 24df9a28 2023-07-08 jrick if (err)
7907 24df9a28 2023-07-08 jrick goto done;
7908 24df9a28 2023-07-08 jrick }
7909 24df9a28 2023-07-08 jrick
7910 24df9a28 2023-07-08 jrick initial_content_len = asprintf(&initial_content,
7911 24df9a28 2023-07-08 jrick "%s%s\n# changes to be committed:\n",
7912 24df9a28 2023-07-08 jrick prepared_msg ? prepared_msg : "",
7913 24df9a28 2023-07-08 jrick merged_msg ? merged_msg : "");
7914 24df9a28 2023-07-08 jrick if (initial_content_len == -1) {
7915 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
7916 24df9a28 2023-07-08 jrick goto done;
7917 24df9a28 2023-07-08 jrick }
7918 24df9a28 2023-07-08 jrick
7919 24df9a28 2023-07-08 jrick if (write(fd, initial_content, initial_content_len) == -1) {
7920 24df9a28 2023-07-08 jrick err = got_error_from_errno2("write", a->logmsg_path);
7921 24df9a28 2023-07-08 jrick goto done;
7922 24df9a28 2023-07-08 jrick }
7923 24df9a28 2023-07-08 jrick
7924 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
7925 24df9a28 2023-07-08 jrick struct got_commitable *ct = pe->data;
7926 24df9a28 2023-07-08 jrick dprintf(fd, "# %c %s\n",
7927 24df9a28 2023-07-08 jrick got_commitable_get_status(ct),
7928 24df9a28 2023-07-08 jrick got_commitable_get_path(ct));
7929 24df9a28 2023-07-08 jrick }
7930 24df9a28 2023-07-08 jrick
7931 24df9a28 2023-07-08 jrick if (diff_path) {
7932 24df9a28 2023-07-08 jrick dprintf(fd, "# detailed changes can be viewed in %s\n",
7933 24df9a28 2023-07-08 jrick diff_path);
7934 24df9a28 2023-07-08 jrick }
7935 24df9a28 2023-07-08 jrick
7936 24df9a28 2023-07-08 jrick if (close(fd) == -1) {
7937 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", a->logmsg_path);
7938 24df9a28 2023-07-08 jrick goto done;
7939 24df9a28 2023-07-08 jrick }
7940 24df9a28 2023-07-08 jrick fd = -1;
7941 24df9a28 2023-07-08 jrick
7942 24df9a28 2023-07-08 jrick err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7943 24df9a28 2023-07-08 jrick initial_content_len, a->prepared_log ? 0 : 1);
7944 24df9a28 2023-07-08 jrick done:
7945 24df9a28 2023-07-08 jrick free(initial_content);
7946 24df9a28 2023-07-08 jrick free(template);
7947 24df9a28 2023-07-08 jrick free(prepared_msg);
7948 24df9a28 2023-07-08 jrick free(merged_msg);
7949 24df9a28 2023-07-08 jrick
7950 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
7951 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", a->logmsg_path);
7952 24df9a28 2023-07-08 jrick
7953 24df9a28 2023-07-08 jrick /* Editor is done; we can now apply unveil(2) */
7954 24df9a28 2023-07-08 jrick if (err == NULL)
7955 24df9a28 2023-07-08 jrick err = got_dial_apply_unveil(a->dial_proto);
7956 24df9a28 2023-07-08 jrick if (err == NULL)
7957 24df9a28 2023-07-08 jrick err = apply_unveil(a->repo_path, 0, a->worktree_path);
7958 24df9a28 2023-07-08 jrick if (err) {
7959 24df9a28 2023-07-08 jrick free(*logmsg);
7960 24df9a28 2023-07-08 jrick *logmsg = NULL;
7961 24df9a28 2023-07-08 jrick }
7962 24df9a28 2023-07-08 jrick return err;
7963 24df9a28 2023-07-08 jrick }
7964 24df9a28 2023-07-08 jrick
7965 24df9a28 2023-07-08 jrick static const struct got_error *
7966 24df9a28 2023-07-08 jrick cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
7967 24df9a28 2023-07-08 jrick const char *type, int has_content)
7968 24df9a28 2023-07-08 jrick {
7969 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7970 24df9a28 2023-07-08 jrick char *logmsg = NULL;
7971 24df9a28 2023-07-08 jrick
7972 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg, commit);
7973 24df9a28 2023-07-08 jrick if (err)
7974 24df9a28 2023-07-08 jrick return err;
7975 24df9a28 2023-07-08 jrick
7976 24df9a28 2023-07-08 jrick if (fprintf(f, "%s# log message of %s commit %s:%s",
7977 24df9a28 2023-07-08 jrick has_content ? "\n" : "", type, idstr, logmsg) < 0)
7978 24df9a28 2023-07-08 jrick err = got_ferror(f, GOT_ERR_IO);
7979 24df9a28 2023-07-08 jrick
7980 24df9a28 2023-07-08 jrick free(logmsg);
7981 24df9a28 2023-07-08 jrick return err;
7982 24df9a28 2023-07-08 jrick }
7983 24df9a28 2023-07-08 jrick
7984 24df9a28 2023-07-08 jrick /*
7985 24df9a28 2023-07-08 jrick * Lookup "logmsg" references of backed-out and cherrypicked commits
7986 24df9a28 2023-07-08 jrick * belonging to the current work tree. If found, and the worktree has
7987 24df9a28 2023-07-08 jrick * at least one modified file that was changed in the referenced commit,
7988 24df9a28 2023-07-08 jrick * add its log message to a new temporary file at *logmsg_path.
7989 24df9a28 2023-07-08 jrick * Add all refs found to matched_refs to be scheduled for removal on
7990 24df9a28 2023-07-08 jrick * successful commit.
7991 24df9a28 2023-07-08 jrick */
7992 24df9a28 2023-07-08 jrick static const struct got_error *
7993 24df9a28 2023-07-08 jrick lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
7994 24df9a28 2023-07-08 jrick struct got_reflist_head *matched_refs, struct got_worktree *worktree,
7995 24df9a28 2023-07-08 jrick struct got_repository *repo)
7996 24df9a28 2023-07-08 jrick {
7997 24df9a28 2023-07-08 jrick const struct got_error *err;
7998 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
7999 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
8000 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
8001 24df9a28 2023-07-08 jrick struct got_reflist_entry *re, *re_match;
8002 24df9a28 2023-07-08 jrick FILE *f = NULL;
8003 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
8004 24df9a28 2023-07-08 jrick int added_logmsg = 0;
8005 24df9a28 2023-07-08 jrick
8006 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
8007 24df9a28 2023-07-08 jrick
8008 24df9a28 2023-07-08 jrick *logmsg_path = NULL;
8009 24df9a28 2023-07-08 jrick
8010 24df9a28 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
8011 24df9a28 2023-07-08 jrick if (err)
8012 24df9a28 2023-07-08 jrick goto done;
8013 24df9a28 2023-07-08 jrick
8014 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, "refs/got/worktree",
8015 24df9a28 2023-07-08 jrick got_ref_cmp_by_name, repo);
8016 24df9a28 2023-07-08 jrick if (err)
8017 24df9a28 2023-07-08 jrick goto done;
8018 24df9a28 2023-07-08 jrick
8019 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
8020 24df9a28 2023-07-08 jrick const char *refname, *type;
8021 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg wcpa;
8022 24df9a28 2023-07-08 jrick int add_logmsg = 0;
8023 24df9a28 2023-07-08 jrick
8024 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
8025 24df9a28 2023-07-08 jrick
8026 24df9a28 2023-07-08 jrick if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8027 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
8028 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8029 24df9a28 2023-07-08 jrick type = "cherrypicked";
8030 24df9a28 2023-07-08 jrick } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8031 24df9a28 2023-07-08 jrick GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
8032 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8033 24df9a28 2023-07-08 jrick type = "backed-out";
8034 24df9a28 2023-07-08 jrick } else
8035 24df9a28 2023-07-08 jrick continue;
8036 24df9a28 2023-07-08 jrick
8037 24df9a28 2023-07-08 jrick if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8038 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8039 24df9a28 2023-07-08 jrick else
8040 24df9a28 2023-07-08 jrick continue;
8041 24df9a28 2023-07-08 jrick
8042 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&id, NULL, refname,
8043 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8044 24df9a28 2023-07-08 jrick if (err)
8045 24df9a28 2023-07-08 jrick goto done;
8046 24df9a28 2023-07-08 jrick
8047 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
8048 24df9a28 2023-07-08 jrick if (err)
8049 24df9a28 2023-07-08 jrick goto done;
8050 24df9a28 2023-07-08 jrick
8051 24df9a28 2023-07-08 jrick wcpa.commit_paths = paths;
8052 24df9a28 2023-07-08 jrick wcpa.has_changes = &add_logmsg;
8053 24df9a28 2023-07-08 jrick
8054 24df9a28 2023-07-08 jrick err = commit_path_changed_in_worktree(&wcpa, id,
8055 24df9a28 2023-07-08 jrick worktree, repo);
8056 24df9a28 2023-07-08 jrick if (err)
8057 24df9a28 2023-07-08 jrick goto done;
8058 24df9a28 2023-07-08 jrick
8059 24df9a28 2023-07-08 jrick if (add_logmsg) {
8060 24df9a28 2023-07-08 jrick if (f == NULL) {
8061 24df9a28 2023-07-08 jrick err = got_opentemp_named(logmsg_path, &f,
8062 24df9a28 2023-07-08 jrick "got-commit-logmsg", "");
8063 24df9a28 2023-07-08 jrick if (err)
8064 24df9a28 2023-07-08 jrick goto done;
8065 24df9a28 2023-07-08 jrick }
8066 24df9a28 2023-07-08 jrick err = cat_logmsg(f, commit, refname, type,
8067 24df9a28 2023-07-08 jrick added_logmsg);
8068 24df9a28 2023-07-08 jrick if (err)
8069 24df9a28 2023-07-08 jrick goto done;
8070 24df9a28 2023-07-08 jrick if (!added_logmsg)
8071 24df9a28 2023-07-08 jrick ++added_logmsg;
8072 24df9a28 2023-07-08 jrick
8073 24df9a28 2023-07-08 jrick err = got_reflist_entry_dup(&re_match, re);
8074 24df9a28 2023-07-08 jrick if (err)
8075 24df9a28 2023-07-08 jrick goto done;
8076 24df9a28 2023-07-08 jrick TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
8077 24df9a28 2023-07-08 jrick }
8078 24df9a28 2023-07-08 jrick
8079 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8080 24df9a28 2023-07-08 jrick commit = NULL;
8081 24df9a28 2023-07-08 jrick free(id);
8082 24df9a28 2023-07-08 jrick id = NULL;
8083 24df9a28 2023-07-08 jrick }
8084 24df9a28 2023-07-08 jrick
8085 24df9a28 2023-07-08 jrick done:
8086 24df9a28 2023-07-08 jrick free(id);
8087 24df9a28 2023-07-08 jrick free(uuidstr);
8088 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
8089 24df9a28 2023-07-08 jrick if (commit)
8090 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8091 24df9a28 2023-07-08 jrick if (f && fclose(f) == EOF && err == NULL)
8092 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
8093 24df9a28 2023-07-08 jrick if (!added_logmsg) {
8094 24df9a28 2023-07-08 jrick if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
8095 24df9a28 2023-07-08 jrick err = got_error_from_errno2("unlink", *logmsg_path);
8096 24df9a28 2023-07-08 jrick *logmsg_path = NULL;
8097 24df9a28 2023-07-08 jrick }
8098 24df9a28 2023-07-08 jrick return err;
8099 24df9a28 2023-07-08 jrick }
8100 24df9a28 2023-07-08 jrick
8101 24df9a28 2023-07-08 jrick static const struct got_error *
8102 24df9a28 2023-07-08 jrick cmd_commit(int argc, char *argv[])
8103 24df9a28 2023-07-08 jrick {
8104 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
8105 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
8106 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
8107 24df9a28 2023-07-08 jrick char *cwd = NULL, *id_str = NULL;
8108 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
8109 24df9a28 2023-07-08 jrick const char *logmsg = NULL;
8110 24df9a28 2023-07-08 jrick char *prepared_logmsg = NULL, *merged_logmsg = NULL;
8111 24df9a28 2023-07-08 jrick struct collect_commit_logmsg_arg cl_arg;
8112 24df9a28 2023-07-08 jrick const char *author = NULL;
8113 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
8114 24df9a28 2023-07-08 jrick int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8115 24df9a28 2023-07-08 jrick int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8116 24df9a28 2023-07-08 jrick int show_diff = 1, commit_conflicts = 0;
8117 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
8118 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
8119 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
8120 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
8121 24df9a28 2023-07-08 jrick const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8122 24df9a28 2023-07-08 jrick const struct got_remote_repo *remotes, *remote = NULL;
8123 24df9a28 2023-07-08 jrick int nremotes;
8124 24df9a28 2023-07-08 jrick char *proto = NULL, *host = NULL, *port = NULL;
8125 24df9a28 2023-07-08 jrick char *repo_name = NULL, *server_path = NULL;
8126 24df9a28 2023-07-08 jrick const char *remote_name;
8127 24df9a28 2023-07-08 jrick int verbosity = 0;
8128 24df9a28 2023-07-08 jrick int i;
8129 24df9a28 2023-07-08 jrick
8130 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
8131 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
8132 24df9a28 2023-07-08 jrick cl_arg.logmsg_path = NULL;
8133 24df9a28 2023-07-08 jrick
8134 24df9a28 2023-07-08 jrick #ifndef PROFILE
8135 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8136 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
8137 24df9a28 2023-07-08 jrick err(1, "pledge");
8138 24df9a28 2023-07-08 jrick #endif
8139 24df9a28 2023-07-08 jrick
8140 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
8141 24df9a28 2023-07-08 jrick switch (ch) {
8142 24df9a28 2023-07-08 jrick case 'A':
8143 24df9a28 2023-07-08 jrick author = optarg;
8144 24df9a28 2023-07-08 jrick error = valid_author(author);
8145 24df9a28 2023-07-08 jrick if (error)
8146 24df9a28 2023-07-08 jrick return error;
8147 24df9a28 2023-07-08 jrick break;
8148 24df9a28 2023-07-08 jrick case 'C':
8149 24df9a28 2023-07-08 jrick commit_conflicts = 1;
8150 24df9a28 2023-07-08 jrick break;
8151 24df9a28 2023-07-08 jrick case 'F':
8152 24df9a28 2023-07-08 jrick if (logmsg != NULL)
8153 24df9a28 2023-07-08 jrick option_conflict('F', 'm');
8154 24df9a28 2023-07-08 jrick prepared_logmsg = realpath(optarg, NULL);
8155 24df9a28 2023-07-08 jrick if (prepared_logmsg == NULL)
8156 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
8157 24df9a28 2023-07-08 jrick optarg);
8158 24df9a28 2023-07-08 jrick break;
8159 24df9a28 2023-07-08 jrick case 'm':
8160 24df9a28 2023-07-08 jrick if (prepared_logmsg)
8161 24df9a28 2023-07-08 jrick option_conflict('m', 'F');
8162 24df9a28 2023-07-08 jrick logmsg = optarg;
8163 24df9a28 2023-07-08 jrick break;
8164 24df9a28 2023-07-08 jrick case 'N':
8165 24df9a28 2023-07-08 jrick non_interactive = 1;
8166 24df9a28 2023-07-08 jrick break;
8167 24df9a28 2023-07-08 jrick case 'n':
8168 24df9a28 2023-07-08 jrick show_diff = 0;
8169 24df9a28 2023-07-08 jrick break;
8170 24df9a28 2023-07-08 jrick case 'S':
8171 24df9a28 2023-07-08 jrick allow_bad_symlinks = 1;
8172 24df9a28 2023-07-08 jrick break;
8173 24df9a28 2023-07-08 jrick default:
8174 24df9a28 2023-07-08 jrick usage_commit();
8175 24df9a28 2023-07-08 jrick /* NOTREACHED */
8176 24df9a28 2023-07-08 jrick }
8177 24df9a28 2023-07-08 jrick }
8178 24df9a28 2023-07-08 jrick
8179 24df9a28 2023-07-08 jrick argc -= optind;
8180 24df9a28 2023-07-08 jrick argv += optind;
8181 24df9a28 2023-07-08 jrick
8182 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
8183 24df9a28 2023-07-08 jrick if (cwd == NULL) {
8184 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
8185 24df9a28 2023-07-08 jrick goto done;
8186 24df9a28 2023-07-08 jrick }
8187 24df9a28 2023-07-08 jrick
8188 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
8189 24df9a28 2023-07-08 jrick if (error != NULL)
8190 24df9a28 2023-07-08 jrick goto done;
8191 24df9a28 2023-07-08 jrick
8192 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
8193 24df9a28 2023-07-08 jrick if (error) {
8194 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
8195 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "commit", cwd);
8196 24df9a28 2023-07-08 jrick goto done;
8197 24df9a28 2023-07-08 jrick }
8198 24df9a28 2023-07-08 jrick
8199 24df9a28 2023-07-08 jrick error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8200 24df9a28 2023-07-08 jrick if (error)
8201 24df9a28 2023-07-08 jrick goto done;
8202 24df9a28 2023-07-08 jrick if (rebase_in_progress) {
8203 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_REBASING);
8204 24df9a28 2023-07-08 jrick goto done;
8205 24df9a28 2023-07-08 jrick }
8206 24df9a28 2023-07-08 jrick
8207 24df9a28 2023-07-08 jrick error = got_worktree_histedit_in_progress(&histedit_in_progress,
8208 24df9a28 2023-07-08 jrick worktree);
8209 24df9a28 2023-07-08 jrick if (error)
8210 24df9a28 2023-07-08 jrick goto done;
8211 24df9a28 2023-07-08 jrick
8212 24df9a28 2023-07-08 jrick error = get_gitconfig_path(&gitconfig_path);
8213 24df9a28 2023-07-08 jrick if (error)
8214 24df9a28 2023-07-08 jrick goto done;
8215 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8216 24df9a28 2023-07-08 jrick gitconfig_path, pack_fds);
8217 24df9a28 2023-07-08 jrick if (error != NULL)
8218 24df9a28 2023-07-08 jrick goto done;
8219 24df9a28 2023-07-08 jrick
8220 24df9a28 2023-07-08 jrick error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8221 24df9a28 2023-07-08 jrick if (error)
8222 24df9a28 2023-07-08 jrick goto done;
8223 24df9a28 2023-07-08 jrick if (merge_in_progress) {
8224 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_MERGE_BUSY);
8225 24df9a28 2023-07-08 jrick goto done;
8226 24df9a28 2023-07-08 jrick }
8227 24df9a28 2023-07-08 jrick
8228 24df9a28 2023-07-08 jrick error = get_author(&committer, repo, worktree);
8229 24df9a28 2023-07-08 jrick if (error)
8230 24df9a28 2023-07-08 jrick goto done;
8231 24df9a28 2023-07-08 jrick
8232 24df9a28 2023-07-08 jrick if (author == NULL)
8233 24df9a28 2023-07-08 jrick author = committer;
8234 24df9a28 2023-07-08 jrick
8235 24df9a28 2023-07-08 jrick remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8236 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
8237 24df9a28 2023-07-08 jrick if (worktree_conf) {
8238 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
8239 24df9a28 2023-07-08 jrick worktree_conf);
8240 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
8241 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
8242 24df9a28 2023-07-08 jrick remote = &remotes[i];
8243 24df9a28 2023-07-08 jrick break;
8244 24df9a28 2023-07-08 jrick }
8245 24df9a28 2023-07-08 jrick }
8246 24df9a28 2023-07-08 jrick }
8247 24df9a28 2023-07-08 jrick if (remote == NULL) {
8248 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
8249 24df9a28 2023-07-08 jrick if (repo_conf) {
8250 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
8251 24df9a28 2023-07-08 jrick repo_conf);
8252 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
8253 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
8254 24df9a28 2023-07-08 jrick remote = &remotes[i];
8255 24df9a28 2023-07-08 jrick break;
8256 24df9a28 2023-07-08 jrick }
8257 24df9a28 2023-07-08 jrick }
8258 24df9a28 2023-07-08 jrick }
8259 24df9a28 2023-07-08 jrick }
8260 24df9a28 2023-07-08 jrick if (remote == NULL) {
8261 24df9a28 2023-07-08 jrick got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8262 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
8263 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
8264 24df9a28 2023-07-08 jrick remote = &remotes[i];
8265 24df9a28 2023-07-08 jrick break;
8266 24df9a28 2023-07-08 jrick }
8267 24df9a28 2023-07-08 jrick }
8268 24df9a28 2023-07-08 jrick }
8269 24df9a28 2023-07-08 jrick if (remote == NULL) {
8270 24df9a28 2023-07-08 jrick error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8271 24df9a28 2023-07-08 jrick goto done;
8272 24df9a28 2023-07-08 jrick }
8273 24df9a28 2023-07-08 jrick
8274 24df9a28 2023-07-08 jrick error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8275 24df9a28 2023-07-08 jrick &repo_name, remote->fetch_url);
8276 24df9a28 2023-07-08 jrick if (error)
8277 24df9a28 2023-07-08 jrick goto done;
8278 24df9a28 2023-07-08 jrick
8279 24df9a28 2023-07-08 jrick if (strcmp(proto, "git") == 0) {
8280 24df9a28 2023-07-08 jrick #ifndef PROFILE
8281 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8282 24df9a28 2023-07-08 jrick "sendfd dns inet unveil", NULL) == -1)
8283 24df9a28 2023-07-08 jrick err(1, "pledge");
8284 24df9a28 2023-07-08 jrick #endif
8285 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "git+ssh") == 0 ||
8286 24df9a28 2023-07-08 jrick strcmp(proto, "ssh") == 0) {
8287 24df9a28 2023-07-08 jrick #ifndef PROFILE
8288 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8289 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
8290 24df9a28 2023-07-08 jrick err(1, "pledge");
8291 24df9a28 2023-07-08 jrick #endif
8292 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "http") == 0 ||
8293 24df9a28 2023-07-08 jrick strcmp(proto, "git+http") == 0) {
8294 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8295 24df9a28 2023-07-08 jrick goto done;
8296 24df9a28 2023-07-08 jrick } else {
8297 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8298 24df9a28 2023-07-08 jrick goto done;
8299 24df9a28 2023-07-08 jrick }
8300 24df9a28 2023-07-08 jrick
8301 24df9a28 2023-07-08 jrick
8302 24df9a28 2023-07-08 jrick /*if (verbosity >= 0) {
8303 24df9a28 2023-07-08 jrick printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
8304 24df9a28 2023-07-08 jrick remote->name, proto, host,
8305 24df9a28 2023-07-08 jrick port ? ":" : "", port ? port : "",
8306 24df9a28 2023-07-08 jrick *server_path == '/' ? "" : "/", server_path);
8307 24df9a28 2023-07-08 jrick }*/
8308 24df9a28 2023-07-08 jrick
8309 24df9a28 2023-07-08 jrick /*
8310 24df9a28 2023-07-08 jrick * unveil(2) traverses exec(2); if an editor is used we have
8311 24df9a28 2023-07-08 jrick * to apply unveil after the log message has been written during
8312 24df9a28 2023-07-08 jrick * the callback.
8313 24df9a28 2023-07-08 jrick */
8314 24df9a28 2023-07-08 jrick if (logmsg == NULL || strlen(logmsg) == 0)
8315 24df9a28 2023-07-08 jrick error = get_editor(&editor);
8316 24df9a28 2023-07-08 jrick else {
8317 24df9a28 2023-07-08 jrick error = got_dial_apply_unveil(proto);
8318 24df9a28 2023-07-08 jrick if (error)
8319 24df9a28 2023-07-08 jrick goto done;
8320 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
8321 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
8322 24df9a28 2023-07-08 jrick }
8323 24df9a28 2023-07-08 jrick if (error)
8324 24df9a28 2023-07-08 jrick goto done;
8325 24df9a28 2023-07-08 jrick
8326 24df9a28 2023-07-08 jrick if (prepared_logmsg == NULL) {
8327 24df9a28 2023-07-08 jrick error = lookup_logmsg_ref(&merged_logmsg,
8328 24df9a28 2023-07-08 jrick argc > 0 ? &paths : NULL, &refs, worktree, repo);
8329 24df9a28 2023-07-08 jrick if (error)
8330 24df9a28 2023-07-08 jrick goto done;
8331 24df9a28 2023-07-08 jrick }
8332 24df9a28 2023-07-08 jrick
8333 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8334 24df9a28 2023-07-08 jrick if (error)
8335 24df9a28 2023-07-08 jrick goto done;
8336 24df9a28 2023-07-08 jrick
8337 24df9a28 2023-07-08 jrick cl_arg.editor = editor;
8338 24df9a28 2023-07-08 jrick cl_arg.cmdline_log = logmsg;
8339 24df9a28 2023-07-08 jrick cl_arg.prepared_log = prepared_logmsg;
8340 24df9a28 2023-07-08 jrick cl_arg.merged_log = merged_logmsg;
8341 24df9a28 2023-07-08 jrick cl_arg.non_interactive = non_interactive;
8342 24df9a28 2023-07-08 jrick cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8343 24df9a28 2023-07-08 jrick cl_arg.repo_path = got_repo_get_path(repo);
8344 24df9a28 2023-07-08 jrick cl_arg.dial_proto = proto;
8345 24df9a28 2023-07-08 jrick error = got_worktree_cvg_commit(&id, worktree, &paths, author,
8346 24df9a28 2023-07-08 jrick committer, allow_bad_symlinks, show_diff, commit_conflicts,
8347 24df9a28 2023-07-08 jrick collect_commit_logmsg, &cl_arg, print_status, NULL, proto, host,
8348 24df9a28 2023-07-08 jrick port, server_path, verbosity, remote, check_cancelled, repo);
8349 24df9a28 2023-07-08 jrick if (error) {
8350 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8351 24df9a28 2023-07-08 jrick cl_arg.logmsg_path != NULL)
8352 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
8353 24df9a28 2023-07-08 jrick goto done;
8354 24df9a28 2023-07-08 jrick }
8355 24df9a28 2023-07-08 jrick
8356 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, id);
8357 24df9a28 2023-07-08 jrick if (error)
8358 24df9a28 2023-07-08 jrick goto done;
8359 24df9a28 2023-07-08 jrick printf("Created commit %s\n", id_str);
8360 24df9a28 2023-07-08 jrick
8361 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
8362 24df9a28 2023-07-08 jrick error = got_ref_delete(re->ref, repo);
8363 24df9a28 2023-07-08 jrick if (error)
8364 24df9a28 2023-07-08 jrick goto done;
8365 24df9a28 2023-07-08 jrick }
8366 24df9a28 2023-07-08 jrick
8367 24df9a28 2023-07-08 jrick done:
8368 24df9a28 2023-07-08 jrick if (preserve_logmsg) {
8369 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: log message preserved in %s\n",
8370 24df9a28 2023-07-08 jrick getprogname(), cl_arg.logmsg_path);
8371 24df9a28 2023-07-08 jrick } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8372 24df9a28 2023-07-08 jrick error == NULL)
8373 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8374 24df9a28 2023-07-08 jrick free(cl_arg.logmsg_path);
8375 24df9a28 2023-07-08 jrick if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
8376 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unlink", merged_logmsg);
8377 24df9a28 2023-07-08 jrick free(merged_logmsg);
8378 24df9a28 2023-07-08 jrick if (repo) {
8379 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8380 24df9a28 2023-07-08 jrick if (error == NULL)
8381 24df9a28 2023-07-08 jrick error = close_err;
8382 24df9a28 2023-07-08 jrick }
8383 24df9a28 2023-07-08 jrick if (worktree)
8384 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8385 24df9a28 2023-07-08 jrick if (pack_fds) {
8386 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8387 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8388 24df9a28 2023-07-08 jrick if (error == NULL)
8389 24df9a28 2023-07-08 jrick error = pack_err;
8390 24df9a28 2023-07-08 jrick }
8391 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
8392 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8393 24df9a28 2023-07-08 jrick free(cwd);
8394 24df9a28 2023-07-08 jrick free(id_str);
8395 24df9a28 2023-07-08 jrick free(gitconfig_path);
8396 24df9a28 2023-07-08 jrick free(editor);
8397 24df9a28 2023-07-08 jrick free(committer);
8398 24df9a28 2023-07-08 jrick free(prepared_logmsg);
8399 24df9a28 2023-07-08 jrick return error;
8400 24df9a28 2023-07-08 jrick }
8401 24df9a28 2023-07-08 jrick
8402 24df9a28 2023-07-08 jrick /*
8403 24df9a28 2023-07-08 jrick * Print and if delete is set delete all ref_prefix references.
8404 24df9a28 2023-07-08 jrick * If wanted_ref is not NULL, only print or delete this reference.
8405 24df9a28 2023-07-08 jrick */
8406 24df9a28 2023-07-08 jrick static const struct got_error *
8407 24df9a28 2023-07-08 jrick process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
8408 24df9a28 2023-07-08 jrick const char *wanted_ref, int delete, struct got_worktree *worktree,
8409 24df9a28 2023-07-08 jrick struct got_repository *repo)
8410 24df9a28 2023-07-08 jrick {
8411 24df9a28 2023-07-08 jrick const struct got_error *err;
8412 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
8413 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
8414 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
8415 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap = NULL;
8416 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8417 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
8418 24df9a28 2023-07-08 jrick const char *header_prefix;
8419 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
8420 24df9a28 2023-07-08 jrick int found = 0;
8421 24df9a28 2023-07-08 jrick
8422 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
8423 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
8424 24df9a28 2023-07-08 jrick
8425 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
8426 24df9a28 2023-07-08 jrick if (err)
8427 24df9a28 2023-07-08 jrick goto done;
8428 24df9a28 2023-07-08 jrick
8429 24df9a28 2023-07-08 jrick err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8430 24df9a28 2023-07-08 jrick if (err)
8431 24df9a28 2023-07-08 jrick goto done;
8432 24df9a28 2023-07-08 jrick
8433 24df9a28 2023-07-08 jrick if (worktree != NULL) {
8434 24df9a28 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
8435 24df9a28 2023-07-08 jrick if (err)
8436 24df9a28 2023-07-08 jrick goto done;
8437 24df9a28 2023-07-08 jrick }
8438 24df9a28 2023-07-08 jrick
8439 24df9a28 2023-07-08 jrick if (wanted_ref) {
8440 24df9a28 2023-07-08 jrick if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
8441 24df9a28 2023-07-08 jrick wanted_ref += 11;
8442 24df9a28 2023-07-08 jrick }
8443 24df9a28 2023-07-08 jrick
8444 24df9a28 2023-07-08 jrick if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
8445 24df9a28 2023-07-08 jrick header_prefix = "backout";
8446 24df9a28 2023-07-08 jrick else
8447 24df9a28 2023-07-08 jrick header_prefix = "cherrypick";
8448 24df9a28 2023-07-08 jrick
8449 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
8450 24df9a28 2023-07-08 jrick const char *refname, *wt;
8451 24df9a28 2023-07-08 jrick
8452 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
8453 24df9a28 2023-07-08 jrick
8454 24df9a28 2023-07-08 jrick err = check_cancelled(NULL);
8455 24df9a28 2023-07-08 jrick if (err)
8456 24df9a28 2023-07-08 jrick goto done;
8457 24df9a28 2023-07-08 jrick
8458 24df9a28 2023-07-08 jrick if (strncmp(refname, ref_prefix, prefix_len) == 0)
8459 24df9a28 2023-07-08 jrick refname += prefix_len + 1; /* skip '-' delimiter */
8460 24df9a28 2023-07-08 jrick else
8461 24df9a28 2023-07-08 jrick continue;
8462 24df9a28 2023-07-08 jrick
8463 24df9a28 2023-07-08 jrick wt = refname;
8464 24df9a28 2023-07-08 jrick
8465 24df9a28 2023-07-08 jrick if (worktree == NULL || strncmp(refname, uuidstr,
8466 24df9a28 2023-07-08 jrick GOT_WORKTREE_UUID_STRLEN) == 0)
8467 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8468 24df9a28 2023-07-08 jrick else
8469 24df9a28 2023-07-08 jrick continue;
8470 24df9a28 2023-07-08 jrick
8471 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&id, NULL, refname,
8472 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8473 24df9a28 2023-07-08 jrick if (err)
8474 24df9a28 2023-07-08 jrick goto done;
8475 24df9a28 2023-07-08 jrick
8476 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
8477 24df9a28 2023-07-08 jrick if (err)
8478 24df9a28 2023-07-08 jrick goto done;
8479 24df9a28 2023-07-08 jrick
8480 24df9a28 2023-07-08 jrick if (wanted_ref)
8481 24df9a28 2023-07-08 jrick found = strncmp(wanted_ref, refname,
8482 24df9a28 2023-07-08 jrick strlen(wanted_ref)) == 0;
8483 24df9a28 2023-07-08 jrick if (wanted_ref && !found) {
8484 24df9a28 2023-07-08 jrick struct got_reflist_head *ci_refs;
8485 24df9a28 2023-07-08 jrick
8486 24df9a28 2023-07-08 jrick ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
8487 24df9a28 2023-07-08 jrick id);
8488 24df9a28 2023-07-08 jrick
8489 24df9a28 2023-07-08 jrick if (ci_refs) {
8490 24df9a28 2023-07-08 jrick char *refs_str = NULL;
8491 24df9a28 2023-07-08 jrick char const *r = NULL;
8492 24df9a28 2023-07-08 jrick
8493 24df9a28 2023-07-08 jrick err = build_refs_str(&refs_str, ci_refs, id,
8494 24df9a28 2023-07-08 jrick repo, 1);
8495 24df9a28 2023-07-08 jrick if (err)
8496 24df9a28 2023-07-08 jrick goto done;
8497 24df9a28 2023-07-08 jrick
8498 24df9a28 2023-07-08 jrick r = refs_str;
8499 24df9a28 2023-07-08 jrick while (r) {
8500 24df9a28 2023-07-08 jrick if (strncmp(r, wanted_ref,
8501 24df9a28 2023-07-08 jrick strlen(wanted_ref)) == 0) {
8502 24df9a28 2023-07-08 jrick found = 1;
8503 24df9a28 2023-07-08 jrick break;
8504 24df9a28 2023-07-08 jrick }
8505 24df9a28 2023-07-08 jrick r = strchr(r, ' ');
8506 24df9a28 2023-07-08 jrick if (r)
8507 24df9a28 2023-07-08 jrick ++r;
8508 24df9a28 2023-07-08 jrick }
8509 24df9a28 2023-07-08 jrick free(refs_str);
8510 24df9a28 2023-07-08 jrick }
8511 24df9a28 2023-07-08 jrick }
8512 24df9a28 2023-07-08 jrick
8513 24df9a28 2023-07-08 jrick if (wanted_ref == NULL || found) {
8514 24df9a28 2023-07-08 jrick if (delete) {
8515 24df9a28 2023-07-08 jrick err = got_ref_delete(re->ref, repo);
8516 24df9a28 2023-07-08 jrick if (err)
8517 24df9a28 2023-07-08 jrick goto done;
8518 24df9a28 2023-07-08 jrick printf("Deleted: ");
8519 24df9a28 2023-07-08 jrick err = print_commit_oneline(commit, id, repo,
8520 24df9a28 2023-07-08 jrick refs_idmap);
8521 24df9a28 2023-07-08 jrick } else {
8522 24df9a28 2023-07-08 jrick /*
8523 24df9a28 2023-07-08 jrick * Print paths modified by commit to help
8524 24df9a28 2023-07-08 jrick * associate commits with worktree changes.
8525 24df9a28 2023-07-08 jrick */
8526 24df9a28 2023-07-08 jrick err = get_changed_paths(&paths, commit,
8527 24df9a28 2023-07-08 jrick repo, NULL);
8528 24df9a28 2023-07-08 jrick if (err)
8529 24df9a28 2023-07-08 jrick goto done;
8530 24df9a28 2023-07-08 jrick
8531 24df9a28 2023-07-08 jrick err = print_commit(commit, id, repo, NULL,
8532 24df9a28 2023-07-08 jrick &paths, NULL, 0, 0, refs_idmap, NULL,
8533 24df9a28 2023-07-08 jrick header_prefix);
8534 24df9a28 2023-07-08 jrick got_pathlist_free(&paths,
8535 24df9a28 2023-07-08 jrick GOT_PATHLIST_FREE_ALL);
8536 24df9a28 2023-07-08 jrick
8537 24df9a28 2023-07-08 jrick if (worktree == NULL)
8538 24df9a28 2023-07-08 jrick printf("work tree: %.*s\n\n",
8539 24df9a28 2023-07-08 jrick GOT_WORKTREE_UUID_STRLEN, wt);
8540 24df9a28 2023-07-08 jrick }
8541 24df9a28 2023-07-08 jrick if (err || found)
8542 24df9a28 2023-07-08 jrick goto done;
8543 24df9a28 2023-07-08 jrick }
8544 24df9a28 2023-07-08 jrick
8545 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8546 24df9a28 2023-07-08 jrick commit = NULL;
8547 24df9a28 2023-07-08 jrick free(id);
8548 24df9a28 2023-07-08 jrick id = NULL;
8549 24df9a28 2023-07-08 jrick }
8550 24df9a28 2023-07-08 jrick
8551 24df9a28 2023-07-08 jrick if (wanted_ref != NULL && !found)
8552 24df9a28 2023-07-08 jrick err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
8553 24df9a28 2023-07-08 jrick
8554 24df9a28 2023-07-08 jrick done:
8555 24df9a28 2023-07-08 jrick free(id);
8556 24df9a28 2023-07-08 jrick free(uuidstr);
8557 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
8558 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8559 24df9a28 2023-07-08 jrick if (refs_idmap)
8560 24df9a28 2023-07-08 jrick got_reflist_object_id_map_free(refs_idmap);
8561 24df9a28 2023-07-08 jrick if (commit)
8562 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8563 24df9a28 2023-07-08 jrick return err;
8564 24df9a28 2023-07-08 jrick }
8565 24df9a28 2023-07-08 jrick
8566 24df9a28 2023-07-08 jrick /*
8567 24df9a28 2023-07-08 jrick * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
8568 24df9a28 2023-07-08 jrick * identified by id for log messages to prepopulate the editor on commit.
8569 24df9a28 2023-07-08 jrick */
8570 24df9a28 2023-07-08 jrick static const struct got_error *
8571 24df9a28 2023-07-08 jrick logmsg_ref(struct got_object_id *id, const char *prefix,
8572 24df9a28 2023-07-08 jrick struct got_worktree *worktree, struct got_repository *repo)
8573 24df9a28 2023-07-08 jrick {
8574 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
8575 24df9a28 2023-07-08 jrick char *idstr, *ref = NULL, *refname = NULL;
8576 24df9a28 2023-07-08 jrick int histedit_in_progress;
8577 24df9a28 2023-07-08 jrick int rebase_in_progress, merge_in_progress;
8578 24df9a28 2023-07-08 jrick
8579 24df9a28 2023-07-08 jrick /*
8580 24df9a28 2023-07-08 jrick * Silenty refuse to create merge reference if any histedit, merge,
8581 24df9a28 2023-07-08 jrick * or rebase operation is in progress.
8582 24df9a28 2023-07-08 jrick */
8583 24df9a28 2023-07-08 jrick err = got_worktree_histedit_in_progress(&histedit_in_progress,
8584 24df9a28 2023-07-08 jrick worktree);
8585 24df9a28 2023-07-08 jrick if (err)
8586 24df9a28 2023-07-08 jrick return err;
8587 24df9a28 2023-07-08 jrick if (histedit_in_progress)
8588 24df9a28 2023-07-08 jrick return NULL;
8589 24df9a28 2023-07-08 jrick
8590 24df9a28 2023-07-08 jrick err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8591 24df9a28 2023-07-08 jrick if (err)
8592 24df9a28 2023-07-08 jrick return err;
8593 24df9a28 2023-07-08 jrick if (rebase_in_progress)
8594 24df9a28 2023-07-08 jrick return NULL;
8595 24df9a28 2023-07-08 jrick
8596 24df9a28 2023-07-08 jrick err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
8597 24df9a28 2023-07-08 jrick repo);
8598 24df9a28 2023-07-08 jrick if (err)
8599 24df9a28 2023-07-08 jrick return err;
8600 24df9a28 2023-07-08 jrick if (merge_in_progress)
8601 24df9a28 2023-07-08 jrick return NULL;
8602 24df9a28 2023-07-08 jrick
8603 24df9a28 2023-07-08 jrick err = got_object_id_str(&idstr, id);
8604 24df9a28 2023-07-08 jrick if (err)
8605 24df9a28 2023-07-08 jrick return err;
8606 24df9a28 2023-07-08 jrick
8607 24df9a28 2023-07-08 jrick err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
8608 24df9a28 2023-07-08 jrick if (err)
8609 24df9a28 2023-07-08 jrick goto done;
8610 24df9a28 2023-07-08 jrick
8611 24df9a28 2023-07-08 jrick if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
8612 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
8613 24df9a28 2023-07-08 jrick goto done;
8614 24df9a28 2023-07-08 jrick }
8615 24df9a28 2023-07-08 jrick
8616 24df9a28 2023-07-08 jrick err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
8617 24df9a28 2023-07-08 jrick -1, repo);
8618 24df9a28 2023-07-08 jrick done:
8619 24df9a28 2023-07-08 jrick free(ref);
8620 24df9a28 2023-07-08 jrick free(idstr);
8621 24df9a28 2023-07-08 jrick free(refname);
8622 24df9a28 2023-07-08 jrick return err;
8623 24df9a28 2023-07-08 jrick }
8624 24df9a28 2023-07-08 jrick
8625 24df9a28 2023-07-08 jrick __dead static void
8626 24df9a28 2023-07-08 jrick usage_cherrypick(void)
8627 24df9a28 2023-07-08 jrick {
8628 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
8629 24df9a28 2023-07-08 jrick getprogname());
8630 24df9a28 2023-07-08 jrick exit(1);
8631 24df9a28 2023-07-08 jrick }
8632 24df9a28 2023-07-08 jrick
8633 24df9a28 2023-07-08 jrick static const struct got_error *
8634 24df9a28 2023-07-08 jrick cmd_cherrypick(int argc, char *argv[])
8635 24df9a28 2023-07-08 jrick {
8636 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
8637 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
8638 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
8639 24df9a28 2023-07-08 jrick char *cwd = NULL, *commit_id_str = NULL;
8640 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
8641 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8642 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
8643 24df9a28 2023-07-08 jrick int ch, list_refs = 0, remove_refs = 0;
8644 24df9a28 2023-07-08 jrick struct got_update_progress_arg upa;
8645 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
8646 24df9a28 2023-07-08 jrick
8647 24df9a28 2023-07-08 jrick #ifndef PROFILE
8648 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8649 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
8650 24df9a28 2023-07-08 jrick err(1, "pledge");
8651 24df9a28 2023-07-08 jrick #endif
8652 24df9a28 2023-07-08 jrick
8653 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "lX")) != -1) {
8654 24df9a28 2023-07-08 jrick switch (ch) {
8655 24df9a28 2023-07-08 jrick case 'l':
8656 24df9a28 2023-07-08 jrick list_refs = 1;
8657 24df9a28 2023-07-08 jrick break;
8658 24df9a28 2023-07-08 jrick case 'X':
8659 24df9a28 2023-07-08 jrick remove_refs = 1;
8660 24df9a28 2023-07-08 jrick break;
8661 24df9a28 2023-07-08 jrick default:
8662 24df9a28 2023-07-08 jrick usage_cherrypick();
8663 24df9a28 2023-07-08 jrick /* NOTREACHED */
8664 24df9a28 2023-07-08 jrick }
8665 24df9a28 2023-07-08 jrick }
8666 24df9a28 2023-07-08 jrick
8667 24df9a28 2023-07-08 jrick argc -= optind;
8668 24df9a28 2023-07-08 jrick argv += optind;
8669 24df9a28 2023-07-08 jrick
8670 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8671 24df9a28 2023-07-08 jrick if (argc != 0 && argc != 1)
8672 24df9a28 2023-07-08 jrick usage_cherrypick();
8673 24df9a28 2023-07-08 jrick } else if (argc != 1)
8674 24df9a28 2023-07-08 jrick usage_cherrypick();
8675 24df9a28 2023-07-08 jrick if (list_refs && remove_refs)
8676 24df9a28 2023-07-08 jrick option_conflict('l', 'X');
8677 24df9a28 2023-07-08 jrick
8678 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
8679 24df9a28 2023-07-08 jrick if (cwd == NULL) {
8680 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
8681 24df9a28 2023-07-08 jrick goto done;
8682 24df9a28 2023-07-08 jrick }
8683 24df9a28 2023-07-08 jrick
8684 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
8685 24df9a28 2023-07-08 jrick if (error != NULL)
8686 24df9a28 2023-07-08 jrick goto done;
8687 24df9a28 2023-07-08 jrick
8688 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
8689 24df9a28 2023-07-08 jrick if (error) {
8690 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8691 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_WORKTREE)
8692 24df9a28 2023-07-08 jrick goto done;
8693 24df9a28 2023-07-08 jrick } else {
8694 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
8695 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error,
8696 24df9a28 2023-07-08 jrick "cherrypick", cwd);
8697 24df9a28 2023-07-08 jrick goto done;
8698 24df9a28 2023-07-08 jrick }
8699 24df9a28 2023-07-08 jrick }
8700 24df9a28 2023-07-08 jrick
8701 24df9a28 2023-07-08 jrick error = got_repo_open(&repo,
8702 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_repo_path(worktree) : cwd,
8703 24df9a28 2023-07-08 jrick NULL, pack_fds);
8704 24df9a28 2023-07-08 jrick if (error != NULL)
8705 24df9a28 2023-07-08 jrick goto done;
8706 24df9a28 2023-07-08 jrick
8707 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
8708 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
8709 24df9a28 2023-07-08 jrick if (error)
8710 24df9a28 2023-07-08 jrick goto done;
8711 24df9a28 2023-07-08 jrick
8712 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8713 24df9a28 2023-07-08 jrick error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8714 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
8715 24df9a28 2023-07-08 jrick argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8716 24df9a28 2023-07-08 jrick goto done;
8717 24df9a28 2023-07-08 jrick }
8718 24df9a28 2023-07-08 jrick
8719 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8720 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8721 24df9a28 2023-07-08 jrick if (error)
8722 24df9a28 2023-07-08 jrick goto done;
8723 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
8724 24df9a28 2023-07-08 jrick if (error)
8725 24df9a28 2023-07-08 jrick goto done;
8726 24df9a28 2023-07-08 jrick
8727 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
8728 24df9a28 2023-07-08 jrick if (error)
8729 24df9a28 2023-07-08 jrick goto done;
8730 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8731 24df9a28 2023-07-08 jrick memset(&upa, 0, sizeof(upa));
8732 24df9a28 2023-07-08 jrick error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8733 24df9a28 2023-07-08 jrick commit_id, repo, update_progress, &upa, check_cancelled,
8734 24df9a28 2023-07-08 jrick NULL);
8735 24df9a28 2023-07-08 jrick if (error != NULL)
8736 24df9a28 2023-07-08 jrick goto done;
8737 24df9a28 2023-07-08 jrick
8738 24df9a28 2023-07-08 jrick if (upa.did_something) {
8739 24df9a28 2023-07-08 jrick error = logmsg_ref(commit_id,
8740 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
8741 24df9a28 2023-07-08 jrick if (error)
8742 24df9a28 2023-07-08 jrick goto done;
8743 24df9a28 2023-07-08 jrick printf("Merged commit %s\n", commit_id_str);
8744 24df9a28 2023-07-08 jrick }
8745 24df9a28 2023-07-08 jrick print_merge_progress_stats(&upa);
8746 24df9a28 2023-07-08 jrick done:
8747 24df9a28 2023-07-08 jrick free(cwd);
8748 24df9a28 2023-07-08 jrick if (commit)
8749 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8750 24df9a28 2023-07-08 jrick free(commit_id_str);
8751 24df9a28 2023-07-08 jrick if (worktree)
8752 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8753 24df9a28 2023-07-08 jrick if (repo) {
8754 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8755 24df9a28 2023-07-08 jrick if (error == NULL)
8756 24df9a28 2023-07-08 jrick error = close_err;
8757 24df9a28 2023-07-08 jrick }
8758 24df9a28 2023-07-08 jrick if (pack_fds) {
8759 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8760 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8761 24df9a28 2023-07-08 jrick if (error == NULL)
8762 24df9a28 2023-07-08 jrick error = pack_err;
8763 24df9a28 2023-07-08 jrick }
8764 24df9a28 2023-07-08 jrick
8765 24df9a28 2023-07-08 jrick return error;
8766 24df9a28 2023-07-08 jrick }
8767 24df9a28 2023-07-08 jrick
8768 24df9a28 2023-07-08 jrick __dead static void
8769 24df9a28 2023-07-08 jrick usage_backout(void)
8770 24df9a28 2023-07-08 jrick {
8771 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
8772 24df9a28 2023-07-08 jrick exit(1);
8773 24df9a28 2023-07-08 jrick }
8774 24df9a28 2023-07-08 jrick
8775 24df9a28 2023-07-08 jrick static const struct got_error *
8776 24df9a28 2023-07-08 jrick cmd_backout(int argc, char *argv[])
8777 24df9a28 2023-07-08 jrick {
8778 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
8779 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
8780 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
8781 24df9a28 2023-07-08 jrick char *cwd = NULL, *commit_id_str = NULL;
8782 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
8783 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8784 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
8785 24df9a28 2023-07-08 jrick int ch, list_refs = 0, remove_refs = 0;
8786 24df9a28 2023-07-08 jrick struct got_update_progress_arg upa;
8787 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
8788 24df9a28 2023-07-08 jrick
8789 24df9a28 2023-07-08 jrick #ifndef PROFILE
8790 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8791 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
8792 24df9a28 2023-07-08 jrick err(1, "pledge");
8793 24df9a28 2023-07-08 jrick #endif
8794 24df9a28 2023-07-08 jrick
8795 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "lX")) != -1) {
8796 24df9a28 2023-07-08 jrick switch (ch) {
8797 24df9a28 2023-07-08 jrick case 'l':
8798 24df9a28 2023-07-08 jrick list_refs = 1;
8799 24df9a28 2023-07-08 jrick break;
8800 24df9a28 2023-07-08 jrick case 'X':
8801 24df9a28 2023-07-08 jrick remove_refs = 1;
8802 24df9a28 2023-07-08 jrick break;
8803 24df9a28 2023-07-08 jrick default:
8804 24df9a28 2023-07-08 jrick usage_backout();
8805 24df9a28 2023-07-08 jrick /* NOTREACHED */
8806 24df9a28 2023-07-08 jrick }
8807 24df9a28 2023-07-08 jrick }
8808 24df9a28 2023-07-08 jrick
8809 24df9a28 2023-07-08 jrick argc -= optind;
8810 24df9a28 2023-07-08 jrick argv += optind;
8811 24df9a28 2023-07-08 jrick
8812 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8813 24df9a28 2023-07-08 jrick if (argc != 0 && argc != 1)
8814 24df9a28 2023-07-08 jrick usage_backout();
8815 24df9a28 2023-07-08 jrick } else if (argc != 1)
8816 24df9a28 2023-07-08 jrick usage_backout();
8817 24df9a28 2023-07-08 jrick if (list_refs && remove_refs)
8818 24df9a28 2023-07-08 jrick option_conflict('l', 'X');
8819 24df9a28 2023-07-08 jrick
8820 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
8821 24df9a28 2023-07-08 jrick if (cwd == NULL) {
8822 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
8823 24df9a28 2023-07-08 jrick goto done;
8824 24df9a28 2023-07-08 jrick }
8825 24df9a28 2023-07-08 jrick
8826 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
8827 24df9a28 2023-07-08 jrick if (error != NULL)
8828 24df9a28 2023-07-08 jrick goto done;
8829 24df9a28 2023-07-08 jrick
8830 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
8831 24df9a28 2023-07-08 jrick if (error) {
8832 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8833 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_WORKTREE)
8834 24df9a28 2023-07-08 jrick goto done;
8835 24df9a28 2023-07-08 jrick } else {
8836 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
8837 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error,
8838 24df9a28 2023-07-08 jrick "backout", cwd);
8839 24df9a28 2023-07-08 jrick goto done;
8840 24df9a28 2023-07-08 jrick }
8841 24df9a28 2023-07-08 jrick }
8842 24df9a28 2023-07-08 jrick
8843 24df9a28 2023-07-08 jrick error = got_repo_open(&repo,
8844 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_repo_path(worktree) : cwd,
8845 24df9a28 2023-07-08 jrick NULL, pack_fds);
8846 24df9a28 2023-07-08 jrick if (error != NULL)
8847 24df9a28 2023-07-08 jrick goto done;
8848 24df9a28 2023-07-08 jrick
8849 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
8850 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
8851 24df9a28 2023-07-08 jrick if (error)
8852 24df9a28 2023-07-08 jrick goto done;
8853 24df9a28 2023-07-08 jrick
8854 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8855 24df9a28 2023-07-08 jrick error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
8856 24df9a28 2023-07-08 jrick GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
8857 24df9a28 2023-07-08 jrick argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8858 24df9a28 2023-07-08 jrick goto done;
8859 24df9a28 2023-07-08 jrick }
8860 24df9a28 2023-07-08 jrick
8861 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8862 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8863 24df9a28 2023-07-08 jrick if (error)
8864 24df9a28 2023-07-08 jrick goto done;
8865 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
8866 24df9a28 2023-07-08 jrick if (error)
8867 24df9a28 2023-07-08 jrick goto done;
8868 24df9a28 2023-07-08 jrick
8869 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
8870 24df9a28 2023-07-08 jrick if (error)
8871 24df9a28 2023-07-08 jrick goto done;
8872 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8873 24df9a28 2023-07-08 jrick if (pid == NULL) {
8874 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_ROOT_COMMIT);
8875 24df9a28 2023-07-08 jrick goto done;
8876 24df9a28 2023-07-08 jrick }
8877 24df9a28 2023-07-08 jrick
8878 24df9a28 2023-07-08 jrick memset(&upa, 0, sizeof(upa));
8879 24df9a28 2023-07-08 jrick error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8880 24df9a28 2023-07-08 jrick repo, update_progress, &upa, check_cancelled, NULL);
8881 24df9a28 2023-07-08 jrick if (error != NULL)
8882 24df9a28 2023-07-08 jrick goto done;
8883 24df9a28 2023-07-08 jrick
8884 24df9a28 2023-07-08 jrick if (upa.did_something) {
8885 24df9a28 2023-07-08 jrick error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8886 24df9a28 2023-07-08 jrick worktree, repo);
8887 24df9a28 2023-07-08 jrick if (error)
8888 24df9a28 2023-07-08 jrick goto done;
8889 24df9a28 2023-07-08 jrick printf("Backed out commit %s\n", commit_id_str);
8890 24df9a28 2023-07-08 jrick }
8891 24df9a28 2023-07-08 jrick print_merge_progress_stats(&upa);
8892 24df9a28 2023-07-08 jrick done:
8893 24df9a28 2023-07-08 jrick free(cwd);
8894 24df9a28 2023-07-08 jrick if (commit)
8895 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8896 24df9a28 2023-07-08 jrick free(commit_id_str);
8897 24df9a28 2023-07-08 jrick if (worktree)
8898 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8899 24df9a28 2023-07-08 jrick if (repo) {
8900 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8901 24df9a28 2023-07-08 jrick if (error == NULL)
8902 24df9a28 2023-07-08 jrick error = close_err;
8903 24df9a28 2023-07-08 jrick }
8904 24df9a28 2023-07-08 jrick if (pack_fds) {
8905 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8906 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8907 24df9a28 2023-07-08 jrick if (error == NULL)
8908 24df9a28 2023-07-08 jrick error = pack_err;
8909 24df9a28 2023-07-08 jrick }
8910 24df9a28 2023-07-08 jrick return error;
8911 24df9a28 2023-07-08 jrick }
8912 24df9a28 2023-07-08 jrick
8913 24df9a28 2023-07-08 jrick __dead static void
8914 24df9a28 2023-07-08 jrick usage_cat(void)
8915 24df9a28 2023-07-08 jrick {
8916 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
8917 24df9a28 2023-07-08 jrick "arg ...\n", getprogname());
8918 24df9a28 2023-07-08 jrick exit(1);
8919 24df9a28 2023-07-08 jrick }
8920 24df9a28 2023-07-08 jrick
8921 24df9a28 2023-07-08 jrick static const struct got_error *
8922 24df9a28 2023-07-08 jrick cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8923 24df9a28 2023-07-08 jrick {
8924 24df9a28 2023-07-08 jrick const struct got_error *err;
8925 24df9a28 2023-07-08 jrick struct got_blob_object *blob;
8926 24df9a28 2023-07-08 jrick int fd = -1;
8927 24df9a28 2023-07-08 jrick
8928 24df9a28 2023-07-08 jrick fd = got_opentempfd();
8929 24df9a28 2023-07-08 jrick if (fd == -1)
8930 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
8931 24df9a28 2023-07-08 jrick
8932 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
8933 24df9a28 2023-07-08 jrick if (err)
8934 24df9a28 2023-07-08 jrick goto done;
8935 24df9a28 2023-07-08 jrick
8936 24df9a28 2023-07-08 jrick err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8937 24df9a28 2023-07-08 jrick done:
8938 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
8939 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
8940 24df9a28 2023-07-08 jrick if (blob)
8941 24df9a28 2023-07-08 jrick got_object_blob_close(blob);
8942 24df9a28 2023-07-08 jrick return err;
8943 24df9a28 2023-07-08 jrick }
8944 24df9a28 2023-07-08 jrick
8945 24df9a28 2023-07-08 jrick static const struct got_error *
8946 24df9a28 2023-07-08 jrick cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8947 24df9a28 2023-07-08 jrick {
8948 24df9a28 2023-07-08 jrick const struct got_error *err;
8949 24df9a28 2023-07-08 jrick struct got_tree_object *tree;
8950 24df9a28 2023-07-08 jrick int nentries, i;
8951 24df9a28 2023-07-08 jrick
8952 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree, repo, id);
8953 24df9a28 2023-07-08 jrick if (err)
8954 24df9a28 2023-07-08 jrick return err;
8955 24df9a28 2023-07-08 jrick
8956 24df9a28 2023-07-08 jrick nentries = got_object_tree_get_nentries(tree);
8957 24df9a28 2023-07-08 jrick for (i = 0; i < nentries; i++) {
8958 24df9a28 2023-07-08 jrick struct got_tree_entry *te;
8959 24df9a28 2023-07-08 jrick char *id_str;
8960 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
8961 24df9a28 2023-07-08 jrick break;
8962 24df9a28 2023-07-08 jrick te = got_object_tree_get_entry(tree, i);
8963 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8964 24df9a28 2023-07-08 jrick if (err)
8965 24df9a28 2023-07-08 jrick break;
8966 24df9a28 2023-07-08 jrick fprintf(outfile, "%s %.7o %s\n", id_str,
8967 24df9a28 2023-07-08 jrick got_tree_entry_get_mode(te),
8968 24df9a28 2023-07-08 jrick got_tree_entry_get_name(te));
8969 24df9a28 2023-07-08 jrick free(id_str);
8970 24df9a28 2023-07-08 jrick }
8971 24df9a28 2023-07-08 jrick
8972 24df9a28 2023-07-08 jrick got_object_tree_close(tree);
8973 24df9a28 2023-07-08 jrick return err;
8974 24df9a28 2023-07-08 jrick }
8975 24df9a28 2023-07-08 jrick
8976 24df9a28 2023-07-08 jrick static const struct got_error *
8977 24df9a28 2023-07-08 jrick cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8978 24df9a28 2023-07-08 jrick {
8979 24df9a28 2023-07-08 jrick const struct got_error *err;
8980 24df9a28 2023-07-08 jrick struct got_commit_object *commit;
8981 24df9a28 2023-07-08 jrick const struct got_object_id_queue *parent_ids;
8982 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
8983 24df9a28 2023-07-08 jrick char *id_str = NULL;
8984 24df9a28 2023-07-08 jrick const char *logmsg = NULL;
8985 24df9a28 2023-07-08 jrick char gmtoff[6];
8986 24df9a28 2023-07-08 jrick
8987 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
8988 24df9a28 2023-07-08 jrick if (err)
8989 24df9a28 2023-07-08 jrick return err;
8990 24df9a28 2023-07-08 jrick
8991 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8992 24df9a28 2023-07-08 jrick if (err)
8993 24df9a28 2023-07-08 jrick goto done;
8994 24df9a28 2023-07-08 jrick
8995 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8996 24df9a28 2023-07-08 jrick parent_ids = got_object_commit_get_parent_ids(commit);
8997 24df9a28 2023-07-08 jrick fprintf(outfile, "numparents %d\n",
8998 24df9a28 2023-07-08 jrick got_object_commit_get_nparents(commit));
8999 24df9a28 2023-07-08 jrick STAILQ_FOREACH(pid, parent_ids, entry) {
9000 24df9a28 2023-07-08 jrick char *pid_str;
9001 24df9a28 2023-07-08 jrick err = got_object_id_str(&pid_str, &pid->id);
9002 24df9a28 2023-07-08 jrick if (err)
9003 24df9a28 2023-07-08 jrick goto done;
9004 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9005 24df9a28 2023-07-08 jrick free(pid_str);
9006 24df9a28 2023-07-08 jrick }
9007 24df9a28 2023-07-08 jrick got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
9008 24df9a28 2023-07-08 jrick got_object_commit_get_author_gmtoff(commit));
9009 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
9010 24df9a28 2023-07-08 jrick got_object_commit_get_author(commit),
9011 24df9a28 2023-07-08 jrick (long long)got_object_commit_get_author_time(commit),
9012 24df9a28 2023-07-08 jrick gmtoff);
9013 24df9a28 2023-07-08 jrick
9014 24df9a28 2023-07-08 jrick got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
9015 24df9a28 2023-07-08 jrick got_object_commit_get_committer_gmtoff(commit));
9016 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
9017 24df9a28 2023-07-08 jrick got_object_commit_get_committer(commit),
9018 24df9a28 2023-07-08 jrick (long long)got_object_commit_get_committer_time(commit),
9019 24df9a28 2023-07-08 jrick gmtoff);
9020 24df9a28 2023-07-08 jrick
9021 24df9a28 2023-07-08 jrick logmsg = got_object_commit_get_logmsg_raw(commit);
9022 24df9a28 2023-07-08 jrick fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9023 24df9a28 2023-07-08 jrick fprintf(outfile, "%s", logmsg);
9024 24df9a28 2023-07-08 jrick done:
9025 24df9a28 2023-07-08 jrick free(id_str);
9026 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
9027 24df9a28 2023-07-08 jrick return err;
9028 24df9a28 2023-07-08 jrick }
9029 24df9a28 2023-07-08 jrick
9030 24df9a28 2023-07-08 jrick static const struct got_error *
9031 24df9a28 2023-07-08 jrick cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9032 24df9a28 2023-07-08 jrick {
9033 24df9a28 2023-07-08 jrick const struct got_error *err;
9034 24df9a28 2023-07-08 jrick struct got_tag_object *tag;
9035 24df9a28 2023-07-08 jrick char *id_str = NULL;
9036 24df9a28 2023-07-08 jrick const char *tagmsg = NULL;
9037 24df9a28 2023-07-08 jrick char gmtoff[6];
9038 24df9a28 2023-07-08 jrick
9039 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&tag, repo, id);
9040 24df9a28 2023-07-08 jrick if (err)
9041 24df9a28 2023-07-08 jrick return err;
9042 24df9a28 2023-07-08 jrick
9043 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9044 24df9a28 2023-07-08 jrick if (err)
9045 24df9a28 2023-07-08 jrick goto done;
9046 24df9a28 2023-07-08 jrick
9047 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9048 24df9a28 2023-07-08 jrick
9049 24df9a28 2023-07-08 jrick switch (got_object_tag_get_object_type(tag)) {
9050 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
9051 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9052 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_BLOB);
9053 24df9a28 2023-07-08 jrick break;
9054 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
9055 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9056 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_TREE);
9057 24df9a28 2023-07-08 jrick break;
9058 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
9059 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9060 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_COMMIT);
9061 24df9a28 2023-07-08 jrick break;
9062 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TAG:
9063 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9064 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_TAG);
9065 24df9a28 2023-07-08 jrick break;
9066 24df9a28 2023-07-08 jrick default:
9067 24df9a28 2023-07-08 jrick break;
9068 24df9a28 2023-07-08 jrick }
9069 24df9a28 2023-07-08 jrick
9070 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9071 24df9a28 2023-07-08 jrick got_object_tag_get_name(tag));
9072 24df9a28 2023-07-08 jrick
9073 24df9a28 2023-07-08 jrick got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
9074 24df9a28 2023-07-08 jrick got_object_tag_get_tagger_gmtoff(tag));
9075 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
9076 24df9a28 2023-07-08 jrick got_object_tag_get_tagger(tag),
9077 24df9a28 2023-07-08 jrick (long long)got_object_tag_get_tagger_time(tag),
9078 24df9a28 2023-07-08 jrick gmtoff);
9079 24df9a28 2023-07-08 jrick
9080 24df9a28 2023-07-08 jrick tagmsg = got_object_tag_get_message(tag);
9081 24df9a28 2023-07-08 jrick fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9082 24df9a28 2023-07-08 jrick fprintf(outfile, "%s", tagmsg);
9083 24df9a28 2023-07-08 jrick done:
9084 24df9a28 2023-07-08 jrick free(id_str);
9085 24df9a28 2023-07-08 jrick got_object_tag_close(tag);
9086 24df9a28 2023-07-08 jrick return err;
9087 24df9a28 2023-07-08 jrick }
9088 24df9a28 2023-07-08 jrick
9089 24df9a28 2023-07-08 jrick static const struct got_error *
9090 24df9a28 2023-07-08 jrick cmd_cat(int argc, char *argv[])
9091 24df9a28 2023-07-08 jrick {
9092 24df9a28 2023-07-08 jrick const struct got_error *error;
9093 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
9094 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
9095 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL, *label = NULL;
9096 24df9a28 2023-07-08 jrick const char *commit_id_str = NULL;
9097 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL, *commit_id = NULL;
9098 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
9099 24df9a28 2023-07-08 jrick int ch, obj_type, i, force_path = 0;
9100 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
9101 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
9102 24df9a28 2023-07-08 jrick
9103 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
9104 24df9a28 2023-07-08 jrick
9105 24df9a28 2023-07-08 jrick #ifndef PROFILE
9106 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9107 24df9a28 2023-07-08 jrick NULL) == -1)
9108 24df9a28 2023-07-08 jrick err(1, "pledge");
9109 24df9a28 2023-07-08 jrick #endif
9110 24df9a28 2023-07-08 jrick
9111 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
9112 24df9a28 2023-07-08 jrick switch (ch) {
9113 24df9a28 2023-07-08 jrick case 'c':
9114 24df9a28 2023-07-08 jrick commit_id_str = optarg;
9115 24df9a28 2023-07-08 jrick break;
9116 24df9a28 2023-07-08 jrick case 'P':
9117 24df9a28 2023-07-08 jrick force_path = 1;
9118 24df9a28 2023-07-08 jrick break;
9119 24df9a28 2023-07-08 jrick case 'r':
9120 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
9121 24df9a28 2023-07-08 jrick if (repo_path == NULL)
9122 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
9123 24df9a28 2023-07-08 jrick optarg);
9124 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
9125 24df9a28 2023-07-08 jrick break;
9126 24df9a28 2023-07-08 jrick default:
9127 24df9a28 2023-07-08 jrick usage_cat();
9128 24df9a28 2023-07-08 jrick /* NOTREACHED */
9129 24df9a28 2023-07-08 jrick }
9130 24df9a28 2023-07-08 jrick }
9131 24df9a28 2023-07-08 jrick
9132 24df9a28 2023-07-08 jrick argc -= optind;
9133 24df9a28 2023-07-08 jrick argv += optind;
9134 24df9a28 2023-07-08 jrick
9135 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
9136 24df9a28 2023-07-08 jrick if (cwd == NULL) {
9137 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
9138 24df9a28 2023-07-08 jrick goto done;
9139 24df9a28 2023-07-08 jrick }
9140 24df9a28 2023-07-08 jrick
9141 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
9142 24df9a28 2023-07-08 jrick if (error != NULL)
9143 24df9a28 2023-07-08 jrick goto done;
9144 24df9a28 2023-07-08 jrick
9145 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
9146 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
9147 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
9148 24df9a28 2023-07-08 jrick goto done;
9149 24df9a28 2023-07-08 jrick if (worktree) {
9150 24df9a28 2023-07-08 jrick repo_path = strdup(
9151 24df9a28 2023-07-08 jrick got_worktree_get_repo_path(worktree));
9152 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
9153 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
9154 24df9a28 2023-07-08 jrick goto done;
9155 24df9a28 2023-07-08 jrick }
9156 24df9a28 2023-07-08 jrick
9157 24df9a28 2023-07-08 jrick /* Release work tree lock. */
9158 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
9159 24df9a28 2023-07-08 jrick worktree = NULL;
9160 24df9a28 2023-07-08 jrick }
9161 24df9a28 2023-07-08 jrick }
9162 24df9a28 2023-07-08 jrick
9163 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
9164 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
9165 24df9a28 2023-07-08 jrick if (repo_path == NULL)
9166 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
9167 24df9a28 2023-07-08 jrick }
9168 24df9a28 2023-07-08 jrick
9169 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9170 24df9a28 2023-07-08 jrick free(repo_path);
9171 24df9a28 2023-07-08 jrick if (error != NULL)
9172 24df9a28 2023-07-08 jrick goto done;
9173 24df9a28 2023-07-08 jrick
9174 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9175 24df9a28 2023-07-08 jrick if (error)
9176 24df9a28 2023-07-08 jrick goto done;
9177 24df9a28 2023-07-08 jrick
9178 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9179 24df9a28 2023-07-08 jrick if (error)
9180 24df9a28 2023-07-08 jrick goto done;
9181 24df9a28 2023-07-08 jrick
9182 24df9a28 2023-07-08 jrick if (commit_id_str == NULL)
9183 24df9a28 2023-07-08 jrick commit_id_str = GOT_REF_HEAD;
9184 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
9185 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
9186 24df9a28 2023-07-08 jrick if (error)
9187 24df9a28 2023-07-08 jrick goto done;
9188 24df9a28 2023-07-08 jrick
9189 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
9190 24df9a28 2023-07-08 jrick if (error)
9191 24df9a28 2023-07-08 jrick goto done;
9192 24df9a28 2023-07-08 jrick
9193 24df9a28 2023-07-08 jrick for (i = 0; i < argc; i++) {
9194 24df9a28 2023-07-08 jrick if (force_path) {
9195 24df9a28 2023-07-08 jrick error = got_object_id_by_path(&id, repo, commit,
9196 24df9a28 2023-07-08 jrick argv[i]);
9197 24df9a28 2023-07-08 jrick if (error)
9198 24df9a28 2023-07-08 jrick break;
9199 24df9a28 2023-07-08 jrick } else {
9200 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&id, &label, argv[i],
9201 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
9202 24df9a28 2023-07-08 jrick repo);
9203 24df9a28 2023-07-08 jrick if (error) {
9204 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9205 24df9a28 2023-07-08 jrick error->code != GOT_ERR_NOT_REF)
9206 24df9a28 2023-07-08 jrick break;
9207 24df9a28 2023-07-08 jrick error = got_object_id_by_path(&id, repo,
9208 24df9a28 2023-07-08 jrick commit, argv[i]);
9209 24df9a28 2023-07-08 jrick if (error)
9210 24df9a28 2023-07-08 jrick break;
9211 24df9a28 2023-07-08 jrick }
9212 24df9a28 2023-07-08 jrick }
9213 24df9a28 2023-07-08 jrick
9214 24df9a28 2023-07-08 jrick error = got_object_get_type(&obj_type, repo, id);
9215 24df9a28 2023-07-08 jrick if (error)
9216 24df9a28 2023-07-08 jrick break;
9217 24df9a28 2023-07-08 jrick
9218 24df9a28 2023-07-08 jrick switch (obj_type) {
9219 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
9220 24df9a28 2023-07-08 jrick error = cat_blob(id, repo, stdout);
9221 24df9a28 2023-07-08 jrick break;
9222 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
9223 24df9a28 2023-07-08 jrick error = cat_tree(id, repo, stdout);
9224 24df9a28 2023-07-08 jrick break;
9225 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
9226 24df9a28 2023-07-08 jrick error = cat_commit(id, repo, stdout);
9227 24df9a28 2023-07-08 jrick break;
9228 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TAG:
9229 24df9a28 2023-07-08 jrick error = cat_tag(id, repo, stdout);
9230 24df9a28 2023-07-08 jrick break;
9231 24df9a28 2023-07-08 jrick default:
9232 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_OBJ_TYPE);
9233 24df9a28 2023-07-08 jrick break;
9234 24df9a28 2023-07-08 jrick }
9235 24df9a28 2023-07-08 jrick if (error)
9236 24df9a28 2023-07-08 jrick break;
9237 24df9a28 2023-07-08 jrick free(label);
9238 24df9a28 2023-07-08 jrick label = NULL;
9239 24df9a28 2023-07-08 jrick free(id);
9240 24df9a28 2023-07-08 jrick id = NULL;
9241 24df9a28 2023-07-08 jrick }
9242 24df9a28 2023-07-08 jrick done:
9243 24df9a28 2023-07-08 jrick free(label);
9244 24df9a28 2023-07-08 jrick free(id);
9245 24df9a28 2023-07-08 jrick free(commit_id);
9246 24df9a28 2023-07-08 jrick if (commit)
9247 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
9248 24df9a28 2023-07-08 jrick if (worktree)
9249 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
9250 24df9a28 2023-07-08 jrick if (repo) {
9251 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
9252 24df9a28 2023-07-08 jrick if (error == NULL)
9253 24df9a28 2023-07-08 jrick error = close_err;
9254 24df9a28 2023-07-08 jrick }
9255 24df9a28 2023-07-08 jrick if (pack_fds) {
9256 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
9257 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
9258 24df9a28 2023-07-08 jrick if (error == NULL)
9259 24df9a28 2023-07-08 jrick error = pack_err;
9260 24df9a28 2023-07-08 jrick }
9261 24df9a28 2023-07-08 jrick
9262 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
9263 24df9a28 2023-07-08 jrick return error;
9264 24df9a28 2023-07-08 jrick }
9265 24df9a28 2023-07-08 jrick
9266 24df9a28 2023-07-08 jrick __dead static void
9267 24df9a28 2023-07-08 jrick usage_info(void)
9268 24df9a28 2023-07-08 jrick {
9269 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s info [path ...]\n",
9270 24df9a28 2023-07-08 jrick getprogname());
9271 24df9a28 2023-07-08 jrick exit(1);
9272 24df9a28 2023-07-08 jrick }
9273 24df9a28 2023-07-08 jrick
9274 24df9a28 2023-07-08 jrick static const struct got_error *
9275 24df9a28 2023-07-08 jrick print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9276 24df9a28 2023-07-08 jrick struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9277 24df9a28 2023-07-08 jrick struct got_object_id *commit_id)
9278 24df9a28 2023-07-08 jrick {
9279 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
9280 24df9a28 2023-07-08 jrick char *id_str = NULL;
9281 24df9a28 2023-07-08 jrick char datebuf[128];
9282 24df9a28 2023-07-08 jrick struct tm mytm, *tm;
9283 24df9a28 2023-07-08 jrick struct got_pathlist_head *paths = arg;
9284 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
9285 24df9a28 2023-07-08 jrick
9286 24df9a28 2023-07-08 jrick /*
9287 24df9a28 2023-07-08 jrick * Clear error indication from any of the path arguments which
9288 24df9a28 2023-07-08 jrick * would cause this file index entry to be displayed.
9289 24df9a28 2023-07-08 jrick */
9290 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, paths, entry) {
9291 24df9a28 2023-07-08 jrick if (got_path_cmp(path, pe->path, strlen(path),
9292 24df9a28 2023-07-08 jrick pe->path_len) == 0 ||
9293 24df9a28 2023-07-08 jrick got_path_is_child(path, pe->path, pe->path_len))
9294 24df9a28 2023-07-08 jrick pe->data = NULL; /* no error */
9295 24df9a28 2023-07-08 jrick }
9296 24df9a28 2023-07-08 jrick
9297 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
9298 24df9a28 2023-07-08 jrick if (S_ISLNK(mode))
9299 24df9a28 2023-07-08 jrick printf("symlink: %s\n", path);
9300 24df9a28 2023-07-08 jrick else if (S_ISREG(mode)) {
9301 24df9a28 2023-07-08 jrick printf("file: %s\n", path);
9302 24df9a28 2023-07-08 jrick printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9303 24df9a28 2023-07-08 jrick } else if (S_ISDIR(mode))
9304 24df9a28 2023-07-08 jrick printf("directory: %s\n", path);
9305 24df9a28 2023-07-08 jrick else
9306 24df9a28 2023-07-08 jrick printf("something: %s\n", path);
9307 24df9a28 2023-07-08 jrick
9308 24df9a28 2023-07-08 jrick tm = localtime_r(&mtime, &mytm);
9309 24df9a28 2023-07-08 jrick if (tm == NULL)
9310 24df9a28 2023-07-08 jrick return NULL;
9311 24df9a28 2023-07-08 jrick if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
9312 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
9313 24df9a28 2023-07-08 jrick printf("timestamp: %s\n", datebuf);
9314 24df9a28 2023-07-08 jrick
9315 24df9a28 2023-07-08 jrick if (blob_id) {
9316 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, blob_id);
9317 24df9a28 2023-07-08 jrick if (err)
9318 24df9a28 2023-07-08 jrick return err;
9319 24df9a28 2023-07-08 jrick printf("based on blob: %s\n", id_str);
9320 24df9a28 2023-07-08 jrick free(id_str);
9321 24df9a28 2023-07-08 jrick }
9322 24df9a28 2023-07-08 jrick
9323 24df9a28 2023-07-08 jrick if (staged_blob_id) {
9324 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, staged_blob_id);
9325 24df9a28 2023-07-08 jrick if (err)
9326 24df9a28 2023-07-08 jrick return err;
9327 24df9a28 2023-07-08 jrick printf("based on staged blob: %s\n", id_str);
9328 24df9a28 2023-07-08 jrick free(id_str);
9329 24df9a28 2023-07-08 jrick }
9330 24df9a28 2023-07-08 jrick
9331 24df9a28 2023-07-08 jrick if (commit_id) {
9332 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, commit_id);
9333 24df9a28 2023-07-08 jrick if (err)
9334 24df9a28 2023-07-08 jrick return err;
9335 24df9a28 2023-07-08 jrick printf("based on commit: %s\n", id_str);
9336 24df9a28 2023-07-08 jrick free(id_str);
9337 24df9a28 2023-07-08 jrick }
9338 24df9a28 2023-07-08 jrick
9339 24df9a28 2023-07-08 jrick return NULL;
9340 24df9a28 2023-07-08 jrick }
9341 24df9a28 2023-07-08 jrick
9342 24df9a28 2023-07-08 jrick static const struct got_error *
9343 24df9a28 2023-07-08 jrick cmd_info(int argc, char *argv[])
9344 24df9a28 2023-07-08 jrick {
9345 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
9346 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
9347 24df9a28 2023-07-08 jrick char *cwd = NULL, *id_str = NULL;
9348 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
9349 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
9350 24df9a28 2023-07-08 jrick int ch, show_files = 0;
9351 24df9a28 2023-07-08 jrick
9352 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
9353 24df9a28 2023-07-08 jrick
9354 24df9a28 2023-07-08 jrick #ifndef PROFILE
9355 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9356 24df9a28 2023-07-08 jrick NULL) == -1)
9357 24df9a28 2023-07-08 jrick err(1, "pledge");
9358 24df9a28 2023-07-08 jrick #endif
9359 24df9a28 2023-07-08 jrick
9360 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "")) != -1) {
9361 24df9a28 2023-07-08 jrick switch (ch) {
9362 24df9a28 2023-07-08 jrick default:
9363 24df9a28 2023-07-08 jrick usage_info();
9364 24df9a28 2023-07-08 jrick /* NOTREACHED */
9365 24df9a28 2023-07-08 jrick }
9366 24df9a28 2023-07-08 jrick }
9367 24df9a28 2023-07-08 jrick
9368 24df9a28 2023-07-08 jrick argc -= optind;
9369 24df9a28 2023-07-08 jrick argv += optind;
9370 24df9a28 2023-07-08 jrick
9371 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
9372 24df9a28 2023-07-08 jrick if (cwd == NULL) {
9373 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
9374 24df9a28 2023-07-08 jrick goto done;
9375 24df9a28 2023-07-08 jrick }
9376 24df9a28 2023-07-08 jrick
9377 24df9a28 2023-07-08 jrick error = got_worktree_open(&worktree, cwd);
9378 24df9a28 2023-07-08 jrick if (error) {
9379 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
9380 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "info", cwd);
9381 24df9a28 2023-07-08 jrick goto done;
9382 24df9a28 2023-07-08 jrick }
9383 24df9a28 2023-07-08 jrick
9384 24df9a28 2023-07-08 jrick #ifndef PROFILE
9385 24df9a28 2023-07-08 jrick /* Remove "wpath cpath proc exec sendfd" promises. */
9386 24df9a28 2023-07-08 jrick if (pledge("stdio rpath flock unveil", NULL) == -1)
9387 24df9a28 2023-07-08 jrick err(1, "pledge");
9388 24df9a28 2023-07-08 jrick #endif
9389 24df9a28 2023-07-08 jrick error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9390 24df9a28 2023-07-08 jrick if (error)
9391 24df9a28 2023-07-08 jrick goto done;
9392 24df9a28 2023-07-08 jrick
9393 24df9a28 2023-07-08 jrick if (argc >= 1) {
9394 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv,
9395 24df9a28 2023-07-08 jrick worktree);
9396 24df9a28 2023-07-08 jrick if (error)
9397 24df9a28 2023-07-08 jrick goto done;
9398 24df9a28 2023-07-08 jrick show_files = 1;
9399 24df9a28 2023-07-08 jrick }
9400 24df9a28 2023-07-08 jrick
9401 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str,
9402 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree));
9403 24df9a28 2023-07-08 jrick if (error)
9404 24df9a28 2023-07-08 jrick goto done;
9405 24df9a28 2023-07-08 jrick
9406 24df9a28 2023-07-08 jrick error = got_worktree_get_uuid(&uuidstr, worktree);
9407 24df9a28 2023-07-08 jrick if (error)
9408 24df9a28 2023-07-08 jrick goto done;
9409 24df9a28 2023-07-08 jrick
9410 24df9a28 2023-07-08 jrick printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9411 24df9a28 2023-07-08 jrick printf("work tree base commit: %s\n", id_str);
9412 24df9a28 2023-07-08 jrick printf("work tree path prefix: %s\n",
9413 24df9a28 2023-07-08 jrick got_worktree_get_path_prefix(worktree));
9414 24df9a28 2023-07-08 jrick printf("work tree branch reference: %s\n",
9415 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree));
9416 24df9a28 2023-07-08 jrick printf("work tree UUID: %s\n", uuidstr);
9417 24df9a28 2023-07-08 jrick printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9418 24df9a28 2023-07-08 jrick
9419 24df9a28 2023-07-08 jrick if (show_files) {
9420 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
9421 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
9422 24df9a28 2023-07-08 jrick if (pe->path_len == 0)
9423 24df9a28 2023-07-08 jrick continue;
9424 24df9a28 2023-07-08 jrick /*
9425 24df9a28 2023-07-08 jrick * Assume this path will fail. This will be corrected
9426 24df9a28 2023-07-08 jrick * in print_path_info() in case the path does suceeed.
9427 24df9a28 2023-07-08 jrick */
9428 24df9a28 2023-07-08 jrick pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
9429 24df9a28 2023-07-08 jrick }
9430 24df9a28 2023-07-08 jrick error = got_worktree_path_info(worktree, &paths,
9431 24df9a28 2023-07-08 jrick print_path_info, &paths, check_cancelled, NULL);
9432 24df9a28 2023-07-08 jrick if (error)
9433 24df9a28 2023-07-08 jrick goto done;
9434 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
9435 24df9a28 2023-07-08 jrick if (pe->data != NULL) {
9436 24df9a28 2023-07-08 jrick const struct got_error *perr;
9437 24df9a28 2023-07-08 jrick
9438 24df9a28 2023-07-08 jrick perr = pe->data;
9439 24df9a28 2023-07-08 jrick error = got_error_fmt(perr->code, "%s",
9440 24df9a28 2023-07-08 jrick pe->path);
9441 24df9a28 2023-07-08 jrick break;
9442 24df9a28 2023-07-08 jrick }
9443 24df9a28 2023-07-08 jrick }
9444 24df9a28 2023-07-08 jrick }
9445 24df9a28 2023-07-08 jrick done:
9446 24df9a28 2023-07-08 jrick if (worktree)
9447 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
9448 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9449 24df9a28 2023-07-08 jrick free(cwd);
9450 24df9a28 2023-07-08 jrick free(id_str);
9451 24df9a28 2023-07-08 jrick free(uuidstr);
9452 24df9a28 2023-07-08 jrick return error;
9453 24df9a28 2023-07-08 jrick }