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>
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.
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.
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>
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>
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"
68 24df9a28 2023-07-08 jrick #ifndef nitems
69 24df9a28 2023-07-08 jrick #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
72 9c177e8d 2024-03-18 op #ifndef GOT_DEFAULT_EDITOR
73 9c177e8d 2024-03-18 op #define GOT_DEFAULT_EDITOR "/usr/bin/vi"
76 24df9a28 2023-07-08 jrick static volatile sig_atomic_t sigint_received;
77 24df9a28 2023-07-08 jrick static volatile sig_atomic_t sigpipe_received;
79 24df9a28 2023-07-08 jrick static void
80 24df9a28 2023-07-08 jrick catch_sigint(int signo)
82 24df9a28 2023-07-08 jrick sigint_received = 1;
85 24df9a28 2023-07-08 jrick static void
86 24df9a28 2023-07-08 jrick catch_sigpipe(int signo)
88 24df9a28 2023-07-08 jrick sigpipe_received = 1;
92 24df9a28 2023-07-08 jrick struct got_cmd {
93 24df9a28 2023-07-08 jrick const char *cmd_name;
94 24df9a28 2023-07-08 jrick const struct got_error *(*cmd_main)(int, char *[]);
95 24df9a28 2023-07-08 jrick void (*cmd_usage)(void);
96 24df9a28 2023-07-08 jrick const char *cmd_alias;
99 24df9a28 2023-07-08 jrick __dead static void usage(int, int);
100 24df9a28 2023-07-08 jrick __dead static void usage_import(void);
101 24df9a28 2023-07-08 jrick __dead static void usage_clone(void);
102 24df9a28 2023-07-08 jrick __dead static void usage_checkout(void);
103 24df9a28 2023-07-08 jrick __dead static void usage_update(void);
104 24df9a28 2023-07-08 jrick __dead static void usage_log(void);
105 24df9a28 2023-07-08 jrick __dead static void usage_diff(void);
106 24df9a28 2023-07-08 jrick __dead static void usage_blame(void);
107 24df9a28 2023-07-08 jrick __dead static void usage_tree(void);
108 24df9a28 2023-07-08 jrick __dead static void usage_status(void);
109 24df9a28 2023-07-08 jrick __dead static void usage_tag(void);
110 24df9a28 2023-07-08 jrick __dead static void usage_add(void);
111 24df9a28 2023-07-08 jrick __dead static void usage_remove(void);
112 24df9a28 2023-07-08 jrick __dead static void usage_patch(void);
113 24df9a28 2023-07-08 jrick __dead static void usage_revert(void);
114 24df9a28 2023-07-08 jrick __dead static void usage_commit(void);
115 24df9a28 2023-07-08 jrick __dead static void usage_cherrypick(void);
116 24df9a28 2023-07-08 jrick __dead static void usage_backout(void);
117 24df9a28 2023-07-08 jrick __dead static void usage_cat(void);
118 24df9a28 2023-07-08 jrick __dead static void usage_info(void);
120 24df9a28 2023-07-08 jrick static const struct got_error* cmd_import(int, char *[]);
121 24df9a28 2023-07-08 jrick static const struct got_error* cmd_clone(int, char *[]);
122 24df9a28 2023-07-08 jrick static const struct got_error* cmd_checkout(int, char *[]);
123 24df9a28 2023-07-08 jrick static const struct got_error* cmd_update(int, char *[]);
124 24df9a28 2023-07-08 jrick static const struct got_error* cmd_log(int, char *[]);
125 24df9a28 2023-07-08 jrick static const struct got_error* cmd_diff(int, char *[]);
126 24df9a28 2023-07-08 jrick static const struct got_error* cmd_blame(int, char *[]);
127 24df9a28 2023-07-08 jrick static const struct got_error* cmd_tree(int, char *[]);
128 24df9a28 2023-07-08 jrick static const struct got_error* cmd_status(int, char *[]);
129 24df9a28 2023-07-08 jrick static const struct got_error* cmd_tag(int, char *[]);
130 24df9a28 2023-07-08 jrick static const struct got_error* cmd_add(int, char *[]);
131 24df9a28 2023-07-08 jrick static const struct got_error* cmd_remove(int, char *[]);
132 24df9a28 2023-07-08 jrick static const struct got_error* cmd_patch(int, char *[]);
133 24df9a28 2023-07-08 jrick static const struct got_error* cmd_revert(int, char *[]);
134 24df9a28 2023-07-08 jrick static const struct got_error* cmd_commit(int, char *[]);
135 24df9a28 2023-07-08 jrick static const struct got_error* cmd_cherrypick(int, char *[]);
136 24df9a28 2023-07-08 jrick static const struct got_error* cmd_backout(int, char *[]);
137 24df9a28 2023-07-08 jrick static const struct got_error* cmd_cat(int, char *[]);
138 24df9a28 2023-07-08 jrick static const struct got_error* cmd_info(int, char *[]);
140 24df9a28 2023-07-08 jrick static const struct got_cmd got_commands[] = {
141 24df9a28 2023-07-08 jrick { "import", cmd_import, usage_import, "im" },
142 24df9a28 2023-07-08 jrick { "clone", cmd_clone, usage_clone, "cl" },
143 24df9a28 2023-07-08 jrick { "checkout", cmd_checkout, usage_checkout, "co" },
144 24df9a28 2023-07-08 jrick { "update", cmd_update, usage_update, "up" },
145 24df9a28 2023-07-08 jrick { "log", cmd_log, usage_log, "" },
146 24df9a28 2023-07-08 jrick { "diff", cmd_diff, usage_diff, "di" },
147 24df9a28 2023-07-08 jrick { "blame", cmd_blame, usage_blame, "bl" },
148 24df9a28 2023-07-08 jrick { "tree", cmd_tree, usage_tree, "tr" },
149 24df9a28 2023-07-08 jrick { "status", cmd_status, usage_status, "st" },
150 24df9a28 2023-07-08 jrick { "tag", cmd_tag, usage_tag, "" },
151 24df9a28 2023-07-08 jrick { "add", cmd_add, usage_add, "" },
152 24df9a28 2023-07-08 jrick { "remove", cmd_remove, usage_remove, "rm" },
153 24df9a28 2023-07-08 jrick { "patch", cmd_patch, usage_patch, "pa" },
154 24df9a28 2023-07-08 jrick { "revert", cmd_revert, usage_revert, "rv" },
155 24df9a28 2023-07-08 jrick { "commit", cmd_commit, usage_commit, "ci" },
156 24df9a28 2023-07-08 jrick { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
157 24df9a28 2023-07-08 jrick { "backout", cmd_backout, usage_backout, "bo" },
158 24df9a28 2023-07-08 jrick { "cat", cmd_cat, usage_cat, "" },
159 24df9a28 2023-07-08 jrick { "info", cmd_info, usage_info, "" },
162 24df9a28 2023-07-08 jrick static void
163 24df9a28 2023-07-08 jrick list_commands(FILE *fp)
167 24df9a28 2023-07-08 jrick fprintf(fp, "commands:");
168 24df9a28 2023-07-08 jrick for (i = 0; i < nitems(got_commands); i++) {
169 24df9a28 2023-07-08 jrick const struct got_cmd *cmd = &got_commands[i];
170 24df9a28 2023-07-08 jrick fprintf(fp, " %s", cmd->cmd_name);
172 24df9a28 2023-07-08 jrick fputc('\n', fp);
175 24df9a28 2023-07-08 jrick __dead static void
176 24df9a28 2023-07-08 jrick option_conflict(char a, char b)
178 24df9a28 2023-07-08 jrick errx(1, "-%c and -%c options are mutually exclusive", a, b);
182 24df9a28 2023-07-08 jrick main(int argc, char *argv[])
184 24df9a28 2023-07-08 jrick const struct got_cmd *cmd;
187 24df9a28 2023-07-08 jrick int hflag = 0, Vflag = 0;
188 24df9a28 2023-07-08 jrick static const struct option longopts[] = {
189 24df9a28 2023-07-08 jrick { "version", no_argument, NULL, 'V' },
190 24df9a28 2023-07-08 jrick { NULL, 0, NULL, 0 }
193 24df9a28 2023-07-08 jrick setlocale(LC_CTYPE, "");
195 24df9a28 2023-07-08 jrick while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
196 24df9a28 2023-07-08 jrick switch (ch) {
198 24df9a28 2023-07-08 jrick hflag = 1;
201 24df9a28 2023-07-08 jrick Vflag = 1;
204 24df9a28 2023-07-08 jrick usage(hflag, 1);
205 24df9a28 2023-07-08 jrick /* NOTREACHED */
209 24df9a28 2023-07-08 jrick argc -= optind;
210 24df9a28 2023-07-08 jrick argv += optind;
211 24df9a28 2023-07-08 jrick optind = 1;
212 24df9a28 2023-07-08 jrick optreset = 1;
214 24df9a28 2023-07-08 jrick if (Vflag) {
215 24df9a28 2023-07-08 jrick got_version_print_str();
219 24df9a28 2023-07-08 jrick if (argc <= 0)
220 24df9a28 2023-07-08 jrick usage(hflag, hflag ? 0 : 1);
222 24df9a28 2023-07-08 jrick signal(SIGINT, catch_sigint);
223 24df9a28 2023-07-08 jrick signal(SIGPIPE, catch_sigpipe);
225 24df9a28 2023-07-08 jrick for (i = 0; i < nitems(got_commands); i++) {
226 24df9a28 2023-07-08 jrick const struct got_error *error;
228 24df9a28 2023-07-08 jrick cmd = &got_commands[i];
230 24df9a28 2023-07-08 jrick if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
231 24df9a28 2023-07-08 jrick strcmp(cmd->cmd_alias, argv[0]) != 0)
234 24df9a28 2023-07-08 jrick if (hflag)
235 24df9a28 2023-07-08 jrick cmd->cmd_usage();
237 24df9a28 2023-07-08 jrick error = cmd->cmd_main(argc, argv);
238 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_CANCELLED &&
239 24df9a28 2023-07-08 jrick error->code != GOT_ERR_PRIVSEP_EXIT &&
240 24df9a28 2023-07-08 jrick !(sigpipe_received &&
241 24df9a28 2023-07-08 jrick error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
242 24df9a28 2023-07-08 jrick !(sigint_received &&
243 24df9a28 2023-07-08 jrick error->code == GOT_ERR_ERRNO && errno == EINTR)) {
244 24df9a28 2023-07-08 jrick fflush(stdout);
245 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
252 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
253 24df9a28 2023-07-08 jrick list_commands(stderr);
257 24df9a28 2023-07-08 jrick __dead static void
258 24df9a28 2023-07-08 jrick usage(int hflag, int status)
260 24df9a28 2023-07-08 jrick FILE *fp = (status == 0) ? stdout : stderr;
262 24df9a28 2023-07-08 jrick fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
263 24df9a28 2023-07-08 jrick getprogname());
264 24df9a28 2023-07-08 jrick if (hflag)
265 24df9a28 2023-07-08 jrick list_commands(fp);
266 24df9a28 2023-07-08 jrick exit(status);
269 24df9a28 2023-07-08 jrick static const struct got_error *
270 24df9a28 2023-07-08 jrick get_editor(char **abspath)
272 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
273 24df9a28 2023-07-08 jrick const char *editor;
275 24df9a28 2023-07-08 jrick *abspath = NULL;
277 24df9a28 2023-07-08 jrick editor = getenv("VISUAL");
278 24df9a28 2023-07-08 jrick if (editor == NULL)
279 24df9a28 2023-07-08 jrick editor = getenv("EDITOR");
281 24df9a28 2023-07-08 jrick if (editor) {
282 24df9a28 2023-07-08 jrick err = got_path_find_prog(abspath, editor);
284 24df9a28 2023-07-08 jrick return err;
287 24df9a28 2023-07-08 jrick if (*abspath == NULL) {
288 9c177e8d 2024-03-18 op *abspath = strdup(GOT_DEFAULT_EDITOR);
289 24df9a28 2023-07-08 jrick if (*abspath == NULL)
290 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
293 24df9a28 2023-07-08 jrick return NULL;
296 24df9a28 2023-07-08 jrick static const struct got_error *
297 24df9a28 2023-07-08 jrick apply_unveil(const char *repo_path, int repo_read_only,
298 24df9a28 2023-07-08 jrick const char *worktree_path)
300 24df9a28 2023-07-08 jrick const struct got_error *err;
302 24df9a28 2023-07-08 jrick #ifdef PROFILE
303 24df9a28 2023-07-08 jrick if (unveil("gmon.out", "rwc") != 0)
304 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", "gmon.out");
306 24df9a28 2023-07-08 jrick if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
307 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", repo_path);
309 24df9a28 2023-07-08 jrick if (worktree_path && unveil(worktree_path, "rwc") != 0)
310 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", worktree_path);
312 24df9a28 2023-07-08 jrick if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
313 24df9a28 2023-07-08 jrick return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
315 24df9a28 2023-07-08 jrick err = got_privsep_unveil_exec_helpers();
316 24df9a28 2023-07-08 jrick if (err != NULL)
317 24df9a28 2023-07-08 jrick return err;
319 24df9a28 2023-07-08 jrick if (unveil(NULL, NULL) != 0)
320 24df9a28 2023-07-08 jrick return got_error_from_errno("unveil");
322 24df9a28 2023-07-08 jrick return NULL;
325 24df9a28 2023-07-08 jrick __dead static void
326 24df9a28 2023-07-08 jrick usage_import(void)
328 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
329 24df9a28 2023-07-08 jrick "[-r repository-path] directory\n", getprogname());
333 24df9a28 2023-07-08 jrick static int
334 24df9a28 2023-07-08 jrick spawn_editor(const char *editor, const char *file)
336 24df9a28 2023-07-08 jrick pid_t pid;
337 24df9a28 2023-07-08 jrick sig_t sighup, sigint, sigquit;
338 24df9a28 2023-07-08 jrick int st = -1;
340 24df9a28 2023-07-08 jrick sighup = signal(SIGHUP, SIG_IGN);
341 24df9a28 2023-07-08 jrick sigint = signal(SIGINT, SIG_IGN);
342 24df9a28 2023-07-08 jrick sigquit = signal(SIGQUIT, SIG_IGN);
344 24df9a28 2023-07-08 jrick switch (pid = fork()) {
346 24df9a28 2023-07-08 jrick goto doneediting;
348 24df9a28 2023-07-08 jrick execl(editor, editor, file, (char *)NULL);
349 24df9a28 2023-07-08 jrick _exit(127);
352 24df9a28 2023-07-08 jrick while (waitpid(pid, &st, 0) == -1)
353 24df9a28 2023-07-08 jrick if (errno != EINTR)
356 24df9a28 2023-07-08 jrick doneediting:
357 24df9a28 2023-07-08 jrick (void)signal(SIGHUP, sighup);
358 24df9a28 2023-07-08 jrick (void)signal(SIGINT, sigint);
359 24df9a28 2023-07-08 jrick (void)signal(SIGQUIT, sigquit);
361 24df9a28 2023-07-08 jrick if (!WIFEXITED(st)) {
362 24df9a28 2023-07-08 jrick errno = EINTR;
363 24df9a28 2023-07-08 jrick return -1;
366 24df9a28 2023-07-08 jrick return WEXITSTATUS(st);
369 24df9a28 2023-07-08 jrick static const struct got_error *
370 24df9a28 2023-07-08 jrick read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
372 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
373 24df9a28 2023-07-08 jrick char *line = NULL;
374 24df9a28 2023-07-08 jrick size_t linesize = 0;
376 24df9a28 2023-07-08 jrick *logmsg = NULL;
379 24df9a28 2023-07-08 jrick if (fseeko(fp, 0L, SEEK_SET) == -1)
380 24df9a28 2023-07-08 jrick return got_error_from_errno("fseeko");
382 24df9a28 2023-07-08 jrick *logmsg = malloc(filesize + 1);
383 24df9a28 2023-07-08 jrick if (*logmsg == NULL)
384 24df9a28 2023-07-08 jrick return got_error_from_errno("malloc");
385 24df9a28 2023-07-08 jrick (*logmsg)[0] = '\0';
387 24df9a28 2023-07-08 jrick while (getline(&line, &linesize, fp) != -1) {
388 24df9a28 2023-07-08 jrick if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
389 24df9a28 2023-07-08 jrick continue; /* remove comments and leading empty lines */
390 24df9a28 2023-07-08 jrick *len = strlcat(*logmsg, line, filesize + 1);
391 24df9a28 2023-07-08 jrick if (*len >= filesize + 1) {
392 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
393 24df9a28 2023-07-08 jrick goto done;
396 24df9a28 2023-07-08 jrick if (ferror(fp)) {
397 24df9a28 2023-07-08 jrick err = got_ferror(fp, GOT_ERR_IO);
398 24df9a28 2023-07-08 jrick goto done;
401 24df9a28 2023-07-08 jrick while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
402 24df9a28 2023-07-08 jrick (*logmsg)[*len - 1] = '\0';
406 24df9a28 2023-07-08 jrick free(line);
407 24df9a28 2023-07-08 jrick if (err) {
408 24df9a28 2023-07-08 jrick free(*logmsg);
409 24df9a28 2023-07-08 jrick *logmsg = NULL;
412 24df9a28 2023-07-08 jrick return err;
415 24df9a28 2023-07-08 jrick static const struct got_error *
416 24df9a28 2023-07-08 jrick edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
417 24df9a28 2023-07-08 jrick const char *initial_content, size_t initial_content_len,
418 24df9a28 2023-07-08 jrick int require_modification)
420 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
421 24df9a28 2023-07-08 jrick struct stat st, st2;
422 24df9a28 2023-07-08 jrick FILE *fp = NULL;
423 24df9a28 2023-07-08 jrick size_t logmsg_len;
425 24df9a28 2023-07-08 jrick *logmsg = NULL;
427 24df9a28 2023-07-08 jrick if (stat(logmsg_path, &st) == -1)
428 24df9a28 2023-07-08 jrick return got_error_from_errno2("stat", logmsg_path);
430 24df9a28 2023-07-08 jrick if (spawn_editor(editor, logmsg_path) == -1)
431 24df9a28 2023-07-08 jrick return got_error_from_errno("failed spawning editor");
433 24df9a28 2023-07-08 jrick if (require_modification) {
434 24df9a28 2023-07-08 jrick struct timespec timeout;
436 24df9a28 2023-07-08 jrick timeout.tv_sec = 0;
437 24df9a28 2023-07-08 jrick timeout.tv_nsec = 1;
438 24df9a28 2023-07-08 jrick nanosleep(&timeout, NULL);
441 24df9a28 2023-07-08 jrick if (stat(logmsg_path, &st2) == -1)
442 5a6c61ae 2023-07-15 naddy return got_error_from_errno2("stat", logmsg_path);
444 24df9a28 2023-07-08 jrick if (require_modification && st.st_size == st2.st_size &&
445 24df9a28 2023-07-08 jrick timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
446 24df9a28 2023-07-08 jrick return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
447 24df9a28 2023-07-08 jrick "no changes made to commit message, aborting");
449 24df9a28 2023-07-08 jrick fp = fopen(logmsg_path, "re");
450 24df9a28 2023-07-08 jrick if (fp == NULL) {
451 24df9a28 2023-07-08 jrick err = got_error_from_errno("fopen");
452 24df9a28 2023-07-08 jrick goto done;
455 24df9a28 2023-07-08 jrick /* strip comments and leading/trailing newlines */
456 24df9a28 2023-07-08 jrick err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
458 24df9a28 2023-07-08 jrick goto done;
459 24df9a28 2023-07-08 jrick if (logmsg_len == 0) {
460 24df9a28 2023-07-08 jrick err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
461 24df9a28 2023-07-08 jrick "commit message cannot be empty, aborting");
462 24df9a28 2023-07-08 jrick goto done;
465 24df9a28 2023-07-08 jrick if (fp && fclose(fp) == EOF && err == NULL)
466 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
467 24df9a28 2023-07-08 jrick if (err) {
468 24df9a28 2023-07-08 jrick free(*logmsg);
469 24df9a28 2023-07-08 jrick *logmsg = NULL;
471 24df9a28 2023-07-08 jrick return err;
474 24df9a28 2023-07-08 jrick static const struct got_error *
475 24df9a28 2023-07-08 jrick collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
476 24df9a28 2023-07-08 jrick const char *path_dir, const char *branch_name)
478 24df9a28 2023-07-08 jrick char *initial_content = NULL;
479 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
480 24df9a28 2023-07-08 jrick int initial_content_len;
481 24df9a28 2023-07-08 jrick int fd = -1;
483 24df9a28 2023-07-08 jrick initial_content_len = asprintf(&initial_content,
484 24df9a28 2023-07-08 jrick "\n# %s to be imported to branch %s\n", path_dir,
485 24df9a28 2023-07-08 jrick branch_name);
486 24df9a28 2023-07-08 jrick if (initial_content_len == -1)
487 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
489 24df9a28 2023-07-08 jrick err = got_opentemp_named_fd(logmsg_path, &fd,
490 24df9a28 2023-07-08 jrick GOT_TMPDIR_STR "/got-importmsg", "");
492 24df9a28 2023-07-08 jrick goto done;
494 24df9a28 2023-07-08 jrick if (write(fd, initial_content, initial_content_len) == -1) {
495 24df9a28 2023-07-08 jrick err = got_error_from_errno2("write", *logmsg_path);
496 24df9a28 2023-07-08 jrick goto done;
498 24df9a28 2023-07-08 jrick if (close(fd) == -1) {
499 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *logmsg_path);
500 24df9a28 2023-07-08 jrick goto done;
504 24df9a28 2023-07-08 jrick err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
505 24df9a28 2023-07-08 jrick initial_content_len, 1);
507 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
508 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *logmsg_path);
509 24df9a28 2023-07-08 jrick free(initial_content);
510 24df9a28 2023-07-08 jrick if (err) {
511 24df9a28 2023-07-08 jrick free(*logmsg_path);
512 24df9a28 2023-07-08 jrick *logmsg_path = NULL;
514 24df9a28 2023-07-08 jrick return err;
517 24df9a28 2023-07-08 jrick static const struct got_error *
518 24df9a28 2023-07-08 jrick import_progress(void *arg, const char *path)
520 24df9a28 2023-07-08 jrick printf("A %s\n", path);
521 24df9a28 2023-07-08 jrick return NULL;
524 24df9a28 2023-07-08 jrick static const struct got_error *
525 24df9a28 2023-07-08 jrick valid_author(const char *author)
527 24df9a28 2023-07-08 jrick const char *email = author;
530 24df9a28 2023-07-08 jrick * Git' expects the author (or committer) to be in the form
531 24df9a28 2023-07-08 jrick * "name <email>", which are mostly free form (see the
532 24df9a28 2023-07-08 jrick * "committer" description in git-fast-import(1)). We're only
533 24df9a28 2023-07-08 jrick * doing this to avoid git's object parser breaking on commits
534 24df9a28 2023-07-08 jrick * we create.
537 24df9a28 2023-07-08 jrick while (*author && *author != '\n' && *author != '<' && *author != '>')
539 24df9a28 2023-07-08 jrick if (author != email && *author == '<' && *(author - 1) != ' ')
540 24df9a28 2023-07-08 jrick return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
541 24df9a28 2023-07-08 jrick "between author name and email required", email);
542 24df9a28 2023-07-08 jrick if (*author++ != '<')
543 24df9a28 2023-07-08 jrick return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
544 24df9a28 2023-07-08 jrick while (*author && *author != '\n' && *author != '<' && *author != '>')
546 24df9a28 2023-07-08 jrick if (strcmp(author, ">") != 0)
547 24df9a28 2023-07-08 jrick return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
548 24df9a28 2023-07-08 jrick return NULL;
551 24df9a28 2023-07-08 jrick static const struct got_error *
552 24df9a28 2023-07-08 jrick get_author(char **author, struct got_repository *repo,
553 24df9a28 2023-07-08 jrick struct got_worktree *worktree)
555 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
556 24df9a28 2023-07-08 jrick const char *got_author = NULL, *name, *email;
557 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
559 24df9a28 2023-07-08 jrick *author = NULL;
561 24df9a28 2023-07-08 jrick if (worktree)
562 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
563 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
566 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
567 24df9a28 2023-07-08 jrick * significant to least significant:
568 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
569 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
570 24df9a28 2023-07-08 jrick * 3) repository's git config file
571 24df9a28 2023-07-08 jrick * 4) environment variables
572 24df9a28 2023-07-08 jrick * 5) global git config files (in user's home directory or /etc)
575 24df9a28 2023-07-08 jrick if (worktree_conf)
576 24df9a28 2023-07-08 jrick got_author = got_gotconfig_get_author(worktree_conf);
577 24df9a28 2023-07-08 jrick if (got_author == NULL)
578 24df9a28 2023-07-08 jrick got_author = got_gotconfig_get_author(repo_conf);
579 24df9a28 2023-07-08 jrick if (got_author == NULL) {
580 24df9a28 2023-07-08 jrick name = got_repo_get_gitconfig_author_name(repo);
581 24df9a28 2023-07-08 jrick email = got_repo_get_gitconfig_author_email(repo);
582 24df9a28 2023-07-08 jrick if (name && email) {
583 24df9a28 2023-07-08 jrick if (asprintf(author, "%s <%s>", name, email) == -1)
584 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
585 24df9a28 2023-07-08 jrick return NULL;
588 24df9a28 2023-07-08 jrick got_author = getenv("GOT_AUTHOR");
589 24df9a28 2023-07-08 jrick if (got_author == NULL) {
590 24df9a28 2023-07-08 jrick name = got_repo_get_global_gitconfig_author_name(repo);
591 24df9a28 2023-07-08 jrick email = got_repo_get_global_gitconfig_author_email(
593 24df9a28 2023-07-08 jrick if (name && email) {
594 24df9a28 2023-07-08 jrick if (asprintf(author, "%s <%s>", name, email)
596 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
597 24df9a28 2023-07-08 jrick return NULL;
599 24df9a28 2023-07-08 jrick /* TODO: Look up user in password database? */
600 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
604 24df9a28 2023-07-08 jrick *author = strdup(got_author);
605 24df9a28 2023-07-08 jrick if (*author == NULL)
606 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
608 24df9a28 2023-07-08 jrick err = valid_author(*author);
609 24df9a28 2023-07-08 jrick if (err) {
610 24df9a28 2023-07-08 jrick free(*author);
611 24df9a28 2023-07-08 jrick *author = NULL;
613 24df9a28 2023-07-08 jrick return err;
616 24df9a28 2023-07-08 jrick static const struct got_error *
617 24df9a28 2023-07-08 jrick get_allowed_signers(char **allowed_signers, struct got_repository *repo,
618 24df9a28 2023-07-08 jrick struct got_worktree *worktree)
620 24df9a28 2023-07-08 jrick const char *got_allowed_signers = NULL;
621 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
623 24df9a28 2023-07-08 jrick *allowed_signers = NULL;
625 24df9a28 2023-07-08 jrick if (worktree)
626 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
627 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
630 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
631 24df9a28 2023-07-08 jrick * significant to least significant:
632 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
633 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
636 24df9a28 2023-07-08 jrick if (worktree_conf)
637 24df9a28 2023-07-08 jrick got_allowed_signers = got_gotconfig_get_allowed_signers_file(
638 24df9a28 2023-07-08 jrick worktree_conf);
639 24df9a28 2023-07-08 jrick if (got_allowed_signers == NULL)
640 24df9a28 2023-07-08 jrick got_allowed_signers = got_gotconfig_get_allowed_signers_file(
641 24df9a28 2023-07-08 jrick repo_conf);
643 24df9a28 2023-07-08 jrick if (got_allowed_signers) {
644 24df9a28 2023-07-08 jrick *allowed_signers = strdup(got_allowed_signers);
645 24df9a28 2023-07-08 jrick if (*allowed_signers == NULL)
646 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
648 24df9a28 2023-07-08 jrick return NULL;
651 24df9a28 2023-07-08 jrick static const struct got_error *
652 24df9a28 2023-07-08 jrick get_revoked_signers(char **revoked_signers, struct got_repository *repo,
653 24df9a28 2023-07-08 jrick struct got_worktree *worktree)
655 24df9a28 2023-07-08 jrick const char *got_revoked_signers = NULL;
656 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
658 24df9a28 2023-07-08 jrick *revoked_signers = NULL;
660 24df9a28 2023-07-08 jrick if (worktree)
661 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
662 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
665 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
666 24df9a28 2023-07-08 jrick * significant to least significant:
667 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
668 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
671 24df9a28 2023-07-08 jrick if (worktree_conf)
672 24df9a28 2023-07-08 jrick got_revoked_signers = got_gotconfig_get_revoked_signers_file(
673 24df9a28 2023-07-08 jrick worktree_conf);
674 24df9a28 2023-07-08 jrick if (got_revoked_signers == NULL)
675 24df9a28 2023-07-08 jrick got_revoked_signers = got_gotconfig_get_revoked_signers_file(
676 24df9a28 2023-07-08 jrick repo_conf);
678 24df9a28 2023-07-08 jrick if (got_revoked_signers) {
679 24df9a28 2023-07-08 jrick *revoked_signers = strdup(got_revoked_signers);
680 24df9a28 2023-07-08 jrick if (*revoked_signers == NULL)
681 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
683 24df9a28 2023-07-08 jrick return NULL;
686 24df9a28 2023-07-08 jrick static const char *
687 24df9a28 2023-07-08 jrick get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
689 24df9a28 2023-07-08 jrick const char *got_signer_id = NULL;
690 24df9a28 2023-07-08 jrick const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
692 24df9a28 2023-07-08 jrick if (worktree)
693 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
694 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
697 24df9a28 2023-07-08 jrick * Priority of potential author information sources, from most
698 24df9a28 2023-07-08 jrick * significant to least significant:
699 24df9a28 2023-07-08 jrick * 1) work tree's .got/got.conf file
700 24df9a28 2023-07-08 jrick * 2) repository's got.conf file
703 24df9a28 2023-07-08 jrick if (worktree_conf)
704 24df9a28 2023-07-08 jrick got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
705 24df9a28 2023-07-08 jrick if (got_signer_id == NULL)
706 24df9a28 2023-07-08 jrick got_signer_id = got_gotconfig_get_signer_id(repo_conf);
708 24df9a28 2023-07-08 jrick return got_signer_id;
711 24df9a28 2023-07-08 jrick static const struct got_error *
712 24df9a28 2023-07-08 jrick get_gitconfig_path(char **gitconfig_path)
714 24df9a28 2023-07-08 jrick const char *homedir = getenv("HOME");
716 24df9a28 2023-07-08 jrick *gitconfig_path = NULL;
717 24df9a28 2023-07-08 jrick if (homedir) {
718 24df9a28 2023-07-08 jrick if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
719 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
722 24df9a28 2023-07-08 jrick return NULL;
725 24df9a28 2023-07-08 jrick static const struct got_error *
726 24df9a28 2023-07-08 jrick cmd_import(int argc, char *argv[])
728 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
729 24df9a28 2023-07-08 jrick char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
730 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
731 24df9a28 2023-07-08 jrick const char *branch_name = NULL;
732 24df9a28 2023-07-08 jrick char *id_str = NULL, *logmsg_path = NULL;
733 24df9a28 2023-07-08 jrick char refname[PATH_MAX] = "refs/heads/";
734 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
735 24df9a28 2023-07-08 jrick struct got_reference *branch_ref = NULL, *head_ref = NULL;
736 24df9a28 2023-07-08 jrick struct got_object_id *new_commit_id = NULL;
737 24df9a28 2023-07-08 jrick int ch, n = 0;
738 24df9a28 2023-07-08 jrick struct got_pathlist_head ignores;
739 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
740 24df9a28 2023-07-08 jrick int preserve_logmsg = 0;
741 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
743 24df9a28 2023-07-08 jrick TAILQ_INIT(&ignores);
745 24df9a28 2023-07-08 jrick #ifndef PROFILE
746 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
748 24df9a28 2023-07-08 jrick NULL) == -1)
749 24df9a28 2023-07-08 jrick err(1, "pledge");
752 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
753 24df9a28 2023-07-08 jrick switch (ch) {
755 24df9a28 2023-07-08 jrick branch_name = optarg;
758 24df9a28 2023-07-08 jrick if (optarg[0] == '\0')
760 24df9a28 2023-07-08 jrick error = got_pathlist_insert(&pe, &ignores, optarg,
762 24df9a28 2023-07-08 jrick if (error)
763 24df9a28 2023-07-08 jrick goto done;
766 24df9a28 2023-07-08 jrick logmsg = strdup(optarg);
767 24df9a28 2023-07-08 jrick if (logmsg == NULL) {
768 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
769 24df9a28 2023-07-08 jrick goto done;
773 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
774 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
775 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath",
777 24df9a28 2023-07-08 jrick goto done;
781 24df9a28 2023-07-08 jrick usage_import();
782 24df9a28 2023-07-08 jrick /* NOTREACHED */
786 24df9a28 2023-07-08 jrick argc -= optind;
787 24df9a28 2023-07-08 jrick argv += optind;
789 24df9a28 2023-07-08 jrick if (argc != 1)
790 24df9a28 2023-07-08 jrick usage_import();
792 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
793 24df9a28 2023-07-08 jrick repo_path = getcwd(NULL, 0);
794 24df9a28 2023-07-08 jrick if (repo_path == NULL)
795 24df9a28 2023-07-08 jrick return got_error_from_errno("getcwd");
797 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
798 24df9a28 2023-07-08 jrick error = get_gitconfig_path(&gitconfig_path);
799 24df9a28 2023-07-08 jrick if (error)
800 24df9a28 2023-07-08 jrick goto done;
801 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
802 24df9a28 2023-07-08 jrick if (error != NULL)
803 24df9a28 2023-07-08 jrick goto done;
804 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
805 24df9a28 2023-07-08 jrick if (error)
806 24df9a28 2023-07-08 jrick goto done;
808 24df9a28 2023-07-08 jrick error = get_author(&author, repo, NULL);
809 24df9a28 2023-07-08 jrick if (error)
810 24df9a28 2023-07-08 jrick return error;
813 24df9a28 2023-07-08 jrick * Don't let the user create a branch name with a leading '-'.
814 24df9a28 2023-07-08 jrick * While technically a valid reference name, this case is usually
815 24df9a28 2023-07-08 jrick * an unintended typo.
817 24df9a28 2023-07-08 jrick if (branch_name && branch_name[0] == '-')
818 24df9a28 2023-07-08 jrick return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
820 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
821 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_REF)
822 24df9a28 2023-07-08 jrick goto done;
824 24df9a28 2023-07-08 jrick if (branch_name)
825 24df9a28 2023-07-08 jrick n = strlcat(refname, branch_name, sizeof(refname));
826 24df9a28 2023-07-08 jrick else if (head_ref && got_ref_is_symbolic(head_ref))
827 24df9a28 2023-07-08 jrick n = strlcpy(refname, got_ref_get_symref_target(head_ref),
828 24df9a28 2023-07-08 jrick sizeof(refname));
830 24df9a28 2023-07-08 jrick n = strlcat(refname, "main", sizeof(refname));
831 24df9a28 2023-07-08 jrick if (n >= sizeof(refname)) {
832 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_NO_SPACE);
833 24df9a28 2023-07-08 jrick goto done;
836 24df9a28 2023-07-08 jrick error = got_ref_open(&branch_ref, repo, refname, 0);
837 24df9a28 2023-07-08 jrick if (error) {
838 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF)
839 24df9a28 2023-07-08 jrick goto done;
841 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
842 24df9a28 2023-07-08 jrick "import target branch already exists");
843 24df9a28 2023-07-08 jrick goto done;
846 24df9a28 2023-07-08 jrick path_dir = realpath(argv[0], NULL);
847 24df9a28 2023-07-08 jrick if (path_dir == NULL) {
848 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath", argv[0]);
849 24df9a28 2023-07-08 jrick goto done;
851 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(path_dir);
854 24df9a28 2023-07-08 jrick * unveil(2) traverses exec(2); if an editor is used we have
855 24df9a28 2023-07-08 jrick * to apply unveil after the log message has been written.
857 24df9a28 2023-07-08 jrick if (logmsg == NULL || *logmsg == '\0') {
858 24df9a28 2023-07-08 jrick error = get_editor(&editor);
859 24df9a28 2023-07-08 jrick if (error)
860 24df9a28 2023-07-08 jrick goto done;
861 24df9a28 2023-07-08 jrick free(logmsg);
862 24df9a28 2023-07-08 jrick error = collect_import_msg(&logmsg, &logmsg_path, editor,
863 24df9a28 2023-07-08 jrick path_dir, refname);
864 24df9a28 2023-07-08 jrick if (error) {
865 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
866 24df9a28 2023-07-08 jrick logmsg_path != NULL)
867 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
868 24df9a28 2023-07-08 jrick goto done;
872 24df9a28 2023-07-08 jrick if (unveil(path_dir, "r") != 0) {
873 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unveil", path_dir);
874 24df9a28 2023-07-08 jrick if (logmsg_path)
875 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
876 24df9a28 2023-07-08 jrick goto done;
879 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0, NULL);
880 24df9a28 2023-07-08 jrick if (error) {
881 24df9a28 2023-07-08 jrick if (logmsg_path)
882 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
883 24df9a28 2023-07-08 jrick goto done;
886 24df9a28 2023-07-08 jrick error = got_repo_import(&new_commit_id, path_dir, logmsg,
887 24df9a28 2023-07-08 jrick author, &ignores, repo, import_progress, NULL);
888 24df9a28 2023-07-08 jrick if (error) {
889 24df9a28 2023-07-08 jrick if (logmsg_path)
890 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
891 24df9a28 2023-07-08 jrick goto done;
894 24df9a28 2023-07-08 jrick error = got_ref_alloc(&branch_ref, refname, new_commit_id);
895 24df9a28 2023-07-08 jrick if (error) {
896 24df9a28 2023-07-08 jrick if (logmsg_path)
897 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
898 24df9a28 2023-07-08 jrick goto done;
901 24df9a28 2023-07-08 jrick error = got_ref_write(branch_ref, repo);
902 24df9a28 2023-07-08 jrick if (error) {
903 24df9a28 2023-07-08 jrick if (logmsg_path)
904 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
905 24df9a28 2023-07-08 jrick goto done;
908 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, new_commit_id);
909 24df9a28 2023-07-08 jrick if (error) {
910 24df9a28 2023-07-08 jrick if (logmsg_path)
911 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
912 24df9a28 2023-07-08 jrick goto done;
915 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
916 24df9a28 2023-07-08 jrick if (error) {
917 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF) {
918 24df9a28 2023-07-08 jrick if (logmsg_path)
919 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
920 24df9a28 2023-07-08 jrick goto done;
923 24df9a28 2023-07-08 jrick error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
924 24df9a28 2023-07-08 jrick branch_ref);
925 24df9a28 2023-07-08 jrick if (error) {
926 24df9a28 2023-07-08 jrick if (logmsg_path)
927 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
928 24df9a28 2023-07-08 jrick goto done;
931 24df9a28 2023-07-08 jrick error = got_ref_write(head_ref, repo);
932 24df9a28 2023-07-08 jrick if (error) {
933 24df9a28 2023-07-08 jrick if (logmsg_path)
934 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
935 24df9a28 2023-07-08 jrick goto done;
939 24df9a28 2023-07-08 jrick printf("Created branch %s with commit %s\n",
940 24df9a28 2023-07-08 jrick got_ref_get_name(branch_ref), id_str);
942 24df9a28 2023-07-08 jrick if (pack_fds) {
943 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
944 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
945 24df9a28 2023-07-08 jrick if (error == NULL)
946 24df9a28 2023-07-08 jrick error = pack_err;
948 24df9a28 2023-07-08 jrick if (repo) {
949 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
950 24df9a28 2023-07-08 jrick if (error == NULL)
951 24df9a28 2023-07-08 jrick error = close_err;
953 24df9a28 2023-07-08 jrick if (preserve_logmsg) {
954 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: log message preserved in %s\n",
955 24df9a28 2023-07-08 jrick getprogname(), logmsg_path);
956 24df9a28 2023-07-08 jrick } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
957 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unlink", logmsg_path);
958 24df9a28 2023-07-08 jrick free(logmsg);
959 24df9a28 2023-07-08 jrick free(logmsg_path);
960 24df9a28 2023-07-08 jrick free(repo_path);
961 24df9a28 2023-07-08 jrick free(editor);
962 24df9a28 2023-07-08 jrick free(new_commit_id);
963 24df9a28 2023-07-08 jrick free(id_str);
964 24df9a28 2023-07-08 jrick free(author);
965 24df9a28 2023-07-08 jrick free(gitconfig_path);
966 24df9a28 2023-07-08 jrick if (branch_ref)
967 24df9a28 2023-07-08 jrick got_ref_close(branch_ref);
968 24df9a28 2023-07-08 jrick if (head_ref)
969 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
970 24df9a28 2023-07-08 jrick return error;
973 24df9a28 2023-07-08 jrick __dead static void
974 24df9a28 2023-07-08 jrick usage_clone(void)
976 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
977 24df9a28 2023-07-08 jrick "repository-URL [directory]\n", getprogname());
981 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg {
982 24df9a28 2023-07-08 jrick char last_scaled_size[FMT_SCALED_STRSIZE];
983 24df9a28 2023-07-08 jrick int last_p_indexed;
984 24df9a28 2023-07-08 jrick int last_p_resolved;
985 24df9a28 2023-07-08 jrick int verbosity;
987 24df9a28 2023-07-08 jrick struct got_repository *repo;
989 24df9a28 2023-07-08 jrick int create_configs;
990 24df9a28 2023-07-08 jrick int configs_created;
992 24df9a28 2023-07-08 jrick struct got_pathlist_head *symrefs;
993 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_branches;
994 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs;
995 24df9a28 2023-07-08 jrick const char *proto;
996 24df9a28 2023-07-08 jrick const char *host;
997 24df9a28 2023-07-08 jrick const char *port;
998 24df9a28 2023-07-08 jrick const char *remote_repo_path;
999 24df9a28 2023-07-08 jrick const char *git_url;
1000 24df9a28 2023-07-08 jrick int fetch_all_branches;
1001 24df9a28 2023-07-08 jrick int mirror_references;
1002 24df9a28 2023-07-08 jrick } config_info;
1005 24df9a28 2023-07-08 jrick /* XXX forward declaration */
1006 24df9a28 2023-07-08 jrick static const struct got_error *
1007 24df9a28 2023-07-08 jrick create_config_files(const char *proto, const char *host, const char *port,
1008 24df9a28 2023-07-08 jrick const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1009 24df9a28 2023-07-08 jrick int mirror_references, struct got_pathlist_head *symrefs,
1010 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_branches,
1011 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1013 24df9a28 2023-07-08 jrick static const struct got_error *
1014 24df9a28 2023-07-08 jrick fetch_progress(void *arg, const char *message, off_t packfile_size,
1015 24df9a28 2023-07-08 jrick int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1017 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1018 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg *a = arg;
1019 24df9a28 2023-07-08 jrick char scaled_size[FMT_SCALED_STRSIZE];
1020 24df9a28 2023-07-08 jrick int p_indexed, p_resolved;
1021 24df9a28 2023-07-08 jrick int print_size = 0, print_indexed = 0, print_resolved = 0;
1024 24df9a28 2023-07-08 jrick * In order to allow a failed clone to be resumed with 'got fetch'
1025 24df9a28 2023-07-08 jrick * we try to create configuration files as soon as possible.
1026 24df9a28 2023-07-08 jrick * Once the server has sent information about its default branch
1027 24df9a28 2023-07-08 jrick * we have all required information.
1029 24df9a28 2023-07-08 jrick if (a->create_configs && !a->configs_created &&
1030 24df9a28 2023-07-08 jrick !TAILQ_EMPTY(a->config_info.symrefs)) {
1031 24df9a28 2023-07-08 jrick err = create_config_files(a->config_info.proto,
1032 24df9a28 2023-07-08 jrick a->config_info.host, a->config_info.port,
1033 24df9a28 2023-07-08 jrick a->config_info.remote_repo_path,
1034 24df9a28 2023-07-08 jrick a->config_info.git_url,
1035 24df9a28 2023-07-08 jrick a->config_info.fetch_all_branches,
1036 24df9a28 2023-07-08 jrick a->config_info.mirror_references,
1037 24df9a28 2023-07-08 jrick a->config_info.symrefs,
1038 24df9a28 2023-07-08 jrick a->config_info.wanted_branches,
1039 24df9a28 2023-07-08 jrick a->config_info.wanted_refs, a->repo);
1041 24df9a28 2023-07-08 jrick return err;
1042 24df9a28 2023-07-08 jrick a->configs_created = 1;
1045 24df9a28 2023-07-08 jrick if (a->verbosity < 0)
1046 24df9a28 2023-07-08 jrick return NULL;
1048 24df9a28 2023-07-08 jrick if (message && message[0] != '\0') {
1049 24df9a28 2023-07-08 jrick printf("\rserver: %s", message);
1050 24df9a28 2023-07-08 jrick fflush(stdout);
1051 24df9a28 2023-07-08 jrick return NULL;
1054 24df9a28 2023-07-08 jrick if (packfile_size > 0 || nobj_indexed > 0) {
1055 24df9a28 2023-07-08 jrick if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1056 24df9a28 2023-07-08 jrick (a->last_scaled_size[0] == '\0' ||
1057 24df9a28 2023-07-08 jrick strcmp(scaled_size, a->last_scaled_size)) != 0) {
1058 24df9a28 2023-07-08 jrick print_size = 1;
1059 24df9a28 2023-07-08 jrick if (strlcpy(a->last_scaled_size, scaled_size,
1060 24df9a28 2023-07-08 jrick FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1061 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
1063 24df9a28 2023-07-08 jrick if (nobj_indexed > 0) {
1064 24df9a28 2023-07-08 jrick p_indexed = (nobj_indexed * 100) / nobj_total;
1065 24df9a28 2023-07-08 jrick if (p_indexed != a->last_p_indexed) {
1066 24df9a28 2023-07-08 jrick a->last_p_indexed = p_indexed;
1067 24df9a28 2023-07-08 jrick print_indexed = 1;
1068 24df9a28 2023-07-08 jrick print_size = 1;
1071 24df9a28 2023-07-08 jrick if (nobj_resolved > 0) {
1072 24df9a28 2023-07-08 jrick p_resolved = (nobj_resolved * 100) /
1073 24df9a28 2023-07-08 jrick (nobj_total - nobj_loose);
1074 24df9a28 2023-07-08 jrick if (p_resolved != a->last_p_resolved) {
1075 24df9a28 2023-07-08 jrick a->last_p_resolved = p_resolved;
1076 24df9a28 2023-07-08 jrick print_resolved = 1;
1077 24df9a28 2023-07-08 jrick print_indexed = 1;
1078 24df9a28 2023-07-08 jrick print_size = 1;
1083 24df9a28 2023-07-08 jrick if (print_size || print_indexed || print_resolved)
1084 24df9a28 2023-07-08 jrick printf("\r");
1085 24df9a28 2023-07-08 jrick if (print_size)
1086 24df9a28 2023-07-08 jrick printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1087 24df9a28 2023-07-08 jrick if (print_indexed)
1088 24df9a28 2023-07-08 jrick printf("; indexing %d%%", p_indexed);
1089 24df9a28 2023-07-08 jrick if (print_resolved)
1090 24df9a28 2023-07-08 jrick printf("; resolving deltas %d%%", p_resolved);
1091 24df9a28 2023-07-08 jrick if (print_size || print_indexed || print_resolved)
1092 24df9a28 2023-07-08 jrick fflush(stdout);
1094 24df9a28 2023-07-08 jrick return NULL;
1097 24df9a28 2023-07-08 jrick static const struct got_error *
1098 24df9a28 2023-07-08 jrick create_symref(const char *refname, struct got_reference *target_ref,
1099 24df9a28 2023-07-08 jrick int verbosity, struct got_repository *repo)
1101 24df9a28 2023-07-08 jrick const struct got_error *err;
1102 24df9a28 2023-07-08 jrick struct got_reference *head_symref;
1104 24df9a28 2023-07-08 jrick err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1106 24df9a28 2023-07-08 jrick return err;
1108 24df9a28 2023-07-08 jrick err = got_ref_write(head_symref, repo);
1109 24df9a28 2023-07-08 jrick if (err == NULL && verbosity > 0) {
1110 24df9a28 2023-07-08 jrick printf("Created reference %s: %s\n", GOT_REF_HEAD,
1111 24df9a28 2023-07-08 jrick got_ref_get_name(target_ref));
1113 24df9a28 2023-07-08 jrick got_ref_close(head_symref);
1114 24df9a28 2023-07-08 jrick return err;
1117 24df9a28 2023-07-08 jrick static const struct got_error *
1118 24df9a28 2023-07-08 jrick list_remote_refs(struct got_pathlist_head *symrefs,
1119 24df9a28 2023-07-08 jrick struct got_pathlist_head *refs)
1121 24df9a28 2023-07-08 jrick const struct got_error *err;
1122 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1124 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, symrefs, entry) {
1125 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1126 24df9a28 2023-07-08 jrick const char *targetref = pe->data;
1128 24df9a28 2023-07-08 jrick printf("%s: %s\n", refname, targetref);
1131 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, refs, entry) {
1132 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1133 24df9a28 2023-07-08 jrick struct got_object_id *id = pe->data;
1134 24df9a28 2023-07-08 jrick char *id_str;
1136 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
1138 24df9a28 2023-07-08 jrick return err;
1139 24df9a28 2023-07-08 jrick printf("%s: %s\n", refname, id_str);
1140 24df9a28 2023-07-08 jrick free(id_str);
1143 24df9a28 2023-07-08 jrick return NULL;
1146 24df9a28 2023-07-08 jrick static const struct got_error *
1147 24df9a28 2023-07-08 jrick create_ref(const char *refname, struct got_object_id *id,
1148 24df9a28 2023-07-08 jrick int verbosity, struct got_repository *repo)
1150 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1151 24df9a28 2023-07-08 jrick struct got_reference *ref;
1152 24df9a28 2023-07-08 jrick char *id_str;
1154 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
1156 24df9a28 2023-07-08 jrick return err;
1158 24df9a28 2023-07-08 jrick err = got_ref_alloc(&ref, refname, id);
1160 24df9a28 2023-07-08 jrick goto done;
1162 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
1163 24df9a28 2023-07-08 jrick got_ref_close(ref);
1165 24df9a28 2023-07-08 jrick if (err == NULL && verbosity >= 0)
1166 24df9a28 2023-07-08 jrick printf("Created reference %s: %s\n", refname, id_str);
1168 24df9a28 2023-07-08 jrick free(id_str);
1169 24df9a28 2023-07-08 jrick return err;
1172 24df9a28 2023-07-08 jrick static int
1173 24df9a28 2023-07-08 jrick match_wanted_ref(const char *refname, const char *wanted_ref)
1175 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/", 5) != 0)
1176 24df9a28 2023-07-08 jrick return 0;
1177 24df9a28 2023-07-08 jrick refname += 5;
1180 24df9a28 2023-07-08 jrick * Prevent fetching of references that won't make any
1181 24df9a28 2023-07-08 jrick * sense outside of the remote repository's context.
1183 24df9a28 2023-07-08 jrick if (strncmp(refname, "got/", 4) == 0)
1184 24df9a28 2023-07-08 jrick return 0;
1185 24df9a28 2023-07-08 jrick if (strncmp(refname, "remotes/", 8) == 0)
1186 24df9a28 2023-07-08 jrick return 0;
1188 24df9a28 2023-07-08 jrick if (strncmp(wanted_ref, "refs/", 5) == 0)
1189 24df9a28 2023-07-08 jrick wanted_ref += 5;
1191 24df9a28 2023-07-08 jrick /* Allow prefix match. */
1192 24df9a28 2023-07-08 jrick if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1193 24df9a28 2023-07-08 jrick return 1;
1195 24df9a28 2023-07-08 jrick /* Allow exact match. */
1196 24df9a28 2023-07-08 jrick return (strcmp(refname, wanted_ref) == 0);
1199 24df9a28 2023-07-08 jrick static int
1200 24df9a28 2023-07-08 jrick is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1202 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1204 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_refs, entry) {
1205 24df9a28 2023-07-08 jrick if (match_wanted_ref(refname, pe->path))
1206 24df9a28 2023-07-08 jrick return 1;
1209 24df9a28 2023-07-08 jrick return 0;
1212 24df9a28 2023-07-08 jrick static const struct got_error *
1213 24df9a28 2023-07-08 jrick create_wanted_ref(const char *refname, struct got_object_id *id,
1214 24df9a28 2023-07-08 jrick const char *remote_repo_name, int verbosity, struct got_repository *repo)
1216 24df9a28 2023-07-08 jrick const struct got_error *err;
1217 24df9a28 2023-07-08 jrick char *remote_refname;
1219 24df9a28 2023-07-08 jrick if (strncmp("refs/", refname, 5) == 0)
1220 24df9a28 2023-07-08 jrick refname += 5;
1222 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1223 24df9a28 2023-07-08 jrick remote_repo_name, refname) == -1)
1224 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
1226 24df9a28 2023-07-08 jrick err = create_ref(remote_refname, id, verbosity, repo);
1227 24df9a28 2023-07-08 jrick free(remote_refname);
1228 24df9a28 2023-07-08 jrick return err;
1231 24df9a28 2023-07-08 jrick static const struct got_error *
1232 24df9a28 2023-07-08 jrick create_gotconfig(const char *proto, const char *host, const char *port,
1233 24df9a28 2023-07-08 jrick const char *remote_repo_path, const char *default_branch,
1234 24df9a28 2023-07-08 jrick int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1235 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, int mirror_references,
1236 24df9a28 2023-07-08 jrick struct got_repository *repo)
1238 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1239 24df9a28 2023-07-08 jrick char *gotconfig_path = NULL;
1240 24df9a28 2023-07-08 jrick char *gotconfig = NULL;
1241 24df9a28 2023-07-08 jrick FILE *gotconfig_file = NULL;
1242 24df9a28 2023-07-08 jrick const char *branchname = NULL;
1243 24df9a28 2023-07-08 jrick char *branches = NULL, *refs = NULL;
1244 24df9a28 2023-07-08 jrick ssize_t n;
1246 24df9a28 2023-07-08 jrick if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1247 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1248 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_branches, entry) {
1250 24df9a28 2023-07-08 jrick branchname = pe->path;
1251 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1252 24df9a28 2023-07-08 jrick branchname += 11;
1253 24df9a28 2023-07-08 jrick if (asprintf(&s, "%s\"%s\" ",
1254 24df9a28 2023-07-08 jrick branches ? branches : "", branchname) == -1) {
1255 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1256 24df9a28 2023-07-08 jrick goto done;
1258 24df9a28 2023-07-08 jrick free(branches);
1259 24df9a28 2023-07-08 jrick branches = s;
1261 24df9a28 2023-07-08 jrick } else if (!fetch_all_branches && default_branch) {
1262 24df9a28 2023-07-08 jrick branchname = default_branch;
1263 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1264 24df9a28 2023-07-08 jrick branchname += 11;
1265 24df9a28 2023-07-08 jrick if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1266 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1267 24df9a28 2023-07-08 jrick goto done;
1270 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(wanted_refs)) {
1271 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1272 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_refs, entry) {
1274 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1275 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/", 5) == 0)
1276 24df9a28 2023-07-08 jrick branchname += 5;
1277 24df9a28 2023-07-08 jrick if (asprintf(&s, "%s\"%s\" ",
1278 24df9a28 2023-07-08 jrick refs ? refs : "", refname) == -1) {
1279 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1280 24df9a28 2023-07-08 jrick goto done;
1282 24df9a28 2023-07-08 jrick free(refs);
1283 24df9a28 2023-07-08 jrick refs = s;
1287 24df9a28 2023-07-08 jrick /* Create got.conf(5). */
1288 24df9a28 2023-07-08 jrick gotconfig_path = got_repo_get_path_gotconfig(repo);
1289 24df9a28 2023-07-08 jrick if (gotconfig_path == NULL) {
1290 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_repo_get_path_gotconfig");
1291 24df9a28 2023-07-08 jrick goto done;
1293 24df9a28 2023-07-08 jrick gotconfig_file = fopen(gotconfig_path, "ae");
1294 24df9a28 2023-07-08 jrick if (gotconfig_file == NULL) {
1295 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fopen", gotconfig_path);
1296 24df9a28 2023-07-08 jrick goto done;
1298 24df9a28 2023-07-08 jrick if (asprintf(&gotconfig,
1299 24df9a28 2023-07-08 jrick "remote \"%s\" {\n"
1300 24df9a28 2023-07-08 jrick "\tserver %s\n"
1301 24df9a28 2023-07-08 jrick "\tprotocol %s\n"
1303 24df9a28 2023-07-08 jrick "\trepository \"%s\"\n"
1309 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1310 24df9a28 2023-07-08 jrick port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1311 24df9a28 2023-07-08 jrick remote_repo_path, branches ? "\tbranch { " : "",
1312 24df9a28 2023-07-08 jrick branches ? branches : "", branches ? "}\n" : "",
1313 24df9a28 2023-07-08 jrick refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1314 24df9a28 2023-07-08 jrick mirror_references ? "\tmirror_references yes\n" : "",
1315 24df9a28 2023-07-08 jrick fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1316 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1317 24df9a28 2023-07-08 jrick goto done;
1319 24df9a28 2023-07-08 jrick n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1320 24df9a28 2023-07-08 jrick if (n != strlen(gotconfig)) {
1321 24df9a28 2023-07-08 jrick err = got_ferror(gotconfig_file, GOT_ERR_IO);
1322 24df9a28 2023-07-08 jrick goto done;
1326 24df9a28 2023-07-08 jrick if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1327 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fclose", gotconfig_path);
1328 24df9a28 2023-07-08 jrick free(gotconfig_path);
1329 24df9a28 2023-07-08 jrick free(branches);
1330 24df9a28 2023-07-08 jrick return err;
1333 24df9a28 2023-07-08 jrick static const struct got_error *
1334 24df9a28 2023-07-08 jrick create_gitconfig(const char *git_url, const char *default_branch,
1335 24df9a28 2023-07-08 jrick int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1336 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, int mirror_references,
1337 24df9a28 2023-07-08 jrick struct got_repository *repo)
1339 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1340 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL;
1341 24df9a28 2023-07-08 jrick char *gitconfig = NULL;
1342 24df9a28 2023-07-08 jrick FILE *gitconfig_file = NULL;
1343 24df9a28 2023-07-08 jrick char *branches = NULL, *refs = NULL;
1344 24df9a28 2023-07-08 jrick const char *branchname;
1345 24df9a28 2023-07-08 jrick ssize_t n;
1347 24df9a28 2023-07-08 jrick /* Create a config file Git can understand. */
1348 24df9a28 2023-07-08 jrick gitconfig_path = got_repo_get_path_gitconfig(repo);
1349 24df9a28 2023-07-08 jrick if (gitconfig_path == NULL) {
1350 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_repo_get_path_gitconfig");
1351 24df9a28 2023-07-08 jrick goto done;
1353 24df9a28 2023-07-08 jrick gitconfig_file = fopen(gitconfig_path, "ae");
1354 24df9a28 2023-07-08 jrick if (gitconfig_file == NULL) {
1355 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fopen", gitconfig_path);
1356 24df9a28 2023-07-08 jrick goto done;
1358 24df9a28 2023-07-08 jrick if (fetch_all_branches) {
1359 24df9a28 2023-07-08 jrick if (mirror_references) {
1360 24df9a28 2023-07-08 jrick if (asprintf(&branches,
1361 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1362 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1363 24df9a28 2023-07-08 jrick goto done;
1365 24df9a28 2023-07-08 jrick } else if (asprintf(&branches,
1366 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1367 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1368 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1369 24df9a28 2023-07-08 jrick goto done;
1371 24df9a28 2023-07-08 jrick } else if (!TAILQ_EMPTY(wanted_branches)) {
1372 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1373 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_branches, entry) {
1375 24df9a28 2023-07-08 jrick branchname = pe->path;
1376 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1377 24df9a28 2023-07-08 jrick branchname += 11;
1378 24df9a28 2023-07-08 jrick if (mirror_references) {
1379 24df9a28 2023-07-08 jrick if (asprintf(&s,
1380 24df9a28 2023-07-08 jrick "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1381 24df9a28 2023-07-08 jrick branches ? branches : "",
1382 24df9a28 2023-07-08 jrick branchname, branchname) == -1) {
1383 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1384 24df9a28 2023-07-08 jrick goto done;
1386 24df9a28 2023-07-08 jrick } else if (asprintf(&s,
1387 24df9a28 2023-07-08 jrick "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1388 24df9a28 2023-07-08 jrick branches ? branches : "",
1389 24df9a28 2023-07-08 jrick branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1390 24df9a28 2023-07-08 jrick branchname) == -1) {
1391 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1392 24df9a28 2023-07-08 jrick goto done;
1394 24df9a28 2023-07-08 jrick free(branches);
1395 24df9a28 2023-07-08 jrick branches = s;
1399 24df9a28 2023-07-08 jrick * If the server specified a default branch, use just that one.
1400 24df9a28 2023-07-08 jrick * Otherwise fall back to fetching all branches on next fetch.
1402 24df9a28 2023-07-08 jrick if (default_branch) {
1403 24df9a28 2023-07-08 jrick branchname = default_branch;
1404 24df9a28 2023-07-08 jrick if (strncmp(branchname, "refs/heads/", 11) == 0)
1405 24df9a28 2023-07-08 jrick branchname += 11;
1407 24df9a28 2023-07-08 jrick branchname = "*"; /* fall back to all branches */
1408 24df9a28 2023-07-08 jrick if (mirror_references) {
1409 24df9a28 2023-07-08 jrick if (asprintf(&branches,
1410 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/%s:refs/heads/%s\n",
1411 24df9a28 2023-07-08 jrick branchname, branchname) == -1) {
1412 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1413 24df9a28 2023-07-08 jrick goto done;
1415 24df9a28 2023-07-08 jrick } else if (asprintf(&branches,
1416 24df9a28 2023-07-08 jrick "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1417 24df9a28 2023-07-08 jrick branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1418 24df9a28 2023-07-08 jrick branchname) == -1) {
1419 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1420 24df9a28 2023-07-08 jrick goto done;
1423 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(wanted_refs)) {
1424 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1425 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, wanted_refs, entry) {
1427 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1428 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/", 5) == 0)
1429 24df9a28 2023-07-08 jrick refname += 5;
1430 24df9a28 2023-07-08 jrick if (mirror_references) {
1431 24df9a28 2023-07-08 jrick if (asprintf(&s,
1432 24df9a28 2023-07-08 jrick "%s\tfetch = refs/%s:refs/%s\n",
1433 24df9a28 2023-07-08 jrick refs ? refs : "", refname, refname) == -1) {
1434 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1435 24df9a28 2023-07-08 jrick goto done;
1437 24df9a28 2023-07-08 jrick } else if (asprintf(&s,
1438 24df9a28 2023-07-08 jrick "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1439 24df9a28 2023-07-08 jrick refs ? refs : "",
1440 24df9a28 2023-07-08 jrick refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1441 24df9a28 2023-07-08 jrick refname) == -1) {
1442 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1443 24df9a28 2023-07-08 jrick goto done;
1445 24df9a28 2023-07-08 jrick free(refs);
1446 24df9a28 2023-07-08 jrick refs = s;
1450 24df9a28 2023-07-08 jrick if (asprintf(&gitconfig,
1451 24df9a28 2023-07-08 jrick "[remote \"%s\"]\n"
1452 24df9a28 2023-07-08 jrick "\turl = %s\n"
1455 24df9a28 2023-07-08 jrick "\tfetch = refs/tags/*:refs/tags/*\n",
1456 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1457 24df9a28 2023-07-08 jrick refs ? refs : "") == -1) {
1458 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
1459 24df9a28 2023-07-08 jrick goto done;
1461 24df9a28 2023-07-08 jrick n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1462 24df9a28 2023-07-08 jrick if (n != strlen(gitconfig)) {
1463 24df9a28 2023-07-08 jrick err = got_ferror(gitconfig_file, GOT_ERR_IO);
1464 24df9a28 2023-07-08 jrick goto done;
1467 24df9a28 2023-07-08 jrick if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1468 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fclose", gitconfig_path);
1469 24df9a28 2023-07-08 jrick free(gitconfig_path);
1470 24df9a28 2023-07-08 jrick free(branches);
1471 24df9a28 2023-07-08 jrick return err;
1474 24df9a28 2023-07-08 jrick static const struct got_error *
1475 24df9a28 2023-07-08 jrick create_config_files(const char *proto, const char *host, const char *port,
1476 24df9a28 2023-07-08 jrick const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1477 24df9a28 2023-07-08 jrick int mirror_references, struct got_pathlist_head *symrefs,
1478 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_branches,
1479 24df9a28 2023-07-08 jrick struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1481 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1482 24df9a28 2023-07-08 jrick const char *default_branch = NULL;
1483 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1486 24df9a28 2023-07-08 jrick * If we asked for a set of wanted branches then use the first
1487 24df9a28 2023-07-08 jrick * one of those.
1489 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(wanted_branches)) {
1490 24df9a28 2023-07-08 jrick pe = TAILQ_FIRST(wanted_branches);
1491 24df9a28 2023-07-08 jrick default_branch = pe->path;
1493 24df9a28 2023-07-08 jrick /* First HEAD ref listed by server is the default branch. */
1494 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, symrefs, entry) {
1495 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1496 24df9a28 2023-07-08 jrick const char *target = pe->data;
1498 24df9a28 2023-07-08 jrick if (strcmp(refname, GOT_REF_HEAD) != 0)
1499 24df9a28 2023-07-08 jrick continue;
1501 24df9a28 2023-07-08 jrick default_branch = target;
1506 24df9a28 2023-07-08 jrick /* Create got.conf(5). */
1507 24df9a28 2023-07-08 jrick err = create_gotconfig(proto, host, port, remote_repo_path,
1508 24df9a28 2023-07-08 jrick default_branch, fetch_all_branches, wanted_branches,
1509 24df9a28 2023-07-08 jrick wanted_refs, mirror_references, repo);
1511 24df9a28 2023-07-08 jrick return err;
1513 24df9a28 2023-07-08 jrick /* Create a config file Git can understand. */
1514 24df9a28 2023-07-08 jrick return create_gitconfig(git_url, default_branch, fetch_all_branches,
1515 24df9a28 2023-07-08 jrick wanted_branches, wanted_refs, mirror_references, repo);
1518 24df9a28 2023-07-08 jrick static const struct got_error *
1519 24df9a28 2023-07-08 jrick cmd_clone(int argc, char *argv[])
1521 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
1522 24df9a28 2023-07-08 jrick const char *uri, *dirname;
1523 24df9a28 2023-07-08 jrick char *proto, *host, *port, *repo_name, *server_path;
1524 24df9a28 2023-07-08 jrick char *default_destdir = NULL, *id_str = NULL;
1525 24df9a28 2023-07-08 jrick const char *repo_path;
1526 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
1527 24df9a28 2023-07-08 jrick struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1528 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
1529 24df9a28 2023-07-08 jrick struct got_object_id *pack_hash = NULL;
1530 24df9a28 2023-07-08 jrick int ch, fetchfd = -1, fetchstatus;
1531 24df9a28 2023-07-08 jrick pid_t fetchpid = -1;
1532 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg fpa;
1533 24df9a28 2023-07-08 jrick char *git_url = NULL;
1534 24df9a28 2023-07-08 jrick int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1535 24df9a28 2023-07-08 jrick int bflag = 0, list_refs_only = 0;
1536 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
1538 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
1539 24df9a28 2023-07-08 jrick TAILQ_INIT(&symrefs);
1540 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_branches);
1541 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_refs);
1543 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1544 24df9a28 2023-07-08 jrick switch (ch) {
1545 24df9a28 2023-07-08 jrick case 'a':
1546 24df9a28 2023-07-08 jrick fetch_all_branches = 1;
1548 24df9a28 2023-07-08 jrick case 'b':
1549 24df9a28 2023-07-08 jrick error = got_pathlist_append(&wanted_branches,
1550 24df9a28 2023-07-08 jrick optarg, NULL);
1551 24df9a28 2023-07-08 jrick if (error)
1552 24df9a28 2023-07-08 jrick return error;
1553 24df9a28 2023-07-08 jrick bflag = 1;
1555 24df9a28 2023-07-08 jrick case 'l':
1556 24df9a28 2023-07-08 jrick list_refs_only = 1;
1558 24df9a28 2023-07-08 jrick case 'm':
1559 24df9a28 2023-07-08 jrick mirror_references = 1;
1561 24df9a28 2023-07-08 jrick case 'q':
1562 24df9a28 2023-07-08 jrick verbosity = -1;
1564 24df9a28 2023-07-08 jrick case 'R':
1565 24df9a28 2023-07-08 jrick error = got_pathlist_append(&wanted_refs,
1566 24df9a28 2023-07-08 jrick optarg, NULL);
1567 24df9a28 2023-07-08 jrick if (error)
1568 24df9a28 2023-07-08 jrick return error;
1570 24df9a28 2023-07-08 jrick case 'v':
1571 24df9a28 2023-07-08 jrick if (verbosity < 0)
1572 24df9a28 2023-07-08 jrick verbosity = 0;
1573 24df9a28 2023-07-08 jrick else if (verbosity < 3)
1574 24df9a28 2023-07-08 jrick verbosity++;
1577 24df9a28 2023-07-08 jrick usage_clone();
1581 24df9a28 2023-07-08 jrick argc -= optind;
1582 24df9a28 2023-07-08 jrick argv += optind;
1584 24df9a28 2023-07-08 jrick if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1585 24df9a28 2023-07-08 jrick option_conflict('a', 'b');
1586 24df9a28 2023-07-08 jrick if (list_refs_only) {
1587 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(&wanted_branches))
1588 24df9a28 2023-07-08 jrick option_conflict('l', 'b');
1589 24df9a28 2023-07-08 jrick if (fetch_all_branches)
1590 24df9a28 2023-07-08 jrick option_conflict('l', 'a');
1591 24df9a28 2023-07-08 jrick if (mirror_references)
1592 24df9a28 2023-07-08 jrick option_conflict('l', 'm');
1593 24df9a28 2023-07-08 jrick if (!TAILQ_EMPTY(&wanted_refs))
1594 24df9a28 2023-07-08 jrick option_conflict('l', 'R');
1597 24df9a28 2023-07-08 jrick uri = argv[0];
1599 24df9a28 2023-07-08 jrick if (argc == 1)
1600 24df9a28 2023-07-08 jrick dirname = NULL;
1601 24df9a28 2023-07-08 jrick else if (argc == 2)
1602 24df9a28 2023-07-08 jrick dirname = argv[1];
1604 24df9a28 2023-07-08 jrick usage_clone();
1606 24df9a28 2023-07-08 jrick error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1607 24df9a28 2023-07-08 jrick &repo_name, uri);
1608 24df9a28 2023-07-08 jrick if (error)
1609 24df9a28 2023-07-08 jrick goto done;
1611 24df9a28 2023-07-08 jrick if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1612 24df9a28 2023-07-08 jrick host, port ? ":" : "", port ? port : "",
1613 24df9a28 2023-07-08 jrick server_path[0] != '/' ? "/" : "", server_path) == -1) {
1614 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1615 24df9a28 2023-07-08 jrick goto done;
1618 24df9a28 2023-07-08 jrick if (strcmp(proto, "git") == 0) {
1619 24df9a28 2023-07-08 jrick #ifndef PROFILE
1620 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1621 24df9a28 2023-07-08 jrick "sendfd dns inet unveil", NULL) == -1)
1622 24df9a28 2023-07-08 jrick err(1, "pledge");
1624 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "git+ssh") == 0 ||
1625 24df9a28 2023-07-08 jrick strcmp(proto, "ssh") == 0) {
1626 24df9a28 2023-07-08 jrick #ifndef PROFILE
1627 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1628 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
1629 24df9a28 2023-07-08 jrick err(1, "pledge");
1631 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "http") == 0 ||
1632 24df9a28 2023-07-08 jrick strcmp(proto, "git+http") == 0) {
1633 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1634 24df9a28 2023-07-08 jrick goto done;
1636 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1637 24df9a28 2023-07-08 jrick goto done;
1639 24df9a28 2023-07-08 jrick if (dirname == NULL) {
1640 24df9a28 2023-07-08 jrick if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1641 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1642 24df9a28 2023-07-08 jrick goto done;
1644 24df9a28 2023-07-08 jrick repo_path = default_destdir;
1646 24df9a28 2023-07-08 jrick repo_path = dirname;
1648 24df9a28 2023-07-08 jrick if (!list_refs_only) {
1649 24df9a28 2023-07-08 jrick error = got_path_mkdir(repo_path);
1650 24df9a28 2023-07-08 jrick if (error &&
1651 24df9a28 2023-07-08 jrick (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1652 24df9a28 2023-07-08 jrick !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1653 24df9a28 2023-07-08 jrick goto done;
1654 24df9a28 2023-07-08 jrick if (!got_path_dir_is_empty(repo_path)) {
1655 24df9a28 2023-07-08 jrick error = got_error_path(repo_path,
1656 24df9a28 2023-07-08 jrick GOT_ERR_DIR_NOT_EMPTY);
1657 24df9a28 2023-07-08 jrick goto done;
1661 24df9a28 2023-07-08 jrick error = got_dial_apply_unveil(proto);
1662 24df9a28 2023-07-08 jrick if (error)
1663 24df9a28 2023-07-08 jrick goto done;
1665 24df9a28 2023-07-08 jrick error = apply_unveil(repo_path, 0, NULL);
1666 24df9a28 2023-07-08 jrick if (error)
1667 24df9a28 2023-07-08 jrick goto done;
1669 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1670 24df9a28 2023-07-08 jrick printf("Connecting to %s\n", git_url);
1672 24df9a28 2023-07-08 jrick error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1673 24df9a28 2023-07-08 jrick server_path, verbosity);
1674 24df9a28 2023-07-08 jrick if (error)
1675 24df9a28 2023-07-08 jrick goto done;
1677 24df9a28 2023-07-08 jrick if (!list_refs_only) {
1678 24df9a28 2023-07-08 jrick error = got_repo_init(repo_path, NULL);
1679 24df9a28 2023-07-08 jrick if (error)
1680 24df9a28 2023-07-08 jrick goto done;
1681 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
1682 24df9a28 2023-07-08 jrick if (error != NULL)
1683 24df9a28 2023-07-08 jrick goto done;
1684 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1685 24df9a28 2023-07-08 jrick if (error)
1686 24df9a28 2023-07-08 jrick goto done;
1689 24df9a28 2023-07-08 jrick fpa.last_scaled_size[0] = '\0';
1690 24df9a28 2023-07-08 jrick fpa.last_p_indexed = -1;
1691 24df9a28 2023-07-08 jrick fpa.last_p_resolved = -1;
1692 24df9a28 2023-07-08 jrick fpa.verbosity = verbosity;
1693 24df9a28 2023-07-08 jrick fpa.create_configs = 1;
1694 24df9a28 2023-07-08 jrick fpa.configs_created = 0;
1695 24df9a28 2023-07-08 jrick fpa.repo = repo;
1696 24df9a28 2023-07-08 jrick fpa.config_info.symrefs = &symrefs;
1697 24df9a28 2023-07-08 jrick fpa.config_info.wanted_branches = &wanted_branches;
1698 24df9a28 2023-07-08 jrick fpa.config_info.wanted_refs = &wanted_refs;
1699 24df9a28 2023-07-08 jrick fpa.config_info.proto = proto;
1700 24df9a28 2023-07-08 jrick fpa.config_info.host = host;
1701 24df9a28 2023-07-08 jrick fpa.config_info.port = port;
1702 24df9a28 2023-07-08 jrick fpa.config_info.remote_repo_path = server_path;
1703 24df9a28 2023-07-08 jrick fpa.config_info.git_url = git_url;
1704 24df9a28 2023-07-08 jrick fpa.config_info.fetch_all_branches = fetch_all_branches;
1705 24df9a28 2023-07-08 jrick fpa.config_info.mirror_references = mirror_references;
1706 24df9a28 2023-07-08 jrick error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1707 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1708 24df9a28 2023-07-08 jrick fetch_all_branches, &wanted_branches, &wanted_refs,
1709 24df9a28 2023-07-08 jrick list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1710 24df9a28 2023-07-08 jrick fetch_progress, &fpa);
1711 24df9a28 2023-07-08 jrick if (error)
1712 24df9a28 2023-07-08 jrick goto done;
1714 24df9a28 2023-07-08 jrick if (list_refs_only) {
1715 24df9a28 2023-07-08 jrick error = list_remote_refs(&symrefs, &refs);
1716 24df9a28 2023-07-08 jrick goto done;
1719 24df9a28 2023-07-08 jrick if (pack_hash == NULL) {
1720 24df9a28 2023-07-08 jrick error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1721 24df9a28 2023-07-08 jrick "server sent an empty pack file");
1722 24df9a28 2023-07-08 jrick goto done;
1724 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, pack_hash);
1725 24df9a28 2023-07-08 jrick if (error)
1726 24df9a28 2023-07-08 jrick goto done;
1727 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1728 24df9a28 2023-07-08 jrick printf("\nFetched %s.pack\n", id_str);
1729 24df9a28 2023-07-08 jrick free(id_str);
1731 24df9a28 2023-07-08 jrick /* Set up references provided with the pack file. */
1732 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &refs, entry) {
1733 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1734 24df9a28 2023-07-08 jrick struct got_object_id *id = pe->data;
1735 24df9a28 2023-07-08 jrick char *remote_refname;
1737 24df9a28 2023-07-08 jrick if (is_wanted_ref(&wanted_refs, refname) &&
1738 24df9a28 2023-07-08 jrick !mirror_references) {
1739 24df9a28 2023-07-08 jrick error = create_wanted_ref(refname, id,
1740 24df9a28 2023-07-08 jrick GOT_FETCH_DEFAULT_REMOTE_NAME,
1741 24df9a28 2023-07-08 jrick verbosity - 1, repo);
1742 24df9a28 2023-07-08 jrick if (error)
1743 24df9a28 2023-07-08 jrick goto done;
1744 24df9a28 2023-07-08 jrick continue;
1747 24df9a28 2023-07-08 jrick error = create_ref(refname, id, verbosity - 1, repo);
1748 24df9a28 2023-07-08 jrick if (error)
1749 24df9a28 2023-07-08 jrick goto done;
1751 24df9a28 2023-07-08 jrick if (mirror_references)
1752 24df9a28 2023-07-08 jrick continue;
1754 24df9a28 2023-07-08 jrick if (strncmp("refs/heads/", refname, 11) != 0)
1755 24df9a28 2023-07-08 jrick continue;
1757 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname,
1758 24df9a28 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1759 24df9a28 2023-07-08 jrick refname + 11) == -1) {
1760 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1761 24df9a28 2023-07-08 jrick goto done;
1763 24df9a28 2023-07-08 jrick error = create_ref(remote_refname, id, verbosity - 1, repo);
1764 24df9a28 2023-07-08 jrick free(remote_refname);
1765 24df9a28 2023-07-08 jrick if (error)
1766 24df9a28 2023-07-08 jrick goto done;
1769 24df9a28 2023-07-08 jrick /* Set the HEAD reference if the server provided one. */
1770 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &symrefs, entry) {
1771 24df9a28 2023-07-08 jrick struct got_reference *target_ref;
1772 24df9a28 2023-07-08 jrick const char *refname = pe->path;
1773 24df9a28 2023-07-08 jrick const char *target = pe->data;
1774 24df9a28 2023-07-08 jrick char *remote_refname = NULL, *remote_target = NULL;
1776 24df9a28 2023-07-08 jrick if (strcmp(refname, GOT_REF_HEAD) != 0)
1777 24df9a28 2023-07-08 jrick continue;
1779 24df9a28 2023-07-08 jrick error = got_ref_open(&target_ref, repo, target, 0);
1780 24df9a28 2023-07-08 jrick if (error) {
1781 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_REF) {
1782 24df9a28 2023-07-08 jrick error = NULL;
1783 24df9a28 2023-07-08 jrick continue;
1785 24df9a28 2023-07-08 jrick goto done;
1788 24df9a28 2023-07-08 jrick error = create_symref(refname, target_ref, verbosity, repo);
1789 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
1790 24df9a28 2023-07-08 jrick if (error)
1791 24df9a28 2023-07-08 jrick goto done;
1793 24df9a28 2023-07-08 jrick if (mirror_references)
1794 24df9a28 2023-07-08 jrick continue;
1796 24df9a28 2023-07-08 jrick if (strncmp("refs/heads/", target, 11) != 0)
1797 24df9a28 2023-07-08 jrick continue;
1799 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname,
1800 24df9a28 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1801 24df9a28 2023-07-08 jrick refname) == -1) {
1802 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1803 24df9a28 2023-07-08 jrick goto done;
1805 24df9a28 2023-07-08 jrick if (asprintf(&remote_target,
1806 24df9a28 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1807 24df9a28 2023-07-08 jrick target + 11) == -1) {
1808 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
1809 24df9a28 2023-07-08 jrick free(remote_refname);
1810 24df9a28 2023-07-08 jrick goto done;
1812 24df9a28 2023-07-08 jrick error = got_ref_open(&target_ref, repo, remote_target, 0);
1813 24df9a28 2023-07-08 jrick if (error) {
1814 24df9a28 2023-07-08 jrick free(remote_refname);
1815 24df9a28 2023-07-08 jrick free(remote_target);
1816 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_REF) {
1817 24df9a28 2023-07-08 jrick error = NULL;
1818 24df9a28 2023-07-08 jrick continue;
1820 24df9a28 2023-07-08 jrick goto done;
1822 24df9a28 2023-07-08 jrick error = create_symref(remote_refname, target_ref,
1823 24df9a28 2023-07-08 jrick verbosity - 1, repo);
1824 24df9a28 2023-07-08 jrick free(remote_refname);
1825 24df9a28 2023-07-08 jrick free(remote_target);
1826 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
1827 24df9a28 2023-07-08 jrick if (error)
1828 24df9a28 2023-07-08 jrick goto done;
1830 24df9a28 2023-07-08 jrick if (pe == NULL) {
1832 24df9a28 2023-07-08 jrick * We failed to set the HEAD reference. If we asked for
1833 24df9a28 2023-07-08 jrick * a set of wanted branches use the first of one of those
1834 24df9a28 2023-07-08 jrick * which could be fetched instead.
1836 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &wanted_branches, entry) {
1837 24df9a28 2023-07-08 jrick const char *target = pe->path;
1838 24df9a28 2023-07-08 jrick struct got_reference *target_ref;
1840 24df9a28 2023-07-08 jrick error = got_ref_open(&target_ref, repo, target, 0);
1841 24df9a28 2023-07-08 jrick if (error) {
1842 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_REF) {
1843 24df9a28 2023-07-08 jrick error = NULL;
1844 24df9a28 2023-07-08 jrick continue;
1846 24df9a28 2023-07-08 jrick goto done;
1849 24df9a28 2023-07-08 jrick error = create_symref(GOT_REF_HEAD, target_ref,
1850 24df9a28 2023-07-08 jrick verbosity, repo);
1851 24df9a28 2023-07-08 jrick got_ref_close(target_ref);
1852 24df9a28 2023-07-08 jrick if (error)
1853 24df9a28 2023-07-08 jrick goto done;
1857 24df9a28 2023-07-08 jrick if (!fpa.configs_created && pe != NULL) {
1858 24df9a28 2023-07-08 jrick error = create_config_files(fpa.config_info.proto,
1859 24df9a28 2023-07-08 jrick fpa.config_info.host, fpa.config_info.port,
1860 24df9a28 2023-07-08 jrick fpa.config_info.remote_repo_path,
1861 24df9a28 2023-07-08 jrick fpa.config_info.git_url,
1862 24df9a28 2023-07-08 jrick fpa.config_info.fetch_all_branches,
1863 24df9a28 2023-07-08 jrick fpa.config_info.mirror_references,
1864 24df9a28 2023-07-08 jrick fpa.config_info.symrefs,
1865 24df9a28 2023-07-08 jrick fpa.config_info.wanted_branches,
1866 24df9a28 2023-07-08 jrick fpa.config_info.wanted_refs, fpa.repo);
1867 24df9a28 2023-07-08 jrick if (error)
1868 24df9a28 2023-07-08 jrick goto done;
1872 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1873 24df9a28 2023-07-08 jrick printf("Created %s repository '%s'\n",
1874 24df9a28 2023-07-08 jrick mirror_references ? "mirrored" : "cloned", repo_path);
1876 24df9a28 2023-07-08 jrick if (pack_fds) {
1877 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
1878 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
1879 24df9a28 2023-07-08 jrick if (error == NULL)
1880 24df9a28 2023-07-08 jrick error = pack_err;
1882 24df9a28 2023-07-08 jrick if (fetchpid > 0) {
1883 24df9a28 2023-07-08 jrick if (kill(fetchpid, SIGTERM) == -1)
1884 24df9a28 2023-07-08 jrick error = got_error_from_errno("kill");
1885 24df9a28 2023-07-08 jrick if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1886 24df9a28 2023-07-08 jrick error = got_error_from_errno("waitpid");
1888 24df9a28 2023-07-08 jrick if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1889 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
1890 24df9a28 2023-07-08 jrick if (repo) {
1891 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
1892 24df9a28 2023-07-08 jrick if (error == NULL)
1893 24df9a28 2023-07-08 jrick error = close_err;
1895 24df9a28 2023-07-08 jrick got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1896 24df9a28 2023-07-08 jrick got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1897 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1898 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1899 24df9a28 2023-07-08 jrick free(pack_hash);
1900 24df9a28 2023-07-08 jrick free(proto);
1901 24df9a28 2023-07-08 jrick free(host);
1902 24df9a28 2023-07-08 jrick free(port);
1903 24df9a28 2023-07-08 jrick free(server_path);
1904 24df9a28 2023-07-08 jrick free(repo_name);
1905 24df9a28 2023-07-08 jrick free(default_destdir);
1906 24df9a28 2023-07-08 jrick free(git_url);
1907 24df9a28 2023-07-08 jrick return error;
1910 24df9a28 2023-07-08 jrick static const struct got_error *
1911 24df9a28 2023-07-08 jrick update_ref(struct got_reference *ref, struct got_object_id *new_id,
1912 24df9a28 2023-07-08 jrick int replace_tags, int verbosity, struct got_repository *repo)
1914 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
1915 24df9a28 2023-07-08 jrick char *new_id_str = NULL;
1916 24df9a28 2023-07-08 jrick struct got_object_id *old_id = NULL;
1918 24df9a28 2023-07-08 jrick err = got_object_id_str(&new_id_str, new_id);
1920 24df9a28 2023-07-08 jrick goto done;
1922 24df9a28 2023-07-08 jrick if (!replace_tags &&
1923 24df9a28 2023-07-08 jrick strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1924 24df9a28 2023-07-08 jrick err = got_ref_resolve(&old_id, repo, ref);
1926 24df9a28 2023-07-08 jrick goto done;
1927 24df9a28 2023-07-08 jrick if (got_object_id_cmp(old_id, new_id) == 0)
1928 24df9a28 2023-07-08 jrick goto done;
1929 24df9a28 2023-07-08 jrick if (verbosity >= 0) {
1930 24df9a28 2023-07-08 jrick printf("Rejecting update of existing tag %s: %s\n",
1931 24df9a28 2023-07-08 jrick got_ref_get_name(ref), new_id_str);
1933 24df9a28 2023-07-08 jrick goto done;
1936 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(ref)) {
1937 24df9a28 2023-07-08 jrick if (verbosity >= 0) {
1938 24df9a28 2023-07-08 jrick printf("Replacing reference %s: %s\n",
1939 24df9a28 2023-07-08 jrick got_ref_get_name(ref),
1940 24df9a28 2023-07-08 jrick got_ref_get_symref_target(ref));
1942 24df9a28 2023-07-08 jrick err = got_ref_change_symref_to_ref(ref, new_id);
1944 24df9a28 2023-07-08 jrick goto done;
1945 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
1947 24df9a28 2023-07-08 jrick goto done;
1949 24df9a28 2023-07-08 jrick err = got_ref_resolve(&old_id, repo, ref);
1951 24df9a28 2023-07-08 jrick goto done;
1952 24df9a28 2023-07-08 jrick if (got_object_id_cmp(old_id, new_id) == 0)
1953 24df9a28 2023-07-08 jrick goto done;
1955 24df9a28 2023-07-08 jrick err = got_ref_change_ref(ref, new_id);
1957 24df9a28 2023-07-08 jrick goto done;
1958 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
1960 24df9a28 2023-07-08 jrick goto done;
1963 24df9a28 2023-07-08 jrick if (verbosity >= 0)
1964 24df9a28 2023-07-08 jrick printf("Updated %s: %s\n", got_ref_get_name(ref),
1965 24df9a28 2023-07-08 jrick new_id_str);
1967 24df9a28 2023-07-08 jrick free(old_id);
1968 24df9a28 2023-07-08 jrick free(new_id_str);
1969 24df9a28 2023-07-08 jrick return err;
1972 24df9a28 2023-07-08 jrick static const struct got_error *
1973 24df9a28 2023-07-08 jrick update_wanted_ref(const char *refname, struct got_object_id *id,
1974 24df9a28 2023-07-08 jrick const char *remote_repo_name, int verbosity, struct got_repository *repo)
1976 24df9a28 2023-07-08 jrick const struct got_error *err, *unlock_err;
1977 24df9a28 2023-07-08 jrick char *remote_refname;
1978 24df9a28 2023-07-08 jrick struct got_reference *ref;
1980 24df9a28 2023-07-08 jrick if (strncmp("refs/", refname, 5) == 0)
1981 24df9a28 2023-07-08 jrick refname += 5;
1983 24df9a28 2023-07-08 jrick if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1984 24df9a28 2023-07-08 jrick remote_repo_name, refname) == -1)
1985 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
1987 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, remote_refname, 1);
1988 24df9a28 2023-07-08 jrick if (err) {
1989 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_NOT_REF)
1990 24df9a28 2023-07-08 jrick goto done;
1991 24df9a28 2023-07-08 jrick err = create_ref(remote_refname, id, verbosity, repo);
1993 24df9a28 2023-07-08 jrick err = update_ref(ref, id, 0, verbosity, repo);
1994 24df9a28 2023-07-08 jrick unlock_err = got_ref_unlock(ref);
1995 24df9a28 2023-07-08 jrick if (unlock_err && err == NULL)
1996 24df9a28 2023-07-08 jrick err = unlock_err;
1997 24df9a28 2023-07-08 jrick got_ref_close(ref);
2000 24df9a28 2023-07-08 jrick free(remote_refname);
2001 24df9a28 2023-07-08 jrick return err;
2004 24df9a28 2023-07-08 jrick __dead static void
2005 24df9a28 2023-07-08 jrick usage_checkout(void)
2007 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2008 24df9a28 2023-07-08 jrick "[-p path-prefix] repository-path [work-tree-path]\n",
2009 24df9a28 2023-07-08 jrick getprogname());
2013 24df9a28 2023-07-08 jrick static void
2014 24df9a28 2023-07-08 jrick show_worktree_base_ref_warning(void)
2016 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: warning: could not create a reference "
2017 24df9a28 2023-07-08 jrick "to the work tree's base commit; the commit could be "
2018 24df9a28 2023-07-08 jrick "garbage-collected by Git or 'gotadmin cleanup'; making the "
2019 24df9a28 2023-07-08 jrick "repository writable and running 'got update' will prevent this\n",
2020 24df9a28 2023-07-08 jrick getprogname());
2023 24df9a28 2023-07-08 jrick struct got_checkout_progress_arg {
2024 24df9a28 2023-07-08 jrick const char *worktree_path;
2025 24df9a28 2023-07-08 jrick int had_base_commit_ref_error;
2026 24df9a28 2023-07-08 jrick int verbosity;
2029 24df9a28 2023-07-08 jrick static const struct got_error *
2030 24df9a28 2023-07-08 jrick checkout_progress(void *arg, unsigned char status, const char *path)
2032 24df9a28 2023-07-08 jrick struct got_checkout_progress_arg *a = arg;
2034 24df9a28 2023-07-08 jrick /* Base commit bump happens silently. */
2035 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_BUMP_BASE)
2036 24df9a28 2023-07-08 jrick return NULL;
2038 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_BASE_REF_ERR) {
2039 24df9a28 2023-07-08 jrick a->had_base_commit_ref_error = 1;
2040 24df9a28 2023-07-08 jrick return NULL;
2043 24df9a28 2023-07-08 jrick while (path[0] == '/')
2046 24df9a28 2023-07-08 jrick if (a->verbosity >= 0)
2047 24df9a28 2023-07-08 jrick printf("%c %s/%s\n", status, a->worktree_path, path);
2049 24df9a28 2023-07-08 jrick return NULL;
2052 24df9a28 2023-07-08 jrick static const struct got_error *
2053 24df9a28 2023-07-08 jrick check_cancelled(void *arg)
2055 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
2056 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_CANCELLED);
2057 24df9a28 2023-07-08 jrick return NULL;
2060 24df9a28 2023-07-08 jrick static const struct got_error *
2061 24df9a28 2023-07-08 jrick check_linear_ancestry(struct got_object_id *commit_id,
2062 24df9a28 2023-07-08 jrick struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2063 24df9a28 2023-07-08 jrick struct got_repository *repo)
2065 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2066 24df9a28 2023-07-08 jrick struct got_object_id *yca_id;
2068 24df9a28 2023-07-08 jrick err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2069 e12cc036 2024-03-27 stsp commit_id, base_commit_id, 1, 0, repo, check_cancelled, NULL);
2071 24df9a28 2023-07-08 jrick return err;
2073 24df9a28 2023-07-08 jrick if (yca_id == NULL)
2074 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ANCESTRY);
2077 24df9a28 2023-07-08 jrick * Require a straight line of history between the target commit
2078 24df9a28 2023-07-08 jrick * and the work tree's base commit.
2080 24df9a28 2023-07-08 jrick * Non-linear situations such as this require a rebase:
2082 24df9a28 2023-07-08 jrick * (commit) D F (base_commit)
2086 24df9a28 2023-07-08 jrick * B (yca)
2090 24df9a28 2023-07-08 jrick * 'got update' only handles linear cases:
2091 24df9a28 2023-07-08 jrick * Update forwards in time: A (base/yca) - B - C - D (commit)
2092 24df9a28 2023-07-08 jrick * Update backwards in time: D (base) - C - B - A (commit/yca)
2094 24df9a28 2023-07-08 jrick if (allow_forwards_in_time_only) {
2095 24df9a28 2023-07-08 jrick if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2096 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ANCESTRY);
2097 24df9a28 2023-07-08 jrick } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2098 24df9a28 2023-07-08 jrick got_object_id_cmp(base_commit_id, yca_id) != 0)
2099 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ANCESTRY);
2101 24df9a28 2023-07-08 jrick free(yca_id);
2102 24df9a28 2023-07-08 jrick return NULL;
2105 24df9a28 2023-07-08 jrick static const struct got_error *
2106 24df9a28 2023-07-08 jrick check_same_branch(struct got_object_id *commit_id,
2107 24df9a28 2023-07-08 jrick struct got_reference *head_ref, struct got_repository *repo)
2109 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2110 24df9a28 2023-07-08 jrick struct got_commit_graph *graph = NULL;
2111 24df9a28 2023-07-08 jrick struct got_object_id *head_commit_id = NULL;
2113 24df9a28 2023-07-08 jrick err = got_ref_resolve(&head_commit_id, repo, head_ref);
2115 24df9a28 2023-07-08 jrick goto done;
2117 24df9a28 2023-07-08 jrick if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2118 24df9a28 2023-07-08 jrick goto done;
2120 24df9a28 2023-07-08 jrick err = got_commit_graph_open(&graph, "/", 1);
2122 24df9a28 2023-07-08 jrick goto done;
2124 98297eed 2024-03-27 stsp err = got_commit_graph_bfsort(graph, head_commit_id, repo,
2125 24df9a28 2023-07-08 jrick check_cancelled, NULL);
2127 24df9a28 2023-07-08 jrick goto done;
2129 24df9a28 2023-07-08 jrick for (;;) {
2130 24df9a28 2023-07-08 jrick struct got_object_id id;
2132 24df9a28 2023-07-08 jrick err = got_commit_graph_iter_next(&id, graph, repo,
2133 24df9a28 2023-07-08 jrick check_cancelled, NULL);
2134 24df9a28 2023-07-08 jrick if (err) {
2135 24df9a28 2023-07-08 jrick if (err->code == GOT_ERR_ITER_COMPLETED)
2136 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_ANCESTRY);
2140 24df9a28 2023-07-08 jrick if (got_object_id_cmp(&id, commit_id) == 0)
2144 24df9a28 2023-07-08 jrick if (graph)
2145 24df9a28 2023-07-08 jrick got_commit_graph_close(graph);
2146 24df9a28 2023-07-08 jrick free(head_commit_id);
2147 24df9a28 2023-07-08 jrick return err;
2150 24df9a28 2023-07-08 jrick static const struct got_error *
2151 24df9a28 2023-07-08 jrick checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2153 24df9a28 2023-07-08 jrick static char msg[512];
2154 24df9a28 2023-07-08 jrick const char *branch_name;
2156 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(ref))
2157 24df9a28 2023-07-08 jrick branch_name = got_ref_get_symref_target(ref);
2159 24df9a28 2023-07-08 jrick branch_name = got_ref_get_name(ref);
2161 24df9a28 2023-07-08 jrick if (strncmp("refs/heads/", branch_name, 11) == 0)
2162 24df9a28 2023-07-08 jrick branch_name += 11;
2164 24df9a28 2023-07-08 jrick snprintf(msg, sizeof(msg),
2165 24df9a28 2023-07-08 jrick "target commit is not contained in branch '%s'; "
2166 24df9a28 2023-07-08 jrick "the branch to use must be specified with -b; "
2167 24df9a28 2023-07-08 jrick "if necessary a new branch can be created for "
2168 24df9a28 2023-07-08 jrick "this commit with 'got branch -c %s BRANCH_NAME'",
2169 24df9a28 2023-07-08 jrick branch_name, commit_id_str);
2171 24df9a28 2023-07-08 jrick return got_error_msg(GOT_ERR_ANCESTRY, msg);
2174 24df9a28 2023-07-08 jrick static const struct got_error *
2175 24df9a28 2023-07-08 jrick cmd_checkout(int argc, char *argv[])
2177 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
2178 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
2179 24df9a28 2023-07-08 jrick struct got_reference *head_ref = NULL, *ref = NULL;
2180 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
2181 24df9a28 2023-07-08 jrick char *repo_path = NULL;
2182 24df9a28 2023-07-08 jrick char *worktree_path = NULL;
2183 24df9a28 2023-07-08 jrick const char *path_prefix = "";
2184 24df9a28 2023-07-08 jrick const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2185 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
2186 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
2187 24df9a28 2023-07-08 jrick char *cwd = NULL;
2188 24df9a28 2023-07-08 jrick int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2189 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
2190 24df9a28 2023-07-08 jrick struct got_checkout_progress_arg cpa;
2191 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
2193 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
2195 24df9a28 2023-07-08 jrick #ifndef PROFILE
2196 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2197 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
2198 24df9a28 2023-07-08 jrick err(1, "pledge");
2201 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2202 24df9a28 2023-07-08 jrick switch (ch) {
2203 24df9a28 2023-07-08 jrick case 'b':
2204 24df9a28 2023-07-08 jrick branch_name = optarg;
2206 24df9a28 2023-07-08 jrick case 'c':
2207 24df9a28 2023-07-08 jrick commit_id_str = strdup(optarg);
2208 24df9a28 2023-07-08 jrick if (commit_id_str == NULL)
2209 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
2211 24df9a28 2023-07-08 jrick case 'E':
2212 24df9a28 2023-07-08 jrick allow_nonempty = 1;
2214 24df9a28 2023-07-08 jrick case 'p':
2215 24df9a28 2023-07-08 jrick path_prefix = optarg;
2217 24df9a28 2023-07-08 jrick case 'q':
2218 24df9a28 2023-07-08 jrick verbosity = -1;
2221 24df9a28 2023-07-08 jrick usage_checkout();
2222 24df9a28 2023-07-08 jrick /* NOTREACHED */
2226 24df9a28 2023-07-08 jrick argc -= optind;
2227 24df9a28 2023-07-08 jrick argv += optind;
2229 24df9a28 2023-07-08 jrick if (argc == 1) {
2230 24df9a28 2023-07-08 jrick char *base, *dotgit;
2231 24df9a28 2023-07-08 jrick const char *path;
2232 24df9a28 2023-07-08 jrick repo_path = realpath(argv[0], NULL);
2233 24df9a28 2023-07-08 jrick if (repo_path == NULL)
2234 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath", argv[0]);
2235 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
2236 24df9a28 2023-07-08 jrick if (cwd == NULL) {
2237 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
2238 24df9a28 2023-07-08 jrick goto done;
2240 24df9a28 2023-07-08 jrick if (path_prefix[0])
2241 24df9a28 2023-07-08 jrick path = path_prefix;
2243 24df9a28 2023-07-08 jrick path = repo_path;
2244 24df9a28 2023-07-08 jrick error = got_path_basename(&base, path);
2245 24df9a28 2023-07-08 jrick if (error)
2246 24df9a28 2023-07-08 jrick goto done;
2247 24df9a28 2023-07-08 jrick dotgit = strstr(base, ".git");
2248 24df9a28 2023-07-08 jrick if (dotgit)
2249 24df9a28 2023-07-08 jrick *dotgit = '\0';
2250 24df9a28 2023-07-08 jrick if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2251 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
2252 24df9a28 2023-07-08 jrick free(base);
2253 24df9a28 2023-07-08 jrick goto done;
2255 24df9a28 2023-07-08 jrick free(base);
2256 24df9a28 2023-07-08 jrick } else if (argc == 2) {
2257 24df9a28 2023-07-08 jrick repo_path = realpath(argv[0], NULL);
2258 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
2259 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath", argv[0]);
2260 24df9a28 2023-07-08 jrick goto done;
2262 24df9a28 2023-07-08 jrick worktree_path = realpath(argv[1], NULL);
2263 24df9a28 2023-07-08 jrick if (worktree_path == NULL) {
2264 24df9a28 2023-07-08 jrick if (errno != ENOENT) {
2265 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath",
2266 24df9a28 2023-07-08 jrick argv[1]);
2267 24df9a28 2023-07-08 jrick goto done;
2269 24df9a28 2023-07-08 jrick worktree_path = strdup(argv[1]);
2270 24df9a28 2023-07-08 jrick if (worktree_path == NULL) {
2271 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
2272 24df9a28 2023-07-08 jrick goto done;
2276 24df9a28 2023-07-08 jrick usage_checkout();
2278 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
2279 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(worktree_path);
2281 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
2282 24df9a28 2023-07-08 jrick if (error != NULL)
2283 24df9a28 2023-07-08 jrick goto done;
2285 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2286 24df9a28 2023-07-08 jrick if (error != NULL)
2287 24df9a28 2023-07-08 jrick goto done;
2289 24df9a28 2023-07-08 jrick /* Pre-create work tree path for unveil(2) */
2290 24df9a28 2023-07-08 jrick error = got_path_mkdir(worktree_path);
2291 24df9a28 2023-07-08 jrick if (error) {
2292 24df9a28 2023-07-08 jrick if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2293 24df9a28 2023-07-08 jrick !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2294 24df9a28 2023-07-08 jrick goto done;
2295 24df9a28 2023-07-08 jrick if (!allow_nonempty &&
2296 24df9a28 2023-07-08 jrick !got_path_dir_is_empty(worktree_path)) {
2297 24df9a28 2023-07-08 jrick error = got_error_path(worktree_path,
2298 24df9a28 2023-07-08 jrick GOT_ERR_DIR_NOT_EMPTY);
2299 24df9a28 2023-07-08 jrick goto done;
2303 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2304 24df9a28 2023-07-08 jrick if (error)
2305 24df9a28 2023-07-08 jrick goto done;
2307 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, branch_name, 0);
2308 24df9a28 2023-07-08 jrick if (error != NULL)
2309 24df9a28 2023-07-08 jrick goto done;
2311 df6221c7 2023-07-19 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix,
2312 df6221c7 2023-07-19 stsp GOT_WORKTREE_CVG_DIR, repo);
2313 24df9a28 2023-07-08 jrick if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2314 24df9a28 2023-07-08 jrick goto done;
2316 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, worktree_path, GOT_WORKTREE_CVG_DIR);
2317 24df9a28 2023-07-08 jrick if (error != NULL)
2318 24df9a28 2023-07-08 jrick goto done;
2320 24df9a28 2023-07-08 jrick error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2321 24df9a28 2023-07-08 jrick path_prefix);
2322 24df9a28 2023-07-08 jrick if (error != NULL)
2323 24df9a28 2023-07-08 jrick goto done;
2324 24df9a28 2023-07-08 jrick if (!same_path_prefix) {
2325 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_PATH_PREFIX);
2326 24df9a28 2023-07-08 jrick goto done;
2329 24df9a28 2023-07-08 jrick if (commit_id_str) {
2330 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
2331 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
2332 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2334 24df9a28 2023-07-08 jrick if (error)
2335 24df9a28 2023-07-08 jrick goto done;
2336 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
2337 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2338 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
2339 24df9a28 2023-07-08 jrick if (error)
2340 24df9a28 2023-07-08 jrick goto done;
2341 24df9a28 2023-07-08 jrick error = check_linear_ancestry(commit_id,
2342 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree), 0, repo);
2343 24df9a28 2023-07-08 jrick if (error != NULL) {
2344 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_ANCESTRY) {
2345 24df9a28 2023-07-08 jrick error = checkout_ancestry_error(
2346 24df9a28 2023-07-08 jrick head_ref, commit_id_str);
2348 24df9a28 2023-07-08 jrick goto done;
2350 24df9a28 2023-07-08 jrick error = check_same_branch(commit_id, head_ref, repo);
2351 24df9a28 2023-07-08 jrick if (error) {
2352 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_ANCESTRY) {
2353 24df9a28 2023-07-08 jrick error = checkout_ancestry_error(
2354 24df9a28 2023-07-08 jrick head_ref, commit_id_str);
2356 24df9a28 2023-07-08 jrick goto done;
2358 24df9a28 2023-07-08 jrick error = got_worktree_set_base_commit_id(worktree, repo,
2359 24df9a28 2023-07-08 jrick commit_id);
2360 24df9a28 2023-07-08 jrick if (error)
2361 24df9a28 2023-07-08 jrick goto done;
2362 24df9a28 2023-07-08 jrick /* Expand potentially abbreviated commit ID string. */
2363 24df9a28 2023-07-08 jrick free(commit_id_str);
2364 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2365 24df9a28 2023-07-08 jrick if (error)
2366 24df9a28 2023-07-08 jrick goto done;
2368 24df9a28 2023-07-08 jrick commit_id = got_object_id_dup(
2369 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree));
2370 24df9a28 2023-07-08 jrick if (commit_id == NULL) {
2371 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_object_id_dup");
2372 24df9a28 2023-07-08 jrick goto done;
2374 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2375 24df9a28 2023-07-08 jrick if (error)
2376 24df9a28 2023-07-08 jrick goto done;
2379 24df9a28 2023-07-08 jrick error = got_pathlist_append(&paths, "", NULL);
2380 24df9a28 2023-07-08 jrick if (error)
2381 24df9a28 2023-07-08 jrick goto done;
2382 24df9a28 2023-07-08 jrick cpa.worktree_path = worktree_path;
2383 24df9a28 2023-07-08 jrick cpa.had_base_commit_ref_error = 0;
2384 24df9a28 2023-07-08 jrick cpa.verbosity = verbosity;
2385 24df9a28 2023-07-08 jrick error = got_worktree_checkout_files(worktree, &paths, repo,
2386 24df9a28 2023-07-08 jrick checkout_progress, &cpa, check_cancelled, NULL);
2387 24df9a28 2023-07-08 jrick if (error != NULL)
2388 24df9a28 2023-07-08 jrick goto done;
2390 24df9a28 2023-07-08 jrick if (got_ref_is_symbolic(head_ref)) {
2391 24df9a28 2023-07-08 jrick error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2392 24df9a28 2023-07-08 jrick if (error)
2393 24df9a28 2023-07-08 jrick goto done;
2394 24df9a28 2023-07-08 jrick refname = got_ref_get_name(ref);
2396 24df9a28 2023-07-08 jrick refname = got_ref_get_name(head_ref);
2397 24df9a28 2023-07-08 jrick printf("Checked out %s: %s\n", refname, commit_id_str);
2398 24df9a28 2023-07-08 jrick printf("Now shut up and hack\n");
2399 24df9a28 2023-07-08 jrick if (cpa.had_base_commit_ref_error)
2400 24df9a28 2023-07-08 jrick show_worktree_base_ref_warning();
2402 24df9a28 2023-07-08 jrick if (pack_fds) {
2403 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
2404 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
2405 24df9a28 2023-07-08 jrick if (error == NULL)
2406 24df9a28 2023-07-08 jrick error = pack_err;
2408 24df9a28 2023-07-08 jrick if (head_ref)
2409 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
2411 24df9a28 2023-07-08 jrick got_ref_close(ref);
2412 24df9a28 2023-07-08 jrick if (repo) {
2413 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
2414 24df9a28 2023-07-08 jrick if (error == NULL)
2415 24df9a28 2023-07-08 jrick error = close_err;
2417 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2418 24df9a28 2023-07-08 jrick free(commit_id_str);
2419 24df9a28 2023-07-08 jrick free(commit_id);
2420 24df9a28 2023-07-08 jrick free(repo_path);
2421 24df9a28 2023-07-08 jrick free(worktree_path);
2422 24df9a28 2023-07-08 jrick free(cwd);
2423 24df9a28 2023-07-08 jrick return error;
2426 24df9a28 2023-07-08 jrick struct got_update_progress_arg {
2427 24df9a28 2023-07-08 jrick int did_something;
2428 24df9a28 2023-07-08 jrick int conflicts;
2429 24df9a28 2023-07-08 jrick int obstructed;
2430 24df9a28 2023-07-08 jrick int not_updated;
2431 24df9a28 2023-07-08 jrick int missing;
2432 24df9a28 2023-07-08 jrick int not_deleted;
2433 24df9a28 2023-07-08 jrick int unversioned;
2434 24df9a28 2023-07-08 jrick int verbosity;
2437 24df9a28 2023-07-08 jrick static void
2438 24df9a28 2023-07-08 jrick print_update_progress_stats(struct got_update_progress_arg *upa)
2440 24df9a28 2023-07-08 jrick if (!upa->did_something)
2443 24df9a28 2023-07-08 jrick if (upa->conflicts > 0)
2444 24df9a28 2023-07-08 jrick printf("Files with new merge conflicts: %d\n", upa->conflicts);
2445 24df9a28 2023-07-08 jrick if (upa->obstructed > 0)
2446 24df9a28 2023-07-08 jrick printf("File paths obstructed by a non-regular file: %d\n",
2447 24df9a28 2023-07-08 jrick upa->obstructed);
2448 24df9a28 2023-07-08 jrick if (upa->not_updated > 0)
2449 24df9a28 2023-07-08 jrick printf("Files not updated because of existing merge "
2450 24df9a28 2023-07-08 jrick "conflicts: %d\n", upa->not_updated);
2454 24df9a28 2023-07-08 jrick * The meaning of some status codes differs between merge-style operations and
2455 24df9a28 2023-07-08 jrick * update operations. For example, the ! status code means "file was missing"
2456 24df9a28 2023-07-08 jrick * if changes were merged into the work tree, and "missing file was restored"
2457 24df9a28 2023-07-08 jrick * if the work tree was updated. This function should be used by any operation
2458 24df9a28 2023-07-08 jrick * which merges changes into the work tree without updating the work tree.
2460 24df9a28 2023-07-08 jrick static void
2461 24df9a28 2023-07-08 jrick print_merge_progress_stats(struct got_update_progress_arg *upa)
2463 24df9a28 2023-07-08 jrick if (!upa->did_something)
2466 24df9a28 2023-07-08 jrick if (upa->conflicts > 0)
2467 24df9a28 2023-07-08 jrick printf("Files with new merge conflicts: %d\n", upa->conflicts);
2468 24df9a28 2023-07-08 jrick if (upa->obstructed > 0)
2469 24df9a28 2023-07-08 jrick printf("File paths obstructed by a non-regular file: %d\n",
2470 24df9a28 2023-07-08 jrick upa->obstructed);
2471 24df9a28 2023-07-08 jrick if (upa->missing > 0)
2472 24df9a28 2023-07-08 jrick printf("Files which had incoming changes but could not be "
2473 24df9a28 2023-07-08 jrick "found in the work tree: %d\n", upa->missing);
2474 24df9a28 2023-07-08 jrick if (upa->not_deleted > 0)
2475 24df9a28 2023-07-08 jrick printf("Files not deleted due to differences in deleted "
2476 24df9a28 2023-07-08 jrick "content: %d\n", upa->not_deleted);
2477 24df9a28 2023-07-08 jrick if (upa->unversioned > 0)
2478 24df9a28 2023-07-08 jrick printf("Files not merged because an unversioned file was "
2479 24df9a28 2023-07-08 jrick "found in the work tree: %d\n", upa->unversioned);
2482 24df9a28 2023-07-08 jrick __dead static void
2483 24df9a28 2023-07-08 jrick usage_update(void)
2485 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2486 24df9a28 2023-07-08 jrick "[path ...]\n", getprogname());
2490 24df9a28 2023-07-08 jrick static const struct got_error *
2491 24df9a28 2023-07-08 jrick update_progress(void *arg, unsigned char status, const char *path)
2493 24df9a28 2023-07-08 jrick struct got_update_progress_arg *upa = arg;
2495 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_EXISTS ||
2496 24df9a28 2023-07-08 jrick status == GOT_STATUS_BASE_REF_ERR)
2497 24df9a28 2023-07-08 jrick return NULL;
2499 24df9a28 2023-07-08 jrick upa->did_something = 1;
2501 24df9a28 2023-07-08 jrick /* Base commit bump happens silently. */
2502 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_BUMP_BASE)
2503 24df9a28 2023-07-08 jrick return NULL;
2505 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CONFLICT)
2506 24df9a28 2023-07-08 jrick upa->conflicts++;
2507 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_OBSTRUCTED)
2508 24df9a28 2023-07-08 jrick upa->obstructed++;
2509 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CANNOT_UPDATE)
2510 24df9a28 2023-07-08 jrick upa->not_updated++;
2511 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_MISSING)
2512 24df9a28 2023-07-08 jrick upa->missing++;
2513 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CANNOT_DELETE)
2514 24df9a28 2023-07-08 jrick upa->not_deleted++;
2515 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_UNVERSIONED)
2516 24df9a28 2023-07-08 jrick upa->unversioned++;
2518 24df9a28 2023-07-08 jrick while (path[0] == '/')
2520 24df9a28 2023-07-08 jrick if (upa->verbosity >= 0)
2521 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
2523 24df9a28 2023-07-08 jrick return NULL;
2526 24df9a28 2023-07-08 jrick static const struct got_error *
2527 24df9a28 2023-07-08 jrick check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2529 24df9a28 2023-07-08 jrick const struct got_error *err;
2530 24df9a28 2023-07-08 jrick int in_progress;
2532 24df9a28 2023-07-08 jrick err = got_worktree_rebase_in_progress(&in_progress, worktree);
2534 24df9a28 2023-07-08 jrick return err;
2535 24df9a28 2023-07-08 jrick if (in_progress)
2536 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_REBASING);
2538 24df9a28 2023-07-08 jrick err = got_worktree_histedit_in_progress(&in_progress, worktree);
2540 24df9a28 2023-07-08 jrick return err;
2541 24df9a28 2023-07-08 jrick if (in_progress)
2542 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_HISTEDIT_BUSY);
2544 24df9a28 2023-07-08 jrick return NULL;
2547 24df9a28 2023-07-08 jrick static const struct got_error *
2548 24df9a28 2023-07-08 jrick check_merge_in_progress(struct got_worktree *worktree,
2549 24df9a28 2023-07-08 jrick struct got_repository *repo)
2551 24df9a28 2023-07-08 jrick const struct got_error *err;
2552 24df9a28 2023-07-08 jrick int in_progress;
2554 24df9a28 2023-07-08 jrick err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2556 24df9a28 2023-07-08 jrick return err;
2557 24df9a28 2023-07-08 jrick if (in_progress)
2558 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_MERGE_BUSY);
2560 24df9a28 2023-07-08 jrick return NULL;
2563 24df9a28 2023-07-08 jrick static const struct got_error *
2564 24df9a28 2023-07-08 jrick get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2565 24df9a28 2023-07-08 jrick char *argv[], struct got_worktree *worktree)
2567 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
2568 24df9a28 2023-07-08 jrick char *path;
2569 24df9a28 2023-07-08 jrick struct got_pathlist_entry *new;
2572 24df9a28 2023-07-08 jrick if (argc == 0) {
2573 24df9a28 2023-07-08 jrick path = strdup("");
2574 24df9a28 2023-07-08 jrick if (path == NULL)
2575 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
2576 24df9a28 2023-07-08 jrick return got_pathlist_append(paths, path, NULL);
2579 24df9a28 2023-07-08 jrick for (i = 0; i < argc; i++) {
2580 24df9a28 2023-07-08 jrick err = got_worktree_resolve_path(&path, worktree, argv[i]);
2583 24df9a28 2023-07-08 jrick err = got_pathlist_insert(&new, paths, path, NULL);
2584 24df9a28 2023-07-08 jrick if (err || new == NULL /* duplicate */) {
2585 24df9a28 2023-07-08 jrick free(path);
2591 24df9a28 2023-07-08 jrick return err;
2594 24df9a28 2023-07-08 jrick static const struct got_error *
2595 24df9a28 2023-07-08 jrick wrap_not_worktree_error(const struct got_error *orig_err,
2596 24df9a28 2023-07-08 jrick const char *cmdname, const char *path)
2598 24df9a28 2023-07-08 jrick const struct got_error *err;
2599 24df9a28 2023-07-08 jrick struct got_repository *repo;
2600 24df9a28 2023-07-08 jrick static char msg[512];
2601 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
2603 24df9a28 2023-07-08 jrick err = got_repo_pack_fds_open(&pack_fds);
2605 24df9a28 2023-07-08 jrick return err;
2607 24df9a28 2023-07-08 jrick err = got_repo_open(&repo, path, NULL, pack_fds);
2609 24df9a28 2023-07-08 jrick return orig_err;
2611 24df9a28 2023-07-08 jrick snprintf(msg, sizeof(msg),
2612 24df9a28 2023-07-08 jrick "'got %s' needs a work tree in addition to a git repository\n"
2613 24df9a28 2023-07-08 jrick "Work trees can be checked out from this Git repository with "
2614 24df9a28 2023-07-08 jrick "'got checkout'.\n"
2615 24df9a28 2023-07-08 jrick "The got(1) manual page contains more information.", cmdname);
2616 24df9a28 2023-07-08 jrick err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2617 24df9a28 2023-07-08 jrick if (repo) {
2618 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
2619 24df9a28 2023-07-08 jrick if (err == NULL)
2620 24df9a28 2023-07-08 jrick err = close_err;
2622 24df9a28 2023-07-08 jrick if (pack_fds) {
2623 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
2624 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
2625 24df9a28 2023-07-08 jrick if (err == NULL)
2626 24df9a28 2023-07-08 jrick err = pack_err;
2628 24df9a28 2023-07-08 jrick return err;
2631 24df9a28 2023-07-08 jrick static const struct got_error *
2632 24df9a28 2023-07-08 jrick cmd_update(int argc, char *argv[])
2634 24df9a28 2023-07-08 jrick const struct got_error *error = NULL, *unlock_err;
2635 24df9a28 2023-07-08 jrick char *worktree_path = NULL;
2636 24df9a28 2023-07-08 jrick const char *repo_path = NULL;
2637 24df9a28 2023-07-08 jrick const char *remote_name = NULL;
2638 24df9a28 2023-07-08 jrick char *proto = NULL, *host = NULL, *port = NULL;
2639 24df9a28 2023-07-08 jrick char *repo_name = NULL, *server_path = NULL;
2640 24df9a28 2023-07-08 jrick const struct got_remote_repo *remotes, *remote = NULL;
2641 24df9a28 2023-07-08 jrick int nremotes;
2642 24df9a28 2023-07-08 jrick char *id_str = NULL;
2643 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
2644 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
2645 24df9a28 2023-07-08 jrick const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2646 24df9a28 2023-07-08 jrick struct got_pathlist_head paths, refs, symrefs;
2647 24df9a28 2023-07-08 jrick struct got_pathlist_head wanted_branches, wanted_refs;
2648 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
2649 24df9a28 2023-07-08 jrick struct got_reflist_head remote_refs;
2650 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
2651 24df9a28 2023-07-08 jrick struct got_object_id *pack_hash = NULL;
2652 24df9a28 2023-07-08 jrick int i, ch, fetchfd = -1, fetchstatus;
2653 24df9a28 2023-07-08 jrick pid_t fetchpid = -1;
2654 24df9a28 2023-07-08 jrick struct got_fetch_progress_arg fpa;
2655 24df9a28 2023-07-08 jrick struct got_update_progress_arg upa;
2656 24df9a28 2023-07-08 jrick int verbosity = 0;
2657 24df9a28 2023-07-08 jrick int delete_remote = 0;
2658 24df9a28 2023-07-08 jrick int replace_tags = 0;
2659 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
2660 24df9a28 2023-07-08 jrick const char *remote_head = NULL, *worktree_branch = NULL;
2661 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
2662 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
2663 24df9a28 2023-07-08 jrick const char *refname;
2664 24df9a28 2023-07-08 jrick struct got_reference *head_ref = NULL;
2666 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
2667 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
2668 24df9a28 2023-07-08 jrick TAILQ_INIT(&symrefs);
2669 24df9a28 2023-07-08 jrick TAILQ_INIT(&remote_refs);
2670 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_branches);
2671 24df9a28 2023-07-08 jrick TAILQ_INIT(&wanted_refs);
2673 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2674 24df9a28 2023-07-08 jrick switch (ch) {
2675 24df9a28 2023-07-08 jrick case 'c':
2676 24df9a28 2023-07-08 jrick commit_id_str = strdup(optarg);
2677 24df9a28 2023-07-08 jrick if (commit_id_str == NULL)
2678 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
2680 24df9a28 2023-07-08 jrick case 't':
2681 24df9a28 2023-07-08 jrick replace_tags = 1;
2683 24df9a28 2023-07-08 jrick case 'q':
2684 24df9a28 2023-07-08 jrick verbosity = -1;
2686 24df9a28 2023-07-08 jrick case 'r':
2687 24df9a28 2023-07-08 jrick remote_name = optarg;
2689 24df9a28 2023-07-08 jrick case 'v':
2690 24df9a28 2023-07-08 jrick if (verbosity < 0)
2691 24df9a28 2023-07-08 jrick verbosity = 0;
2692 24df9a28 2023-07-08 jrick else if (verbosity < 3)
2693 24df9a28 2023-07-08 jrick verbosity++;
2695 24df9a28 2023-07-08 jrick case 'X':
2696 24df9a28 2023-07-08 jrick delete_remote = 1;
2699 24df9a28 2023-07-08 jrick usage_update();
2703 24df9a28 2023-07-08 jrick argc -= optind;
2704 24df9a28 2023-07-08 jrick argv += optind;
2706 24df9a28 2023-07-08 jrick if (delete_remote) {
2707 24df9a28 2023-07-08 jrick if (replace_tags)
2708 24df9a28 2023-07-08 jrick option_conflict('X', 't');
2709 24df9a28 2023-07-08 jrick if (remote_name == NULL)
2710 24df9a28 2023-07-08 jrick errx(1, "-X option requires a remote name");
2712 24df9a28 2023-07-08 jrick if (remote_name == NULL)
2713 24df9a28 2023-07-08 jrick remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2715 24df9a28 2023-07-08 jrick worktree_path = getcwd(NULL, 0);
2716 24df9a28 2023-07-08 jrick if (worktree_path == NULL) {
2717 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
2718 24df9a28 2023-07-08 jrick goto done;
2720 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, worktree_path, GOT_WORKTREE_CVG_DIR);
2721 24df9a28 2023-07-08 jrick if (error) {
2722 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
2723 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "update",
2724 24df9a28 2023-07-08 jrick worktree_path);
2725 24df9a28 2023-07-08 jrick goto done;
2727 24df9a28 2023-07-08 jrick repo_path = got_worktree_get_repo_path(worktree);
2729 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
2730 24df9a28 2023-07-08 jrick if (error != NULL)
2731 24df9a28 2023-07-08 jrick goto done;
2733 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2734 24df9a28 2023-07-08 jrick if (error)
2735 24df9a28 2023-07-08 jrick goto done;
2737 24df9a28 2023-07-08 jrick error = check_rebase_or_histedit_in_progress(worktree);
2738 24df9a28 2023-07-08 jrick if (error)
2739 24df9a28 2023-07-08 jrick goto done;
2740 24df9a28 2023-07-08 jrick error = check_merge_in_progress(worktree, repo);
2741 24df9a28 2023-07-08 jrick if (error)
2742 24df9a28 2023-07-08 jrick goto done;
2744 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2745 24df9a28 2023-07-08 jrick if (error)
2746 24df9a28 2023-07-08 jrick goto done;
2748 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
2749 24df9a28 2023-07-08 jrick if (worktree_conf) {
2750 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
2751 24df9a28 2023-07-08 jrick worktree_conf);
2752 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
2753 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
2754 24df9a28 2023-07-08 jrick remote = &remotes[i];
2760 24df9a28 2023-07-08 jrick if (remote == NULL) {
2761 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
2762 24df9a28 2023-07-08 jrick if (repo_conf) {
2763 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
2764 24df9a28 2023-07-08 jrick repo_conf);
2765 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
2766 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
2767 24df9a28 2023-07-08 jrick remote = &remotes[i];
2773 24df9a28 2023-07-08 jrick if (remote == NULL) {
2774 24df9a28 2023-07-08 jrick got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2775 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
2776 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
2777 24df9a28 2023-07-08 jrick remote = &remotes[i];
2782 24df9a28 2023-07-08 jrick if (remote == NULL) {
2783 24df9a28 2023-07-08 jrick error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2784 24df9a28 2023-07-08 jrick goto done;
2787 24df9a28 2023-07-08 jrick error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2788 24df9a28 2023-07-08 jrick &repo_name, remote->fetch_url);
2789 24df9a28 2023-07-08 jrick if (error)
2790 24df9a28 2023-07-08 jrick goto done;
2792 24df9a28 2023-07-08 jrick if (strcmp(proto, "git") == 0) {
2793 24df9a28 2023-07-08 jrick #ifndef PROFILE
2794 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2795 24df9a28 2023-07-08 jrick "sendfd dns inet unveil", NULL) == -1)
2796 24df9a28 2023-07-08 jrick err(1, "pledge");
2798 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "git+ssh") == 0 ||
2799 24df9a28 2023-07-08 jrick strcmp(proto, "ssh") == 0) {
2800 24df9a28 2023-07-08 jrick #ifndef PROFILE
2801 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2802 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
2803 24df9a28 2023-07-08 jrick err(1, "pledge");
2805 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "http") == 0 ||
2806 24df9a28 2023-07-08 jrick strcmp(proto, "git+http") == 0) {
2807 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2808 24df9a28 2023-07-08 jrick goto done;
2810 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2811 24df9a28 2023-07-08 jrick goto done;
2814 24df9a28 2023-07-08 jrick error = got_dial_apply_unveil(proto);
2815 24df9a28 2023-07-08 jrick if (error)
2816 24df9a28 2023-07-08 jrick goto done;
2818 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
2819 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
2820 24df9a28 2023-07-08 jrick if (error)
2821 24df9a28 2023-07-08 jrick goto done;
2823 24df9a28 2023-07-08 jrick if (verbosity >= 0) {
2824 24df9a28 2023-07-08 jrick printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2825 24df9a28 2023-07-08 jrick remote->name, proto, host,
2826 24df9a28 2023-07-08 jrick port ? ":" : "", port ? port : "",
2827 24df9a28 2023-07-08 jrick *server_path == '/' ? "" : "/", server_path);
2830 24df9a28 2023-07-08 jrick error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2831 24df9a28 2023-07-08 jrick server_path, verbosity);
2832 24df9a28 2023-07-08 jrick if (error)
2833 24df9a28 2023-07-08 jrick goto done;
2836 24df9a28 2023-07-08 jrick * If set, get this remote's HEAD ref target so
2837 24df9a28 2023-07-08 jrick * if it has changed on the server we can fetch it.
2839 24df9a28 2023-07-08 jrick error = got_ref_list(&remote_refs, repo, "refs/remotes",
2840 24df9a28 2023-07-08 jrick got_ref_cmp_by_name, repo);
2841 24df9a28 2023-07-08 jrick if (error)
2842 24df9a28 2023-07-08 jrick goto done;
2844 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &remote_refs, entry) {
2845 24df9a28 2023-07-08 jrick const char *remote_refname, *remote_target;
2846 24df9a28 2023-07-08 jrick size_t remote_name_len;
2848 24df9a28 2023-07-08 jrick if (!got_ref_is_symbolic(re->ref))
2849 24df9a28 2023-07-08 jrick continue;
2851 24df9a28 2023-07-08 jrick remote_name_len = strlen(remote->name);
2852 24df9a28 2023-07-08 jrick remote_refname = got_ref_get_name(re->ref);
2854 24df9a28 2023-07-08 jrick /* we only want refs/remotes/$remote->name/HEAD */
2855 24df9a28 2023-07-08 jrick if (strncmp(remote_refname + 13, remote->name,
2856 24df9a28 2023-07-08 jrick remote_name_len) != 0)
2857 24df9a28 2023-07-08 jrick continue;
2859 24df9a28 2023-07-08 jrick if (strcmp(remote_refname + remote_name_len + 14,
2860 24df9a28 2023-07-08 jrick GOT_REF_HEAD) != 0)
2861 24df9a28 2023-07-08 jrick continue;
2864 24df9a28 2023-07-08 jrick * Take the name itself because we already
2865 24df9a28 2023-07-08 jrick * only match with refs/heads/ in fetch_pack().
2867 24df9a28 2023-07-08 jrick remote_target = got_ref_get_symref_target(re->ref);
2868 24df9a28 2023-07-08 jrick remote_head = remote_target + remote_name_len + 14;
2872 24df9a28 2023-07-08 jrick refname = got_worktree_get_head_ref_name(worktree);
2873 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/heads/", 11) == 0)
2874 24df9a28 2023-07-08 jrick worktree_branch = refname;
2876 24df9a28 2023-07-08 jrick fpa.last_scaled_size[0] = '\0';
2877 24df9a28 2023-07-08 jrick fpa.last_p_indexed = -1;
2878 24df9a28 2023-07-08 jrick fpa.last_p_resolved = -1;
2879 24df9a28 2023-07-08 jrick fpa.verbosity = verbosity;
2880 24df9a28 2023-07-08 jrick fpa.repo = repo;
2881 24df9a28 2023-07-08 jrick fpa.create_configs = 0;
2882 24df9a28 2023-07-08 jrick fpa.configs_created = 0;
2883 24df9a28 2023-07-08 jrick memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2885 24df9a28 2023-07-08 jrick error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2886 24df9a28 2023-07-08 jrick remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2887 24df9a28 2023-07-08 jrick 0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2888 24df9a28 2023-07-08 jrick 0, fetch_progress, &fpa);
2889 24df9a28 2023-07-08 jrick if (error)
2890 24df9a28 2023-07-08 jrick goto done;
2892 24df9a28 2023-07-08 jrick if (pack_hash != NULL && verbosity >= 0) {
2893 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, pack_hash);
2894 24df9a28 2023-07-08 jrick if (error)
2895 24df9a28 2023-07-08 jrick goto done;
2896 24df9a28 2023-07-08 jrick printf("\nFetched %s.pack\n", id_str);
2897 24df9a28 2023-07-08 jrick free(id_str);
2898 24df9a28 2023-07-08 jrick id_str = NULL;
2901 24df9a28 2023-07-08 jrick /* Update references provided with the pack file. */
2902 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &refs, entry) {
2903 24df9a28 2023-07-08 jrick const char *refname = pe->path;
2904 24df9a28 2023-07-08 jrick struct got_object_id *id = pe->data;
2905 24df9a28 2023-07-08 jrick struct got_reference *ref;
2907 24df9a28 2023-07-08 jrick if (is_wanted_ref(&wanted_refs, refname)) {
2908 24df9a28 2023-07-08 jrick error = update_wanted_ref(refname, id,
2909 24df9a28 2023-07-08 jrick remote->name, verbosity, repo);
2910 24df9a28 2023-07-08 jrick if (error)
2911 24df9a28 2023-07-08 jrick goto done;
2912 24df9a28 2023-07-08 jrick continue;
2915 24df9a28 2023-07-08 jrick error = got_ref_open(&ref, repo, refname, 1);
2916 24df9a28 2023-07-08 jrick if (error) {
2917 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF)
2918 24df9a28 2023-07-08 jrick goto done;
2919 24df9a28 2023-07-08 jrick error = create_ref(refname, id, verbosity,
2921 24df9a28 2023-07-08 jrick if (error)
2922 24df9a28 2023-07-08 jrick goto done;
2924 24df9a28 2023-07-08 jrick error = update_ref(ref, id, replace_tags,
2925 24df9a28 2023-07-08 jrick verbosity-1, repo);
2926 24df9a28 2023-07-08 jrick unlock_err = got_ref_unlock(ref);
2927 24df9a28 2023-07-08 jrick if (unlock_err && error == NULL)
2928 24df9a28 2023-07-08 jrick error = unlock_err;
2929 24df9a28 2023-07-08 jrick got_ref_close(ref);
2930 24df9a28 2023-07-08 jrick if (error)
2931 24df9a28 2023-07-08 jrick goto done;
2935 24df9a28 2023-07-08 jrick /* Update worktree */
2936 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo,
2937 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree), 0);
2938 24df9a28 2023-07-08 jrick if (error != NULL)
2939 24df9a28 2023-07-08 jrick goto done;
2940 24df9a28 2023-07-08 jrick if (commit_id_str == NULL) {
2941 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
2942 24df9a28 2023-07-08 jrick if (error != NULL)
2943 24df9a28 2023-07-08 jrick goto done;
2944 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2945 24df9a28 2023-07-08 jrick if (error != NULL)
2946 24df9a28 2023-07-08 jrick goto done;
2948 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
2949 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
2950 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2952 24df9a28 2023-07-08 jrick if (error)
2953 24df9a28 2023-07-08 jrick goto done;
2954 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
2955 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2956 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
2957 24df9a28 2023-07-08 jrick free(commit_id_str);
2958 24df9a28 2023-07-08 jrick commit_id_str = NULL;
2959 24df9a28 2023-07-08 jrick if (error)
2960 24df9a28 2023-07-08 jrick goto done;
2961 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
2962 24df9a28 2023-07-08 jrick if (error)
2963 24df9a28 2023-07-08 jrick goto done;
2967 24df9a28 2023-07-08 jrick error = check_linear_ancestry(commit_id,
2968 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree), 0, repo);
2969 24df9a28 2023-07-08 jrick if (error != NULL) {
2970 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_ANCESTRY)
2971 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_BRANCH_MOVED);
2972 24df9a28 2023-07-08 jrick goto done;
2974 24df9a28 2023-07-08 jrick error = check_same_branch(commit_id, head_ref, repo);
2975 24df9a28 2023-07-08 jrick if (error)
2976 24df9a28 2023-07-08 jrick goto done;
2978 24df9a28 2023-07-08 jrick if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2979 24df9a28 2023-07-08 jrick commit_id) != 0) {
2980 24df9a28 2023-07-08 jrick error = got_worktree_set_base_commit_id(worktree, repo,
2981 24df9a28 2023-07-08 jrick commit_id);
2982 24df9a28 2023-07-08 jrick if (error)
2983 24df9a28 2023-07-08 jrick goto done;
2986 24df9a28 2023-07-08 jrick memset(&upa, 0, sizeof(upa));
2987 24df9a28 2023-07-08 jrick upa.verbosity = verbosity;
2988 24df9a28 2023-07-08 jrick error = got_worktree_checkout_files(worktree, &paths, repo,
2989 24df9a28 2023-07-08 jrick update_progress, &upa, check_cancelled, NULL);
2990 24df9a28 2023-07-08 jrick if (error != NULL)
2991 24df9a28 2023-07-08 jrick goto done;
2993 24df9a28 2023-07-08 jrick if (upa.did_something) {
2994 24df9a28 2023-07-08 jrick printf("Updated to %s: %s\n",
2995 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree), commit_id_str);
2997 24df9a28 2023-07-08 jrick printf("Already up-to-date\n");
2999 24df9a28 2023-07-08 jrick print_update_progress_stats(&upa);
3001 24df9a28 2023-07-08 jrick if (fetchpid > 0) {
3002 24df9a28 2023-07-08 jrick if (kill(fetchpid, SIGTERM) == -1)
3003 24df9a28 2023-07-08 jrick error = got_error_from_errno("kill");
3004 24df9a28 2023-07-08 jrick if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
3005 24df9a28 2023-07-08 jrick error = got_error_from_errno("waitpid");
3007 24df9a28 2023-07-08 jrick if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3008 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
3009 24df9a28 2023-07-08 jrick if (repo) {
3010 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
3011 24df9a28 2023-07-08 jrick if (error == NULL)
3012 24df9a28 2023-07-08 jrick error = close_err;
3014 24df9a28 2023-07-08 jrick if (worktree)
3015 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
3016 24df9a28 2023-07-08 jrick if (pack_fds) {
3017 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
3018 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
3019 24df9a28 2023-07-08 jrick if (error == NULL)
3020 24df9a28 2023-07-08 jrick error = pack_err;
3022 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3023 24df9a28 2023-07-08 jrick got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3024 24df9a28 2023-07-08 jrick got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3025 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3026 24df9a28 2023-07-08 jrick got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3027 24df9a28 2023-07-08 jrick got_ref_list_free(&remote_refs);
3028 24df9a28 2023-07-08 jrick free(id_str);
3029 24df9a28 2023-07-08 jrick free(worktree_path);
3030 24df9a28 2023-07-08 jrick free(pack_hash);
3031 24df9a28 2023-07-08 jrick free(proto);
3032 24df9a28 2023-07-08 jrick free(host);
3033 24df9a28 2023-07-08 jrick free(port);
3034 24df9a28 2023-07-08 jrick free(server_path);
3035 24df9a28 2023-07-08 jrick free(repo_name);
3036 24df9a28 2023-07-08 jrick free(commit_id);
3037 24df9a28 2023-07-08 jrick free(commit_id_str);
3038 24df9a28 2023-07-08 jrick return error;
3041 24df9a28 2023-07-08 jrick static const struct got_error *
3042 24df9a28 2023-07-08 jrick diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3043 24df9a28 2023-07-08 jrick const char *path, int diff_context, int ignore_whitespace,
3044 24df9a28 2023-07-08 jrick int force_text_diff, struct got_diffstat_cb_arg *dsa,
3045 24df9a28 2023-07-08 jrick struct got_repository *repo, FILE *outfile)
3047 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3048 24df9a28 2023-07-08 jrick struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3049 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
3050 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
3052 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
3053 24df9a28 2023-07-08 jrick if (fd1 == -1)
3054 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
3055 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
3056 24df9a28 2023-07-08 jrick if (fd2 == -1) {
3057 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3058 24df9a28 2023-07-08 jrick goto done;
3061 24df9a28 2023-07-08 jrick if (blob_id1) {
3062 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3065 24df9a28 2023-07-08 jrick goto done;
3068 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3070 24df9a28 2023-07-08 jrick goto done;
3072 24df9a28 2023-07-08 jrick f1 = got_opentemp();
3073 24df9a28 2023-07-08 jrick if (f1 == NULL) {
3074 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3075 24df9a28 2023-07-08 jrick goto done;
3077 24df9a28 2023-07-08 jrick f2 = got_opentemp();
3078 24df9a28 2023-07-08 jrick if (f2 == NULL) {
3079 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3080 24df9a28 2023-07-08 jrick goto done;
3083 24df9a28 2023-07-08 jrick while (path[0] == '/')
3085 24df9a28 2023-07-08 jrick err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3086 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3087 24df9a28 2023-07-08 jrick force_text_diff, dsa, outfile);
3089 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3090 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3091 24df9a28 2023-07-08 jrick if (blob1)
3092 24df9a28 2023-07-08 jrick got_object_blob_close(blob1);
3093 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3094 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3095 24df9a28 2023-07-08 jrick if (blob2)
3096 24df9a28 2023-07-08 jrick got_object_blob_close(blob2);
3097 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && err == NULL)
3098 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3099 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
3100 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3101 24df9a28 2023-07-08 jrick return err;
3104 24df9a28 2023-07-08 jrick static const struct got_error *
3105 24df9a28 2023-07-08 jrick diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3106 24df9a28 2023-07-08 jrick const char *path, int diff_context, int ignore_whitespace,
3107 24df9a28 2023-07-08 jrick int force_text_diff, struct got_diffstat_cb_arg *dsa,
3108 24df9a28 2023-07-08 jrick struct got_repository *repo, FILE *outfile)
3110 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3111 24df9a28 2023-07-08 jrick struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3112 24df9a28 2023-07-08 jrick struct got_diff_blob_output_unidiff_arg arg;
3113 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
3114 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
3116 24df9a28 2023-07-08 jrick if (tree_id1) {
3117 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree1, repo, tree_id1);
3119 24df9a28 2023-07-08 jrick goto done;
3120 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
3121 24df9a28 2023-07-08 jrick if (fd1 == -1) {
3122 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3123 24df9a28 2023-07-08 jrick goto done;
3127 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree2, repo, tree_id2);
3129 24df9a28 2023-07-08 jrick goto done;
3131 24df9a28 2023-07-08 jrick f1 = got_opentemp();
3132 24df9a28 2023-07-08 jrick if (f1 == NULL) {
3133 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3134 24df9a28 2023-07-08 jrick goto done;
3137 24df9a28 2023-07-08 jrick f2 = got_opentemp();
3138 24df9a28 2023-07-08 jrick if (f2 == NULL) {
3139 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3140 24df9a28 2023-07-08 jrick goto done;
3142 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
3143 24df9a28 2023-07-08 jrick if (fd2 == -1) {
3144 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3145 24df9a28 2023-07-08 jrick goto done;
3147 24df9a28 2023-07-08 jrick arg.diff_context = diff_context;
3148 24df9a28 2023-07-08 jrick arg.ignore_whitespace = ignore_whitespace;
3149 24df9a28 2023-07-08 jrick arg.force_text_diff = force_text_diff;
3150 24df9a28 2023-07-08 jrick arg.diffstat = dsa;
3151 24df9a28 2023-07-08 jrick arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3152 24df9a28 2023-07-08 jrick arg.outfile = outfile;
3153 24df9a28 2023-07-08 jrick arg.lines = NULL;
3154 24df9a28 2023-07-08 jrick arg.nlines = 0;
3155 24df9a28 2023-07-08 jrick while (path[0] == '/')
3157 24df9a28 2023-07-08 jrick err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3158 24df9a28 2023-07-08 jrick got_diff_blob_output_unidiff, &arg, 1);
3160 24df9a28 2023-07-08 jrick if (tree1)
3161 24df9a28 2023-07-08 jrick got_object_tree_close(tree1);
3162 24df9a28 2023-07-08 jrick if (tree2)
3163 24df9a28 2023-07-08 jrick got_object_tree_close(tree2);
3164 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && err == NULL)
3165 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3166 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
3167 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3168 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3169 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3170 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3171 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3172 24df9a28 2023-07-08 jrick return err;
3175 24df9a28 2023-07-08 jrick static const struct got_error *
3176 24df9a28 2023-07-08 jrick get_changed_paths(struct got_pathlist_head *paths,
3177 24df9a28 2023-07-08 jrick struct got_commit_object *commit, struct got_repository *repo,
3178 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg *dsa)
3180 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3181 24df9a28 2023-07-08 jrick struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3182 24df9a28 2023-07-08 jrick struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3183 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3184 24df9a28 2023-07-08 jrick got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3185 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
3186 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
3188 24df9a28 2023-07-08 jrick if (dsa) {
3189 24df9a28 2023-07-08 jrick cb = got_diff_tree_compute_diffstat;
3191 24df9a28 2023-07-08 jrick f1 = got_opentemp();
3192 24df9a28 2023-07-08 jrick if (f1 == NULL) {
3193 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3194 24df9a28 2023-07-08 jrick goto done;
3196 24df9a28 2023-07-08 jrick f2 = got_opentemp();
3197 24df9a28 2023-07-08 jrick if (f2 == NULL) {
3198 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3199 24df9a28 2023-07-08 jrick goto done;
3201 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
3202 24df9a28 2023-07-08 jrick if (fd1 == -1) {
3203 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3204 24df9a28 2023-07-08 jrick goto done;
3206 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
3207 24df9a28 2023-07-08 jrick if (fd2 == -1) {
3208 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
3209 24df9a28 2023-07-08 jrick goto done;
3213 24df9a28 2023-07-08 jrick qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3214 24df9a28 2023-07-08 jrick if (qid != NULL) {
3215 24df9a28 2023-07-08 jrick struct got_commit_object *pcommit;
3216 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&pcommit, repo,
3217 24df9a28 2023-07-08 jrick &qid->id);
3219 24df9a28 2023-07-08 jrick return err;
3221 24df9a28 2023-07-08 jrick tree_id1 = got_object_id_dup(
3222 24df9a28 2023-07-08 jrick got_object_commit_get_tree_id(pcommit));
3223 24df9a28 2023-07-08 jrick if (tree_id1 == NULL) {
3224 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
3225 24df9a28 2023-07-08 jrick return got_error_from_errno("got_object_id_dup");
3227 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
3231 24df9a28 2023-07-08 jrick if (tree_id1) {
3232 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree1, repo, tree_id1);
3234 24df9a28 2023-07-08 jrick goto done;
3237 24df9a28 2023-07-08 jrick tree_id2 = got_object_commit_get_tree_id(commit);
3238 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree2, repo, tree_id2);
3240 24df9a28 2023-07-08 jrick goto done;
3242 24df9a28 2023-07-08 jrick err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3243 24df9a28 2023-07-08 jrick cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3245 24df9a28 2023-07-08 jrick if (tree1)
3246 24df9a28 2023-07-08 jrick got_object_tree_close(tree1);
3247 24df9a28 2023-07-08 jrick if (tree2)
3248 24df9a28 2023-07-08 jrick got_object_tree_close(tree2);
3249 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3250 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3251 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3252 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
3253 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && err == NULL)
3254 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3255 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
3256 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3257 24df9a28 2023-07-08 jrick free(tree_id1);
3258 24df9a28 2023-07-08 jrick return err;
3261 24df9a28 2023-07-08 jrick static const struct got_error *
3262 24df9a28 2023-07-08 jrick print_patch(struct got_commit_object *commit, struct got_object_id *id,
3263 24df9a28 2023-07-08 jrick const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3264 24df9a28 2023-07-08 jrick struct got_repository *repo, FILE *outfile)
3266 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3267 24df9a28 2023-07-08 jrick struct got_commit_object *pcommit = NULL;
3268 24df9a28 2023-07-08 jrick char *id_str1 = NULL, *id_str2 = NULL;
3269 24df9a28 2023-07-08 jrick struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3270 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3272 24df9a28 2023-07-08 jrick qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3273 24df9a28 2023-07-08 jrick if (qid != NULL) {
3274 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&pcommit, repo,
3275 24df9a28 2023-07-08 jrick &qid->id);
3277 24df9a28 2023-07-08 jrick return err;
3278 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str1, &qid->id);
3280 24df9a28 2023-07-08 jrick goto done;
3283 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str2, id);
3285 24df9a28 2023-07-08 jrick goto done;
3287 24df9a28 2023-07-08 jrick if (path && path[0] != '\0') {
3288 24df9a28 2023-07-08 jrick int obj_type;
3289 24df9a28 2023-07-08 jrick err = got_object_id_by_path(&obj_id2, repo, commit, path);
3291 24df9a28 2023-07-08 jrick goto done;
3292 24df9a28 2023-07-08 jrick if (pcommit) {
3293 24df9a28 2023-07-08 jrick err = got_object_id_by_path(&obj_id1, repo,
3294 24df9a28 2023-07-08 jrick pcommit, path);
3295 24df9a28 2023-07-08 jrick if (err) {
3296 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3297 24df9a28 2023-07-08 jrick free(obj_id2);
3298 24df9a28 2023-07-08 jrick goto done;
3302 24df9a28 2023-07-08 jrick err = got_object_get_type(&obj_type, repo, obj_id2);
3303 24df9a28 2023-07-08 jrick if (err) {
3304 24df9a28 2023-07-08 jrick free(obj_id2);
3305 24df9a28 2023-07-08 jrick goto done;
3307 24df9a28 2023-07-08 jrick fprintf(outfile,
3308 24df9a28 2023-07-08 jrick "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3309 24df9a28 2023-07-08 jrick fprintf(outfile, "commit - %s\n",
3310 24df9a28 2023-07-08 jrick id_str1 ? id_str1 : "/dev/null");
3311 24df9a28 2023-07-08 jrick fprintf(outfile, "commit + %s\n", id_str2);
3312 24df9a28 2023-07-08 jrick switch (obj_type) {
3313 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
3314 24df9a28 2023-07-08 jrick err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3315 24df9a28 2023-07-08 jrick 0, 0, dsa, repo, outfile);
3317 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
3318 24df9a28 2023-07-08 jrick err = diff_trees(obj_id1, obj_id2, path, diff_context,
3319 24df9a28 2023-07-08 jrick 0, 0, dsa, repo, outfile);
3322 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_OBJ_TYPE);
3325 24df9a28 2023-07-08 jrick free(obj_id1);
3326 24df9a28 2023-07-08 jrick free(obj_id2);
3328 24df9a28 2023-07-08 jrick obj_id2 = got_object_commit_get_tree_id(commit);
3329 24df9a28 2023-07-08 jrick if (pcommit)
3330 24df9a28 2023-07-08 jrick obj_id1 = got_object_commit_get_tree_id(pcommit);
3331 24df9a28 2023-07-08 jrick fprintf(outfile,
3332 24df9a28 2023-07-08 jrick "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3333 24df9a28 2023-07-08 jrick fprintf(outfile, "commit - %s\n",
3334 24df9a28 2023-07-08 jrick id_str1 ? id_str1 : "/dev/null");
3335 24df9a28 2023-07-08 jrick fprintf(outfile, "commit + %s\n", id_str2);
3336 24df9a28 2023-07-08 jrick err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3337 24df9a28 2023-07-08 jrick dsa, repo, outfile);
3340 24df9a28 2023-07-08 jrick free(id_str1);
3341 24df9a28 2023-07-08 jrick free(id_str2);
3342 24df9a28 2023-07-08 jrick if (pcommit)
3343 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
3344 24df9a28 2023-07-08 jrick return err;
3347 24df9a28 2023-07-08 jrick static char *
3348 24df9a28 2023-07-08 jrick get_datestr(time_t *time, char *datebuf)
3350 24df9a28 2023-07-08 jrick struct tm mytm, *tm;
3351 24df9a28 2023-07-08 jrick char *p, *s;
3353 24df9a28 2023-07-08 jrick tm = gmtime_r(time, &mytm);
3354 24df9a28 2023-07-08 jrick if (tm == NULL)
3355 24df9a28 2023-07-08 jrick return NULL;
3356 24df9a28 2023-07-08 jrick s = asctime_r(tm, datebuf);
3357 24df9a28 2023-07-08 jrick if (s == NULL)
3358 24df9a28 2023-07-08 jrick return NULL;
3359 24df9a28 2023-07-08 jrick p = strchr(s, '\n');
3361 24df9a28 2023-07-08 jrick *p = '\0';
3362 24df9a28 2023-07-08 jrick return s;
3365 24df9a28 2023-07-08 jrick static const struct got_error *
3366 24df9a28 2023-07-08 jrick match_commit(int *have_match, struct got_object_id *id,
3367 24df9a28 2023-07-08 jrick struct got_commit_object *commit, regex_t *regex)
3369 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3370 24df9a28 2023-07-08 jrick regmatch_t regmatch;
3371 24df9a28 2023-07-08 jrick char *id_str = NULL, *logmsg = NULL;
3373 24df9a28 2023-07-08 jrick *have_match = 0;
3375 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
3377 24df9a28 2023-07-08 jrick return err;
3379 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg, commit);
3381 24df9a28 2023-07-08 jrick goto done;
3383 24df9a28 2023-07-08 jrick if (regexec(regex, got_object_commit_get_author(commit), 1,
3384 24df9a28 2023-07-08 jrick ®match, 0) == 0 ||
3385 24df9a28 2023-07-08 jrick regexec(regex, got_object_commit_get_committer(commit), 1,
3386 24df9a28 2023-07-08 jrick ®match, 0) == 0 ||
3387 24df9a28 2023-07-08 jrick regexec(regex, id_str, 1, ®match, 0) == 0 ||
3388 24df9a28 2023-07-08 jrick regexec(regex, logmsg, 1, ®match, 0) == 0)
3389 24df9a28 2023-07-08 jrick *have_match = 1;
3391 24df9a28 2023-07-08 jrick free(id_str);
3392 24df9a28 2023-07-08 jrick free(logmsg);
3393 24df9a28 2023-07-08 jrick return err;
3396 24df9a28 2023-07-08 jrick static void
3397 24df9a28 2023-07-08 jrick match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3398 24df9a28 2023-07-08 jrick regex_t *regex)
3400 24df9a28 2023-07-08 jrick regmatch_t regmatch;
3401 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
3403 24df9a28 2023-07-08 jrick *have_match = 0;
3405 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, changed_paths, entry) {
3406 24df9a28 2023-07-08 jrick if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3407 24df9a28 2023-07-08 jrick *have_match = 1;
3413 24df9a28 2023-07-08 jrick static const struct got_error *
3414 24df9a28 2023-07-08 jrick match_patch(int *have_match, struct got_commit_object *commit,
3415 24df9a28 2023-07-08 jrick struct got_object_id *id, const char *path, int diff_context,
3416 24df9a28 2023-07-08 jrick struct got_repository *repo, regex_t *regex, FILE *f)
3418 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3419 24df9a28 2023-07-08 jrick char *line = NULL;
3420 24df9a28 2023-07-08 jrick size_t linesize = 0;
3421 24df9a28 2023-07-08 jrick regmatch_t regmatch;
3423 24df9a28 2023-07-08 jrick *have_match = 0;
3425 24df9a28 2023-07-08 jrick err = got_opentemp_truncate(f);
3427 24df9a28 2023-07-08 jrick return err;
3429 24df9a28 2023-07-08 jrick err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3431 24df9a28 2023-07-08 jrick goto done;
3433 24df9a28 2023-07-08 jrick if (fseeko(f, 0L, SEEK_SET) == -1) {
3434 24df9a28 2023-07-08 jrick err = got_error_from_errno("fseeko");
3435 24df9a28 2023-07-08 jrick goto done;
3438 24df9a28 2023-07-08 jrick while (getline(&line, &linesize, f) != -1) {
3439 24df9a28 2023-07-08 jrick if (regexec(regex, line, 1, ®match, 0) == 0) {
3440 24df9a28 2023-07-08 jrick *have_match = 1;
3445 24df9a28 2023-07-08 jrick free(line);
3446 24df9a28 2023-07-08 jrick return err;
3449 24df9a28 2023-07-08 jrick #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3451 24df9a28 2023-07-08 jrick static const struct got_error*
3452 24df9a28 2023-07-08 jrick build_refs_str(char **refs_str, struct got_reflist_head *refs,
3453 24df9a28 2023-07-08 jrick struct got_object_id *id, struct got_repository *repo,
3454 24df9a28 2023-07-08 jrick int local_only)
3456 24df9a28 2023-07-08 jrick static const struct got_error *err = NULL;
3457 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
3459 24df9a28 2023-07-08 jrick const char *name;
3461 24df9a28 2023-07-08 jrick *refs_str = NULL;
3463 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, refs, entry) {
3464 24df9a28 2023-07-08 jrick struct got_tag_object *tag = NULL;
3465 24df9a28 2023-07-08 jrick struct got_object_id *ref_id;
3468 24df9a28 2023-07-08 jrick name = got_ref_get_name(re->ref);
3469 24df9a28 2023-07-08 jrick if (strcmp(name, GOT_REF_HEAD) == 0)
3470 24df9a28 2023-07-08 jrick continue;
3471 24df9a28 2023-07-08 jrick if (strncmp(name, "refs/", 5) == 0)
3472 24df9a28 2023-07-08 jrick name += 5;
3473 24df9a28 2023-07-08 jrick if (strncmp(name, "got/", 4) == 0)
3474 24df9a28 2023-07-08 jrick continue;
3475 24df9a28 2023-07-08 jrick if (strncmp(name, "heads/", 6) == 0)
3476 24df9a28 2023-07-08 jrick name += 6;
3477 24df9a28 2023-07-08 jrick if (strncmp(name, "remotes/", 8) == 0) {
3478 24df9a28 2023-07-08 jrick if (local_only)
3479 24df9a28 2023-07-08 jrick continue;
3480 24df9a28 2023-07-08 jrick name += 8;
3481 24df9a28 2023-07-08 jrick s = strstr(name, "/" GOT_REF_HEAD);
3482 24df9a28 2023-07-08 jrick if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3483 24df9a28 2023-07-08 jrick continue;
3485 24df9a28 2023-07-08 jrick err = got_ref_resolve(&ref_id, repo, re->ref);
3488 24df9a28 2023-07-08 jrick if (strncmp(name, "tags/", 5) == 0) {
3489 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&tag, repo, ref_id);
3490 24df9a28 2023-07-08 jrick if (err) {
3491 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_OBJ_TYPE) {
3492 24df9a28 2023-07-08 jrick free(ref_id);
3495 24df9a28 2023-07-08 jrick /* Ref points at something other than a tag. */
3496 24df9a28 2023-07-08 jrick err = NULL;
3497 24df9a28 2023-07-08 jrick tag = NULL;
3500 24df9a28 2023-07-08 jrick cmp = got_object_id_cmp(tag ?
3501 24df9a28 2023-07-08 jrick got_object_tag_get_object_id(tag) : ref_id, id);
3502 24df9a28 2023-07-08 jrick free(ref_id);
3504 24df9a28 2023-07-08 jrick got_object_tag_close(tag);
3505 24df9a28 2023-07-08 jrick if (cmp != 0)
3506 24df9a28 2023-07-08 jrick continue;
3507 24df9a28 2023-07-08 jrick s = *refs_str;
3508 24df9a28 2023-07-08 jrick if (asprintf(refs_str, "%s%s%s", s ? s : "",
3509 24df9a28 2023-07-08 jrick s ? ", " : "", name) == -1) {
3510 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
3512 24df9a28 2023-07-08 jrick *refs_str = NULL;
3518 24df9a28 2023-07-08 jrick return err;
3521 24df9a28 2023-07-08 jrick static const struct got_error *
3522 24df9a28 2023-07-08 jrick print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3523 24df9a28 2023-07-08 jrick struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3525 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3526 24df9a28 2023-07-08 jrick char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3527 24df9a28 2023-07-08 jrick char *comma, *s, *nl;
3528 24df9a28 2023-07-08 jrick struct got_reflist_head *refs;
3529 24df9a28 2023-07-08 jrick char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3530 24df9a28 2023-07-08 jrick struct tm tm;
3531 24df9a28 2023-07-08 jrick time_t committer_time;
3533 24df9a28 2023-07-08 jrick refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3534 24df9a28 2023-07-08 jrick if (refs) {
3535 24df9a28 2023-07-08 jrick err = build_refs_str(&ref_str, refs, id, repo, 1);
3537 24df9a28 2023-07-08 jrick return err;
3539 24df9a28 2023-07-08 jrick /* Display the first matching ref only. */
3540 24df9a28 2023-07-08 jrick if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3541 24df9a28 2023-07-08 jrick *comma = '\0';
3544 24df9a28 2023-07-08 jrick if (ref_str == NULL) {
3545 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
3547 24df9a28 2023-07-08 jrick return err;
3550 24df9a28 2023-07-08 jrick committer_time = got_object_commit_get_committer_time(commit);
3551 24df9a28 2023-07-08 jrick if (gmtime_r(&committer_time, &tm) == NULL) {
3552 24df9a28 2023-07-08 jrick err = got_error_from_errno("gmtime_r");
3553 24df9a28 2023-07-08 jrick goto done;
3555 24df9a28 2023-07-08 jrick if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3556 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
3557 24df9a28 2023-07-08 jrick goto done;
3560 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg0, commit);
3562 24df9a28 2023-07-08 jrick goto done;
3564 24df9a28 2023-07-08 jrick s = logmsg0;
3565 24df9a28 2023-07-08 jrick while (isspace((unsigned char)s[0]))
3568 24df9a28 2023-07-08 jrick nl = strchr(s, '\n');
3569 24df9a28 2023-07-08 jrick if (nl) {
3570 24df9a28 2023-07-08 jrick *nl = '\0';
3573 24df9a28 2023-07-08 jrick if (ref_str)
3574 24df9a28 2023-07-08 jrick printf("%s%-7s %s\n", datebuf, ref_str, s);
3576 24df9a28 2023-07-08 jrick printf("%s%.7s %s\n", datebuf, id_str, s);
3578 24df9a28 2023-07-08 jrick if (fflush(stdout) != 0 && err == NULL)
3579 24df9a28 2023-07-08 jrick err = got_error_from_errno("fflush");
3581 24df9a28 2023-07-08 jrick free(id_str);
3582 24df9a28 2023-07-08 jrick free(ref_str);
3583 24df9a28 2023-07-08 jrick free(logmsg0);
3584 24df9a28 2023-07-08 jrick return err;
3587 24df9a28 2023-07-08 jrick static const struct got_error *
3588 24df9a28 2023-07-08 jrick print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3590 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
3592 24df9a28 2023-07-08 jrick if (header != NULL)
3593 24df9a28 2023-07-08 jrick printf("%s\n", header);
3595 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, dsa->paths, entry) {
3596 24df9a28 2023-07-08 jrick struct got_diff_changed_path *cp = pe->data;
3597 24df9a28 2023-07-08 jrick int pad = dsa->max_path_len - pe->path_len + 1;
3599 24df9a28 2023-07-08 jrick printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3600 24df9a28 2023-07-08 jrick ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3602 24df9a28 2023-07-08 jrick printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3603 24df9a28 2023-07-08 jrick dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3604 24df9a28 2023-07-08 jrick dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3606 24df9a28 2023-07-08 jrick if (fflush(stdout) != 0)
3607 24df9a28 2023-07-08 jrick return got_error_from_errno("fflush");
3609 24df9a28 2023-07-08 jrick return NULL;
3612 24df9a28 2023-07-08 jrick static const struct got_error *
3613 24df9a28 2023-07-08 jrick printfile(FILE *f)
3615 24df9a28 2023-07-08 jrick char buf[8192];
3616 24df9a28 2023-07-08 jrick size_t r;
3618 24df9a28 2023-07-08 jrick if (fseeko(f, 0L, SEEK_SET) == -1)
3619 24df9a28 2023-07-08 jrick return got_error_from_errno("fseek");
3621 24df9a28 2023-07-08 jrick for (;;) {
3622 24df9a28 2023-07-08 jrick r = fread(buf, 1, sizeof(buf), f);
3623 24df9a28 2023-07-08 jrick if (r == 0) {
3624 24df9a28 2023-07-08 jrick if (ferror(f))
3625 24df9a28 2023-07-08 jrick return got_error_from_errno("fread");
3626 24df9a28 2023-07-08 jrick if (feof(f))
3629 24df9a28 2023-07-08 jrick if (fwrite(buf, 1, r, stdout) != r)
3630 24df9a28 2023-07-08 jrick return got_ferror(stdout, GOT_ERR_IO);
3633 24df9a28 2023-07-08 jrick return NULL;
3636 24df9a28 2023-07-08 jrick static const struct got_error *
3637 24df9a28 2023-07-08 jrick print_commit(struct got_commit_object *commit, struct got_object_id *id,
3638 24df9a28 2023-07-08 jrick struct got_repository *repo, const char *path,
3639 24df9a28 2023-07-08 jrick struct got_pathlist_head *changed_paths,
3640 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3641 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3642 24df9a28 2023-07-08 jrick const char *prefix)
3644 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
3645 24df9a28 2023-07-08 jrick FILE *f = NULL;
3646 24df9a28 2023-07-08 jrick char *id_str, *datestr, *logmsg0, *logmsg, *line;
3647 24df9a28 2023-07-08 jrick char datebuf[26];
3648 24df9a28 2023-07-08 jrick time_t committer_time;
3649 24df9a28 2023-07-08 jrick const char *author, *committer;
3650 24df9a28 2023-07-08 jrick char *refs_str = NULL;
3652 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
3654 24df9a28 2023-07-08 jrick return err;
3656 24df9a28 2023-07-08 jrick if (custom_refs_str == NULL) {
3657 24df9a28 2023-07-08 jrick struct got_reflist_head *refs;
3658 24df9a28 2023-07-08 jrick refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3659 24df9a28 2023-07-08 jrick if (refs) {
3660 24df9a28 2023-07-08 jrick err = build_refs_str(&refs_str, refs, id, repo, 0);
3662 24df9a28 2023-07-08 jrick goto done;
3666 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
3667 24df9a28 2023-07-08 jrick if (custom_refs_str)
3668 24df9a28 2023-07-08 jrick printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3669 24df9a28 2023-07-08 jrick custom_refs_str);
3671 24df9a28 2023-07-08 jrick printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3672 24df9a28 2023-07-08 jrick refs_str ? " (" : "", refs_str ? refs_str : "",
3673 24df9a28 2023-07-08 jrick refs_str ? ")" : "");
3674 24df9a28 2023-07-08 jrick free(id_str);
3675 24df9a28 2023-07-08 jrick id_str = NULL;
3676 24df9a28 2023-07-08 jrick free(refs_str);
3677 24df9a28 2023-07-08 jrick refs_str = NULL;
3678 24df9a28 2023-07-08 jrick printf("from: %s\n", got_object_commit_get_author(commit));
3679 24df9a28 2023-07-08 jrick author = got_object_commit_get_author(commit);
3680 24df9a28 2023-07-08 jrick committer = got_object_commit_get_committer(commit);
3681 24df9a28 2023-07-08 jrick if (strcmp(author, committer) != 0)
3682 24df9a28 2023-07-08 jrick printf("via: %s\n", committer);
3683 24df9a28 2023-07-08 jrick committer_time = got_object_commit_get_committer_time(commit);
3684 24df9a28 2023-07-08 jrick datestr = get_datestr(&committer_time, datebuf);
3685 24df9a28 2023-07-08 jrick if (datestr)
3686 24df9a28 2023-07-08 jrick printf("date: %s UTC\n", datestr);
3687 24df9a28 2023-07-08 jrick if (got_object_commit_get_nparents(commit) > 1) {
3688 24df9a28 2023-07-08 jrick const struct got_object_id_queue *parent_ids;
3689 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3690 24df9a28 2023-07-08 jrick int n = 1;
3691 24df9a28 2023-07-08 jrick parent_ids = got_object_commit_get_parent_ids(commit);
3692 24df9a28 2023-07-08 jrick STAILQ_FOREACH(qid, parent_ids, entry) {
3693 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, &qid->id);
3695 24df9a28 2023-07-08 jrick goto done;
3696 24df9a28 2023-07-08 jrick printf("parent %d: %s\n", n++, id_str);
3697 24df9a28 2023-07-08 jrick free(id_str);
3698 24df9a28 2023-07-08 jrick id_str = NULL;
3702 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg0, commit);
3704 24df9a28 2023-07-08 jrick goto done;
3706 24df9a28 2023-07-08 jrick logmsg = logmsg0;
3708 24df9a28 2023-07-08 jrick line = strsep(&logmsg, "\n");
3709 24df9a28 2023-07-08 jrick if (line)
3710 24df9a28 2023-07-08 jrick printf(" %s\n", line);
3711 24df9a28 2023-07-08 jrick } while (line);
3712 24df9a28 2023-07-08 jrick free(logmsg0);
3714 24df9a28 2023-07-08 jrick if (changed_paths && diffstat == NULL) {
3715 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
3717 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, changed_paths, entry) {
3718 24df9a28 2023-07-08 jrick struct got_diff_changed_path *cp = pe->data;
3720 24df9a28 2023-07-08 jrick printf(" %c %s\n", cp->status, pe->path);
3722 24df9a28 2023-07-08 jrick printf("\n");
3724 24df9a28 2023-07-08 jrick if (show_patch) {
3725 24df9a28 2023-07-08 jrick if (diffstat) {
3726 24df9a28 2023-07-08 jrick f = got_opentemp();
3727 24df9a28 2023-07-08 jrick if (f == NULL) {
3728 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3729 24df9a28 2023-07-08 jrick goto done;
3733 24df9a28 2023-07-08 jrick err = print_patch(commit, id, path, diff_context, diffstat,
3734 24df9a28 2023-07-08 jrick repo, diffstat == NULL ? stdout : f);
3736 24df9a28 2023-07-08 jrick goto done;
3738 24df9a28 2023-07-08 jrick if (diffstat) {
3739 24df9a28 2023-07-08 jrick err = print_diffstat(diffstat, NULL);
3741 24df9a28 2023-07-08 jrick goto done;
3742 24df9a28 2023-07-08 jrick if (show_patch) {
3743 24df9a28 2023-07-08 jrick err = printfile(f);
3745 24df9a28 2023-07-08 jrick goto done;
3748 24df9a28 2023-07-08 jrick if (show_patch)
3749 24df9a28 2023-07-08 jrick printf("\n");
3751 24df9a28 2023-07-08 jrick if (fflush(stdout) != 0 && err == NULL)
3752 24df9a28 2023-07-08 jrick err = got_error_from_errno("fflush");
3754 24df9a28 2023-07-08 jrick if (f && fclose(f) == EOF && err == NULL)
3755 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
3756 24df9a28 2023-07-08 jrick free(id_str);
3757 24df9a28 2023-07-08 jrick free(refs_str);
3758 24df9a28 2023-07-08 jrick return err;
3761 24df9a28 2023-07-08 jrick static const struct got_error *
3762 24df9a28 2023-07-08 jrick print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3763 24df9a28 2023-07-08 jrick struct got_repository *repo, const char *path, int show_changed_paths,
3764 24df9a28 2023-07-08 jrick int show_diffstat, int show_patch, const char *search_pattern,
3765 24df9a28 2023-07-08 jrick int diff_context, int limit, int log_branches, int reverse_display_order,
3766 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap, int one_line,
3767 24df9a28 2023-07-08 jrick FILE *tmpfile)
3769 24df9a28 2023-07-08 jrick const struct got_error *err;
3770 24df9a28 2023-07-08 jrick struct got_commit_graph *graph;
3771 24df9a28 2023-07-08 jrick regex_t regex;
3772 24df9a28 2023-07-08 jrick int have_match;
3773 24df9a28 2023-07-08 jrick struct got_object_id_queue reversed_commits;
3774 24df9a28 2023-07-08 jrick struct got_object_qid *qid;
3775 24df9a28 2023-07-08 jrick struct got_commit_object *commit;
3776 24df9a28 2023-07-08 jrick struct got_pathlist_head changed_paths;
3778 24df9a28 2023-07-08 jrick STAILQ_INIT(&reversed_commits);
3779 24df9a28 2023-07-08 jrick TAILQ_INIT(&changed_paths);
3781 24df9a28 2023-07-08 jrick if (search_pattern && regcomp(®ex, search_pattern,
3782 24df9a28 2023-07-08 jrick REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3783 24df9a28 2023-07-08 jrick return got_error_msg(GOT_ERR_REGEX, search_pattern);
3785 24df9a28 2023-07-08 jrick err = got_commit_graph_open(&graph, path, !log_branches);
3787 24df9a28 2023-07-08 jrick return err;
3788 98297eed 2024-03-27 stsp err = got_commit_graph_bfsort(graph, root_id, repo,
3789 24df9a28 2023-07-08 jrick check_cancelled, NULL);
3791 24df9a28 2023-07-08 jrick goto done;
3792 24df9a28 2023-07-08 jrick for (;;) {
3793 24df9a28 2023-07-08 jrick struct got_object_id id;
3794 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3795 24df9a28 2023-07-08 jrick &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3797 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
3800 24df9a28 2023-07-08 jrick err = got_commit_graph_iter_next(&id, graph, repo,
3801 24df9a28 2023-07-08 jrick check_cancelled, NULL);
3802 24df9a28 2023-07-08 jrick if (err) {
3803 24df9a28 2023-07-08 jrick if (err->code == GOT_ERR_ITER_COMPLETED)
3804 24df9a28 2023-07-08 jrick err = NULL;
3808 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, &id);
3812 24df9a28 2023-07-08 jrick if ((show_changed_paths || (show_diffstat && !show_patch))
3813 24df9a28 2023-07-08 jrick && !reverse_display_order) {
3814 24df9a28 2023-07-08 jrick err = get_changed_paths(&changed_paths, commit, repo,
3815 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL);
3820 24df9a28 2023-07-08 jrick if (search_pattern) {
3821 24df9a28 2023-07-08 jrick err = match_commit(&have_match, &id, commit, ®ex);
3822 24df9a28 2023-07-08 jrick if (err) {
3823 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3826 24df9a28 2023-07-08 jrick if (have_match == 0 && show_changed_paths)
3827 24df9a28 2023-07-08 jrick match_changed_paths(&have_match,
3828 24df9a28 2023-07-08 jrick &changed_paths, ®ex);
3829 24df9a28 2023-07-08 jrick if (have_match == 0 && show_patch) {
3830 24df9a28 2023-07-08 jrick err = match_patch(&have_match, commit, &id,
3831 24df9a28 2023-07-08 jrick path, diff_context, repo, ®ex, tmpfile);
3835 24df9a28 2023-07-08 jrick if (have_match == 0) {
3836 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3837 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths,
3838 24df9a28 2023-07-08 jrick GOT_PATHLIST_FREE_ALL);
3839 24df9a28 2023-07-08 jrick continue;
3843 24df9a28 2023-07-08 jrick if (reverse_display_order) {
3844 24df9a28 2023-07-08 jrick err = got_object_qid_alloc(&qid, &id);
3847 24df9a28 2023-07-08 jrick STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3848 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3850 24df9a28 2023-07-08 jrick if (one_line)
3851 24df9a28 2023-07-08 jrick err = print_commit_oneline(commit, &id,
3852 24df9a28 2023-07-08 jrick repo, refs_idmap);
3854 24df9a28 2023-07-08 jrick err = print_commit(commit, &id, repo, path,
3855 24df9a28 2023-07-08 jrick (show_changed_paths || show_diffstat) ?
3856 24df9a28 2023-07-08 jrick &changed_paths : NULL,
3857 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, show_patch,
3858 24df9a28 2023-07-08 jrick diff_context, refs_idmap, NULL, NULL);
3859 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3863 24df9a28 2023-07-08 jrick if ((limit && --limit == 0) ||
3864 24df9a28 2023-07-08 jrick (end_id && got_object_id_cmp(&id, end_id) == 0))
3867 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3869 24df9a28 2023-07-08 jrick if (reverse_display_order) {
3870 24df9a28 2023-07-08 jrick STAILQ_FOREACH(qid, &reversed_commits, entry) {
3871 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3872 24df9a28 2023-07-08 jrick &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3874 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo,
3875 24df9a28 2023-07-08 jrick &qid->id);
3878 24df9a28 2023-07-08 jrick if (show_changed_paths ||
3879 24df9a28 2023-07-08 jrick (show_diffstat && !show_patch)) {
3880 24df9a28 2023-07-08 jrick err = get_changed_paths(&changed_paths, commit,
3881 24df9a28 2023-07-08 jrick repo, show_diffstat ? &dsa : NULL);
3885 24df9a28 2023-07-08 jrick if (one_line)
3886 24df9a28 2023-07-08 jrick err = print_commit_oneline(commit, &qid->id,
3887 24df9a28 2023-07-08 jrick repo, refs_idmap);
3889 24df9a28 2023-07-08 jrick err = print_commit(commit, &qid->id, repo, path,
3890 24df9a28 2023-07-08 jrick (show_changed_paths || show_diffstat) ?
3891 24df9a28 2023-07-08 jrick &changed_paths : NULL,
3892 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, show_patch,
3893 24df9a28 2023-07-08 jrick diff_context, refs_idmap, NULL, NULL);
3894 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
3897 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3901 24df9a28 2023-07-08 jrick while (!STAILQ_EMPTY(&reversed_commits)) {
3902 24df9a28 2023-07-08 jrick qid = STAILQ_FIRST(&reversed_commits);
3903 24df9a28 2023-07-08 jrick STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3904 24df9a28 2023-07-08 jrick got_object_qid_free(qid);
3906 24df9a28 2023-07-08 jrick got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3907 24df9a28 2023-07-08 jrick if (search_pattern)
3908 24df9a28 2023-07-08 jrick regfree(®ex);
3909 24df9a28 2023-07-08 jrick got_commit_graph_close(graph);
3910 24df9a28 2023-07-08 jrick return err;
3913 24df9a28 2023-07-08 jrick __dead static void
3914 24df9a28 2023-07-08 jrick usage_log(void)
3916 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3917 24df9a28 2023-07-08 jrick "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3918 24df9a28 2023-07-08 jrick "[path]\n", getprogname());
3922 24df9a28 2023-07-08 jrick static int
3923 24df9a28 2023-07-08 jrick get_default_log_limit(void)
3925 24df9a28 2023-07-08 jrick const char *got_default_log_limit;
3926 24df9a28 2023-07-08 jrick long long n;
3927 24df9a28 2023-07-08 jrick const char *errstr;
3929 24df9a28 2023-07-08 jrick got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3930 24df9a28 2023-07-08 jrick if (got_default_log_limit == NULL)
3931 24df9a28 2023-07-08 jrick return 0;
3932 24df9a28 2023-07-08 jrick n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3933 24df9a28 2023-07-08 jrick if (errstr != NULL)
3934 24df9a28 2023-07-08 jrick return 0;
3935 24df9a28 2023-07-08 jrick return n;
3938 24df9a28 2023-07-08 jrick static const struct got_error *
3939 24df9a28 2023-07-08 jrick cmd_log(int argc, char *argv[])
3941 24df9a28 2023-07-08 jrick const struct got_error *error;
3942 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
3943 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
3944 24df9a28 2023-07-08 jrick struct got_object_id *start_id = NULL, *end_id = NULL;
3945 24df9a28 2023-07-08 jrick char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3946 24df9a28 2023-07-08 jrick const char *start_commit = NULL, *end_commit = NULL;
3947 24df9a28 2023-07-08 jrick const char *search_pattern = NULL;
3948 24df9a28 2023-07-08 jrick int diff_context = -1, ch;
3949 24df9a28 2023-07-08 jrick int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3950 24df9a28 2023-07-08 jrick int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3951 24df9a28 2023-07-08 jrick const char *errstr;
3952 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
3953 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap = NULL;
3954 24df9a28 2023-07-08 jrick FILE *tmpfile = NULL;
3955 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
3957 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
3959 24df9a28 2023-07-08 jrick #ifndef PROFILE
3960 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3963 24df9a28 2023-07-08 jrick err(1, "pledge");
3966 24df9a28 2023-07-08 jrick limit = get_default_log_limit();
3968 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3969 24df9a28 2023-07-08 jrick switch (ch) {
3970 24df9a28 2023-07-08 jrick case 'b':
3971 24df9a28 2023-07-08 jrick log_branches = 1;
3973 24df9a28 2023-07-08 jrick case 'C':
3974 24df9a28 2023-07-08 jrick diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3975 24df9a28 2023-07-08 jrick &errstr);
3976 24df9a28 2023-07-08 jrick if (errstr != NULL)
3977 24df9a28 2023-07-08 jrick errx(1, "number of context lines is %s: %s",
3978 24df9a28 2023-07-08 jrick errstr, optarg);
3980 24df9a28 2023-07-08 jrick case 'c':
3981 24df9a28 2023-07-08 jrick start_commit = optarg;
3983 24df9a28 2023-07-08 jrick case 'd':
3984 24df9a28 2023-07-08 jrick show_diffstat = 1;
3986 24df9a28 2023-07-08 jrick case 'l':
3987 24df9a28 2023-07-08 jrick limit = strtonum(optarg, 0, INT_MAX, &errstr);
3988 24df9a28 2023-07-08 jrick if (errstr != NULL)
3989 24df9a28 2023-07-08 jrick errx(1, "number of commits is %s: %s",
3990 24df9a28 2023-07-08 jrick errstr, optarg);
3992 24df9a28 2023-07-08 jrick case 'P':
3993 24df9a28 2023-07-08 jrick show_changed_paths = 1;
3995 24df9a28 2023-07-08 jrick case 'p':
3996 24df9a28 2023-07-08 jrick show_patch = 1;
3998 24df9a28 2023-07-08 jrick case 'R':
3999 24df9a28 2023-07-08 jrick reverse_display_order = 1;
4001 24df9a28 2023-07-08 jrick case 'r':
4002 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
4003 24df9a28 2023-07-08 jrick if (repo_path == NULL)
4004 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
4006 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
4008 24df9a28 2023-07-08 jrick case 'S':
4009 24df9a28 2023-07-08 jrick search_pattern = optarg;
4011 24df9a28 2023-07-08 jrick case 's':
4012 24df9a28 2023-07-08 jrick one_line = 1;
4014 24df9a28 2023-07-08 jrick case 'x':
4015 24df9a28 2023-07-08 jrick end_commit = optarg;
4018 24df9a28 2023-07-08 jrick usage_log();
4019 24df9a28 2023-07-08 jrick /* NOTREACHED */
4023 24df9a28 2023-07-08 jrick argc -= optind;
4024 24df9a28 2023-07-08 jrick argv += optind;
4026 24df9a28 2023-07-08 jrick if (diff_context == -1)
4027 24df9a28 2023-07-08 jrick diff_context = 3;
4028 24df9a28 2023-07-08 jrick else if (!show_patch)
4029 24df9a28 2023-07-08 jrick errx(1, "-C requires -p");
4031 24df9a28 2023-07-08 jrick if (one_line && (show_patch || show_changed_paths || show_diffstat))
4032 24df9a28 2023-07-08 jrick errx(1, "cannot use -s with -d, -p or -P");
4034 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
4035 24df9a28 2023-07-08 jrick if (cwd == NULL) {
4036 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
4037 24df9a28 2023-07-08 jrick goto done;
4040 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
4041 24df9a28 2023-07-08 jrick if (error != NULL)
4042 24df9a28 2023-07-08 jrick goto done;
4044 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4045 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
4046 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
4047 24df9a28 2023-07-08 jrick goto done;
4048 24df9a28 2023-07-08 jrick error = NULL;
4051 24df9a28 2023-07-08 jrick if (argc == 1) {
4052 24df9a28 2023-07-08 jrick if (worktree) {
4053 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&path, worktree,
4054 24df9a28 2023-07-08 jrick argv[0]);
4055 24df9a28 2023-07-08 jrick if (error)
4056 24df9a28 2023-07-08 jrick goto done;
4058 24df9a28 2023-07-08 jrick path = strdup(argv[0]);
4059 24df9a28 2023-07-08 jrick if (path == NULL) {
4060 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4061 24df9a28 2023-07-08 jrick goto done;
4064 24df9a28 2023-07-08 jrick } else if (argc != 0)
4065 24df9a28 2023-07-08 jrick usage_log();
4067 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4068 24df9a28 2023-07-08 jrick repo_path = worktree ?
4069 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4071 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4072 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4073 24df9a28 2023-07-08 jrick goto done;
4076 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4077 24df9a28 2023-07-08 jrick if (error != NULL)
4078 24df9a28 2023-07-08 jrick goto done;
4080 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
4081 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
4082 24df9a28 2023-07-08 jrick if (error)
4083 24df9a28 2023-07-08 jrick goto done;
4085 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4086 24df9a28 2023-07-08 jrick if (error)
4087 24df9a28 2023-07-08 jrick goto done;
4089 24df9a28 2023-07-08 jrick error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4090 24df9a28 2023-07-08 jrick if (error)
4091 24df9a28 2023-07-08 jrick goto done;
4093 24df9a28 2023-07-08 jrick if (start_commit == NULL) {
4094 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
4095 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
4096 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo,
4097 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_head_ref_name(worktree)
4098 24df9a28 2023-07-08 jrick : GOT_REF_HEAD, 0);
4099 24df9a28 2023-07-08 jrick if (error != NULL)
4100 24df9a28 2023-07-08 jrick goto done;
4101 24df9a28 2023-07-08 jrick error = got_ref_resolve(&start_id, repo, head_ref);
4102 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
4103 24df9a28 2023-07-08 jrick if (error != NULL)
4104 24df9a28 2023-07-08 jrick goto done;
4105 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo,
4106 24df9a28 2023-07-08 jrick start_id);
4107 24df9a28 2023-07-08 jrick if (error != NULL)
4108 24df9a28 2023-07-08 jrick goto done;
4109 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4111 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&start_id, NULL,
4112 24df9a28 2023-07-08 jrick start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4113 24df9a28 2023-07-08 jrick if (error != NULL)
4114 24df9a28 2023-07-08 jrick goto done;
4116 24df9a28 2023-07-08 jrick if (end_commit != NULL) {
4117 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&end_id, NULL,
4118 24df9a28 2023-07-08 jrick end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4119 24df9a28 2023-07-08 jrick if (error != NULL)
4120 24df9a28 2023-07-08 jrick goto done;
4123 24df9a28 2023-07-08 jrick if (worktree) {
4125 24df9a28 2023-07-08 jrick * If a path was specified on the command line it was resolved
4126 24df9a28 2023-07-08 jrick * to a path in the work tree above. Prepend the work tree's
4127 24df9a28 2023-07-08 jrick * path prefix to obtain the corresponding in-repository path.
4129 24df9a28 2023-07-08 jrick if (path) {
4130 24df9a28 2023-07-08 jrick const char *prefix;
4131 24df9a28 2023-07-08 jrick prefix = got_worktree_get_path_prefix(worktree);
4132 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
4133 24df9a28 2023-07-08 jrick (path[0] != '\0') ? "/" : "", path) == -1) {
4134 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4135 24df9a28 2023-07-08 jrick goto done;
4139 24df9a28 2023-07-08 jrick error = got_repo_map_path(&in_repo_path, repo,
4140 24df9a28 2023-07-08 jrick path ? path : "");
4141 24df9a28 2023-07-08 jrick if (error != NULL)
4142 24df9a28 2023-07-08 jrick goto done;
4143 24df9a28 2023-07-08 jrick if (in_repo_path) {
4144 24df9a28 2023-07-08 jrick free(path);
4145 24df9a28 2023-07-08 jrick path = in_repo_path;
4148 24df9a28 2023-07-08 jrick if (worktree) {
4149 24df9a28 2023-07-08 jrick /* Release work tree lock. */
4150 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4151 24df9a28 2023-07-08 jrick worktree = NULL;
4154 24df9a28 2023-07-08 jrick if (search_pattern && show_patch) {
4155 24df9a28 2023-07-08 jrick tmpfile = got_opentemp();
4156 24df9a28 2023-07-08 jrick if (tmpfile == NULL) {
4157 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4158 24df9a28 2023-07-08 jrick goto done;
4162 24df9a28 2023-07-08 jrick error = print_commits(start_id, end_id, repo, path ? path : "",
4163 24df9a28 2023-07-08 jrick show_changed_paths, show_diffstat, show_patch, search_pattern,
4164 24df9a28 2023-07-08 jrick diff_context, limit, log_branches, reverse_display_order,
4165 24df9a28 2023-07-08 jrick refs_idmap, one_line, tmpfile);
4167 24df9a28 2023-07-08 jrick free(path);
4168 24df9a28 2023-07-08 jrick free(repo_path);
4169 24df9a28 2023-07-08 jrick free(cwd);
4170 8a00d20d 2023-07-12 jrick free(start_id);
4171 8a00d20d 2023-07-12 jrick free(end_id);
4172 24df9a28 2023-07-08 jrick if (worktree)
4173 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4174 24df9a28 2023-07-08 jrick if (repo) {
4175 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
4176 24df9a28 2023-07-08 jrick if (error == NULL)
4177 24df9a28 2023-07-08 jrick error = close_err;
4179 24df9a28 2023-07-08 jrick if (pack_fds) {
4180 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
4181 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
4182 24df9a28 2023-07-08 jrick if (error == NULL)
4183 24df9a28 2023-07-08 jrick error = pack_err;
4185 24df9a28 2023-07-08 jrick if (refs_idmap)
4186 24df9a28 2023-07-08 jrick got_reflist_object_id_map_free(refs_idmap);
4187 24df9a28 2023-07-08 jrick if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4188 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4189 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
4190 24df9a28 2023-07-08 jrick return error;
4193 24df9a28 2023-07-08 jrick __dead static void
4194 24df9a28 2023-07-08 jrick usage_diff(void)
4196 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4197 24df9a28 2023-07-08 jrick "[-r repository-path] [object1 object2 | path ...]\n",
4198 24df9a28 2023-07-08 jrick getprogname());
4202 24df9a28 2023-07-08 jrick struct print_diff_arg {
4203 24df9a28 2023-07-08 jrick struct got_repository *repo;
4204 24df9a28 2023-07-08 jrick struct got_worktree *worktree;
4205 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg *diffstat;
4206 24df9a28 2023-07-08 jrick int diff_context;
4207 24df9a28 2023-07-08 jrick const char *id_str;
4208 24df9a28 2023-07-08 jrick int header_shown;
4209 24df9a28 2023-07-08 jrick int diff_staged;
4210 24df9a28 2023-07-08 jrick enum got_diff_algorithm diff_algo;
4211 24df9a28 2023-07-08 jrick int ignore_whitespace;
4212 24df9a28 2023-07-08 jrick int force_text_diff;
4213 24df9a28 2023-07-08 jrick FILE *f1;
4214 24df9a28 2023-07-08 jrick FILE *f2;
4215 24df9a28 2023-07-08 jrick FILE *outfile;
4219 24df9a28 2023-07-08 jrick * Create a file which contains the target path of a symlink so we can feed
4220 24df9a28 2023-07-08 jrick * it as content to the diff engine.
4222 24df9a28 2023-07-08 jrick static const struct got_error *
4223 24df9a28 2023-07-08 jrick get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4224 24df9a28 2023-07-08 jrick const char *abspath)
4226 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
4227 24df9a28 2023-07-08 jrick char target_path[PATH_MAX];
4228 24df9a28 2023-07-08 jrick ssize_t target_len, outlen;
4230 24df9a28 2023-07-08 jrick *fd = -1;
4232 24df9a28 2023-07-08 jrick if (dirfd != -1) {
4233 24df9a28 2023-07-08 jrick target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4234 24df9a28 2023-07-08 jrick if (target_len == -1)
4235 24df9a28 2023-07-08 jrick return got_error_from_errno2("readlinkat", abspath);
4237 24df9a28 2023-07-08 jrick target_len = readlink(abspath, target_path, PATH_MAX);
4238 24df9a28 2023-07-08 jrick if (target_len == -1)
4239 24df9a28 2023-07-08 jrick return got_error_from_errno2("readlink", abspath);
4242 24df9a28 2023-07-08 jrick *fd = got_opentempfd();
4243 24df9a28 2023-07-08 jrick if (*fd == -1)
4244 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
4246 24df9a28 2023-07-08 jrick outlen = write(*fd, target_path, target_len);
4247 24df9a28 2023-07-08 jrick if (outlen == -1) {
4248 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4249 24df9a28 2023-07-08 jrick goto done;
4252 24df9a28 2023-07-08 jrick if (lseek(*fd, 0, SEEK_SET) == -1) {
4253 24df9a28 2023-07-08 jrick err = got_error_from_errno2("lseek", abspath);
4254 24df9a28 2023-07-08 jrick goto done;
4257 24df9a28 2023-07-08 jrick if (err) {
4258 24df9a28 2023-07-08 jrick close(*fd);
4259 24df9a28 2023-07-08 jrick *fd = -1;
4261 24df9a28 2023-07-08 jrick return err;
4264 24df9a28 2023-07-08 jrick static const struct got_error *
4265 24df9a28 2023-07-08 jrick print_diff(void *arg, unsigned char status, unsigned char staged_status,
4266 24df9a28 2023-07-08 jrick const char *path, struct got_object_id *blob_id,
4267 24df9a28 2023-07-08 jrick struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4268 24df9a28 2023-07-08 jrick int dirfd, const char *de_name)
4270 24df9a28 2023-07-08 jrick struct print_diff_arg *a = arg;
4271 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
4272 24df9a28 2023-07-08 jrick struct got_blob_object *blob1 = NULL;
4273 24df9a28 2023-07-08 jrick int fd = -1, fd1 = -1, fd2 = -1;
4274 24df9a28 2023-07-08 jrick FILE *f2 = NULL;
4275 24df9a28 2023-07-08 jrick char *abspath = NULL, *label1 = NULL;
4276 24df9a28 2023-07-08 jrick struct stat sb;
4277 24df9a28 2023-07-08 jrick off_t size1 = 0;
4278 24df9a28 2023-07-08 jrick int f2_exists = 0;
4280 24df9a28 2023-07-08 jrick memset(&sb, 0, sizeof(sb));
4282 24df9a28 2023-07-08 jrick if (a->diff_staged) {
4283 24df9a28 2023-07-08 jrick if (staged_status != GOT_STATUS_MODIFY &&
4284 24df9a28 2023-07-08 jrick staged_status != GOT_STATUS_ADD &&
4285 24df9a28 2023-07-08 jrick staged_status != GOT_STATUS_DELETE)
4286 24df9a28 2023-07-08 jrick return NULL;
4288 24df9a28 2023-07-08 jrick if (staged_status == GOT_STATUS_DELETE)
4289 24df9a28 2023-07-08 jrick return NULL;
4290 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_NONEXISTENT)
4291 24df9a28 2023-07-08 jrick return got_error_set_errno(ENOENT, path);
4292 24df9a28 2023-07-08 jrick if (status != GOT_STATUS_MODIFY &&
4293 24df9a28 2023-07-08 jrick status != GOT_STATUS_ADD &&
4294 24df9a28 2023-07-08 jrick status != GOT_STATUS_DELETE &&
4295 24df9a28 2023-07-08 jrick status != GOT_STATUS_CONFLICT)
4296 24df9a28 2023-07-08 jrick return NULL;
4299 24df9a28 2023-07-08 jrick err = got_opentemp_truncate(a->f1);
4301 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentemp_truncate");
4302 24df9a28 2023-07-08 jrick err = got_opentemp_truncate(a->f2);
4304 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentemp_truncate");
4306 24df9a28 2023-07-08 jrick if (!a->header_shown) {
4307 24df9a28 2023-07-08 jrick if (fprintf(a->outfile, "diff %s%s\n",
4308 24df9a28 2023-07-08 jrick a->diff_staged ? "-s " : "",
4309 24df9a28 2023-07-08 jrick got_worktree_get_root_path(a->worktree)) < 0) {
4310 24df9a28 2023-07-08 jrick err = got_error_from_errno("fprintf");
4311 24df9a28 2023-07-08 jrick goto done;
4313 24df9a28 2023-07-08 jrick if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4314 24df9a28 2023-07-08 jrick err = got_error_from_errno("fprintf");
4315 24df9a28 2023-07-08 jrick goto done;
4317 24df9a28 2023-07-08 jrick if (fprintf(a->outfile, "path + %s%s\n",
4318 24df9a28 2023-07-08 jrick got_worktree_get_root_path(a->worktree),
4319 24df9a28 2023-07-08 jrick a->diff_staged ? " (staged changes)" : "") < 0) {
4320 24df9a28 2023-07-08 jrick err = got_error_from_errno("fprintf");
4321 24df9a28 2023-07-08 jrick goto done;
4323 24df9a28 2023-07-08 jrick a->header_shown = 1;
4326 24df9a28 2023-07-08 jrick if (a->diff_staged) {
4327 24df9a28 2023-07-08 jrick const char *label1 = NULL, *label2 = NULL;
4328 24df9a28 2023-07-08 jrick switch (staged_status) {
4329 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
4330 24df9a28 2023-07-08 jrick label1 = path;
4331 24df9a28 2023-07-08 jrick label2 = path;
4333 24df9a28 2023-07-08 jrick case GOT_STATUS_ADD:
4334 24df9a28 2023-07-08 jrick label2 = path;
4336 24df9a28 2023-07-08 jrick case GOT_STATUS_DELETE:
4337 24df9a28 2023-07-08 jrick label1 = path;
4340 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_FILE_STATUS);
4342 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
4343 24df9a28 2023-07-08 jrick if (fd1 == -1) {
4344 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4345 24df9a28 2023-07-08 jrick goto done;
4347 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
4348 24df9a28 2023-07-08 jrick if (fd2 == -1) {
4349 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4350 24df9a28 2023-07-08 jrick goto done;
4352 24df9a28 2023-07-08 jrick err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4353 24df9a28 2023-07-08 jrick fd1, fd2, blob_id, staged_blob_id, label1, label2,
4354 24df9a28 2023-07-08 jrick a->diff_algo, a->diff_context, a->ignore_whitespace,
4355 24df9a28 2023-07-08 jrick a->force_text_diff, a->diffstat, a->repo, a->outfile);
4356 24df9a28 2023-07-08 jrick goto done;
4359 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
4360 24df9a28 2023-07-08 jrick if (fd1 == -1) {
4361 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
4362 24df9a28 2023-07-08 jrick goto done;
4365 24df9a28 2023-07-08 jrick if (staged_status == GOT_STATUS_ADD ||
4366 24df9a28 2023-07-08 jrick staged_status == GOT_STATUS_MODIFY) {
4367 24df9a28 2023-07-08 jrick char *id_str;
4368 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4369 24df9a28 2023-07-08 jrick 8192, fd1);
4371 24df9a28 2023-07-08 jrick goto done;
4372 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, staged_blob_id);
4374 24df9a28 2023-07-08 jrick goto done;
4375 24df9a28 2023-07-08 jrick if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4376 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
4377 24df9a28 2023-07-08 jrick free(id_str);
4378 24df9a28 2023-07-08 jrick goto done;
4380 24df9a28 2023-07-08 jrick free(id_str);
4381 24df9a28 2023-07-08 jrick } else if (status != GOT_STATUS_ADD) {
4382 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4385 24df9a28 2023-07-08 jrick goto done;
4388 24df9a28 2023-07-08 jrick if (status != GOT_STATUS_DELETE) {
4389 24df9a28 2023-07-08 jrick if (asprintf(&abspath, "%s/%s",
4390 24df9a28 2023-07-08 jrick got_worktree_get_root_path(a->worktree), path) == -1) {
4391 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
4392 24df9a28 2023-07-08 jrick goto done;
4395 24df9a28 2023-07-08 jrick if (dirfd != -1) {
4396 24df9a28 2023-07-08 jrick fd = openat(dirfd, de_name,
4397 24df9a28 2023-07-08 jrick O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4398 24df9a28 2023-07-08 jrick if (fd == -1) {
4399 24df9a28 2023-07-08 jrick if (!got_err_open_nofollow_on_symlink()) {
4400 24df9a28 2023-07-08 jrick err = got_error_from_errno2("openat",
4401 24df9a28 2023-07-08 jrick abspath);
4402 24df9a28 2023-07-08 jrick goto done;
4404 24df9a28 2023-07-08 jrick err = get_symlink_target_file(&fd, dirfd,
4405 24df9a28 2023-07-08 jrick de_name, abspath);
4407 24df9a28 2023-07-08 jrick goto done;
4410 24df9a28 2023-07-08 jrick fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4411 24df9a28 2023-07-08 jrick if (fd == -1) {
4412 24df9a28 2023-07-08 jrick if (!got_err_open_nofollow_on_symlink()) {
4413 24df9a28 2023-07-08 jrick err = got_error_from_errno2("open",
4414 24df9a28 2023-07-08 jrick abspath);
4415 24df9a28 2023-07-08 jrick goto done;
4417 24df9a28 2023-07-08 jrick err = get_symlink_target_file(&fd, dirfd,
4418 24df9a28 2023-07-08 jrick de_name, abspath);
4420 24df9a28 2023-07-08 jrick goto done;
4423 24df9a28 2023-07-08 jrick if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4424 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fstatat", abspath);
4425 24df9a28 2023-07-08 jrick goto done;
4427 24df9a28 2023-07-08 jrick f2 = fdopen(fd, "r");
4428 24df9a28 2023-07-08 jrick if (f2 == NULL) {
4429 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fdopen", abspath);
4430 24df9a28 2023-07-08 jrick goto done;
4433 24df9a28 2023-07-08 jrick f2_exists = 1;
4436 24df9a28 2023-07-08 jrick if (blob1) {
4437 24df9a28 2023-07-08 jrick err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4438 24df9a28 2023-07-08 jrick a->f1, blob1);
4440 24df9a28 2023-07-08 jrick goto done;
4443 24df9a28 2023-07-08 jrick err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4444 24df9a28 2023-07-08 jrick f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4445 24df9a28 2023-07-08 jrick a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
4447 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4448 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
4449 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4450 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
4451 24df9a28 2023-07-08 jrick if (blob1)
4452 24df9a28 2023-07-08 jrick got_object_blob_close(blob1);
4453 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
4454 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
4455 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && err == NULL)
4456 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
4457 24df9a28 2023-07-08 jrick free(abspath);
4458 24df9a28 2023-07-08 jrick return err;
4461 24df9a28 2023-07-08 jrick static const struct got_error *
4462 24df9a28 2023-07-08 jrick cmd_diff(int argc, char *argv[])
4464 24df9a28 2023-07-08 jrick const struct got_error *error;
4465 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
4466 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
4467 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL;
4468 24df9a28 2023-07-08 jrick const char *commit_args[2] = { NULL, NULL };
4469 24df9a28 2023-07-08 jrick int ncommit_args = 0;
4470 24df9a28 2023-07-08 jrick struct got_object_id *ids[2] = { NULL, NULL };
4471 24df9a28 2023-07-08 jrick char *labels[2] = { NULL, NULL };
4472 24df9a28 2023-07-08 jrick int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4473 24df9a28 2023-07-08 jrick int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4474 24df9a28 2023-07-08 jrick int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
4475 24df9a28 2023-07-08 jrick const char *errstr;
4476 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
4477 24df9a28 2023-07-08 jrick struct got_pathlist_head diffstat_paths, paths;
4478 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4479 24df9a28 2023-07-08 jrick int fd1 = -1, fd2 = -1;
4480 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
4481 24df9a28 2023-07-08 jrick struct got_diffstat_cb_arg dsa;
4483 24df9a28 2023-07-08 jrick memset(&dsa, 0, sizeof(dsa));
4485 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
4486 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
4487 24df9a28 2023-07-08 jrick TAILQ_INIT(&diffstat_paths);
4489 24df9a28 2023-07-08 jrick #ifndef PROFILE
4490 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4491 24df9a28 2023-07-08 jrick NULL) == -1)
4492 24df9a28 2023-07-08 jrick err(1, "pledge");
4495 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
4496 24df9a28 2023-07-08 jrick switch (ch) {
4497 24df9a28 2023-07-08 jrick case 'a':
4498 24df9a28 2023-07-08 jrick force_text_diff = 1;
4500 24df9a28 2023-07-08 jrick case 'C':
4501 24df9a28 2023-07-08 jrick diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4502 24df9a28 2023-07-08 jrick &errstr);
4503 24df9a28 2023-07-08 jrick if (errstr != NULL)
4504 24df9a28 2023-07-08 jrick errx(1, "number of context lines is %s: %s",
4505 24df9a28 2023-07-08 jrick errstr, optarg);
4507 24df9a28 2023-07-08 jrick case 'c':
4508 24df9a28 2023-07-08 jrick if (ncommit_args >= 2)
4509 24df9a28 2023-07-08 jrick errx(1, "too many -c options used");
4510 24df9a28 2023-07-08 jrick commit_args[ncommit_args++] = optarg;
4512 24df9a28 2023-07-08 jrick case 'd':
4513 24df9a28 2023-07-08 jrick show_diffstat = 1;
4515 24df9a28 2023-07-08 jrick case 'P':
4516 24df9a28 2023-07-08 jrick force_path = 1;
4518 24df9a28 2023-07-08 jrick case 'r':
4519 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
4520 24df9a28 2023-07-08 jrick if (repo_path == NULL)
4521 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
4523 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
4524 24df9a28 2023-07-08 jrick rflag = 1;
4526 24df9a28 2023-07-08 jrick case 's':
4527 24df9a28 2023-07-08 jrick diff_staged = 1;
4529 24df9a28 2023-07-08 jrick case 'w':
4530 24df9a28 2023-07-08 jrick ignore_whitespace = 1;
4533 24df9a28 2023-07-08 jrick usage_diff();
4534 24df9a28 2023-07-08 jrick /* NOTREACHED */
4538 24df9a28 2023-07-08 jrick argc -= optind;
4539 24df9a28 2023-07-08 jrick argv += optind;
4541 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
4542 24df9a28 2023-07-08 jrick if (cwd == NULL) {
4543 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
4544 24df9a28 2023-07-08 jrick goto done;
4547 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
4548 24df9a28 2023-07-08 jrick if (error != NULL)
4549 24df9a28 2023-07-08 jrick goto done;
4551 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4552 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
4553 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
4554 24df9a28 2023-07-08 jrick goto done;
4556 24df9a28 2023-07-08 jrick error = NULL;
4557 24df9a28 2023-07-08 jrick if (worktree) {
4558 24df9a28 2023-07-08 jrick repo_path =
4559 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
4560 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4561 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4562 24df9a28 2023-07-08 jrick goto done;
4565 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
4566 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
4567 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4568 24df9a28 2023-07-08 jrick goto done;
4573 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4574 24df9a28 2023-07-08 jrick free(repo_path);
4575 24df9a28 2023-07-08 jrick if (error != NULL)
4576 24df9a28 2023-07-08 jrick goto done;
4578 24df9a28 2023-07-08 jrick if (show_diffstat) {
4579 24df9a28 2023-07-08 jrick dsa.paths = &diffstat_paths;
4580 24df9a28 2023-07-08 jrick dsa.force_text = force_text_diff;
4581 24df9a28 2023-07-08 jrick dsa.ignore_ws = ignore_whitespace;
4582 24df9a28 2023-07-08 jrick dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4585 24df9a28 2023-07-08 jrick if (rflag || worktree == NULL || ncommit_args > 0) {
4586 24df9a28 2023-07-08 jrick if (force_path) {
4587 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_NOT_IMPL,
4588 24df9a28 2023-07-08 jrick "-P option can only be used when diffing "
4589 24df9a28 2023-07-08 jrick "a work tree");
4590 24df9a28 2023-07-08 jrick goto done;
4592 24df9a28 2023-07-08 jrick if (diff_staged) {
4593 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_NOT_IMPL,
4594 24df9a28 2023-07-08 jrick "-s option can only be used when diffing "
4595 24df9a28 2023-07-08 jrick "a work tree");
4596 24df9a28 2023-07-08 jrick goto done;
4600 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
4601 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
4602 24df9a28 2023-07-08 jrick if (error)
4603 24df9a28 2023-07-08 jrick goto done;
4605 24df9a28 2023-07-08 jrick if ((!force_path && argc == 2) || ncommit_args > 0) {
4606 24df9a28 2023-07-08 jrick int obj_type = (ncommit_args > 0 ?
4607 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4608 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4610 24df9a28 2023-07-08 jrick if (error)
4611 24df9a28 2023-07-08 jrick goto done;
4612 24df9a28 2023-07-08 jrick for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4613 24df9a28 2023-07-08 jrick const char *arg;
4614 24df9a28 2023-07-08 jrick if (ncommit_args > 0)
4615 24df9a28 2023-07-08 jrick arg = commit_args[i];
4617 24df9a28 2023-07-08 jrick arg = argv[i];
4618 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&ids[i], &labels[i],
4619 24df9a28 2023-07-08 jrick arg, obj_type, &refs, repo);
4620 24df9a28 2023-07-08 jrick if (error) {
4621 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_REF &&
4622 24df9a28 2023-07-08 jrick error->code != GOT_ERR_NO_OBJ)
4623 24df9a28 2023-07-08 jrick goto done;
4624 24df9a28 2023-07-08 jrick if (ncommit_args > 0)
4625 24df9a28 2023-07-08 jrick goto done;
4626 24df9a28 2023-07-08 jrick error = NULL;
4632 24df9a28 2023-07-08 jrick f1 = got_opentemp();
4633 24df9a28 2023-07-08 jrick if (f1 == NULL) {
4634 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4635 24df9a28 2023-07-08 jrick goto done;
4638 24df9a28 2023-07-08 jrick f2 = got_opentemp();
4639 24df9a28 2023-07-08 jrick if (f2 == NULL) {
4640 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4641 24df9a28 2023-07-08 jrick goto done;
4644 24df9a28 2023-07-08 jrick outfile = got_opentemp();
4645 24df9a28 2023-07-08 jrick if (outfile == NULL) {
4646 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
4647 24df9a28 2023-07-08 jrick goto done;
4650 24df9a28 2023-07-08 jrick if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4651 24df9a28 2023-07-08 jrick struct print_diff_arg arg;
4652 24df9a28 2023-07-08 jrick char *id_str;
4654 24df9a28 2023-07-08 jrick if (worktree == NULL) {
4655 24df9a28 2023-07-08 jrick if (argc == 2 && ids[0] == NULL) {
4656 24df9a28 2023-07-08 jrick error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4657 24df9a28 2023-07-08 jrick goto done;
4658 24df9a28 2023-07-08 jrick } else if (argc == 2 && ids[1] == NULL) {
4659 24df9a28 2023-07-08 jrick error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4660 24df9a28 2023-07-08 jrick goto done;
4661 24df9a28 2023-07-08 jrick } else if (argc > 0) {
4662 24df9a28 2023-07-08 jrick error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4663 24df9a28 2023-07-08 jrick "%s", "specified paths cannot be resolved");
4664 24df9a28 2023-07-08 jrick goto done;
4666 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_NOT_WORKTREE);
4667 24df9a28 2023-07-08 jrick goto done;
4671 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv,
4672 24df9a28 2023-07-08 jrick worktree);
4673 24df9a28 2023-07-08 jrick if (error)
4674 24df9a28 2023-07-08 jrick goto done;
4676 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str,
4677 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree));
4678 24df9a28 2023-07-08 jrick if (error)
4679 24df9a28 2023-07-08 jrick goto done;
4680 24df9a28 2023-07-08 jrick arg.repo = repo;
4681 24df9a28 2023-07-08 jrick arg.worktree = worktree;
4682 24df9a28 2023-07-08 jrick arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4683 24df9a28 2023-07-08 jrick arg.diff_context = diff_context;
4684 24df9a28 2023-07-08 jrick arg.id_str = id_str;
4685 24df9a28 2023-07-08 jrick arg.header_shown = 0;
4686 24df9a28 2023-07-08 jrick arg.diff_staged = diff_staged;
4687 24df9a28 2023-07-08 jrick arg.ignore_whitespace = ignore_whitespace;
4688 24df9a28 2023-07-08 jrick arg.force_text_diff = force_text_diff;
4689 24df9a28 2023-07-08 jrick arg.diffstat = show_diffstat ? &dsa : NULL;
4690 24df9a28 2023-07-08 jrick arg.f1 = f1;
4691 24df9a28 2023-07-08 jrick arg.f2 = f2;
4692 24df9a28 2023-07-08 jrick arg.outfile = outfile;
4694 24df9a28 2023-07-08 jrick error = got_worktree_status(worktree, &paths, repo, 0,
4695 24df9a28 2023-07-08 jrick print_diff, &arg, check_cancelled, NULL);
4696 24df9a28 2023-07-08 jrick free(id_str);
4697 24df9a28 2023-07-08 jrick if (error)
4698 24df9a28 2023-07-08 jrick goto done;
4700 24df9a28 2023-07-08 jrick if (show_diffstat && dsa.nfiles > 0) {
4701 24df9a28 2023-07-08 jrick char *header;
4703 24df9a28 2023-07-08 jrick if (asprintf(&header, "diffstat %s%s",
4704 24df9a28 2023-07-08 jrick diff_staged ? "-s " : "",
4705 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree)) == -1) {
4706 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4707 24df9a28 2023-07-08 jrick goto done;
4710 24df9a28 2023-07-08 jrick error = print_diffstat(&dsa, header);
4711 24df9a28 2023-07-08 jrick free(header);
4712 24df9a28 2023-07-08 jrick if (error)
4713 24df9a28 2023-07-08 jrick goto done;
4716 24df9a28 2023-07-08 jrick error = printfile(outfile);
4717 24df9a28 2023-07-08 jrick goto done;
4720 24df9a28 2023-07-08 jrick if (ncommit_args == 1) {
4721 24df9a28 2023-07-08 jrick struct got_commit_object *commit;
4722 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, ids[0]);
4723 24df9a28 2023-07-08 jrick if (error)
4724 24df9a28 2023-07-08 jrick goto done;
4726 24df9a28 2023-07-08 jrick labels[1] = labels[0];
4727 24df9a28 2023-07-08 jrick ids[1] = ids[0];
4728 24df9a28 2023-07-08 jrick if (got_object_commit_get_nparents(commit) > 0) {
4729 24df9a28 2023-07-08 jrick const struct got_object_id_queue *pids;
4730 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
4731 24df9a28 2023-07-08 jrick pids = got_object_commit_get_parent_ids(commit);
4732 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(pids);
4733 24df9a28 2023-07-08 jrick ids[0] = got_object_id_dup(&pid->id);
4734 24df9a28 2023-07-08 jrick if (ids[0] == NULL) {
4735 24df9a28 2023-07-08 jrick error = got_error_from_errno(
4736 24df9a28 2023-07-08 jrick "got_object_id_dup");
4737 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4738 24df9a28 2023-07-08 jrick goto done;
4740 24df9a28 2023-07-08 jrick error = got_object_id_str(&labels[0], ids[0]);
4741 24df9a28 2023-07-08 jrick if (error) {
4742 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4743 24df9a28 2023-07-08 jrick goto done;
4746 24df9a28 2023-07-08 jrick ids[0] = NULL;
4747 24df9a28 2023-07-08 jrick labels[0] = strdup("/dev/null");
4748 24df9a28 2023-07-08 jrick if (labels[0] == NULL) {
4749 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
4750 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4751 24df9a28 2023-07-08 jrick goto done;
4755 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
4758 24df9a28 2023-07-08 jrick if (ncommit_args == 0 && argc > 2) {
4759 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
4760 24df9a28 2023-07-08 jrick "path arguments cannot be used when diffing two objects");
4761 24df9a28 2023-07-08 jrick goto done;
4764 24df9a28 2023-07-08 jrick if (ids[0]) {
4765 24df9a28 2023-07-08 jrick error = got_object_get_type(&type1, repo, ids[0]);
4766 24df9a28 2023-07-08 jrick if (error)
4767 24df9a28 2023-07-08 jrick goto done;
4770 24df9a28 2023-07-08 jrick error = got_object_get_type(&type2, repo, ids[1]);
4771 24df9a28 2023-07-08 jrick if (error)
4772 24df9a28 2023-07-08 jrick goto done;
4773 24df9a28 2023-07-08 jrick if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4774 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_OBJ_TYPE);
4775 24df9a28 2023-07-08 jrick goto done;
4777 24df9a28 2023-07-08 jrick if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
4778 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_OBJ_TYPE,
4779 24df9a28 2023-07-08 jrick "path arguments cannot be used when diffing blobs");
4780 24df9a28 2023-07-08 jrick goto done;
4783 24df9a28 2023-07-08 jrick for (i = 0; ncommit_args > 0 && i < argc; i++) {
4784 24df9a28 2023-07-08 jrick char *in_repo_path;
4785 24df9a28 2023-07-08 jrick struct got_pathlist_entry *new;
4786 24df9a28 2023-07-08 jrick if (worktree) {
4787 24df9a28 2023-07-08 jrick const char *prefix;
4789 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&p, worktree,
4790 24df9a28 2023-07-08 jrick argv[i]);
4791 24df9a28 2023-07-08 jrick if (error)
4792 24df9a28 2023-07-08 jrick goto done;
4793 24df9a28 2023-07-08 jrick prefix = got_worktree_get_path_prefix(worktree);
4794 24df9a28 2023-07-08 jrick while (prefix[0] == '/')
4795 24df9a28 2023-07-08 jrick prefix++;
4796 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
4797 24df9a28 2023-07-08 jrick (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4798 24df9a28 2023-07-08 jrick p) == -1) {
4799 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4801 24df9a28 2023-07-08 jrick goto done;
4805 24df9a28 2023-07-08 jrick char *mapped_path, *s;
4806 24df9a28 2023-07-08 jrick error = got_repo_map_path(&mapped_path, repo, argv[i]);
4807 24df9a28 2023-07-08 jrick if (error)
4808 24df9a28 2023-07-08 jrick goto done;
4809 24df9a28 2023-07-08 jrick s = mapped_path;
4810 24df9a28 2023-07-08 jrick while (s[0] == '/')
4812 24df9a28 2023-07-08 jrick in_repo_path = strdup(s);
4813 24df9a28 2023-07-08 jrick if (in_repo_path == NULL) {
4814 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4815 24df9a28 2023-07-08 jrick free(mapped_path);
4816 24df9a28 2023-07-08 jrick goto done;
4818 24df9a28 2023-07-08 jrick free(mapped_path);
4821 24df9a28 2023-07-08 jrick error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4822 24df9a28 2023-07-08 jrick if (error || new == NULL /* duplicate */)
4823 24df9a28 2023-07-08 jrick free(in_repo_path);
4824 24df9a28 2023-07-08 jrick if (error)
4825 24df9a28 2023-07-08 jrick goto done;
4828 24df9a28 2023-07-08 jrick if (worktree) {
4829 24df9a28 2023-07-08 jrick /* Release work tree lock. */
4830 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4831 24df9a28 2023-07-08 jrick worktree = NULL;
4834 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
4835 24df9a28 2023-07-08 jrick if (fd1 == -1) {
4836 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
4837 24df9a28 2023-07-08 jrick goto done;
4840 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
4841 24df9a28 2023-07-08 jrick if (fd2 == -1) {
4842 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
4843 24df9a28 2023-07-08 jrick goto done;
4846 24df9a28 2023-07-08 jrick switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4847 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
4848 24df9a28 2023-07-08 jrick error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4849 24df9a28 2023-07-08 jrick fd1, fd2, ids[0], ids[1], NULL, NULL,
4850 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4851 24df9a28 2023-07-08 jrick ignore_whitespace, force_text_diff,
4852 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, repo, outfile);
4854 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
4855 24df9a28 2023-07-08 jrick error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
4856 24df9a28 2023-07-08 jrick ids[0], ids[1], &paths, "", "",
4857 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4858 24df9a28 2023-07-08 jrick ignore_whitespace, force_text_diff,
4859 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, repo, outfile);
4861 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
4862 24df9a28 2023-07-08 jrick fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
4863 24df9a28 2023-07-08 jrick error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4864 24df9a28 2023-07-08 jrick fd1, fd2, ids[0], ids[1], &paths,
4865 24df9a28 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4866 24df9a28 2023-07-08 jrick ignore_whitespace, force_text_diff,
4867 24df9a28 2023-07-08 jrick show_diffstat ? &dsa : NULL, repo, outfile);
4870 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_OBJ_TYPE);
4872 24df9a28 2023-07-08 jrick if (error)
4873 24df9a28 2023-07-08 jrick goto done;
4875 24df9a28 2023-07-08 jrick if (show_diffstat && dsa.nfiles > 0) {
4876 24df9a28 2023-07-08 jrick char *header = NULL;
4878 24df9a28 2023-07-08 jrick if (asprintf(&header, "diffstat %s %s",
4879 24df9a28 2023-07-08 jrick labels[0], labels[1]) == -1) {
4880 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
4881 24df9a28 2023-07-08 jrick goto done;
4884 24df9a28 2023-07-08 jrick error = print_diffstat(&dsa, header);
4885 24df9a28 2023-07-08 jrick free(header);
4886 24df9a28 2023-07-08 jrick if (error)
4887 24df9a28 2023-07-08 jrick goto done;
4890 24df9a28 2023-07-08 jrick error = printfile(outfile);
4893 24df9a28 2023-07-08 jrick free(labels[0]);
4894 24df9a28 2023-07-08 jrick free(labels[1]);
4895 24df9a28 2023-07-08 jrick free(ids[0]);
4896 24df9a28 2023-07-08 jrick free(ids[1]);
4897 24df9a28 2023-07-08 jrick if (worktree)
4898 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
4899 24df9a28 2023-07-08 jrick if (repo) {
4900 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
4901 24df9a28 2023-07-08 jrick if (error == NULL)
4902 24df9a28 2023-07-08 jrick error = close_err;
4904 24df9a28 2023-07-08 jrick if (pack_fds) {
4905 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
4906 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
4907 24df9a28 2023-07-08 jrick if (error == NULL)
4908 24df9a28 2023-07-08 jrick error = pack_err;
4910 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
4911 24df9a28 2023-07-08 jrick got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
4912 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
4913 24df9a28 2023-07-08 jrick if (outfile && fclose(outfile) == EOF && error == NULL)
4914 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4915 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && error == NULL)
4916 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4917 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && error == NULL)
4918 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
4919 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && error == NULL)
4920 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
4921 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && error == NULL)
4922 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
4923 24df9a28 2023-07-08 jrick return error;
4926 24df9a28 2023-07-08 jrick __dead static void
4927 24df9a28 2023-07-08 jrick usage_blame(void)
4929 24df9a28 2023-07-08 jrick fprintf(stderr,
4930 24df9a28 2023-07-08 jrick "usage: %s blame [-c commit] [-r repository-path] path\n",
4931 24df9a28 2023-07-08 jrick getprogname());
4935 24df9a28 2023-07-08 jrick struct blame_line {
4936 24df9a28 2023-07-08 jrick int annotated;
4937 24df9a28 2023-07-08 jrick char *id_str;
4938 24df9a28 2023-07-08 jrick char *committer;
4939 24df9a28 2023-07-08 jrick char datebuf[11]; /* YYYY-MM-DD + NUL */
4942 24df9a28 2023-07-08 jrick struct blame_cb_args {
4943 24df9a28 2023-07-08 jrick struct blame_line *lines;
4944 24df9a28 2023-07-08 jrick int nlines;
4945 24df9a28 2023-07-08 jrick int nlines_prec;
4946 24df9a28 2023-07-08 jrick int lineno_cur;
4947 24df9a28 2023-07-08 jrick off_t *line_offsets;
4949 24df9a28 2023-07-08 jrick struct got_repository *repo;
4952 24df9a28 2023-07-08 jrick static const struct got_error *
4953 24df9a28 2023-07-08 jrick blame_cb(void *arg, int nlines, int lineno,
4954 24df9a28 2023-07-08 jrick struct got_commit_object *commit, struct got_object_id *id)
4956 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
4957 24df9a28 2023-07-08 jrick struct blame_cb_args *a = arg;
4958 24df9a28 2023-07-08 jrick struct blame_line *bline;
4959 24df9a28 2023-07-08 jrick char *line = NULL;
4960 24df9a28 2023-07-08 jrick size_t linesize = 0;
4961 24df9a28 2023-07-08 jrick off_t offset;
4962 24df9a28 2023-07-08 jrick struct tm tm;
4963 24df9a28 2023-07-08 jrick time_t committer_time;
4965 24df9a28 2023-07-08 jrick if (nlines != a->nlines ||
4966 24df9a28 2023-07-08 jrick (lineno != -1 && lineno < 1) || lineno > a->nlines)
4967 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_RANGE);
4969 24df9a28 2023-07-08 jrick if (sigint_received)
4970 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_ITER_COMPLETED);
4972 24df9a28 2023-07-08 jrick if (lineno == -1)
4973 24df9a28 2023-07-08 jrick return NULL; /* no change in this commit */
4975 24df9a28 2023-07-08 jrick /* Annotate this line. */
4976 24df9a28 2023-07-08 jrick bline = &a->lines[lineno - 1];
4977 24df9a28 2023-07-08 jrick if (bline->annotated)
4978 24df9a28 2023-07-08 jrick return NULL;
4979 24df9a28 2023-07-08 jrick err = got_object_id_str(&bline->id_str, id);
4981 24df9a28 2023-07-08 jrick return err;
4983 24df9a28 2023-07-08 jrick bline->committer = strdup(got_object_commit_get_committer(commit));
4984 24df9a28 2023-07-08 jrick if (bline->committer == NULL) {
4985 24df9a28 2023-07-08 jrick err = got_error_from_errno("strdup");
4986 24df9a28 2023-07-08 jrick goto done;
4989 24df9a28 2023-07-08 jrick committer_time = got_object_commit_get_committer_time(commit);
4990 24df9a28 2023-07-08 jrick if (gmtime_r(&committer_time, &tm) == NULL)
4991 24df9a28 2023-07-08 jrick return got_error_from_errno("gmtime_r");
4992 24df9a28 2023-07-08 jrick if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4993 24df9a28 2023-07-08 jrick &tm) == 0) {
4994 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
4995 24df9a28 2023-07-08 jrick goto done;
4997 24df9a28 2023-07-08 jrick bline->annotated = 1;
4999 24df9a28 2023-07-08 jrick /* Print lines annotated so far. */
5000 24df9a28 2023-07-08 jrick bline = &a->lines[a->lineno_cur - 1];
5001 24df9a28 2023-07-08 jrick if (!bline->annotated)
5002 24df9a28 2023-07-08 jrick goto done;
5004 24df9a28 2023-07-08 jrick offset = a->line_offsets[a->lineno_cur - 1];
5005 24df9a28 2023-07-08 jrick if (fseeko(a->f, offset, SEEK_SET) == -1) {
5006 24df9a28 2023-07-08 jrick err = got_error_from_errno("fseeko");
5007 24df9a28 2023-07-08 jrick goto done;
5010 24df9a28 2023-07-08 jrick while (a->lineno_cur <= a->nlines && bline->annotated) {
5011 24df9a28 2023-07-08 jrick char *smallerthan, *at, *nl, *committer;
5012 24df9a28 2023-07-08 jrick size_t len;
5014 24df9a28 2023-07-08 jrick if (getline(&line, &linesize, a->f) == -1) {
5015 24df9a28 2023-07-08 jrick if (ferror(a->f))
5016 24df9a28 2023-07-08 jrick err = got_error_from_errno("getline");
5020 24df9a28 2023-07-08 jrick committer = bline->committer;
5021 24df9a28 2023-07-08 jrick smallerthan = strchr(committer, '<');
5022 24df9a28 2023-07-08 jrick if (smallerthan && smallerthan[1] != '\0')
5023 24df9a28 2023-07-08 jrick committer = smallerthan + 1;
5024 24df9a28 2023-07-08 jrick at = strchr(committer, '@');
5026 24df9a28 2023-07-08 jrick *at = '\0';
5027 24df9a28 2023-07-08 jrick len = strlen(committer);
5028 24df9a28 2023-07-08 jrick if (len >= 9)
5029 24df9a28 2023-07-08 jrick committer[8] = '\0';
5031 24df9a28 2023-07-08 jrick nl = strchr(line, '\n');
5033 24df9a28 2023-07-08 jrick *nl = '\0';
5034 24df9a28 2023-07-08 jrick printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5035 24df9a28 2023-07-08 jrick bline->id_str, bline->datebuf, committer, line);
5037 24df9a28 2023-07-08 jrick a->lineno_cur++;
5038 24df9a28 2023-07-08 jrick bline = &a->lines[a->lineno_cur - 1];
5041 24df9a28 2023-07-08 jrick free(line);
5042 24df9a28 2023-07-08 jrick return err;
5045 24df9a28 2023-07-08 jrick static const struct got_error *
5046 24df9a28 2023-07-08 jrick cmd_blame(int argc, char *argv[])
5048 24df9a28 2023-07-08 jrick const struct got_error *error;
5049 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5050 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5051 24df9a28 2023-07-08 jrick char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5052 24df9a28 2023-07-08 jrick char *link_target = NULL;
5053 24df9a28 2023-07-08 jrick struct got_object_id *obj_id = NULL;
5054 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
5055 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
5056 24df9a28 2023-07-08 jrick struct got_blob_object *blob = NULL;
5057 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
5058 24df9a28 2023-07-08 jrick struct blame_cb_args bca;
5059 24df9a28 2023-07-08 jrick int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5060 24df9a28 2023-07-08 jrick off_t filesize;
5061 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5062 24df9a28 2023-07-08 jrick FILE *f1 = NULL, *f2 = NULL;
5064 24df9a28 2023-07-08 jrick fd1 = got_opentempfd();
5065 24df9a28 2023-07-08 jrick if (fd1 == -1)
5066 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
5068 24df9a28 2023-07-08 jrick memset(&bca, 0, sizeof(bca));
5070 24df9a28 2023-07-08 jrick #ifndef PROFILE
5071 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5072 24df9a28 2023-07-08 jrick NULL) == -1)
5073 24df9a28 2023-07-08 jrick err(1, "pledge");
5076 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5077 24df9a28 2023-07-08 jrick switch (ch) {
5078 24df9a28 2023-07-08 jrick case 'c':
5079 24df9a28 2023-07-08 jrick commit_id_str = optarg;
5081 24df9a28 2023-07-08 jrick case 'r':
5082 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
5083 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5084 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
5086 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
5089 24df9a28 2023-07-08 jrick usage_blame();
5090 24df9a28 2023-07-08 jrick /* NOTREACHED */
5094 24df9a28 2023-07-08 jrick argc -= optind;
5095 24df9a28 2023-07-08 jrick argv += optind;
5097 24df9a28 2023-07-08 jrick if (argc == 1)
5098 24df9a28 2023-07-08 jrick path = argv[0];
5100 24df9a28 2023-07-08 jrick usage_blame();
5102 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
5103 24df9a28 2023-07-08 jrick if (cwd == NULL) {
5104 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
5105 24df9a28 2023-07-08 jrick goto done;
5108 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
5109 24df9a28 2023-07-08 jrick if (error != NULL)
5110 24df9a28 2023-07-08 jrick goto done;
5112 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5113 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5114 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
5115 24df9a28 2023-07-08 jrick goto done;
5117 24df9a28 2023-07-08 jrick error = NULL;
5118 24df9a28 2023-07-08 jrick if (worktree) {
5119 24df9a28 2023-07-08 jrick repo_path =
5120 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
5121 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5122 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5123 24df9a28 2023-07-08 jrick if (error)
5124 24df9a28 2023-07-08 jrick goto done;
5127 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
5128 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5129 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5130 24df9a28 2023-07-08 jrick goto done;
5135 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5136 24df9a28 2023-07-08 jrick if (error != NULL)
5137 24df9a28 2023-07-08 jrick goto done;
5139 24df9a28 2023-07-08 jrick if (worktree) {
5140 24df9a28 2023-07-08 jrick const char *prefix = got_worktree_get_path_prefix(worktree);
5143 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&p, worktree, path);
5144 24df9a28 2023-07-08 jrick if (error)
5145 24df9a28 2023-07-08 jrick goto done;
5146 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
5147 24df9a28 2023-07-08 jrick (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5148 24df9a28 2023-07-08 jrick p) == -1) {
5149 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
5151 24df9a28 2023-07-08 jrick goto done;
5154 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5156 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5157 24df9a28 2023-07-08 jrick if (error)
5158 24df9a28 2023-07-08 jrick goto done;
5159 24df9a28 2023-07-08 jrick error = got_repo_map_path(&in_repo_path, repo, path);
5161 24df9a28 2023-07-08 jrick if (error)
5162 24df9a28 2023-07-08 jrick goto done;
5164 24df9a28 2023-07-08 jrick if (commit_id_str == NULL) {
5165 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
5166 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, worktree ?
5167 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5168 24df9a28 2023-07-08 jrick if (error != NULL)
5169 24df9a28 2023-07-08 jrick goto done;
5170 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
5171 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
5172 24df9a28 2023-07-08 jrick if (error != NULL)
5173 24df9a28 2023-07-08 jrick goto done;
5175 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5176 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5177 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5179 24df9a28 2023-07-08 jrick if (error)
5180 24df9a28 2023-07-08 jrick goto done;
5181 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
5182 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5183 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
5184 24df9a28 2023-07-08 jrick if (error)
5185 24df9a28 2023-07-08 jrick goto done;
5188 24df9a28 2023-07-08 jrick if (worktree) {
5189 24df9a28 2023-07-08 jrick /* Release work tree lock. */
5190 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5191 24df9a28 2023-07-08 jrick worktree = NULL;
5194 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
5195 24df9a28 2023-07-08 jrick if (error)
5196 24df9a28 2023-07-08 jrick goto done;
5198 24df9a28 2023-07-08 jrick error = got_object_resolve_symlinks(&link_target, in_repo_path,
5199 24df9a28 2023-07-08 jrick commit, repo);
5200 24df9a28 2023-07-08 jrick if (error)
5201 24df9a28 2023-07-08 jrick goto done;
5203 24df9a28 2023-07-08 jrick error = got_object_id_by_path(&obj_id, repo, commit,
5204 24df9a28 2023-07-08 jrick link_target ? link_target : in_repo_path);
5205 24df9a28 2023-07-08 jrick if (error)
5206 24df9a28 2023-07-08 jrick goto done;
5208 24df9a28 2023-07-08 jrick error = got_object_get_type(&obj_type, repo, obj_id);
5209 24df9a28 2023-07-08 jrick if (error)
5210 24df9a28 2023-07-08 jrick goto done;
5212 24df9a28 2023-07-08 jrick if (obj_type != GOT_OBJ_TYPE_BLOB) {
5213 24df9a28 2023-07-08 jrick error = got_error_path(link_target ? link_target : in_repo_path,
5214 24df9a28 2023-07-08 jrick GOT_ERR_OBJ_TYPE);
5215 24df9a28 2023-07-08 jrick goto done;
5218 24df9a28 2023-07-08 jrick error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5219 24df9a28 2023-07-08 jrick if (error)
5220 24df9a28 2023-07-08 jrick goto done;
5221 24df9a28 2023-07-08 jrick bca.f = got_opentemp();
5222 24df9a28 2023-07-08 jrick if (bca.f == NULL) {
5223 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
5224 24df9a28 2023-07-08 jrick goto done;
5226 24df9a28 2023-07-08 jrick error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5227 24df9a28 2023-07-08 jrick &bca.line_offsets, bca.f, blob);
5228 24df9a28 2023-07-08 jrick if (error || bca.nlines == 0)
5229 24df9a28 2023-07-08 jrick goto done;
5231 24df9a28 2023-07-08 jrick /* Don't include \n at EOF in the blame line count. */
5232 24df9a28 2023-07-08 jrick if (bca.line_offsets[bca.nlines - 1] == filesize)
5233 24df9a28 2023-07-08 jrick bca.nlines--;
5235 24df9a28 2023-07-08 jrick bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5236 24df9a28 2023-07-08 jrick if (bca.lines == NULL) {
5237 24df9a28 2023-07-08 jrick error = got_error_from_errno("calloc");
5238 24df9a28 2023-07-08 jrick goto done;
5240 24df9a28 2023-07-08 jrick bca.lineno_cur = 1;
5241 24df9a28 2023-07-08 jrick bca.nlines_prec = 0;
5242 24df9a28 2023-07-08 jrick i = bca.nlines;
5243 24df9a28 2023-07-08 jrick while (i > 0) {
5245 24df9a28 2023-07-08 jrick bca.nlines_prec++;
5247 24df9a28 2023-07-08 jrick bca.repo = repo;
5249 24df9a28 2023-07-08 jrick fd2 = got_opentempfd();
5250 24df9a28 2023-07-08 jrick if (fd2 == -1) {
5251 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
5252 24df9a28 2023-07-08 jrick goto done;
5254 24df9a28 2023-07-08 jrick fd3 = got_opentempfd();
5255 24df9a28 2023-07-08 jrick if (fd3 == -1) {
5256 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentempfd");
5257 24df9a28 2023-07-08 jrick goto done;
5259 24df9a28 2023-07-08 jrick f1 = got_opentemp();
5260 24df9a28 2023-07-08 jrick if (f1 == NULL) {
5261 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
5262 24df9a28 2023-07-08 jrick goto done;
5264 24df9a28 2023-07-08 jrick f2 = got_opentemp();
5265 24df9a28 2023-07-08 jrick if (f2 == NULL) {
5266 24df9a28 2023-07-08 jrick error = got_error_from_errno("got_opentemp");
5267 24df9a28 2023-07-08 jrick goto done;
5269 24df9a28 2023-07-08 jrick error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5270 24df9a28 2023-07-08 jrick repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5271 24df9a28 2023-07-08 jrick check_cancelled, NULL, fd2, fd3, f1, f2);
5273 24df9a28 2023-07-08 jrick free(in_repo_path);
5274 24df9a28 2023-07-08 jrick free(link_target);
5275 24df9a28 2023-07-08 jrick free(repo_path);
5276 24df9a28 2023-07-08 jrick free(cwd);
5277 24df9a28 2023-07-08 jrick free(commit_id);
5278 24df9a28 2023-07-08 jrick free(obj_id);
5279 24df9a28 2023-07-08 jrick if (commit)
5280 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
5282 24df9a28 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5283 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
5284 24df9a28 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5285 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
5286 24df9a28 2023-07-08 jrick if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5287 24df9a28 2023-07-08 jrick error = got_error_from_errno("close");
5288 24df9a28 2023-07-08 jrick if (f1 && fclose(f1) == EOF && error == NULL)
5289 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
5290 24df9a28 2023-07-08 jrick if (f2 && fclose(f2) == EOF && error == NULL)
5291 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
5293 24df9a28 2023-07-08 jrick if (blob)
5294 24df9a28 2023-07-08 jrick got_object_blob_close(blob);
5295 24df9a28 2023-07-08 jrick if (worktree)
5296 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5297 24df9a28 2023-07-08 jrick if (repo) {
5298 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
5299 24df9a28 2023-07-08 jrick if (error == NULL)
5300 24df9a28 2023-07-08 jrick error = close_err;
5302 24df9a28 2023-07-08 jrick if (pack_fds) {
5303 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
5304 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
5305 24df9a28 2023-07-08 jrick if (error == NULL)
5306 24df9a28 2023-07-08 jrick error = pack_err;
5308 24df9a28 2023-07-08 jrick if (bca.lines) {
5309 24df9a28 2023-07-08 jrick for (i = 0; i < bca.nlines; i++) {
5310 24df9a28 2023-07-08 jrick struct blame_line *bline = &bca.lines[i];
5311 24df9a28 2023-07-08 jrick free(bline->id_str);
5312 24df9a28 2023-07-08 jrick free(bline->committer);
5314 24df9a28 2023-07-08 jrick free(bca.lines);
5316 24df9a28 2023-07-08 jrick free(bca.line_offsets);
5317 24df9a28 2023-07-08 jrick if (bca.f && fclose(bca.f) == EOF && error == NULL)
5318 24df9a28 2023-07-08 jrick error = got_error_from_errno("fclose");
5319 24df9a28 2023-07-08 jrick return error;
5322 24df9a28 2023-07-08 jrick __dead static void
5323 24df9a28 2023-07-08 jrick usage_tree(void)
5325 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5326 24df9a28 2023-07-08 jrick "[path]\n", getprogname());
5330 24df9a28 2023-07-08 jrick static const struct got_error *
5331 24df9a28 2023-07-08 jrick print_entry(struct got_tree_entry *te, const char *id, const char *path,
5332 24df9a28 2023-07-08 jrick const char *root_path, struct got_repository *repo)
5334 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5335 24df9a28 2023-07-08 jrick int is_root_path = (strcmp(path, root_path) == 0);
5336 24df9a28 2023-07-08 jrick const char *modestr = "";
5337 24df9a28 2023-07-08 jrick mode_t mode = got_tree_entry_get_mode(te);
5338 24df9a28 2023-07-08 jrick char *link_target = NULL;
5340 24df9a28 2023-07-08 jrick path += strlen(root_path);
5341 24df9a28 2023-07-08 jrick while (path[0] == '/')
5344 24df9a28 2023-07-08 jrick if (got_object_tree_entry_is_submodule(te))
5345 24df9a28 2023-07-08 jrick modestr = "$";
5346 24df9a28 2023-07-08 jrick else if (S_ISLNK(mode)) {
5349 24df9a28 2023-07-08 jrick err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5351 24df9a28 2023-07-08 jrick return err;
5352 24df9a28 2023-07-08 jrick for (i = 0; link_target[i] != '\0'; i++) {
5353 24df9a28 2023-07-08 jrick if (!isprint((unsigned char)link_target[i]))
5354 24df9a28 2023-07-08 jrick link_target[i] = '?';
5357 24df9a28 2023-07-08 jrick modestr = "@";
5359 24df9a28 2023-07-08 jrick else if (S_ISDIR(mode))
5360 24df9a28 2023-07-08 jrick modestr = "/";
5361 24df9a28 2023-07-08 jrick else if (mode & S_IXUSR)
5362 24df9a28 2023-07-08 jrick modestr = "*";
5364 24df9a28 2023-07-08 jrick printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5365 24df9a28 2023-07-08 jrick is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5366 24df9a28 2023-07-08 jrick link_target ? " -> ": "", link_target ? link_target : "");
5368 24df9a28 2023-07-08 jrick free(link_target);
5369 24df9a28 2023-07-08 jrick return NULL;
5372 24df9a28 2023-07-08 jrick static const struct got_error *
5373 24df9a28 2023-07-08 jrick print_tree(const char *path, struct got_commit_object *commit,
5374 24df9a28 2023-07-08 jrick int show_ids, int recurse, const char *root_path,
5375 24df9a28 2023-07-08 jrick struct got_repository *repo)
5377 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5378 24df9a28 2023-07-08 jrick struct got_object_id *tree_id = NULL;
5379 24df9a28 2023-07-08 jrick struct got_tree_object *tree = NULL;
5380 24df9a28 2023-07-08 jrick int nentries, i;
5382 24df9a28 2023-07-08 jrick err = got_object_id_by_path(&tree_id, repo, commit, path);
5384 24df9a28 2023-07-08 jrick goto done;
5386 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree, repo, tree_id);
5388 24df9a28 2023-07-08 jrick goto done;
5389 24df9a28 2023-07-08 jrick nentries = got_object_tree_get_nentries(tree);
5390 24df9a28 2023-07-08 jrick for (i = 0; i < nentries; i++) {
5391 24df9a28 2023-07-08 jrick struct got_tree_entry *te;
5392 24df9a28 2023-07-08 jrick char *id = NULL;
5394 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
5397 24df9a28 2023-07-08 jrick te = got_object_tree_get_entry(tree, i);
5398 24df9a28 2023-07-08 jrick if (show_ids) {
5399 24df9a28 2023-07-08 jrick char *id_str;
5400 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str,
5401 24df9a28 2023-07-08 jrick got_tree_entry_get_id(te));
5403 24df9a28 2023-07-08 jrick goto done;
5404 24df9a28 2023-07-08 jrick if (asprintf(&id, "%s ", id_str) == -1) {
5405 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
5406 24df9a28 2023-07-08 jrick free(id_str);
5407 24df9a28 2023-07-08 jrick goto done;
5409 24df9a28 2023-07-08 jrick free(id_str);
5411 24df9a28 2023-07-08 jrick err = print_entry(te, id, path, root_path, repo);
5412 24df9a28 2023-07-08 jrick free(id);
5414 24df9a28 2023-07-08 jrick goto done;
5416 24df9a28 2023-07-08 jrick if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5417 24df9a28 2023-07-08 jrick char *child_path;
5418 24df9a28 2023-07-08 jrick if (asprintf(&child_path, "%s%s%s", path,
5419 24df9a28 2023-07-08 jrick path[0] == '/' && path[1] == '\0' ? "" : "/",
5420 24df9a28 2023-07-08 jrick got_tree_entry_get_name(te)) == -1) {
5421 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
5422 24df9a28 2023-07-08 jrick goto done;
5424 24df9a28 2023-07-08 jrick err = print_tree(child_path, commit, show_ids, 1,
5425 24df9a28 2023-07-08 jrick root_path, repo);
5426 24df9a28 2023-07-08 jrick free(child_path);
5428 24df9a28 2023-07-08 jrick goto done;
5432 24df9a28 2023-07-08 jrick if (tree)
5433 24df9a28 2023-07-08 jrick got_object_tree_close(tree);
5434 24df9a28 2023-07-08 jrick free(tree_id);
5435 24df9a28 2023-07-08 jrick return err;
5438 24df9a28 2023-07-08 jrick static const struct got_error *
5439 24df9a28 2023-07-08 jrick cmd_tree(int argc, char *argv[])
5441 24df9a28 2023-07-08 jrick const struct got_error *error;
5442 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5443 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5444 24df9a28 2023-07-08 jrick const char *path, *refname = NULL;
5445 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5446 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
5447 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
5448 24df9a28 2023-07-08 jrick char *commit_id_str = NULL;
5449 24df9a28 2023-07-08 jrick int show_ids = 0, recurse = 0;
5451 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5453 24df9a28 2023-07-08 jrick #ifndef PROFILE
5454 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5455 24df9a28 2023-07-08 jrick NULL) == -1)
5456 24df9a28 2023-07-08 jrick err(1, "pledge");
5459 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5460 24df9a28 2023-07-08 jrick switch (ch) {
5461 24df9a28 2023-07-08 jrick case 'c':
5462 24df9a28 2023-07-08 jrick commit_id_str = optarg;
5464 24df9a28 2023-07-08 jrick case 'i':
5465 24df9a28 2023-07-08 jrick show_ids = 1;
5467 24df9a28 2023-07-08 jrick case 'R':
5468 24df9a28 2023-07-08 jrick recurse = 1;
5470 24df9a28 2023-07-08 jrick case 'r':
5471 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
5472 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5473 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
5475 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
5478 24df9a28 2023-07-08 jrick usage_tree();
5479 24df9a28 2023-07-08 jrick /* NOTREACHED */
5483 24df9a28 2023-07-08 jrick argc -= optind;
5484 24df9a28 2023-07-08 jrick argv += optind;
5486 24df9a28 2023-07-08 jrick if (argc == 1)
5487 24df9a28 2023-07-08 jrick path = argv[0];
5488 24df9a28 2023-07-08 jrick else if (argc > 1)
5489 24df9a28 2023-07-08 jrick usage_tree();
5491 24df9a28 2023-07-08 jrick path = NULL;
5493 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
5494 24df9a28 2023-07-08 jrick if (cwd == NULL) {
5495 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
5496 24df9a28 2023-07-08 jrick goto done;
5499 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
5500 24df9a28 2023-07-08 jrick if (error != NULL)
5501 24df9a28 2023-07-08 jrick goto done;
5503 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5504 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5505 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
5506 24df9a28 2023-07-08 jrick goto done;
5508 24df9a28 2023-07-08 jrick error = NULL;
5509 24df9a28 2023-07-08 jrick if (worktree) {
5510 24df9a28 2023-07-08 jrick repo_path =
5511 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
5512 24df9a28 2023-07-08 jrick if (repo_path == NULL)
5513 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5514 24df9a28 2023-07-08 jrick if (error)
5515 24df9a28 2023-07-08 jrick goto done;
5517 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
5518 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
5519 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
5520 24df9a28 2023-07-08 jrick goto done;
5525 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5526 24df9a28 2023-07-08 jrick if (error != NULL)
5527 24df9a28 2023-07-08 jrick goto done;
5529 24df9a28 2023-07-08 jrick if (worktree) {
5530 24df9a28 2023-07-08 jrick const char *prefix = got_worktree_get_path_prefix(worktree);
5533 24df9a28 2023-07-08 jrick if (path == NULL || got_path_is_root_dir(path))
5534 24df9a28 2023-07-08 jrick path = "";
5535 24df9a28 2023-07-08 jrick error = got_worktree_resolve_path(&p, worktree, path);
5536 24df9a28 2023-07-08 jrick if (error)
5537 24df9a28 2023-07-08 jrick goto done;
5538 24df9a28 2023-07-08 jrick if (asprintf(&in_repo_path, "%s%s%s", prefix,
5539 24df9a28 2023-07-08 jrick (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5540 24df9a28 2023-07-08 jrick p) == -1) {
5541 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
5543 24df9a28 2023-07-08 jrick goto done;
5546 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5547 24df9a28 2023-07-08 jrick if (error)
5548 24df9a28 2023-07-08 jrick goto done;
5550 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5551 24df9a28 2023-07-08 jrick if (error)
5552 24df9a28 2023-07-08 jrick goto done;
5553 24df9a28 2023-07-08 jrick if (path == NULL)
5554 24df9a28 2023-07-08 jrick path = "/";
5555 24df9a28 2023-07-08 jrick error = got_repo_map_path(&in_repo_path, repo, path);
5556 24df9a28 2023-07-08 jrick if (error != NULL)
5557 24df9a28 2023-07-08 jrick goto done;
5560 24df9a28 2023-07-08 jrick if (commit_id_str == NULL) {
5561 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
5562 24df9a28 2023-07-08 jrick if (worktree)
5563 24df9a28 2023-07-08 jrick refname = got_worktree_get_head_ref_name(worktree);
5565 24df9a28 2023-07-08 jrick refname = GOT_REF_HEAD;
5566 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo, refname, 0);
5567 24df9a28 2023-07-08 jrick if (error != NULL)
5568 24df9a28 2023-07-08 jrick goto done;
5569 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
5570 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
5571 24df9a28 2023-07-08 jrick if (error != NULL)
5572 24df9a28 2023-07-08 jrick goto done;
5574 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5575 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5576 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5578 24df9a28 2023-07-08 jrick if (error)
5579 24df9a28 2023-07-08 jrick goto done;
5580 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
5581 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5582 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
5583 24df9a28 2023-07-08 jrick if (error)
5584 24df9a28 2023-07-08 jrick goto done;
5587 24df9a28 2023-07-08 jrick if (worktree) {
5588 24df9a28 2023-07-08 jrick /* Release work tree lock. */
5589 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5590 24df9a28 2023-07-08 jrick worktree = NULL;
5593 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
5594 24df9a28 2023-07-08 jrick if (error)
5595 24df9a28 2023-07-08 jrick goto done;
5597 24df9a28 2023-07-08 jrick error = print_tree(in_repo_path, commit, show_ids, recurse,
5598 24df9a28 2023-07-08 jrick in_repo_path, repo);
5600 24df9a28 2023-07-08 jrick free(in_repo_path);
5601 24df9a28 2023-07-08 jrick free(repo_path);
5602 24df9a28 2023-07-08 jrick free(cwd);
5603 24df9a28 2023-07-08 jrick free(commit_id);
5604 24df9a28 2023-07-08 jrick if (commit)
5605 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
5606 24df9a28 2023-07-08 jrick if (worktree)
5607 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
5608 24df9a28 2023-07-08 jrick if (repo) {
5609 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
5610 24df9a28 2023-07-08 jrick if (error == NULL)
5611 24df9a28 2023-07-08 jrick error = close_err;
5613 24df9a28 2023-07-08 jrick if (pack_fds) {
5614 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
5615 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
5616 24df9a28 2023-07-08 jrick if (error == NULL)
5617 24df9a28 2023-07-08 jrick error = pack_err;
5619 24df9a28 2023-07-08 jrick return error;
5622 24df9a28 2023-07-08 jrick __dead static void
5623 24df9a28 2023-07-08 jrick usage_status(void)
5625 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5626 24df9a28 2023-07-08 jrick "[-s status-codes] [path ...]\n", getprogname());
5630 24df9a28 2023-07-08 jrick struct got_status_arg {
5631 24df9a28 2023-07-08 jrick char *status_codes;
5632 24df9a28 2023-07-08 jrick int suppress;
5635 24df9a28 2023-07-08 jrick static const struct got_error *
5636 24df9a28 2023-07-08 jrick print_status(void *arg, unsigned char status, unsigned char staged_status,
5637 24df9a28 2023-07-08 jrick const char *path, struct got_object_id *blob_id,
5638 24df9a28 2023-07-08 jrick struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5639 24df9a28 2023-07-08 jrick int dirfd, const char *de_name)
5641 24df9a28 2023-07-08 jrick struct got_status_arg *st = arg;
5643 24df9a28 2023-07-08 jrick if (status == staged_status && (status == GOT_STATUS_DELETE))
5644 24df9a28 2023-07-08 jrick status = GOT_STATUS_NO_CHANGE;
5645 24df9a28 2023-07-08 jrick if (st != NULL && st->status_codes) {
5646 24df9a28 2023-07-08 jrick size_t ncodes = strlen(st->status_codes);
5647 24df9a28 2023-07-08 jrick int i, j = 0;
5649 24df9a28 2023-07-08 jrick for (i = 0; i < ncodes ; i++) {
5650 24df9a28 2023-07-08 jrick if (st->suppress) {
5651 24df9a28 2023-07-08 jrick if (status == st->status_codes[i] ||
5652 24df9a28 2023-07-08 jrick staged_status == st->status_codes[i]) {
5654 24df9a28 2023-07-08 jrick continue;
5657 24df9a28 2023-07-08 jrick if (status == st->status_codes[i] ||
5658 24df9a28 2023-07-08 jrick staged_status == st->status_codes[i])
5663 24df9a28 2023-07-08 jrick if (st->suppress && j == 0)
5664 24df9a28 2023-07-08 jrick goto print;
5666 24df9a28 2023-07-08 jrick if (i == ncodes)
5667 24df9a28 2023-07-08 jrick return NULL;
5670 24df9a28 2023-07-08 jrick printf("%c%c %s\n", status, staged_status, path);
5671 24df9a28 2023-07-08 jrick return NULL;
5674 24df9a28 2023-07-08 jrick static const struct got_error *
5675 24df9a28 2023-07-08 jrick cmd_status(int argc, char *argv[])
5677 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
5678 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
5679 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
5680 24df9a28 2023-07-08 jrick struct got_status_arg st;
5681 24df9a28 2023-07-08 jrick char *cwd = NULL;
5682 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
5683 24df9a28 2023-07-08 jrick int ch, i, no_ignores = 0;
5684 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
5686 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
5688 24df9a28 2023-07-08 jrick memset(&st, 0, sizeof(st));
5689 24df9a28 2023-07-08 jrick st.status_codes = NULL;
5690 24df9a28 2023-07-08 jrick st.suppress = 0;
5692 24df9a28 2023-07-08 jrick #ifndef PROFILE
5693 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5694 24df9a28 2023-07-08 jrick NULL) == -1)
5695 24df9a28 2023-07-08 jrick err(1, "pledge");
5698 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
5699 24df9a28 2023-07-08 jrick switch (ch) {
5700 24df9a28 2023-07-08 jrick case 'I':
5701 24df9a28 2023-07-08 jrick no_ignores = 1;
5703 24df9a28 2023-07-08 jrick case 'S':
5704 24df9a28 2023-07-08 jrick if (st.status_codes != NULL && st.suppress == 0)
5705 24df9a28 2023-07-08 jrick option_conflict('S', 's');
5706 24df9a28 2023-07-08 jrick st.suppress = 1;
5707 24df9a28 2023-07-08 jrick /* fallthrough */
5708 24df9a28 2023-07-08 jrick case 's':
5709 24df9a28 2023-07-08 jrick for (i = 0; optarg[i] != '\0'; i++) {
5710 24df9a28 2023-07-08 jrick switch (optarg[i]) {
5711 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
5712 24df9a28 2023-07-08 jrick case GOT_STATUS_ADD:
5713 24df9a28 2023-07-08 jrick case GOT_STATUS_DELETE:
5714 24df9a28 2023-07-08 jrick case GOT_STATUS_CONFLICT:
5715 24df9a28 2023-07-08 jrick case GOT_STATUS_MISSING:
5716 24df9a28 2023-07-08 jrick case GOT_STATUS_OBSTRUCTED:
5717 24df9a28 2023-07-08 jrick case GOT_STATUS_UNVERSIONED:
5718 24df9a28 2023-07-08 jrick case GOT_STATUS_MODE_CHANGE:
5719 24df9a28 2023-07-08 jrick case GOT_STATUS_NONEXISTENT:
5722 24df9a28 2023-07-08 jrick errx(1, "invalid status code '%c'",
5723 24df9a28 2023-07-08 jrick optarg[i]);
5726 24df9a28 2023-07-08 jrick if (ch == 's' && st.suppress)
5727 24df9a28 2023-07-08 jrick option_conflict('s', 'S');
5728 24df9a28 2023-07-08 jrick st.status_codes = optarg;
5731 24df9a28 2023-07-08 jrick usage_status();
5732 24df9a28 2023-07-08 jrick /* NOTREACHED */
5736 24df9a28 2023-07-08 jrick argc -= optind;
5737 24df9a28 2023-07-08 jrick argv += optind;
5739 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
5740 24df9a28 2023-07-08 jrick if (cwd == NULL) {
5741 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
5742 24df9a28 2023-07-08 jrick goto done;
5745 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
5746 24df9a28 2023-07-08 jrick if (error != NULL)
5747 24df9a28 2023-07-08 jrick goto done;
5749 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5750 24df9a28 2023-07-08 jrick if (error) {
5751 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
5752 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "status", cwd);
5753 24df9a28 2023-07-08 jrick goto done;
5756 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5757 24df9a28 2023-07-08 jrick NULL, pack_fds);
5758 24df9a28 2023-07-08 jrick if (error != NULL)
5759 24df9a28 2023-07-08 jrick goto done;
5761 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
5762 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
5763 24df9a28 2023-07-08 jrick if (error)
5764 24df9a28 2023-07-08 jrick goto done;
5766 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5767 24df9a28 2023-07-08 jrick if (error)
5768 24df9a28 2023-07-08 jrick goto done;
5770 24df9a28 2023-07-08 jrick error = got_worktree_status(worktree, &paths, repo, no_ignores,
5771 24df9a28 2023-07-08 jrick print_status, &st, check_cancelled, NULL);
5773 24df9a28 2023-07-08 jrick if (pack_fds) {
5774 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
5775 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
5776 24df9a28 2023-07-08 jrick if (error == NULL)
5777 24df9a28 2023-07-08 jrick error = pack_err;
5779 24df9a28 2023-07-08 jrick if (repo) {
5780 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
5781 24df9a28 2023-07-08 jrick if (error == NULL)
5782 24df9a28 2023-07-08 jrick error = close_err;
5785 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5786 24df9a28 2023-07-08 jrick free(cwd);
5787 24df9a28 2023-07-08 jrick return error;
5790 24df9a28 2023-07-08 jrick __dead static void
5791 24df9a28 2023-07-08 jrick usage_tag(void)
5793 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
5794 24df9a28 2023-07-08 jrick "[-r repository-path] [-s signer-id] name\n", getprogname());
5799 24df9a28 2023-07-08 jrick static const struct got_error *
5800 24df9a28 2023-07-08 jrick sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5802 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
5803 24df9a28 2023-07-08 jrick struct got_reflist_entry *re, *se, *new;
5804 24df9a28 2023-07-08 jrick struct got_object_id *re_id, *se_id;
5805 24df9a28 2023-07-08 jrick struct got_tag_object *re_tag, *se_tag;
5806 24df9a28 2023-07-08 jrick time_t re_time, se_time;
5808 24df9a28 2023-07-08 jrick STAILQ_FOREACH(re, tags, entry) {
5809 24df9a28 2023-07-08 jrick se = STAILQ_FIRST(sorted);
5810 24df9a28 2023-07-08 jrick if (se == NULL) {
5811 24df9a28 2023-07-08 jrick err = got_reflist_entry_dup(&new, re);
5813 24df9a28 2023-07-08 jrick return err;
5814 24df9a28 2023-07-08 jrick STAILQ_INSERT_HEAD(sorted, new, entry);
5815 24df9a28 2023-07-08 jrick continue;
5817 24df9a28 2023-07-08 jrick err = got_ref_resolve(&re_id, repo, re->ref);
5820 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&re_tag, repo, re_id);
5821 24df9a28 2023-07-08 jrick free(re_id);
5824 24df9a28 2023-07-08 jrick re_time = got_object_tag_get_tagger_time(re_tag);
5825 24df9a28 2023-07-08 jrick got_object_tag_close(re_tag);
5828 24df9a28 2023-07-08 jrick while (se) {
5829 24df9a28 2023-07-08 jrick err = got_ref_resolve(&se_id, repo, re->ref);
5832 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&se_tag, repo, se_id);
5833 24df9a28 2023-07-08 jrick free(se_id);
5836 24df9a28 2023-07-08 jrick se_time = got_object_tag_get_tagger_time(se_tag);
5837 24df9a28 2023-07-08 jrick got_object_tag_close(se_tag);
5839 24df9a28 2023-07-08 jrick if (se_time > re_time) {
5840 24df9a28 2023-07-08 jrick err = got_reflist_entry_dup(&new, re);
5842 24df9a28 2023-07-08 jrick return err;
5843 24df9a28 2023-07-08 jrick STAILQ_INSERT_AFTER(sorted, se, new, entry);
5846 24df9a28 2023-07-08 jrick se = STAILQ_NEXT(se, entry);
5847 24df9a28 2023-07-08 jrick continue;
5851 24df9a28 2023-07-08 jrick return err;
5855 24df9a28 2023-07-08 jrick static const struct got_error *
5856 24df9a28 2023-07-08 jrick get_tag_refname(char **refname, const char *tag_name)
5858 24df9a28 2023-07-08 jrick const struct got_error *err;
5860 24df9a28 2023-07-08 jrick if (strncmp("refs/tags/", tag_name, 10) == 0) {
5861 24df9a28 2023-07-08 jrick *refname = strdup(tag_name);
5862 24df9a28 2023-07-08 jrick if (*refname == NULL)
5863 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
5864 24df9a28 2023-07-08 jrick } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
5865 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
5866 24df9a28 2023-07-08 jrick *refname = NULL;
5867 24df9a28 2023-07-08 jrick return err;
5870 24df9a28 2023-07-08 jrick return NULL;
5873 24df9a28 2023-07-08 jrick static const struct got_error *
5874 24df9a28 2023-07-08 jrick list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
5875 24df9a28 2023-07-08 jrick const char *allowed_signers, const char *revoked_signers, int verbosity)
5877 24df9a28 2023-07-08 jrick static const struct got_error *err = NULL;
5878 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
5879 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
5880 24df9a28 2023-07-08 jrick char *wanted_refname = NULL;
5881 24df9a28 2023-07-08 jrick int bad_sigs = 0;
5883 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
5885 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5887 24df9a28 2023-07-08 jrick return err;
5889 24df9a28 2023-07-08 jrick if (tag_name) {
5890 24df9a28 2023-07-08 jrick struct got_reference *ref;
5891 24df9a28 2023-07-08 jrick err = get_tag_refname(&wanted_refname, tag_name);
5893 24df9a28 2023-07-08 jrick goto done;
5894 24df9a28 2023-07-08 jrick /* Wanted tag reference should exist. */
5895 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, wanted_refname, 0);
5897 24df9a28 2023-07-08 jrick goto done;
5898 24df9a28 2023-07-08 jrick got_ref_close(ref);
5901 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
5902 24df9a28 2023-07-08 jrick const char *refname;
5903 24df9a28 2023-07-08 jrick char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5904 24df9a28 2023-07-08 jrick char datebuf[26];
5905 24df9a28 2023-07-08 jrick const char *tagger, *ssh_sig = NULL;
5906 24df9a28 2023-07-08 jrick char *sig_msg = NULL;
5907 24df9a28 2023-07-08 jrick time_t tagger_time;
5908 24df9a28 2023-07-08 jrick struct got_object_id *id;
5909 24df9a28 2023-07-08 jrick struct got_tag_object *tag;
5910 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
5912 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
5913 24df9a28 2023-07-08 jrick if (strncmp(refname, "refs/tags/", 10) != 0 ||
5914 24df9a28 2023-07-08 jrick (wanted_refname && strcmp(refname, wanted_refname) != 0))
5915 24df9a28 2023-07-08 jrick continue;
5916 24df9a28 2023-07-08 jrick refname += 10;
5917 24df9a28 2023-07-08 jrick refstr = got_ref_to_str(re->ref);
5918 24df9a28 2023-07-08 jrick if (refstr == NULL) {
5919 24df9a28 2023-07-08 jrick err = got_error_from_errno("got_ref_to_str");
5923 24df9a28 2023-07-08 jrick err = got_ref_resolve(&id, repo, re->ref);
5926 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&tag, repo, id);
5927 24df9a28 2023-07-08 jrick if (err) {
5928 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_OBJ_TYPE) {
5929 24df9a28 2023-07-08 jrick free(id);
5932 24df9a28 2023-07-08 jrick /* "lightweight" tag */
5933 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
5934 24df9a28 2023-07-08 jrick if (err) {
5935 24df9a28 2023-07-08 jrick free(id);
5938 24df9a28 2023-07-08 jrick tagger = got_object_commit_get_committer(commit);
5939 24df9a28 2023-07-08 jrick tagger_time =
5940 24df9a28 2023-07-08 jrick got_object_commit_get_committer_time(commit);
5941 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, id);
5942 24df9a28 2023-07-08 jrick free(id);
5946 24df9a28 2023-07-08 jrick free(id);
5947 24df9a28 2023-07-08 jrick tagger = got_object_tag_get_tagger(tag);
5948 24df9a28 2023-07-08 jrick tagger_time = got_object_tag_get_tagger_time(tag);
5949 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str,
5950 24df9a28 2023-07-08 jrick got_object_tag_get_object_id(tag));
5955 24df9a28 2023-07-08 jrick if (tag && verify_tags) {
5956 24df9a28 2023-07-08 jrick ssh_sig = got_sigs_get_tagmsg_ssh_signature(
5957 24df9a28 2023-07-08 jrick got_object_tag_get_message(tag));
5958 24df9a28 2023-07-08 jrick if (ssh_sig && allowed_signers == NULL) {
5959 24df9a28 2023-07-08 jrick err = got_error_msg(
5960 24df9a28 2023-07-08 jrick GOT_ERR_VERIFY_TAG_SIGNATURE,
5961 24df9a28 2023-07-08 jrick "SSH signature verification requires "
5962 24df9a28 2023-07-08 jrick "setting allowed_signers in "
5963 24df9a28 2023-07-08 jrick "got.conf(5)");
5968 24df9a28 2023-07-08 jrick printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5969 24df9a28 2023-07-08 jrick free(refstr);
5970 24df9a28 2023-07-08 jrick printf("from: %s\n", tagger);
5971 24df9a28 2023-07-08 jrick datestr = get_datestr(&tagger_time, datebuf);
5972 24df9a28 2023-07-08 jrick if (datestr)
5973 24df9a28 2023-07-08 jrick printf("date: %s UTC\n", datestr);
5974 24df9a28 2023-07-08 jrick if (commit)
5975 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5977 24df9a28 2023-07-08 jrick switch (got_object_tag_get_object_type(tag)) {
5978 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
5979 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5982 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
5983 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5986 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
5987 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5990 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TAG:
5991 24df9a28 2023-07-08 jrick printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5998 24df9a28 2023-07-08 jrick free(id_str);
6000 24df9a28 2023-07-08 jrick if (ssh_sig) {
6001 24df9a28 2023-07-08 jrick err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
6002 24df9a28 2023-07-08 jrick allowed_signers, revoked_signers, verbosity);
6003 24df9a28 2023-07-08 jrick if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
6004 24df9a28 2023-07-08 jrick bad_sigs = 1;
6005 24df9a28 2023-07-08 jrick else if (err)
6007 24df9a28 2023-07-08 jrick printf("signature: %s", sig_msg);
6008 24df9a28 2023-07-08 jrick free(sig_msg);
6009 24df9a28 2023-07-08 jrick sig_msg = NULL;
6012 24df9a28 2023-07-08 jrick if (commit) {
6013 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&tagmsg0, commit);
6016 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
6018 24df9a28 2023-07-08 jrick tagmsg0 = strdup(got_object_tag_get_message(tag));
6019 24df9a28 2023-07-08 jrick got_object_tag_close(tag);
6020 24df9a28 2023-07-08 jrick if (tagmsg0 == NULL) {
6021 24df9a28 2023-07-08 jrick err = got_error_from_errno("strdup");
6026 24df9a28 2023-07-08 jrick tagmsg = tagmsg0;
6028 24df9a28 2023-07-08 jrick line = strsep(&tagmsg, "\n");
6029 24df9a28 2023-07-08 jrick if (line)
6030 24df9a28 2023-07-08 jrick printf(" %s\n", line);
6031 24df9a28 2023-07-08 jrick } while (line);
6032 24df9a28 2023-07-08 jrick free(tagmsg0);
6035 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
6036 24df9a28 2023-07-08 jrick free(wanted_refname);
6038 24df9a28 2023-07-08 jrick if (err == NULL && bad_sigs)
6039 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
6040 24df9a28 2023-07-08 jrick return err;
6043 24df9a28 2023-07-08 jrick static const struct got_error *
6044 24df9a28 2023-07-08 jrick get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6045 24df9a28 2023-07-08 jrick const char *tag_name, const char *repo_path)
6047 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
6048 24df9a28 2023-07-08 jrick char *template = NULL, *initial_content = NULL;
6049 24df9a28 2023-07-08 jrick char *editor = NULL;
6050 24df9a28 2023-07-08 jrick int initial_content_len;
6051 24df9a28 2023-07-08 jrick int fd = -1;
6053 24df9a28 2023-07-08 jrick if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6054 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
6055 24df9a28 2023-07-08 jrick goto done;
6058 24df9a28 2023-07-08 jrick initial_content_len = asprintf(&initial_content,
6059 24df9a28 2023-07-08 jrick "\n# tagging commit %s as %s\n",
6060 24df9a28 2023-07-08 jrick commit_id_str, tag_name);
6061 24df9a28 2023-07-08 jrick if (initial_content_len == -1) {
6062 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
6063 24df9a28 2023-07-08 jrick goto done;
6066 24df9a28 2023-07-08 jrick err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
6068 24df9a28 2023-07-08 jrick goto done;
6070 24df9a28 2023-07-08 jrick if (write(fd, initial_content, initial_content_len) == -1) {
6071 24df9a28 2023-07-08 jrick err = got_error_from_errno2("write", *tagmsg_path);
6072 24df9a28 2023-07-08 jrick goto done;
6074 24df9a28 2023-07-08 jrick if (close(fd) == -1) {
6075 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *tagmsg_path);
6076 24df9a28 2023-07-08 jrick goto done;
6080 24df9a28 2023-07-08 jrick err = get_editor(&editor);
6082 24df9a28 2023-07-08 jrick goto done;
6083 24df9a28 2023-07-08 jrick err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6084 24df9a28 2023-07-08 jrick initial_content_len, 1);
6086 24df9a28 2023-07-08 jrick free(initial_content);
6087 24df9a28 2023-07-08 jrick free(template);
6088 24df9a28 2023-07-08 jrick free(editor);
6090 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
6091 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", *tagmsg_path);
6093 24df9a28 2023-07-08 jrick if (err) {
6094 24df9a28 2023-07-08 jrick free(*tagmsg);
6095 24df9a28 2023-07-08 jrick *tagmsg = NULL;
6097 24df9a28 2023-07-08 jrick return err;
6100 24df9a28 2023-07-08 jrick static const struct got_error *
6101 24df9a28 2023-07-08 jrick add_tag(struct got_repository *repo, const char *tagger,
6102 24df9a28 2023-07-08 jrick const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
6103 24df9a28 2023-07-08 jrick const char *signer_id, int verbosity)
6105 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
6106 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL, *tag_id = NULL;
6107 24df9a28 2023-07-08 jrick char *label = NULL, *commit_id_str = NULL;
6108 24df9a28 2023-07-08 jrick struct got_reference *ref = NULL;
6109 24df9a28 2023-07-08 jrick char *refname = NULL, *tagmsg = NULL;
6110 24df9a28 2023-07-08 jrick char *tagmsg_path = NULL, *tag_id_str = NULL;
6111 24df9a28 2023-07-08 jrick int preserve_tagmsg = 0;
6112 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
6114 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
6117 24df9a28 2023-07-08 jrick * Don't let the user create a tag name with a leading '-'.
6118 24df9a28 2023-07-08 jrick * While technically a valid reference name, this case is usually
6119 24df9a28 2023-07-08 jrick * an unintended typo.
6121 24df9a28 2023-07-08 jrick if (tag_name[0] == '-')
6122 24df9a28 2023-07-08 jrick return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6124 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6126 24df9a28 2023-07-08 jrick goto done;
6128 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6129 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, &refs, repo);
6131 24df9a28 2023-07-08 jrick goto done;
6133 24df9a28 2023-07-08 jrick err = got_object_id_str(&commit_id_str, commit_id);
6135 24df9a28 2023-07-08 jrick goto done;
6137 24df9a28 2023-07-08 jrick err = get_tag_refname(&refname, tag_name);
6139 24df9a28 2023-07-08 jrick goto done;
6140 24df9a28 2023-07-08 jrick if (strncmp("refs/tags/", tag_name, 10) == 0)
6141 24df9a28 2023-07-08 jrick tag_name += 10;
6143 24df9a28 2023-07-08 jrick err = got_ref_open(&ref, repo, refname, 0);
6144 24df9a28 2023-07-08 jrick if (err == NULL) {
6145 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_TAG_EXISTS);
6146 24df9a28 2023-07-08 jrick goto done;
6147 24df9a28 2023-07-08 jrick } else if (err->code != GOT_ERR_NOT_REF)
6148 24df9a28 2023-07-08 jrick goto done;
6150 24df9a28 2023-07-08 jrick if (tagmsg_arg == NULL) {
6151 24df9a28 2023-07-08 jrick err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6152 24df9a28 2023-07-08 jrick tag_name, got_repo_get_path(repo));
6153 24df9a28 2023-07-08 jrick if (err) {
6154 24df9a28 2023-07-08 jrick if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6155 24df9a28 2023-07-08 jrick tagmsg_path != NULL)
6156 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6157 24df9a28 2023-07-08 jrick goto done;
6159 24df9a28 2023-07-08 jrick /* Editor is done; we can now apply unveil(2) */
6160 24df9a28 2023-07-08 jrick err = got_sigs_apply_unveil();
6162 24df9a28 2023-07-08 jrick goto done;
6163 24df9a28 2023-07-08 jrick err = apply_unveil(got_repo_get_path(repo), 0, NULL);
6165 24df9a28 2023-07-08 jrick goto done;
6168 24df9a28 2023-07-08 jrick err = got_object_tag_create(&tag_id, tag_name, commit_id,
6169 24df9a28 2023-07-08 jrick tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
6170 24df9a28 2023-07-08 jrick verbosity);
6171 24df9a28 2023-07-08 jrick if (err) {
6172 24df9a28 2023-07-08 jrick if (tagmsg_path)
6173 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6174 24df9a28 2023-07-08 jrick goto done;
6177 24df9a28 2023-07-08 jrick err = got_ref_alloc(&ref, refname, tag_id);
6178 24df9a28 2023-07-08 jrick if (err) {
6179 24df9a28 2023-07-08 jrick if (tagmsg_path)
6180 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6181 24df9a28 2023-07-08 jrick goto done;
6184 24df9a28 2023-07-08 jrick err = got_ref_write(ref, repo);
6185 24df9a28 2023-07-08 jrick if (err) {
6186 24df9a28 2023-07-08 jrick if (tagmsg_path)
6187 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6188 24df9a28 2023-07-08 jrick goto done;
6191 24df9a28 2023-07-08 jrick err = got_object_id_str(&tag_id_str, tag_id);
6192 24df9a28 2023-07-08 jrick if (err) {
6193 24df9a28 2023-07-08 jrick if (tagmsg_path)
6194 24df9a28 2023-07-08 jrick preserve_tagmsg = 1;
6195 24df9a28 2023-07-08 jrick goto done;
6197 24df9a28 2023-07-08 jrick printf("Created tag %s\n", tag_id_str);
6199 24df9a28 2023-07-08 jrick if (preserve_tagmsg) {
6200 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: tag message preserved in %s\n",
6201 24df9a28 2023-07-08 jrick getprogname(), tagmsg_path);
6202 24df9a28 2023-07-08 jrick } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6203 24df9a28 2023-07-08 jrick err = got_error_from_errno2("unlink", tagmsg_path);
6204 24df9a28 2023-07-08 jrick free(tag_id_str);
6206 24df9a28 2023-07-08 jrick got_ref_close(ref);
6207 24df9a28 2023-07-08 jrick free(commit_id);
6208 24df9a28 2023-07-08 jrick free(commit_id_str);
6209 24df9a28 2023-07-08 jrick free(refname);
6210 24df9a28 2023-07-08 jrick free(tagmsg);
6211 24df9a28 2023-07-08 jrick free(tagmsg_path);
6212 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
6213 24df9a28 2023-07-08 jrick return err;
6216 24df9a28 2023-07-08 jrick static const struct got_error *
6217 24df9a28 2023-07-08 jrick cmd_tag(int argc, char *argv[])
6219 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
6220 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6221 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6222 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6223 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL, *tagger = NULL;
6224 24df9a28 2023-07-08 jrick char *allowed_signers = NULL, *revoked_signers = NULL;
6225 24df9a28 2023-07-08 jrick const char *signer_id = NULL;
6226 24df9a28 2023-07-08 jrick const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
6227 24df9a28 2023-07-08 jrick int ch, do_list = 0, verify_tags = 0, verbosity = 0;
6228 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6230 24df9a28 2023-07-08 jrick #ifndef PROFILE
6231 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6232 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
6233 24df9a28 2023-07-08 jrick err(1, "pledge");
6236 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
6237 24df9a28 2023-07-08 jrick switch (ch) {
6238 24df9a28 2023-07-08 jrick case 'c':
6239 24df9a28 2023-07-08 jrick commit_id_arg = optarg;
6241 24df9a28 2023-07-08 jrick case 'l':
6242 24df9a28 2023-07-08 jrick do_list = 1;
6244 24df9a28 2023-07-08 jrick case 'm':
6245 24df9a28 2023-07-08 jrick tagmsg = optarg;
6247 24df9a28 2023-07-08 jrick case 'r':
6248 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
6249 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6250 24df9a28 2023-07-08 jrick error = got_error_from_errno2("realpath",
6252 24df9a28 2023-07-08 jrick goto done;
6254 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
6256 24df9a28 2023-07-08 jrick case 's':
6257 24df9a28 2023-07-08 jrick signer_id = optarg;
6259 24df9a28 2023-07-08 jrick case 'V':
6260 24df9a28 2023-07-08 jrick verify_tags = 1;
6262 24df9a28 2023-07-08 jrick case 'v':
6263 24df9a28 2023-07-08 jrick if (verbosity < 0)
6264 24df9a28 2023-07-08 jrick verbosity = 0;
6265 24df9a28 2023-07-08 jrick else if (verbosity < 3)
6266 24df9a28 2023-07-08 jrick verbosity++;
6269 24df9a28 2023-07-08 jrick usage_tag();
6270 24df9a28 2023-07-08 jrick /* NOTREACHED */
6274 24df9a28 2023-07-08 jrick argc -= optind;
6275 24df9a28 2023-07-08 jrick argv += optind;
6277 24df9a28 2023-07-08 jrick if (do_list || verify_tags) {
6278 24df9a28 2023-07-08 jrick if (commit_id_arg != NULL)
6280 24df9a28 2023-07-08 jrick "-c option can only be used when creating a tag");
6281 24df9a28 2023-07-08 jrick if (tagmsg) {
6282 24df9a28 2023-07-08 jrick if (do_list)
6283 24df9a28 2023-07-08 jrick option_conflict('l', 'm');
6285 24df9a28 2023-07-08 jrick option_conflict('V', 'm');
6287 24df9a28 2023-07-08 jrick if (signer_id) {
6288 24df9a28 2023-07-08 jrick if (do_list)
6289 24df9a28 2023-07-08 jrick option_conflict('l', 's');
6291 24df9a28 2023-07-08 jrick option_conflict('V', 's');
6293 24df9a28 2023-07-08 jrick if (argc > 1)
6294 24df9a28 2023-07-08 jrick usage_tag();
6295 24df9a28 2023-07-08 jrick } else if (argc != 1)
6296 24df9a28 2023-07-08 jrick usage_tag();
6298 24df9a28 2023-07-08 jrick if (argc == 1)
6299 24df9a28 2023-07-08 jrick tag_name = argv[0];
6301 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6302 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6303 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6304 24df9a28 2023-07-08 jrick goto done;
6307 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6308 24df9a28 2023-07-08 jrick if (error != NULL)
6309 24df9a28 2023-07-08 jrick goto done;
6311 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6312 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6313 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
6314 24df9a28 2023-07-08 jrick goto done;
6316 24df9a28 2023-07-08 jrick error = NULL;
6317 24df9a28 2023-07-08 jrick if (worktree) {
6318 24df9a28 2023-07-08 jrick repo_path =
6319 24df9a28 2023-07-08 jrick strdup(got_worktree_get_repo_path(worktree));
6320 24df9a28 2023-07-08 jrick if (repo_path == NULL)
6321 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6322 24df9a28 2023-07-08 jrick if (error)
6323 24df9a28 2023-07-08 jrick goto done;
6325 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
6326 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
6327 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
6328 24df9a28 2023-07-08 jrick goto done;
6333 24df9a28 2023-07-08 jrick if (do_list || verify_tags) {
6334 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6335 24df9a28 2023-07-08 jrick if (error != NULL)
6336 24df9a28 2023-07-08 jrick goto done;
6337 24df9a28 2023-07-08 jrick error = get_allowed_signers(&allowed_signers, repo, worktree);
6338 24df9a28 2023-07-08 jrick if (error)
6339 24df9a28 2023-07-08 jrick goto done;
6340 24df9a28 2023-07-08 jrick error = get_revoked_signers(&revoked_signers, repo, worktree);
6341 24df9a28 2023-07-08 jrick if (error)
6342 24df9a28 2023-07-08 jrick goto done;
6343 24df9a28 2023-07-08 jrick if (worktree) {
6344 24df9a28 2023-07-08 jrick /* Release work tree lock. */
6345 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6346 24df9a28 2023-07-08 jrick worktree = NULL;
6350 24df9a28 2023-07-08 jrick * Remove "cpath" promise unless needed for signature tmpfile
6351 24df9a28 2023-07-08 jrick * creation.
6353 24df9a28 2023-07-08 jrick if (verify_tags)
6354 24df9a28 2023-07-08 jrick got_sigs_apply_unveil();
6356 24df9a28 2023-07-08 jrick #ifndef PROFILE
6357 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath flock proc exec sendfd "
6358 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
6359 24df9a28 2023-07-08 jrick err(1, "pledge");
6362 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6363 24df9a28 2023-07-08 jrick if (error)
6364 24df9a28 2023-07-08 jrick goto done;
6365 24df9a28 2023-07-08 jrick error = list_tags(repo, tag_name, verify_tags, allowed_signers,
6366 24df9a28 2023-07-08 jrick revoked_signers, verbosity);
6368 24df9a28 2023-07-08 jrick error = get_gitconfig_path(&gitconfig_path);
6369 24df9a28 2023-07-08 jrick if (error)
6370 24df9a28 2023-07-08 jrick goto done;
6371 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, gitconfig_path,
6372 24df9a28 2023-07-08 jrick pack_fds);
6373 24df9a28 2023-07-08 jrick if (error != NULL)
6374 24df9a28 2023-07-08 jrick goto done;
6376 24df9a28 2023-07-08 jrick error = get_author(&tagger, repo, worktree);
6377 24df9a28 2023-07-08 jrick if (error)
6378 24df9a28 2023-07-08 jrick goto done;
6379 24df9a28 2023-07-08 jrick if (signer_id == NULL)
6380 24df9a28 2023-07-08 jrick signer_id = get_signer_id(repo, worktree);
6382 24df9a28 2023-07-08 jrick if (tagmsg) {
6383 24df9a28 2023-07-08 jrick if (signer_id) {
6384 24df9a28 2023-07-08 jrick error = got_sigs_apply_unveil();
6385 24df9a28 2023-07-08 jrick if (error)
6386 24df9a28 2023-07-08 jrick goto done;
6388 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6389 24df9a28 2023-07-08 jrick if (error)
6390 24df9a28 2023-07-08 jrick goto done;
6393 24df9a28 2023-07-08 jrick if (commit_id_arg == NULL) {
6394 24df9a28 2023-07-08 jrick struct got_reference *head_ref;
6395 24df9a28 2023-07-08 jrick struct got_object_id *commit_id;
6396 24df9a28 2023-07-08 jrick error = got_ref_open(&head_ref, repo,
6397 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_head_ref_name(worktree)
6398 24df9a28 2023-07-08 jrick : GOT_REF_HEAD, 0);
6399 24df9a28 2023-07-08 jrick if (error)
6400 24df9a28 2023-07-08 jrick goto done;
6401 24df9a28 2023-07-08 jrick error = got_ref_resolve(&commit_id, repo, head_ref);
6402 24df9a28 2023-07-08 jrick got_ref_close(head_ref);
6403 24df9a28 2023-07-08 jrick if (error)
6404 24df9a28 2023-07-08 jrick goto done;
6405 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
6406 24df9a28 2023-07-08 jrick free(commit_id);
6407 24df9a28 2023-07-08 jrick if (error)
6408 24df9a28 2023-07-08 jrick goto done;
6411 24df9a28 2023-07-08 jrick if (worktree) {
6412 24df9a28 2023-07-08 jrick /* Release work tree lock. */
6413 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6414 24df9a28 2023-07-08 jrick worktree = NULL;
6417 24df9a28 2023-07-08 jrick error = add_tag(repo, tagger, tag_name,
6418 24df9a28 2023-07-08 jrick commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
6419 24df9a28 2023-07-08 jrick signer_id, verbosity);
6422 24df9a28 2023-07-08 jrick if (repo) {
6423 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
6424 24df9a28 2023-07-08 jrick if (error == NULL)
6425 24df9a28 2023-07-08 jrick error = close_err;
6427 24df9a28 2023-07-08 jrick if (worktree)
6428 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6429 24df9a28 2023-07-08 jrick if (pack_fds) {
6430 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6431 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6432 24df9a28 2023-07-08 jrick if (error == NULL)
6433 24df9a28 2023-07-08 jrick error = pack_err;
6435 24df9a28 2023-07-08 jrick free(cwd);
6436 24df9a28 2023-07-08 jrick free(repo_path);
6437 24df9a28 2023-07-08 jrick free(gitconfig_path);
6438 24df9a28 2023-07-08 jrick free(commit_id_str);
6439 24df9a28 2023-07-08 jrick free(tagger);
6440 24df9a28 2023-07-08 jrick free(allowed_signers);
6441 24df9a28 2023-07-08 jrick free(revoked_signers);
6442 24df9a28 2023-07-08 jrick return error;
6445 24df9a28 2023-07-08 jrick __dead static void
6446 24df9a28 2023-07-08 jrick usage_add(void)
6448 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
6452 24df9a28 2023-07-08 jrick static const struct got_error *
6453 24df9a28 2023-07-08 jrick add_progress(void *arg, unsigned char status, const char *path)
6455 24df9a28 2023-07-08 jrick while (path[0] == '/')
6457 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
6458 24df9a28 2023-07-08 jrick return NULL;
6461 24df9a28 2023-07-08 jrick static const struct got_error *
6462 24df9a28 2023-07-08 jrick cmd_add(int argc, char *argv[])
6464 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
6465 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6466 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6467 24df9a28 2023-07-08 jrick char *cwd = NULL;
6468 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
6469 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
6470 24df9a28 2023-07-08 jrick int ch, can_recurse = 0, no_ignores = 0;
6471 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6473 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
6475 24df9a28 2023-07-08 jrick #ifndef PROFILE
6476 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6477 24df9a28 2023-07-08 jrick NULL) == -1)
6478 24df9a28 2023-07-08 jrick err(1, "pledge");
6481 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "IR")) != -1) {
6482 24df9a28 2023-07-08 jrick switch (ch) {
6483 24df9a28 2023-07-08 jrick case 'I':
6484 24df9a28 2023-07-08 jrick no_ignores = 1;
6486 24df9a28 2023-07-08 jrick case 'R':
6487 24df9a28 2023-07-08 jrick can_recurse = 1;
6490 24df9a28 2023-07-08 jrick usage_add();
6491 24df9a28 2023-07-08 jrick /* NOTREACHED */
6495 24df9a28 2023-07-08 jrick argc -= optind;
6496 24df9a28 2023-07-08 jrick argv += optind;
6498 24df9a28 2023-07-08 jrick if (argc < 1)
6499 24df9a28 2023-07-08 jrick usage_add();
6501 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6502 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6503 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6504 24df9a28 2023-07-08 jrick goto done;
6507 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6508 24df9a28 2023-07-08 jrick if (error != NULL)
6509 24df9a28 2023-07-08 jrick goto done;
6511 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6512 24df9a28 2023-07-08 jrick if (error) {
6513 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
6514 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "add", cwd);
6515 24df9a28 2023-07-08 jrick goto done;
6518 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6519 24df9a28 2023-07-08 jrick NULL, pack_fds);
6520 24df9a28 2023-07-08 jrick if (error != NULL)
6521 24df9a28 2023-07-08 jrick goto done;
6523 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
6524 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
6525 24df9a28 2023-07-08 jrick if (error)
6526 24df9a28 2023-07-08 jrick goto done;
6528 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6529 24df9a28 2023-07-08 jrick if (error)
6530 24df9a28 2023-07-08 jrick goto done;
6532 24df9a28 2023-07-08 jrick if (!can_recurse) {
6533 24df9a28 2023-07-08 jrick char *ondisk_path;
6534 24df9a28 2023-07-08 jrick struct stat sb;
6535 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
6536 24df9a28 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
6537 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree),
6538 24df9a28 2023-07-08 jrick pe->path) == -1) {
6539 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
6540 24df9a28 2023-07-08 jrick goto done;
6542 24df9a28 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
6543 24df9a28 2023-07-08 jrick if (errno == ENOENT) {
6544 24df9a28 2023-07-08 jrick free(ondisk_path);
6545 24df9a28 2023-07-08 jrick continue;
6547 24df9a28 2023-07-08 jrick error = got_error_from_errno2("lstat",
6548 24df9a28 2023-07-08 jrick ondisk_path);
6549 24df9a28 2023-07-08 jrick free(ondisk_path);
6550 24df9a28 2023-07-08 jrick goto done;
6552 24df9a28 2023-07-08 jrick free(ondisk_path);
6553 24df9a28 2023-07-08 jrick if (S_ISDIR(sb.st_mode)) {
6554 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
6555 24df9a28 2023-07-08 jrick "adding directories requires -R option");
6556 24df9a28 2023-07-08 jrick goto done;
6561 24df9a28 2023-07-08 jrick error = got_worktree_schedule_add(worktree, &paths, add_progress,
6562 24df9a28 2023-07-08 jrick NULL, repo, no_ignores);
6564 24df9a28 2023-07-08 jrick if (repo) {
6565 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
6566 24df9a28 2023-07-08 jrick if (error == NULL)
6567 24df9a28 2023-07-08 jrick error = close_err;
6569 24df9a28 2023-07-08 jrick if (worktree)
6570 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6571 24df9a28 2023-07-08 jrick if (pack_fds) {
6572 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6573 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6574 24df9a28 2023-07-08 jrick if (error == NULL)
6575 24df9a28 2023-07-08 jrick error = pack_err;
6577 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6578 24df9a28 2023-07-08 jrick free(cwd);
6579 24df9a28 2023-07-08 jrick return error;
6582 24df9a28 2023-07-08 jrick __dead static void
6583 24df9a28 2023-07-08 jrick usage_remove(void)
6585 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
6586 24df9a28 2023-07-08 jrick getprogname());
6590 24df9a28 2023-07-08 jrick static const struct got_error *
6591 24df9a28 2023-07-08 jrick print_remove_status(void *arg, unsigned char status,
6592 24df9a28 2023-07-08 jrick unsigned char staged_status, const char *path)
6594 24df9a28 2023-07-08 jrick while (path[0] == '/')
6596 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_NONEXISTENT)
6597 24df9a28 2023-07-08 jrick return NULL;
6598 24df9a28 2023-07-08 jrick if (status == staged_status && (status == GOT_STATUS_DELETE))
6599 24df9a28 2023-07-08 jrick status = GOT_STATUS_NO_CHANGE;
6600 24df9a28 2023-07-08 jrick printf("%c%c %s\n", status, staged_status, path);
6601 24df9a28 2023-07-08 jrick return NULL;
6604 24df9a28 2023-07-08 jrick static const struct got_error *
6605 24df9a28 2023-07-08 jrick cmd_remove(int argc, char *argv[])
6607 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
6608 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6609 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6610 24df9a28 2023-07-08 jrick const char *status_codes = NULL;
6611 24df9a28 2023-07-08 jrick char *cwd = NULL;
6612 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
6613 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
6614 24df9a28 2023-07-08 jrick int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6615 24df9a28 2023-07-08 jrick int ignore_missing_paths = 0;
6616 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6618 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
6620 24df9a28 2023-07-08 jrick #ifndef PROFILE
6621 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6622 24df9a28 2023-07-08 jrick NULL) == -1)
6623 24df9a28 2023-07-08 jrick err(1, "pledge");
6626 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6627 24df9a28 2023-07-08 jrick switch (ch) {
6628 24df9a28 2023-07-08 jrick case 'f':
6629 24df9a28 2023-07-08 jrick delete_local_mods = 1;
6630 24df9a28 2023-07-08 jrick ignore_missing_paths = 1;
6632 24df9a28 2023-07-08 jrick case 'k':
6633 24df9a28 2023-07-08 jrick keep_on_disk = 1;
6635 24df9a28 2023-07-08 jrick case 'R':
6636 24df9a28 2023-07-08 jrick can_recurse = 1;
6638 24df9a28 2023-07-08 jrick case 's':
6639 24df9a28 2023-07-08 jrick for (i = 0; optarg[i] != '\0'; i++) {
6640 24df9a28 2023-07-08 jrick switch (optarg[i]) {
6641 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
6642 24df9a28 2023-07-08 jrick delete_local_mods = 1;
6644 24df9a28 2023-07-08 jrick case GOT_STATUS_MISSING:
6645 24df9a28 2023-07-08 jrick ignore_missing_paths = 1;
6648 24df9a28 2023-07-08 jrick errx(1, "invalid status code '%c'",
6649 24df9a28 2023-07-08 jrick optarg[i]);
6652 24df9a28 2023-07-08 jrick status_codes = optarg;
6655 24df9a28 2023-07-08 jrick usage_remove();
6656 24df9a28 2023-07-08 jrick /* NOTREACHED */
6660 24df9a28 2023-07-08 jrick argc -= optind;
6661 24df9a28 2023-07-08 jrick argv += optind;
6663 24df9a28 2023-07-08 jrick if (argc < 1)
6664 24df9a28 2023-07-08 jrick usage_remove();
6666 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
6667 24df9a28 2023-07-08 jrick if (cwd == NULL) {
6668 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6669 24df9a28 2023-07-08 jrick goto done;
6672 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6673 24df9a28 2023-07-08 jrick if (error != NULL)
6674 24df9a28 2023-07-08 jrick goto done;
6676 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6677 24df9a28 2023-07-08 jrick if (error) {
6678 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
6679 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "remove", cwd);
6680 24df9a28 2023-07-08 jrick goto done;
6683 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6684 24df9a28 2023-07-08 jrick NULL, pack_fds);
6685 24df9a28 2023-07-08 jrick if (error)
6686 24df9a28 2023-07-08 jrick goto done;
6688 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1,
6689 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
6690 24df9a28 2023-07-08 jrick if (error)
6691 24df9a28 2023-07-08 jrick goto done;
6693 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6694 24df9a28 2023-07-08 jrick if (error)
6695 24df9a28 2023-07-08 jrick goto done;
6697 24df9a28 2023-07-08 jrick if (!can_recurse) {
6698 24df9a28 2023-07-08 jrick char *ondisk_path;
6699 24df9a28 2023-07-08 jrick struct stat sb;
6700 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
6701 24df9a28 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
6702 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree),
6703 24df9a28 2023-07-08 jrick pe->path) == -1) {
6704 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
6705 24df9a28 2023-07-08 jrick goto done;
6707 24df9a28 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
6708 24df9a28 2023-07-08 jrick if (errno == ENOENT) {
6709 24df9a28 2023-07-08 jrick free(ondisk_path);
6710 24df9a28 2023-07-08 jrick continue;
6712 24df9a28 2023-07-08 jrick error = got_error_from_errno2("lstat",
6713 24df9a28 2023-07-08 jrick ondisk_path);
6714 24df9a28 2023-07-08 jrick free(ondisk_path);
6715 24df9a28 2023-07-08 jrick goto done;
6717 24df9a28 2023-07-08 jrick free(ondisk_path);
6718 24df9a28 2023-07-08 jrick if (S_ISDIR(sb.st_mode)) {
6719 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
6720 24df9a28 2023-07-08 jrick "removing directories requires -R option");
6721 24df9a28 2023-07-08 jrick goto done;
6726 24df9a28 2023-07-08 jrick error = got_worktree_schedule_delete(worktree, &paths,
6727 24df9a28 2023-07-08 jrick delete_local_mods, status_codes, print_remove_status, NULL,
6728 24df9a28 2023-07-08 jrick repo, keep_on_disk, ignore_missing_paths);
6730 24df9a28 2023-07-08 jrick if (repo) {
6731 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
6732 24df9a28 2023-07-08 jrick if (error == NULL)
6733 24df9a28 2023-07-08 jrick error = close_err;
6735 24df9a28 2023-07-08 jrick if (worktree)
6736 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
6737 24df9a28 2023-07-08 jrick if (pack_fds) {
6738 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6739 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6740 24df9a28 2023-07-08 jrick if (error == NULL)
6741 24df9a28 2023-07-08 jrick error = pack_err;
6743 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6744 24df9a28 2023-07-08 jrick free(cwd);
6745 24df9a28 2023-07-08 jrick return error;
6748 24df9a28 2023-07-08 jrick __dead static void
6749 24df9a28 2023-07-08 jrick usage_patch(void)
6751 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
6752 24df9a28 2023-07-08 jrick "[patchfile]\n", getprogname());
6756 24df9a28 2023-07-08 jrick static const struct got_error *
6757 24df9a28 2023-07-08 jrick patch_from_stdin(int *patchfd)
6759 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
6760 24df9a28 2023-07-08 jrick ssize_t r;
6761 24df9a28 2023-07-08 jrick char buf[BUFSIZ];
6762 24df9a28 2023-07-08 jrick sig_t sighup, sigint, sigquit;
6764 24df9a28 2023-07-08 jrick *patchfd = got_opentempfd();
6765 24df9a28 2023-07-08 jrick if (*patchfd == -1)
6766 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
6768 24df9a28 2023-07-08 jrick sighup = signal(SIGHUP, SIG_DFL);
6769 24df9a28 2023-07-08 jrick sigint = signal(SIGINT, SIG_DFL);
6770 24df9a28 2023-07-08 jrick sigquit = signal(SIGQUIT, SIG_DFL);
6772 24df9a28 2023-07-08 jrick for (;;) {
6773 24df9a28 2023-07-08 jrick r = read(0, buf, sizeof(buf));
6774 24df9a28 2023-07-08 jrick if (r == -1) {
6775 24df9a28 2023-07-08 jrick err = got_error_from_errno("read");
6778 24df9a28 2023-07-08 jrick if (r == 0)
6780 24df9a28 2023-07-08 jrick if (write(*patchfd, buf, r) == -1) {
6781 24df9a28 2023-07-08 jrick err = got_error_from_errno("write");
6786 24df9a28 2023-07-08 jrick signal(SIGHUP, sighup);
6787 24df9a28 2023-07-08 jrick signal(SIGINT, sigint);
6788 24df9a28 2023-07-08 jrick signal(SIGQUIT, sigquit);
6790 24df9a28 2023-07-08 jrick if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
6791 24df9a28 2023-07-08 jrick err = got_error_from_errno("lseek");
6793 24df9a28 2023-07-08 jrick if (err != NULL) {
6794 24df9a28 2023-07-08 jrick close(*patchfd);
6795 24df9a28 2023-07-08 jrick *patchfd = -1;
6798 24df9a28 2023-07-08 jrick return err;
6801 24df9a28 2023-07-08 jrick struct got_patch_progress_arg {
6802 24df9a28 2023-07-08 jrick int did_something;
6803 24df9a28 2023-07-08 jrick int conflicts;
6804 24df9a28 2023-07-08 jrick int rejects;
6807 24df9a28 2023-07-08 jrick static const struct got_error *
6808 24df9a28 2023-07-08 jrick patch_progress(void *arg, const char *old, const char *new,
6809 24df9a28 2023-07-08 jrick unsigned char status, const struct got_error *error, int old_from,
6810 24df9a28 2023-07-08 jrick int old_lines, int new_from, int new_lines, int offset,
6811 24df9a28 2023-07-08 jrick int ws_mangled, const struct got_error *hunk_err)
6813 24df9a28 2023-07-08 jrick const char *path = new == NULL ? old : new;
6814 24df9a28 2023-07-08 jrick struct got_patch_progress_arg *a = arg;
6816 24df9a28 2023-07-08 jrick while (*path == '/')
6819 24df9a28 2023-07-08 jrick if (status != GOT_STATUS_NO_CHANGE &&
6820 24df9a28 2023-07-08 jrick status != 0 /* per-hunk progress */) {
6821 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
6822 24df9a28 2023-07-08 jrick a->did_something = 1;
6825 24df9a28 2023-07-08 jrick if (hunk_err == NULL) {
6826 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_CANNOT_UPDATE)
6827 24df9a28 2023-07-08 jrick a->rejects++;
6828 24df9a28 2023-07-08 jrick else if (status == GOT_STATUS_CONFLICT)
6829 24df9a28 2023-07-08 jrick a->conflicts++;
6832 24df9a28 2023-07-08 jrick if (error != NULL)
6833 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
6835 24df9a28 2023-07-08 jrick if (offset != 0 || hunk_err != NULL || ws_mangled) {
6836 24df9a28 2023-07-08 jrick printf("@@ -%d,%d +%d,%d @@ ", old_from,
6837 24df9a28 2023-07-08 jrick old_lines, new_from, new_lines);
6838 24df9a28 2023-07-08 jrick if (hunk_err != NULL)
6839 24df9a28 2023-07-08 jrick printf("%s\n", hunk_err->msg);
6840 24df9a28 2023-07-08 jrick else if (offset != 0)
6841 24df9a28 2023-07-08 jrick printf("applied with offset %d\n", offset);
6843 24df9a28 2023-07-08 jrick printf("hunk contains mangled whitespace\n");
6846 24df9a28 2023-07-08 jrick return NULL;
6849 24df9a28 2023-07-08 jrick static void
6850 24df9a28 2023-07-08 jrick print_patch_progress_stats(struct got_patch_progress_arg *ppa)
6852 24df9a28 2023-07-08 jrick if (!ppa->did_something)
6855 24df9a28 2023-07-08 jrick if (ppa->conflicts > 0)
6856 24df9a28 2023-07-08 jrick printf("Files with merge conflicts: %d\n", ppa->conflicts);
6858 24df9a28 2023-07-08 jrick if (ppa->rejects > 0) {
6859 24df9a28 2023-07-08 jrick printf("Files where patch failed to apply: %d\n",
6860 24df9a28 2023-07-08 jrick ppa->rejects);
6864 24df9a28 2023-07-08 jrick static const struct got_error *
6865 24df9a28 2023-07-08 jrick cmd_patch(int argc, char *argv[])
6867 24df9a28 2023-07-08 jrick const struct got_error *error = NULL, *close_error = NULL;
6868 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
6869 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
6870 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
6871 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
6872 24df9a28 2023-07-08 jrick const char *commit_id_str = NULL;
6873 24df9a28 2023-07-08 jrick struct stat sb;
6874 24df9a28 2023-07-08 jrick const char *errstr;
6875 24df9a28 2023-07-08 jrick char *cwd = NULL;
6876 24df9a28 2023-07-08 jrick int ch, nop = 0, strip = -1, reverse = 0;
6877 24df9a28 2023-07-08 jrick int patchfd;
6878 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
6879 24df9a28 2023-07-08 jrick struct got_patch_progress_arg ppa;
6881 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
6883 24df9a28 2023-07-08 jrick #ifndef PROFILE
6884 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
6885 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
6886 24df9a28 2023-07-08 jrick err(1, "pledge");
6889 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
6890 24df9a28 2023-07-08 jrick switch (ch) {
6891 24df9a28 2023-07-08 jrick case 'c':
6892 24df9a28 2023-07-08 jrick commit_id_str = optarg;
6894 24df9a28 2023-07-08 jrick case 'n':
6897 24df9a28 2023-07-08 jrick case 'p':
6898 24df9a28 2023-07-08 jrick strip = strtonum(optarg, 0, INT_MAX, &errstr);
6899 24df9a28 2023-07-08 jrick if (errstr != NULL)
6900 24df9a28 2023-07-08 jrick errx(1, "pathname strip count is %s: %s",
6901 24df9a28 2023-07-08 jrick errstr, optarg);
6903 24df9a28 2023-07-08 jrick case 'R':
6904 24df9a28 2023-07-08 jrick reverse = 1;
6907 24df9a28 2023-07-08 jrick usage_patch();
6908 24df9a28 2023-07-08 jrick /* NOTREACHED */
6912 24df9a28 2023-07-08 jrick argc -= optind;
6913 24df9a28 2023-07-08 jrick argv += optind;
6915 24df9a28 2023-07-08 jrick if (argc == 0) {
6916 24df9a28 2023-07-08 jrick error = patch_from_stdin(&patchfd);
6917 24df9a28 2023-07-08 jrick if (error)
6918 24df9a28 2023-07-08 jrick return error;
6919 24df9a28 2023-07-08 jrick } else if (argc == 1) {
6920 24df9a28 2023-07-08 jrick patchfd = open(argv[0], O_RDONLY);
6921 24df9a28 2023-07-08 jrick if (patchfd == -1) {
6922 24df9a28 2023-07-08 jrick error = got_error_from_errno2("open", argv[0]);
6923 24df9a28 2023-07-08 jrick return error;
6925 24df9a28 2023-07-08 jrick if (fstat(patchfd, &sb) == -1) {
6926 24df9a28 2023-07-08 jrick error = got_error_from_errno2("fstat", argv[0]);
6927 24df9a28 2023-07-08 jrick goto done;
6929 24df9a28 2023-07-08 jrick if (!S_ISREG(sb.st_mode)) {
6930 24df9a28 2023-07-08 jrick error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
6931 24df9a28 2023-07-08 jrick goto done;
6934 24df9a28 2023-07-08 jrick usage_patch();
6936 24df9a28 2023-07-08 jrick if ((cwd = getcwd(NULL, 0)) == NULL) {
6937 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
6938 24df9a28 2023-07-08 jrick goto done;
6941 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
6942 24df9a28 2023-07-08 jrick if (error != NULL)
6943 24df9a28 2023-07-08 jrick goto done;
6945 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6946 24df9a28 2023-07-08 jrick if (error != NULL)
6947 24df9a28 2023-07-08 jrick goto done;
6949 24df9a28 2023-07-08 jrick const char *repo_path = got_worktree_get_repo_path(worktree);
6950 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6951 24df9a28 2023-07-08 jrick if (error != NULL)
6952 24df9a28 2023-07-08 jrick goto done;
6954 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
6955 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
6956 24df9a28 2023-07-08 jrick if (error != NULL)
6957 24df9a28 2023-07-08 jrick goto done;
6959 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6960 24df9a28 2023-07-08 jrick if (error)
6961 24df9a28 2023-07-08 jrick goto done;
6963 24df9a28 2023-07-08 jrick if (commit_id_str != NULL) {
6964 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
6965 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6966 24df9a28 2023-07-08 jrick if (error)
6967 24df9a28 2023-07-08 jrick goto done;
6970 24df9a28 2023-07-08 jrick memset(&ppa, 0, sizeof(ppa));
6971 24df9a28 2023-07-08 jrick error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
6972 24df9a28 2023-07-08 jrick commit_id, patch_progress, &ppa, check_cancelled, NULL);
6973 24df9a28 2023-07-08 jrick print_patch_progress_stats(&ppa);
6975 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
6976 24df9a28 2023-07-08 jrick free(commit_id);
6977 24df9a28 2023-07-08 jrick if (repo) {
6978 24df9a28 2023-07-08 jrick close_error = got_repo_close(repo);
6979 24df9a28 2023-07-08 jrick if (error == NULL)
6980 24df9a28 2023-07-08 jrick error = close_error;
6982 24df9a28 2023-07-08 jrick if (worktree != NULL) {
6983 24df9a28 2023-07-08 jrick close_error = got_worktree_close(worktree);
6984 24df9a28 2023-07-08 jrick if (error == NULL)
6985 24df9a28 2023-07-08 jrick error = close_error;
6987 24df9a28 2023-07-08 jrick if (pack_fds) {
6988 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
6989 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
6990 24df9a28 2023-07-08 jrick if (error == NULL)
6991 24df9a28 2023-07-08 jrick error = pack_err;
6993 24df9a28 2023-07-08 jrick free(cwd);
6994 24df9a28 2023-07-08 jrick return error;
6997 24df9a28 2023-07-08 jrick __dead static void
6998 24df9a28 2023-07-08 jrick usage_revert(void)
7000 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
7001 24df9a28 2023-07-08 jrick getprogname());
7005 24df9a28 2023-07-08 jrick static const struct got_error *
7006 24df9a28 2023-07-08 jrick revert_progress(void *arg, unsigned char status, const char *path)
7008 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_UNVERSIONED)
7009 24df9a28 2023-07-08 jrick return NULL;
7011 24df9a28 2023-07-08 jrick while (path[0] == '/')
7013 24df9a28 2023-07-08 jrick printf("%c %s\n", status, path);
7014 24df9a28 2023-07-08 jrick return NULL;
7017 24df9a28 2023-07-08 jrick struct choose_patch_arg {
7018 24df9a28 2023-07-08 jrick FILE *patch_script_file;
7019 24df9a28 2023-07-08 jrick const char *action;
7022 24df9a28 2023-07-08 jrick static const struct got_error *
7023 24df9a28 2023-07-08 jrick show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7024 24df9a28 2023-07-08 jrick int nchanges, const char *action)
7026 24df9a28 2023-07-08 jrick const struct got_error *err;
7027 24df9a28 2023-07-08 jrick char *line = NULL;
7028 24df9a28 2023-07-08 jrick size_t linesize = 0;
7029 24df9a28 2023-07-08 jrick ssize_t linelen;
7031 24df9a28 2023-07-08 jrick switch (status) {
7032 24df9a28 2023-07-08 jrick case GOT_STATUS_ADD:
7033 24df9a28 2023-07-08 jrick printf("A %s\n%s this addition? [y/n] ", path, action);
7035 24df9a28 2023-07-08 jrick case GOT_STATUS_DELETE:
7036 24df9a28 2023-07-08 jrick printf("D %s\n%s this deletion? [y/n] ", path, action);
7038 24df9a28 2023-07-08 jrick case GOT_STATUS_MODIFY:
7039 24df9a28 2023-07-08 jrick if (fseek(patch_file, 0L, SEEK_SET) == -1)
7040 24df9a28 2023-07-08 jrick return got_error_from_errno("fseek");
7041 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
7042 24df9a28 2023-07-08 jrick while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7043 24df9a28 2023-07-08 jrick printf("%s", line);
7044 24df9a28 2023-07-08 jrick if (linelen == -1 && ferror(patch_file)) {
7045 24df9a28 2023-07-08 jrick err = got_error_from_errno("getline");
7046 24df9a28 2023-07-08 jrick free(line);
7047 24df9a28 2023-07-08 jrick return err;
7049 24df9a28 2023-07-08 jrick free(line);
7050 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
7051 24df9a28 2023-07-08 jrick printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7052 24df9a28 2023-07-08 jrick path, n, nchanges, action);
7055 24df9a28 2023-07-08 jrick return got_error_path(path, GOT_ERR_FILE_STATUS);
7058 24df9a28 2023-07-08 jrick fflush(stdout);
7059 24df9a28 2023-07-08 jrick return NULL;
7062 24df9a28 2023-07-08 jrick static const struct got_error *
7063 24df9a28 2023-07-08 jrick choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7064 24df9a28 2023-07-08 jrick FILE *patch_file, int n, int nchanges)
7066 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7067 24df9a28 2023-07-08 jrick char *line = NULL;
7068 24df9a28 2023-07-08 jrick size_t linesize = 0;
7069 24df9a28 2023-07-08 jrick ssize_t linelen;
7070 24df9a28 2023-07-08 jrick int resp = ' ';
7071 24df9a28 2023-07-08 jrick struct choose_patch_arg *a = arg;
7073 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_NONE;
7075 24df9a28 2023-07-08 jrick if (a->patch_script_file) {
7076 24df9a28 2023-07-08 jrick char *nl;
7077 24df9a28 2023-07-08 jrick err = show_change(status, path, patch_file, n, nchanges,
7078 24df9a28 2023-07-08 jrick a->action);
7080 24df9a28 2023-07-08 jrick return err;
7081 24df9a28 2023-07-08 jrick linelen = getline(&line, &linesize, a->patch_script_file);
7082 24df9a28 2023-07-08 jrick if (linelen == -1) {
7083 24df9a28 2023-07-08 jrick if (ferror(a->patch_script_file))
7084 24df9a28 2023-07-08 jrick return got_error_from_errno("getline");
7085 24df9a28 2023-07-08 jrick return NULL;
7087 24df9a28 2023-07-08 jrick nl = strchr(line, '\n');
7089 24df9a28 2023-07-08 jrick *nl = '\0';
7090 24df9a28 2023-07-08 jrick if (strcmp(line, "y") == 0) {
7091 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_YES;
7092 24df9a28 2023-07-08 jrick printf("y\n");
7093 24df9a28 2023-07-08 jrick } else if (strcmp(line, "n") == 0) {
7094 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_NO;
7095 24df9a28 2023-07-08 jrick printf("n\n");
7096 24df9a28 2023-07-08 jrick } else if (strcmp(line, "q") == 0 &&
7097 24df9a28 2023-07-08 jrick status == GOT_STATUS_MODIFY) {
7098 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_QUIT;
7099 24df9a28 2023-07-08 jrick printf("q\n");
7101 24df9a28 2023-07-08 jrick printf("invalid response '%s'\n", line);
7102 24df9a28 2023-07-08 jrick free(line);
7103 24df9a28 2023-07-08 jrick return NULL;
7106 24df9a28 2023-07-08 jrick while (resp != 'y' && resp != 'n' && resp != 'q') {
7107 24df9a28 2023-07-08 jrick err = show_change(status, path, patch_file, n, nchanges,
7108 24df9a28 2023-07-08 jrick a->action);
7110 24df9a28 2023-07-08 jrick return err;
7111 24df9a28 2023-07-08 jrick resp = getchar();
7112 24df9a28 2023-07-08 jrick if (resp == '\n')
7113 24df9a28 2023-07-08 jrick resp = getchar();
7114 24df9a28 2023-07-08 jrick if (status == GOT_STATUS_MODIFY) {
7115 24df9a28 2023-07-08 jrick if (resp != 'y' && resp != 'n' && resp != 'q') {
7116 24df9a28 2023-07-08 jrick printf("invalid response '%c'\n", resp);
7117 24df9a28 2023-07-08 jrick resp = ' ';
7119 24df9a28 2023-07-08 jrick } else if (resp != 'y' && resp != 'n') {
7120 24df9a28 2023-07-08 jrick printf("invalid response '%c'\n", resp);
7121 24df9a28 2023-07-08 jrick resp = ' ';
7125 24df9a28 2023-07-08 jrick if (resp == 'y')
7126 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_YES;
7127 24df9a28 2023-07-08 jrick else if (resp == 'n')
7128 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_NO;
7129 24df9a28 2023-07-08 jrick else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7130 24df9a28 2023-07-08 jrick *choice = GOT_PATCH_CHOICE_QUIT;
7132 24df9a28 2023-07-08 jrick return NULL;
7135 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg {
7136 24df9a28 2023-07-08 jrick struct got_pathlist_head *commit_paths;
7137 24df9a28 2023-07-08 jrick int *has_changes;
7141 24df9a28 2023-07-08 jrick * Shortcut work tree status callback to determine if the set of paths scanned
7142 24df9a28 2023-07-08 jrick * has at least one versioned path that is being modified and, if not NULL, is
7143 24df9a28 2023-07-08 jrick * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
7144 24df9a28 2023-07-08 jrick * soon as a path is passed with a status that satisfies this criteria.
7146 24df9a28 2023-07-08 jrick static const struct got_error *
7147 24df9a28 2023-07-08 jrick worktree_has_commitable_path(void *arg, unsigned char status,
7148 24df9a28 2023-07-08 jrick unsigned char staged_status, const char *path,
7149 24df9a28 2023-07-08 jrick struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7150 24df9a28 2023-07-08 jrick struct got_object_id *commit_id, int dirfd, const char *de_name)
7152 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg *a = arg;
7154 24df9a28 2023-07-08 jrick if (status == staged_status && (status == GOT_STATUS_DELETE))
7155 24df9a28 2023-07-08 jrick status = GOT_STATUS_NO_CHANGE;
7157 24df9a28 2023-07-08 jrick if (!(status == GOT_STATUS_NO_CHANGE ||
7158 24df9a28 2023-07-08 jrick status == GOT_STATUS_UNVERSIONED) ||
7159 24df9a28 2023-07-08 jrick staged_status != GOT_STATUS_NO_CHANGE) {
7160 24df9a28 2023-07-08 jrick if (a->commit_paths != NULL) {
7161 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
7163 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, a->commit_paths, entry) {
7164 24df9a28 2023-07-08 jrick if (strncmp(path, pe->path,
7165 24df9a28 2023-07-08 jrick pe->path_len) == 0) {
7166 24df9a28 2023-07-08 jrick *a->has_changes = 1;
7171 24df9a28 2023-07-08 jrick *a->has_changes = 1;
7173 24df9a28 2023-07-08 jrick if (*a->has_changes)
7174 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_FILE_MODIFIED);
7177 24df9a28 2023-07-08 jrick return NULL;
7181 24df9a28 2023-07-08 jrick * Check that the changeset of the commit identified by id is
7182 24df9a28 2023-07-08 jrick * comprised of at least one modified path that is being committed.
7184 24df9a28 2023-07-08 jrick static const struct got_error *
7185 24df9a28 2023-07-08 jrick commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
7186 24df9a28 2023-07-08 jrick struct got_object_id *id, struct got_worktree *worktree,
7187 24df9a28 2023-07-08 jrick struct got_repository *repo)
7189 24df9a28 2023-07-08 jrick const struct got_error *err;
7190 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
7191 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL, *pcommit = NULL;
7192 24df9a28 2023-07-08 jrick struct got_tree_object *tree = NULL, *ptree = NULL;
7193 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
7195 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
7197 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
7199 24df9a28 2023-07-08 jrick goto done;
7201 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree, repo,
7202 24df9a28 2023-07-08 jrick got_object_commit_get_tree_id(commit));
7204 24df9a28 2023-07-08 jrick goto done;
7206 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7207 24df9a28 2023-07-08 jrick if (pid != NULL) {
7208 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&pcommit, repo, &pid->id);
7210 24df9a28 2023-07-08 jrick goto done;
7212 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&ptree, repo,
7213 24df9a28 2023-07-08 jrick got_object_commit_get_tree_id(pcommit));
7215 24df9a28 2023-07-08 jrick goto done;
7218 24df9a28 2023-07-08 jrick err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
7219 24df9a28 2023-07-08 jrick got_diff_tree_collect_changed_paths, &paths, 0);
7221 24df9a28 2023-07-08 jrick goto done;
7223 24df9a28 2023-07-08 jrick err = got_worktree_status(worktree, &paths, repo, 0,
7224 24df9a28 2023-07-08 jrick worktree_has_commitable_path, wcpa, check_cancelled, NULL);
7225 24df9a28 2023-07-08 jrick if (err && err->code == GOT_ERR_FILE_MODIFIED) {
7227 24df9a28 2023-07-08 jrick * At least one changed path in the referenced commit is
7228 24df9a28 2023-07-08 jrick * modified in the work tree, that's all we need to know!
7230 24df9a28 2023-07-08 jrick err = NULL;
7234 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
7235 24df9a28 2023-07-08 jrick if (commit)
7236 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7237 24df9a28 2023-07-08 jrick if (pcommit)
7238 24df9a28 2023-07-08 jrick got_object_commit_close(pcommit);
7239 24df9a28 2023-07-08 jrick if (tree)
7240 24df9a28 2023-07-08 jrick got_object_tree_close(tree);
7241 24df9a28 2023-07-08 jrick if (ptree)
7242 24df9a28 2023-07-08 jrick got_object_tree_close(ptree);
7243 24df9a28 2023-07-08 jrick return err;
7247 24df9a28 2023-07-08 jrick * Remove any "logmsg" reference comprised entirely of paths that have
7248 24df9a28 2023-07-08 jrick * been reverted in this work tree. If any path in the logmsg ref changeset
7249 24df9a28 2023-07-08 jrick * remains in a changed state in the worktree, do not remove the reference.
7251 24df9a28 2023-07-08 jrick static const struct got_error *
7252 24df9a28 2023-07-08 jrick rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
7254 24df9a28 2023-07-08 jrick const struct got_error *err;
7255 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
7256 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
7257 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
7258 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
7259 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg wcpa;
7260 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
7262 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
7264 24df9a28 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
7266 24df9a28 2023-07-08 jrick goto done;
7268 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, "refs/got/worktree",
7269 24df9a28 2023-07-08 jrick got_ref_cmp_by_name, repo);
7271 24df9a28 2023-07-08 jrick goto done;
7273 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
7274 24df9a28 2023-07-08 jrick const char *refname;
7275 24df9a28 2023-07-08 jrick int has_changes = 0;
7277 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
7279 24df9a28 2023-07-08 jrick if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7280 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
7281 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7282 24df9a28 2023-07-08 jrick else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7283 24df9a28 2023-07-08 jrick GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
7284 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7286 24df9a28 2023-07-08 jrick continue;
7288 24df9a28 2023-07-08 jrick if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7289 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7291 24df9a28 2023-07-08 jrick continue;
7293 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&commit_id, NULL, refname,
7294 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
7296 24df9a28 2023-07-08 jrick goto done;
7298 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, commit_id);
7300 24df9a28 2023-07-08 jrick goto done;
7302 24df9a28 2023-07-08 jrick wcpa.commit_paths = NULL;
7303 24df9a28 2023-07-08 jrick wcpa.has_changes = &has_changes;
7305 24df9a28 2023-07-08 jrick err = commit_path_changed_in_worktree(&wcpa, commit_id,
7306 24df9a28 2023-07-08 jrick worktree, repo);
7308 24df9a28 2023-07-08 jrick goto done;
7310 24df9a28 2023-07-08 jrick if (!has_changes) {
7311 24df9a28 2023-07-08 jrick err = got_ref_delete(re->ref, repo);
7313 24df9a28 2023-07-08 jrick goto done;
7316 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7317 24df9a28 2023-07-08 jrick commit = NULL;
7318 24df9a28 2023-07-08 jrick free(commit_id);
7319 24df9a28 2023-07-08 jrick commit_id = NULL;
7323 24df9a28 2023-07-08 jrick free(uuidstr);
7324 24df9a28 2023-07-08 jrick free(commit_id);
7325 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
7326 24df9a28 2023-07-08 jrick if (commit)
7327 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7328 24df9a28 2023-07-08 jrick return err;
7331 24df9a28 2023-07-08 jrick static const struct got_error *
7332 24df9a28 2023-07-08 jrick cmd_revert(int argc, char *argv[])
7334 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
7335 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
7336 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
7337 24df9a28 2023-07-08 jrick char *cwd = NULL, *path = NULL;
7338 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
7339 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
7340 24df9a28 2023-07-08 jrick int ch, can_recurse = 0, pflag = 0;
7341 24df9a28 2023-07-08 jrick FILE *patch_script_file = NULL;
7342 24df9a28 2023-07-08 jrick const char *patch_script_path = NULL;
7343 24df9a28 2023-07-08 jrick struct choose_patch_arg cpa;
7344 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
7346 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
7348 24df9a28 2023-07-08 jrick #ifndef PROFILE
7349 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7350 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
7351 24df9a28 2023-07-08 jrick err(1, "pledge");
7354 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "F:pR")) != -1) {
7355 24df9a28 2023-07-08 jrick switch (ch) {
7356 24df9a28 2023-07-08 jrick case 'F':
7357 24df9a28 2023-07-08 jrick patch_script_path = optarg;
7359 24df9a28 2023-07-08 jrick case 'p':
7360 24df9a28 2023-07-08 jrick pflag = 1;
7362 24df9a28 2023-07-08 jrick case 'R':
7363 24df9a28 2023-07-08 jrick can_recurse = 1;
7366 24df9a28 2023-07-08 jrick usage_revert();
7367 24df9a28 2023-07-08 jrick /* NOTREACHED */
7371 24df9a28 2023-07-08 jrick argc -= optind;
7372 24df9a28 2023-07-08 jrick argv += optind;
7374 24df9a28 2023-07-08 jrick if (argc < 1)
7375 24df9a28 2023-07-08 jrick usage_revert();
7376 24df9a28 2023-07-08 jrick if (patch_script_path && !pflag)
7377 24df9a28 2023-07-08 jrick errx(1, "-F option can only be used together with -p option");
7379 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
7380 24df9a28 2023-07-08 jrick if (cwd == NULL) {
7381 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
7382 24df9a28 2023-07-08 jrick goto done;
7385 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
7386 24df9a28 2023-07-08 jrick if (error != NULL)
7387 24df9a28 2023-07-08 jrick goto done;
7389 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
7390 24df9a28 2023-07-08 jrick if (error) {
7391 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
7392 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "revert", cwd);
7393 24df9a28 2023-07-08 jrick goto done;
7396 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7397 24df9a28 2023-07-08 jrick NULL, pack_fds);
7398 24df9a28 2023-07-08 jrick if (error != NULL)
7399 24df9a28 2023-07-08 jrick goto done;
7401 24df9a28 2023-07-08 jrick if (patch_script_path) {
7402 24df9a28 2023-07-08 jrick patch_script_file = fopen(patch_script_path, "re");
7403 24df9a28 2023-07-08 jrick if (patch_script_file == NULL) {
7404 24df9a28 2023-07-08 jrick error = got_error_from_errno2("fopen",
7405 24df9a28 2023-07-08 jrick patch_script_path);
7406 24df9a28 2023-07-08 jrick goto done;
7411 24df9a28 2023-07-08 jrick * XXX "c" perm needed on repo dir to delete merge references.
7413 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
7414 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
7415 24df9a28 2023-07-08 jrick if (error)
7416 24df9a28 2023-07-08 jrick goto done;
7418 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7419 24df9a28 2023-07-08 jrick if (error)
7420 24df9a28 2023-07-08 jrick goto done;
7422 24df9a28 2023-07-08 jrick if (!can_recurse) {
7423 24df9a28 2023-07-08 jrick char *ondisk_path;
7424 24df9a28 2023-07-08 jrick struct stat sb;
7425 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
7426 24df9a28 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
7427 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree),
7428 24df9a28 2023-07-08 jrick pe->path) == -1) {
7429 24df9a28 2023-07-08 jrick error = got_error_from_errno("asprintf");
7430 24df9a28 2023-07-08 jrick goto done;
7432 24df9a28 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
7433 24df9a28 2023-07-08 jrick if (errno == ENOENT) {
7434 24df9a28 2023-07-08 jrick free(ondisk_path);
7435 24df9a28 2023-07-08 jrick continue;
7437 24df9a28 2023-07-08 jrick error = got_error_from_errno2("lstat",
7438 24df9a28 2023-07-08 jrick ondisk_path);
7439 24df9a28 2023-07-08 jrick free(ondisk_path);
7440 24df9a28 2023-07-08 jrick goto done;
7442 24df9a28 2023-07-08 jrick free(ondisk_path);
7443 24df9a28 2023-07-08 jrick if (S_ISDIR(sb.st_mode)) {
7444 24df9a28 2023-07-08 jrick error = got_error_msg(GOT_ERR_BAD_PATH,
7445 24df9a28 2023-07-08 jrick "reverting directories requires -R option");
7446 24df9a28 2023-07-08 jrick goto done;
7451 24df9a28 2023-07-08 jrick cpa.patch_script_file = patch_script_file;
7452 24df9a28 2023-07-08 jrick cpa.action = "revert";
7453 24df9a28 2023-07-08 jrick error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7454 24df9a28 2023-07-08 jrick pflag ? choose_patch : NULL, &cpa, repo);
7456 24df9a28 2023-07-08 jrick error = rm_logmsg_ref(worktree, repo);
7458 24df9a28 2023-07-08 jrick if (patch_script_file && fclose(patch_script_file) == EOF &&
7459 24df9a28 2023-07-08 jrick error == NULL)
7460 24df9a28 2023-07-08 jrick error = got_error_from_errno2("fclose", patch_script_path);
7461 24df9a28 2023-07-08 jrick if (repo) {
7462 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
7463 24df9a28 2023-07-08 jrick if (error == NULL)
7464 24df9a28 2023-07-08 jrick error = close_err;
7466 24df9a28 2023-07-08 jrick if (worktree)
7467 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
7468 24df9a28 2023-07-08 jrick if (pack_fds) {
7469 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
7470 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
7471 24df9a28 2023-07-08 jrick if (error == NULL)
7472 24df9a28 2023-07-08 jrick error = pack_err;
7474 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7475 24df9a28 2023-07-08 jrick free(path);
7476 24df9a28 2023-07-08 jrick free(cwd);
7477 24df9a28 2023-07-08 jrick return error;
7480 24df9a28 2023-07-08 jrick __dead static void
7481 24df9a28 2023-07-08 jrick usage_commit(void)
7483 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
7484 24df9a28 2023-07-08 jrick "[-m message] [path ...]\n", getprogname());
7488 24df9a28 2023-07-08 jrick struct collect_commit_logmsg_arg {
7489 24df9a28 2023-07-08 jrick const char *cmdline_log;
7490 24df9a28 2023-07-08 jrick const char *prepared_log;
7491 24df9a28 2023-07-08 jrick const char *merged_log;
7492 24df9a28 2023-07-08 jrick int non_interactive;
7493 24df9a28 2023-07-08 jrick const char *editor;
7494 24df9a28 2023-07-08 jrick const char *worktree_path;
7495 24df9a28 2023-07-08 jrick const char *repo_path;
7496 24df9a28 2023-07-08 jrick const char *dial_proto;
7497 24df9a28 2023-07-08 jrick char *logmsg_path;
7500 24df9a28 2023-07-08 jrick static const struct got_error *
7501 24df9a28 2023-07-08 jrick read_prepared_logmsg(char **logmsg, const char *path)
7503 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7504 24df9a28 2023-07-08 jrick FILE *f = NULL;
7505 24df9a28 2023-07-08 jrick struct stat sb;
7506 24df9a28 2023-07-08 jrick size_t r;
7508 24df9a28 2023-07-08 jrick *logmsg = NULL;
7509 24df9a28 2023-07-08 jrick memset(&sb, 0, sizeof(sb));
7511 24df9a28 2023-07-08 jrick f = fopen(path, "re");
7512 24df9a28 2023-07-08 jrick if (f == NULL)
7513 24df9a28 2023-07-08 jrick return got_error_from_errno2("fopen", path);
7515 24df9a28 2023-07-08 jrick if (fstat(fileno(f), &sb) == -1) {
7516 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fstat", path);
7517 24df9a28 2023-07-08 jrick goto done;
7519 24df9a28 2023-07-08 jrick if (sb.st_size == 0) {
7520 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7521 24df9a28 2023-07-08 jrick goto done;
7524 24df9a28 2023-07-08 jrick *logmsg = malloc(sb.st_size + 1);
7525 24df9a28 2023-07-08 jrick if (*logmsg == NULL) {
7526 24df9a28 2023-07-08 jrick err = got_error_from_errno("malloc");
7527 24df9a28 2023-07-08 jrick goto done;
7530 24df9a28 2023-07-08 jrick r = fread(*logmsg, 1, sb.st_size, f);
7531 24df9a28 2023-07-08 jrick if (r != sb.st_size) {
7532 24df9a28 2023-07-08 jrick if (ferror(f))
7533 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fread", path);
7535 24df9a28 2023-07-08 jrick err = got_error(GOT_ERR_IO);
7536 24df9a28 2023-07-08 jrick goto done;
7538 24df9a28 2023-07-08 jrick (*logmsg)[sb.st_size] = '\0';
7540 24df9a28 2023-07-08 jrick if (fclose(f) == EOF && err == NULL)
7541 24df9a28 2023-07-08 jrick err = got_error_from_errno2("fclose", path);
7542 24df9a28 2023-07-08 jrick if (err) {
7543 24df9a28 2023-07-08 jrick free(*logmsg);
7544 24df9a28 2023-07-08 jrick *logmsg = NULL;
7546 24df9a28 2023-07-08 jrick return err;
7549 24df9a28 2023-07-08 jrick static const struct got_error *
7550 24df9a28 2023-07-08 jrick collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
7551 24df9a28 2023-07-08 jrick const char *diff_path, char **logmsg, void *arg)
7553 24df9a28 2023-07-08 jrick char *initial_content = NULL;
7554 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
7555 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7556 24df9a28 2023-07-08 jrick char *template = NULL;
7557 24df9a28 2023-07-08 jrick char *prepared_msg = NULL, *merged_msg = NULL;
7558 24df9a28 2023-07-08 jrick struct collect_commit_logmsg_arg *a = arg;
7559 24df9a28 2023-07-08 jrick int initial_content_len;
7560 24df9a28 2023-07-08 jrick int fd = -1;
7561 24df9a28 2023-07-08 jrick size_t len;
7563 24df9a28 2023-07-08 jrick /* if a message was specified on the command line, just use it */
7564 24df9a28 2023-07-08 jrick if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
7565 24df9a28 2023-07-08 jrick len = strlen(a->cmdline_log) + 1;
7566 24df9a28 2023-07-08 jrick *logmsg = malloc(len + 1);
7567 24df9a28 2023-07-08 jrick if (*logmsg == NULL)
7568 24df9a28 2023-07-08 jrick return got_error_from_errno("malloc");
7569 24df9a28 2023-07-08 jrick strlcpy(*logmsg, a->cmdline_log, len);
7570 24df9a28 2023-07-08 jrick return NULL;
7571 24df9a28 2023-07-08 jrick } else if (a->prepared_log != NULL && a->non_interactive)
7572 24df9a28 2023-07-08 jrick return read_prepared_logmsg(logmsg, a->prepared_log);
7574 24df9a28 2023-07-08 jrick if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7575 24df9a28 2023-07-08 jrick return got_error_from_errno("asprintf");
7577 24df9a28 2023-07-08 jrick err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
7579 24df9a28 2023-07-08 jrick goto done;
7581 24df9a28 2023-07-08 jrick if (a->prepared_log) {
7582 24df9a28 2023-07-08 jrick err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
7584 24df9a28 2023-07-08 jrick goto done;
7585 24df9a28 2023-07-08 jrick } else if (a->merged_log) {
7586 24df9a28 2023-07-08 jrick err = read_prepared_logmsg(&merged_msg, a->merged_log);
7588 24df9a28 2023-07-08 jrick goto done;
7591 24df9a28 2023-07-08 jrick initial_content_len = asprintf(&initial_content,
7592 24df9a28 2023-07-08 jrick "%s%s\n# changes to be committed:\n",
7593 24df9a28 2023-07-08 jrick prepared_msg ? prepared_msg : "",
7594 24df9a28 2023-07-08 jrick merged_msg ? merged_msg : "");
7595 24df9a28 2023-07-08 jrick if (initial_content_len == -1) {
7596 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
7597 24df9a28 2023-07-08 jrick goto done;
7600 24df9a28 2023-07-08 jrick if (write(fd, initial_content, initial_content_len) == -1) {
7601 24df9a28 2023-07-08 jrick err = got_error_from_errno2("write", a->logmsg_path);
7602 24df9a28 2023-07-08 jrick goto done;
7605 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
7606 24df9a28 2023-07-08 jrick struct got_commitable *ct = pe->data;
7607 24df9a28 2023-07-08 jrick dprintf(fd, "# %c %s\n",
7608 24df9a28 2023-07-08 jrick got_commitable_get_status(ct),
7609 24df9a28 2023-07-08 jrick got_commitable_get_path(ct));
7612 24df9a28 2023-07-08 jrick if (diff_path) {
7613 24df9a28 2023-07-08 jrick dprintf(fd, "# detailed changes can be viewed in %s\n",
7614 24df9a28 2023-07-08 jrick diff_path);
7617 24df9a28 2023-07-08 jrick if (close(fd) == -1) {
7618 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", a->logmsg_path);
7619 24df9a28 2023-07-08 jrick goto done;
7623 24df9a28 2023-07-08 jrick err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7624 24df9a28 2023-07-08 jrick initial_content_len, a->prepared_log ? 0 : 1);
7626 24df9a28 2023-07-08 jrick free(initial_content);
7627 24df9a28 2023-07-08 jrick free(template);
7628 24df9a28 2023-07-08 jrick free(prepared_msg);
7629 24df9a28 2023-07-08 jrick free(merged_msg);
7631 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
7632 24df9a28 2023-07-08 jrick err = got_error_from_errno2("close", a->logmsg_path);
7634 24df9a28 2023-07-08 jrick /* Editor is done; we can now apply unveil(2) */
7635 24df9a28 2023-07-08 jrick if (err == NULL)
7636 24df9a28 2023-07-08 jrick err = got_dial_apply_unveil(a->dial_proto);
7637 24df9a28 2023-07-08 jrick if (err == NULL)
7638 24df9a28 2023-07-08 jrick err = apply_unveil(a->repo_path, 0, a->worktree_path);
7639 24df9a28 2023-07-08 jrick if (err) {
7640 24df9a28 2023-07-08 jrick free(*logmsg);
7641 24df9a28 2023-07-08 jrick *logmsg = NULL;
7643 24df9a28 2023-07-08 jrick return err;
7646 24df9a28 2023-07-08 jrick static const struct got_error *
7647 24df9a28 2023-07-08 jrick cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
7648 24df9a28 2023-07-08 jrick const char *type, int has_content)
7650 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
7651 24df9a28 2023-07-08 jrick char *logmsg = NULL;
7653 24df9a28 2023-07-08 jrick err = got_object_commit_get_logmsg(&logmsg, commit);
7655 24df9a28 2023-07-08 jrick return err;
7657 24df9a28 2023-07-08 jrick if (fprintf(f, "%s# log message of %s commit %s:%s",
7658 24df9a28 2023-07-08 jrick has_content ? "\n" : "", type, idstr, logmsg) < 0)
7659 24df9a28 2023-07-08 jrick err = got_ferror(f, GOT_ERR_IO);
7661 24df9a28 2023-07-08 jrick free(logmsg);
7662 24df9a28 2023-07-08 jrick return err;
7666 24df9a28 2023-07-08 jrick * Lookup "logmsg" references of backed-out and cherrypicked commits
7667 24df9a28 2023-07-08 jrick * belonging to the current work tree. If found, and the worktree has
7668 24df9a28 2023-07-08 jrick * at least one modified file that was changed in the referenced commit,
7669 24df9a28 2023-07-08 jrick * add its log message to a new temporary file at *logmsg_path.
7670 24df9a28 2023-07-08 jrick * Add all refs found to matched_refs to be scheduled for removal on
7671 24df9a28 2023-07-08 jrick * successful commit.
7673 24df9a28 2023-07-08 jrick static const struct got_error *
7674 24df9a28 2023-07-08 jrick lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
7675 24df9a28 2023-07-08 jrick struct got_reflist_head *matched_refs, struct got_worktree *worktree,
7676 24df9a28 2023-07-08 jrick struct got_repository *repo)
7678 24df9a28 2023-07-08 jrick const struct got_error *err;
7679 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
7680 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
7681 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
7682 24df9a28 2023-07-08 jrick struct got_reflist_entry *re, *re_match;
7683 24df9a28 2023-07-08 jrick FILE *f = NULL;
7684 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
7685 24df9a28 2023-07-08 jrick int added_logmsg = 0;
7687 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
7689 24df9a28 2023-07-08 jrick *logmsg_path = NULL;
7691 24df9a28 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
7693 24df9a28 2023-07-08 jrick goto done;
7695 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, "refs/got/worktree",
7696 24df9a28 2023-07-08 jrick got_ref_cmp_by_name, repo);
7698 24df9a28 2023-07-08 jrick goto done;
7700 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
7701 24df9a28 2023-07-08 jrick const char *refname, *type;
7702 24df9a28 2023-07-08 jrick struct wt_commitable_path_arg wcpa;
7703 24df9a28 2023-07-08 jrick int add_logmsg = 0;
7705 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
7707 24df9a28 2023-07-08 jrick if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7708 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
7709 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7710 24df9a28 2023-07-08 jrick type = "cherrypicked";
7711 24df9a28 2023-07-08 jrick } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7712 24df9a28 2023-07-08 jrick GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
7713 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7714 24df9a28 2023-07-08 jrick type = "backed-out";
7716 24df9a28 2023-07-08 jrick continue;
7718 24df9a28 2023-07-08 jrick if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7719 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7721 24df9a28 2023-07-08 jrick continue;
7723 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&id, NULL, refname,
7724 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
7726 24df9a28 2023-07-08 jrick goto done;
7728 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
7730 24df9a28 2023-07-08 jrick goto done;
7732 24df9a28 2023-07-08 jrick wcpa.commit_paths = paths;
7733 24df9a28 2023-07-08 jrick wcpa.has_changes = &add_logmsg;
7735 24df9a28 2023-07-08 jrick err = commit_path_changed_in_worktree(&wcpa, id,
7736 24df9a28 2023-07-08 jrick worktree, repo);
7738 24df9a28 2023-07-08 jrick goto done;
7740 24df9a28 2023-07-08 jrick if (add_logmsg) {
7741 24df9a28 2023-07-08 jrick if (f == NULL) {
7742 24df9a28 2023-07-08 jrick err = got_opentemp_named(logmsg_path, &f,
7743 24df9a28 2023-07-08 jrick "got-commit-logmsg", "");
7745 24df9a28 2023-07-08 jrick goto done;
7747 24df9a28 2023-07-08 jrick err = cat_logmsg(f, commit, refname, type,
7748 24df9a28 2023-07-08 jrick added_logmsg);
7750 24df9a28 2023-07-08 jrick goto done;
7751 24df9a28 2023-07-08 jrick if (!added_logmsg)
7752 24df9a28 2023-07-08 jrick ++added_logmsg;
7754 24df9a28 2023-07-08 jrick err = got_reflist_entry_dup(&re_match, re);
7756 24df9a28 2023-07-08 jrick goto done;
7757 24df9a28 2023-07-08 jrick TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
7760 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7761 24df9a28 2023-07-08 jrick commit = NULL;
7762 24df9a28 2023-07-08 jrick free(id);
7763 24df9a28 2023-07-08 jrick id = NULL;
7767 24df9a28 2023-07-08 jrick free(id);
7768 24df9a28 2023-07-08 jrick free(uuidstr);
7769 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
7770 24df9a28 2023-07-08 jrick if (commit)
7771 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
7772 24df9a28 2023-07-08 jrick if (f && fclose(f) == EOF && err == NULL)
7773 24df9a28 2023-07-08 jrick err = got_error_from_errno("fclose");
7774 24df9a28 2023-07-08 jrick if (!added_logmsg) {
7775 24df9a28 2023-07-08 jrick if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
7776 24df9a28 2023-07-08 jrick err = got_error_from_errno2("unlink", *logmsg_path);
7777 24df9a28 2023-07-08 jrick *logmsg_path = NULL;
7779 24df9a28 2023-07-08 jrick return err;
7782 24df9a28 2023-07-08 jrick static const struct got_error *
7783 24df9a28 2023-07-08 jrick cmd_commit(int argc, char *argv[])
7785 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
7786 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
7787 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
7788 24df9a28 2023-07-08 jrick char *cwd = NULL, *id_str = NULL;
7789 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
7790 24df9a28 2023-07-08 jrick const char *logmsg = NULL;
7791 24df9a28 2023-07-08 jrick char *prepared_logmsg = NULL, *merged_logmsg = NULL;
7792 24df9a28 2023-07-08 jrick struct collect_commit_logmsg_arg cl_arg;
7793 24df9a28 2023-07-08 jrick const char *author = NULL;
7794 24df9a28 2023-07-08 jrick char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
7795 24df9a28 2023-07-08 jrick int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7796 24df9a28 2023-07-08 jrick int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7797 24df9a28 2023-07-08 jrick int show_diff = 1, commit_conflicts = 0;
7798 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
7799 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
7800 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
7801 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
7802 24df9a28 2023-07-08 jrick const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7803 24df9a28 2023-07-08 jrick const struct got_remote_repo *remotes, *remote = NULL;
7804 24df9a28 2023-07-08 jrick int nremotes;
7805 24df9a28 2023-07-08 jrick char *proto = NULL, *host = NULL, *port = NULL;
7806 24df9a28 2023-07-08 jrick char *repo_name = NULL, *server_path = NULL;
7807 24df9a28 2023-07-08 jrick const char *remote_name;
7808 24df9a28 2023-07-08 jrick int verbosity = 0;
7811 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
7812 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
7813 24df9a28 2023-07-08 jrick cl_arg.logmsg_path = NULL;
7815 24df9a28 2023-07-08 jrick #ifndef PROFILE
7816 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7817 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
7818 24df9a28 2023-07-08 jrick err(1, "pledge");
7821 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
7822 24df9a28 2023-07-08 jrick switch (ch) {
7823 24df9a28 2023-07-08 jrick case 'A':
7824 24df9a28 2023-07-08 jrick author = optarg;
7825 24df9a28 2023-07-08 jrick error = valid_author(author);
7826 24df9a28 2023-07-08 jrick if (error)
7827 24df9a28 2023-07-08 jrick return error;
7829 24df9a28 2023-07-08 jrick case 'C':
7830 24df9a28 2023-07-08 jrick commit_conflicts = 1;
7832 24df9a28 2023-07-08 jrick case 'F':
7833 24df9a28 2023-07-08 jrick if (logmsg != NULL)
7834 24df9a28 2023-07-08 jrick option_conflict('F', 'm');
7835 24df9a28 2023-07-08 jrick prepared_logmsg = realpath(optarg, NULL);
7836 24df9a28 2023-07-08 jrick if (prepared_logmsg == NULL)
7837 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
7840 24df9a28 2023-07-08 jrick case 'm':
7841 24df9a28 2023-07-08 jrick if (prepared_logmsg)
7842 24df9a28 2023-07-08 jrick option_conflict('m', 'F');
7843 24df9a28 2023-07-08 jrick logmsg = optarg;
7845 24df9a28 2023-07-08 jrick case 'N':
7846 24df9a28 2023-07-08 jrick non_interactive = 1;
7848 24df9a28 2023-07-08 jrick case 'n':
7849 24df9a28 2023-07-08 jrick show_diff = 0;
7851 24df9a28 2023-07-08 jrick case 'S':
7852 24df9a28 2023-07-08 jrick allow_bad_symlinks = 1;
7855 24df9a28 2023-07-08 jrick usage_commit();
7856 24df9a28 2023-07-08 jrick /* NOTREACHED */
7860 24df9a28 2023-07-08 jrick argc -= optind;
7861 24df9a28 2023-07-08 jrick argv += optind;
7863 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
7864 24df9a28 2023-07-08 jrick if (cwd == NULL) {
7865 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
7866 24df9a28 2023-07-08 jrick goto done;
7869 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
7870 24df9a28 2023-07-08 jrick if (error != NULL)
7871 24df9a28 2023-07-08 jrick goto done;
7873 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
7874 24df9a28 2023-07-08 jrick if (error) {
7875 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
7876 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "commit", cwd);
7877 24df9a28 2023-07-08 jrick goto done;
7880 24df9a28 2023-07-08 jrick error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7881 24df9a28 2023-07-08 jrick if (error)
7882 24df9a28 2023-07-08 jrick goto done;
7883 24df9a28 2023-07-08 jrick if (rebase_in_progress) {
7884 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_REBASING);
7885 24df9a28 2023-07-08 jrick goto done;
7888 24df9a28 2023-07-08 jrick error = got_worktree_histedit_in_progress(&histedit_in_progress,
7889 24df9a28 2023-07-08 jrick worktree);
7890 24df9a28 2023-07-08 jrick if (error)
7891 24df9a28 2023-07-08 jrick goto done;
7893 24df9a28 2023-07-08 jrick error = get_gitconfig_path(&gitconfig_path);
7894 24df9a28 2023-07-08 jrick if (error)
7895 24df9a28 2023-07-08 jrick goto done;
7896 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7897 24df9a28 2023-07-08 jrick gitconfig_path, pack_fds);
7898 24df9a28 2023-07-08 jrick if (error != NULL)
7899 24df9a28 2023-07-08 jrick goto done;
7901 24df9a28 2023-07-08 jrick error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7902 24df9a28 2023-07-08 jrick if (error)
7903 24df9a28 2023-07-08 jrick goto done;
7904 24df9a28 2023-07-08 jrick if (merge_in_progress) {
7905 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_MERGE_BUSY);
7906 24df9a28 2023-07-08 jrick goto done;
7909 24df9a28 2023-07-08 jrick error = get_author(&committer, repo, worktree);
7910 24df9a28 2023-07-08 jrick if (error)
7911 24df9a28 2023-07-08 jrick goto done;
7913 24df9a28 2023-07-08 jrick if (author == NULL)
7914 24df9a28 2023-07-08 jrick author = committer;
7916 24df9a28 2023-07-08 jrick remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
7917 24df9a28 2023-07-08 jrick worktree_conf = got_worktree_get_gotconfig(worktree);
7918 24df9a28 2023-07-08 jrick if (worktree_conf) {
7919 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
7920 24df9a28 2023-07-08 jrick worktree_conf);
7921 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
7922 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
7923 24df9a28 2023-07-08 jrick remote = &remotes[i];
7928 24df9a28 2023-07-08 jrick if (remote == NULL) {
7929 24df9a28 2023-07-08 jrick repo_conf = got_repo_get_gotconfig(repo);
7930 24df9a28 2023-07-08 jrick if (repo_conf) {
7931 24df9a28 2023-07-08 jrick got_gotconfig_get_remotes(&nremotes, &remotes,
7932 24df9a28 2023-07-08 jrick repo_conf);
7933 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
7934 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
7935 24df9a28 2023-07-08 jrick remote = &remotes[i];
7941 24df9a28 2023-07-08 jrick if (remote == NULL) {
7942 24df9a28 2023-07-08 jrick got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
7943 24df9a28 2023-07-08 jrick for (i = 0; i < nremotes; i++) {
7944 24df9a28 2023-07-08 jrick if (strcmp(remotes[i].name, remote_name) == 0) {
7945 24df9a28 2023-07-08 jrick remote = &remotes[i];
7950 24df9a28 2023-07-08 jrick if (remote == NULL) {
7951 24df9a28 2023-07-08 jrick error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
7952 24df9a28 2023-07-08 jrick goto done;
7955 24df9a28 2023-07-08 jrick error = got_dial_parse_uri(&proto, &host, &port, &server_path,
7956 24df9a28 2023-07-08 jrick &repo_name, remote->fetch_url);
7957 24df9a28 2023-07-08 jrick if (error)
7958 24df9a28 2023-07-08 jrick goto done;
7960 24df9a28 2023-07-08 jrick if (strcmp(proto, "git") == 0) {
7961 24df9a28 2023-07-08 jrick #ifndef PROFILE
7962 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7963 24df9a28 2023-07-08 jrick "sendfd dns inet unveil", NULL) == -1)
7964 24df9a28 2023-07-08 jrick err(1, "pledge");
7966 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "git+ssh") == 0 ||
7967 24df9a28 2023-07-08 jrick strcmp(proto, "ssh") == 0) {
7968 24df9a28 2023-07-08 jrick #ifndef PROFILE
7969 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7970 24df9a28 2023-07-08 jrick "sendfd unveil", NULL) == -1)
7971 24df9a28 2023-07-08 jrick err(1, "pledge");
7973 24df9a28 2023-07-08 jrick } else if (strcmp(proto, "http") == 0 ||
7974 24df9a28 2023-07-08 jrick strcmp(proto, "git+http") == 0) {
7975 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_NOT_IMPL);
7976 24df9a28 2023-07-08 jrick goto done;
7978 24df9a28 2023-07-08 jrick error = got_error_path(proto, GOT_ERR_BAD_PROTO);
7979 24df9a28 2023-07-08 jrick goto done;
7983 24df9a28 2023-07-08 jrick /*if (verbosity >= 0) {
7984 24df9a28 2023-07-08 jrick printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
7985 24df9a28 2023-07-08 jrick remote->name, proto, host,
7986 24df9a28 2023-07-08 jrick port ? ":" : "", port ? port : "",
7987 24df9a28 2023-07-08 jrick *server_path == '/' ? "" : "/", server_path);
7991 24df9a28 2023-07-08 jrick * unveil(2) traverses exec(2); if an editor is used we have
7992 24df9a28 2023-07-08 jrick * to apply unveil after the log message has been written during
7993 24df9a28 2023-07-08 jrick * the callback.
7995 24df9a28 2023-07-08 jrick if (logmsg == NULL || strlen(logmsg) == 0)
7996 24df9a28 2023-07-08 jrick error = get_editor(&editor);
7998 24df9a28 2023-07-08 jrick error = got_dial_apply_unveil(proto);
7999 24df9a28 2023-07-08 jrick if (error)
8000 24df9a28 2023-07-08 jrick goto done;
8001 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
8002 24df9a28 2023-07-08 jrick got_worktree_get_root_path(worktree));
8004 24df9a28 2023-07-08 jrick if (error)
8005 24df9a28 2023-07-08 jrick goto done;
8007 24df9a28 2023-07-08 jrick if (prepared_logmsg == NULL) {
8008 24df9a28 2023-07-08 jrick error = lookup_logmsg_ref(&merged_logmsg,
8009 24df9a28 2023-07-08 jrick argc > 0 ? &paths : NULL, &refs, worktree, repo);
8010 24df9a28 2023-07-08 jrick if (error)
8011 24df9a28 2023-07-08 jrick goto done;
8014 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8015 24df9a28 2023-07-08 jrick if (error)
8016 24df9a28 2023-07-08 jrick goto done;
8018 24df9a28 2023-07-08 jrick cl_arg.editor = editor;
8019 24df9a28 2023-07-08 jrick cl_arg.cmdline_log = logmsg;
8020 24df9a28 2023-07-08 jrick cl_arg.prepared_log = prepared_logmsg;
8021 24df9a28 2023-07-08 jrick cl_arg.merged_log = merged_logmsg;
8022 24df9a28 2023-07-08 jrick cl_arg.non_interactive = non_interactive;
8023 24df9a28 2023-07-08 jrick cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8024 24df9a28 2023-07-08 jrick cl_arg.repo_path = got_repo_get_path(repo);
8025 24df9a28 2023-07-08 jrick cl_arg.dial_proto = proto;
8026 24df9a28 2023-07-08 jrick error = got_worktree_cvg_commit(&id, worktree, &paths, author,
8027 24df9a28 2023-07-08 jrick committer, allow_bad_symlinks, show_diff, commit_conflicts,
8028 24df9a28 2023-07-08 jrick collect_commit_logmsg, &cl_arg, print_status, NULL, proto, host,
8029 24df9a28 2023-07-08 jrick port, server_path, verbosity, remote, check_cancelled, repo);
8030 24df9a28 2023-07-08 jrick if (error) {
8031 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8032 24df9a28 2023-07-08 jrick cl_arg.logmsg_path != NULL)
8033 24df9a28 2023-07-08 jrick preserve_logmsg = 1;
8034 24df9a28 2023-07-08 jrick goto done;
8037 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str, id);
8038 24df9a28 2023-07-08 jrick if (error)
8039 24df9a28 2023-07-08 jrick goto done;
8040 24df9a28 2023-07-08 jrick printf("Created commit %s\n", id_str);
8042 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
8043 24df9a28 2023-07-08 jrick error = got_ref_delete(re->ref, repo);
8044 24df9a28 2023-07-08 jrick if (error)
8045 24df9a28 2023-07-08 jrick goto done;
8049 24df9a28 2023-07-08 jrick if (preserve_logmsg) {
8050 24df9a28 2023-07-08 jrick fprintf(stderr, "%s: log message preserved in %s\n",
8051 24df9a28 2023-07-08 jrick getprogname(), cl_arg.logmsg_path);
8052 24df9a28 2023-07-08 jrick } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8053 24df9a28 2023-07-08 jrick error == NULL)
8054 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8055 24df9a28 2023-07-08 jrick free(cl_arg.logmsg_path);
8056 24df9a28 2023-07-08 jrick if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
8057 24df9a28 2023-07-08 jrick error = got_error_from_errno2("unlink", merged_logmsg);
8058 24df9a28 2023-07-08 jrick free(merged_logmsg);
8059 24df9a28 2023-07-08 jrick if (repo) {
8060 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8061 24df9a28 2023-07-08 jrick if (error == NULL)
8062 24df9a28 2023-07-08 jrick error = close_err;
8064 24df9a28 2023-07-08 jrick if (worktree)
8065 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8066 24df9a28 2023-07-08 jrick if (pack_fds) {
8067 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8068 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8069 24df9a28 2023-07-08 jrick if (error == NULL)
8070 24df9a28 2023-07-08 jrick error = pack_err;
8072 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
8073 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8074 24df9a28 2023-07-08 jrick free(cwd);
8075 24df9a28 2023-07-08 jrick free(id_str);
8076 24df9a28 2023-07-08 jrick free(gitconfig_path);
8077 24df9a28 2023-07-08 jrick free(editor);
8078 24df9a28 2023-07-08 jrick free(committer);
8079 24df9a28 2023-07-08 jrick free(prepared_logmsg);
8080 24df9a28 2023-07-08 jrick return error;
8084 24df9a28 2023-07-08 jrick * Print and if delete is set delete all ref_prefix references.
8085 24df9a28 2023-07-08 jrick * If wanted_ref is not NULL, only print or delete this reference.
8087 24df9a28 2023-07-08 jrick static const struct got_error *
8088 24df9a28 2023-07-08 jrick process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
8089 24df9a28 2023-07-08 jrick const char *wanted_ref, int delete, struct got_worktree *worktree,
8090 24df9a28 2023-07-08 jrick struct got_repository *repo)
8092 24df9a28 2023-07-08 jrick const struct got_error *err;
8093 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
8094 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
8095 24df9a28 2023-07-08 jrick struct got_reflist_entry *re;
8096 24df9a28 2023-07-08 jrick struct got_reflist_object_id_map *refs_idmap = NULL;
8097 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8098 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL;
8099 24df9a28 2023-07-08 jrick const char *header_prefix;
8100 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
8101 24df9a28 2023-07-08 jrick int found = 0;
8103 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
8104 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
8106 24df9a28 2023-07-08 jrick err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
8108 24df9a28 2023-07-08 jrick goto done;
8110 24df9a28 2023-07-08 jrick err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8112 24df9a28 2023-07-08 jrick goto done;
8114 24df9a28 2023-07-08 jrick if (worktree != NULL) {
8115 24df9a28 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
8117 24df9a28 2023-07-08 jrick goto done;
8120 24df9a28 2023-07-08 jrick if (wanted_ref) {
8121 24df9a28 2023-07-08 jrick if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
8122 24df9a28 2023-07-08 jrick wanted_ref += 11;
8125 24df9a28 2023-07-08 jrick if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
8126 24df9a28 2023-07-08 jrick header_prefix = "backout";
8128 24df9a28 2023-07-08 jrick header_prefix = "cherrypick";
8130 24df9a28 2023-07-08 jrick TAILQ_FOREACH(re, &refs, entry) {
8131 24df9a28 2023-07-08 jrick const char *refname, *wt;
8133 24df9a28 2023-07-08 jrick refname = got_ref_get_name(re->ref);
8135 24df9a28 2023-07-08 jrick err = check_cancelled(NULL);
8137 24df9a28 2023-07-08 jrick goto done;
8139 24df9a28 2023-07-08 jrick if (strncmp(refname, ref_prefix, prefix_len) == 0)
8140 24df9a28 2023-07-08 jrick refname += prefix_len + 1; /* skip '-' delimiter */
8142 24df9a28 2023-07-08 jrick continue;
8144 24df9a28 2023-07-08 jrick wt = refname;
8146 24df9a28 2023-07-08 jrick if (worktree == NULL || strncmp(refname, uuidstr,
8147 24df9a28 2023-07-08 jrick GOT_WORKTREE_UUID_STRLEN) == 0)
8148 24df9a28 2023-07-08 jrick refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8150 24df9a28 2023-07-08 jrick continue;
8152 24df9a28 2023-07-08 jrick err = got_repo_match_object_id(&id, NULL, refname,
8153 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8155 24df9a28 2023-07-08 jrick goto done;
8157 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
8159 24df9a28 2023-07-08 jrick goto done;
8161 24df9a28 2023-07-08 jrick if (wanted_ref)
8162 24df9a28 2023-07-08 jrick found = strncmp(wanted_ref, refname,
8163 24df9a28 2023-07-08 jrick strlen(wanted_ref)) == 0;
8164 24df9a28 2023-07-08 jrick if (wanted_ref && !found) {
8165 24df9a28 2023-07-08 jrick struct got_reflist_head *ci_refs;
8167 24df9a28 2023-07-08 jrick ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
8170 24df9a28 2023-07-08 jrick if (ci_refs) {
8171 24df9a28 2023-07-08 jrick char *refs_str = NULL;
8172 24df9a28 2023-07-08 jrick char const *r = NULL;
8174 24df9a28 2023-07-08 jrick err = build_refs_str(&refs_str, ci_refs, id,
8175 24df9a28 2023-07-08 jrick repo, 1);
8177 24df9a28 2023-07-08 jrick goto done;
8179 24df9a28 2023-07-08 jrick r = refs_str;
8180 24df9a28 2023-07-08 jrick while (r) {
8181 24df9a28 2023-07-08 jrick if (strncmp(r, wanted_ref,
8182 24df9a28 2023-07-08 jrick strlen(wanted_ref)) == 0) {
8183 24df9a28 2023-07-08 jrick found = 1;
8186 24df9a28 2023-07-08 jrick r = strchr(r, ' ');
8190 24df9a28 2023-07-08 jrick free(refs_str);
8194 24df9a28 2023-07-08 jrick if (wanted_ref == NULL || found) {
8195 24df9a28 2023-07-08 jrick if (delete) {
8196 24df9a28 2023-07-08 jrick err = got_ref_delete(re->ref, repo);
8198 24df9a28 2023-07-08 jrick goto done;
8199 24df9a28 2023-07-08 jrick printf("Deleted: ");
8200 24df9a28 2023-07-08 jrick err = print_commit_oneline(commit, id, repo,
8201 24df9a28 2023-07-08 jrick refs_idmap);
8204 24df9a28 2023-07-08 jrick * Print paths modified by commit to help
8205 24df9a28 2023-07-08 jrick * associate commits with worktree changes.
8207 24df9a28 2023-07-08 jrick err = get_changed_paths(&paths, commit,
8208 24df9a28 2023-07-08 jrick repo, NULL);
8210 24df9a28 2023-07-08 jrick goto done;
8212 24df9a28 2023-07-08 jrick err = print_commit(commit, id, repo, NULL,
8213 24df9a28 2023-07-08 jrick &paths, NULL, 0, 0, refs_idmap, NULL,
8214 24df9a28 2023-07-08 jrick header_prefix);
8215 24df9a28 2023-07-08 jrick got_pathlist_free(&paths,
8216 24df9a28 2023-07-08 jrick GOT_PATHLIST_FREE_ALL);
8218 24df9a28 2023-07-08 jrick if (worktree == NULL)
8219 24df9a28 2023-07-08 jrick printf("work tree: %.*s\n\n",
8220 24df9a28 2023-07-08 jrick GOT_WORKTREE_UUID_STRLEN, wt);
8222 24df9a28 2023-07-08 jrick if (err || found)
8223 24df9a28 2023-07-08 jrick goto done;
8226 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8227 24df9a28 2023-07-08 jrick commit = NULL;
8228 24df9a28 2023-07-08 jrick free(id);
8229 24df9a28 2023-07-08 jrick id = NULL;
8232 24df9a28 2023-07-08 jrick if (wanted_ref != NULL && !found)
8233 24df9a28 2023-07-08 jrick err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
8236 24df9a28 2023-07-08 jrick free(id);
8237 24df9a28 2023-07-08 jrick free(uuidstr);
8238 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
8239 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8240 24df9a28 2023-07-08 jrick if (refs_idmap)
8241 24df9a28 2023-07-08 jrick got_reflist_object_id_map_free(refs_idmap);
8242 24df9a28 2023-07-08 jrick if (commit)
8243 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8244 24df9a28 2023-07-08 jrick return err;
8248 24df9a28 2023-07-08 jrick * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
8249 24df9a28 2023-07-08 jrick * identified by id for log messages to prepopulate the editor on commit.
8251 24df9a28 2023-07-08 jrick static const struct got_error *
8252 24df9a28 2023-07-08 jrick logmsg_ref(struct got_object_id *id, const char *prefix,
8253 24df9a28 2023-07-08 jrick struct got_worktree *worktree, struct got_repository *repo)
8255 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
8256 24df9a28 2023-07-08 jrick char *idstr, *ref = NULL, *refname = NULL;
8257 24df9a28 2023-07-08 jrick int histedit_in_progress;
8258 24df9a28 2023-07-08 jrick int rebase_in_progress, merge_in_progress;
8261 24df9a28 2023-07-08 jrick * Silenty refuse to create merge reference if any histedit, merge,
8262 24df9a28 2023-07-08 jrick * or rebase operation is in progress.
8264 24df9a28 2023-07-08 jrick err = got_worktree_histedit_in_progress(&histedit_in_progress,
8265 24df9a28 2023-07-08 jrick worktree);
8267 24df9a28 2023-07-08 jrick return err;
8268 24df9a28 2023-07-08 jrick if (histedit_in_progress)
8269 24df9a28 2023-07-08 jrick return NULL;
8271 24df9a28 2023-07-08 jrick err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8273 24df9a28 2023-07-08 jrick return err;
8274 24df9a28 2023-07-08 jrick if (rebase_in_progress)
8275 24df9a28 2023-07-08 jrick return NULL;
8277 24df9a28 2023-07-08 jrick err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
8280 24df9a28 2023-07-08 jrick return err;
8281 24df9a28 2023-07-08 jrick if (merge_in_progress)
8282 24df9a28 2023-07-08 jrick return NULL;
8284 24df9a28 2023-07-08 jrick err = got_object_id_str(&idstr, id);
8286 24df9a28 2023-07-08 jrick return err;
8288 24df9a28 2023-07-08 jrick err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
8290 24df9a28 2023-07-08 jrick goto done;
8292 24df9a28 2023-07-08 jrick if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
8293 24df9a28 2023-07-08 jrick err = got_error_from_errno("asprintf");
8294 24df9a28 2023-07-08 jrick goto done;
8297 24df9a28 2023-07-08 jrick err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
8298 24df9a28 2023-07-08 jrick -1, repo);
8300 24df9a28 2023-07-08 jrick free(ref);
8301 24df9a28 2023-07-08 jrick free(idstr);
8302 24df9a28 2023-07-08 jrick free(refname);
8303 24df9a28 2023-07-08 jrick return err;
8306 24df9a28 2023-07-08 jrick __dead static void
8307 24df9a28 2023-07-08 jrick usage_cherrypick(void)
8309 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
8310 24df9a28 2023-07-08 jrick getprogname());
8314 24df9a28 2023-07-08 jrick static const struct got_error *
8315 24df9a28 2023-07-08 jrick cmd_cherrypick(int argc, char *argv[])
8317 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
8318 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
8319 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
8320 24df9a28 2023-07-08 jrick char *cwd = NULL, *commit_id_str = NULL;
8321 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
8322 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8323 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
8324 24df9a28 2023-07-08 jrick int ch, list_refs = 0, remove_refs = 0;
8325 24df9a28 2023-07-08 jrick struct got_update_progress_arg upa;
8326 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
8328 24df9a28 2023-07-08 jrick #ifndef PROFILE
8329 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8330 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
8331 24df9a28 2023-07-08 jrick err(1, "pledge");
8334 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "lX")) != -1) {
8335 24df9a28 2023-07-08 jrick switch (ch) {
8336 24df9a28 2023-07-08 jrick case 'l':
8337 24df9a28 2023-07-08 jrick list_refs = 1;
8339 24df9a28 2023-07-08 jrick case 'X':
8340 24df9a28 2023-07-08 jrick remove_refs = 1;
8343 24df9a28 2023-07-08 jrick usage_cherrypick();
8344 24df9a28 2023-07-08 jrick /* NOTREACHED */
8348 24df9a28 2023-07-08 jrick argc -= optind;
8349 24df9a28 2023-07-08 jrick argv += optind;
8351 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8352 24df9a28 2023-07-08 jrick if (argc != 0 && argc != 1)
8353 24df9a28 2023-07-08 jrick usage_cherrypick();
8354 24df9a28 2023-07-08 jrick } else if (argc != 1)
8355 24df9a28 2023-07-08 jrick usage_cherrypick();
8356 24df9a28 2023-07-08 jrick if (list_refs && remove_refs)
8357 24df9a28 2023-07-08 jrick option_conflict('l', 'X');
8359 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
8360 24df9a28 2023-07-08 jrick if (cwd == NULL) {
8361 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
8362 24df9a28 2023-07-08 jrick goto done;
8365 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
8366 24df9a28 2023-07-08 jrick if (error != NULL)
8367 24df9a28 2023-07-08 jrick goto done;
8369 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8370 24df9a28 2023-07-08 jrick if (error) {
8371 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8372 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_WORKTREE)
8373 24df9a28 2023-07-08 jrick goto done;
8375 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
8376 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error,
8377 24df9a28 2023-07-08 jrick "cherrypick", cwd);
8378 24df9a28 2023-07-08 jrick goto done;
8382 24df9a28 2023-07-08 jrick error = got_repo_open(&repo,
8383 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_repo_path(worktree) : cwd,
8384 24df9a28 2023-07-08 jrick NULL, pack_fds);
8385 24df9a28 2023-07-08 jrick if (error != NULL)
8386 24df9a28 2023-07-08 jrick goto done;
8388 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
8389 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
8390 24df9a28 2023-07-08 jrick if (error)
8391 24df9a28 2023-07-08 jrick goto done;
8393 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8394 24df9a28 2023-07-08 jrick error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8395 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
8396 24df9a28 2023-07-08 jrick argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8397 24df9a28 2023-07-08 jrick goto done;
8400 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8401 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8402 24df9a28 2023-07-08 jrick if (error)
8403 24df9a28 2023-07-08 jrick goto done;
8404 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
8405 24df9a28 2023-07-08 jrick if (error)
8406 24df9a28 2023-07-08 jrick goto done;
8408 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
8409 24df9a28 2023-07-08 jrick if (error)
8410 24df9a28 2023-07-08 jrick goto done;
8411 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8412 24df9a28 2023-07-08 jrick memset(&upa, 0, sizeof(upa));
8413 24df9a28 2023-07-08 jrick error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8414 24df9a28 2023-07-08 jrick commit_id, repo, update_progress, &upa, check_cancelled,
8416 24df9a28 2023-07-08 jrick if (error != NULL)
8417 24df9a28 2023-07-08 jrick goto done;
8419 24df9a28 2023-07-08 jrick if (upa.did_something) {
8420 24df9a28 2023-07-08 jrick error = logmsg_ref(commit_id,
8421 24df9a28 2023-07-08 jrick GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
8422 24df9a28 2023-07-08 jrick if (error)
8423 24df9a28 2023-07-08 jrick goto done;
8424 24df9a28 2023-07-08 jrick printf("Merged commit %s\n", commit_id_str);
8426 24df9a28 2023-07-08 jrick print_merge_progress_stats(&upa);
8428 24df9a28 2023-07-08 jrick free(cwd);
8429 24df9a28 2023-07-08 jrick if (commit)
8430 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8431 24df9a28 2023-07-08 jrick free(commit_id_str);
8432 24df9a28 2023-07-08 jrick if (worktree)
8433 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8434 24df9a28 2023-07-08 jrick if (repo) {
8435 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8436 24df9a28 2023-07-08 jrick if (error == NULL)
8437 24df9a28 2023-07-08 jrick error = close_err;
8439 24df9a28 2023-07-08 jrick if (pack_fds) {
8440 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8441 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8442 24df9a28 2023-07-08 jrick if (error == NULL)
8443 24df9a28 2023-07-08 jrick error = pack_err;
8446 24df9a28 2023-07-08 jrick return error;
8449 24df9a28 2023-07-08 jrick __dead static void
8450 24df9a28 2023-07-08 jrick usage_backout(void)
8452 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
8456 24df9a28 2023-07-08 jrick static const struct got_error *
8457 24df9a28 2023-07-08 jrick cmd_backout(int argc, char *argv[])
8459 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
8460 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
8461 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
8462 24df9a28 2023-07-08 jrick char *cwd = NULL, *commit_id_str = NULL;
8463 24df9a28 2023-07-08 jrick struct got_object_id *commit_id = NULL;
8464 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8465 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
8466 24df9a28 2023-07-08 jrick int ch, list_refs = 0, remove_refs = 0;
8467 24df9a28 2023-07-08 jrick struct got_update_progress_arg upa;
8468 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
8470 24df9a28 2023-07-08 jrick #ifndef PROFILE
8471 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8472 24df9a28 2023-07-08 jrick "unveil", NULL) == -1)
8473 24df9a28 2023-07-08 jrick err(1, "pledge");
8476 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "lX")) != -1) {
8477 24df9a28 2023-07-08 jrick switch (ch) {
8478 24df9a28 2023-07-08 jrick case 'l':
8479 24df9a28 2023-07-08 jrick list_refs = 1;
8481 24df9a28 2023-07-08 jrick case 'X':
8482 24df9a28 2023-07-08 jrick remove_refs = 1;
8485 24df9a28 2023-07-08 jrick usage_backout();
8486 24df9a28 2023-07-08 jrick /* NOTREACHED */
8490 24df9a28 2023-07-08 jrick argc -= optind;
8491 24df9a28 2023-07-08 jrick argv += optind;
8493 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8494 24df9a28 2023-07-08 jrick if (argc != 0 && argc != 1)
8495 24df9a28 2023-07-08 jrick usage_backout();
8496 24df9a28 2023-07-08 jrick } else if (argc != 1)
8497 24df9a28 2023-07-08 jrick usage_backout();
8498 24df9a28 2023-07-08 jrick if (list_refs && remove_refs)
8499 24df9a28 2023-07-08 jrick option_conflict('l', 'X');
8501 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
8502 24df9a28 2023-07-08 jrick if (cwd == NULL) {
8503 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
8504 24df9a28 2023-07-08 jrick goto done;
8507 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
8508 24df9a28 2023-07-08 jrick if (error != NULL)
8509 24df9a28 2023-07-08 jrick goto done;
8511 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8512 24df9a28 2023-07-08 jrick if (error) {
8513 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8514 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_NOT_WORKTREE)
8515 24df9a28 2023-07-08 jrick goto done;
8517 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
8518 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error,
8519 24df9a28 2023-07-08 jrick "backout", cwd);
8520 24df9a28 2023-07-08 jrick goto done;
8524 24df9a28 2023-07-08 jrick error = got_repo_open(&repo,
8525 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_repo_path(worktree) : cwd,
8526 24df9a28 2023-07-08 jrick NULL, pack_fds);
8527 24df9a28 2023-07-08 jrick if (error != NULL)
8528 24df9a28 2023-07-08 jrick goto done;
8530 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 0,
8531 24df9a28 2023-07-08 jrick worktree ? got_worktree_get_root_path(worktree) : NULL);
8532 24df9a28 2023-07-08 jrick if (error)
8533 24df9a28 2023-07-08 jrick goto done;
8535 24df9a28 2023-07-08 jrick if (list_refs || remove_refs) {
8536 24df9a28 2023-07-08 jrick error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
8537 24df9a28 2023-07-08 jrick GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
8538 24df9a28 2023-07-08 jrick argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8539 24df9a28 2023-07-08 jrick goto done;
8542 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8543 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_COMMIT, NULL, repo);
8544 24df9a28 2023-07-08 jrick if (error)
8545 24df9a28 2023-07-08 jrick goto done;
8546 24df9a28 2023-07-08 jrick error = got_object_id_str(&commit_id_str, commit_id);
8547 24df9a28 2023-07-08 jrick if (error)
8548 24df9a28 2023-07-08 jrick goto done;
8550 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
8551 24df9a28 2023-07-08 jrick if (error)
8552 24df9a28 2023-07-08 jrick goto done;
8553 24df9a28 2023-07-08 jrick pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8554 24df9a28 2023-07-08 jrick if (pid == NULL) {
8555 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_ROOT_COMMIT);
8556 24df9a28 2023-07-08 jrick goto done;
8559 24df9a28 2023-07-08 jrick memset(&upa, 0, sizeof(upa));
8560 24df9a28 2023-07-08 jrick error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8561 24df9a28 2023-07-08 jrick repo, update_progress, &upa, check_cancelled, NULL);
8562 24df9a28 2023-07-08 jrick if (error != NULL)
8563 24df9a28 2023-07-08 jrick goto done;
8565 24df9a28 2023-07-08 jrick if (upa.did_something) {
8566 24df9a28 2023-07-08 jrick error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8567 24df9a28 2023-07-08 jrick worktree, repo);
8568 24df9a28 2023-07-08 jrick if (error)
8569 24df9a28 2023-07-08 jrick goto done;
8570 24df9a28 2023-07-08 jrick printf("Backed out commit %s\n", commit_id_str);
8572 24df9a28 2023-07-08 jrick print_merge_progress_stats(&upa);
8574 24df9a28 2023-07-08 jrick free(cwd);
8575 24df9a28 2023-07-08 jrick if (commit)
8576 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8577 24df9a28 2023-07-08 jrick free(commit_id_str);
8578 24df9a28 2023-07-08 jrick if (worktree)
8579 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8580 24df9a28 2023-07-08 jrick if (repo) {
8581 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8582 24df9a28 2023-07-08 jrick if (error == NULL)
8583 24df9a28 2023-07-08 jrick error = close_err;
8585 24df9a28 2023-07-08 jrick if (pack_fds) {
8586 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8587 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8588 24df9a28 2023-07-08 jrick if (error == NULL)
8589 24df9a28 2023-07-08 jrick error = pack_err;
8591 24df9a28 2023-07-08 jrick return error;
8594 24df9a28 2023-07-08 jrick __dead static void
8595 24df9a28 2023-07-08 jrick usage_cat(void)
8597 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
8598 24df9a28 2023-07-08 jrick "arg ...\n", getprogname());
8602 24df9a28 2023-07-08 jrick static const struct got_error *
8603 24df9a28 2023-07-08 jrick cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8605 24df9a28 2023-07-08 jrick const struct got_error *err;
8606 24df9a28 2023-07-08 jrick struct got_blob_object *blob;
8607 24df9a28 2023-07-08 jrick int fd = -1;
8609 24df9a28 2023-07-08 jrick fd = got_opentempfd();
8610 24df9a28 2023-07-08 jrick if (fd == -1)
8611 24df9a28 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
8613 24df9a28 2023-07-08 jrick err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
8615 24df9a28 2023-07-08 jrick goto done;
8617 24df9a28 2023-07-08 jrick err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8619 24df9a28 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
8620 24df9a28 2023-07-08 jrick err = got_error_from_errno("close");
8621 24df9a28 2023-07-08 jrick if (blob)
8622 24df9a28 2023-07-08 jrick got_object_blob_close(blob);
8623 24df9a28 2023-07-08 jrick return err;
8626 24df9a28 2023-07-08 jrick static const struct got_error *
8627 24df9a28 2023-07-08 jrick cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8629 24df9a28 2023-07-08 jrick const struct got_error *err;
8630 24df9a28 2023-07-08 jrick struct got_tree_object *tree;
8631 24df9a28 2023-07-08 jrick int nentries, i;
8633 24df9a28 2023-07-08 jrick err = got_object_open_as_tree(&tree, repo, id);
8635 24df9a28 2023-07-08 jrick return err;
8637 24df9a28 2023-07-08 jrick nentries = got_object_tree_get_nentries(tree);
8638 24df9a28 2023-07-08 jrick for (i = 0; i < nentries; i++) {
8639 24df9a28 2023-07-08 jrick struct got_tree_entry *te;
8640 24df9a28 2023-07-08 jrick char *id_str;
8641 24df9a28 2023-07-08 jrick if (sigint_received || sigpipe_received)
8643 24df9a28 2023-07-08 jrick te = got_object_tree_get_entry(tree, i);
8644 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8647 24df9a28 2023-07-08 jrick fprintf(outfile, "%s %.7o %s\n", id_str,
8648 24df9a28 2023-07-08 jrick got_tree_entry_get_mode(te),
8649 24df9a28 2023-07-08 jrick got_tree_entry_get_name(te));
8650 24df9a28 2023-07-08 jrick free(id_str);
8653 24df9a28 2023-07-08 jrick got_object_tree_close(tree);
8654 24df9a28 2023-07-08 jrick return err;
8657 24df9a28 2023-07-08 jrick static const struct got_error *
8658 24df9a28 2023-07-08 jrick cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8660 24df9a28 2023-07-08 jrick const struct got_error *err;
8661 24df9a28 2023-07-08 jrick struct got_commit_object *commit;
8662 24df9a28 2023-07-08 jrick const struct got_object_id_queue *parent_ids;
8663 24df9a28 2023-07-08 jrick struct got_object_qid *pid;
8664 24df9a28 2023-07-08 jrick char *id_str = NULL;
8665 24df9a28 2023-07-08 jrick const char *logmsg = NULL;
8666 24df9a28 2023-07-08 jrick char gmtoff[6];
8668 24df9a28 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, id);
8670 24df9a28 2023-07-08 jrick return err;
8672 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8674 24df9a28 2023-07-08 jrick goto done;
8676 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8677 24df9a28 2023-07-08 jrick parent_ids = got_object_commit_get_parent_ids(commit);
8678 24df9a28 2023-07-08 jrick fprintf(outfile, "numparents %d\n",
8679 24df9a28 2023-07-08 jrick got_object_commit_get_nparents(commit));
8680 24df9a28 2023-07-08 jrick STAILQ_FOREACH(pid, parent_ids, entry) {
8681 24df9a28 2023-07-08 jrick char *pid_str;
8682 24df9a28 2023-07-08 jrick err = got_object_id_str(&pid_str, &pid->id);
8684 24df9a28 2023-07-08 jrick goto done;
8685 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8686 24df9a28 2023-07-08 jrick free(pid_str);
8688 24df9a28 2023-07-08 jrick got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8689 24df9a28 2023-07-08 jrick got_object_commit_get_author_gmtoff(commit));
8690 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
8691 24df9a28 2023-07-08 jrick got_object_commit_get_author(commit),
8692 24df9a28 2023-07-08 jrick (long long)got_object_commit_get_author_time(commit),
8695 24df9a28 2023-07-08 jrick got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8696 24df9a28 2023-07-08 jrick got_object_commit_get_committer_gmtoff(commit));
8697 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
8698 24df9a28 2023-07-08 jrick got_object_commit_get_committer(commit),
8699 24df9a28 2023-07-08 jrick (long long)got_object_commit_get_committer_time(commit),
8702 24df9a28 2023-07-08 jrick logmsg = got_object_commit_get_logmsg_raw(commit);
8703 24df9a28 2023-07-08 jrick fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8704 24df9a28 2023-07-08 jrick fprintf(outfile, "%s", logmsg);
8706 24df9a28 2023-07-08 jrick free(id_str);
8707 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8708 24df9a28 2023-07-08 jrick return err;
8711 24df9a28 2023-07-08 jrick static const struct got_error *
8712 24df9a28 2023-07-08 jrick cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8714 24df9a28 2023-07-08 jrick const struct got_error *err;
8715 24df9a28 2023-07-08 jrick struct got_tag_object *tag;
8716 24df9a28 2023-07-08 jrick char *id_str = NULL;
8717 24df9a28 2023-07-08 jrick const char *tagmsg = NULL;
8718 24df9a28 2023-07-08 jrick char gmtoff[6];
8720 24df9a28 2023-07-08 jrick err = got_object_open_as_tag(&tag, repo, id);
8722 24df9a28 2023-07-08 jrick return err;
8724 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8726 24df9a28 2023-07-08 jrick goto done;
8728 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8730 24df9a28 2023-07-08 jrick switch (got_object_tag_get_object_type(tag)) {
8731 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
8732 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8733 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_BLOB);
8735 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
8736 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8737 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_TREE);
8739 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
8740 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8741 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_COMMIT);
8743 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TAG:
8744 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8745 24df9a28 2023-07-08 jrick GOT_OBJ_LABEL_TAG);
8751 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8752 24df9a28 2023-07-08 jrick got_object_tag_get_name(tag));
8754 24df9a28 2023-07-08 jrick got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8755 24df9a28 2023-07-08 jrick got_object_tag_get_tagger_gmtoff(tag));
8756 24df9a28 2023-07-08 jrick fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
8757 24df9a28 2023-07-08 jrick got_object_tag_get_tagger(tag),
8758 24df9a28 2023-07-08 jrick (long long)got_object_tag_get_tagger_time(tag),
8761 24df9a28 2023-07-08 jrick tagmsg = got_object_tag_get_message(tag);
8762 24df9a28 2023-07-08 jrick fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8763 24df9a28 2023-07-08 jrick fprintf(outfile, "%s", tagmsg);
8765 24df9a28 2023-07-08 jrick free(id_str);
8766 24df9a28 2023-07-08 jrick got_object_tag_close(tag);
8767 24df9a28 2023-07-08 jrick return err;
8770 24df9a28 2023-07-08 jrick static const struct got_error *
8771 24df9a28 2023-07-08 jrick cmd_cat(int argc, char *argv[])
8773 24df9a28 2023-07-08 jrick const struct got_error *error;
8774 24df9a28 2023-07-08 jrick struct got_repository *repo = NULL;
8775 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
8776 24df9a28 2023-07-08 jrick char *cwd = NULL, *repo_path = NULL, *label = NULL;
8777 24df9a28 2023-07-08 jrick const char *commit_id_str = NULL;
8778 24df9a28 2023-07-08 jrick struct got_object_id *id = NULL, *commit_id = NULL;
8779 24df9a28 2023-07-08 jrick struct got_commit_object *commit = NULL;
8780 24df9a28 2023-07-08 jrick int ch, obj_type, i, force_path = 0;
8781 24df9a28 2023-07-08 jrick struct got_reflist_head refs;
8782 24df9a28 2023-07-08 jrick int *pack_fds = NULL;
8784 24df9a28 2023-07-08 jrick TAILQ_INIT(&refs);
8786 24df9a28 2023-07-08 jrick #ifndef PROFILE
8787 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8788 24df9a28 2023-07-08 jrick NULL) == -1)
8789 24df9a28 2023-07-08 jrick err(1, "pledge");
8792 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
8793 24df9a28 2023-07-08 jrick switch (ch) {
8794 24df9a28 2023-07-08 jrick case 'c':
8795 24df9a28 2023-07-08 jrick commit_id_str = optarg;
8797 24df9a28 2023-07-08 jrick case 'P':
8798 24df9a28 2023-07-08 jrick force_path = 1;
8800 24df9a28 2023-07-08 jrick case 'r':
8801 24df9a28 2023-07-08 jrick repo_path = realpath(optarg, NULL);
8802 24df9a28 2023-07-08 jrick if (repo_path == NULL)
8803 24df9a28 2023-07-08 jrick return got_error_from_errno2("realpath",
8805 24df9a28 2023-07-08 jrick got_path_strip_trailing_slashes(repo_path);
8808 24df9a28 2023-07-08 jrick usage_cat();
8809 24df9a28 2023-07-08 jrick /* NOTREACHED */
8813 24df9a28 2023-07-08 jrick argc -= optind;
8814 24df9a28 2023-07-08 jrick argv += optind;
8816 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
8817 24df9a28 2023-07-08 jrick if (cwd == NULL) {
8818 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
8819 24df9a28 2023-07-08 jrick goto done;
8822 24df9a28 2023-07-08 jrick error = got_repo_pack_fds_open(&pack_fds);
8823 24df9a28 2023-07-08 jrick if (error != NULL)
8824 24df9a28 2023-07-08 jrick goto done;
8826 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
8827 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8828 24df9a28 2023-07-08 jrick if (error && error->code != GOT_ERR_NOT_WORKTREE)
8829 24df9a28 2023-07-08 jrick goto done;
8830 24df9a28 2023-07-08 jrick if (worktree) {
8831 24df9a28 2023-07-08 jrick repo_path = strdup(
8832 24df9a28 2023-07-08 jrick got_worktree_get_repo_path(worktree));
8833 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
8834 24df9a28 2023-07-08 jrick error = got_error_from_errno("strdup");
8835 24df9a28 2023-07-08 jrick goto done;
8838 24df9a28 2023-07-08 jrick /* Release work tree lock. */
8839 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8840 24df9a28 2023-07-08 jrick worktree = NULL;
8844 24df9a28 2023-07-08 jrick if (repo_path == NULL) {
8845 24df9a28 2023-07-08 jrick repo_path = strdup(cwd);
8846 24df9a28 2023-07-08 jrick if (repo_path == NULL)
8847 24df9a28 2023-07-08 jrick return got_error_from_errno("strdup");
8850 24df9a28 2023-07-08 jrick error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8851 24df9a28 2023-07-08 jrick free(repo_path);
8852 24df9a28 2023-07-08 jrick if (error != NULL)
8853 24df9a28 2023-07-08 jrick goto done;
8855 24df9a28 2023-07-08 jrick error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8856 24df9a28 2023-07-08 jrick if (error)
8857 24df9a28 2023-07-08 jrick goto done;
8859 24df9a28 2023-07-08 jrick error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8860 24df9a28 2023-07-08 jrick if (error)
8861 24df9a28 2023-07-08 jrick goto done;
8863 24df9a28 2023-07-08 jrick if (commit_id_str == NULL)
8864 24df9a28 2023-07-08 jrick commit_id_str = GOT_REF_HEAD;
8865 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&commit_id, NULL,
8866 24df9a28 2023-07-08 jrick commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8867 24df9a28 2023-07-08 jrick if (error)
8868 24df9a28 2023-07-08 jrick goto done;
8870 24df9a28 2023-07-08 jrick error = got_object_open_as_commit(&commit, repo, commit_id);
8871 24df9a28 2023-07-08 jrick if (error)
8872 24df9a28 2023-07-08 jrick goto done;
8874 24df9a28 2023-07-08 jrick for (i = 0; i < argc; i++) {
8875 24df9a28 2023-07-08 jrick if (force_path) {
8876 24df9a28 2023-07-08 jrick error = got_object_id_by_path(&id, repo, commit,
8877 24df9a28 2023-07-08 jrick argv[i]);
8878 24df9a28 2023-07-08 jrick if (error)
8881 24df9a28 2023-07-08 jrick error = got_repo_match_object_id(&id, &label, argv[i],
8882 24df9a28 2023-07-08 jrick GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
8884 24df9a28 2023-07-08 jrick if (error) {
8885 24df9a28 2023-07-08 jrick if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8886 24df9a28 2023-07-08 jrick error->code != GOT_ERR_NOT_REF)
8888 24df9a28 2023-07-08 jrick error = got_object_id_by_path(&id, repo,
8889 24df9a28 2023-07-08 jrick commit, argv[i]);
8890 24df9a28 2023-07-08 jrick if (error)
8895 24df9a28 2023-07-08 jrick error = got_object_get_type(&obj_type, repo, id);
8896 24df9a28 2023-07-08 jrick if (error)
8899 24df9a28 2023-07-08 jrick switch (obj_type) {
8900 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_BLOB:
8901 24df9a28 2023-07-08 jrick error = cat_blob(id, repo, stdout);
8903 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TREE:
8904 24df9a28 2023-07-08 jrick error = cat_tree(id, repo, stdout);
8906 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_COMMIT:
8907 24df9a28 2023-07-08 jrick error = cat_commit(id, repo, stdout);
8909 24df9a28 2023-07-08 jrick case GOT_OBJ_TYPE_TAG:
8910 24df9a28 2023-07-08 jrick error = cat_tag(id, repo, stdout);
8913 24df9a28 2023-07-08 jrick error = got_error(GOT_ERR_OBJ_TYPE);
8916 24df9a28 2023-07-08 jrick if (error)
8918 24df9a28 2023-07-08 jrick free(label);
8919 24df9a28 2023-07-08 jrick label = NULL;
8920 24df9a28 2023-07-08 jrick free(id);
8921 24df9a28 2023-07-08 jrick id = NULL;
8924 24df9a28 2023-07-08 jrick free(label);
8925 24df9a28 2023-07-08 jrick free(id);
8926 24df9a28 2023-07-08 jrick free(commit_id);
8927 24df9a28 2023-07-08 jrick if (commit)
8928 24df9a28 2023-07-08 jrick got_object_commit_close(commit);
8929 24df9a28 2023-07-08 jrick if (worktree)
8930 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
8931 24df9a28 2023-07-08 jrick if (repo) {
8932 24df9a28 2023-07-08 jrick const struct got_error *close_err = got_repo_close(repo);
8933 24df9a28 2023-07-08 jrick if (error == NULL)
8934 24df9a28 2023-07-08 jrick error = close_err;
8936 24df9a28 2023-07-08 jrick if (pack_fds) {
8937 24df9a28 2023-07-08 jrick const struct got_error *pack_err =
8938 24df9a28 2023-07-08 jrick got_repo_pack_fds_close(pack_fds);
8939 24df9a28 2023-07-08 jrick if (error == NULL)
8940 24df9a28 2023-07-08 jrick error = pack_err;
8943 24df9a28 2023-07-08 jrick got_ref_list_free(&refs);
8944 24df9a28 2023-07-08 jrick return error;
8947 24df9a28 2023-07-08 jrick __dead static void
8948 24df9a28 2023-07-08 jrick usage_info(void)
8950 24df9a28 2023-07-08 jrick fprintf(stderr, "usage: %s info [path ...]\n",
8951 24df9a28 2023-07-08 jrick getprogname());
8955 24df9a28 2023-07-08 jrick static const struct got_error *
8956 24df9a28 2023-07-08 jrick print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
8957 24df9a28 2023-07-08 jrick struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8958 24df9a28 2023-07-08 jrick struct got_object_id *commit_id)
8960 24df9a28 2023-07-08 jrick const struct got_error *err = NULL;
8961 24df9a28 2023-07-08 jrick char *id_str = NULL;
8962 24df9a28 2023-07-08 jrick char datebuf[128];
8963 24df9a28 2023-07-08 jrick struct tm mytm, *tm;
8964 24df9a28 2023-07-08 jrick struct got_pathlist_head *paths = arg;
8965 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
8968 24df9a28 2023-07-08 jrick * Clear error indication from any of the path arguments which
8969 24df9a28 2023-07-08 jrick * would cause this file index entry to be displayed.
8971 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, paths, entry) {
8972 24df9a28 2023-07-08 jrick if (got_path_cmp(path, pe->path, strlen(path),
8973 24df9a28 2023-07-08 jrick pe->path_len) == 0 ||
8974 24df9a28 2023-07-08 jrick got_path_is_child(path, pe->path, pe->path_len))
8975 24df9a28 2023-07-08 jrick pe->data = NULL; /* no error */
8978 24df9a28 2023-07-08 jrick printf(GOT_COMMIT_SEP_STR);
8979 24df9a28 2023-07-08 jrick if (S_ISLNK(mode))
8980 24df9a28 2023-07-08 jrick printf("symlink: %s\n", path);
8981 24df9a28 2023-07-08 jrick else if (S_ISREG(mode)) {
8982 24df9a28 2023-07-08 jrick printf("file: %s\n", path);
8983 24df9a28 2023-07-08 jrick printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
8984 24df9a28 2023-07-08 jrick } else if (S_ISDIR(mode))
8985 24df9a28 2023-07-08 jrick printf("directory: %s\n", path);
8987 24df9a28 2023-07-08 jrick printf("something: %s\n", path);
8989 24df9a28 2023-07-08 jrick tm = localtime_r(&mtime, &mytm);
8990 24df9a28 2023-07-08 jrick if (tm == NULL)
8991 24df9a28 2023-07-08 jrick return NULL;
8992 24df9a28 2023-07-08 jrick if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
8993 24df9a28 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
8994 24df9a28 2023-07-08 jrick printf("timestamp: %s\n", datebuf);
8996 24df9a28 2023-07-08 jrick if (blob_id) {
8997 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, blob_id);
8999 24df9a28 2023-07-08 jrick return err;
9000 24df9a28 2023-07-08 jrick printf("based on blob: %s\n", id_str);
9001 24df9a28 2023-07-08 jrick free(id_str);
9004 24df9a28 2023-07-08 jrick if (staged_blob_id) {
9005 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, staged_blob_id);
9007 24df9a28 2023-07-08 jrick return err;
9008 24df9a28 2023-07-08 jrick printf("based on staged blob: %s\n", id_str);
9009 24df9a28 2023-07-08 jrick free(id_str);
9012 24df9a28 2023-07-08 jrick if (commit_id) {
9013 24df9a28 2023-07-08 jrick err = got_object_id_str(&id_str, commit_id);
9015 24df9a28 2023-07-08 jrick return err;
9016 24df9a28 2023-07-08 jrick printf("based on commit: %s\n", id_str);
9017 24df9a28 2023-07-08 jrick free(id_str);
9020 24df9a28 2023-07-08 jrick return NULL;
9023 24df9a28 2023-07-08 jrick static const struct got_error *
9024 24df9a28 2023-07-08 jrick cmd_info(int argc, char *argv[])
9026 24df9a28 2023-07-08 jrick const struct got_error *error = NULL;
9027 24df9a28 2023-07-08 jrick struct got_worktree *worktree = NULL;
9028 24df9a28 2023-07-08 jrick char *cwd = NULL, *id_str = NULL;
9029 24df9a28 2023-07-08 jrick struct got_pathlist_head paths;
9030 24df9a28 2023-07-08 jrick char *uuidstr = NULL;
9031 24df9a28 2023-07-08 jrick int ch, show_files = 0;
9033 24df9a28 2023-07-08 jrick TAILQ_INIT(&paths);
9035 24df9a28 2023-07-08 jrick #ifndef PROFILE
9036 24df9a28 2023-07-08 jrick if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9037 24df9a28 2023-07-08 jrick NULL) == -1)
9038 24df9a28 2023-07-08 jrick err(1, "pledge");
9041 24df9a28 2023-07-08 jrick while ((ch = getopt(argc, argv, "")) != -1) {
9042 24df9a28 2023-07-08 jrick switch (ch) {
9044 24df9a28 2023-07-08 jrick usage_info();
9045 24df9a28 2023-07-08 jrick /* NOTREACHED */
9049 24df9a28 2023-07-08 jrick argc -= optind;
9050 24df9a28 2023-07-08 jrick argv += optind;
9052 24df9a28 2023-07-08 jrick cwd = getcwd(NULL, 0);
9053 24df9a28 2023-07-08 jrick if (cwd == NULL) {
9054 24df9a28 2023-07-08 jrick error = got_error_from_errno("getcwd");
9055 24df9a28 2023-07-08 jrick goto done;
9058 df6221c7 2023-07-19 stsp error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
9059 24df9a28 2023-07-08 jrick if (error) {
9060 24df9a28 2023-07-08 jrick if (error->code == GOT_ERR_NOT_WORKTREE)
9061 24df9a28 2023-07-08 jrick error = wrap_not_worktree_error(error, "info", cwd);
9062 24df9a28 2023-07-08 jrick goto done;
9065 24df9a28 2023-07-08 jrick #ifndef PROFILE
9066 24df9a28 2023-07-08 jrick /* Remove "wpath cpath proc exec sendfd" promises. */
9067 24df9a28 2023-07-08 jrick if (pledge("stdio rpath flock unveil", NULL) == -1)
9068 24df9a28 2023-07-08 jrick err(1, "pledge");
9070 24df9a28 2023-07-08 jrick error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9071 24df9a28 2023-07-08 jrick if (error)
9072 24df9a28 2023-07-08 jrick goto done;
9074 24df9a28 2023-07-08 jrick if (argc >= 1) {
9075 24df9a28 2023-07-08 jrick error = get_worktree_paths_from_argv(&paths, argc, argv,
9076 24df9a28 2023-07-08 jrick worktree);
9077 24df9a28 2023-07-08 jrick if (error)
9078 24df9a28 2023-07-08 jrick goto done;
9079 24df9a28 2023-07-08 jrick show_files = 1;
9082 24df9a28 2023-07-08 jrick error = got_object_id_str(&id_str,
9083 24df9a28 2023-07-08 jrick got_worktree_get_base_commit_id(worktree));
9084 24df9a28 2023-07-08 jrick if (error)
9085 24df9a28 2023-07-08 jrick goto done;
9087 24df9a28 2023-07-08 jrick error = got_worktree_get_uuid(&uuidstr, worktree);
9088 24df9a28 2023-07-08 jrick if (error)
9089 24df9a28 2023-07-08 jrick goto done;
9091 24df9a28 2023-07-08 jrick printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9092 24df9a28 2023-07-08 jrick printf("work tree base commit: %s\n", id_str);
9093 24df9a28 2023-07-08 jrick printf("work tree path prefix: %s\n",
9094 24df9a28 2023-07-08 jrick got_worktree_get_path_prefix(worktree));
9095 24df9a28 2023-07-08 jrick printf("work tree branch reference: %s\n",
9096 24df9a28 2023-07-08 jrick got_worktree_get_head_ref_name(worktree));
9097 24df9a28 2023-07-08 jrick printf("work tree UUID: %s\n", uuidstr);
9098 24df9a28 2023-07-08 jrick printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9100 24df9a28 2023-07-08 jrick if (show_files) {
9101 24df9a28 2023-07-08 jrick struct got_pathlist_entry *pe;
9102 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
9103 24df9a28 2023-07-08 jrick if (pe->path_len == 0)
9104 24df9a28 2023-07-08 jrick continue;
9106 24df9a28 2023-07-08 jrick * Assume this path will fail. This will be corrected
9107 24df9a28 2023-07-08 jrick * in print_path_info() in case the path does suceeed.
9109 24df9a28 2023-07-08 jrick pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
9111 24df9a28 2023-07-08 jrick error = got_worktree_path_info(worktree, &paths,
9112 24df9a28 2023-07-08 jrick print_path_info, &paths, check_cancelled, NULL);
9113 24df9a28 2023-07-08 jrick if (error)
9114 24df9a28 2023-07-08 jrick goto done;
9115 24df9a28 2023-07-08 jrick TAILQ_FOREACH(pe, &paths, entry) {
9116 24df9a28 2023-07-08 jrick if (pe->data != NULL) {
9117 24df9a28 2023-07-08 jrick const struct got_error *perr;
9119 24df9a28 2023-07-08 jrick perr = pe->data;
9120 24df9a28 2023-07-08 jrick error = got_error_fmt(perr->code, "%s",
9121 24df9a28 2023-07-08 jrick pe->path);
9127 24df9a28 2023-07-08 jrick if (worktree)
9128 24df9a28 2023-07-08 jrick got_worktree_close(worktree);
9129 24df9a28 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9130 24df9a28 2023-07-08 jrick free(cwd);
9131 24df9a28 2023-07-08 jrick free(id_str);
9132 24df9a28 2023-07-08 jrick free(uuidstr);
9133 24df9a28 2023-07-08 jrick return error;
