2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 93658fb9 2020-03-18 stsp * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
7 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
8 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
10 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 12463d8b 2019-12-13 stsp #include <fcntl.h>
28 12ce7a6c 2019-08-12 stsp #include <limits.h>
29 5c860e29 2018-03-12 stsp #include <locale.h>
30 818c7501 2019-07-11 stsp #include <ctype.h>
31 99437157 2018-11-11 stsp #include <signal.h>
32 5c860e29 2018-03-12 stsp #include <stdio.h>
33 5c860e29 2018-03-12 stsp #include <stdlib.h>
34 5c860e29 2018-03-12 stsp #include <string.h>
35 5c860e29 2018-03-12 stsp #include <unistd.h>
36 c09a553d 2018-03-12 stsp #include <libgen.h>
37 c0768b0f 2018-06-10 stsp #include <time.h>
38 33ad4cbe 2019-05-12 jcs #include <paths.h>
39 6841bf13 2019-11-29 kn #include <regex.h>
40 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 d2cdc636 2020-03-18 stsp #include <util.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 f42b1b34 2018-03-12 stsp #include "got_error.h"
45 f42b1b34 2018-03-12 stsp #include "got_object.h"
46 5261c201 2018-04-01 stsp #include "got_reference.h"
47 f42b1b34 2018-03-12 stsp #include "got_repository.h"
48 1dd54920 2019-05-11 stsp #include "got_path.h"
49 e6209546 2019-08-22 stsp #include "got_cancel.h"
50 c09a553d 2018-03-12 stsp #include "got_worktree.h"
51 79109fed 2018-03-27 stsp #include "got_diff.h"
52 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
53 6f23baec 2020-03-18 stsp #include "got_fetch.h"
54 404c43c4 2018-06-21 stsp #include "got_blame.h"
55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
58 5c860e29 2018-03-12 stsp #ifndef nitems
59 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
62 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
66 99437157 2018-11-11 stsp catch_sigint(int signo)
68 99437157 2018-11-11 stsp sigint_received = 1;
72 99437157 2018-11-11 stsp catch_sigpipe(int signo)
74 99437157 2018-11-11 stsp sigpipe_received = 1;
78 8cfb4057 2019-07-09 stsp struct got_cmd {
79 5c860e29 2018-03-12 stsp const char *cmd_name;
80 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
81 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
82 97b3a7be 2019-07-09 stsp const char *cmd_alias;
85 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
86 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
87 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
88 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
89 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
90 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
91 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
92 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
93 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
94 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
95 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
96 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
97 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
98 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
99 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
100 d00136be 2019-03-26 stsp __dead static void usage_add(void);
101 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
102 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
103 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
104 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
105 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
106 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
107 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
108 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
109 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
110 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
111 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
113 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
114 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
115 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
116 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
117 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
118 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
119 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
120 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
121 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
122 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
123 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
124 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
125 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
126 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
127 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
128 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
129 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
130 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
131 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
132 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
133 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
134 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
135 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
136 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
137 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
138 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
140 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
141 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
142 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
143 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
144 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
145 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
146 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
147 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
148 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
149 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
150 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
151 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
152 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
153 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
154 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
155 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
156 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
157 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
158 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
159 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
160 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
161 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
162 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
163 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
164 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
165 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
166 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
169 ce5b7c56 2019-07-09 stsp static void
170 ce5b7c56 2019-07-09 stsp list_commands(void)
174 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
175 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
176 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
177 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
179 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
183 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
185 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
186 5c860e29 2018-03-12 stsp unsigned int i;
188 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
189 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
190 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
191 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
194 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
196 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
197 5c860e29 2018-03-12 stsp switch (ch) {
205 ce5b7c56 2019-07-09 stsp usage(hflag);
206 5c860e29 2018-03-12 stsp /* NOTREACHED */
210 5c860e29 2018-03-12 stsp argc -= optind;
211 5c860e29 2018-03-12 stsp argv += optind;
212 1e70621d 2018-03-27 stsp optind = 0;
214 53ccebc2 2019-07-30 stsp if (Vflag) {
215 53ccebc2 2019-07-30 stsp got_version_print_str();
219 5c860e29 2018-03-12 stsp if (argc <= 0)
220 ce5b7c56 2019-07-09 stsp usage(hflag);
222 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
223 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
225 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
226 d7d4f210 2018-03-12 stsp const struct got_error *error;
228 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
230 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
231 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
235 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
237 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
238 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
239 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
240 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
241 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
242 70015d7a 2019-11-08 stsp !(sigint_received &&
243 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
244 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
251 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
252 ce5b7c56 2019-07-09 stsp list_commands();
256 4ed7e80c 2018-05-20 stsp __dead static void
257 ce5b7c56 2019-07-09 stsp usage(int hflag)
259 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
260 53ccebc2 2019-07-30 stsp getprogname());
262 ce5b7c56 2019-07-09 stsp list_commands();
266 0266afb7 2019-01-04 stsp static const struct got_error *
267 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
269 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
270 e2ba3d07 2019-05-13 stsp const char *editor;
272 8920fa04 2019-08-18 stsp *abspath = NULL;
274 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
275 e2ba3d07 2019-05-13 stsp if (editor == NULL)
276 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
278 0ee7065d 2019-05-13 stsp if (editor) {
279 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
281 0ee7065d 2019-05-13 stsp return err;
284 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
285 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
286 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
287 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
290 e2ba3d07 2019-05-13 stsp return NULL;
293 e2ba3d07 2019-05-13 stsp static const struct got_error *
294 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
295 c530dc23 2019-07-23 stsp const char *worktree_path)
297 163ce85a 2019-05-13 stsp const struct got_error *err;
299 37c06ea4 2019-07-15 stsp #ifdef PROFILE
300 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
301 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
303 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
304 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
306 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
307 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
309 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
310 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
312 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
313 163ce85a 2019-05-13 stsp if (err != NULL)
314 163ce85a 2019-05-13 stsp return err;
316 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
317 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
319 0266afb7 2019-01-04 stsp return NULL;
322 2c7829a4 2019-06-17 stsp __dead static void
323 2c7829a4 2019-06-17 stsp usage_init(void)
325 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
329 2c7829a4 2019-06-17 stsp static const struct got_error *
330 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
332 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
333 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
336 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
337 2c7829a4 2019-06-17 stsp switch (ch) {
339 2c7829a4 2019-06-17 stsp usage_init();
340 2c7829a4 2019-06-17 stsp /* NOTREACHED */
344 2c7829a4 2019-06-17 stsp argc -= optind;
345 2c7829a4 2019-06-17 stsp argv += optind;
347 2c7829a4 2019-06-17 stsp #ifndef PROFILE
348 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
349 2c7829a4 2019-06-17 stsp err(1, "pledge");
351 2c7829a4 2019-06-17 stsp if (argc != 1)
352 bc20e173 2019-06-17 stsp usage_init();
354 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
355 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
356 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
358 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
360 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
361 2c7829a4 2019-06-17 stsp if (error &&
362 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
365 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
369 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
371 3ce1b845 2019-07-15 stsp free(repo_path);
372 3ce1b845 2019-07-15 stsp return error;
375 3ce1b845 2019-07-15 stsp __dead static void
376 3ce1b845 2019-07-15 stsp usage_import(void)
378 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
379 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
384 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
387 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
388 3ce1b845 2019-07-15 stsp int st = -1;
390 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
391 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
392 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
394 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
396 3ce1b845 2019-07-15 stsp goto doneediting;
398 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
399 3ce1b845 2019-07-15 stsp _exit(127);
402 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
403 3ce1b845 2019-07-15 stsp if (errno != EINTR)
406 3ce1b845 2019-07-15 stsp doneediting:
407 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
408 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
409 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
411 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
412 3ce1b845 2019-07-15 stsp errno = EINTR;
416 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
419 3ce1b845 2019-07-15 stsp static const struct got_error *
420 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
421 3ce1b845 2019-07-15 stsp const char *initial_content)
423 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
424 3ce1b845 2019-07-15 stsp char buf[1024];
425 3ce1b845 2019-07-15 stsp struct stat st, st2;
427 3ce1b845 2019-07-15 stsp int content_changed = 0;
428 3ce1b845 2019-07-15 stsp size_t len;
430 3ce1b845 2019-07-15 stsp *logmsg = NULL;
432 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
433 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
435 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
438 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
439 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
441 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
442 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
443 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
445 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
446 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
447 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
448 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
451 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
452 3ce1b845 2019-07-15 stsp if (fp == NULL) {
453 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
456 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
457 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
458 3ce1b845 2019-07-15 stsp content_changed = 1;
459 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
460 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
461 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
463 3ce1b845 2019-07-15 stsp fclose(fp);
465 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
466 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
470 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
471 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
475 3ce1b845 2019-07-15 stsp free(*logmsg);
476 3ce1b845 2019-07-15 stsp *logmsg = NULL;
478 3ce1b845 2019-07-15 stsp return err;
481 3ce1b845 2019-07-15 stsp static const struct got_error *
482 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
483 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
485 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
486 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
489 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
490 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
491 3ce1b845 2019-07-15 stsp branch_name) == -1)
492 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
494 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
495 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
499 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
502 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
504 3ce1b845 2019-07-15 stsp free(initial_content);
505 3ce1b845 2019-07-15 stsp return err;
508 3ce1b845 2019-07-15 stsp static const struct got_error *
509 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
511 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
512 3ce1b845 2019-07-15 stsp return NULL;
515 3ce1b845 2019-07-15 stsp static const struct got_error *
516 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
518 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
519 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
521 84792843 2019-08-09 stsp *author = NULL;
523 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
524 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
525 c9956ddf 2019-09-08 stsp if (name && email) {
526 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
527 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
528 aba9c984 2019-09-08 stsp return NULL;
531 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
532 84792843 2019-08-09 stsp if (got_author == NULL) {
533 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
534 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
535 c9956ddf 2019-09-08 stsp if (name && email) {
536 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
537 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
538 c9956ddf 2019-09-08 stsp return NULL;
540 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
541 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
544 aba9c984 2019-09-08 stsp *author = strdup(got_author);
545 aba9c984 2019-09-08 stsp if (*author == NULL)
546 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
549 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
550 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
552 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
553 84792843 2019-08-09 stsp got_author++;
554 aba9c984 2019-09-08 stsp if (*got_author != '<') {
555 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
559 84792843 2019-08-09 stsp got_author++;
560 aba9c984 2019-09-08 stsp if (*got_author != '@') {
561 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
564 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
565 84792843 2019-08-09 stsp got_author++;
566 84792843 2019-08-09 stsp if (*got_author != '>')
567 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
570 aba9c984 2019-09-08 stsp free(*author);
571 aba9c984 2019-09-08 stsp *author = NULL;
573 aba9c984 2019-09-08 stsp return err;
576 c9956ddf 2019-09-08 stsp static const struct got_error *
577 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
579 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
581 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
582 c9956ddf 2019-09-08 stsp if (homedir) {
583 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
584 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
587 c9956ddf 2019-09-08 stsp return NULL;
590 84792843 2019-08-09 stsp static const struct got_error *
591 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
593 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
594 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
595 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
596 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
597 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
598 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
599 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
600 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
602 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
603 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
604 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
606 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
608 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
609 3ce1b845 2019-07-15 stsp switch (ch) {
611 3ce1b845 2019-07-15 stsp branch_name = optarg;
614 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
615 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
616 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
621 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
622 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
623 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
629 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
631 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
637 b2b65d18 2019-08-22 stsp usage_import();
638 3ce1b845 2019-07-15 stsp /* NOTREACHED */
642 3ce1b845 2019-07-15 stsp argc -= optind;
643 3ce1b845 2019-07-15 stsp argv += optind;
645 3ce1b845 2019-07-15 stsp #ifndef PROFILE
646 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
648 3ce1b845 2019-07-15 stsp NULL) == -1)
649 3ce1b845 2019-07-15 stsp err(1, "pledge");
651 3ce1b845 2019-07-15 stsp if (argc != 1)
652 3ce1b845 2019-07-15 stsp usage_import();
654 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
655 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
656 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
657 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
659 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
660 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
663 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
667 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
669 aba9c984 2019-09-08 stsp return error;
672 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
673 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
674 e560b7e0 2019-11-28 stsp * an unintended typo.
676 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
677 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
679 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
680 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
684 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
685 3ce1b845 2019-07-15 stsp if (error) {
686 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
689 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
690 3ce1b845 2019-07-15 stsp "import target branch already exists");
694 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
695 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
696 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
699 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
702 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
703 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
705 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
706 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
709 8e158b01 2019-09-22 stsp free(logmsg);
710 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
711 ef293bdd 2019-10-21 stsp path_dir, refname);
712 ef293bdd 2019-10-21 stsp if (error) {
713 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
714 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
715 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
720 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
721 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
722 ef293bdd 2019-10-21 stsp if (logmsg_path)
723 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
727 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
728 ef293bdd 2019-10-21 stsp if (error) {
729 ef293bdd 2019-10-21 stsp if (logmsg_path)
730 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
734 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
735 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
736 ef293bdd 2019-10-21 stsp if (error) {
737 ef293bdd 2019-10-21 stsp if (logmsg_path)
738 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
742 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
743 ef293bdd 2019-10-21 stsp if (error) {
744 ef293bdd 2019-10-21 stsp if (logmsg_path)
745 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
749 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
750 ef293bdd 2019-10-21 stsp if (error) {
751 ef293bdd 2019-10-21 stsp if (logmsg_path)
752 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
756 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
757 ef293bdd 2019-10-21 stsp if (error) {
758 ef293bdd 2019-10-21 stsp if (logmsg_path)
759 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
763 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
764 3ce1b845 2019-07-15 stsp if (error) {
765 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
766 ef293bdd 2019-10-21 stsp if (logmsg_path)
767 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
771 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
772 3ce1b845 2019-07-15 stsp branch_ref);
773 ef293bdd 2019-10-21 stsp if (error) {
774 ef293bdd 2019-10-21 stsp if (logmsg_path)
775 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
779 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
780 ef293bdd 2019-10-21 stsp if (error) {
781 ef293bdd 2019-10-21 stsp if (logmsg_path)
782 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
787 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
788 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
790 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
791 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
792 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
793 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
794 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
795 8e158b01 2019-09-22 stsp free(logmsg);
796 ef293bdd 2019-10-21 stsp free(logmsg_path);
797 2c7829a4 2019-06-17 stsp free(repo_path);
798 3ce1b845 2019-07-15 stsp free(editor);
799 3ce1b845 2019-07-15 stsp free(refname);
800 3ce1b845 2019-07-15 stsp free(new_commit_id);
801 3ce1b845 2019-07-15 stsp free(id_str);
802 aba9c984 2019-09-08 stsp free(author);
803 c9956ddf 2019-09-08 stsp free(gitconfig_path);
804 3ce1b845 2019-07-15 stsp if (branch_ref)
805 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
806 3ce1b845 2019-07-15 stsp if (head_ref)
807 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
808 2c7829a4 2019-06-17 stsp return error;
811 93658fb9 2020-03-18 stsp __dead static void
812 93658fb9 2020-03-18 stsp usage_clone(void)
814 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
815 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
819 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
820 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
821 892ac3b6 2020-03-18 stsp int last_p_indexed;
822 892ac3b6 2020-03-18 stsp int last_p_resolved;
823 68999b92 2020-03-18 stsp int verbosity;
826 93658fb9 2020-03-18 stsp static const struct got_error *
827 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
828 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
830 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
831 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
832 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
833 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
835 68999b92 2020-03-18 stsp if (a->verbosity < 0)
836 68999b92 2020-03-18 stsp return NULL;
838 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
839 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
840 892ac3b6 2020-03-18 stsp fflush(stdout);
841 12d1281e 2020-03-19 stsp return NULL;
844 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
845 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
846 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
847 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
848 892ac3b6 2020-03-18 stsp print_size = 1;
849 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
850 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
851 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
853 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
854 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
855 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
856 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
857 892ac3b6 2020-03-18 stsp print_indexed = 1;
858 892ac3b6 2020-03-18 stsp print_size = 1;
861 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
862 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
863 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
864 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
865 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
866 892ac3b6 2020-03-18 stsp print_resolved = 1;
867 892ac3b6 2020-03-18 stsp print_indexed = 1;
868 892ac3b6 2020-03-18 stsp print_size = 1;
873 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
874 892ac3b6 2020-03-18 stsp printf("\r");
875 892ac3b6 2020-03-18 stsp if (print_size)
876 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
877 d715f13e 2020-03-19 stsp if (print_indexed)
878 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
879 d715f13e 2020-03-19 stsp if (print_resolved)
880 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
881 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
882 892ac3b6 2020-03-18 stsp fflush(stdout);
884 531c3985 2020-03-18 stsp return NULL;
887 531c3985 2020-03-18 stsp static const struct got_error *
888 f298ae0f 2020-03-25 stsp create_symref(const char *refname, struct got_reference *target_ref,
889 f298ae0f 2020-03-25 stsp int verbosity, struct got_repository *repo)
891 4ba14133 2020-03-20 stsp const struct got_error *err;
892 4ba14133 2020-03-20 stsp struct got_reference *head_symref;
894 f298ae0f 2020-03-25 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
896 4ba14133 2020-03-20 stsp return err;
898 4ba14133 2020-03-20 stsp err = got_ref_write(head_symref, repo);
899 4ba14133 2020-03-20 stsp got_ref_close(head_symref);
900 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
901 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
902 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
904 4ba14133 2020-03-20 stsp return err;
907 4ba14133 2020-03-20 stsp static const struct got_error *
908 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
909 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
911 41b0de12 2020-03-21 stsp const struct got_error *err;
912 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
914 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
915 41b0de12 2020-03-21 stsp const char *refname = pe->path;
916 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
918 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
921 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
922 41b0de12 2020-03-21 stsp const char *refname = pe->path;
923 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
924 41b0de12 2020-03-21 stsp char *id_str;
926 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
928 41b0de12 2020-03-21 stsp return err;
929 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
930 41b0de12 2020-03-21 stsp free(id_str);
933 41b0de12 2020-03-21 stsp return NULL;
936 6338a6a1 2020-03-21 stsp static const struct got_error *
937 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
938 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
940 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
941 6338a6a1 2020-03-21 stsp struct got_reference *ref;
942 6338a6a1 2020-03-21 stsp char *id_str;
944 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
946 6338a6a1 2020-03-21 stsp return err;
948 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
952 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
953 6338a6a1 2020-03-21 stsp got_ref_close(ref);
955 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
956 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
958 6338a6a1 2020-03-21 stsp free(id_str);
959 6338a6a1 2020-03-21 stsp return err;
963 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
965 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
967 0e4002ca 2020-03-21 stsp refname += 5;
970 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
971 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
973 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
975 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
978 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
979 0e4002ca 2020-03-21 stsp wanted_ref += 5;
981 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
982 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
985 0e4002ca 2020-03-21 stsp /* Allow exact match. */
986 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
990 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
992 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
994 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
995 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1002 41b0de12 2020-03-21 stsp static const struct got_error *
1003 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1004 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1006 0e4002ca 2020-03-21 stsp const struct got_error *err;
1007 0e4002ca 2020-03-21 stsp char *remote_refname;
1009 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1010 0e4002ca 2020-03-21 stsp refname += 5;
1012 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1013 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1014 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1016 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1017 0e4002ca 2020-03-21 stsp free(remote_refname);
1018 0e4002ca 2020-03-21 stsp return err;
1021 0e4002ca 2020-03-21 stsp static const struct got_error *
1022 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1024 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1025 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1026 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1027 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1028 bb64b798 2020-03-18 stsp const char *repo_path;
1029 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1030 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1031 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1032 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1033 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1034 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1035 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1036 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1037 b46f3e71 2020-03-18 stsp char *gitconfig_path = NULL;
1038 b46f3e71 2020-03-18 stsp char *gitconfig = NULL;
1039 b46f3e71 2020-03-18 stsp FILE *gitconfig_file = NULL;
1040 b46f3e71 2020-03-18 stsp ssize_t n;
1041 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1042 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1043 659e7fbd 2020-03-20 stsp struct got_reference *head_symref = NULL;
1045 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1046 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1047 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1048 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1050 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1051 93658fb9 2020-03-18 stsp switch (ch) {
1053 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1056 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1057 4ba14133 2020-03-20 stsp optarg, NULL);
1058 4ba14133 2020-03-20 stsp if (error)
1059 4ba14133 2020-03-20 stsp return error;
1062 41b0de12 2020-03-21 stsp list_refs_only = 1;
1065 469dd726 2020-03-20 stsp mirror_references = 1;
1068 68999b92 2020-03-18 stsp if (verbosity < 0)
1069 68999b92 2020-03-18 stsp verbosity = 0;
1070 68999b92 2020-03-18 stsp else if (verbosity < 3)
1071 68999b92 2020-03-18 stsp verbosity++;
1074 68999b92 2020-03-18 stsp verbosity = -1;
1077 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1078 0e4002ca 2020-03-21 stsp optarg, NULL);
1079 0e4002ca 2020-03-21 stsp if (error)
1080 0e4002ca 2020-03-21 stsp return error;
1083 93658fb9 2020-03-18 stsp usage_clone();
1087 93658fb9 2020-03-18 stsp argc -= optind;
1088 93658fb9 2020-03-18 stsp argv += optind;
1090 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1091 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1092 41b0de12 2020-03-21 stsp if (list_refs_only) {
1093 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1094 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1095 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1096 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1097 41b0de12 2020-03-21 stsp if (mirror_references)
1098 41b0de12 2020-03-21 stsp errx(1, "-l and -m options are mutually exclusive");
1099 41b0de12 2020-03-21 stsp if (verbosity == -1)
1100 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1101 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1102 0e4002ca 2020-03-21 stsp errx(1, "-l and -R options are mutually exclusive");
1105 93658fb9 2020-03-18 stsp uri = argv[0];
1107 9df6f38b 2020-03-18 stsp if (argc == 1)
1108 93658fb9 2020-03-18 stsp dirname = NULL;
1109 9df6f38b 2020-03-18 stsp else if (argc == 2)
1110 93658fb9 2020-03-18 stsp dirname = argv[1];
1112 93658fb9 2020-03-18 stsp usage_clone();
1114 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1115 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1116 39c64a6a 2020-03-18 stsp if (error)
1117 09f63084 2020-03-20 stsp goto done;
1119 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1120 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1121 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1122 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1123 09838ffc 2020-03-18 stsp goto done;
1126 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1127 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1128 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1129 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1130 39c64a6a 2020-03-18 stsp err(1, "pledge");
1132 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1133 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1134 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1135 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1136 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1137 39c64a6a 2020-03-18 stsp err(1, "pledge");
1139 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1140 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1141 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1142 39c64a6a 2020-03-18 stsp goto done;
1144 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1145 39c64a6a 2020-03-18 stsp goto done;
1147 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1148 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1149 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1150 bb64b798 2020-03-18 stsp goto done;
1152 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1154 bb64b798 2020-03-18 stsp repo_path = dirname;
1156 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1157 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1158 41b0de12 2020-03-21 stsp if (error)
1159 41b0de12 2020-03-21 stsp goto done;
1161 41b0de12 2020-03-21 stsp error = got_repo_init(repo_path);
1162 41b0de12 2020-03-21 stsp if (error)
1163 41b0de12 2020-03-21 stsp goto done;
1164 41b0de12 2020-03-21 stsp error = got_repo_open(&repo, repo_path, NULL);
1165 41b0de12 2020-03-21 stsp if (error)
1166 41b0de12 2020-03-21 stsp goto done;
1169 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1170 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1171 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1172 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1173 ee448f5f 2020-03-18 stsp goto done;
1176 41b0de12 2020-03-21 stsp error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1177 ee448f5f 2020-03-18 stsp if (error)
1178 ee448f5f 2020-03-18 stsp goto done;
1180 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1181 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1182 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1184 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1185 9c52365f 2020-03-21 stsp server_path, verbosity);
1186 39c64a6a 2020-03-18 stsp if (error)
1187 bb64b798 2020-03-18 stsp goto done;
1189 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1190 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1191 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1192 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1193 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1194 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1195 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1196 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1197 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1198 39c64a6a 2020-03-18 stsp if (error)
1199 d9b4d0c0 2020-03-18 stsp goto done;
1201 41b0de12 2020-03-21 stsp if (list_refs_only) {
1202 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1203 41b0de12 2020-03-21 stsp goto done;
1206 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1207 39c64a6a 2020-03-18 stsp if (error)
1208 d9b4d0c0 2020-03-18 stsp goto done;
1209 68999b92 2020-03-18 stsp if (verbosity >= 0)
1210 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1211 d9b4d0c0 2020-03-18 stsp free(id_str);
1213 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1214 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1215 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1216 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1217 7ebc0570 2020-03-18 stsp char *remote_refname;
1219 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1220 0e4002ca 2020-03-21 stsp !mirror_references) {
1221 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1222 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1223 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1224 0e4002ca 2020-03-21 stsp if (error)
1225 0e4002ca 2020-03-21 stsp goto done;
1229 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1230 39c64a6a 2020-03-18 stsp if (error)
1231 d9b4d0c0 2020-03-18 stsp goto done;
1233 469dd726 2020-03-20 stsp if (mirror_references)
1236 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1239 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1240 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1241 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1242 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1243 7ebc0570 2020-03-18 stsp goto done;
1245 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1246 f298ae0f 2020-03-25 stsp free(remote_refname);
1247 39c64a6a 2020-03-18 stsp if (error)
1248 d9b4d0c0 2020-03-18 stsp goto done;
1251 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1252 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1253 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1254 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1255 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1256 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1258 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1261 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1262 39c64a6a 2020-03-18 stsp if (error) {
1263 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1264 55330abe 2020-03-20 stsp error = NULL;
1267 d9b4d0c0 2020-03-18 stsp goto done;
1270 f298ae0f 2020-03-25 stsp error = create_symref(refname, target_ref, verbosity, repo);
1271 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1272 f298ae0f 2020-03-25 stsp if (error)
1273 f298ae0f 2020-03-25 stsp goto done;
1275 f298ae0f 2020-03-25 stsp if (mirror_references)
1278 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1281 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1282 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1283 f298ae0f 2020-03-25 stsp refname) == -1) {
1284 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1285 f298ae0f 2020-03-25 stsp goto done;
1287 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1288 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1289 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1290 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1291 f298ae0f 2020-03-25 stsp free(remote_refname);
1292 f298ae0f 2020-03-25 stsp goto done;
1294 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1295 f298ae0f 2020-03-25 stsp if (error) {
1296 f298ae0f 2020-03-25 stsp free(remote_refname);
1297 f298ae0f 2020-03-25 stsp free(remote_target);
1298 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1299 f298ae0f 2020-03-25 stsp error = NULL;
1302 f298ae0f 2020-03-25 stsp goto done;
1304 f298ae0f 2020-03-25 stsp error = create_symref(remote_refname, target_ref,
1305 f298ae0f 2020-03-25 stsp verbosity - 1, repo);
1306 f298ae0f 2020-03-25 stsp free(remote_refname);
1307 f298ae0f 2020-03-25 stsp free(remote_target);
1308 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1309 39c64a6a 2020-03-18 stsp if (error)
1310 d9b4d0c0 2020-03-18 stsp goto done;
1312 4ba14133 2020-03-20 stsp if (pe == NULL) {
1314 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1315 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1316 4ba14133 2020-03-20 stsp * which could be fetched instead.
1318 4ba14133 2020-03-20 stsp TAILQ_FOREACH(pe, &wanted_branches, entry) {
1319 4ba14133 2020-03-20 stsp const char *target = pe->path;
1320 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1322 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1323 4ba14133 2020-03-20 stsp if (error) {
1324 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1325 4ba14133 2020-03-20 stsp error = NULL;
1328 4ba14133 2020-03-20 stsp goto done;
1331 f298ae0f 2020-03-25 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1332 f298ae0f 2020-03-25 stsp verbosity, repo);
1333 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1334 4ba14133 2020-03-20 stsp if (error)
1335 4ba14133 2020-03-20 stsp goto done;
1340 659e7fbd 2020-03-20 stsp /* Create a config file git-fetch(1) can understand. */
1341 659e7fbd 2020-03-20 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1342 659e7fbd 2020-03-20 stsp if (gitconfig_path == NULL) {
1343 659e7fbd 2020-03-20 stsp error = got_error_from_errno("got_repo_get_path_gitconfig");
1344 659e7fbd 2020-03-20 stsp goto done;
1346 659e7fbd 2020-03-20 stsp gitconfig_file = fopen(gitconfig_path, "a");
1347 659e7fbd 2020-03-20 stsp if (gitconfig_file == NULL) {
1348 659e7fbd 2020-03-20 stsp error = got_error_from_errno2("fopen", gitconfig_path);
1349 659e7fbd 2020-03-20 stsp goto done;
1351 659e7fbd 2020-03-20 stsp if (mirror_references) {
1352 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1353 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1354 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1355 8ceee112 2020-03-20 stsp "\tfetch = +refs/*:refs/*\n"
1356 659e7fbd 2020-03-20 stsp "\tmirror = true\n",
1357 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1358 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1359 659e7fbd 2020-03-20 stsp goto done;
1361 659e7fbd 2020-03-20 stsp } else if (fetch_all_branches) {
1362 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1363 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1364 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1365 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1366 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1367 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1368 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1369 659e7fbd 2020-03-20 stsp goto done;
1372 659e7fbd 2020-03-20 stsp const char *branchname;
1375 659e7fbd 2020-03-20 stsp * If the server specified a default branch, use just that one.
1376 659e7fbd 2020-03-20 stsp * Otherwise fall back to fetching all branches on next fetch.
1378 659e7fbd 2020-03-20 stsp if (head_symref) {
1379 659e7fbd 2020-03-20 stsp branchname = got_ref_get_symref_target(head_symref);
1380 659e7fbd 2020-03-20 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1381 659e7fbd 2020-03-20 stsp branchname += 11;
1383 659e7fbd 2020-03-20 stsp branchname = "*"; /* fall back to all branches */
1384 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1385 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1386 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1387 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1388 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1389 659e7fbd 2020-03-20 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1390 659e7fbd 2020-03-20 stsp branchname) == -1) {
1391 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1392 659e7fbd 2020-03-20 stsp goto done;
1395 659e7fbd 2020-03-20 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1396 659e7fbd 2020-03-20 stsp if (n != strlen(gitconfig)) {
1397 659e7fbd 2020-03-20 stsp error = got_ferror(gitconfig_file, GOT_ERR_IO);
1398 659e7fbd 2020-03-20 stsp goto done;
1401 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1402 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1403 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1405 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1406 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1407 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1408 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1409 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1411 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1412 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1413 b46f3e71 2020-03-18 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1414 b46f3e71 2020-03-18 stsp error = got_error_from_errno("fclose");
1416 bb64b798 2020-03-18 stsp got_repo_close(repo);
1417 659e7fbd 2020-03-20 stsp if (head_symref)
1418 659e7fbd 2020-03-20 stsp got_ref_close(head_symref);
1419 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1420 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1421 d9b4d0c0 2020-03-18 stsp free(pe->data);
1423 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1424 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1425 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1426 d9b4d0c0 2020-03-18 stsp free(pe->data);
1428 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1429 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1430 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1431 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1432 09838ffc 2020-03-18 stsp free(proto);
1433 09838ffc 2020-03-18 stsp free(host);
1434 09838ffc 2020-03-18 stsp free(port);
1435 09838ffc 2020-03-18 stsp free(server_path);
1436 09838ffc 2020-03-18 stsp free(repo_name);
1437 bb64b798 2020-03-18 stsp free(default_destdir);
1438 b46f3e71 2020-03-18 stsp free(gitconfig_path);
1439 b46f3e71 2020-03-18 stsp free(git_url);
1440 39c64a6a 2020-03-18 stsp return error;
1443 7848a0e1 2020-03-19 stsp static const struct got_error *
1444 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1445 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1447 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1448 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1449 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1451 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1453 7848a0e1 2020-03-19 stsp goto done;
1455 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1456 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1457 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1459 88609724 2020-03-21 stsp goto done;
1460 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1461 88609724 2020-03-21 stsp goto done;
1462 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1463 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1464 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1466 db6d8ad8 2020-03-21 stsp goto done;
1469 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1470 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1471 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1472 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1473 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1475 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1477 7848a0e1 2020-03-19 stsp goto done;
1478 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1480 e8a967e0 2020-03-21 stsp goto done;
1482 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1484 7848a0e1 2020-03-19 stsp goto done;
1485 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1486 6338a6a1 2020-03-21 stsp goto done;
1488 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1490 6338a6a1 2020-03-21 stsp goto done;
1491 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1493 6338a6a1 2020-03-21 stsp goto done;
1496 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1497 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(ref),
1498 6338a6a1 2020-03-21 stsp new_id_str);
1500 7848a0e1 2020-03-19 stsp free(old_id);
1501 7848a0e1 2020-03-19 stsp free(new_id_str);
1502 7848a0e1 2020-03-19 stsp return err;
1505 f1bcca34 2020-03-25 stsp static const struct got_error *
1506 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1507 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1509 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1510 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1511 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1513 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1514 bcf34b0e 2020-03-26 stsp if (err) {
1515 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1516 bcf34b0e 2020-03-26 stsp return err;
1517 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1519 bcf34b0e 2020-03-26 stsp goto done;
1521 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1523 bcf34b0e 2020-03-26 stsp goto done;
1525 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1526 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1527 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1528 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1530 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1532 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1533 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1534 bcf34b0e 2020-03-26 stsp goto done;
1536 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1537 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1539 bcf34b0e 2020-03-26 stsp goto done;
1541 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1543 bcf34b0e 2020-03-26 stsp goto done;
1545 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1546 f4d0e3fb 2020-05-15 stsp printf("Updated %s: %s\n", got_ref_get_name(symref),
1547 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1551 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1552 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1553 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1554 bcf34b0e 2020-03-26 stsp err = unlock_err;
1556 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1557 f1bcca34 2020-03-25 stsp return err;
1560 2ab43947 2020-03-18 stsp __dead static void
1561 7848a0e1 2020-03-19 stsp usage_fetch(void)
1563 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1564 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1565 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1566 13f12b09 2020-03-21 stsp getprogname());
1570 7848a0e1 2020-03-19 stsp static const struct got_error *
1571 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1572 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1574 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1575 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1576 3789fd73 2020-03-26 stsp char *id_str = NULL;
1578 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1579 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1581 3789fd73 2020-03-26 stsp return err;
1582 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1583 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1584 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1585 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1588 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1590 3789fd73 2020-03-26 stsp return err;
1591 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1593 3789fd73 2020-03-26 stsp goto done;
1595 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1597 3789fd73 2020-03-26 stsp goto done;
1598 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1599 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1600 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1605 3789fd73 2020-03-26 stsp free(id_str);
1606 3789fd73 2020-03-26 stsp return NULL;
1609 3789fd73 2020-03-26 stsp static const struct got_error *
1610 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1611 3789fd73 2020-03-26 stsp struct got_pathlist_head *their_symrefs, struct got_remote_repo *remote,
1612 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1614 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
1615 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1616 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1617 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1618 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
1619 3789fd73 2020-03-26 stsp char *local_refname = NULL;
1621 f21ec2f0 2020-03-21 stsp SIMPLEQ_INIT(&my_refs);
1623 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1625 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
1627 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1629 3789fd73 2020-03-26 stsp goto done;
1631 f21ec2f0 2020-03-21 stsp SIMPLEQ_FOREACH(re, &my_refs, entry) {
1632 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1634 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
1635 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
1636 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
1637 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
1638 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
1640 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
1641 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
1642 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
1643 3789fd73 2020-03-26 stsp goto done;
1645 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
1649 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1650 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1653 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1656 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
1657 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1660 3789fd73 2020-03-26 stsp if (pe != NULL)
1663 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
1667 3789fd73 2020-03-26 stsp if (local_refname) {
1668 3789fd73 2020-03-26 stsp struct got_reference *ref;
1669 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
1670 3789fd73 2020-03-26 stsp if (err) {
1671 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1673 3789fd73 2020-03-26 stsp free(local_refname);
1674 3789fd73 2020-03-26 stsp local_refname = NULL;
1677 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
1680 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
1681 3789fd73 2020-03-26 stsp got_ref_close(ref);
1682 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
1683 3789fd73 2020-03-26 stsp err = unlock_err;
1687 3789fd73 2020-03-26 stsp free(local_refname);
1688 3789fd73 2020-03-26 stsp local_refname = NULL;
1692 3789fd73 2020-03-26 stsp free(remote_namespace);
1693 3789fd73 2020-03-26 stsp free(local_refname);
1694 0e4002ca 2020-03-21 stsp return err;
1697 0e4002ca 2020-03-21 stsp static const struct got_error *
1698 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1699 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1701 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1702 0e4002ca 2020-03-21 stsp char *remote_refname;
1703 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1705 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1706 0e4002ca 2020-03-21 stsp refname += 5;
1708 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1709 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1710 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1712 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1713 0e4002ca 2020-03-21 stsp if (err) {
1714 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1715 0e4002ca 2020-03-21 stsp goto done;
1716 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1718 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1719 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1720 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1721 9f142382 2020-03-21 stsp err = unlock_err;
1722 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1725 0e4002ca 2020-03-21 stsp free(remote_refname);
1726 f21ec2f0 2020-03-21 stsp return err;
1729 f21ec2f0 2020-03-21 stsp static const struct got_error *
1730 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1732 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1733 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1734 7848a0e1 2020-03-19 stsp const char *remote_name;
1735 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1736 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
1737 7848a0e1 2020-03-19 stsp struct got_remote_repo *remotes, *remote = NULL;
1738 7848a0e1 2020-03-19 stsp int nremotes;
1739 7848a0e1 2020-03-19 stsp char *id_str = NULL;
1740 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
1741 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
1742 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1743 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
1744 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
1745 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
1746 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1747 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
1748 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1749 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
1751 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
1752 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
1753 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1754 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1756 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1757 7848a0e1 2020-03-19 stsp switch (ch) {
1759 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1762 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1763 4ba14133 2020-03-20 stsp optarg, NULL);
1764 4ba14133 2020-03-20 stsp if (error)
1765 4ba14133 2020-03-20 stsp return error;
1768 f21ec2f0 2020-03-21 stsp delete_refs = 1;
1771 41b0de12 2020-03-21 stsp list_refs_only = 1;
1774 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
1775 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1776 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
1778 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
1781 db6d8ad8 2020-03-21 stsp replace_tags = 1;
1784 7848a0e1 2020-03-19 stsp if (verbosity < 0)
1785 7848a0e1 2020-03-19 stsp verbosity = 0;
1786 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
1787 7848a0e1 2020-03-19 stsp verbosity++;
1790 7848a0e1 2020-03-19 stsp verbosity = -1;
1793 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1794 0e4002ca 2020-03-21 stsp optarg, NULL);
1795 0e4002ca 2020-03-21 stsp if (error)
1796 0e4002ca 2020-03-21 stsp return error;
1799 7848a0e1 2020-03-19 stsp usage_fetch();
1803 7848a0e1 2020-03-19 stsp argc -= optind;
1804 7848a0e1 2020-03-19 stsp argv += optind;
1806 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1807 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1808 41b0de12 2020-03-21 stsp if (list_refs_only) {
1809 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1810 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1811 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1812 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1813 f21ec2f0 2020-03-21 stsp if (delete_refs)
1814 f21ec2f0 2020-03-21 stsp errx(1, "-l and -d options are mutually exclusive");
1815 41b0de12 2020-03-21 stsp if (verbosity == -1)
1816 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1819 7848a0e1 2020-03-19 stsp if (argc == 0)
1820 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1821 7848a0e1 2020-03-19 stsp else if (argc == 1)
1822 7848a0e1 2020-03-19 stsp remote_name = argv[0];
1824 7848a0e1 2020-03-19 stsp usage_fetch();
1826 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
1827 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
1828 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
1829 7848a0e1 2020-03-19 stsp goto done;
1832 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1833 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
1834 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1835 7848a0e1 2020-03-19 stsp goto done;
1837 7848a0e1 2020-03-19 stsp error = NULL;
1838 7848a0e1 2020-03-19 stsp if (worktree) {
1839 7848a0e1 2020-03-19 stsp repo_path =
1840 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
1841 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1842 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1843 7848a0e1 2020-03-19 stsp if (error)
1844 7848a0e1 2020-03-19 stsp goto done;
1846 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
1847 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1848 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1849 7848a0e1 2020-03-19 stsp goto done;
1854 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
1855 7848a0e1 2020-03-19 stsp if (error)
1856 7848a0e1 2020-03-19 stsp goto done;
1858 7848a0e1 2020-03-19 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1859 7848a0e1 2020-03-19 stsp for (i = 0; i < nremotes; i++) {
1860 7848a0e1 2020-03-19 stsp remote = &remotes[i];
1861 7848a0e1 2020-03-19 stsp if (strcmp(remote->name, remote_name) == 0)
1864 7848a0e1 2020-03-19 stsp if (i == nremotes) {
1865 7848a0e1 2020-03-19 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1866 7848a0e1 2020-03-19 stsp goto done;
1869 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1870 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
1871 7848a0e1 2020-03-19 stsp if (error)
1872 7848a0e1 2020-03-19 stsp goto done;
1874 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
1875 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1876 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1877 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
1878 7848a0e1 2020-03-19 stsp err(1, "pledge");
1880 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1881 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
1882 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1883 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1884 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
1885 7848a0e1 2020-03-19 stsp err(1, "pledge");
1887 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
1888 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
1889 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1890 7848a0e1 2020-03-19 stsp goto done;
1892 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1893 7848a0e1 2020-03-19 stsp goto done;
1896 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1897 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1898 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
1899 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
1900 7848a0e1 2020-03-19 stsp goto done;
1903 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
1904 7848a0e1 2020-03-19 stsp if (error)
1905 7848a0e1 2020-03-19 stsp goto done;
1907 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1908 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
1909 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1911 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1912 9c52365f 2020-03-21 stsp server_path, verbosity);
1913 7848a0e1 2020-03-19 stsp if (error)
1914 7848a0e1 2020-03-19 stsp goto done;
1916 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
1917 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
1918 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
1919 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
1920 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
1921 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
1922 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
1923 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1924 7848a0e1 2020-03-19 stsp if (error)
1925 7848a0e1 2020-03-19 stsp goto done;
1927 41b0de12 2020-03-21 stsp if (list_refs_only) {
1928 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1929 41b0de12 2020-03-21 stsp goto done;
1932 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
1933 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
1934 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
1935 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
1936 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
1937 984065c8 2020-03-19 stsp if (error)
1938 984065c8 2020-03-19 stsp goto done;
1939 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1940 984065c8 2020-03-19 stsp free(id_str);
1941 984065c8 2020-03-19 stsp id_str = NULL;
1944 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
1945 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
1946 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
1947 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
1948 7848a0e1 2020-03-19 stsp struct got_reference *ref;
1949 7848a0e1 2020-03-19 stsp char *remote_refname;
1951 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1952 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
1953 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
1954 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
1955 0e4002ca 2020-03-21 stsp if (error)
1956 0e4002ca 2020-03-21 stsp goto done;
1960 1510c839 2020-03-20 stsp if (remote->mirror_references ||
1961 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
1962 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
1963 7848a0e1 2020-03-19 stsp if (error) {
1964 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1965 7848a0e1 2020-03-19 stsp goto done;
1966 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
1968 7848a0e1 2020-03-19 stsp if (error)
1969 7848a0e1 2020-03-19 stsp goto done;
1971 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1972 db6d8ad8 2020-03-21 stsp verbosity, repo);
1973 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1974 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
1975 9f142382 2020-03-21 stsp error = unlock_err;
1976 7848a0e1 2020-03-19 stsp got_ref_close(ref);
1977 7848a0e1 2020-03-19 stsp if (error)
1978 7848a0e1 2020-03-19 stsp goto done;
1980 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
1981 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1982 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
1983 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
1984 7848a0e1 2020-03-19 stsp goto done;
1987 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
1988 7848a0e1 2020-03-19 stsp if (error) {
1989 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1990 7848a0e1 2020-03-19 stsp goto done;
1991 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
1992 688f11b3 2020-03-21 stsp verbosity, repo);
1993 7848a0e1 2020-03-19 stsp if (error)
1994 7848a0e1 2020-03-19 stsp goto done;
1996 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1997 db6d8ad8 2020-03-21 stsp verbosity, repo);
1998 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1999 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2000 9f142382 2020-03-21 stsp error = unlock_err;
2001 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2002 7848a0e1 2020-03-19 stsp if (error)
2003 7848a0e1 2020-03-19 stsp goto done;
2006 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2007 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2008 2ec30c80 2020-03-20 stsp if (error) {
2009 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2010 2ec30c80 2020-03-20 stsp goto done;
2011 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2013 2ec30c80 2020-03-20 stsp if (error)
2014 2ec30c80 2020-03-20 stsp goto done;
2016 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2017 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2018 9f142382 2020-03-21 stsp error = unlock_err;
2019 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2023 f1bcca34 2020-03-25 stsp if (delete_refs) {
2024 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2025 3789fd73 2020-03-26 stsp verbosity, repo);
2026 f1bcca34 2020-03-25 stsp if (error)
2027 f1bcca34 2020-03-25 stsp goto done;
2030 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2031 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2032 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2033 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2034 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2035 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2036 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2038 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2041 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2044 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2045 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2046 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2047 f1bcca34 2020-03-25 stsp goto done;
2049 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2050 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2051 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2052 f1bcca34 2020-03-25 stsp free(remote_refname);
2053 f1bcca34 2020-03-25 stsp goto done;
2056 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2058 f1bcca34 2020-03-25 stsp if (error) {
2059 f1bcca34 2020-03-25 stsp free(remote_refname);
2060 f1bcca34 2020-03-25 stsp free(remote_target);
2061 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2062 f1bcca34 2020-03-25 stsp error = NULL;
2065 f1bcca34 2020-03-25 stsp goto done;
2067 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2068 f1bcca34 2020-03-25 stsp verbosity, repo);
2069 f1bcca34 2020-03-25 stsp free(remote_refname);
2070 f1bcca34 2020-03-25 stsp free(remote_target);
2071 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2072 f1bcca34 2020-03-25 stsp if (error)
2073 f1bcca34 2020-03-25 stsp goto done;
2077 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2078 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2079 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2080 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2081 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2083 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2084 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2086 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2087 7848a0e1 2020-03-19 stsp if (worktree)
2088 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2089 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2090 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2091 7848a0e1 2020-03-19 stsp free(pe->data);
2093 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2094 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2095 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2096 7848a0e1 2020-03-19 stsp free(pe->data);
2098 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2099 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2100 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2101 7848a0e1 2020-03-19 stsp free(id_str);
2102 7848a0e1 2020-03-19 stsp free(cwd);
2103 7848a0e1 2020-03-19 stsp free(repo_path);
2104 7848a0e1 2020-03-19 stsp free(pack_hash);
2105 7848a0e1 2020-03-19 stsp free(proto);
2106 7848a0e1 2020-03-19 stsp free(host);
2107 7848a0e1 2020-03-19 stsp free(port);
2108 7848a0e1 2020-03-19 stsp free(server_path);
2109 7848a0e1 2020-03-19 stsp free(repo_name);
2110 7848a0e1 2020-03-19 stsp return error;
2114 7848a0e1 2020-03-19 stsp __dead static void
2115 2ab43947 2020-03-18 stsp usage_checkout(void)
2117 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2118 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2122 2ab43947 2020-03-18 stsp static void
2123 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2125 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2126 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2127 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2128 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2129 2ab43947 2020-03-18 stsp getprogname());
2132 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2133 2ab43947 2020-03-18 stsp const char *worktree_path;
2134 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2137 2ab43947 2020-03-18 stsp static const struct got_error *
2138 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2140 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2142 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2143 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2144 2ab43947 2020-03-18 stsp return NULL;
2146 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2147 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2148 2ab43947 2020-03-18 stsp return NULL;
2151 2ab43947 2020-03-18 stsp while (path[0] == '/')
2154 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2155 2ab43947 2020-03-18 stsp return NULL;
2158 2ab43947 2020-03-18 stsp static const struct got_error *
2159 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2161 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2162 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2163 2ab43947 2020-03-18 stsp return NULL;
2166 2ab43947 2020-03-18 stsp static const struct got_error *
2167 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2168 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2169 2ab43947 2020-03-18 stsp struct got_repository *repo)
2171 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2172 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2174 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2175 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2177 2ab43947 2020-03-18 stsp return err;
2179 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2180 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2183 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2184 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2186 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2188 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2196 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2197 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2198 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2200 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2201 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2202 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2203 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2204 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2205 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2207 2ab43947 2020-03-18 stsp free(yca_id);
2208 2ab43947 2020-03-18 stsp return NULL;
2211 2ab43947 2020-03-18 stsp static const struct got_error *
2212 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2213 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2214 2ab43947 2020-03-18 stsp struct got_repository *repo)
2216 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2217 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2218 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2219 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2221 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2223 2ab43947 2020-03-18 stsp goto done;
2225 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2226 2ab43947 2020-03-18 stsp is_same_branch = 1;
2227 2ab43947 2020-03-18 stsp goto done;
2229 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2230 2ab43947 2020-03-18 stsp is_same_branch = 1;
2231 2ab43947 2020-03-18 stsp goto done;
2234 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2236 2ab43947 2020-03-18 stsp goto done;
2238 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2239 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2241 2ab43947 2020-03-18 stsp goto done;
2243 2ab43947 2020-03-18 stsp for (;;) {
2244 2ab43947 2020-03-18 stsp struct got_object_id *id;
2245 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2246 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2247 2ab43947 2020-03-18 stsp if (err) {
2248 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2249 2ab43947 2020-03-18 stsp err = NULL;
2254 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2256 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2257 2ab43947 2020-03-18 stsp is_same_branch = 1;
2263 2ab43947 2020-03-18 stsp if (graph)
2264 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2265 2ab43947 2020-03-18 stsp free(head_commit_id);
2266 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2267 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2268 2ab43947 2020-03-18 stsp return err;
2271 4ed7e80c 2018-05-20 stsp static const struct got_error *
2272 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2274 4b6c9460 2020-03-05 stsp static char msg[512];
2275 4b6c9460 2020-03-05 stsp const char *branch_name;
2277 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2278 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2280 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2282 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2283 4b6c9460 2020-03-05 stsp branch_name += 11;
2285 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2286 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2287 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2288 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2289 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2290 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2292 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2295 4b6c9460 2020-03-05 stsp static const struct got_error *
2296 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2298 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2299 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2300 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2301 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2302 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2303 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2304 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2305 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2306 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2307 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2308 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2309 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2311 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2313 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2314 0bb8a95e 2018-03-12 stsp switch (ch) {
2316 08573d5b 2019-05-14 stsp branch_name = optarg;
2319 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2320 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2321 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2324 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2327 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2330 2deda0b9 2019-03-07 stsp usage_checkout();
2331 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2335 0bb8a95e 2018-03-12 stsp argc -= optind;
2336 0bb8a95e 2018-03-12 stsp argv += optind;
2338 6715a751 2018-03-16 stsp #ifndef PROFILE
2339 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2340 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2341 c09a553d 2018-03-12 stsp err(1, "pledge");
2343 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2344 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
2345 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2346 76089277 2018-04-01 stsp if (repo_path == NULL)
2347 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2348 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2349 76089277 2018-04-01 stsp if (cwd == NULL) {
2350 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2351 76089277 2018-04-01 stsp goto done;
2353 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
2354 230a42bd 2019-05-11 jcs base = basename(path_prefix);
2355 230a42bd 2019-05-11 jcs if (base == NULL) {
2356 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2357 230a42bd 2019-05-11 jcs path_prefix);
2361 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
2362 230a42bd 2019-05-11 jcs if (base == NULL) {
2363 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2364 230a42bd 2019-05-11 jcs repo_path);
2368 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2369 c09a553d 2018-03-12 stsp if (dotgit)
2370 c09a553d 2018-03-12 stsp *dotgit = '\0';
2371 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2372 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2373 c09a553d 2018-03-12 stsp free(cwd);
2374 76089277 2018-04-01 stsp goto done;
2376 c09a553d 2018-03-12 stsp free(cwd);
2377 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2378 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2379 76089277 2018-04-01 stsp if (repo_path == NULL) {
2380 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2381 76089277 2018-04-01 stsp goto done;
2383 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2384 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2385 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2386 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2388 b4b3a7dd 2019-07-22 stsp goto done;
2390 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2391 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2392 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2393 b4b3a7dd 2019-07-22 stsp goto done;
2397 c09a553d 2018-03-12 stsp usage_checkout();
2399 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2400 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2402 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2403 c09a553d 2018-03-12 stsp if (error != NULL)
2404 c02c541e 2019-03-29 stsp goto done;
2406 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2407 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2408 c530dc23 2019-07-23 stsp if (error) {
2409 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2410 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2411 c530dc23 2019-07-23 stsp goto done;
2412 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2413 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2414 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2415 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2416 c530dc23 2019-07-23 stsp goto done;
2420 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2421 c02c541e 2019-03-29 stsp if (error)
2422 c09a553d 2018-03-12 stsp goto done;
2424 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2425 c09a553d 2018-03-12 stsp if (error != NULL)
2426 c09a553d 2018-03-12 stsp goto done;
2428 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2429 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2430 c09a553d 2018-03-12 stsp goto done;
2432 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2433 c09a553d 2018-03-12 stsp if (error != NULL)
2434 c09a553d 2018-03-12 stsp goto done;
2436 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2437 e5dc7198 2018-12-29 stsp path_prefix);
2438 e5dc7198 2018-12-29 stsp if (error != NULL)
2439 e5dc7198 2018-12-29 stsp goto done;
2440 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2441 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2442 49520a32 2018-12-29 stsp goto done;
2445 8069f636 2019-01-12 stsp if (commit_id_str) {
2446 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2447 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2448 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2449 30837e32 2019-07-25 stsp if (error)
2450 8069f636 2019-01-12 stsp goto done;
2451 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2452 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2453 8069f636 2019-01-12 stsp if (error != NULL) {
2454 8069f636 2019-01-12 stsp free(commit_id);
2455 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2456 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2457 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2459 8069f636 2019-01-12 stsp goto done;
2461 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2462 4b6c9460 2020-03-05 stsp if (error) {
2463 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2464 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2465 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2467 45d344f6 2019-05-14 stsp goto done;
2469 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2470 8069f636 2019-01-12 stsp commit_id);
2471 8069f636 2019-01-12 stsp free(commit_id);
2472 8069f636 2019-01-12 stsp if (error)
2473 8069f636 2019-01-12 stsp goto done;
2476 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2477 f2ea84fa 2019-07-27 stsp if (error)
2478 f2ea84fa 2019-07-27 stsp goto done;
2479 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2480 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2481 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2482 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2483 c09a553d 2018-03-12 stsp if (error != NULL)
2484 c09a553d 2018-03-12 stsp goto done;
2486 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2487 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2488 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2490 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2491 8069f636 2019-01-12 stsp free(commit_id_str);
2492 76089277 2018-04-01 stsp free(repo_path);
2493 507dc3bb 2018-12-29 stsp free(worktree_path);
2494 507dc3bb 2018-12-29 stsp return error;
2497 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2498 9627c110 2020-04-18 stsp int did_something;
2499 9627c110 2020-04-18 stsp int conflicts;
2500 9627c110 2020-04-18 stsp int obstructed;
2501 9627c110 2020-04-18 stsp int not_updated;
2505 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2507 9627c110 2020-04-18 stsp if (!upa->did_something)
2510 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2511 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2512 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2513 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2514 9627c110 2020-04-18 stsp upa->obstructed);
2515 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2516 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2517 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2520 507dc3bb 2018-12-29 stsp __dead static void
2521 507dc3bb 2018-12-29 stsp usage_update(void)
2523 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2524 507dc3bb 2018-12-29 stsp getprogname());
2528 1ee397ad 2019-07-12 stsp static const struct got_error *
2529 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2531 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2533 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2534 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2535 1ee397ad 2019-07-12 stsp return NULL;
2537 9627c110 2020-04-18 stsp upa->did_something = 1;
2539 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2540 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2541 1ee397ad 2019-07-12 stsp return NULL;
2543 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2544 9627c110 2020-04-18 stsp upa->conflicts++;
2545 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2546 9627c110 2020-04-18 stsp upa->obstructed++;
2547 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2548 9627c110 2020-04-18 stsp upa->not_updated++;
2550 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2552 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2553 1ee397ad 2019-07-12 stsp return NULL;
2556 be7061eb 2018-12-30 stsp static const struct got_error *
2557 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2558 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2559 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2561 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2562 a1fb16d8 2019-05-24 stsp char *base_id_str;
2563 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2565 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2566 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2567 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2568 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2569 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2570 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2571 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2574 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2575 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2576 a1fb16d8 2019-05-24 stsp if (err) {
2577 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2578 a1fb16d8 2019-05-24 stsp return err;
2579 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2581 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2582 a1fb16d8 2019-05-24 stsp return NULL;
2584 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2585 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2586 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2588 a1fb16d8 2019-05-24 stsp return err;
2589 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2590 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2591 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2592 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2593 0ebf8283 2019-07-24 stsp return NULL;
2596 0ebf8283 2019-07-24 stsp static const struct got_error *
2597 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2599 0ebf8283 2019-07-24 stsp const struct got_error *err;
2600 0ebf8283 2019-07-24 stsp int in_progress;
2602 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2604 0ebf8283 2019-07-24 stsp return err;
2605 0ebf8283 2019-07-24 stsp if (in_progress)
2606 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2608 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2610 0ebf8283 2019-07-24 stsp return err;
2611 0ebf8283 2019-07-24 stsp if (in_progress)
2612 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2614 a1fb16d8 2019-05-24 stsp return NULL;
2617 a5edda0a 2019-07-27 stsp static const struct got_error *
2618 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2619 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2621 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2622 a5edda0a 2019-07-27 stsp char *path;
2625 a5edda0a 2019-07-27 stsp if (argc == 0) {
2626 a5edda0a 2019-07-27 stsp path = strdup("");
2627 a5edda0a 2019-07-27 stsp if (path == NULL)
2628 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2629 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2632 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2633 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2636 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2637 a5edda0a 2019-07-27 stsp if (err) {
2638 a5edda0a 2019-07-27 stsp free(path);
2643 a5edda0a 2019-07-27 stsp return err;
2646 a1fb16d8 2019-05-24 stsp static const struct got_error *
2647 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2648 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2650 fa51e947 2020-03-27 stsp const struct got_error *err;
2651 fa51e947 2020-03-27 stsp struct got_repository *repo;
2652 fa51e947 2020-03-27 stsp static char msg[512];
2654 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2656 fa51e947 2020-03-27 stsp return orig_err;
2658 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2659 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2660 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2661 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2662 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2663 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2664 fa51e947 2020-03-27 stsp got_repo_close(repo);
2665 fa51e947 2020-03-27 stsp return err;
2668 fa51e947 2020-03-27 stsp static const struct got_error *
2669 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2671 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2672 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2673 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2674 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2675 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2676 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2677 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2678 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2679 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2680 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2682 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
2684 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2686 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2687 507dc3bb 2018-12-29 stsp switch (ch) {
2689 024e9686 2019-05-14 stsp branch_name = optarg;
2692 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2693 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2694 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2697 2deda0b9 2019-03-07 stsp usage_update();
2698 507dc3bb 2018-12-29 stsp /* NOTREACHED */
2702 507dc3bb 2018-12-29 stsp argc -= optind;
2703 507dc3bb 2018-12-29 stsp argv += optind;
2705 507dc3bb 2018-12-29 stsp #ifndef PROFILE
2706 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2707 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2708 507dc3bb 2018-12-29 stsp err(1, "pledge");
2710 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
2711 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
2712 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2713 c4cdcb68 2019-04-03 stsp goto done;
2715 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
2716 fa51e947 2020-03-27 stsp if (error) {
2717 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
2718 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
2719 fa51e947 2020-03-27 stsp worktree_path);
2720 7d5807f4 2019-07-11 stsp goto done;
2723 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
2724 f2ea84fa 2019-07-27 stsp if (error)
2725 f2ea84fa 2019-07-27 stsp goto done;
2727 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2729 507dc3bb 2018-12-29 stsp if (error != NULL)
2730 507dc3bb 2018-12-29 stsp goto done;
2732 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2733 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2734 087fb88c 2019-08-04 stsp if (error)
2735 087fb88c 2019-08-04 stsp goto done;
2737 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2738 0266afb7 2019-01-04 stsp if (error)
2739 0266afb7 2019-01-04 stsp goto done;
2741 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2742 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
2743 024e9686 2019-05-14 stsp if (error != NULL)
2744 024e9686 2019-05-14 stsp goto done;
2745 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
2746 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2747 9c4b8182 2019-01-02 stsp if (error != NULL)
2748 9c4b8182 2019-01-02 stsp goto done;
2749 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
2750 507dc3bb 2018-12-29 stsp if (error != NULL)
2751 507dc3bb 2018-12-29 stsp goto done;
2753 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2754 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2755 04f57cb3 2019-07-25 stsp free(commit_id_str);
2756 bb787f09 2019-07-25 stsp commit_id_str = NULL;
2757 30837e32 2019-07-25 stsp if (error)
2758 a297e751 2019-07-11 stsp goto done;
2759 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
2760 a297e751 2019-07-11 stsp if (error)
2761 507dc3bb 2018-12-29 stsp goto done;
2764 a1fb16d8 2019-05-24 stsp if (branch_name) {
2765 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
2766 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
2767 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
2769 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
2770 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
2771 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
2772 024e9686 2019-05-14 stsp goto done;
2774 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
2775 024e9686 2019-05-14 stsp if (error)
2776 024e9686 2019-05-14 stsp goto done;
2777 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
2779 a367ff0f 2019-05-14 stsp free(head_commit_id);
2780 024e9686 2019-05-14 stsp if (error != NULL)
2781 024e9686 2019-05-14 stsp goto done;
2782 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2783 a367ff0f 2019-05-14 stsp if (error)
2784 a367ff0f 2019-05-14 stsp goto done;
2785 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
2786 024e9686 2019-05-14 stsp if (error)
2787 024e9686 2019-05-14 stsp goto done;
2789 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2790 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2791 a367ff0f 2019-05-14 stsp if (error != NULL) {
2792 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
2793 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
2794 024e9686 2019-05-14 stsp goto done;
2796 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2797 a367ff0f 2019-05-14 stsp if (error)
2798 a367ff0f 2019-05-14 stsp goto done;
2801 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2802 507dc3bb 2018-12-29 stsp commit_id) != 0) {
2803 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2804 507dc3bb 2018-12-29 stsp commit_id);
2805 507dc3bb 2018-12-29 stsp if (error)
2806 507dc3bb 2018-12-29 stsp goto done;
2809 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
2810 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2811 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
2812 507dc3bb 2018-12-29 stsp if (error != NULL)
2813 507dc3bb 2018-12-29 stsp goto done;
2815 9627c110 2020-04-18 stsp if (upa.did_something)
2816 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
2818 784955db 2019-01-12 stsp printf("Already up-to-date\n");
2819 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
2821 c09a553d 2018-03-12 stsp free(worktree_path);
2822 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2823 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
2824 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2825 507dc3bb 2018-12-29 stsp free(commit_id);
2826 9c4b8182 2019-01-02 stsp free(commit_id_str);
2827 c09a553d 2018-03-12 stsp return error;
2830 f42b1b34 2018-03-12 stsp static const struct got_error *
2831 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2832 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2833 63035f9f 2019-10-06 stsp struct got_repository *repo)
2835 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
2836 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2838 44392932 2019-08-25 stsp if (blob_id1) {
2839 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2841 44392932 2019-08-25 stsp goto done;
2844 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2846 44392932 2019-08-25 stsp goto done;
2848 44392932 2019-08-25 stsp while (path[0] == '/')
2850 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
2851 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
2853 44392932 2019-08-25 stsp if (blob1)
2854 44392932 2019-08-25 stsp got_object_blob_close(blob1);
2855 44392932 2019-08-25 stsp got_object_blob_close(blob2);
2856 44392932 2019-08-25 stsp return err;
2859 44392932 2019-08-25 stsp static const struct got_error *
2860 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2861 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2862 63035f9f 2019-10-06 stsp struct got_repository *repo)
2864 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2865 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2866 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
2868 44392932 2019-08-25 stsp if (tree_id1) {
2869 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2871 44392932 2019-08-25 stsp goto done;
2874 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2876 0f2b3dca 2018-12-22 stsp goto done;
2878 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
2879 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2880 aaa13589 2019-06-01 stsp arg.outfile = stdout;
2881 44392932 2019-08-25 stsp while (path[0] == '/')
2883 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
2884 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
2886 79109fed 2018-03-27 stsp if (tree1)
2887 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
2888 366e0a5f 2019-10-10 stsp if (tree2)
2889 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
2890 44392932 2019-08-25 stsp return err;
2893 44392932 2019-08-25 stsp static const struct got_error *
2894 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
2895 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
2897 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
2898 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2899 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2900 0208f208 2020-05-05 stsp struct got_object_qid *qid;
2902 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2903 0208f208 2020-05-05 stsp if (qid != NULL) {
2904 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
2905 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
2908 0208f208 2020-05-05 stsp return err;
2910 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
2911 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
2915 0208f208 2020-05-05 stsp if (tree_id1) {
2916 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2918 0208f208 2020-05-05 stsp goto done;
2921 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
2922 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2924 0208f208 2020-05-05 stsp goto done;
2926 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
2927 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
2929 0208f208 2020-05-05 stsp if (tree1)
2930 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
2931 0208f208 2020-05-05 stsp if (tree2)
2932 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
2933 0208f208 2020-05-05 stsp return err;
2936 0208f208 2020-05-05 stsp static const struct got_error *
2937 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
2938 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
2940 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2941 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
2942 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
2943 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2944 44392932 2019-08-25 stsp struct got_object_qid *qid;
2946 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2947 44392932 2019-08-25 stsp if (qid != NULL) {
2948 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
2951 44392932 2019-08-25 stsp return err;
2954 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
2955 44392932 2019-08-25 stsp int obj_type;
2956 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
2958 44392932 2019-08-25 stsp goto done;
2959 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2960 44392932 2019-08-25 stsp if (err) {
2961 44392932 2019-08-25 stsp free(obj_id2);
2962 44392932 2019-08-25 stsp goto done;
2964 44392932 2019-08-25 stsp if (pcommit) {
2965 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
2966 44392932 2019-08-25 stsp qid->id, path);
2967 44392932 2019-08-25 stsp if (err) {
2968 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
2969 2e8c69d1 2020-05-04 stsp free(obj_id2);
2970 2e8c69d1 2020-05-04 stsp goto done;
2973 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
2974 2e8c69d1 2020-05-04 stsp if (err) {
2975 2e8c69d1 2020-05-04 stsp free(obj_id2);
2976 2e8c69d1 2020-05-04 stsp goto done;
2980 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
2981 44392932 2019-08-25 stsp if (err) {
2982 44392932 2019-08-25 stsp free(obj_id2);
2983 44392932 2019-08-25 stsp goto done;
2985 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2986 44392932 2019-08-25 stsp switch (obj_type) {
2987 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
2988 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2991 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
2992 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
2996 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2999 44392932 2019-08-25 stsp free(obj_id1);
3000 44392932 2019-08-25 stsp free(obj_id2);
3002 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
3003 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
3005 44392932 2019-08-25 stsp goto done;
3006 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
3007 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
3009 44392932 2019-08-25 stsp goto done;
3010 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3011 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
3014 0f2b3dca 2018-12-22 stsp free(id_str1);
3015 0f2b3dca 2018-12-22 stsp free(id_str2);
3016 44392932 2019-08-25 stsp if (pcommit)
3017 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
3018 79109fed 2018-03-27 stsp return err;
3021 4bb494d5 2018-06-16 stsp static char *
3022 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
3024 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3025 09867e48 2019-08-13 stsp char *p, *s;
3027 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3028 09867e48 2019-08-13 stsp if (tm == NULL)
3029 09867e48 2019-08-13 stsp return NULL;
3030 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3031 09867e48 2019-08-13 stsp if (s == NULL)
3032 09867e48 2019-08-13 stsp return NULL;
3033 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
3035 6c281f94 2018-06-11 stsp *p = '\0';
3039 6841bf13 2019-11-29 kn static const struct got_error *
3040 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
3041 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3043 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3044 6841bf13 2019-11-29 kn regmatch_t regmatch;
3045 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3047 6841bf13 2019-11-29 kn *have_match = 0;
3049 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3053 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3057 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3058 6841bf13 2019-11-29 kn *have_match = 1;
3060 6841bf13 2019-11-29 kn free(id_str);
3061 6841bf13 2019-11-29 kn free(logmsg);
3065 0208f208 2020-05-05 stsp static void
3066 0208f208 2020-05-05 stsp match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3067 0208f208 2020-05-05 stsp regex_t *regex)
3069 0208f208 2020-05-05 stsp regmatch_t regmatch;
3070 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3072 0208f208 2020-05-05 stsp *have_match = 0;
3074 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3075 0208f208 2020-05-05 stsp if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3076 0208f208 2020-05-05 stsp *have_match = 1;
3082 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3084 79109fed 2018-03-27 stsp static const struct got_error *
3085 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3086 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path,
3087 0208f208 2020-05-05 stsp struct got_pathlist_head *changed_paths, int show_patch,
3088 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3090 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3091 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3092 6c281f94 2018-06-11 stsp char datebuf[26];
3093 45d799e2 2018-12-23 stsp time_t committer_time;
3094 45d799e2 2018-12-23 stsp const char *author, *committer;
3095 199a4027 2019-02-02 stsp char *refs_str = NULL;
3096 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3098 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3100 199a4027 2019-02-02 stsp const char *name;
3101 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3104 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3105 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3107 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3108 199a4027 2019-02-02 stsp name += 5;
3109 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3111 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3112 e34f9ed6 2019-02-02 stsp name += 6;
3113 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3114 141c2bff 2019-02-04 stsp name += 8;
3115 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3116 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3119 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3120 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
3121 5d844a1e 2019-08-13 stsp if (err) {
3122 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
3123 5d844a1e 2019-08-13 stsp return err;
3124 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3125 5d844a1e 2019-08-13 stsp err = NULL;
3126 5d844a1e 2019-08-13 stsp tag = NULL;
3129 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3130 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
3132 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3133 a436ad14 2019-08-13 stsp if (cmp != 0)
3135 199a4027 2019-02-02 stsp s = refs_str;
3136 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3137 199a4027 2019-02-02 stsp name) == -1) {
3138 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3140 34ca4898 2019-08-13 stsp return err;
3144 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3146 8bf5b3c9 2018-03-17 stsp return err;
3148 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3149 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3150 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3151 832c249c 2018-06-10 stsp free(id_str);
3152 d3d493d7 2019-02-21 stsp id_str = NULL;
3153 d3d493d7 2019-02-21 stsp free(refs_str);
3154 d3d493d7 2019-02-21 stsp refs_str = NULL;
3155 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3156 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3157 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3158 09867e48 2019-08-13 stsp if (datestr)
3159 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3160 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3161 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3162 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3163 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3164 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3165 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3166 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3167 3fe1abad 2018-06-10 stsp int n = 1;
3168 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3169 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3170 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3172 a0603db2 2018-06-10 stsp return err;
3173 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3174 a0603db2 2018-06-10 stsp free(id_str);
3178 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3180 5943eee2 2019-08-13 stsp return err;
3182 621015ac 2018-07-23 stsp logmsg = logmsg0;
3184 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3186 832c249c 2018-06-10 stsp printf(" %s\n", line);
3187 832c249c 2018-06-10 stsp } while (line);
3188 621015ac 2018-07-23 stsp free(logmsg0);
3190 0208f208 2020-05-05 stsp if (changed_paths) {
3191 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3192 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, changed_paths, entry) {
3193 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3194 0208f208 2020-05-05 stsp printf(" %c %s\n", cp->status, pe->path);
3196 0208f208 2020-05-05 stsp printf("\n");
3198 971751ac 2018-03-27 stsp if (show_patch) {
3199 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3200 971751ac 2018-03-27 stsp if (err == 0)
3201 971751ac 2018-03-27 stsp printf("\n");
3204 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3205 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3206 07862c20 2018-09-15 stsp return err;
3209 f42b1b34 2018-03-12 stsp static const struct got_error *
3210 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3211 0208f208 2020-05-05 stsp struct got_repository *repo, const char *path, int show_changed_paths,
3212 0208f208 2020-05-05 stsp int show_patch, const char *search_pattern, int diff_context, int limit,
3213 0208f208 2020-05-05 stsp int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3215 f42b1b34 2018-03-12 stsp const struct got_error *err;
3216 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3217 6841bf13 2019-11-29 kn regex_t regex;
3218 6841bf13 2019-11-29 kn int have_match;
3219 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3220 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3221 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3222 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3223 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3225 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3226 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3228 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3229 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3230 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3232 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3234 f42b1b34 2018-03-12 stsp return err;
3235 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3236 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3238 fcc85cad 2018-07-22 stsp goto done;
3240 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3242 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3245 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3246 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3247 372ccdbb 2018-06-10 stsp if (err) {
3248 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3249 9ba79e04 2018-06-11 stsp err = NULL;
3252 b43fbaa0 2018-06-11 stsp if (id == NULL)
3255 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3259 0208f208 2020-05-05 stsp if (show_changed_paths) {
3260 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3265 6841bf13 2019-11-29 kn if (search_pattern) {
3266 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3268 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3271 0208f208 2020-05-05 stsp if (have_match == 0 && show_changed_paths)
3272 0208f208 2020-05-05 stsp match_changed_paths(&have_match,
3273 0208f208 2020-05-05 stsp &changed_paths, ®ex);
3274 6841bf13 2019-11-29 kn if (have_match == 0) {
3275 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3276 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3277 0208f208 2020-05-05 stsp free((char *)pe->path);
3278 0208f208 2020-05-05 stsp free(pe->data);
3280 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3285 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3286 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3289 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3290 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3292 0208f208 2020-05-05 stsp err = print_commit(commit, id, repo, path,
3293 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3294 0208f208 2020-05-05 stsp show_patch, diff_context, refs);
3295 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3299 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3300 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3303 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3304 0208f208 2020-05-05 stsp free((char *)pe->path);
3305 0208f208 2020-05-05 stsp free(pe->data);
3307 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3309 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3310 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3311 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3314 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3315 0208f208 2020-05-05 stsp show_changed_paths ? &changed_paths : NULL,
3316 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3317 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3323 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3324 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3325 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3326 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3328 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3329 0208f208 2020-05-05 stsp free((char *)pe->path);
3330 0208f208 2020-05-05 stsp free(pe->data);
3332 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3333 6841bf13 2019-11-29 kn if (search_pattern)
3334 6841bf13 2019-11-29 kn regfree(®ex);
3335 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3336 f42b1b34 2018-03-12 stsp return err;
3339 4ed7e80c 2018-05-20 stsp __dead static void
3340 6f3d1eb0 2018-03-12 stsp usage_log(void)
3342 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3343 0208f208 2020-05-05 stsp "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3344 0208f208 2020-05-05 stsp "[-R] [path]\n", getprogname());
3348 b1ebc001 2019-08-13 stsp static int
3349 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3351 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3352 b1ebc001 2019-08-13 stsp long long n;
3353 b1ebc001 2019-08-13 stsp const char *errstr;
3355 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3356 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3358 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3359 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3364 d1fe46f9 2020-04-18 stsp static const struct got_error *
3365 d1fe46f9 2020-04-18 stsp resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3366 d1fe46f9 2020-04-18 stsp struct got_repository *repo)
3368 d1fe46f9 2020-04-18 stsp const struct got_error *err = NULL;
3369 d1fe46f9 2020-04-18 stsp struct got_reference *ref;
3371 d1fe46f9 2020-04-18 stsp *id = NULL;
3373 d1fe46f9 2020-04-18 stsp err = got_ref_open(&ref, repo, commit_arg, 0);
3374 d1fe46f9 2020-04-18 stsp if (err == NULL) {
3375 d1fe46f9 2020-04-18 stsp int obj_type;
3376 d1fe46f9 2020-04-18 stsp err = got_ref_resolve(id, repo, ref);
3377 d1fe46f9 2020-04-18 stsp got_ref_close(ref);
3379 d1fe46f9 2020-04-18 stsp return err;
3380 d1fe46f9 2020-04-18 stsp err = got_object_get_type(&obj_type, repo, *id);
3382 d1fe46f9 2020-04-18 stsp return err;
3383 d1fe46f9 2020-04-18 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
3384 d1fe46f9 2020-04-18 stsp struct got_tag_object *tag;
3385 d1fe46f9 2020-04-18 stsp err = got_object_open_as_tag(&tag, repo, *id);
3387 d1fe46f9 2020-04-18 stsp return err;
3388 d1fe46f9 2020-04-18 stsp if (got_object_tag_get_object_type(tag) !=
3389 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT) {
3390 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3391 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3393 d1fe46f9 2020-04-18 stsp free(*id);
3394 d1fe46f9 2020-04-18 stsp *id = got_object_id_dup(
3395 d1fe46f9 2020-04-18 stsp got_object_tag_get_object_id(tag));
3396 d1fe46f9 2020-04-18 stsp if (*id == NULL)
3397 d1fe46f9 2020-04-18 stsp err = got_error_from_errno(
3398 d1fe46f9 2020-04-18 stsp "got_object_id_dup");
3399 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3401 d1fe46f9 2020-04-18 stsp return err;
3402 d1fe46f9 2020-04-18 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3403 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3405 d1fe46f9 2020-04-18 stsp err = got_repo_match_object_id_prefix(id, commit_arg,
3406 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT, repo);
3409 d1fe46f9 2020-04-18 stsp return err;
3412 4ed7e80c 2018-05-20 stsp static const struct got_error *
3413 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3415 f42b1b34 2018-03-12 stsp const struct got_error *error;
3416 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3417 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3418 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3419 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3420 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3421 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3422 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3423 0208f208 2020-05-05 stsp int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3424 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3425 64a96a6d 2018-04-01 stsp const char *errstr;
3426 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3428 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3430 6715a751 2018-03-16 stsp #ifndef PROFILE
3431 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3434 f42b1b34 2018-03-12 stsp err(1, "pledge");
3437 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3439 0208f208 2020-05-05 stsp while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3440 79109fed 2018-03-27 stsp switch (ch) {
3442 79109fed 2018-03-27 stsp show_patch = 1;
3445 0208f208 2020-05-05 stsp show_changed_paths = 1;
3448 d142fc45 2018-04-01 stsp start_commit = optarg;
3451 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3453 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3454 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3457 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3458 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3459 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3462 48c8c60d 2020-01-27 stsp log_branches = 1;
3465 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3466 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3467 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3469 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3472 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3475 6841bf13 2019-11-29 kn search_pattern = optarg;
3478 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3481 2deda0b9 2019-03-07 stsp usage_log();
3482 79109fed 2018-03-27 stsp /* NOTREACHED */
3486 79109fed 2018-03-27 stsp argc -= optind;
3487 79109fed 2018-03-27 stsp argv += optind;
3489 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3490 dc1edbfa 2019-11-29 kn diff_context = 3;
3491 dc1edbfa 2019-11-29 kn else if (!show_patch)
3492 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
3494 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3495 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3496 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3497 04ca23f4 2018-07-16 stsp goto done;
3500 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3501 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3502 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3503 50f2fada 2020-04-24 stsp goto done;
3504 50f2fada 2020-04-24 stsp error = NULL;
3507 e7301579 2019-03-18 stsp if (argc == 0) {
3508 cbd1af7a 2019-03-18 stsp path = strdup("");
3509 e7301579 2019-03-18 stsp if (path == NULL) {
3510 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3511 cbd1af7a 2019-03-18 stsp goto done;
3513 e7301579 2019-03-18 stsp } else if (argc == 1) {
3514 e7301579 2019-03-18 stsp if (worktree) {
3515 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3517 e7301579 2019-03-18 stsp if (error)
3518 e7301579 2019-03-18 stsp goto done;
3520 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3521 e7301579 2019-03-18 stsp if (path == NULL) {
3522 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3523 e7301579 2019-03-18 stsp goto done;
3527 cbd1af7a 2019-03-18 stsp usage_log();
3529 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3530 5486daa2 2019-05-11 stsp repo_path = worktree ?
3531 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3533 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3534 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3535 cffc0aa4 2019-02-05 stsp goto done;
3538 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3539 d7d4f210 2018-03-12 stsp if (error != NULL)
3540 04ca23f4 2018-07-16 stsp goto done;
3542 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3543 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3544 c02c541e 2019-03-29 stsp if (error)
3545 c02c541e 2019-03-29 stsp goto done;
3547 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3548 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3549 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3550 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3551 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3552 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3553 3235492e 2018-04-01 stsp if (error != NULL)
3554 d1fe46f9 2020-04-18 stsp goto done;
3555 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3556 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3557 3235492e 2018-04-01 stsp if (error != NULL)
3558 d1fe46f9 2020-04-18 stsp goto done;
3559 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3560 d1fe46f9 2020-04-18 stsp start_id);
3561 d1fe46f9 2020-04-18 stsp if (error != NULL)
3562 d1fe46f9 2020-04-18 stsp goto done;
3563 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3565 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&start_id, start_commit, repo);
3566 d1fe46f9 2020-04-18 stsp if (error != NULL)
3567 d1fe46f9 2020-04-18 stsp goto done;
3569 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3570 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&end_id, end_commit, repo);
3571 d1fe46f9 2020-04-18 stsp if (error != NULL)
3572 d1fe46f9 2020-04-18 stsp goto done;
3575 deeabeae 2019-08-27 stsp if (worktree) {
3576 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3578 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
3579 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3580 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
3581 deeabeae 2019-08-27 stsp goto done;
3583 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3586 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3587 04ca23f4 2018-07-16 stsp if (error != NULL)
3588 04ca23f4 2018-07-16 stsp goto done;
3589 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3590 04ca23f4 2018-07-16 stsp free(path);
3591 04ca23f4 2018-07-16 stsp path = in_repo_path;
3594 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3595 199a4027 2019-02-02 stsp if (error)
3596 199a4027 2019-02-02 stsp goto done;
3598 0208f208 2020-05-05 stsp error = print_commits(start_id, end_id, repo, path, show_changed_paths,
3599 0208f208 2020-05-05 stsp show_patch, search_pattern, diff_context, limit, log_branches,
3600 dbec59df 2020-04-18 stsp reverse_display_order, &refs);
3602 04ca23f4 2018-07-16 stsp free(path);
3603 04ca23f4 2018-07-16 stsp free(repo_path);
3604 04ca23f4 2018-07-16 stsp free(cwd);
3605 cffc0aa4 2019-02-05 stsp if (worktree)
3606 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3607 ad242220 2018-09-08 stsp if (repo) {
3608 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3609 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3610 ad242220 2018-09-08 stsp if (error == NULL)
3611 ad242220 2018-09-08 stsp error = repo_error;
3613 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3614 8bf5b3c9 2018-03-17 stsp return error;
3617 4ed7e80c 2018-05-20 stsp __dead static void
3618 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3620 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3621 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
3625 b72f483a 2019-02-05 stsp struct print_diff_arg {
3626 b72f483a 2019-02-05 stsp struct got_repository *repo;
3627 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3628 b72f483a 2019-02-05 stsp int diff_context;
3629 3fc0c068 2019-02-10 stsp const char *id_str;
3630 3fc0c068 2019-02-10 stsp int header_shown;
3631 98eaaa12 2019-08-03 stsp int diff_staged;
3632 63035f9f 2019-10-06 stsp int ignore_whitespace;
3635 4ed7e80c 2018-05-20 stsp static const struct got_error *
3636 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3637 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3638 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3639 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3641 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3642 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3643 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3644 12463d8b 2019-12-13 stsp int fd = -1;
3645 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3646 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3647 b72f483a 2019-02-05 stsp struct stat sb;
3649 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3650 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3651 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3652 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3653 98eaaa12 2019-08-03 stsp return NULL;
3655 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3656 98eaaa12 2019-08-03 stsp return NULL;
3657 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3658 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3659 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3660 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3661 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3662 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3663 98eaaa12 2019-08-03 stsp return NULL;
3666 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3667 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3668 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3669 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3670 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3673 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3674 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
3675 98eaaa12 2019-08-03 stsp switch (staged_status) {
3676 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
3677 98eaaa12 2019-08-03 stsp label1 = path;
3678 98eaaa12 2019-08-03 stsp label2 = path;
3680 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
3681 98eaaa12 2019-08-03 stsp label2 = path;
3683 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
3684 98eaaa12 2019-08-03 stsp label1 = path;
3687 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
3689 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3690 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
3691 63035f9f 2019-10-06 stsp a->repo, stdout);
3694 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3695 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
3696 4ce46740 2019-08-08 stsp char *id_str;
3697 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3700 4ce46740 2019-08-08 stsp goto done;
3701 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
3703 4ce46740 2019-08-08 stsp goto done;
3704 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3705 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
3706 4ce46740 2019-08-08 stsp free(id_str);
3707 4ce46740 2019-08-08 stsp goto done;
3709 4ce46740 2019-08-08 stsp free(id_str);
3710 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
3711 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3713 4ce46740 2019-08-08 stsp goto done;
3716 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
3717 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
3718 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
3719 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3720 2ec1f75b 2019-03-26 stsp goto done;
3723 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3724 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3725 12463d8b 2019-12-13 stsp if (fd == -1) {
3726 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
3727 12463d8b 2019-12-13 stsp goto done;
3730 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3731 12463d8b 2019-12-13 stsp if (fd == -1) {
3732 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
3733 12463d8b 2019-12-13 stsp goto done;
3736 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
3737 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
3738 2ec1f75b 2019-03-26 stsp goto done;
3740 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
3741 12463d8b 2019-12-13 stsp if (f2 == NULL) {
3742 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
3743 2ec1f75b 2019-03-26 stsp goto done;
3747 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
3749 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3750 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
3752 b72f483a 2019-02-05 stsp if (blob1)
3753 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
3754 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3755 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3756 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3757 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
3758 b72f483a 2019-02-05 stsp free(abspath);
3759 927df6b7 2019-02-10 stsp return err;
3762 927df6b7 2019-02-10 stsp static const struct got_error *
3763 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
3765 b00d56cd 2018-04-01 stsp const struct got_error *error;
3766 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
3767 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
3768 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
3769 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3770 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
3771 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
3772 15a94983 2018-12-23 stsp int type1, type2;
3773 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3774 c0cc5c62 2018-10-18 stsp const char *errstr;
3775 927df6b7 2019-02-10 stsp char *path = NULL;
3777 b00d56cd 2018-04-01 stsp #ifndef PROFILE
3778 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3779 25eccc22 2019-01-04 stsp NULL) == -1)
3780 b00d56cd 2018-04-01 stsp err(1, "pledge");
3783 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3784 b00d56cd 2018-04-01 stsp switch (ch) {
3786 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3788 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3789 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3792 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
3793 b72f483a 2019-02-05 stsp if (repo_path == NULL)
3794 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3796 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3799 98eaaa12 2019-08-03 stsp diff_staged = 1;
3802 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
3805 2deda0b9 2019-03-07 stsp usage_diff();
3806 b00d56cd 2018-04-01 stsp /* NOTREACHED */
3810 b00d56cd 2018-04-01 stsp argc -= optind;
3811 b00d56cd 2018-04-01 stsp argv += optind;
3813 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
3814 b72f483a 2019-02-05 stsp if (cwd == NULL) {
3815 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3816 b72f483a 2019-02-05 stsp goto done;
3818 927df6b7 2019-02-10 stsp if (argc <= 1) {
3819 b72f483a 2019-02-05 stsp if (repo_path)
3821 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
3822 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3823 fa51e947 2020-03-27 stsp if (error) {
3824 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3825 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
3827 1f03b8da 2020-03-20 stsp goto done;
3829 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
3830 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
3831 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3832 927df6b7 2019-02-10 stsp goto done;
3834 927df6b7 2019-02-10 stsp if (argc == 1) {
3835 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3837 927df6b7 2019-02-10 stsp if (error)
3838 927df6b7 2019-02-10 stsp goto done;
3840 927df6b7 2019-02-10 stsp path = strdup("");
3841 927df6b7 2019-02-10 stsp if (path == NULL) {
3842 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3843 927df6b7 2019-02-10 stsp goto done;
3846 b72f483a 2019-02-05 stsp } else if (argc == 2) {
3847 98eaaa12 2019-08-03 stsp if (diff_staged)
3848 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
3849 98eaaa12 2019-08-03 stsp "objects in repository");
3850 15a94983 2018-12-23 stsp id_str1 = argv[0];
3851 15a94983 2018-12-23 stsp id_str2 = argv[1];
3852 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3853 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3854 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3855 30db809c 2019-06-05 stsp goto done;
3856 1f03b8da 2020-03-20 stsp if (worktree) {
3857 1f03b8da 2020-03-20 stsp repo_path = strdup(
3858 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
3859 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3860 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3861 1f03b8da 2020-03-20 stsp goto done;
3864 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
3865 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3866 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3867 1f03b8da 2020-03-20 stsp goto done;
3872 b00d56cd 2018-04-01 stsp usage_diff();
3874 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3875 76089277 2018-04-01 stsp free(repo_path);
3876 b00d56cd 2018-04-01 stsp if (error != NULL)
3877 b00d56cd 2018-04-01 stsp goto done;
3879 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3880 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3881 c02c541e 2019-03-29 stsp if (error)
3882 c02c541e 2019-03-29 stsp goto done;
3884 30db809c 2019-06-05 stsp if (argc <= 1) {
3885 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
3886 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3887 b72f483a 2019-02-05 stsp char *id_str;
3889 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3891 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
3892 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
3893 b72f483a 2019-02-05 stsp if (error)
3894 b72f483a 2019-02-05 stsp goto done;
3895 b72f483a 2019-02-05 stsp arg.repo = repo;
3896 b72f483a 2019-02-05 stsp arg.worktree = worktree;
3897 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
3898 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
3899 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
3900 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
3901 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3903 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
3904 72ea6654 2019-07-27 stsp if (error)
3905 72ea6654 2019-07-27 stsp goto done;
3907 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
3908 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
3909 b72f483a 2019-02-05 stsp free(id_str);
3910 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3911 b72f483a 2019-02-05 stsp goto done;
3914 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3915 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3916 0adb7196 2019-08-11 stsp if (error)
3917 0adb7196 2019-08-11 stsp goto done;
3919 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3920 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3921 0adb7196 2019-08-11 stsp if (error)
3922 0adb7196 2019-08-11 stsp goto done;
3924 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
3925 15a94983 2018-12-23 stsp if (error)
3926 15a94983 2018-12-23 stsp goto done;
3928 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
3929 15a94983 2018-12-23 stsp if (error)
3930 15a94983 2018-12-23 stsp goto done;
3932 15a94983 2018-12-23 stsp if (type1 != type2) {
3933 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3934 b00d56cd 2018-04-01 stsp goto done;
3937 15a94983 2018-12-23 stsp switch (type1) {
3938 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
3939 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3940 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3942 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
3943 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
3944 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3946 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
3947 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
3948 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
3949 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
3952 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3955 5e70831e 2019-05-28 stsp free(label1);
3956 5e70831e 2019-05-28 stsp free(label2);
3957 15a94983 2018-12-23 stsp free(id1);
3958 15a94983 2018-12-23 stsp free(id2);
3959 927df6b7 2019-02-10 stsp free(path);
3960 b72f483a 2019-02-05 stsp if (worktree)
3961 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
3962 ad242220 2018-09-08 stsp if (repo) {
3963 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3964 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3965 ad242220 2018-09-08 stsp if (error == NULL)
3966 ad242220 2018-09-08 stsp error = repo_error;
3968 b00d56cd 2018-04-01 stsp return error;
3971 404c43c4 2018-06-21 stsp __dead static void
3972 404c43c4 2018-06-21 stsp usage_blame(void)
3974 9270e621 2019-02-05 stsp fprintf(stderr,
3975 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
3976 404c43c4 2018-06-21 stsp getprogname());
3980 28315671 2019-08-14 stsp struct blame_line {
3981 28315671 2019-08-14 stsp int annotated;
3982 28315671 2019-08-14 stsp char *id_str;
3983 82f6abb8 2019-08-14 stsp char *committer;
3984 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
3987 28315671 2019-08-14 stsp struct blame_cb_args {
3988 28315671 2019-08-14 stsp struct blame_line *lines;
3989 28315671 2019-08-14 stsp int nlines;
3990 7ef28ff8 2019-08-14 stsp int nlines_prec;
3991 28315671 2019-08-14 stsp int lineno_cur;
3992 28315671 2019-08-14 stsp off_t *line_offsets;
3994 82f6abb8 2019-08-14 stsp struct got_repository *repo;
3997 404c43c4 2018-06-21 stsp static const struct got_error *
3998 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4000 28315671 2019-08-14 stsp const struct got_error *err = NULL;
4001 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
4002 28315671 2019-08-14 stsp struct blame_line *bline;
4003 82f6abb8 2019-08-14 stsp char *line = NULL;
4004 28315671 2019-08-14 stsp size_t linesize = 0;
4005 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
4006 28315671 2019-08-14 stsp off_t offset;
4007 bcb49d15 2019-08-14 stsp struct tm tm;
4008 bcb49d15 2019-08-14 stsp time_t committer_time;
4010 28315671 2019-08-14 stsp if (nlines != a->nlines ||
4011 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4012 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
4014 28315671 2019-08-14 stsp if (sigint_received)
4015 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
4017 2839f8b9 2019-08-18 stsp if (lineno == -1)
4018 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
4020 28315671 2019-08-14 stsp /* Annotate this line. */
4021 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
4022 28315671 2019-08-14 stsp if (bline->annotated)
4023 28315671 2019-08-14 stsp return NULL;
4024 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
4026 28315671 2019-08-14 stsp return err;
4028 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
4030 82f6abb8 2019-08-14 stsp goto done;
4032 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
4033 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
4034 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
4035 bcb49d15 2019-08-14 stsp goto done;
4038 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
4039 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
4040 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
4041 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4042 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
4043 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
4044 82f6abb8 2019-08-14 stsp goto done;
4046 28315671 2019-08-14 stsp bline->annotated = 1;
4048 28315671 2019-08-14 stsp /* Print lines annotated so far. */
4049 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4050 28315671 2019-08-14 stsp if (!bline->annotated)
4051 82f6abb8 2019-08-14 stsp goto done;
4053 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
4054 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
4055 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
4056 82f6abb8 2019-08-14 stsp goto done;
4059 28315671 2019-08-14 stsp while (bline->annotated) {
4060 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
4061 82f6abb8 2019-08-14 stsp size_t len;
4063 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
4064 28315671 2019-08-14 stsp if (ferror(a->f))
4065 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
4069 82f6abb8 2019-08-14 stsp committer = bline->committer;
4070 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
4071 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
4072 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
4073 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
4075 82f6abb8 2019-08-14 stsp *at = '\0';
4076 82f6abb8 2019-08-14 stsp len = strlen(committer);
4077 82f6abb8 2019-08-14 stsp if (len >= 9)
4078 82f6abb8 2019-08-14 stsp committer[8] = '\0';
4080 28315671 2019-08-14 stsp nl = strchr(line, '\n');
4082 28315671 2019-08-14 stsp *nl = '\0';
4083 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4084 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
4086 28315671 2019-08-14 stsp a->lineno_cur++;
4087 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
4090 82f6abb8 2019-08-14 stsp if (commit)
4091 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
4092 28315671 2019-08-14 stsp free(line);
4093 28315671 2019-08-14 stsp return err;
4096 28315671 2019-08-14 stsp static const struct got_error *
4097 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
4099 404c43c4 2018-06-21 stsp const struct got_error *error;
4100 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4101 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4102 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4103 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4104 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4105 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4106 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4107 28315671 2019-08-14 stsp struct blame_cb_args bca;
4108 28315671 2019-08-14 stsp int ch, obj_type, i;
4109 b02560ec 2019-08-19 stsp size_t filesize;
4111 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4113 404c43c4 2018-06-21 stsp #ifndef PROFILE
4114 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4115 36e2fb66 2019-01-04 stsp NULL) == -1)
4116 404c43c4 2018-06-21 stsp err(1, "pledge");
4119 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4120 404c43c4 2018-06-21 stsp switch (ch) {
4122 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4125 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4126 66bea077 2018-08-02 stsp if (repo_path == NULL)
4127 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4129 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4132 2deda0b9 2019-03-07 stsp usage_blame();
4133 404c43c4 2018-06-21 stsp /* NOTREACHED */
4137 404c43c4 2018-06-21 stsp argc -= optind;
4138 404c43c4 2018-06-21 stsp argv += optind;
4140 a39318fd 2018-08-02 stsp if (argc == 1)
4141 404c43c4 2018-06-21 stsp path = argv[0];
4143 404c43c4 2018-06-21 stsp usage_blame();
4145 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4146 66bea077 2018-08-02 stsp if (cwd == NULL) {
4147 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4148 66bea077 2018-08-02 stsp goto done;
4150 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4151 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4152 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4153 66bea077 2018-08-02 stsp goto done;
4155 0c06baac 2019-02-05 stsp error = NULL;
4156 0c06baac 2019-02-05 stsp if (worktree) {
4157 0c06baac 2019-02-05 stsp repo_path =
4158 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4159 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4160 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4161 1f03b8da 2020-03-20 stsp if (error)
4162 1f03b8da 2020-03-20 stsp goto done;
4165 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4166 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4167 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4168 0c06baac 2019-02-05 stsp goto done;
4173 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4174 c02c541e 2019-03-29 stsp if (error != NULL)
4175 36e2fb66 2019-01-04 stsp goto done;
4177 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4178 c02c541e 2019-03-29 stsp if (error)
4179 404c43c4 2018-06-21 stsp goto done;
4181 0c06baac 2019-02-05 stsp if (worktree) {
4182 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4183 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4184 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4185 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
4186 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4187 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
4188 6efaaa2d 2019-02-05 stsp path) == -1) {
4189 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4190 0c06baac 2019-02-05 stsp goto done;
4192 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4195 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4197 0c06baac 2019-02-05 stsp if (error)
4198 66bea077 2018-08-02 stsp goto done;
4200 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4201 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4202 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4203 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4204 404c43c4 2018-06-21 stsp if (error != NULL)
4205 66bea077 2018-08-02 stsp goto done;
4206 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4207 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4208 404c43c4 2018-06-21 stsp if (error != NULL)
4209 66bea077 2018-08-02 stsp goto done;
4211 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4212 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4213 30837e32 2019-07-25 stsp if (error)
4214 66bea077 2018-08-02 stsp goto done;
4217 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4218 28315671 2019-08-14 stsp if (error)
4219 28315671 2019-08-14 stsp goto done;
4221 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4222 28315671 2019-08-14 stsp if (error)
4223 28315671 2019-08-14 stsp goto done;
4225 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4226 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4227 28315671 2019-08-14 stsp goto done;
4230 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4231 28315671 2019-08-14 stsp if (error)
4232 28315671 2019-08-14 stsp goto done;
4233 28315671 2019-08-14 stsp bca.f = got_opentemp();
4234 28315671 2019-08-14 stsp if (bca.f == NULL) {
4235 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4236 28315671 2019-08-14 stsp goto done;
4238 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4239 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4240 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4241 28315671 2019-08-14 stsp goto done;
4243 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4244 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4245 b02560ec 2019-08-19 stsp bca.nlines--;
4247 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4248 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4249 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4250 28315671 2019-08-14 stsp goto done;
4252 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4253 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4254 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4255 7ef28ff8 2019-08-14 stsp while (i > 0) {
4257 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4259 82f6abb8 2019-08-14 stsp bca.repo = repo;
4261 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4262 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
4264 66bea077 2018-08-02 stsp free(in_repo_path);
4265 66bea077 2018-08-02 stsp free(repo_path);
4266 66bea077 2018-08-02 stsp free(cwd);
4267 404c43c4 2018-06-21 stsp free(commit_id);
4268 28315671 2019-08-14 stsp free(obj_id);
4270 28315671 2019-08-14 stsp got_object_blob_close(blob);
4271 0c06baac 2019-02-05 stsp if (worktree)
4272 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4273 ad242220 2018-09-08 stsp if (repo) {
4274 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4275 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4276 ad242220 2018-09-08 stsp if (error == NULL)
4277 ad242220 2018-09-08 stsp error = repo_error;
4279 3affba96 2019-09-22 stsp if (bca.lines) {
4280 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4281 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4282 3affba96 2019-09-22 stsp free(bline->id_str);
4283 3affba96 2019-09-22 stsp free(bline->committer);
4285 3affba96 2019-09-22 stsp free(bca.lines);
4287 28315671 2019-08-14 stsp free(bca.line_offsets);
4288 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4289 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4290 404c43c4 2018-06-21 stsp return error;
4293 5de5890b 2018-10-18 stsp __dead static void
4294 5de5890b 2018-10-18 stsp usage_tree(void)
4296 c1669e2e 2019-01-09 stsp fprintf(stderr,
4297 5d58be12 2020-05-17 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4298 5de5890b 2018-10-18 stsp getprogname());
4302 c1669e2e 2019-01-09 stsp static void
4303 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4304 c1669e2e 2019-01-09 stsp const char *root_path)
4306 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4307 848d6979 2019-08-12 stsp const char *modestr = "";
4308 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4310 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4311 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4314 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4315 63c5ca5d 2019-08-24 stsp modestr = "$";
4316 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
4317 848d6979 2019-08-12 stsp modestr = "@";
4318 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4319 848d6979 2019-08-12 stsp modestr = "/";
4320 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4321 848d6979 2019-08-12 stsp modestr = "*";
4323 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
4324 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
4327 5de5890b 2018-10-18 stsp static const struct got_error *
4328 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4329 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4330 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4332 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4333 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4334 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4335 56e0773d 2019-11-28 stsp int nentries, i;
4337 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4339 5de5890b 2018-10-18 stsp goto done;
4341 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4343 5de5890b 2018-10-18 stsp goto done;
4344 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4345 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4346 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4347 5de5890b 2018-10-18 stsp char *id = NULL;
4349 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4352 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4353 5de5890b 2018-10-18 stsp if (show_ids) {
4354 5de5890b 2018-10-18 stsp char *id_str;
4355 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4356 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4358 5de5890b 2018-10-18 stsp goto done;
4359 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4360 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4361 5de5890b 2018-10-18 stsp free(id_str);
4362 5de5890b 2018-10-18 stsp goto done;
4364 5de5890b 2018-10-18 stsp free(id_str);
4366 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
4369 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4370 c1669e2e 2019-01-09 stsp char *child_path;
4371 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4372 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4373 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4374 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4375 c1669e2e 2019-01-09 stsp goto done;
4377 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4378 c1669e2e 2019-01-09 stsp root_path, repo);
4379 c1669e2e 2019-01-09 stsp free(child_path);
4381 c1669e2e 2019-01-09 stsp goto done;
4386 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4387 5de5890b 2018-10-18 stsp free(tree_id);
4388 5de5890b 2018-10-18 stsp return err;
4391 5de5890b 2018-10-18 stsp static const struct got_error *
4392 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4394 5de5890b 2018-10-18 stsp const struct got_error *error;
4395 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4396 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4397 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4398 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4399 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4400 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4401 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4404 5de5890b 2018-10-18 stsp #ifndef PROFILE
4405 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4406 0f8d269b 2019-01-04 stsp NULL) == -1)
4407 5de5890b 2018-10-18 stsp err(1, "pledge");
4410 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4411 5de5890b 2018-10-18 stsp switch (ch) {
4413 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4416 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4417 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4418 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4420 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4423 5de5890b 2018-10-18 stsp show_ids = 1;
4426 c1669e2e 2019-01-09 stsp recurse = 1;
4429 2deda0b9 2019-03-07 stsp usage_tree();
4430 5de5890b 2018-10-18 stsp /* NOTREACHED */
4434 5de5890b 2018-10-18 stsp argc -= optind;
4435 5de5890b 2018-10-18 stsp argv += optind;
4437 5de5890b 2018-10-18 stsp if (argc == 1)
4438 5de5890b 2018-10-18 stsp path = argv[0];
4439 5de5890b 2018-10-18 stsp else if (argc > 1)
4440 5de5890b 2018-10-18 stsp usage_tree();
4442 7a2c19d6 2019-02-05 stsp path = NULL;
4444 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4445 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4446 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4447 9bf7a39b 2019-02-05 stsp goto done;
4449 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4450 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4451 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4452 7a2c19d6 2019-02-05 stsp goto done;
4454 7a2c19d6 2019-02-05 stsp error = NULL;
4455 7a2c19d6 2019-02-05 stsp if (worktree) {
4456 7a2c19d6 2019-02-05 stsp repo_path =
4457 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4458 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4459 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4460 7a2c19d6 2019-02-05 stsp if (error)
4461 7a2c19d6 2019-02-05 stsp goto done;
4463 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4464 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4465 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4466 7a2c19d6 2019-02-05 stsp goto done;
4471 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4472 5de5890b 2018-10-18 stsp if (error != NULL)
4473 c02c541e 2019-03-29 stsp goto done;
4475 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4476 c02c541e 2019-03-29 stsp if (error)
4477 5de5890b 2018-10-18 stsp goto done;
4479 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4480 9bf7a39b 2019-02-05 stsp if (worktree) {
4481 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4482 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4483 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4484 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4485 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4486 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4487 9bf7a39b 2019-02-05 stsp goto done;
4489 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4491 9bf7a39b 2019-02-05 stsp if (error)
4492 9bf7a39b 2019-02-05 stsp goto done;
4494 9bf7a39b 2019-02-05 stsp path = "/";
4496 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4497 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4498 9bf7a39b 2019-02-05 stsp if (error != NULL)
4499 9bf7a39b 2019-02-05 stsp goto done;
4502 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4503 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4504 4e0a20a4 2020-03-23 tracey if (worktree)
4505 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4507 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4508 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4509 5de5890b 2018-10-18 stsp if (error != NULL)
4510 5de5890b 2018-10-18 stsp goto done;
4511 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4512 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4513 5de5890b 2018-10-18 stsp if (error != NULL)
4514 5de5890b 2018-10-18 stsp goto done;
4516 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4517 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4518 30837e32 2019-07-25 stsp if (error)
4519 5de5890b 2018-10-18 stsp goto done;
4522 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4523 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4525 5de5890b 2018-10-18 stsp free(in_repo_path);
4526 5de5890b 2018-10-18 stsp free(repo_path);
4527 5de5890b 2018-10-18 stsp free(cwd);
4528 5de5890b 2018-10-18 stsp free(commit_id);
4529 7a2c19d6 2019-02-05 stsp if (worktree)
4530 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4531 5de5890b 2018-10-18 stsp if (repo) {
4532 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4533 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4534 5de5890b 2018-10-18 stsp if (error == NULL)
4535 5de5890b 2018-10-18 stsp error = repo_error;
4537 5de5890b 2018-10-18 stsp return error;
4540 6bad629b 2019-02-04 stsp __dead static void
4541 6bad629b 2019-02-04 stsp usage_status(void)
4543 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4547 b72f483a 2019-02-05 stsp static const struct got_error *
4548 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4549 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4550 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4551 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4553 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4554 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4555 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4556 b72f483a 2019-02-05 stsp return NULL;
4559 6bad629b 2019-02-04 stsp static const struct got_error *
4560 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4562 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4563 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4564 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4565 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
4566 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4567 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4570 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4572 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4573 6bad629b 2019-02-04 stsp switch (ch) {
4575 2deda0b9 2019-03-07 stsp usage_status();
4576 6bad629b 2019-02-04 stsp /* NOTREACHED */
4580 6bad629b 2019-02-04 stsp argc -= optind;
4581 6bad629b 2019-02-04 stsp argv += optind;
4583 6bad629b 2019-02-04 stsp #ifndef PROFILE
4584 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4585 6bad629b 2019-02-04 stsp NULL) == -1)
4586 6bad629b 2019-02-04 stsp err(1, "pledge");
4588 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4589 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4590 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4591 927df6b7 2019-02-10 stsp goto done;
4594 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
4595 fa51e947 2020-03-27 stsp if (error) {
4596 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4597 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
4598 a5edda0a 2019-07-27 stsp goto done;
4601 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4603 6bad629b 2019-02-04 stsp if (error != NULL)
4604 6bad629b 2019-02-04 stsp goto done;
4606 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4607 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4608 087fb88c 2019-08-04 stsp if (error)
4609 087fb88c 2019-08-04 stsp goto done;
4611 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4612 6bad629b 2019-02-04 stsp if (error)
4613 6bad629b 2019-02-04 stsp goto done;
4615 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4616 6bad629b 2019-02-04 stsp check_cancelled, NULL);
4618 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
4619 a5edda0a 2019-07-27 stsp free((char *)pe->path);
4620 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4621 927df6b7 2019-02-10 stsp free(cwd);
4622 d0eebce4 2019-03-11 stsp return error;
4625 d0eebce4 2019-03-11 stsp __dead static void
4626 d0eebce4 2019-03-11 stsp usage_ref(void)
4628 d0eebce4 2019-03-11 stsp fprintf(stderr,
4629 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4630 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
4631 d0eebce4 2019-03-11 stsp getprogname());
4635 d0eebce4 2019-03-11 stsp static const struct got_error *
4636 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
4638 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
4639 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
4640 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
4642 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
4643 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4645 d0eebce4 2019-03-11 stsp return err;
4647 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4648 d0eebce4 2019-03-11 stsp char *refstr;
4649 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
4650 d0eebce4 2019-03-11 stsp if (refstr == NULL)
4651 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
4652 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4653 d0eebce4 2019-03-11 stsp free(refstr);
4656 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4657 d0eebce4 2019-03-11 stsp return NULL;
4660 d0eebce4 2019-03-11 stsp static const struct got_error *
4661 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
4663 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4664 d0eebce4 2019-03-11 stsp struct got_reference *ref;
4666 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
4668 d0eebce4 2019-03-11 stsp return err;
4670 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
4671 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4672 d0eebce4 2019-03-11 stsp return err;
4675 d0eebce4 2019-03-11 stsp static const struct got_error *
4676 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
4678 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4679 d0eebce4 2019-03-11 stsp struct got_object_id *id;
4680 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
4683 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4684 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
4685 d1644381 2019-07-14 stsp * an unintended typo.
4687 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4688 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4690 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4692 d83d9d5c 2019-05-13 stsp if (err) {
4693 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
4695 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4696 d83d9d5c 2019-05-13 stsp return err;
4697 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
4699 d83d9d5c 2019-05-13 stsp return err;
4700 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
4701 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
4703 d83d9d5c 2019-05-13 stsp return err;
4706 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
4708 d0eebce4 2019-03-11 stsp goto done;
4710 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
4713 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4715 d1c1ae5f 2019-08-12 stsp return err;
4718 d1c1ae5f 2019-08-12 stsp static const struct got_error *
4719 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
4721 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
4722 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
4723 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
4726 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4727 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
4728 d1c1ae5f 2019-08-12 stsp * an unintended typo.
4730 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4731 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4733 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
4735 d1c1ae5f 2019-08-12 stsp return err;
4737 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
4739 d1c1ae5f 2019-08-12 stsp goto done;
4741 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
4743 d1c1ae5f 2019-08-12 stsp if (target_ref)
4744 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
4746 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
4747 d0eebce4 2019-03-11 stsp return err;
4750 d0eebce4 2019-03-11 stsp static const struct got_error *
4751 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
4753 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
4754 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
4755 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
4756 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
4757 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
4758 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
4759 b2070a3f 2020-03-22 stsp char *refname = NULL;
4761 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4762 d0eebce4 2019-03-11 stsp switch (ch) {
4764 e31abbf2 2020-03-22 stsp obj_arg = optarg;
4767 e31abbf2 2020-03-22 stsp do_delete = 1;
4770 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
4771 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4772 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4774 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4777 d0eebce4 2019-03-11 stsp do_list = 1;
4780 e31abbf2 2020-03-22 stsp symref_target = optarg;
4783 d0eebce4 2019-03-11 stsp usage_ref();
4784 d0eebce4 2019-03-11 stsp /* NOTREACHED */
4788 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
4789 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
4790 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
4791 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
4792 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
4793 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
4794 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
4795 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
4796 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
4797 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
4798 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
4799 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
4801 d0eebce4 2019-03-11 stsp argc -= optind;
4802 d0eebce4 2019-03-11 stsp argv += optind;
4804 e31abbf2 2020-03-22 stsp if (do_list) {
4805 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
4806 d0eebce4 2019-03-11 stsp usage_ref();
4807 b2070a3f 2020-03-22 stsp if (argc == 1) {
4808 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4809 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4810 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4811 b2070a3f 2020-03-22 stsp goto done;
4815 e31abbf2 2020-03-22 stsp if (argc != 1)
4816 e31abbf2 2020-03-22 stsp usage_ref();
4817 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4818 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4819 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4820 b2070a3f 2020-03-22 stsp goto done;
4824 b2070a3f 2020-03-22 stsp if (refname)
4825 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
4827 d0eebce4 2019-03-11 stsp #ifndef PROFILE
4828 e0b57350 2019-03-12 stsp if (do_list) {
4829 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4830 e0b57350 2019-03-12 stsp NULL) == -1)
4831 e0b57350 2019-03-12 stsp err(1, "pledge");
4833 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4834 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
4835 e0b57350 2019-03-12 stsp err(1, "pledge");
4838 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
4839 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
4840 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4841 d0eebce4 2019-03-11 stsp goto done;
4844 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4845 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
4846 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4847 d0eebce4 2019-03-11 stsp goto done;
4849 d0eebce4 2019-03-11 stsp error = NULL;
4850 d0eebce4 2019-03-11 stsp if (worktree) {
4851 d0eebce4 2019-03-11 stsp repo_path =
4852 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
4853 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4854 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4855 d0eebce4 2019-03-11 stsp if (error)
4856 d0eebce4 2019-03-11 stsp goto done;
4858 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
4859 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4860 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4861 d0eebce4 2019-03-11 stsp goto done;
4866 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4867 d0eebce4 2019-03-11 stsp if (error != NULL)
4868 d0eebce4 2019-03-11 stsp goto done;
4870 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4871 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4872 c02c541e 2019-03-29 stsp if (error)
4873 c02c541e 2019-03-29 stsp goto done;
4875 d0eebce4 2019-03-11 stsp if (do_list)
4876 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
4877 e31abbf2 2020-03-22 stsp else if (do_delete)
4878 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
4879 e31abbf2 2020-03-22 stsp else if (symref_target)
4880 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
4882 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
4883 e31abbf2 2020-03-22 stsp usage_ref();
4884 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
4887 b2070a3f 2020-03-22 stsp free(refname);
4889 4e759de4 2019-06-26 stsp got_repo_close(repo);
4890 4e759de4 2019-06-26 stsp if (worktree)
4891 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
4892 4e759de4 2019-06-26 stsp free(cwd);
4893 4e759de4 2019-06-26 stsp free(repo_path);
4894 4e759de4 2019-06-26 stsp return error;
4897 4e759de4 2019-06-26 stsp __dead static void
4898 4e759de4 2019-06-26 stsp usage_branch(void)
4900 4e759de4 2019-06-26 stsp fprintf(stderr,
4901 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4902 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
4906 4e759de4 2019-06-26 stsp static const struct got_error *
4907 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
4908 4e99b47e 2019-10-04 stsp struct got_reference *ref)
4910 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
4911 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
4912 4e99b47e 2019-10-04 stsp char *refstr;
4914 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
4915 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
4916 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
4917 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
4919 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
4921 4e99b47e 2019-10-04 stsp return err;
4922 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
4923 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
4924 4e99b47e 2019-10-04 stsp marker = "* ";
4926 4e99b47e 2019-10-04 stsp marker = "~ ";
4930 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4931 4e99b47e 2019-10-04 stsp refname += 11;
4932 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4933 4e99b47e 2019-10-04 stsp refname += 18;
4935 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
4936 4e99b47e 2019-10-04 stsp if (refstr == NULL)
4937 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
4939 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
4940 4e99b47e 2019-10-04 stsp free(refstr);
4941 4e99b47e 2019-10-04 stsp return NULL;
4944 4e99b47e 2019-10-04 stsp static const struct got_error *
4945 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4947 ad89fa31 2019-10-04 stsp const char *refname;
4949 ad89fa31 2019-10-04 stsp if (worktree == NULL)
4950 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
4952 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
4954 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4955 ad89fa31 2019-10-04 stsp refname += 11;
4956 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4957 ad89fa31 2019-10-04 stsp refname += 18;
4959 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
4961 ad89fa31 2019-10-04 stsp return NULL;
4964 ad89fa31 2019-10-04 stsp static const struct got_error *
4965 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
4967 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
4968 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
4969 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
4970 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
4971 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
4973 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
4975 4e99b47e 2019-10-04 stsp if (worktree) {
4976 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
4977 4e99b47e 2019-10-04 stsp worktree);
4979 4e99b47e 2019-10-04 stsp return err;
4981 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
4982 4e99b47e 2019-10-04 stsp worktree);
4984 4e99b47e 2019-10-04 stsp return err;
4986 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
4987 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
4988 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
4990 4e99b47e 2019-10-04 stsp return err;
4991 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
4992 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
4996 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
4997 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
4999 4e759de4 2019-06-26 stsp return err;
5001 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
5002 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5004 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5005 4e759de4 2019-06-26 stsp return NULL;
5008 4e759de4 2019-06-26 stsp static const struct got_error *
5009 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5010 45cd4e47 2019-08-25 stsp const char *branch_name)
5012 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5013 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5014 4e759de4 2019-06-26 stsp char *refname;
5016 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5017 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5019 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5021 4e759de4 2019-06-26 stsp goto done;
5023 45cd4e47 2019-08-25 stsp if (worktree &&
5024 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5025 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5026 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5027 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5028 45cd4e47 2019-08-25 stsp goto done;
5031 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5034 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5035 4e759de4 2019-06-26 stsp free(refname);
5036 4e759de4 2019-06-26 stsp return err;
5039 4e759de4 2019-06-26 stsp static const struct got_error *
5040 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5041 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5043 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5044 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5045 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5048 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5049 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5050 d3f84d51 2019-07-11 stsp * an unintended typo.
5052 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5053 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5055 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5056 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
5057 4e759de4 2019-06-26 stsp goto done;
5060 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5061 4e759de4 2019-06-26 stsp if (err == NULL) {
5062 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5063 4e759de4 2019-06-26 stsp goto done;
5064 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5065 4e759de4 2019-06-26 stsp goto done;
5067 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5069 4e759de4 2019-06-26 stsp goto done;
5071 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5074 4e759de4 2019-06-26 stsp got_ref_close(ref);
5075 4e759de4 2019-06-26 stsp free(base_refname);
5076 4e759de4 2019-06-26 stsp free(refname);
5077 4e759de4 2019-06-26 stsp return err;
5080 4e759de4 2019-06-26 stsp static const struct got_error *
5081 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5083 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5084 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5085 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5086 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5087 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5088 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5089 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5090 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5091 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5092 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5093 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5095 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5097 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5098 4e759de4 2019-06-26 stsp switch (ch) {
5100 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5103 4e759de4 2019-06-26 stsp delref = optarg;
5106 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5107 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5108 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5110 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5113 4e759de4 2019-06-26 stsp do_list = 1;
5116 da76fce2 2020-02-24 stsp do_update = 0;
5119 4e759de4 2019-06-26 stsp usage_branch();
5120 4e759de4 2019-06-26 stsp /* NOTREACHED */
5124 4e759de4 2019-06-26 stsp if (do_list && delref)
5125 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
5127 4e759de4 2019-06-26 stsp argc -= optind;
5128 4e759de4 2019-06-26 stsp argv += optind;
5130 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5131 ad89fa31 2019-10-04 stsp do_show = 1;
5133 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5134 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5136 4e759de4 2019-06-26 stsp if (do_list || delref) {
5137 4e759de4 2019-06-26 stsp if (argc > 0)
5138 4e759de4 2019-06-26 stsp usage_branch();
5139 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5140 4e759de4 2019-06-26 stsp usage_branch();
5142 4e759de4 2019-06-26 stsp #ifndef PROFILE
5143 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5144 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5145 4e759de4 2019-06-26 stsp NULL) == -1)
5146 4e759de4 2019-06-26 stsp err(1, "pledge");
5148 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5149 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5150 4e759de4 2019-06-26 stsp err(1, "pledge");
5153 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5154 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5155 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5156 4e759de4 2019-06-26 stsp goto done;
5159 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5160 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5161 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5162 4e759de4 2019-06-26 stsp goto done;
5164 4e759de4 2019-06-26 stsp error = NULL;
5165 4e759de4 2019-06-26 stsp if (worktree) {
5166 4e759de4 2019-06-26 stsp repo_path =
5167 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5168 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5169 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5170 4e759de4 2019-06-26 stsp if (error)
5171 4e759de4 2019-06-26 stsp goto done;
5173 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5174 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5175 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5176 4e759de4 2019-06-26 stsp goto done;
5181 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5182 4e759de4 2019-06-26 stsp if (error != NULL)
5183 4e759de4 2019-06-26 stsp goto done;
5185 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5186 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5187 4e759de4 2019-06-26 stsp if (error)
5188 4e759de4 2019-06-26 stsp goto done;
5190 ad89fa31 2019-10-04 stsp if (do_show)
5191 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5192 ad89fa31 2019-10-04 stsp else if (do_list)
5193 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5194 4e759de4 2019-06-26 stsp else if (delref)
5195 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5197 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5198 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5199 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5200 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5201 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5202 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5203 a74f7e83 2019-11-10 stsp if (error)
5204 a74f7e83 2019-11-10 stsp goto done;
5205 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5206 da76fce2 2020-02-24 stsp if (error)
5207 da76fce2 2020-02-24 stsp goto done;
5208 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5209 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5210 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5212 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5213 da76fce2 2020-02-24 stsp if (error)
5214 da76fce2 2020-02-24 stsp goto done;
5215 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5216 da76fce2 2020-02-24 stsp worktree);
5217 da76fce2 2020-02-24 stsp if (error)
5218 da76fce2 2020-02-24 stsp goto done;
5219 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5221 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5222 da76fce2 2020-02-24 stsp goto done;
5224 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5225 da76fce2 2020-02-24 stsp free(branch_refname);
5226 da76fce2 2020-02-24 stsp if (error)
5227 da76fce2 2020-02-24 stsp goto done;
5228 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5230 da76fce2 2020-02-24 stsp if (error)
5231 da76fce2 2020-02-24 stsp goto done;
5232 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5233 da76fce2 2020-02-24 stsp commit_id);
5234 da76fce2 2020-02-24 stsp if (error)
5235 da76fce2 2020-02-24 stsp goto done;
5236 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5237 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5238 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5240 da76fce2 2020-02-24 stsp if (error)
5241 da76fce2 2020-02-24 stsp goto done;
5242 9627c110 2020-04-18 stsp if (upa.did_something)
5243 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5244 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5249 da76fce2 2020-02-24 stsp got_ref_close(ref);
5251 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5252 d0eebce4 2019-03-11 stsp if (worktree)
5253 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5254 d0eebce4 2019-03-11 stsp free(cwd);
5255 d0eebce4 2019-03-11 stsp free(repo_path);
5256 da76fce2 2020-02-24 stsp free(commit_id);
5257 da76fce2 2020-02-24 stsp free(commit_id_str);
5258 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5259 da76fce2 2020-02-24 stsp free((char *)pe->path);
5260 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5261 d00136be 2019-03-26 stsp return error;
5265 d00136be 2019-03-26 stsp __dead static void
5266 8e7bd50a 2019-08-22 stsp usage_tag(void)
5268 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5269 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5270 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5275 b8bad2ba 2019-08-23 stsp static const struct got_error *
5276 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5278 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5279 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5280 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5281 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5282 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5284 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5285 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5286 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5287 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5289 b8bad2ba 2019-08-23 stsp return err;
5290 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5293 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5296 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5297 b8bad2ba 2019-08-23 stsp free(re_id);
5300 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5301 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5304 b8bad2ba 2019-08-23 stsp while (se) {
5305 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5308 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5309 b8bad2ba 2019-08-23 stsp free(se_id);
5312 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5313 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5315 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5316 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5318 b8bad2ba 2019-08-23 stsp return err;
5319 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5322 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5327 b8bad2ba 2019-08-23 stsp return err;
5331 b8bad2ba 2019-08-23 stsp static const struct got_error *
5332 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5334 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5335 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5336 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5338 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5340 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5342 8e7bd50a 2019-08-22 stsp return err;
5344 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5345 8e7bd50a 2019-08-22 stsp const char *refname;
5346 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5347 8e7bd50a 2019-08-22 stsp char datebuf[26];
5348 d4efa91b 2020-01-14 stsp const char *tagger;
5349 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5350 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5351 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5352 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5354 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5355 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5357 8e7bd50a 2019-08-22 stsp refname += 10;
5358 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5359 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5360 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5363 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5364 8e7bd50a 2019-08-22 stsp free(refstr);
5366 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5369 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5370 d4efa91b 2020-01-14 stsp if (err) {
5371 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5375 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5376 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5377 d4efa91b 2020-01-14 stsp if (err) {
5381 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5382 d4efa91b 2020-01-14 stsp tagger_time =
5383 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5384 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5390 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5391 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5392 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5393 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5397 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5398 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5399 2417344c 2019-08-23 stsp if (datestr)
5400 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5401 d4efa91b 2020-01-14 stsp if (commit)
5402 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5404 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5405 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5406 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5409 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5410 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5413 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5414 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5417 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5418 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5425 8e7bd50a 2019-08-22 stsp free(id_str);
5426 d4efa91b 2020-01-14 stsp if (commit) {
5427 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5430 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5432 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5433 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5434 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5435 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5440 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5442 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5444 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5445 8e7bd50a 2019-08-22 stsp } while (line);
5446 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5449 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5450 8e7bd50a 2019-08-22 stsp return NULL;
5453 8e7bd50a 2019-08-22 stsp static const struct got_error *
5454 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5455 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5457 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5458 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5459 f372d5cd 2019-10-21 stsp char *editor = NULL;
5460 8e7bd50a 2019-08-22 stsp int fd = -1;
5462 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5463 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5464 8e7bd50a 2019-08-22 stsp goto done;
5467 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5468 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
5469 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5470 8e7bd50a 2019-08-22 stsp goto done;
5473 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5475 8e7bd50a 2019-08-22 stsp goto done;
5477 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
5478 8e7bd50a 2019-08-22 stsp close(fd);
5480 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5482 8e7bd50a 2019-08-22 stsp goto done;
5483 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5485 8e7bd50a 2019-08-22 stsp free(initial_content);
5486 8e7bd50a 2019-08-22 stsp free(template);
5487 8e7bd50a 2019-08-22 stsp free(editor);
5489 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5490 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5491 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5492 8e7bd50a 2019-08-22 stsp if (err) {
5493 8e7bd50a 2019-08-22 stsp free(*tagmsg);
5494 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
5497 8e7bd50a 2019-08-22 stsp return err;
5500 8e7bd50a 2019-08-22 stsp static const struct got_error *
5501 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
5502 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
5504 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5505 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5506 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5507 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5508 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5509 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5510 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5513 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5514 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5515 8e7bd50a 2019-08-22 stsp * an unintended typo.
5517 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5518 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5520 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
5522 8e7bd50a 2019-08-22 stsp return err;
5524 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5525 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5527 8e7bd50a 2019-08-22 stsp goto done;
5529 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5531 8e7bd50a 2019-08-22 stsp goto done;
5533 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5534 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5535 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5536 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
5537 8e7bd50a 2019-08-22 stsp goto done;
5539 8e7bd50a 2019-08-22 stsp tag_name += 10;
5540 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5541 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5542 8e7bd50a 2019-08-22 stsp goto done;
5545 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5546 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5547 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5548 8e7bd50a 2019-08-22 stsp goto done;
5549 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5550 8e7bd50a 2019-08-22 stsp goto done;
5552 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5553 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5554 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5555 f372d5cd 2019-10-21 stsp if (err) {
5556 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5557 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5558 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5559 8e7bd50a 2019-08-22 stsp goto done;
5563 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5564 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5565 f372d5cd 2019-10-21 stsp if (err) {
5566 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5567 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5568 8e7bd50a 2019-08-22 stsp goto done;
5571 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5572 f372d5cd 2019-10-21 stsp if (err) {
5573 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5574 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5575 8e7bd50a 2019-08-22 stsp goto done;
5578 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5579 f372d5cd 2019-10-21 stsp if (err) {
5580 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5581 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5582 f372d5cd 2019-10-21 stsp goto done;
5585 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
5586 f372d5cd 2019-10-21 stsp if (err) {
5587 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5588 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5589 f372d5cd 2019-10-21 stsp goto done;
5591 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
5593 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
5594 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
5595 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
5596 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5597 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
5598 f372d5cd 2019-10-21 stsp free(tag_id_str);
5600 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
5601 8e7bd50a 2019-08-22 stsp free(commit_id);
5602 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5603 8e7bd50a 2019-08-22 stsp free(refname);
5604 8e7bd50a 2019-08-22 stsp free(tagmsg);
5605 f372d5cd 2019-10-21 stsp free(tagmsg_path);
5606 aba9c984 2019-09-08 stsp free(tagger);
5607 8e7bd50a 2019-08-22 stsp return err;
5610 8e7bd50a 2019-08-22 stsp static const struct got_error *
5611 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
5613 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
5614 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
5615 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
5616 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5617 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
5618 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5619 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
5621 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5622 8e7bd50a 2019-08-22 stsp switch (ch) {
5624 80106605 2020-02-24 stsp commit_id_arg = optarg;
5627 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
5630 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
5631 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5632 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5634 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
5637 8e7bd50a 2019-08-22 stsp do_list = 1;
5640 8e7bd50a 2019-08-22 stsp usage_tag();
5641 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
5645 8e7bd50a 2019-08-22 stsp argc -= optind;
5646 8e7bd50a 2019-08-22 stsp argv += optind;
5648 8e7bd50a 2019-08-22 stsp if (do_list) {
5649 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
5651 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
5652 8e7bd50a 2019-08-22 stsp if (tagmsg)
5653 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
5654 8e7bd50a 2019-08-22 stsp if (argc > 0)
5655 8e7bd50a 2019-08-22 stsp usage_tag();
5656 80106605 2020-02-24 stsp } else if (argc != 1)
5657 8e7bd50a 2019-08-22 stsp usage_tag();
5659 a2887370 2019-08-23 stsp tag_name = argv[0];
5661 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
5662 8e7bd50a 2019-08-22 stsp if (do_list) {
5663 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5664 8e7bd50a 2019-08-22 stsp NULL) == -1)
5665 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5667 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5668 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
5669 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5672 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
5673 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
5674 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
5675 8e7bd50a 2019-08-22 stsp goto done;
5678 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5679 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
5680 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5681 8e7bd50a 2019-08-22 stsp goto done;
5683 8e7bd50a 2019-08-22 stsp error = NULL;
5684 8e7bd50a 2019-08-22 stsp if (worktree) {
5685 8e7bd50a 2019-08-22 stsp repo_path =
5686 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
5687 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5688 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5689 8e7bd50a 2019-08-22 stsp if (error)
5690 8e7bd50a 2019-08-22 stsp goto done;
5692 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
5693 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5694 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5695 8e7bd50a 2019-08-22 stsp goto done;
5700 8e7bd50a 2019-08-22 stsp if (do_list) {
5701 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5702 c9956ddf 2019-09-08 stsp if (error != NULL)
5703 c9956ddf 2019-09-08 stsp goto done;
5704 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5705 8e7bd50a 2019-08-22 stsp if (error)
5706 8e7bd50a 2019-08-22 stsp goto done;
5707 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
5709 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5710 c9956ddf 2019-09-08 stsp if (error)
5711 c9956ddf 2019-09-08 stsp goto done;
5712 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
5713 c9956ddf 2019-09-08 stsp if (error != NULL)
5714 c9956ddf 2019-09-08 stsp goto done;
5716 8e7bd50a 2019-08-22 stsp if (tagmsg) {
5717 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5718 8e7bd50a 2019-08-22 stsp if (error)
5719 8e7bd50a 2019-08-22 stsp goto done;
5722 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
5723 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
5724 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
5725 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
5726 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
5727 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
5728 8e7bd50a 2019-08-22 stsp if (error)
5729 8e7bd50a 2019-08-22 stsp goto done;
5730 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5731 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
5732 8e7bd50a 2019-08-22 stsp if (error)
5733 8e7bd50a 2019-08-22 stsp goto done;
5734 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
5735 8e7bd50a 2019-08-22 stsp free(commit_id);
5736 8e7bd50a 2019-08-22 stsp if (error)
5737 8e7bd50a 2019-08-22 stsp goto done;
5740 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
5741 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5745 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
5746 8e7bd50a 2019-08-22 stsp if (worktree)
5747 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
5748 8e7bd50a 2019-08-22 stsp free(cwd);
5749 8e7bd50a 2019-08-22 stsp free(repo_path);
5750 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5751 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5752 8e7bd50a 2019-08-22 stsp return error;
5755 8e7bd50a 2019-08-22 stsp __dead static void
5756 d00136be 2019-03-26 stsp usage_add(void)
5758 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5759 022fae89 2019-12-06 tracey getprogname());
5763 d00136be 2019-03-26 stsp static const struct got_error *
5764 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
5766 4e68cba3 2019-11-23 stsp while (path[0] == '/')
5768 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
5769 4e68cba3 2019-11-23 stsp return NULL;
5772 4e68cba3 2019-11-23 stsp static const struct got_error *
5773 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
5775 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
5776 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
5777 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
5778 1dd54920 2019-05-11 stsp char *cwd = NULL;
5779 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
5780 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
5781 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
5783 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
5785 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
5786 d00136be 2019-03-26 stsp switch (ch) {
5787 022fae89 2019-12-06 tracey case 'I':
5788 022fae89 2019-12-06 tracey no_ignores = 1;
5791 4e68cba3 2019-11-23 stsp can_recurse = 1;
5794 d00136be 2019-03-26 stsp usage_add();
5795 d00136be 2019-03-26 stsp /* NOTREACHED */
5799 d00136be 2019-03-26 stsp argc -= optind;
5800 d00136be 2019-03-26 stsp argv += optind;
5802 43012d58 2019-07-14 stsp #ifndef PROFILE
5803 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5804 43012d58 2019-07-14 stsp NULL) == -1)
5805 43012d58 2019-07-14 stsp err(1, "pledge");
5807 723c305c 2019-05-11 jcs if (argc < 1)
5808 d00136be 2019-03-26 stsp usage_add();
5810 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
5811 d00136be 2019-03-26 stsp if (cwd == NULL) {
5812 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5813 d00136be 2019-03-26 stsp goto done;
5816 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5817 fa51e947 2020-03-27 stsp if (error) {
5818 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5819 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
5820 d00136be 2019-03-26 stsp goto done;
5823 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5825 031a5338 2019-03-26 stsp if (error != NULL)
5826 031a5338 2019-03-26 stsp goto done;
5828 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5829 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5830 d00136be 2019-03-26 stsp if (error)
5831 d00136be 2019-03-26 stsp goto done;
5833 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5834 6d022e97 2019-08-04 stsp if (error)
5835 022fae89 2019-12-06 tracey goto done;
5837 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
5838 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5839 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
5840 6d022e97 2019-08-04 stsp goto done;
5844 4e68cba3 2019-11-23 stsp if (!can_recurse) {
5845 4e68cba3 2019-11-23 stsp char *ondisk_path;
5846 4e68cba3 2019-11-23 stsp struct stat sb;
5847 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
5848 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
5849 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
5850 4e68cba3 2019-11-23 stsp pe->path) == -1) {
5851 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
5852 4e68cba3 2019-11-23 stsp goto done;
5854 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
5855 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
5856 4e68cba3 2019-11-23 stsp free(ondisk_path);
5859 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
5860 4e68cba3 2019-11-23 stsp ondisk_path);
5861 4e68cba3 2019-11-23 stsp free(ondisk_path);
5862 4e68cba3 2019-11-23 stsp goto done;
5864 4e68cba3 2019-11-23 stsp free(ondisk_path);
5865 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
5866 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5867 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
5868 4e68cba3 2019-11-23 stsp goto done;
5873 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
5874 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
5877 031a5338 2019-03-26 stsp got_repo_close(repo);
5878 d00136be 2019-03-26 stsp if (worktree)
5879 d00136be 2019-03-26 stsp got_worktree_close(worktree);
5880 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
5881 1dd54920 2019-05-11 stsp free((char *)pe->path);
5882 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
5883 2ec1f75b 2019-03-26 stsp free(cwd);
5884 2ec1f75b 2019-03-26 stsp return error;
5887 2ec1f75b 2019-03-26 stsp __dead static void
5888 648e4ef7 2019-07-09 stsp usage_remove(void)
5890 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5891 f2a9dc41 2019-12-13 tracey getprogname());
5895 2a06fe5f 2019-08-24 stsp static const struct got_error *
5896 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
5897 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
5899 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
5901 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5902 2a06fe5f 2019-08-24 stsp return NULL;
5903 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5904 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
5905 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
5906 2a06fe5f 2019-08-24 stsp return NULL;
5909 2ec1f75b 2019-03-26 stsp static const struct got_error *
5910 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
5912 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
5913 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
5914 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
5915 17ed4618 2019-06-02 stsp char *cwd = NULL;
5916 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
5917 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
5918 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5920 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
5922 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
5923 2ec1f75b 2019-03-26 stsp switch (ch) {
5925 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
5927 70e3e7f5 2019-12-13 tracey case 'k':
5928 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
5930 f2a9dc41 2019-12-13 tracey case 'R':
5931 f2a9dc41 2019-12-13 tracey can_recurse = 1;
5934 f2a9dc41 2019-12-13 tracey usage_remove();
5935 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
5939 2ec1f75b 2019-03-26 stsp argc -= optind;
5940 2ec1f75b 2019-03-26 stsp argv += optind;
5942 43012d58 2019-07-14 stsp #ifndef PROFILE
5943 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5944 43012d58 2019-07-14 stsp NULL) == -1)
5945 43012d58 2019-07-14 stsp err(1, "pledge");
5947 17ed4618 2019-06-02 stsp if (argc < 1)
5948 648e4ef7 2019-07-09 stsp usage_remove();
5950 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
5951 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
5952 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5953 2ec1f75b 2019-03-26 stsp goto done;
5955 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5956 fa51e947 2020-03-27 stsp if (error) {
5957 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5958 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
5959 2ec1f75b 2019-03-26 stsp goto done;
5962 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5965 2ec1f75b 2019-03-26 stsp goto done;
5967 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5968 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5969 2ec1f75b 2019-03-26 stsp if (error)
5970 2ec1f75b 2019-03-26 stsp goto done;
5972 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5973 6d022e97 2019-08-04 stsp if (error)
5974 6d022e97 2019-08-04 stsp goto done;
5976 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
5977 f2a9dc41 2019-12-13 tracey char *ondisk_path;
5978 f2a9dc41 2019-12-13 tracey struct stat sb;
5979 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
5980 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
5981 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
5982 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
5983 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
5984 f2a9dc41 2019-12-13 tracey goto done;
5986 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
5987 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
5988 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5989 f2a9dc41 2019-12-13 tracey continue;
5991 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
5992 f2a9dc41 2019-12-13 tracey ondisk_path);
5993 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5994 f2a9dc41 2019-12-13 tracey goto done;
5996 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5997 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
5998 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5999 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6000 f2a9dc41 2019-12-13 tracey goto done;
6005 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6006 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
6009 a129376b 2019-03-28 stsp got_repo_close(repo);
6010 a129376b 2019-03-28 stsp if (worktree)
6011 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6012 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6013 17ed4618 2019-06-02 stsp free((char *)pe->path);
6014 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6015 a129376b 2019-03-28 stsp free(cwd);
6016 a129376b 2019-03-28 stsp return error;
6019 a129376b 2019-03-28 stsp __dead static void
6020 a129376b 2019-03-28 stsp usage_revert(void)
6022 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6023 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6027 1ee397ad 2019-07-12 stsp static const struct got_error *
6028 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6030 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6031 fb9704af 2020-01-27 stsp return NULL;
6033 a129376b 2019-03-28 stsp while (path[0] == '/')
6035 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6036 33aa809d 2019-08-08 stsp return NULL;
6039 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6040 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6041 33aa809d 2019-08-08 stsp const char *action;
6044 33aa809d 2019-08-08 stsp static const struct got_error *
6045 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6046 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6048 33aa809d 2019-08-08 stsp char *line = NULL;
6049 33aa809d 2019-08-08 stsp size_t linesize = 0;
6050 33aa809d 2019-08-08 stsp ssize_t linelen;
6052 33aa809d 2019-08-08 stsp switch (status) {
6053 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6054 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6056 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6057 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6059 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6060 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6061 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6062 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6063 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6064 33aa809d 2019-08-08 stsp printf("%s", line);
6065 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6066 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6067 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6068 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6069 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6072 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6075 33aa809d 2019-08-08 stsp return NULL;
6078 33aa809d 2019-08-08 stsp static const struct got_error *
6079 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6080 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6082 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6083 33aa809d 2019-08-08 stsp char *line = NULL;
6084 33aa809d 2019-08-08 stsp size_t linesize = 0;
6085 33aa809d 2019-08-08 stsp ssize_t linelen;
6086 33aa809d 2019-08-08 stsp int resp = ' ';
6087 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6089 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6091 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6093 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6094 33aa809d 2019-08-08 stsp a->action);
6096 33aa809d 2019-08-08 stsp return err;
6097 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6098 33aa809d 2019-08-08 stsp if (linelen == -1) {
6099 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6100 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6101 33aa809d 2019-08-08 stsp return NULL;
6103 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6105 33aa809d 2019-08-08 stsp *nl = '\0';
6106 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6107 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6108 33aa809d 2019-08-08 stsp printf("y\n");
6109 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6110 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6111 33aa809d 2019-08-08 stsp printf("n\n");
6112 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6113 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6114 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6115 33aa809d 2019-08-08 stsp printf("q\n");
6117 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6118 33aa809d 2019-08-08 stsp free(line);
6119 33aa809d 2019-08-08 stsp return NULL;
6122 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6123 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6124 33aa809d 2019-08-08 stsp a->action);
6126 33aa809d 2019-08-08 stsp return err;
6127 33aa809d 2019-08-08 stsp resp = getchar();
6128 33aa809d 2019-08-08 stsp if (resp == '\n')
6129 33aa809d 2019-08-08 stsp resp = getchar();
6130 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6131 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6132 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6133 33aa809d 2019-08-08 stsp resp = ' ';
6135 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6136 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6137 33aa809d 2019-08-08 stsp resp = ' ';
6141 33aa809d 2019-08-08 stsp if (resp == 'y')
6142 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6143 33aa809d 2019-08-08 stsp else if (resp == 'n')
6144 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6145 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6146 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6148 1ee397ad 2019-07-12 stsp return NULL;
6152 a129376b 2019-03-28 stsp static const struct got_error *
6153 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6155 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6156 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6157 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6158 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6159 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6160 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6161 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6162 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6163 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6164 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6166 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6168 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6169 a129376b 2019-03-28 stsp switch (ch) {
6171 33aa809d 2019-08-08 stsp pflag = 1;
6174 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6177 0f6d7415 2019-08-08 stsp can_recurse = 1;
6180 a129376b 2019-03-28 stsp usage_revert();
6181 a129376b 2019-03-28 stsp /* NOTREACHED */
6185 a129376b 2019-03-28 stsp argc -= optind;
6186 a129376b 2019-03-28 stsp argv += optind;
6188 43012d58 2019-07-14 stsp #ifndef PROFILE
6189 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6190 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6191 43012d58 2019-07-14 stsp err(1, "pledge");
6193 e20a8b6f 2019-06-04 stsp if (argc < 1)
6194 a129376b 2019-03-28 stsp usage_revert();
6195 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6196 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6198 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6199 a129376b 2019-03-28 stsp if (cwd == NULL) {
6200 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6201 a129376b 2019-03-28 stsp goto done;
6203 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6204 fa51e947 2020-03-27 stsp if (error) {
6205 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6206 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6207 2ec1f75b 2019-03-26 stsp goto done;
6210 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6212 a129376b 2019-03-28 stsp if (error != NULL)
6213 a129376b 2019-03-28 stsp goto done;
6215 33aa809d 2019-08-08 stsp if (patch_script_path) {
6216 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6217 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6218 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6219 33aa809d 2019-08-08 stsp patch_script_path);
6220 33aa809d 2019-08-08 stsp goto done;
6223 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6224 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6225 a129376b 2019-03-28 stsp if (error)
6226 a129376b 2019-03-28 stsp goto done;
6228 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6229 6d022e97 2019-08-04 stsp if (error)
6230 6d022e97 2019-08-04 stsp goto done;
6232 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6233 0f6d7415 2019-08-08 stsp char *ondisk_path;
6234 0f6d7415 2019-08-08 stsp struct stat sb;
6235 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6236 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6237 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6238 0f6d7415 2019-08-08 stsp pe->path) == -1) {
6239 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6240 0f6d7415 2019-08-08 stsp goto done;
6242 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6243 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6244 0f6d7415 2019-08-08 stsp free(ondisk_path);
6247 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6248 0f6d7415 2019-08-08 stsp ondisk_path);
6249 0f6d7415 2019-08-08 stsp free(ondisk_path);
6250 0f6d7415 2019-08-08 stsp goto done;
6252 0f6d7415 2019-08-08 stsp free(ondisk_path);
6253 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6254 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6255 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6256 0f6d7415 2019-08-08 stsp goto done;
6261 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6262 33aa809d 2019-08-08 stsp cpa.action = "revert";
6263 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6264 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6266 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6267 33aa809d 2019-08-08 stsp error == NULL)
6268 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6270 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6271 2ec1f75b 2019-03-26 stsp if (worktree)
6272 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6273 2ec1f75b 2019-03-26 stsp free(path);
6274 d00136be 2019-03-26 stsp free(cwd);
6275 6bad629b 2019-02-04 stsp return error;
6278 c4296144 2019-05-09 stsp __dead static void
6279 c4296144 2019-05-09 stsp usage_commit(void)
6281 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6282 5c1e53bc 2019-07-28 stsp getprogname());
6286 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6287 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6288 e2ba3d07 2019-05-13 stsp const char *editor;
6289 e0870e44 2019-05-13 stsp const char *worktree_path;
6290 76d98825 2019-06-03 stsp const char *branch_name;
6291 314a6357 2019-05-13 stsp const char *repo_path;
6292 e0870e44 2019-05-13 stsp char *logmsg_path;
6296 33ad4cbe 2019-05-12 jcs static const struct got_error *
6297 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6300 76d98825 2019-06-03 stsp char *initial_content = NULL;
6301 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6302 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6303 e0870e44 2019-05-13 stsp char *template = NULL;
6304 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6306 33ad4cbe 2019-05-12 jcs size_t len;
6308 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6309 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6310 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6311 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6312 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6313 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6314 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6315 33ad4cbe 2019-05-12 jcs return NULL;
6318 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6319 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6321 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
6322 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6323 76d98825 2019-06-03 stsp a->branch_name) == -1)
6324 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6326 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6328 e0870e44 2019-05-13 stsp goto done;
6330 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
6332 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6333 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6334 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6335 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6336 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6340 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6342 76d98825 2019-06-03 stsp free(initial_content);
6343 e0870e44 2019-05-13 stsp free(template);
6345 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6346 3ce1b845 2019-07-15 stsp if (err == NULL) {
6347 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6348 3ce1b845 2019-07-15 stsp if (err) {
6349 3ce1b845 2019-07-15 stsp free(*logmsg);
6350 3ce1b845 2019-07-15 stsp *logmsg = NULL;
6353 33ad4cbe 2019-05-12 jcs return err;
6356 c4296144 2019-05-09 stsp static const struct got_error *
6357 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6359 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6360 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6361 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6362 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6363 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6364 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6365 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6366 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6367 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6368 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6370 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6371 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6373 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
6374 c4296144 2019-05-09 stsp switch (ch) {
6376 c4296144 2019-05-09 stsp logmsg = optarg;
6379 c4296144 2019-05-09 stsp usage_commit();
6380 c4296144 2019-05-09 stsp /* NOTREACHED */
6384 c4296144 2019-05-09 stsp argc -= optind;
6385 c4296144 2019-05-09 stsp argv += optind;
6387 43012d58 2019-07-14 stsp #ifndef PROFILE
6388 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6389 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6390 43012d58 2019-07-14 stsp err(1, "pledge");
6392 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6393 c4296144 2019-05-09 stsp if (cwd == NULL) {
6394 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6395 c4296144 2019-05-09 stsp goto done;
6397 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6398 fa51e947 2020-03-27 stsp if (error) {
6399 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6400 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6401 7d5807f4 2019-07-11 stsp goto done;
6404 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6405 c4296144 2019-05-09 stsp if (error)
6406 a698f62e 2019-07-25 stsp goto done;
6407 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6408 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6409 c4296144 2019-05-09 stsp goto done;
6412 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6413 916f288c 2019-07-30 stsp worktree);
6414 5c1e53bc 2019-07-28 stsp if (error)
6415 5c1e53bc 2019-07-28 stsp goto done;
6417 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6418 c9956ddf 2019-09-08 stsp if (error)
6419 c9956ddf 2019-09-08 stsp goto done;
6420 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6421 c9956ddf 2019-09-08 stsp gitconfig_path);
6422 c4296144 2019-05-09 stsp if (error != NULL)
6423 c4296144 2019-05-09 stsp goto done;
6425 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
6426 aba9c984 2019-09-08 stsp if (error)
6427 aba9c984 2019-09-08 stsp return error;
6430 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6431 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6433 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6434 314a6357 2019-05-13 stsp error = get_editor(&editor);
6436 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6437 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6438 c4296144 2019-05-09 stsp if (error)
6439 c4296144 2019-05-09 stsp goto done;
6441 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6442 087fb88c 2019-08-04 stsp if (error)
6443 087fb88c 2019-08-04 stsp goto done;
6445 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6446 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6447 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6448 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6449 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6450 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6451 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6452 916f288c 2019-07-30 stsp goto done;
6454 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6456 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6457 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6458 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6459 e0870e44 2019-05-13 stsp if (error) {
6460 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6461 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6462 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6463 c4296144 2019-05-09 stsp goto done;
6466 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6467 c4296144 2019-05-09 stsp if (error)
6468 c4296144 2019-05-09 stsp goto done;
6469 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6471 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6472 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6473 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6474 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6475 7266f21f 2019-10-21 stsp error == NULL)
6476 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6477 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6479 c4296144 2019-05-09 stsp got_repo_close(repo);
6480 c4296144 2019-05-09 stsp if (worktree)
6481 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6482 c4296144 2019-05-09 stsp free(cwd);
6483 c4296144 2019-05-09 stsp free(id_str);
6484 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6485 e2ba3d07 2019-05-13 stsp free(editor);
6486 aba9c984 2019-09-08 stsp free(author);
6487 234035bc 2019-06-01 stsp return error;
6490 234035bc 2019-06-01 stsp __dead static void
6491 234035bc 2019-06-01 stsp usage_cherrypick(void)
6493 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6497 234035bc 2019-06-01 stsp static const struct got_error *
6498 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6500 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6501 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6502 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6503 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6504 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6505 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6506 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6507 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6509 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6511 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6512 234035bc 2019-06-01 stsp switch (ch) {
6514 234035bc 2019-06-01 stsp usage_cherrypick();
6515 234035bc 2019-06-01 stsp /* NOTREACHED */
6519 234035bc 2019-06-01 stsp argc -= optind;
6520 234035bc 2019-06-01 stsp argv += optind;
6522 43012d58 2019-07-14 stsp #ifndef PROFILE
6523 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6524 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6525 43012d58 2019-07-14 stsp err(1, "pledge");
6527 234035bc 2019-06-01 stsp if (argc != 1)
6528 234035bc 2019-06-01 stsp usage_cherrypick();
6530 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6531 234035bc 2019-06-01 stsp if (cwd == NULL) {
6532 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6533 234035bc 2019-06-01 stsp goto done;
6535 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6536 fa51e947 2020-03-27 stsp if (error) {
6537 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6538 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6540 234035bc 2019-06-01 stsp goto done;
6543 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6545 234035bc 2019-06-01 stsp if (error != NULL)
6546 234035bc 2019-06-01 stsp goto done;
6548 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6549 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6550 234035bc 2019-06-01 stsp if (error)
6551 234035bc 2019-06-01 stsp goto done;
6553 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6554 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6555 234035bc 2019-06-01 stsp if (error != NULL) {
6556 234035bc 2019-06-01 stsp struct got_reference *ref;
6557 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6558 234035bc 2019-06-01 stsp goto done;
6559 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6560 234035bc 2019-06-01 stsp if (error != NULL)
6561 234035bc 2019-06-01 stsp goto done;
6562 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
6563 234035bc 2019-06-01 stsp got_ref_close(ref);
6564 234035bc 2019-06-01 stsp if (error != NULL)
6565 234035bc 2019-06-01 stsp goto done;
6567 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
6568 234035bc 2019-06-01 stsp if (error)
6569 234035bc 2019-06-01 stsp goto done;
6571 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
6572 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
6573 234035bc 2019-06-01 stsp if (error != NULL)
6574 234035bc 2019-06-01 stsp goto done;
6576 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6577 234035bc 2019-06-01 stsp if (error) {
6578 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
6579 234035bc 2019-06-01 stsp goto done;
6580 234035bc 2019-06-01 stsp error = NULL;
6582 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
6583 234035bc 2019-06-01 stsp goto done;
6586 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6587 234035bc 2019-06-01 stsp if (error)
6588 234035bc 2019-06-01 stsp goto done;
6589 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6590 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6591 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6592 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
6594 234035bc 2019-06-01 stsp if (error != NULL)
6595 234035bc 2019-06-01 stsp goto done;
6597 9627c110 2020-04-18 stsp if (upa.did_something)
6598 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
6599 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6601 234035bc 2019-06-01 stsp if (commit)
6602 234035bc 2019-06-01 stsp got_object_commit_close(commit);
6603 234035bc 2019-06-01 stsp free(commit_id_str);
6604 234035bc 2019-06-01 stsp if (head_ref)
6605 234035bc 2019-06-01 stsp got_ref_close(head_ref);
6606 234035bc 2019-06-01 stsp if (worktree)
6607 234035bc 2019-06-01 stsp got_worktree_close(worktree);
6609 234035bc 2019-06-01 stsp got_repo_close(repo);
6610 c4296144 2019-05-09 stsp return error;
6613 5ef14e63 2019-06-02 stsp __dead static void
6614 5ef14e63 2019-06-02 stsp usage_backout(void)
6616 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6620 5ef14e63 2019-06-02 stsp static const struct got_error *
6621 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
6623 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
6624 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
6625 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
6626 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
6627 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
6628 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
6629 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
6630 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
6632 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6634 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6635 5ef14e63 2019-06-02 stsp switch (ch) {
6637 5ef14e63 2019-06-02 stsp usage_backout();
6638 5ef14e63 2019-06-02 stsp /* NOTREACHED */
6642 5ef14e63 2019-06-02 stsp argc -= optind;
6643 5ef14e63 2019-06-02 stsp argv += optind;
6645 43012d58 2019-07-14 stsp #ifndef PROFILE
6646 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6647 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6648 43012d58 2019-07-14 stsp err(1, "pledge");
6650 5ef14e63 2019-06-02 stsp if (argc != 1)
6651 5ef14e63 2019-06-02 stsp usage_backout();
6653 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
6654 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
6655 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
6656 5ef14e63 2019-06-02 stsp goto done;
6658 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
6659 fa51e947 2020-03-27 stsp if (error) {
6660 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6661 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
6662 5ef14e63 2019-06-02 stsp goto done;
6665 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6667 5ef14e63 2019-06-02 stsp if (error != NULL)
6668 5ef14e63 2019-06-02 stsp goto done;
6670 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6671 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6672 5ef14e63 2019-06-02 stsp if (error)
6673 5ef14e63 2019-06-02 stsp goto done;
6675 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6676 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6677 5ef14e63 2019-06-02 stsp if (error != NULL) {
6678 5ef14e63 2019-06-02 stsp struct got_reference *ref;
6679 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6680 5ef14e63 2019-06-02 stsp goto done;
6681 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6682 5ef14e63 2019-06-02 stsp if (error != NULL)
6683 5ef14e63 2019-06-02 stsp goto done;
6684 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
6685 5ef14e63 2019-06-02 stsp got_ref_close(ref);
6686 5ef14e63 2019-06-02 stsp if (error != NULL)
6687 5ef14e63 2019-06-02 stsp goto done;
6689 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
6690 5ef14e63 2019-06-02 stsp if (error)
6691 5ef14e63 2019-06-02 stsp goto done;
6693 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
6694 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
6695 5ef14e63 2019-06-02 stsp if (error != NULL)
6696 5ef14e63 2019-06-02 stsp goto done;
6698 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6699 5ef14e63 2019-06-02 stsp if (error)
6700 5ef14e63 2019-06-02 stsp goto done;
6702 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6703 5ef14e63 2019-06-02 stsp if (error)
6704 5ef14e63 2019-06-02 stsp goto done;
6705 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6706 5ef14e63 2019-06-02 stsp if (pid == NULL) {
6707 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
6708 5ef14e63 2019-06-02 stsp goto done;
6711 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6712 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6713 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
6714 5ef14e63 2019-06-02 stsp if (error != NULL)
6715 5ef14e63 2019-06-02 stsp goto done;
6717 9627c110 2020-04-18 stsp if (upa.did_something)
6718 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
6719 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6721 5ef14e63 2019-06-02 stsp if (commit)
6722 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
6723 5ef14e63 2019-06-02 stsp free(commit_id_str);
6724 5ef14e63 2019-06-02 stsp if (head_ref)
6725 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
6726 818c7501 2019-07-11 stsp if (worktree)
6727 818c7501 2019-07-11 stsp got_worktree_close(worktree);
6729 818c7501 2019-07-11 stsp got_repo_close(repo);
6730 818c7501 2019-07-11 stsp return error;
6733 818c7501 2019-07-11 stsp __dead static void
6734 818c7501 2019-07-11 stsp usage_rebase(void)
6736 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6737 af54c8f8 2019-07-11 stsp getprogname());
6742 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
6745 0ebf8283 2019-07-24 stsp size_t len;
6747 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
6748 0ebf8283 2019-07-24 stsp if (len > limit)
6749 0ebf8283 2019-07-24 stsp len = limit;
6750 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
6751 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
6753 0ebf8283 2019-07-24 stsp *nl = '\0';
6756 0ebf8283 2019-07-24 stsp static const struct got_error *
6757 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6759 5943eee2 2019-08-13 stsp const struct got_error *err;
6760 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
6761 5943eee2 2019-08-13 stsp const char *s;
6763 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
6765 5943eee2 2019-08-13 stsp return err;
6767 5943eee2 2019-08-13 stsp s = logmsg0;
6768 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
6771 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
6772 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
6773 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6774 5943eee2 2019-08-13 stsp goto done;
6777 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
6779 5943eee2 2019-08-13 stsp free(logmsg0);
6780 a0ea4fc0 2020-02-28 stsp return err;
6783 a0ea4fc0 2020-02-28 stsp static const struct got_error *
6784 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6786 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
6787 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
6788 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
6790 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
6792 a0ea4fc0 2020-02-28 stsp return err;
6794 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
6796 a0ea4fc0 2020-02-28 stsp goto done;
6798 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
6800 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
6802 a0ea4fc0 2020-02-28 stsp goto done;
6804 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
6806 a0ea4fc0 2020-02-28 stsp free(id_str);
6807 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
6808 a0ea4fc0 2020-02-28 stsp free(logmsg);
6809 5943eee2 2019-08-13 stsp return err;
6812 818c7501 2019-07-11 stsp static const struct got_error *
6813 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
6814 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
6816 818c7501 2019-07-11 stsp const struct got_error *err;
6817 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6819 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
6821 818c7501 2019-07-11 stsp goto done;
6823 ff0d2220 2019-07-11 stsp if (new_id) {
6824 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
6826 ff0d2220 2019-07-11 stsp goto done;
6829 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
6830 ff0d2220 2019-07-11 stsp if (new_id_str)
6831 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
6833 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6835 0ebf8283 2019-07-24 stsp goto done;
6837 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
6838 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6840 818c7501 2019-07-11 stsp free(old_id_str);
6841 818c7501 2019-07-11 stsp free(new_id_str);
6842 272a1371 2020-02-28 stsp free(logmsg);
6843 818c7501 2019-07-11 stsp return err;
6846 1ee397ad 2019-07-12 stsp static const struct got_error *
6847 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6848 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
6849 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
6851 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
6852 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
6853 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
6856 818c7501 2019-07-11 stsp static const struct got_error *
6857 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
6858 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6859 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
6860 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6862 ff0d2220 2019-07-11 stsp const struct got_error *error;
6863 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
6864 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
6866 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6867 ff0d2220 2019-07-11 stsp if (error)
6868 ff0d2220 2019-07-11 stsp return error;
6870 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6871 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
6872 ff0d2220 2019-07-11 stsp if (error) {
6873 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6874 ff0d2220 2019-07-11 stsp goto done;
6875 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
6877 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
6878 ff0d2220 2019-07-11 stsp free(new_commit_id);
6881 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
6882 ff0d2220 2019-07-11 stsp return error;
6885 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
6886 64c6d990 2019-07-11 stsp const char *path_prefix;
6887 64c6d990 2019-07-11 stsp size_t len;
6888 8ca9bd68 2019-07-25 stsp int errcode;
6891 64c6d990 2019-07-11 stsp static const struct got_error *
6892 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6893 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
6894 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
6895 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
6897 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
6899 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6900 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6901 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
6903 64c6d990 2019-07-11 stsp return NULL;
6906 64c6d990 2019-07-11 stsp static const struct got_error *
6907 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
6908 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
6909 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
6911 64c6d990 2019-07-11 stsp const struct got_error *err;
6912 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6913 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
6914 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
6916 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
6917 64c6d990 2019-07-11 stsp return NULL;
6919 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6921 64c6d990 2019-07-11 stsp goto done;
6923 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6925 64c6d990 2019-07-11 stsp goto done;
6927 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
6928 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
6930 64c6d990 2019-07-11 stsp goto done;
6932 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
6933 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
6935 64c6d990 2019-07-11 stsp goto done;
6937 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
6938 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
6939 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
6940 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
6941 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
6942 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
6943 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
6945 64c6d990 2019-07-11 stsp if (tree1)
6946 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
6947 64c6d990 2019-07-11 stsp if (tree2)
6948 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
6949 64c6d990 2019-07-11 stsp if (commit)
6950 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
6951 64c6d990 2019-07-11 stsp if (parent_commit)
6952 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
6953 64c6d990 2019-07-11 stsp return err;
6956 ff0d2220 2019-07-11 stsp static const struct got_error *
6957 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
6958 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
6959 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6960 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
6961 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
6963 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
6964 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
6965 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
6966 af61c510 2019-07-19 stsp struct got_object_qid *qid;
6967 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
6969 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
6971 af61c510 2019-07-19 stsp return err;
6973 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6974 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6976 af61c510 2019-07-19 stsp goto done;
6977 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6978 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
6979 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
6980 af61c510 2019-07-19 stsp if (err) {
6981 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
6982 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
6983 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
6984 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
6985 af61c510 2019-07-19 stsp "been reached?!?");
6987 ee780d5c 2020-01-04 stsp goto done;
6989 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
6990 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
6992 af61c510 2019-07-19 stsp goto done;
6994 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
6996 af61c510 2019-07-19 stsp goto done;
6997 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6998 af61c510 2019-07-19 stsp commit_id = parent_id;
7002 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7003 af61c510 2019-07-19 stsp return err;
7006 af61c510 2019-07-19 stsp static const struct got_error *
7007 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7009 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7010 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7011 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7012 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7013 818c7501 2019-07-11 stsp char *cwd = NULL;
7014 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7015 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7016 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7017 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7018 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7019 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7020 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7021 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7022 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7023 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7024 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7025 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7026 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7028 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7029 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7031 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7032 818c7501 2019-07-11 stsp switch (ch) {
7034 818c7501 2019-07-11 stsp abort_rebase = 1;
7037 818c7501 2019-07-11 stsp continue_rebase = 1;
7040 818c7501 2019-07-11 stsp usage_rebase();
7041 818c7501 2019-07-11 stsp /* NOTREACHED */
7045 818c7501 2019-07-11 stsp argc -= optind;
7046 818c7501 2019-07-11 stsp argv += optind;
7048 43012d58 2019-07-14 stsp #ifndef PROFILE
7049 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7050 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7051 43012d58 2019-07-14 stsp err(1, "pledge");
7053 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7054 818c7501 2019-07-11 stsp usage_rebase();
7055 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7056 818c7501 2019-07-11 stsp if (argc != 0)
7057 818c7501 2019-07-11 stsp usage_rebase();
7058 818c7501 2019-07-11 stsp } else if (argc != 1)
7059 818c7501 2019-07-11 stsp usage_rebase();
7061 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7062 818c7501 2019-07-11 stsp if (cwd == NULL) {
7063 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7064 818c7501 2019-07-11 stsp goto done;
7066 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7067 fa51e947 2020-03-27 stsp if (error) {
7068 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7069 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7070 818c7501 2019-07-11 stsp goto done;
7073 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7075 818c7501 2019-07-11 stsp if (error != NULL)
7076 818c7501 2019-07-11 stsp goto done;
7078 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7079 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7080 7ef62c4e 2020-02-24 stsp if (error)
7081 7ef62c4e 2020-02-24 stsp goto done;
7083 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7084 7ef62c4e 2020-02-24 stsp worktree);
7085 818c7501 2019-07-11 stsp if (error)
7086 7ef62c4e 2020-02-24 stsp goto done;
7087 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7088 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7089 818c7501 2019-07-11 stsp goto done;
7092 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7093 818c7501 2019-07-11 stsp if (error)
7094 818c7501 2019-07-11 stsp goto done;
7096 f6794adc 2019-07-23 stsp if (abort_rebase) {
7097 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7098 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7099 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7100 f6794adc 2019-07-23 stsp goto done;
7102 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7103 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7104 3e3a69f1 2019-07-25 stsp worktree, repo);
7105 818c7501 2019-07-11 stsp if (error)
7106 818c7501 2019-07-11 stsp goto done;
7107 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7108 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7109 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7110 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7111 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7112 818c7501 2019-07-11 stsp if (error)
7113 818c7501 2019-07-11 stsp goto done;
7114 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7115 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7116 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7119 818c7501 2019-07-11 stsp if (continue_rebase) {
7120 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7121 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7122 f6794adc 2019-07-23 stsp goto done;
7124 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7125 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7126 3e3a69f1 2019-07-25 stsp worktree, repo);
7127 818c7501 2019-07-11 stsp if (error)
7128 818c7501 2019-07-11 stsp goto done;
7130 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7131 01757395 2019-07-12 stsp resume_commit_id, repo);
7132 818c7501 2019-07-11 stsp if (error)
7133 818c7501 2019-07-11 stsp goto done;
7135 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7136 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7137 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7138 818c7501 2019-07-11 stsp goto done;
7141 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7142 818c7501 2019-07-11 stsp if (error != NULL)
7143 818c7501 2019-07-11 stsp goto done;
7146 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7147 ff0d2220 2019-07-11 stsp if (error)
7148 ff0d2220 2019-07-11 stsp goto done;
7150 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7151 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7153 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7154 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7155 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7156 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7157 818c7501 2019-07-11 stsp if (error)
7158 818c7501 2019-07-11 stsp goto done;
7159 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7160 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7161 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7162 818c7501 2019-07-11 stsp "with work tree's branch");
7163 818c7501 2019-07-11 stsp goto done;
7166 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7167 a51a74b3 2019-07-27 stsp if (error) {
7168 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7169 a51a74b3 2019-07-27 stsp goto done;
7170 a51a74b3 2019-07-27 stsp error = NULL;
7172 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7173 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7174 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7175 a51a74b3 2019-07-27 stsp goto done;
7177 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7178 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7179 818c7501 2019-07-11 stsp if (error)
7180 818c7501 2019-07-11 stsp goto done;
7183 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7184 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7185 818c7501 2019-07-11 stsp if (error)
7186 818c7501 2019-07-11 stsp goto done;
7188 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7189 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7190 fc66b545 2019-08-12 stsp if (pid == NULL) {
7191 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7192 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7193 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7194 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7195 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7196 fc66b545 2019-08-12 stsp if (error)
7197 fc66b545 2019-08-12 stsp goto done;
7198 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7199 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7200 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7203 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7204 fc66b545 2019-08-12 stsp goto done;
7206 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7207 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7208 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7209 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7210 818c7501 2019-07-11 stsp commit = NULL;
7211 818c7501 2019-07-11 stsp if (error)
7212 818c7501 2019-07-11 stsp goto done;
7214 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7215 38b0338b 2019-11-29 stsp if (continue_rebase) {
7216 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7217 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7218 38b0338b 2019-11-29 stsp goto done;
7220 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7221 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7222 38b0338b 2019-11-29 stsp char *id_str;
7223 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7224 38b0338b 2019-11-29 stsp new_base_branch);
7225 38b0338b 2019-11-29 stsp if (error)
7226 38b0338b 2019-11-29 stsp goto done;
7227 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7228 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7229 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7230 38b0338b 2019-11-29 stsp free(id_str);
7231 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7232 38b0338b 2019-11-29 stsp new_head_commit_id);
7233 38b0338b 2019-11-29 stsp if (error)
7234 38b0338b 2019-11-29 stsp goto done;
7238 818c7501 2019-07-11 stsp pid = NULL;
7239 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7240 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7242 818c7501 2019-07-11 stsp commit_id = qid->id;
7243 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7244 818c7501 2019-07-11 stsp pid = qid;
7246 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7247 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7248 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7249 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7250 818c7501 2019-07-11 stsp if (error)
7251 818c7501 2019-07-11 stsp goto done;
7253 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7254 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7255 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7257 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7258 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7259 a0ea4fc0 2020-02-28 stsp if (error)
7260 a0ea4fc0 2020-02-28 stsp goto done;
7261 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7265 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7266 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7267 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7268 818c7501 2019-07-11 stsp if (error)
7269 818c7501 2019-07-11 stsp goto done;
7272 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7273 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7274 818c7501 2019-07-11 stsp if (error)
7275 818c7501 2019-07-11 stsp goto done;
7276 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7277 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7279 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7280 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7282 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7283 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7284 818c7501 2019-07-11 stsp free(resume_commit_id);
7285 818c7501 2019-07-11 stsp free(yca_id);
7286 818c7501 2019-07-11 stsp if (commit)
7287 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7288 818c7501 2019-07-11 stsp if (branch)
7289 818c7501 2019-07-11 stsp got_ref_close(branch);
7290 818c7501 2019-07-11 stsp if (new_base_branch)
7291 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7292 818c7501 2019-07-11 stsp if (tmp_branch)
7293 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7294 5ef14e63 2019-06-02 stsp if (worktree)
7295 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7297 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7298 5ef14e63 2019-06-02 stsp return error;
7301 0ebf8283 2019-07-24 stsp __dead static void
7302 0ebf8283 2019-07-24 stsp usage_histedit(void)
7304 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7305 0ebf8283 2019-07-24 stsp getprogname());
7309 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7310 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7311 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7312 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7313 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7315 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7316 0ebf8283 2019-07-24 stsp unsigned char code;
7317 0ebf8283 2019-07-24 stsp const char *name;
7318 0ebf8283 2019-07-24 stsp const char *desc;
7319 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7320 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7321 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7322 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7323 82997472 2020-01-29 stsp "be used" },
7324 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7325 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7326 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7329 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7330 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7331 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7332 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7333 0ebf8283 2019-07-24 stsp char *logmsg;
7335 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7337 0ebf8283 2019-07-24 stsp static const struct got_error *
7338 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7339 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7341 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7342 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7343 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7346 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7348 0ebf8283 2019-07-24 stsp goto done;
7350 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7352 0ebf8283 2019-07-24 stsp goto done;
7354 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7356 0ebf8283 2019-07-24 stsp goto done;
7358 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7359 0ebf8283 2019-07-24 stsp if (n < 0)
7360 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7362 0ebf8283 2019-07-24 stsp if (commit)
7363 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7364 0ebf8283 2019-07-24 stsp free(id_str);
7365 0ebf8283 2019-07-24 stsp free(logmsg);
7366 0ebf8283 2019-07-24 stsp return err;
7369 0ebf8283 2019-07-24 stsp static const struct got_error *
7370 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7371 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7373 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7374 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7376 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7377 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7379 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7380 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7384 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7385 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7386 083957f4 2020-02-24 stsp if (n < 0) {
7387 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7393 0ebf8283 2019-07-24 stsp return err;
7396 0ebf8283 2019-07-24 stsp static const struct got_error *
7397 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7398 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7400 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7402 514f2ffe 2020-01-29 stsp char *id_str;
7403 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7405 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7406 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7408 514f2ffe 2020-01-29 stsp return err;
7410 514f2ffe 2020-01-29 stsp n = fprintf(f,
7411 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7412 514f2ffe 2020-01-29 stsp "# commit %s\n"
7413 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7414 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7415 514f2ffe 2020-01-29 stsp if (n < 0) {
7416 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7417 514f2ffe 2020-01-29 stsp goto done;
7420 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7421 514f2ffe 2020-01-29 stsp if (n < 0) {
7422 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7423 514f2ffe 2020-01-29 stsp goto done;
7426 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7427 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7428 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7429 0ebf8283 2019-07-24 stsp cmd->desc);
7430 0ebf8283 2019-07-24 stsp if (n < 0) {
7431 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7436 514f2ffe 2020-01-29 stsp free(id_str);
7437 0ebf8283 2019-07-24 stsp return err;
7440 0ebf8283 2019-07-24 stsp static const struct got_error *
7441 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7443 0ebf8283 2019-07-24 stsp static char msg[42];
7446 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7448 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7449 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7451 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7454 0ebf8283 2019-07-24 stsp static const struct got_error *
7455 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7456 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7458 0ebf8283 2019-07-24 stsp const struct got_error *err;
7459 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7460 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7462 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7464 0ebf8283 2019-07-24 stsp return err;
7466 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7468 0ebf8283 2019-07-24 stsp goto done;
7470 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7472 5943eee2 2019-08-13 stsp goto done;
7473 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7474 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7475 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7476 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7479 0ebf8283 2019-07-24 stsp if (folded_commit)
7480 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7481 0ebf8283 2019-07-24 stsp free(id_str);
7482 5943eee2 2019-08-13 stsp free(folded_logmsg);
7483 0ebf8283 2019-07-24 stsp return err;
7486 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7487 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7489 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7491 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7492 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7493 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7494 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7495 3f9de99f 2019-07-24 stsp folded = prev;
7496 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7499 0ebf8283 2019-07-24 stsp return folded;
7502 0ebf8283 2019-07-24 stsp static const struct got_error *
7503 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7504 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7506 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7507 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7508 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7509 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7511 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7513 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7515 0ebf8283 2019-07-24 stsp return err;
7517 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7518 0ebf8283 2019-07-24 stsp if (folded) {
7519 0ebf8283 2019-07-24 stsp while (folded != hle) {
7520 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7521 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7524 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7525 0ebf8283 2019-07-24 stsp logmsg, repo);
7527 0ebf8283 2019-07-24 stsp goto done;
7528 0ebf8283 2019-07-24 stsp free(logmsg);
7529 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7530 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7534 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7536 0ebf8283 2019-07-24 stsp goto done;
7537 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7539 5943eee2 2019-08-13 stsp goto done;
7540 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
7541 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7542 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7543 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7544 0ebf8283 2019-07-24 stsp goto done;
7546 0ebf8283 2019-07-24 stsp free(logmsg);
7547 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7549 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7551 0ebf8283 2019-07-24 stsp goto done;
7553 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
7554 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
7556 0ebf8283 2019-07-24 stsp goto done;
7558 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
7559 0ebf8283 2019-07-24 stsp close(fd);
7561 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7563 0ebf8283 2019-07-24 stsp goto done;
7565 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7566 0ebf8283 2019-07-24 stsp if (err) {
7567 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7568 0ebf8283 2019-07-24 stsp goto done;
7569 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7572 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7573 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
7574 0ebf8283 2019-07-24 stsp free(logmsg_path);
7575 0ebf8283 2019-07-24 stsp free(logmsg);
7576 5943eee2 2019-08-13 stsp free(orig_logmsg);
7577 0ebf8283 2019-07-24 stsp free(editor);
7578 0ebf8283 2019-07-24 stsp if (commit)
7579 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7580 0ebf8283 2019-07-24 stsp return err;
7583 0ebf8283 2019-07-24 stsp static const struct got_error *
7584 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
7585 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7587 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7588 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
7589 0ebf8283 2019-07-24 stsp size_t size;
7590 0ebf8283 2019-07-24 stsp ssize_t len;
7591 0ebf8283 2019-07-24 stsp int lineno = 0, i;
7592 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7593 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
7594 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
7596 0ebf8283 2019-07-24 stsp for (;;) {
7597 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
7598 0ebf8283 2019-07-24 stsp if (len == -1) {
7599 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
7600 0ebf8283 2019-07-24 stsp if (feof(f))
7602 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
7603 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
7608 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7610 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
7611 0ebf8283 2019-07-24 stsp free(line);
7612 0ebf8283 2019-07-24 stsp line = NULL;
7615 0ebf8283 2019-07-24 stsp cmd = NULL;
7616 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7617 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
7618 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7619 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
7620 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
7623 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7628 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
7629 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7632 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7634 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
7635 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
7636 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
7639 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
7640 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7644 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
7645 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
7646 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7650 0ebf8283 2019-07-24 stsp free(line);
7651 0ebf8283 2019-07-24 stsp line = NULL;
7655 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
7657 0ebf8283 2019-07-24 stsp *end = '\0';
7659 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
7660 0ebf8283 2019-07-24 stsp if (err) {
7661 0ebf8283 2019-07-24 stsp /* override error code */
7662 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7666 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
7667 0ebf8283 2019-07-24 stsp if (hle == NULL) {
7668 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
7671 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
7672 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
7673 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
7674 0ebf8283 2019-07-24 stsp commit_id = NULL;
7675 0ebf8283 2019-07-24 stsp free(line);
7676 0ebf8283 2019-07-24 stsp line = NULL;
7677 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7680 0ebf8283 2019-07-24 stsp free(line);
7681 0ebf8283 2019-07-24 stsp free(commit_id);
7682 0ebf8283 2019-07-24 stsp return err;
7685 0ebf8283 2019-07-24 stsp static const struct got_error *
7686 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
7687 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
7689 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
7690 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
7691 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7692 5b87815e 2020-03-05 stsp static char msg[92];
7693 bfce7f83 2019-07-27 stsp char *id_str;
7695 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
7696 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7697 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
7698 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
7699 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7701 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7702 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
7703 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7704 5b87815e 2020-03-05 stsp if (hle == hle2)
7706 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
7707 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
7709 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
7711 5b87815e 2020-03-05 stsp return err;
7712 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
7713 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
7714 5b87815e 2020-03-05 stsp free(id_str);
7715 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7719 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7720 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7721 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7724 bfce7f83 2019-07-27 stsp if (hle == NULL) {
7725 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
7727 bfce7f83 2019-07-27 stsp return err;
7728 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
7729 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
7730 bfce7f83 2019-07-27 stsp free(id_str);
7731 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7735 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7736 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7737 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7738 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
7740 bfce7f83 2019-07-27 stsp return NULL;
7743 bfce7f83 2019-07-27 stsp static const struct got_error *
7744 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
7745 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
7746 bfce7f83 2019-07-27 stsp struct got_repository *repo)
7748 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7749 0ebf8283 2019-07-24 stsp char *editor;
7750 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7752 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7754 0ebf8283 2019-07-24 stsp return err;
7756 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
7757 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
7758 0ebf8283 2019-07-24 stsp goto done;
7761 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7762 0ebf8283 2019-07-24 stsp if (f == NULL) {
7763 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
7764 0ebf8283 2019-07-24 stsp goto done;
7766 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7768 bfce7f83 2019-07-27 stsp goto done;
7770 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
7772 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7773 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7774 0ebf8283 2019-07-24 stsp free(editor);
7775 0ebf8283 2019-07-24 stsp return err;
7778 0ebf8283 2019-07-24 stsp static const struct got_error *
7779 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7780 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
7781 514f2ffe 2020-01-29 stsp struct got_repository *);
7783 0ebf8283 2019-07-24 stsp static const struct got_error *
7784 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
7785 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
7786 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
7788 0ebf8283 2019-07-24 stsp const struct got_error *err;
7789 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7790 0ebf8283 2019-07-24 stsp char *path = NULL;
7792 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
7794 0ebf8283 2019-07-24 stsp return err;
7796 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
7798 0ebf8283 2019-07-24 stsp goto done;
7800 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7802 0ebf8283 2019-07-24 stsp goto done;
7804 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7805 083957f4 2020-02-24 stsp rewind(f);
7806 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7808 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
7809 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
7810 0ebf8283 2019-07-24 stsp goto done;
7813 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
7814 083957f4 2020-02-24 stsp if (err) {
7815 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7816 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7817 083957f4 2020-02-24 stsp goto done;
7818 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
7819 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
7823 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7824 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7825 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
7826 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
7827 0ebf8283 2019-07-24 stsp free(path);
7828 0ebf8283 2019-07-24 stsp return err;
7831 0ebf8283 2019-07-24 stsp static const struct got_error *
7832 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
7833 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7835 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7836 0ebf8283 2019-07-24 stsp char *path = NULL;
7837 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7838 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7839 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7841 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
7843 0ebf8283 2019-07-24 stsp return err;
7845 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
7846 0ebf8283 2019-07-24 stsp if (f == NULL) {
7847 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7848 0ebf8283 2019-07-24 stsp goto done;
7850 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7851 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7856 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7857 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
7858 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
7859 0ebf8283 2019-07-24 stsp if (n < 0) {
7860 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7866 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7867 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7868 0ebf8283 2019-07-24 stsp free(path);
7869 0ebf8283 2019-07-24 stsp if (commit)
7870 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7871 0ebf8283 2019-07-24 stsp return err;
7875 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
7877 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7879 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
7880 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
7881 bfce7f83 2019-07-27 stsp free(hle);
7885 0ebf8283 2019-07-24 stsp static const struct got_error *
7886 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
7887 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
7889 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7890 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7892 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7893 0ebf8283 2019-07-24 stsp if (f == NULL) {
7894 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7895 0ebf8283 2019-07-24 stsp goto done;
7898 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7900 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7901 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7902 0ebf8283 2019-07-24 stsp return err;
7905 0ebf8283 2019-07-24 stsp static const struct got_error *
7906 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7907 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
7908 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
7910 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
7911 0ebf8283 2019-07-24 stsp int resp = ' ';
7913 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
7914 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7915 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
7916 0ebf8283 2019-07-24 stsp resp = getchar();
7917 a61a4414 2019-08-07 stsp if (resp == '\n')
7918 a61a4414 2019-08-07 stsp resp = getchar();
7919 426ebf2e 2019-07-25 stsp if (resp == 'c') {
7920 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7921 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
7923 426ebf2e 2019-07-25 stsp if (err) {
7924 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7925 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7927 bfce7f83 2019-07-27 stsp prev_err = err;
7928 426ebf2e 2019-07-25 stsp resp = ' ';
7932 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
7933 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7934 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
7935 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
7936 426ebf2e 2019-07-25 stsp if (err) {
7937 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7938 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7940 bfce7f83 2019-07-27 stsp prev_err = err;
7941 426ebf2e 2019-07-25 stsp resp = ' ';
7945 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
7946 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7949 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
7952 0ebf8283 2019-07-24 stsp return err;
7955 0ebf8283 2019-07-24 stsp static const struct got_error *
7956 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
7957 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7958 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
7960 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7961 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7962 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7963 3e3a69f1 2019-07-25 stsp branch, repo);
7966 0ebf8283 2019-07-24 stsp static const struct got_error *
7967 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
7968 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7970 0ebf8283 2019-07-24 stsp const struct got_error *err;
7971 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7973 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
7975 0ebf8283 2019-07-24 stsp goto done;
7977 0ebf8283 2019-07-24 stsp if (new_id) {
7978 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
7980 0ebf8283 2019-07-24 stsp goto done;
7983 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
7984 0ebf8283 2019-07-24 stsp if (new_id_str)
7985 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
7987 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7988 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
7989 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
7990 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7991 0ebf8283 2019-07-24 stsp goto done;
7993 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
7995 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7997 0ebf8283 2019-07-24 stsp goto done;
8000 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8001 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8002 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8003 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8004 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8006 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8007 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8008 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8015 0ebf8283 2019-07-24 stsp free(old_id_str);
8016 0ebf8283 2019-07-24 stsp free(new_id_str);
8017 0ebf8283 2019-07-24 stsp return err;
8020 0ebf8283 2019-07-24 stsp static const struct got_error *
8021 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8022 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8023 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8024 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8026 0ebf8283 2019-07-24 stsp const struct got_error *err;
8027 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8028 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8030 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8031 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8032 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8034 0ebf8283 2019-07-24 stsp return err;
8037 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8039 0ebf8283 2019-07-24 stsp return err;
8041 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8042 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8043 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8044 0ebf8283 2019-07-24 stsp if (err) {
8045 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8046 0ebf8283 2019-07-24 stsp goto done;
8047 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8049 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8050 0ebf8283 2019-07-24 stsp free(new_commit_id);
8053 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8054 0ebf8283 2019-07-24 stsp return err;
8057 0ebf8283 2019-07-24 stsp static const struct got_error *
8058 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8059 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8061 0ebf8283 2019-07-24 stsp const struct got_error *error;
8062 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8064 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8066 0ebf8283 2019-07-24 stsp if (error)
8067 0ebf8283 2019-07-24 stsp return error;
8069 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8070 0ebf8283 2019-07-24 stsp if (error)
8071 0ebf8283 2019-07-24 stsp return error;
8073 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8074 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8075 0ebf8283 2019-07-24 stsp return error;
8078 ab20a43a 2020-01-29 stsp static const struct got_error *
8079 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8080 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8081 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8082 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8084 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8086 ab20a43a 2020-01-29 stsp switch (status) {
8087 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8088 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8089 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8090 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8091 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8092 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8097 ab20a43a 2020-01-29 stsp switch (staged_status) {
8098 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8099 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8100 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8101 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8102 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8107 ab20a43a 2020-01-29 stsp return NULL;
8110 0ebf8283 2019-07-24 stsp static const struct got_error *
8111 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8113 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8114 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8115 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8116 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8117 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8118 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8119 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8120 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8121 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8122 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8123 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8124 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8125 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8126 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8127 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
8128 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8129 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8130 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8131 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8132 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8133 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8134 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8135 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8137 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8138 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8139 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8140 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8142 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8143 0ebf8283 2019-07-24 stsp switch (ch) {
8145 0ebf8283 2019-07-24 stsp abort_edit = 1;
8148 0ebf8283 2019-07-24 stsp continue_edit = 1;
8151 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8154 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8157 0ebf8283 2019-07-24 stsp usage_histedit();
8158 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8162 0ebf8283 2019-07-24 stsp argc -= optind;
8163 0ebf8283 2019-07-24 stsp argv += optind;
8165 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8166 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8167 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8168 0ebf8283 2019-07-24 stsp err(1, "pledge");
8170 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8171 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
8172 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8173 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
8174 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8175 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
8176 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8177 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
8178 0ebf8283 2019-07-24 stsp if (argc != 0)
8179 0ebf8283 2019-07-24 stsp usage_histedit();
8182 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8183 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8184 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8185 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8186 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8187 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8190 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8191 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8192 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8193 0ebf8283 2019-07-24 stsp goto done;
8195 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8196 fa51e947 2020-03-27 stsp if (error) {
8197 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8198 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8199 0ebf8283 2019-07-24 stsp goto done;
8202 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8204 0ebf8283 2019-07-24 stsp if (error != NULL)
8205 0ebf8283 2019-07-24 stsp goto done;
8207 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8208 0ebf8283 2019-07-24 stsp if (error)
8209 0ebf8283 2019-07-24 stsp goto done;
8210 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8211 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8212 0ebf8283 2019-07-24 stsp goto done;
8215 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8216 0ebf8283 2019-07-24 stsp if (error)
8217 0ebf8283 2019-07-24 stsp goto done;
8219 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8220 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8221 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8222 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8223 083957f4 2020-02-24 stsp "before the -m option can be used");
8224 083957f4 2020-02-24 stsp goto done;
8227 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8228 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8229 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8230 3e3a69f1 2019-07-25 stsp worktree, repo);
8231 0ebf8283 2019-07-24 stsp if (error)
8232 0ebf8283 2019-07-24 stsp goto done;
8233 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8234 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8235 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8236 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8237 0ebf8283 2019-07-24 stsp if (error)
8238 0ebf8283 2019-07-24 stsp goto done;
8239 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8240 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8241 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8242 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8243 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8244 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8245 0ebf8283 2019-07-24 stsp goto done;
8248 0ebf8283 2019-07-24 stsp if (continue_edit) {
8249 0ebf8283 2019-07-24 stsp char *path;
8251 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8252 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8253 0ebf8283 2019-07-24 stsp goto done;
8256 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8257 0ebf8283 2019-07-24 stsp if (error)
8258 0ebf8283 2019-07-24 stsp goto done;
8260 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8261 0ebf8283 2019-07-24 stsp free(path);
8262 0ebf8283 2019-07-24 stsp if (error)
8263 0ebf8283 2019-07-24 stsp goto done;
8265 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8266 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8267 3e3a69f1 2019-07-25 stsp worktree, repo);
8268 0ebf8283 2019-07-24 stsp if (error)
8269 0ebf8283 2019-07-24 stsp goto done;
8271 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8272 0ebf8283 2019-07-24 stsp if (error)
8273 0ebf8283 2019-07-24 stsp goto done;
8275 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8276 0ebf8283 2019-07-24 stsp head_commit_id);
8277 0ebf8283 2019-07-24 stsp if (error)
8278 0ebf8283 2019-07-24 stsp goto done;
8279 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8280 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8281 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8282 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8283 3aac7cf7 2019-07-25 stsp goto done;
8285 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8286 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8287 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8288 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8289 0ebf8283 2019-07-24 stsp commit = NULL;
8290 0ebf8283 2019-07-24 stsp if (error)
8291 0ebf8283 2019-07-24 stsp goto done;
8293 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8294 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8295 0ebf8283 2019-07-24 stsp goto done;
8298 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8299 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8300 0ebf8283 2019-07-24 stsp if (error != NULL)
8301 0ebf8283 2019-07-24 stsp goto done;
8303 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8304 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8305 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8306 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8307 c7d20a3f 2019-07-30 stsp goto done;
8310 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8311 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8312 bfce7f83 2019-07-27 stsp branch = NULL;
8313 0ebf8283 2019-07-24 stsp if (error)
8314 0ebf8283 2019-07-24 stsp goto done;
8316 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8317 0ebf8283 2019-07-24 stsp head_commit_id);
8318 0ebf8283 2019-07-24 stsp if (error)
8319 0ebf8283 2019-07-24 stsp goto done;
8320 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8321 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8322 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8323 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8324 3aac7cf7 2019-07-25 stsp goto done;
8326 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8327 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8328 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8329 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8330 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8331 0ebf8283 2019-07-24 stsp commit = NULL;
8332 0ebf8283 2019-07-24 stsp if (error)
8333 0ebf8283 2019-07-24 stsp goto done;
8335 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8336 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8337 c5996fff 2020-01-29 stsp goto done;
8340 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8341 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8342 bfce7f83 2019-07-27 stsp if (error)
8343 bfce7f83 2019-07-27 stsp goto done;
8345 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8346 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8347 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8348 6ba2bea2 2019-07-27 stsp if (error) {
8349 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8350 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8351 9627c110 2020-04-18 stsp update_progress, &upa);
8352 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8353 0ebf8283 2019-07-24 stsp goto done;
8356 514f2ffe 2020-01-29 stsp const char *branch_name;
8357 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8358 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8359 514f2ffe 2020-01-29 stsp branch_name += 11;
8360 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8361 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8362 6ba2bea2 2019-07-27 stsp if (error) {
8363 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8364 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8365 9627c110 2020-04-18 stsp update_progress, &upa);
8366 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8367 0ebf8283 2019-07-24 stsp goto done;
8372 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8374 6ba2bea2 2019-07-27 stsp if (error) {
8375 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8376 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8377 9627c110 2020-04-18 stsp update_progress, &upa);
8378 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8379 0ebf8283 2019-07-24 stsp goto done;
8384 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8385 4ec14e60 2019-08-28 hiltjo if (error)
8386 0ebf8283 2019-07-24 stsp goto done;
8388 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8389 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8390 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8391 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8394 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8395 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8396 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8397 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8399 ab20a43a 2020-01-29 stsp if (error)
8400 ab20a43a 2020-01-29 stsp goto done;
8402 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8403 ab20a43a 2020-01-29 stsp int have_changes = 0;
8405 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8406 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8407 ab20a43a 2020-01-29 stsp if (error)
8408 ab20a43a 2020-01-29 stsp goto done;
8409 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8410 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8411 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8412 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8413 ab20a43a 2020-01-29 stsp if (error) {
8414 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8415 ab20a43a 2020-01-29 stsp goto done;
8416 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8417 ab20a43a 2020-01-29 stsp goto done;
8419 ab20a43a 2020-01-29 stsp if (have_changes) {
8420 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8421 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8422 ab20a43a 2020-01-29 stsp if (error)
8423 ab20a43a 2020-01-29 stsp goto done;
8425 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8426 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8427 ab20a43a 2020-01-29 stsp if (error)
8428 ab20a43a 2020-01-29 stsp goto done;
8429 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8430 ab20a43a 2020-01-29 stsp hle, NULL);
8431 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8432 ab20a43a 2020-01-29 stsp commit = NULL;
8433 ab20a43a 2020-01-29 stsp if (error)
8434 ab20a43a 2020-01-29 stsp goto done;
8440 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8441 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8442 0ebf8283 2019-07-24 stsp if (error)
8443 0ebf8283 2019-07-24 stsp goto done;
8447 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8448 0ebf8283 2019-07-24 stsp hle->commit_id);
8449 0ebf8283 2019-07-24 stsp if (error)
8450 0ebf8283 2019-07-24 stsp goto done;
8451 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8452 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8454 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8455 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8456 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8457 0ebf8283 2019-07-24 stsp if (error)
8458 0ebf8283 2019-07-24 stsp goto done;
8459 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8460 0ebf8283 2019-07-24 stsp commit = NULL;
8462 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8463 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8464 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8466 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8467 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8469 a0ea4fc0 2020-02-28 stsp if (error)
8470 a0ea4fc0 2020-02-28 stsp goto done;
8471 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8475 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8476 0ebf8283 2019-07-24 stsp char *id_str;
8477 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8478 0ebf8283 2019-07-24 stsp if (error)
8479 0ebf8283 2019-07-24 stsp goto done;
8480 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8482 0ebf8283 2019-07-24 stsp free(id_str);
8483 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8484 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8485 3e3a69f1 2019-07-25 stsp fileindex);
8486 0ebf8283 2019-07-24 stsp goto done;
8489 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8490 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8491 0ebf8283 2019-07-24 stsp if (error)
8492 0ebf8283 2019-07-24 stsp goto done;
8496 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8497 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8498 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8499 0ebf8283 2019-07-24 stsp if (error)
8500 0ebf8283 2019-07-24 stsp goto done;
8503 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8504 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8505 0ebf8283 2019-07-24 stsp if (error)
8506 0ebf8283 2019-07-24 stsp goto done;
8507 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8508 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8510 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8511 3e3a69f1 2019-07-25 stsp branch, repo);
8513 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8514 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8515 0ebf8283 2019-07-24 stsp free(head_commit_id);
8516 0ebf8283 2019-07-24 stsp free(base_commit_id);
8517 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8518 0ebf8283 2019-07-24 stsp if (commit)
8519 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8520 0ebf8283 2019-07-24 stsp if (branch)
8521 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8522 0ebf8283 2019-07-24 stsp if (tmp_branch)
8523 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8524 0ebf8283 2019-07-24 stsp if (worktree)
8525 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8527 2822a352 2019-10-15 stsp got_repo_close(repo);
8528 2822a352 2019-10-15 stsp return error;
8531 2822a352 2019-10-15 stsp __dead static void
8532 2822a352 2019-10-15 stsp usage_integrate(void)
8534 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8538 2822a352 2019-10-15 stsp static const struct got_error *
8539 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8541 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8542 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8543 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8544 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8545 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8546 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8547 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8548 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8550 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8552 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8553 2822a352 2019-10-15 stsp switch (ch) {
8555 2822a352 2019-10-15 stsp usage_integrate();
8556 2822a352 2019-10-15 stsp /* NOTREACHED */
8560 2822a352 2019-10-15 stsp argc -= optind;
8561 2822a352 2019-10-15 stsp argv += optind;
8563 2822a352 2019-10-15 stsp if (argc != 1)
8564 2822a352 2019-10-15 stsp usage_integrate();
8565 2822a352 2019-10-15 stsp branch_arg = argv[0];
8567 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8568 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
8569 2822a352 2019-10-15 stsp err(1, "pledge");
8571 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
8572 2822a352 2019-10-15 stsp if (cwd == NULL) {
8573 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
8574 2822a352 2019-10-15 stsp goto done;
8577 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
8578 fa51e947 2020-03-27 stsp if (error) {
8579 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8580 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
8582 2822a352 2019-10-15 stsp goto done;
8585 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
8586 2822a352 2019-10-15 stsp if (error)
8587 2822a352 2019-10-15 stsp goto done;
8589 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8591 2822a352 2019-10-15 stsp if (error != NULL)
8592 2822a352 2019-10-15 stsp goto done;
8594 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8595 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
8596 2822a352 2019-10-15 stsp if (error)
8597 2822a352 2019-10-15 stsp goto done;
8599 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8600 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
8601 2822a352 2019-10-15 stsp goto done;
8604 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8605 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
8606 2822a352 2019-10-15 stsp if (error)
8607 2822a352 2019-10-15 stsp goto done;
8609 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
8610 2822a352 2019-10-15 stsp if (refname == NULL) {
8611 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8612 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8613 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8614 2822a352 2019-10-15 stsp goto done;
8616 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
8617 2822a352 2019-10-15 stsp if (base_refname == NULL) {
8618 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8619 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8620 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8621 2822a352 2019-10-15 stsp goto done;
8624 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
8625 2822a352 2019-10-15 stsp if (error)
8626 2822a352 2019-10-15 stsp goto done;
8628 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8629 2822a352 2019-10-15 stsp if (error)
8630 2822a352 2019-10-15 stsp goto done;
8632 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8633 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
8634 2822a352 2019-10-15 stsp "specified branch has already been integrated");
8635 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8636 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8637 2822a352 2019-10-15 stsp goto done;
8640 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8641 2822a352 2019-10-15 stsp if (error) {
8642 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
8643 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
8644 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8645 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8646 2822a352 2019-10-15 stsp goto done;
8649 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8650 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
8651 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
8652 2822a352 2019-10-15 stsp check_cancelled, NULL);
8653 2822a352 2019-10-15 stsp if (error)
8654 2822a352 2019-10-15 stsp goto done;
8656 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
8657 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8660 715dc77e 2019-08-03 stsp got_repo_close(repo);
8661 2822a352 2019-10-15 stsp if (worktree)
8662 2822a352 2019-10-15 stsp got_worktree_close(worktree);
8663 2822a352 2019-10-15 stsp free(cwd);
8664 2822a352 2019-10-15 stsp free(base_commit_id);
8665 2822a352 2019-10-15 stsp free(commit_id);
8666 2822a352 2019-10-15 stsp free(refname);
8667 2822a352 2019-10-15 stsp free(base_refname);
8668 715dc77e 2019-08-03 stsp return error;
8671 715dc77e 2019-08-03 stsp __dead static void
8672 715dc77e 2019-08-03 stsp usage_stage(void)
8674 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8675 f3055044 2019-08-07 stsp "[file-path ...]\n",
8676 715dc77e 2019-08-03 stsp getprogname());
8680 715dc77e 2019-08-03 stsp static const struct got_error *
8681 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
8682 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
8683 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8684 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
8686 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
8687 408b4ebc 2019-08-03 stsp char *id_str = NULL;
8689 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
8690 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
8691 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
8692 408b4ebc 2019-08-03 stsp return NULL;
8694 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
8695 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
8696 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
8698 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
8700 408b4ebc 2019-08-03 stsp return err;
8702 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
8703 408b4ebc 2019-08-03 stsp free(id_str);
8704 dc424a06 2019-08-07 stsp return NULL;
8707 dc424a06 2019-08-07 stsp static const struct got_error *
8708 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
8710 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
8711 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
8712 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
8713 715dc77e 2019-08-03 stsp char *cwd = NULL;
8714 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
8715 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
8716 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
8717 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
8718 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8719 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8721 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
8723 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8724 715dc77e 2019-08-03 stsp switch (ch) {
8726 408b4ebc 2019-08-03 stsp list_stage = 1;
8729 dc424a06 2019-08-07 stsp pflag = 1;
8732 dc424a06 2019-08-07 stsp patch_script_path = optarg;
8735 715dc77e 2019-08-03 stsp usage_stage();
8736 715dc77e 2019-08-03 stsp /* NOTREACHED */
8740 715dc77e 2019-08-03 stsp argc -= optind;
8741 715dc77e 2019-08-03 stsp argv += optind;
8743 715dc77e 2019-08-03 stsp #ifndef PROFILE
8744 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8745 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
8746 715dc77e 2019-08-03 stsp err(1, "pledge");
8748 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
8749 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
8750 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
8751 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
8753 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
8754 715dc77e 2019-08-03 stsp if (cwd == NULL) {
8755 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
8756 715dc77e 2019-08-03 stsp goto done;
8759 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8760 fa51e947 2020-03-27 stsp if (error) {
8761 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8762 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
8763 715dc77e 2019-08-03 stsp goto done;
8766 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8768 715dc77e 2019-08-03 stsp if (error != NULL)
8769 715dc77e 2019-08-03 stsp goto done;
8771 dc424a06 2019-08-07 stsp if (patch_script_path) {
8772 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
8773 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
8774 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
8775 dc424a06 2019-08-07 stsp patch_script_path);
8776 dc424a06 2019-08-07 stsp goto done;
8779 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8780 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
8781 715dc77e 2019-08-03 stsp if (error)
8782 715dc77e 2019-08-03 stsp goto done;
8784 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8785 6d022e97 2019-08-04 stsp if (error)
8786 6d022e97 2019-08-04 stsp goto done;
8788 6d022e97 2019-08-04 stsp if (list_stage)
8789 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
8790 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
8792 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8793 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
8794 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
8795 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
8796 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
8799 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8800 2e1f37b0 2019-08-08 stsp error == NULL)
8801 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8803 ad493afc 2019-08-03 stsp got_repo_close(repo);
8804 ad493afc 2019-08-03 stsp if (worktree)
8805 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
8806 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8807 ad493afc 2019-08-03 stsp free((char *)pe->path);
8808 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
8809 ad493afc 2019-08-03 stsp free(cwd);
8810 ad493afc 2019-08-03 stsp return error;
8813 ad493afc 2019-08-03 stsp __dead static void
8814 ad493afc 2019-08-03 stsp usage_unstage(void)
8816 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8817 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
8818 ad493afc 2019-08-03 stsp getprogname());
8823 ad493afc 2019-08-03 stsp static const struct got_error *
8824 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
8826 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
8827 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
8828 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
8829 ad493afc 2019-08-03 stsp char *cwd = NULL;
8830 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
8831 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8832 9627c110 2020-04-18 stsp int ch, pflag = 0;
8833 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8834 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
8835 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8836 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8838 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
8840 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
8841 ad493afc 2019-08-03 stsp switch (ch) {
8843 2e1f37b0 2019-08-08 stsp pflag = 1;
8846 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
8849 ad493afc 2019-08-03 stsp usage_unstage();
8850 ad493afc 2019-08-03 stsp /* NOTREACHED */
8854 ad493afc 2019-08-03 stsp argc -= optind;
8855 ad493afc 2019-08-03 stsp argv += optind;
8857 ad493afc 2019-08-03 stsp #ifndef PROFILE
8858 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8859 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
8860 ad493afc 2019-08-03 stsp err(1, "pledge");
8862 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
8863 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
8865 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
8866 ad493afc 2019-08-03 stsp if (cwd == NULL) {
8867 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
8868 ad493afc 2019-08-03 stsp goto done;
8871 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8872 fa51e947 2020-03-27 stsp if (error) {
8873 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8874 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
8875 ad493afc 2019-08-03 stsp goto done;
8878 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8880 ad493afc 2019-08-03 stsp if (error != NULL)
8881 ad493afc 2019-08-03 stsp goto done;
8883 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
8884 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
8885 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
8886 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
8887 2e1f37b0 2019-08-08 stsp patch_script_path);
8888 2e1f37b0 2019-08-08 stsp goto done;
8892 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8893 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
8894 ad493afc 2019-08-03 stsp if (error)
8895 ad493afc 2019-08-03 stsp goto done;
8897 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8898 ad493afc 2019-08-03 stsp if (error)
8899 ad493afc 2019-08-03 stsp goto done;
8901 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8902 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
8903 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8904 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
8905 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
8906 9627c110 2020-04-18 stsp if (!error)
8907 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8909 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8910 2e1f37b0 2019-08-08 stsp error == NULL)
8911 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8913 0ebf8283 2019-07-24 stsp got_repo_close(repo);
8914 715dc77e 2019-08-03 stsp if (worktree)
8915 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
8916 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8917 715dc77e 2019-08-03 stsp free((char *)pe->path);
8918 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
8919 715dc77e 2019-08-03 stsp free(cwd);
8920 01073a5d 2019-08-22 stsp return error;
8923 01073a5d 2019-08-22 stsp __dead static void
8924 01073a5d 2019-08-22 stsp usage_cat(void)
8926 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8927 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
8931 01073a5d 2019-08-22 stsp static const struct got_error *
8932 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8934 01073a5d 2019-08-22 stsp const struct got_error *err;
8935 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
8937 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
8939 01073a5d 2019-08-22 stsp return err;
8941 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8942 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
8943 01073a5d 2019-08-22 stsp return err;
8946 01073a5d 2019-08-22 stsp static const struct got_error *
8947 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8949 01073a5d 2019-08-22 stsp const struct got_error *err;
8950 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
8951 56e0773d 2019-11-28 stsp int nentries, i;
8953 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
8955 01073a5d 2019-08-22 stsp return err;
8957 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
8958 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
8959 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
8960 01073a5d 2019-08-22 stsp char *id_str;
8961 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
8963 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
8964 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8967 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
8968 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
8969 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
8970 01073a5d 2019-08-22 stsp free(id_str);
8973 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
8974 01073a5d 2019-08-22 stsp return err;
8977 01073a5d 2019-08-22 stsp static const struct got_error *
8978 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8980 01073a5d 2019-08-22 stsp const struct got_error *err;
8981 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
8982 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
8983 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
8984 01073a5d 2019-08-22 stsp char *id_str = NULL;
8985 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
8987 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
8989 01073a5d 2019-08-22 stsp return err;
8991 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8993 01073a5d 2019-08-22 stsp goto done;
8995 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8996 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8997 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
8998 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
8999 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9000 01073a5d 2019-08-22 stsp char *pid_str;
9001 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9003 01073a5d 2019-08-22 stsp goto done;
9004 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9005 01073a5d 2019-08-22 stsp free(pid_str);
9007 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9008 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9009 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
9011 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9012 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9013 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
9015 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9016 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9017 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9019 01073a5d 2019-08-22 stsp free(id_str);
9020 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9021 01073a5d 2019-08-22 stsp return err;
9024 01073a5d 2019-08-22 stsp static const struct got_error *
9025 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9027 01073a5d 2019-08-22 stsp const struct got_error *err;
9028 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9029 01073a5d 2019-08-22 stsp char *id_str = NULL;
9030 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9032 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9034 01073a5d 2019-08-22 stsp return err;
9036 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9038 01073a5d 2019-08-22 stsp goto done;
9040 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9042 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9043 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9044 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9045 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9047 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9048 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9049 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9051 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9052 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9053 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9055 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9056 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9057 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9063 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9064 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9066 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9067 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9068 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
9070 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9071 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9072 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9074 01073a5d 2019-08-22 stsp free(id_str);
9075 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9076 01073a5d 2019-08-22 stsp return err;
9079 01073a5d 2019-08-22 stsp static const struct got_error *
9080 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9082 01073a5d 2019-08-22 stsp const struct got_error *error;
9083 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9084 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9085 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9086 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9087 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9088 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9090 01073a5d 2019-08-22 stsp #ifndef PROFILE
9091 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9092 01073a5d 2019-08-22 stsp NULL) == -1)
9093 01073a5d 2019-08-22 stsp err(1, "pledge");
9096 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9097 01073a5d 2019-08-22 stsp switch (ch) {
9099 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9102 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9103 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9104 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9106 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9109 896e9b6f 2019-08-26 stsp force_path = 1;
9112 01073a5d 2019-08-22 stsp usage_cat();
9113 01073a5d 2019-08-22 stsp /* NOTREACHED */
9117 01073a5d 2019-08-22 stsp argc -= optind;
9118 01073a5d 2019-08-22 stsp argv += optind;
9120 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9121 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9122 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9123 01073a5d 2019-08-22 stsp goto done;
9125 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9126 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9127 01073a5d 2019-08-22 stsp goto done;
9128 01073a5d 2019-08-22 stsp if (worktree) {
9129 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9130 01073a5d 2019-08-22 stsp repo_path = strdup(
9131 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9132 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9133 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9134 01073a5d 2019-08-22 stsp goto done;
9139 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9140 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9141 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9142 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9145 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9146 01073a5d 2019-08-22 stsp free(repo_path);
9147 01073a5d 2019-08-22 stsp if (error != NULL)
9148 01073a5d 2019-08-22 stsp goto done;
9150 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9151 896e9b6f 2019-08-26 stsp if (error)
9152 896e9b6f 2019-08-26 stsp goto done;
9154 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9155 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9156 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9157 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9158 01073a5d 2019-08-22 stsp if (error)
9159 01073a5d 2019-08-22 stsp goto done;
9161 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9162 896e9b6f 2019-08-26 stsp if (force_path) {
9163 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9165 896e9b6f 2019-08-26 stsp if (error)
9168 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9169 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9170 896e9b6f 2019-08-26 stsp if (error) {
9171 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9172 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9174 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9175 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9176 896e9b6f 2019-08-26 stsp if (error)
9181 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9182 01073a5d 2019-08-22 stsp if (error)
9185 01073a5d 2019-08-22 stsp switch (obj_type) {
9186 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9187 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9189 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9190 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9192 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9193 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9195 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9196 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9199 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9202 01073a5d 2019-08-22 stsp if (error)
9204 01073a5d 2019-08-22 stsp free(label);
9205 01073a5d 2019-08-22 stsp label = NULL;
9207 01073a5d 2019-08-22 stsp id = NULL;
9210 01073a5d 2019-08-22 stsp free(label);
9212 896e9b6f 2019-08-26 stsp free(commit_id);
9213 01073a5d 2019-08-22 stsp if (worktree)
9214 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9215 01073a5d 2019-08-22 stsp if (repo) {
9216 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9217 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9218 01073a5d 2019-08-22 stsp if (error == NULL)
9219 01073a5d 2019-08-22 stsp error = repo_error;
9221 0ebf8283 2019-07-24 stsp return error;
