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 0d6c6ee3 2020-05-20 stsp static const struct got_error *
4303 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4304 0d6c6ee3 2020-05-20 stsp const char *root_path, struct got_repository *repo)
4306 0d6c6ee3 2020-05-20 stsp const struct got_error *err = NULL;
4307 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4308 848d6979 2019-08-12 stsp const char *modestr = "";
4309 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4310 0d6c6ee3 2020-05-20 stsp char *link_target = NULL;
4312 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4313 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4316 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4317 63c5ca5d 2019-08-24 stsp modestr = "$";
4318 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4321 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4323 0d6c6ee3 2020-05-20 stsp return err;
4324 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4325 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4326 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4329 848d6979 2019-08-12 stsp modestr = "@";
4331 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4332 848d6979 2019-08-12 stsp modestr = "/";
4333 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4334 848d6979 2019-08-12 stsp modestr = "*";
4336 0d6c6ee3 2020-05-20 stsp printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4337 0d6c6ee3 2020-05-20 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4338 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "", link_target ? link_target : "");
4340 0d6c6ee3 2020-05-20 stsp free(link_target);
4341 0d6c6ee3 2020-05-20 stsp return NULL;
4344 5de5890b 2018-10-18 stsp static const struct got_error *
4345 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4346 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4347 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4349 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4350 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4351 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4352 56e0773d 2019-11-28 stsp int nentries, i;
4354 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4356 5de5890b 2018-10-18 stsp goto done;
4358 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4360 5de5890b 2018-10-18 stsp goto done;
4361 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4362 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4363 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4364 5de5890b 2018-10-18 stsp char *id = NULL;
4366 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4369 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4370 5de5890b 2018-10-18 stsp if (show_ids) {
4371 5de5890b 2018-10-18 stsp char *id_str;
4372 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4373 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4375 5de5890b 2018-10-18 stsp goto done;
4376 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4377 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4378 5de5890b 2018-10-18 stsp free(id_str);
4379 5de5890b 2018-10-18 stsp goto done;
4381 5de5890b 2018-10-18 stsp free(id_str);
4383 0d6c6ee3 2020-05-20 stsp err = print_entry(te, id, path, root_path, repo);
4386 0d6c6ee3 2020-05-20 stsp goto done;
4388 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4389 c1669e2e 2019-01-09 stsp char *child_path;
4390 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4391 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4392 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4393 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4394 c1669e2e 2019-01-09 stsp goto done;
4396 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4397 c1669e2e 2019-01-09 stsp root_path, repo);
4398 c1669e2e 2019-01-09 stsp free(child_path);
4400 c1669e2e 2019-01-09 stsp goto done;
4405 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4406 5de5890b 2018-10-18 stsp free(tree_id);
4407 5de5890b 2018-10-18 stsp return err;
4410 5de5890b 2018-10-18 stsp static const struct got_error *
4411 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4413 5de5890b 2018-10-18 stsp const struct got_error *error;
4414 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4415 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4416 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4417 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4418 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4419 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4420 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4423 5de5890b 2018-10-18 stsp #ifndef PROFILE
4424 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4425 0f8d269b 2019-01-04 stsp NULL) == -1)
4426 5de5890b 2018-10-18 stsp err(1, "pledge");
4429 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4430 5de5890b 2018-10-18 stsp switch (ch) {
4432 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4435 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4436 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4437 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4439 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4442 5de5890b 2018-10-18 stsp show_ids = 1;
4445 c1669e2e 2019-01-09 stsp recurse = 1;
4448 2deda0b9 2019-03-07 stsp usage_tree();
4449 5de5890b 2018-10-18 stsp /* NOTREACHED */
4453 5de5890b 2018-10-18 stsp argc -= optind;
4454 5de5890b 2018-10-18 stsp argv += optind;
4456 5de5890b 2018-10-18 stsp if (argc == 1)
4457 5de5890b 2018-10-18 stsp path = argv[0];
4458 5de5890b 2018-10-18 stsp else if (argc > 1)
4459 5de5890b 2018-10-18 stsp usage_tree();
4461 7a2c19d6 2019-02-05 stsp path = NULL;
4463 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4464 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4465 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4466 9bf7a39b 2019-02-05 stsp goto done;
4468 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4469 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4470 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4471 7a2c19d6 2019-02-05 stsp goto done;
4473 7a2c19d6 2019-02-05 stsp error = NULL;
4474 7a2c19d6 2019-02-05 stsp if (worktree) {
4475 7a2c19d6 2019-02-05 stsp repo_path =
4476 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4477 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4478 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4479 7a2c19d6 2019-02-05 stsp if (error)
4480 7a2c19d6 2019-02-05 stsp goto done;
4482 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4483 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4484 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4485 7a2c19d6 2019-02-05 stsp goto done;
4490 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4491 5de5890b 2018-10-18 stsp if (error != NULL)
4492 c02c541e 2019-03-29 stsp goto done;
4494 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4495 c02c541e 2019-03-29 stsp if (error)
4496 5de5890b 2018-10-18 stsp goto done;
4498 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4499 9bf7a39b 2019-02-05 stsp if (worktree) {
4500 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4501 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4502 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4503 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4504 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4505 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4506 9bf7a39b 2019-02-05 stsp goto done;
4508 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4510 9bf7a39b 2019-02-05 stsp if (error)
4511 9bf7a39b 2019-02-05 stsp goto done;
4513 9bf7a39b 2019-02-05 stsp path = "/";
4515 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4516 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4517 9bf7a39b 2019-02-05 stsp if (error != NULL)
4518 9bf7a39b 2019-02-05 stsp goto done;
4521 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4522 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4523 4e0a20a4 2020-03-23 tracey if (worktree)
4524 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4526 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4527 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4528 5de5890b 2018-10-18 stsp if (error != NULL)
4529 5de5890b 2018-10-18 stsp goto done;
4530 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4531 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4532 5de5890b 2018-10-18 stsp if (error != NULL)
4533 5de5890b 2018-10-18 stsp goto done;
4535 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4536 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4537 30837e32 2019-07-25 stsp if (error)
4538 5de5890b 2018-10-18 stsp goto done;
4541 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4542 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4544 5de5890b 2018-10-18 stsp free(in_repo_path);
4545 5de5890b 2018-10-18 stsp free(repo_path);
4546 5de5890b 2018-10-18 stsp free(cwd);
4547 5de5890b 2018-10-18 stsp free(commit_id);
4548 7a2c19d6 2019-02-05 stsp if (worktree)
4549 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4550 5de5890b 2018-10-18 stsp if (repo) {
4551 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4552 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4553 5de5890b 2018-10-18 stsp if (error == NULL)
4554 5de5890b 2018-10-18 stsp error = repo_error;
4556 5de5890b 2018-10-18 stsp return error;
4559 6bad629b 2019-02-04 stsp __dead static void
4560 6bad629b 2019-02-04 stsp usage_status(void)
4562 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4566 b72f483a 2019-02-05 stsp static const struct got_error *
4567 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4568 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4569 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4570 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4572 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4573 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4574 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4575 b72f483a 2019-02-05 stsp return NULL;
4578 6bad629b 2019-02-04 stsp static const struct got_error *
4579 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4581 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4582 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4583 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4584 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
4585 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4586 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4589 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4591 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4592 6bad629b 2019-02-04 stsp switch (ch) {
4594 2deda0b9 2019-03-07 stsp usage_status();
4595 6bad629b 2019-02-04 stsp /* NOTREACHED */
4599 6bad629b 2019-02-04 stsp argc -= optind;
4600 6bad629b 2019-02-04 stsp argv += optind;
4602 6bad629b 2019-02-04 stsp #ifndef PROFILE
4603 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4604 6bad629b 2019-02-04 stsp NULL) == -1)
4605 6bad629b 2019-02-04 stsp err(1, "pledge");
4607 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4608 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4609 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4610 927df6b7 2019-02-10 stsp goto done;
4613 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
4614 fa51e947 2020-03-27 stsp if (error) {
4615 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4616 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
4617 a5edda0a 2019-07-27 stsp goto done;
4620 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4622 6bad629b 2019-02-04 stsp if (error != NULL)
4623 6bad629b 2019-02-04 stsp goto done;
4625 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4626 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4627 087fb88c 2019-08-04 stsp if (error)
4628 087fb88c 2019-08-04 stsp goto done;
4630 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4631 6bad629b 2019-02-04 stsp if (error)
4632 6bad629b 2019-02-04 stsp goto done;
4634 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4635 6bad629b 2019-02-04 stsp check_cancelled, NULL);
4637 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
4638 a5edda0a 2019-07-27 stsp free((char *)pe->path);
4639 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4640 927df6b7 2019-02-10 stsp free(cwd);
4641 d0eebce4 2019-03-11 stsp return error;
4644 d0eebce4 2019-03-11 stsp __dead static void
4645 d0eebce4 2019-03-11 stsp usage_ref(void)
4647 d0eebce4 2019-03-11 stsp fprintf(stderr,
4648 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4649 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
4650 d0eebce4 2019-03-11 stsp getprogname());
4654 d0eebce4 2019-03-11 stsp static const struct got_error *
4655 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
4657 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
4658 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
4659 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
4661 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
4662 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4664 d0eebce4 2019-03-11 stsp return err;
4666 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4667 d0eebce4 2019-03-11 stsp char *refstr;
4668 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
4669 d0eebce4 2019-03-11 stsp if (refstr == NULL)
4670 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
4671 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4672 d0eebce4 2019-03-11 stsp free(refstr);
4675 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4676 d0eebce4 2019-03-11 stsp return NULL;
4679 d0eebce4 2019-03-11 stsp static const struct got_error *
4680 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
4682 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4683 d0eebce4 2019-03-11 stsp struct got_reference *ref;
4685 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
4687 d0eebce4 2019-03-11 stsp return err;
4689 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
4690 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4691 d0eebce4 2019-03-11 stsp return err;
4694 d0eebce4 2019-03-11 stsp static const struct got_error *
4695 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
4697 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4698 d0eebce4 2019-03-11 stsp struct got_object_id *id;
4699 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
4702 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4703 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
4704 d1644381 2019-07-14 stsp * an unintended typo.
4706 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4707 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4709 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4711 d83d9d5c 2019-05-13 stsp if (err) {
4712 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
4714 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4715 d83d9d5c 2019-05-13 stsp return err;
4716 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
4718 d83d9d5c 2019-05-13 stsp return err;
4719 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
4720 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
4722 d83d9d5c 2019-05-13 stsp return err;
4725 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
4727 d0eebce4 2019-03-11 stsp goto done;
4729 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
4732 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4734 d1c1ae5f 2019-08-12 stsp return err;
4737 d1c1ae5f 2019-08-12 stsp static const struct got_error *
4738 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
4740 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
4741 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
4742 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
4745 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4746 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
4747 d1c1ae5f 2019-08-12 stsp * an unintended typo.
4749 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4750 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4752 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
4754 d1c1ae5f 2019-08-12 stsp return err;
4756 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
4758 d1c1ae5f 2019-08-12 stsp goto done;
4760 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
4762 d1c1ae5f 2019-08-12 stsp if (target_ref)
4763 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
4765 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
4766 d0eebce4 2019-03-11 stsp return err;
4769 d0eebce4 2019-03-11 stsp static const struct got_error *
4770 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
4772 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
4773 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
4774 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
4775 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
4776 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
4777 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
4778 b2070a3f 2020-03-22 stsp char *refname = NULL;
4780 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4781 d0eebce4 2019-03-11 stsp switch (ch) {
4783 e31abbf2 2020-03-22 stsp obj_arg = optarg;
4786 e31abbf2 2020-03-22 stsp do_delete = 1;
4789 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
4790 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4791 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4793 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4796 d0eebce4 2019-03-11 stsp do_list = 1;
4799 e31abbf2 2020-03-22 stsp symref_target = optarg;
4802 d0eebce4 2019-03-11 stsp usage_ref();
4803 d0eebce4 2019-03-11 stsp /* NOTREACHED */
4807 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
4808 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
4809 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
4810 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
4811 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
4812 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
4813 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
4814 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
4815 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
4816 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
4817 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
4818 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
4820 d0eebce4 2019-03-11 stsp argc -= optind;
4821 d0eebce4 2019-03-11 stsp argv += optind;
4823 e31abbf2 2020-03-22 stsp if (do_list) {
4824 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
4825 d0eebce4 2019-03-11 stsp usage_ref();
4826 b2070a3f 2020-03-22 stsp if (argc == 1) {
4827 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4828 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4829 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4830 b2070a3f 2020-03-22 stsp goto done;
4834 e31abbf2 2020-03-22 stsp if (argc != 1)
4835 e31abbf2 2020-03-22 stsp usage_ref();
4836 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4837 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4838 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4839 b2070a3f 2020-03-22 stsp goto done;
4843 b2070a3f 2020-03-22 stsp if (refname)
4844 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
4846 d0eebce4 2019-03-11 stsp #ifndef PROFILE
4847 e0b57350 2019-03-12 stsp if (do_list) {
4848 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4849 e0b57350 2019-03-12 stsp NULL) == -1)
4850 e0b57350 2019-03-12 stsp err(1, "pledge");
4852 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4853 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
4854 e0b57350 2019-03-12 stsp err(1, "pledge");
4857 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
4858 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
4859 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4860 d0eebce4 2019-03-11 stsp goto done;
4863 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4864 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
4865 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4866 d0eebce4 2019-03-11 stsp goto done;
4868 d0eebce4 2019-03-11 stsp error = NULL;
4869 d0eebce4 2019-03-11 stsp if (worktree) {
4870 d0eebce4 2019-03-11 stsp repo_path =
4871 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
4872 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4873 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4874 d0eebce4 2019-03-11 stsp if (error)
4875 d0eebce4 2019-03-11 stsp goto done;
4877 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
4878 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4879 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4880 d0eebce4 2019-03-11 stsp goto done;
4885 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4886 d0eebce4 2019-03-11 stsp if (error != NULL)
4887 d0eebce4 2019-03-11 stsp goto done;
4889 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4890 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4891 c02c541e 2019-03-29 stsp if (error)
4892 c02c541e 2019-03-29 stsp goto done;
4894 d0eebce4 2019-03-11 stsp if (do_list)
4895 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
4896 e31abbf2 2020-03-22 stsp else if (do_delete)
4897 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
4898 e31abbf2 2020-03-22 stsp else if (symref_target)
4899 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
4901 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
4902 e31abbf2 2020-03-22 stsp usage_ref();
4903 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
4906 b2070a3f 2020-03-22 stsp free(refname);
4908 4e759de4 2019-06-26 stsp got_repo_close(repo);
4909 4e759de4 2019-06-26 stsp if (worktree)
4910 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
4911 4e759de4 2019-06-26 stsp free(cwd);
4912 4e759de4 2019-06-26 stsp free(repo_path);
4913 4e759de4 2019-06-26 stsp return error;
4916 4e759de4 2019-06-26 stsp __dead static void
4917 4e759de4 2019-06-26 stsp usage_branch(void)
4919 4e759de4 2019-06-26 stsp fprintf(stderr,
4920 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4921 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
4925 4e759de4 2019-06-26 stsp static const struct got_error *
4926 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
4927 4e99b47e 2019-10-04 stsp struct got_reference *ref)
4929 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
4930 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
4931 4e99b47e 2019-10-04 stsp char *refstr;
4933 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
4934 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
4935 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
4936 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
4938 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
4940 4e99b47e 2019-10-04 stsp return err;
4941 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
4942 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
4943 4e99b47e 2019-10-04 stsp marker = "* ";
4945 4e99b47e 2019-10-04 stsp marker = "~ ";
4949 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4950 4e99b47e 2019-10-04 stsp refname += 11;
4951 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4952 4e99b47e 2019-10-04 stsp refname += 18;
4954 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
4955 4e99b47e 2019-10-04 stsp if (refstr == NULL)
4956 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
4958 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
4959 4e99b47e 2019-10-04 stsp free(refstr);
4960 4e99b47e 2019-10-04 stsp return NULL;
4963 4e99b47e 2019-10-04 stsp static const struct got_error *
4964 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4966 ad89fa31 2019-10-04 stsp const char *refname;
4968 ad89fa31 2019-10-04 stsp if (worktree == NULL)
4969 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
4971 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
4973 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4974 ad89fa31 2019-10-04 stsp refname += 11;
4975 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4976 ad89fa31 2019-10-04 stsp refname += 18;
4978 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
4980 ad89fa31 2019-10-04 stsp return NULL;
4983 ad89fa31 2019-10-04 stsp static const struct got_error *
4984 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
4986 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
4987 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
4988 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
4989 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
4990 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
4992 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
4994 4e99b47e 2019-10-04 stsp if (worktree) {
4995 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
4996 4e99b47e 2019-10-04 stsp worktree);
4998 4e99b47e 2019-10-04 stsp return err;
5000 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
5001 4e99b47e 2019-10-04 stsp worktree);
5003 4e99b47e 2019-10-04 stsp return err;
5005 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
5006 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
5007 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
5009 4e99b47e 2019-10-04 stsp return err;
5010 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
5011 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
5015 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
5016 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
5018 4e759de4 2019-06-26 stsp return err;
5020 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
5021 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
5023 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
5024 4e759de4 2019-06-26 stsp return NULL;
5027 4e759de4 2019-06-26 stsp static const struct got_error *
5028 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5029 45cd4e47 2019-08-25 stsp const char *branch_name)
5031 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5032 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
5033 4e759de4 2019-06-26 stsp char *refname;
5035 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5036 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
5038 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5040 4e759de4 2019-06-26 stsp goto done;
5042 45cd4e47 2019-08-25 stsp if (worktree &&
5043 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
5044 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
5045 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5046 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
5047 45cd4e47 2019-08-25 stsp goto done;
5050 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
5053 45cd4e47 2019-08-25 stsp got_ref_close(ref);
5054 4e759de4 2019-06-26 stsp free(refname);
5055 4e759de4 2019-06-26 stsp return err;
5058 4e759de4 2019-06-26 stsp static const struct got_error *
5059 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
5060 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
5062 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
5063 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
5064 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
5067 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
5068 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
5069 d3f84d51 2019-07-11 stsp * an unintended typo.
5071 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
5072 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5074 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5075 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
5076 4e759de4 2019-06-26 stsp goto done;
5079 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
5080 4e759de4 2019-06-26 stsp if (err == NULL) {
5081 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
5082 4e759de4 2019-06-26 stsp goto done;
5083 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
5084 4e759de4 2019-06-26 stsp goto done;
5086 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
5088 4e759de4 2019-06-26 stsp goto done;
5090 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
5093 4e759de4 2019-06-26 stsp got_ref_close(ref);
5094 4e759de4 2019-06-26 stsp free(base_refname);
5095 4e759de4 2019-06-26 stsp free(refname);
5096 4e759de4 2019-06-26 stsp return err;
5099 4e759de4 2019-06-26 stsp static const struct got_error *
5100 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
5102 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
5103 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
5104 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
5105 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
5106 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
5107 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
5108 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
5109 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
5110 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
5111 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
5112 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
5114 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
5116 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5117 4e759de4 2019-06-26 stsp switch (ch) {
5119 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5122 4e759de4 2019-06-26 stsp delref = optarg;
5125 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5126 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5127 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5129 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5132 4e759de4 2019-06-26 stsp do_list = 1;
5135 da76fce2 2020-02-24 stsp do_update = 0;
5138 4e759de4 2019-06-26 stsp usage_branch();
5139 4e759de4 2019-06-26 stsp /* NOTREACHED */
5143 4e759de4 2019-06-26 stsp if (do_list && delref)
5144 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
5146 4e759de4 2019-06-26 stsp argc -= optind;
5147 4e759de4 2019-06-26 stsp argv += optind;
5149 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5150 ad89fa31 2019-10-04 stsp do_show = 1;
5152 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5153 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5155 4e759de4 2019-06-26 stsp if (do_list || delref) {
5156 4e759de4 2019-06-26 stsp if (argc > 0)
5157 4e759de4 2019-06-26 stsp usage_branch();
5158 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5159 4e759de4 2019-06-26 stsp usage_branch();
5161 4e759de4 2019-06-26 stsp #ifndef PROFILE
5162 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5163 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5164 4e759de4 2019-06-26 stsp NULL) == -1)
5165 4e759de4 2019-06-26 stsp err(1, "pledge");
5167 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5168 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5169 4e759de4 2019-06-26 stsp err(1, "pledge");
5172 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5173 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5174 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5175 4e759de4 2019-06-26 stsp goto done;
5178 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5179 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5180 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5181 4e759de4 2019-06-26 stsp goto done;
5183 4e759de4 2019-06-26 stsp error = NULL;
5184 4e759de4 2019-06-26 stsp if (worktree) {
5185 4e759de4 2019-06-26 stsp repo_path =
5186 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5187 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5188 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5189 4e759de4 2019-06-26 stsp if (error)
5190 4e759de4 2019-06-26 stsp goto done;
5192 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5193 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5194 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5195 4e759de4 2019-06-26 stsp goto done;
5200 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5201 4e759de4 2019-06-26 stsp if (error != NULL)
5202 4e759de4 2019-06-26 stsp goto done;
5204 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5205 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5206 4e759de4 2019-06-26 stsp if (error)
5207 4e759de4 2019-06-26 stsp goto done;
5209 ad89fa31 2019-10-04 stsp if (do_show)
5210 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5211 ad89fa31 2019-10-04 stsp else if (do_list)
5212 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5213 4e759de4 2019-06-26 stsp else if (delref)
5214 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5216 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5217 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5218 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5219 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5220 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5221 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5222 a74f7e83 2019-11-10 stsp if (error)
5223 a74f7e83 2019-11-10 stsp goto done;
5224 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5225 da76fce2 2020-02-24 stsp if (error)
5226 da76fce2 2020-02-24 stsp goto done;
5227 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5228 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5229 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5231 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5232 da76fce2 2020-02-24 stsp if (error)
5233 da76fce2 2020-02-24 stsp goto done;
5234 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5235 da76fce2 2020-02-24 stsp worktree);
5236 da76fce2 2020-02-24 stsp if (error)
5237 da76fce2 2020-02-24 stsp goto done;
5238 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5240 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5241 da76fce2 2020-02-24 stsp goto done;
5243 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5244 da76fce2 2020-02-24 stsp free(branch_refname);
5245 da76fce2 2020-02-24 stsp if (error)
5246 da76fce2 2020-02-24 stsp goto done;
5247 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5249 da76fce2 2020-02-24 stsp if (error)
5250 da76fce2 2020-02-24 stsp goto done;
5251 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5252 da76fce2 2020-02-24 stsp commit_id);
5253 da76fce2 2020-02-24 stsp if (error)
5254 da76fce2 2020-02-24 stsp goto done;
5255 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5256 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5257 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5259 da76fce2 2020-02-24 stsp if (error)
5260 da76fce2 2020-02-24 stsp goto done;
5261 9627c110 2020-04-18 stsp if (upa.did_something)
5262 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5263 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5268 da76fce2 2020-02-24 stsp got_ref_close(ref);
5270 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5271 d0eebce4 2019-03-11 stsp if (worktree)
5272 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5273 d0eebce4 2019-03-11 stsp free(cwd);
5274 d0eebce4 2019-03-11 stsp free(repo_path);
5275 da76fce2 2020-02-24 stsp free(commit_id);
5276 da76fce2 2020-02-24 stsp free(commit_id_str);
5277 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5278 da76fce2 2020-02-24 stsp free((char *)pe->path);
5279 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5280 d00136be 2019-03-26 stsp return error;
5284 d00136be 2019-03-26 stsp __dead static void
5285 8e7bd50a 2019-08-22 stsp usage_tag(void)
5287 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5288 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5289 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5294 b8bad2ba 2019-08-23 stsp static const struct got_error *
5295 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5297 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5298 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5299 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5300 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5301 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5303 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5304 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5305 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5306 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5308 b8bad2ba 2019-08-23 stsp return err;
5309 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5312 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5315 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5316 b8bad2ba 2019-08-23 stsp free(re_id);
5319 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5320 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5323 b8bad2ba 2019-08-23 stsp while (se) {
5324 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5327 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5328 b8bad2ba 2019-08-23 stsp free(se_id);
5331 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5332 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5334 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5335 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5337 b8bad2ba 2019-08-23 stsp return err;
5338 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5341 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5346 b8bad2ba 2019-08-23 stsp return err;
5350 b8bad2ba 2019-08-23 stsp static const struct got_error *
5351 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5353 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5354 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5355 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5357 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5359 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5361 8e7bd50a 2019-08-22 stsp return err;
5363 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5364 8e7bd50a 2019-08-22 stsp const char *refname;
5365 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5366 8e7bd50a 2019-08-22 stsp char datebuf[26];
5367 d4efa91b 2020-01-14 stsp const char *tagger;
5368 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5369 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5370 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5371 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5373 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5374 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5376 8e7bd50a 2019-08-22 stsp refname += 10;
5377 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5378 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5379 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5382 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5383 8e7bd50a 2019-08-22 stsp free(refstr);
5385 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5388 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5389 d4efa91b 2020-01-14 stsp if (err) {
5390 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5394 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5395 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5396 d4efa91b 2020-01-14 stsp if (err) {
5400 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5401 d4efa91b 2020-01-14 stsp tagger_time =
5402 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5403 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5409 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5410 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5411 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5412 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5416 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5417 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5418 2417344c 2019-08-23 stsp if (datestr)
5419 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5420 d4efa91b 2020-01-14 stsp if (commit)
5421 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5423 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5424 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5425 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5428 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5429 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5432 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5433 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5436 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5437 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5444 8e7bd50a 2019-08-22 stsp free(id_str);
5445 d4efa91b 2020-01-14 stsp if (commit) {
5446 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5449 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5451 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5452 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5453 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5454 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5459 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5461 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5463 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5464 8e7bd50a 2019-08-22 stsp } while (line);
5465 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5468 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5469 8e7bd50a 2019-08-22 stsp return NULL;
5472 8e7bd50a 2019-08-22 stsp static const struct got_error *
5473 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5474 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5476 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5477 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5478 f372d5cd 2019-10-21 stsp char *editor = NULL;
5479 8e7bd50a 2019-08-22 stsp int fd = -1;
5481 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5482 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5483 8e7bd50a 2019-08-22 stsp goto done;
5486 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5487 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
5488 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5489 8e7bd50a 2019-08-22 stsp goto done;
5492 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5494 8e7bd50a 2019-08-22 stsp goto done;
5496 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
5497 8e7bd50a 2019-08-22 stsp close(fd);
5499 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5501 8e7bd50a 2019-08-22 stsp goto done;
5502 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5504 8e7bd50a 2019-08-22 stsp free(initial_content);
5505 8e7bd50a 2019-08-22 stsp free(template);
5506 8e7bd50a 2019-08-22 stsp free(editor);
5508 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5509 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5510 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5511 8e7bd50a 2019-08-22 stsp if (err) {
5512 8e7bd50a 2019-08-22 stsp free(*tagmsg);
5513 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
5516 8e7bd50a 2019-08-22 stsp return err;
5519 8e7bd50a 2019-08-22 stsp static const struct got_error *
5520 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
5521 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
5523 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5524 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5525 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5526 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5527 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5528 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5529 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5532 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5533 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5534 8e7bd50a 2019-08-22 stsp * an unintended typo.
5536 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5537 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5539 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
5541 8e7bd50a 2019-08-22 stsp return err;
5543 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5544 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5546 8e7bd50a 2019-08-22 stsp goto done;
5548 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5550 8e7bd50a 2019-08-22 stsp goto done;
5552 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5553 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5554 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5555 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
5556 8e7bd50a 2019-08-22 stsp goto done;
5558 8e7bd50a 2019-08-22 stsp tag_name += 10;
5559 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5560 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5561 8e7bd50a 2019-08-22 stsp goto done;
5564 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5565 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5566 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5567 8e7bd50a 2019-08-22 stsp goto done;
5568 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5569 8e7bd50a 2019-08-22 stsp goto done;
5571 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5572 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5573 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5574 f372d5cd 2019-10-21 stsp if (err) {
5575 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5576 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5577 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5578 8e7bd50a 2019-08-22 stsp goto done;
5582 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5583 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5584 f372d5cd 2019-10-21 stsp if (err) {
5585 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5586 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5587 8e7bd50a 2019-08-22 stsp goto done;
5590 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5591 f372d5cd 2019-10-21 stsp if (err) {
5592 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5593 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5594 8e7bd50a 2019-08-22 stsp goto done;
5597 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5598 f372d5cd 2019-10-21 stsp if (err) {
5599 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5600 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5601 f372d5cd 2019-10-21 stsp goto done;
5604 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
5605 f372d5cd 2019-10-21 stsp if (err) {
5606 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5607 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5608 f372d5cd 2019-10-21 stsp goto done;
5610 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
5612 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
5613 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
5614 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
5615 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5616 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
5617 f372d5cd 2019-10-21 stsp free(tag_id_str);
5619 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
5620 8e7bd50a 2019-08-22 stsp free(commit_id);
5621 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5622 8e7bd50a 2019-08-22 stsp free(refname);
5623 8e7bd50a 2019-08-22 stsp free(tagmsg);
5624 f372d5cd 2019-10-21 stsp free(tagmsg_path);
5625 aba9c984 2019-09-08 stsp free(tagger);
5626 8e7bd50a 2019-08-22 stsp return err;
5629 8e7bd50a 2019-08-22 stsp static const struct got_error *
5630 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
5632 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
5633 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
5634 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
5635 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5636 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
5637 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5638 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
5640 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5641 8e7bd50a 2019-08-22 stsp switch (ch) {
5643 80106605 2020-02-24 stsp commit_id_arg = optarg;
5646 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
5649 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
5650 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5651 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5653 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
5656 8e7bd50a 2019-08-22 stsp do_list = 1;
5659 8e7bd50a 2019-08-22 stsp usage_tag();
5660 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
5664 8e7bd50a 2019-08-22 stsp argc -= optind;
5665 8e7bd50a 2019-08-22 stsp argv += optind;
5667 8e7bd50a 2019-08-22 stsp if (do_list) {
5668 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
5670 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
5671 8e7bd50a 2019-08-22 stsp if (tagmsg)
5672 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
5673 8e7bd50a 2019-08-22 stsp if (argc > 0)
5674 8e7bd50a 2019-08-22 stsp usage_tag();
5675 80106605 2020-02-24 stsp } else if (argc != 1)
5676 8e7bd50a 2019-08-22 stsp usage_tag();
5678 a2887370 2019-08-23 stsp tag_name = argv[0];
5680 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
5681 8e7bd50a 2019-08-22 stsp if (do_list) {
5682 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5683 8e7bd50a 2019-08-22 stsp NULL) == -1)
5684 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5686 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5687 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
5688 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5691 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
5692 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
5693 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
5694 8e7bd50a 2019-08-22 stsp goto done;
5697 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5698 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
5699 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5700 8e7bd50a 2019-08-22 stsp goto done;
5702 8e7bd50a 2019-08-22 stsp error = NULL;
5703 8e7bd50a 2019-08-22 stsp if (worktree) {
5704 8e7bd50a 2019-08-22 stsp repo_path =
5705 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
5706 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5707 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5708 8e7bd50a 2019-08-22 stsp if (error)
5709 8e7bd50a 2019-08-22 stsp goto done;
5711 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
5712 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5713 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5714 8e7bd50a 2019-08-22 stsp goto done;
5719 8e7bd50a 2019-08-22 stsp if (do_list) {
5720 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5721 c9956ddf 2019-09-08 stsp if (error != NULL)
5722 c9956ddf 2019-09-08 stsp goto done;
5723 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5724 8e7bd50a 2019-08-22 stsp if (error)
5725 8e7bd50a 2019-08-22 stsp goto done;
5726 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
5728 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5729 c9956ddf 2019-09-08 stsp if (error)
5730 c9956ddf 2019-09-08 stsp goto done;
5731 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
5732 c9956ddf 2019-09-08 stsp if (error != NULL)
5733 c9956ddf 2019-09-08 stsp goto done;
5735 8e7bd50a 2019-08-22 stsp if (tagmsg) {
5736 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5737 8e7bd50a 2019-08-22 stsp if (error)
5738 8e7bd50a 2019-08-22 stsp goto done;
5741 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
5742 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
5743 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
5744 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
5745 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
5746 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
5747 8e7bd50a 2019-08-22 stsp if (error)
5748 8e7bd50a 2019-08-22 stsp goto done;
5749 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5750 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
5751 8e7bd50a 2019-08-22 stsp if (error)
5752 8e7bd50a 2019-08-22 stsp goto done;
5753 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
5754 8e7bd50a 2019-08-22 stsp free(commit_id);
5755 8e7bd50a 2019-08-22 stsp if (error)
5756 8e7bd50a 2019-08-22 stsp goto done;
5759 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
5760 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5764 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
5765 8e7bd50a 2019-08-22 stsp if (worktree)
5766 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
5767 8e7bd50a 2019-08-22 stsp free(cwd);
5768 8e7bd50a 2019-08-22 stsp free(repo_path);
5769 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5770 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5771 8e7bd50a 2019-08-22 stsp return error;
5774 8e7bd50a 2019-08-22 stsp __dead static void
5775 d00136be 2019-03-26 stsp usage_add(void)
5777 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5778 022fae89 2019-12-06 tracey getprogname());
5782 d00136be 2019-03-26 stsp static const struct got_error *
5783 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
5785 4e68cba3 2019-11-23 stsp while (path[0] == '/')
5787 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
5788 4e68cba3 2019-11-23 stsp return NULL;
5791 4e68cba3 2019-11-23 stsp static const struct got_error *
5792 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
5794 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
5795 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
5796 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
5797 1dd54920 2019-05-11 stsp char *cwd = NULL;
5798 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
5799 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
5800 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
5802 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
5804 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
5805 d00136be 2019-03-26 stsp switch (ch) {
5806 022fae89 2019-12-06 tracey case 'I':
5807 022fae89 2019-12-06 tracey no_ignores = 1;
5810 4e68cba3 2019-11-23 stsp can_recurse = 1;
5813 d00136be 2019-03-26 stsp usage_add();
5814 d00136be 2019-03-26 stsp /* NOTREACHED */
5818 d00136be 2019-03-26 stsp argc -= optind;
5819 d00136be 2019-03-26 stsp argv += optind;
5821 43012d58 2019-07-14 stsp #ifndef PROFILE
5822 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5823 43012d58 2019-07-14 stsp NULL) == -1)
5824 43012d58 2019-07-14 stsp err(1, "pledge");
5826 723c305c 2019-05-11 jcs if (argc < 1)
5827 d00136be 2019-03-26 stsp usage_add();
5829 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
5830 d00136be 2019-03-26 stsp if (cwd == NULL) {
5831 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5832 d00136be 2019-03-26 stsp goto done;
5835 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5836 fa51e947 2020-03-27 stsp if (error) {
5837 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5838 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
5839 d00136be 2019-03-26 stsp goto done;
5842 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5844 031a5338 2019-03-26 stsp if (error != NULL)
5845 031a5338 2019-03-26 stsp goto done;
5847 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5848 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5849 d00136be 2019-03-26 stsp if (error)
5850 d00136be 2019-03-26 stsp goto done;
5852 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5853 6d022e97 2019-08-04 stsp if (error)
5854 022fae89 2019-12-06 tracey goto done;
5856 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
5857 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5858 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
5859 6d022e97 2019-08-04 stsp goto done;
5863 4e68cba3 2019-11-23 stsp if (!can_recurse) {
5864 4e68cba3 2019-11-23 stsp char *ondisk_path;
5865 4e68cba3 2019-11-23 stsp struct stat sb;
5866 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
5867 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
5868 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
5869 4e68cba3 2019-11-23 stsp pe->path) == -1) {
5870 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
5871 4e68cba3 2019-11-23 stsp goto done;
5873 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
5874 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
5875 4e68cba3 2019-11-23 stsp free(ondisk_path);
5878 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
5879 4e68cba3 2019-11-23 stsp ondisk_path);
5880 4e68cba3 2019-11-23 stsp free(ondisk_path);
5881 4e68cba3 2019-11-23 stsp goto done;
5883 4e68cba3 2019-11-23 stsp free(ondisk_path);
5884 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
5885 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5886 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
5887 4e68cba3 2019-11-23 stsp goto done;
5892 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
5893 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
5896 031a5338 2019-03-26 stsp got_repo_close(repo);
5897 d00136be 2019-03-26 stsp if (worktree)
5898 d00136be 2019-03-26 stsp got_worktree_close(worktree);
5899 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
5900 1dd54920 2019-05-11 stsp free((char *)pe->path);
5901 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
5902 2ec1f75b 2019-03-26 stsp free(cwd);
5903 2ec1f75b 2019-03-26 stsp return error;
5906 2ec1f75b 2019-03-26 stsp __dead static void
5907 648e4ef7 2019-07-09 stsp usage_remove(void)
5909 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5910 f2a9dc41 2019-12-13 tracey getprogname());
5914 2a06fe5f 2019-08-24 stsp static const struct got_error *
5915 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
5916 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
5918 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
5920 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5921 2a06fe5f 2019-08-24 stsp return NULL;
5922 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5923 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
5924 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
5925 2a06fe5f 2019-08-24 stsp return NULL;
5928 2ec1f75b 2019-03-26 stsp static const struct got_error *
5929 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
5931 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
5932 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
5933 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
5934 17ed4618 2019-06-02 stsp char *cwd = NULL;
5935 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
5936 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
5937 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5939 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
5941 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
5942 2ec1f75b 2019-03-26 stsp switch (ch) {
5944 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
5946 70e3e7f5 2019-12-13 tracey case 'k':
5947 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
5949 f2a9dc41 2019-12-13 tracey case 'R':
5950 f2a9dc41 2019-12-13 tracey can_recurse = 1;
5953 f2a9dc41 2019-12-13 tracey usage_remove();
5954 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
5958 2ec1f75b 2019-03-26 stsp argc -= optind;
5959 2ec1f75b 2019-03-26 stsp argv += optind;
5961 43012d58 2019-07-14 stsp #ifndef PROFILE
5962 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5963 43012d58 2019-07-14 stsp NULL) == -1)
5964 43012d58 2019-07-14 stsp err(1, "pledge");
5966 17ed4618 2019-06-02 stsp if (argc < 1)
5967 648e4ef7 2019-07-09 stsp usage_remove();
5969 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
5970 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
5971 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5972 2ec1f75b 2019-03-26 stsp goto done;
5974 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5975 fa51e947 2020-03-27 stsp if (error) {
5976 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5977 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
5978 2ec1f75b 2019-03-26 stsp goto done;
5981 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5984 2ec1f75b 2019-03-26 stsp goto done;
5986 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5987 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5988 2ec1f75b 2019-03-26 stsp if (error)
5989 2ec1f75b 2019-03-26 stsp goto done;
5991 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5992 6d022e97 2019-08-04 stsp if (error)
5993 6d022e97 2019-08-04 stsp goto done;
5995 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
5996 f2a9dc41 2019-12-13 tracey char *ondisk_path;
5997 f2a9dc41 2019-12-13 tracey struct stat sb;
5998 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
5999 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
6000 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
6001 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
6002 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
6003 f2a9dc41 2019-12-13 tracey goto done;
6005 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
6006 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
6007 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6008 f2a9dc41 2019-12-13 tracey continue;
6010 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
6011 f2a9dc41 2019-12-13 tracey ondisk_path);
6012 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6013 f2a9dc41 2019-12-13 tracey goto done;
6015 f2a9dc41 2019-12-13 tracey free(ondisk_path);
6016 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
6017 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
6018 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
6019 f2a9dc41 2019-12-13 tracey goto done;
6024 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
6025 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
6028 a129376b 2019-03-28 stsp got_repo_close(repo);
6029 a129376b 2019-03-28 stsp if (worktree)
6030 a129376b 2019-03-28 stsp got_worktree_close(worktree);
6031 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
6032 17ed4618 2019-06-02 stsp free((char *)pe->path);
6033 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
6034 a129376b 2019-03-28 stsp free(cwd);
6035 a129376b 2019-03-28 stsp return error;
6038 a129376b 2019-03-28 stsp __dead static void
6039 a129376b 2019-03-28 stsp usage_revert(void)
6041 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6042 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
6046 1ee397ad 2019-07-12 stsp static const struct got_error *
6047 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
6049 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
6050 fb9704af 2020-01-27 stsp return NULL;
6052 a129376b 2019-03-28 stsp while (path[0] == '/')
6054 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
6055 33aa809d 2019-08-08 stsp return NULL;
6058 33aa809d 2019-08-08 stsp struct choose_patch_arg {
6059 33aa809d 2019-08-08 stsp FILE *patch_script_file;
6060 33aa809d 2019-08-08 stsp const char *action;
6063 33aa809d 2019-08-08 stsp static const struct got_error *
6064 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6065 33aa809d 2019-08-08 stsp int nchanges, const char *action)
6067 33aa809d 2019-08-08 stsp char *line = NULL;
6068 33aa809d 2019-08-08 stsp size_t linesize = 0;
6069 33aa809d 2019-08-08 stsp ssize_t linelen;
6071 33aa809d 2019-08-08 stsp switch (status) {
6072 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
6073 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
6075 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
6076 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
6078 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
6079 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
6080 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
6081 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6082 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6083 33aa809d 2019-08-08 stsp printf("%s", line);
6084 33aa809d 2019-08-08 stsp if (ferror(patch_file))
6085 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6086 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
6087 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6088 33aa809d 2019-08-08 stsp path, n, nchanges, action);
6091 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
6094 33aa809d 2019-08-08 stsp return NULL;
6097 33aa809d 2019-08-08 stsp static const struct got_error *
6098 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6099 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
6101 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
6102 33aa809d 2019-08-08 stsp char *line = NULL;
6103 33aa809d 2019-08-08 stsp size_t linesize = 0;
6104 33aa809d 2019-08-08 stsp ssize_t linelen;
6105 33aa809d 2019-08-08 stsp int resp = ' ';
6106 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
6108 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
6110 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
6112 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6113 33aa809d 2019-08-08 stsp a->action);
6115 33aa809d 2019-08-08 stsp return err;
6116 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
6117 33aa809d 2019-08-08 stsp if (linelen == -1) {
6118 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
6119 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6120 33aa809d 2019-08-08 stsp return NULL;
6122 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6124 33aa809d 2019-08-08 stsp *nl = '\0';
6125 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6126 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6127 33aa809d 2019-08-08 stsp printf("y\n");
6128 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6129 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6130 33aa809d 2019-08-08 stsp printf("n\n");
6131 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6132 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6133 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6134 33aa809d 2019-08-08 stsp printf("q\n");
6136 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6137 33aa809d 2019-08-08 stsp free(line);
6138 33aa809d 2019-08-08 stsp return NULL;
6141 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6142 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6143 33aa809d 2019-08-08 stsp a->action);
6145 33aa809d 2019-08-08 stsp return err;
6146 33aa809d 2019-08-08 stsp resp = getchar();
6147 33aa809d 2019-08-08 stsp if (resp == '\n')
6148 33aa809d 2019-08-08 stsp resp = getchar();
6149 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6150 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6151 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6152 33aa809d 2019-08-08 stsp resp = ' ';
6154 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6155 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6156 33aa809d 2019-08-08 stsp resp = ' ';
6160 33aa809d 2019-08-08 stsp if (resp == 'y')
6161 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6162 33aa809d 2019-08-08 stsp else if (resp == 'n')
6163 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6164 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6165 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6167 1ee397ad 2019-07-12 stsp return NULL;
6171 a129376b 2019-03-28 stsp static const struct got_error *
6172 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6174 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6175 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6176 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6177 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6178 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6179 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6180 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6181 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6182 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6183 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6185 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6187 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6188 a129376b 2019-03-28 stsp switch (ch) {
6190 33aa809d 2019-08-08 stsp pflag = 1;
6193 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6196 0f6d7415 2019-08-08 stsp can_recurse = 1;
6199 a129376b 2019-03-28 stsp usage_revert();
6200 a129376b 2019-03-28 stsp /* NOTREACHED */
6204 a129376b 2019-03-28 stsp argc -= optind;
6205 a129376b 2019-03-28 stsp argv += optind;
6207 43012d58 2019-07-14 stsp #ifndef PROFILE
6208 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6209 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6210 43012d58 2019-07-14 stsp err(1, "pledge");
6212 e20a8b6f 2019-06-04 stsp if (argc < 1)
6213 a129376b 2019-03-28 stsp usage_revert();
6214 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6215 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6217 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6218 a129376b 2019-03-28 stsp if (cwd == NULL) {
6219 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6220 a129376b 2019-03-28 stsp goto done;
6222 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6223 fa51e947 2020-03-27 stsp if (error) {
6224 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6225 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6226 2ec1f75b 2019-03-26 stsp goto done;
6229 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6231 a129376b 2019-03-28 stsp if (error != NULL)
6232 a129376b 2019-03-28 stsp goto done;
6234 33aa809d 2019-08-08 stsp if (patch_script_path) {
6235 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6236 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6237 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6238 33aa809d 2019-08-08 stsp patch_script_path);
6239 33aa809d 2019-08-08 stsp goto done;
6242 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6243 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6244 a129376b 2019-03-28 stsp if (error)
6245 a129376b 2019-03-28 stsp goto done;
6247 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6248 6d022e97 2019-08-04 stsp if (error)
6249 6d022e97 2019-08-04 stsp goto done;
6251 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6252 0f6d7415 2019-08-08 stsp char *ondisk_path;
6253 0f6d7415 2019-08-08 stsp struct stat sb;
6254 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6255 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6256 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6257 0f6d7415 2019-08-08 stsp pe->path) == -1) {
6258 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6259 0f6d7415 2019-08-08 stsp goto done;
6261 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6262 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6263 0f6d7415 2019-08-08 stsp free(ondisk_path);
6266 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6267 0f6d7415 2019-08-08 stsp ondisk_path);
6268 0f6d7415 2019-08-08 stsp free(ondisk_path);
6269 0f6d7415 2019-08-08 stsp goto done;
6271 0f6d7415 2019-08-08 stsp free(ondisk_path);
6272 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6273 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6274 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6275 0f6d7415 2019-08-08 stsp goto done;
6280 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6281 33aa809d 2019-08-08 stsp cpa.action = "revert";
6282 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6283 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6285 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6286 33aa809d 2019-08-08 stsp error == NULL)
6287 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6289 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6290 2ec1f75b 2019-03-26 stsp if (worktree)
6291 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6292 2ec1f75b 2019-03-26 stsp free(path);
6293 d00136be 2019-03-26 stsp free(cwd);
6294 6bad629b 2019-02-04 stsp return error;
6297 c4296144 2019-05-09 stsp __dead static void
6298 c4296144 2019-05-09 stsp usage_commit(void)
6300 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6301 5c1e53bc 2019-07-28 stsp getprogname());
6305 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6306 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6307 e2ba3d07 2019-05-13 stsp const char *editor;
6308 e0870e44 2019-05-13 stsp const char *worktree_path;
6309 76d98825 2019-06-03 stsp const char *branch_name;
6310 314a6357 2019-05-13 stsp const char *repo_path;
6311 e0870e44 2019-05-13 stsp char *logmsg_path;
6315 33ad4cbe 2019-05-12 jcs static const struct got_error *
6316 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6319 76d98825 2019-06-03 stsp char *initial_content = NULL;
6320 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6321 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6322 e0870e44 2019-05-13 stsp char *template = NULL;
6323 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6325 33ad4cbe 2019-05-12 jcs size_t len;
6327 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6328 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6329 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6330 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6331 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6332 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6333 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6334 33ad4cbe 2019-05-12 jcs return NULL;
6337 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6338 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6340 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
6341 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6342 76d98825 2019-06-03 stsp a->branch_name) == -1)
6343 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6345 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6347 e0870e44 2019-05-13 stsp goto done;
6349 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
6351 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6352 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6353 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6354 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6355 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6359 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6361 76d98825 2019-06-03 stsp free(initial_content);
6362 e0870e44 2019-05-13 stsp free(template);
6364 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6365 3ce1b845 2019-07-15 stsp if (err == NULL) {
6366 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6367 3ce1b845 2019-07-15 stsp if (err) {
6368 3ce1b845 2019-07-15 stsp free(*logmsg);
6369 3ce1b845 2019-07-15 stsp *logmsg = NULL;
6372 33ad4cbe 2019-05-12 jcs return err;
6375 c4296144 2019-05-09 stsp static const struct got_error *
6376 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6378 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6379 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6380 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6381 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6382 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6383 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6384 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6385 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6386 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6387 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6389 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6390 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6392 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
6393 c4296144 2019-05-09 stsp switch (ch) {
6395 c4296144 2019-05-09 stsp logmsg = optarg;
6398 c4296144 2019-05-09 stsp usage_commit();
6399 c4296144 2019-05-09 stsp /* NOTREACHED */
6403 c4296144 2019-05-09 stsp argc -= optind;
6404 c4296144 2019-05-09 stsp argv += optind;
6406 43012d58 2019-07-14 stsp #ifndef PROFILE
6407 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6408 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6409 43012d58 2019-07-14 stsp err(1, "pledge");
6411 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6412 c4296144 2019-05-09 stsp if (cwd == NULL) {
6413 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6414 c4296144 2019-05-09 stsp goto done;
6416 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6417 fa51e947 2020-03-27 stsp if (error) {
6418 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6419 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6420 7d5807f4 2019-07-11 stsp goto done;
6423 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6424 c4296144 2019-05-09 stsp if (error)
6425 a698f62e 2019-07-25 stsp goto done;
6426 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6427 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6428 c4296144 2019-05-09 stsp goto done;
6431 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6432 916f288c 2019-07-30 stsp worktree);
6433 5c1e53bc 2019-07-28 stsp if (error)
6434 5c1e53bc 2019-07-28 stsp goto done;
6436 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6437 c9956ddf 2019-09-08 stsp if (error)
6438 c9956ddf 2019-09-08 stsp goto done;
6439 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6440 c9956ddf 2019-09-08 stsp gitconfig_path);
6441 c4296144 2019-05-09 stsp if (error != NULL)
6442 c4296144 2019-05-09 stsp goto done;
6444 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
6445 aba9c984 2019-09-08 stsp if (error)
6446 aba9c984 2019-09-08 stsp return error;
6449 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6450 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6452 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6453 314a6357 2019-05-13 stsp error = get_editor(&editor);
6455 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6456 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6457 c4296144 2019-05-09 stsp if (error)
6458 c4296144 2019-05-09 stsp goto done;
6460 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6461 087fb88c 2019-08-04 stsp if (error)
6462 087fb88c 2019-08-04 stsp goto done;
6464 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6465 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6466 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6467 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6468 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6469 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6470 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6471 916f288c 2019-07-30 stsp goto done;
6473 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6475 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6476 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6477 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6478 e0870e44 2019-05-13 stsp if (error) {
6479 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6480 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6481 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6482 c4296144 2019-05-09 stsp goto done;
6485 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6486 c4296144 2019-05-09 stsp if (error)
6487 c4296144 2019-05-09 stsp goto done;
6488 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6490 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6491 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6492 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6493 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6494 7266f21f 2019-10-21 stsp error == NULL)
6495 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6496 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6498 c4296144 2019-05-09 stsp got_repo_close(repo);
6499 c4296144 2019-05-09 stsp if (worktree)
6500 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6501 c4296144 2019-05-09 stsp free(cwd);
6502 c4296144 2019-05-09 stsp free(id_str);
6503 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6504 e2ba3d07 2019-05-13 stsp free(editor);
6505 aba9c984 2019-09-08 stsp free(author);
6506 234035bc 2019-06-01 stsp return error;
6509 234035bc 2019-06-01 stsp __dead static void
6510 234035bc 2019-06-01 stsp usage_cherrypick(void)
6512 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6516 234035bc 2019-06-01 stsp static const struct got_error *
6517 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6519 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6520 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6521 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6522 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6523 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6524 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6525 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6526 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6528 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6530 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6531 234035bc 2019-06-01 stsp switch (ch) {
6533 234035bc 2019-06-01 stsp usage_cherrypick();
6534 234035bc 2019-06-01 stsp /* NOTREACHED */
6538 234035bc 2019-06-01 stsp argc -= optind;
6539 234035bc 2019-06-01 stsp argv += optind;
6541 43012d58 2019-07-14 stsp #ifndef PROFILE
6542 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6543 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6544 43012d58 2019-07-14 stsp err(1, "pledge");
6546 234035bc 2019-06-01 stsp if (argc != 1)
6547 234035bc 2019-06-01 stsp usage_cherrypick();
6549 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6550 234035bc 2019-06-01 stsp if (cwd == NULL) {
6551 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6552 234035bc 2019-06-01 stsp goto done;
6554 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6555 fa51e947 2020-03-27 stsp if (error) {
6556 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6557 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6559 234035bc 2019-06-01 stsp goto done;
6562 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6564 234035bc 2019-06-01 stsp if (error != NULL)
6565 234035bc 2019-06-01 stsp goto done;
6567 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6568 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6569 234035bc 2019-06-01 stsp if (error)
6570 234035bc 2019-06-01 stsp goto done;
6572 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6573 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6574 234035bc 2019-06-01 stsp if (error != NULL) {
6575 234035bc 2019-06-01 stsp struct got_reference *ref;
6576 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6577 234035bc 2019-06-01 stsp goto done;
6578 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6579 234035bc 2019-06-01 stsp if (error != NULL)
6580 234035bc 2019-06-01 stsp goto done;
6581 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
6582 234035bc 2019-06-01 stsp got_ref_close(ref);
6583 234035bc 2019-06-01 stsp if (error != NULL)
6584 234035bc 2019-06-01 stsp goto done;
6586 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
6587 234035bc 2019-06-01 stsp if (error)
6588 234035bc 2019-06-01 stsp goto done;
6590 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
6591 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
6592 234035bc 2019-06-01 stsp if (error != NULL)
6593 234035bc 2019-06-01 stsp goto done;
6595 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6596 234035bc 2019-06-01 stsp if (error) {
6597 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
6598 234035bc 2019-06-01 stsp goto done;
6599 234035bc 2019-06-01 stsp error = NULL;
6601 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
6602 234035bc 2019-06-01 stsp goto done;
6605 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6606 234035bc 2019-06-01 stsp if (error)
6607 234035bc 2019-06-01 stsp goto done;
6608 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6609 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6610 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6611 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
6613 234035bc 2019-06-01 stsp if (error != NULL)
6614 234035bc 2019-06-01 stsp goto done;
6616 9627c110 2020-04-18 stsp if (upa.did_something)
6617 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
6618 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6620 234035bc 2019-06-01 stsp if (commit)
6621 234035bc 2019-06-01 stsp got_object_commit_close(commit);
6622 234035bc 2019-06-01 stsp free(commit_id_str);
6623 234035bc 2019-06-01 stsp if (head_ref)
6624 234035bc 2019-06-01 stsp got_ref_close(head_ref);
6625 234035bc 2019-06-01 stsp if (worktree)
6626 234035bc 2019-06-01 stsp got_worktree_close(worktree);
6628 234035bc 2019-06-01 stsp got_repo_close(repo);
6629 c4296144 2019-05-09 stsp return error;
6632 5ef14e63 2019-06-02 stsp __dead static void
6633 5ef14e63 2019-06-02 stsp usage_backout(void)
6635 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6639 5ef14e63 2019-06-02 stsp static const struct got_error *
6640 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
6642 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
6643 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
6644 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
6645 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
6646 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
6647 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
6648 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
6649 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
6651 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6653 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6654 5ef14e63 2019-06-02 stsp switch (ch) {
6656 5ef14e63 2019-06-02 stsp usage_backout();
6657 5ef14e63 2019-06-02 stsp /* NOTREACHED */
6661 5ef14e63 2019-06-02 stsp argc -= optind;
6662 5ef14e63 2019-06-02 stsp argv += optind;
6664 43012d58 2019-07-14 stsp #ifndef PROFILE
6665 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6666 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6667 43012d58 2019-07-14 stsp err(1, "pledge");
6669 5ef14e63 2019-06-02 stsp if (argc != 1)
6670 5ef14e63 2019-06-02 stsp usage_backout();
6672 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
6673 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
6674 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
6675 5ef14e63 2019-06-02 stsp goto done;
6677 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
6678 fa51e947 2020-03-27 stsp if (error) {
6679 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6680 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
6681 5ef14e63 2019-06-02 stsp goto done;
6684 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6686 5ef14e63 2019-06-02 stsp if (error != NULL)
6687 5ef14e63 2019-06-02 stsp goto done;
6689 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6690 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6691 5ef14e63 2019-06-02 stsp if (error)
6692 5ef14e63 2019-06-02 stsp goto done;
6694 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6695 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6696 5ef14e63 2019-06-02 stsp if (error != NULL) {
6697 5ef14e63 2019-06-02 stsp struct got_reference *ref;
6698 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6699 5ef14e63 2019-06-02 stsp goto done;
6700 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6701 5ef14e63 2019-06-02 stsp if (error != NULL)
6702 5ef14e63 2019-06-02 stsp goto done;
6703 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
6704 5ef14e63 2019-06-02 stsp got_ref_close(ref);
6705 5ef14e63 2019-06-02 stsp if (error != NULL)
6706 5ef14e63 2019-06-02 stsp goto done;
6708 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
6709 5ef14e63 2019-06-02 stsp if (error)
6710 5ef14e63 2019-06-02 stsp goto done;
6712 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
6713 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
6714 5ef14e63 2019-06-02 stsp if (error != NULL)
6715 5ef14e63 2019-06-02 stsp goto done;
6717 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6718 5ef14e63 2019-06-02 stsp if (error)
6719 5ef14e63 2019-06-02 stsp goto done;
6721 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6722 5ef14e63 2019-06-02 stsp if (error)
6723 5ef14e63 2019-06-02 stsp goto done;
6724 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6725 5ef14e63 2019-06-02 stsp if (pid == NULL) {
6726 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
6727 5ef14e63 2019-06-02 stsp goto done;
6730 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6731 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6732 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
6733 5ef14e63 2019-06-02 stsp if (error != NULL)
6734 5ef14e63 2019-06-02 stsp goto done;
6736 9627c110 2020-04-18 stsp if (upa.did_something)
6737 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
6738 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6740 5ef14e63 2019-06-02 stsp if (commit)
6741 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
6742 5ef14e63 2019-06-02 stsp free(commit_id_str);
6743 5ef14e63 2019-06-02 stsp if (head_ref)
6744 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
6745 818c7501 2019-07-11 stsp if (worktree)
6746 818c7501 2019-07-11 stsp got_worktree_close(worktree);
6748 818c7501 2019-07-11 stsp got_repo_close(repo);
6749 818c7501 2019-07-11 stsp return error;
6752 818c7501 2019-07-11 stsp __dead static void
6753 818c7501 2019-07-11 stsp usage_rebase(void)
6755 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6756 af54c8f8 2019-07-11 stsp getprogname());
6761 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
6764 0ebf8283 2019-07-24 stsp size_t len;
6766 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
6767 0ebf8283 2019-07-24 stsp if (len > limit)
6768 0ebf8283 2019-07-24 stsp len = limit;
6769 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
6770 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
6772 0ebf8283 2019-07-24 stsp *nl = '\0';
6775 0ebf8283 2019-07-24 stsp static const struct got_error *
6776 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6778 5943eee2 2019-08-13 stsp const struct got_error *err;
6779 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
6780 5943eee2 2019-08-13 stsp const char *s;
6782 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
6784 5943eee2 2019-08-13 stsp return err;
6786 5943eee2 2019-08-13 stsp s = logmsg0;
6787 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
6790 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
6791 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
6792 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6793 5943eee2 2019-08-13 stsp goto done;
6796 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
6798 5943eee2 2019-08-13 stsp free(logmsg0);
6799 a0ea4fc0 2020-02-28 stsp return err;
6802 a0ea4fc0 2020-02-28 stsp static const struct got_error *
6803 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6805 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
6806 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
6807 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
6809 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
6811 a0ea4fc0 2020-02-28 stsp return err;
6813 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
6815 a0ea4fc0 2020-02-28 stsp goto done;
6817 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
6819 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
6821 a0ea4fc0 2020-02-28 stsp goto done;
6823 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
6825 a0ea4fc0 2020-02-28 stsp free(id_str);
6826 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
6827 a0ea4fc0 2020-02-28 stsp free(logmsg);
6828 5943eee2 2019-08-13 stsp return err;
6831 818c7501 2019-07-11 stsp static const struct got_error *
6832 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
6833 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
6835 818c7501 2019-07-11 stsp const struct got_error *err;
6836 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6838 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
6840 818c7501 2019-07-11 stsp goto done;
6842 ff0d2220 2019-07-11 stsp if (new_id) {
6843 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
6845 ff0d2220 2019-07-11 stsp goto done;
6848 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
6849 ff0d2220 2019-07-11 stsp if (new_id_str)
6850 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
6852 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6854 0ebf8283 2019-07-24 stsp goto done;
6856 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
6857 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6859 818c7501 2019-07-11 stsp free(old_id_str);
6860 818c7501 2019-07-11 stsp free(new_id_str);
6861 272a1371 2020-02-28 stsp free(logmsg);
6862 818c7501 2019-07-11 stsp return err;
6865 1ee397ad 2019-07-12 stsp static const struct got_error *
6866 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6867 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
6868 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
6870 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
6871 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
6872 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
6875 818c7501 2019-07-11 stsp static const struct got_error *
6876 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
6877 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6878 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
6879 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6881 ff0d2220 2019-07-11 stsp const struct got_error *error;
6882 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
6883 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
6885 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6886 ff0d2220 2019-07-11 stsp if (error)
6887 ff0d2220 2019-07-11 stsp return error;
6889 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6890 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
6891 ff0d2220 2019-07-11 stsp if (error) {
6892 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6893 ff0d2220 2019-07-11 stsp goto done;
6894 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
6896 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
6897 ff0d2220 2019-07-11 stsp free(new_commit_id);
6900 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
6901 ff0d2220 2019-07-11 stsp return error;
6904 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
6905 64c6d990 2019-07-11 stsp const char *path_prefix;
6906 64c6d990 2019-07-11 stsp size_t len;
6907 8ca9bd68 2019-07-25 stsp int errcode;
6910 64c6d990 2019-07-11 stsp static const struct got_error *
6911 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6912 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
6913 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
6914 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
6916 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
6918 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6919 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6920 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
6922 64c6d990 2019-07-11 stsp return NULL;
6925 64c6d990 2019-07-11 stsp static const struct got_error *
6926 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
6927 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
6928 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
6930 64c6d990 2019-07-11 stsp const struct got_error *err;
6931 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6932 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
6933 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
6935 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
6936 64c6d990 2019-07-11 stsp return NULL;
6938 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6940 64c6d990 2019-07-11 stsp goto done;
6942 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6944 64c6d990 2019-07-11 stsp goto done;
6946 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
6947 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
6949 64c6d990 2019-07-11 stsp goto done;
6951 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
6952 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
6954 64c6d990 2019-07-11 stsp goto done;
6956 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
6957 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
6958 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
6959 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
6960 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
6961 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
6962 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
6964 64c6d990 2019-07-11 stsp if (tree1)
6965 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
6966 64c6d990 2019-07-11 stsp if (tree2)
6967 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
6968 64c6d990 2019-07-11 stsp if (commit)
6969 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
6970 64c6d990 2019-07-11 stsp if (parent_commit)
6971 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
6972 64c6d990 2019-07-11 stsp return err;
6975 ff0d2220 2019-07-11 stsp static const struct got_error *
6976 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
6977 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
6978 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6979 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
6980 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
6982 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
6983 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
6984 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
6985 af61c510 2019-07-19 stsp struct got_object_qid *qid;
6986 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
6988 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
6990 af61c510 2019-07-19 stsp return err;
6992 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6993 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6995 af61c510 2019-07-19 stsp goto done;
6996 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6997 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
6998 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
6999 af61c510 2019-07-19 stsp if (err) {
7000 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
7001 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
7002 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
7003 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
7004 af61c510 2019-07-19 stsp "been reached?!?");
7006 ee780d5c 2020-01-04 stsp goto done;
7008 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
7009 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
7011 af61c510 2019-07-19 stsp goto done;
7013 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
7015 af61c510 2019-07-19 stsp goto done;
7016 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7017 af61c510 2019-07-19 stsp commit_id = parent_id;
7021 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
7022 af61c510 2019-07-19 stsp return err;
7025 af61c510 2019-07-19 stsp static const struct got_error *
7026 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
7028 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
7029 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
7030 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
7031 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7032 818c7501 2019-07-11 stsp char *cwd = NULL;
7033 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
7034 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7035 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
7036 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
7037 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7038 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
7039 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7040 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
7041 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7042 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
7043 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
7044 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
7045 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
7047 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
7048 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
7050 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
7051 818c7501 2019-07-11 stsp switch (ch) {
7053 818c7501 2019-07-11 stsp abort_rebase = 1;
7056 818c7501 2019-07-11 stsp continue_rebase = 1;
7059 818c7501 2019-07-11 stsp usage_rebase();
7060 818c7501 2019-07-11 stsp /* NOTREACHED */
7064 818c7501 2019-07-11 stsp argc -= optind;
7065 818c7501 2019-07-11 stsp argv += optind;
7067 43012d58 2019-07-14 stsp #ifndef PROFILE
7068 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7069 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
7070 43012d58 2019-07-14 stsp err(1, "pledge");
7072 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
7073 818c7501 2019-07-11 stsp usage_rebase();
7074 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
7075 818c7501 2019-07-11 stsp if (argc != 0)
7076 818c7501 2019-07-11 stsp usage_rebase();
7077 818c7501 2019-07-11 stsp } else if (argc != 1)
7078 818c7501 2019-07-11 stsp usage_rebase();
7080 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
7081 818c7501 2019-07-11 stsp if (cwd == NULL) {
7082 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
7083 818c7501 2019-07-11 stsp goto done;
7085 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
7086 fa51e947 2020-03-27 stsp if (error) {
7087 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7088 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
7089 818c7501 2019-07-11 stsp goto done;
7092 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7094 818c7501 2019-07-11 stsp if (error != NULL)
7095 818c7501 2019-07-11 stsp goto done;
7097 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7098 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
7099 7ef62c4e 2020-02-24 stsp if (error)
7100 7ef62c4e 2020-02-24 stsp goto done;
7102 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
7103 7ef62c4e 2020-02-24 stsp worktree);
7104 818c7501 2019-07-11 stsp if (error)
7105 7ef62c4e 2020-02-24 stsp goto done;
7106 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
7107 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7108 818c7501 2019-07-11 stsp goto done;
7111 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7112 818c7501 2019-07-11 stsp if (error)
7113 818c7501 2019-07-11 stsp goto done;
7115 f6794adc 2019-07-23 stsp if (abort_rebase) {
7116 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7117 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7118 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7119 f6794adc 2019-07-23 stsp goto done;
7121 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7122 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7123 3e3a69f1 2019-07-25 stsp worktree, repo);
7124 818c7501 2019-07-11 stsp if (error)
7125 818c7501 2019-07-11 stsp goto done;
7126 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7127 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7128 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7129 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7130 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7131 818c7501 2019-07-11 stsp if (error)
7132 818c7501 2019-07-11 stsp goto done;
7133 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7134 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7135 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7138 818c7501 2019-07-11 stsp if (continue_rebase) {
7139 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7140 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7141 f6794adc 2019-07-23 stsp goto done;
7143 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7144 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7145 3e3a69f1 2019-07-25 stsp worktree, repo);
7146 818c7501 2019-07-11 stsp if (error)
7147 818c7501 2019-07-11 stsp goto done;
7149 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7150 01757395 2019-07-12 stsp resume_commit_id, repo);
7151 818c7501 2019-07-11 stsp if (error)
7152 818c7501 2019-07-11 stsp goto done;
7154 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7155 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7156 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7157 818c7501 2019-07-11 stsp goto done;
7160 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7161 818c7501 2019-07-11 stsp if (error != NULL)
7162 818c7501 2019-07-11 stsp goto done;
7165 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7166 ff0d2220 2019-07-11 stsp if (error)
7167 ff0d2220 2019-07-11 stsp goto done;
7169 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7170 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7172 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7173 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7174 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7175 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7176 818c7501 2019-07-11 stsp if (error)
7177 818c7501 2019-07-11 stsp goto done;
7178 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7179 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7180 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7181 818c7501 2019-07-11 stsp "with work tree's branch");
7182 818c7501 2019-07-11 stsp goto done;
7185 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7186 a51a74b3 2019-07-27 stsp if (error) {
7187 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7188 a51a74b3 2019-07-27 stsp goto done;
7189 a51a74b3 2019-07-27 stsp error = NULL;
7191 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7192 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7193 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7194 a51a74b3 2019-07-27 stsp goto done;
7196 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7197 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7198 818c7501 2019-07-11 stsp if (error)
7199 818c7501 2019-07-11 stsp goto done;
7202 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7203 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7204 818c7501 2019-07-11 stsp if (error)
7205 818c7501 2019-07-11 stsp goto done;
7207 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7208 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7209 fc66b545 2019-08-12 stsp if (pid == NULL) {
7210 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7211 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7212 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7213 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7214 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7215 fc66b545 2019-08-12 stsp if (error)
7216 fc66b545 2019-08-12 stsp goto done;
7217 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7218 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7219 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7222 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7223 fc66b545 2019-08-12 stsp goto done;
7225 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7226 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7227 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7228 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7229 818c7501 2019-07-11 stsp commit = NULL;
7230 818c7501 2019-07-11 stsp if (error)
7231 818c7501 2019-07-11 stsp goto done;
7233 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7234 38b0338b 2019-11-29 stsp if (continue_rebase) {
7235 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7236 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7237 38b0338b 2019-11-29 stsp goto done;
7239 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7240 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7241 38b0338b 2019-11-29 stsp char *id_str;
7242 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7243 38b0338b 2019-11-29 stsp new_base_branch);
7244 38b0338b 2019-11-29 stsp if (error)
7245 38b0338b 2019-11-29 stsp goto done;
7246 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7247 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7248 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7249 38b0338b 2019-11-29 stsp free(id_str);
7250 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7251 38b0338b 2019-11-29 stsp new_head_commit_id);
7252 38b0338b 2019-11-29 stsp if (error)
7253 38b0338b 2019-11-29 stsp goto done;
7257 818c7501 2019-07-11 stsp pid = NULL;
7258 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7259 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7261 818c7501 2019-07-11 stsp commit_id = qid->id;
7262 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7263 818c7501 2019-07-11 stsp pid = qid;
7265 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7266 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7267 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7268 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7269 818c7501 2019-07-11 stsp if (error)
7270 818c7501 2019-07-11 stsp goto done;
7272 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7273 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7274 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7276 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7277 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7278 a0ea4fc0 2020-02-28 stsp if (error)
7279 a0ea4fc0 2020-02-28 stsp goto done;
7280 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7284 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7285 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7286 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7287 818c7501 2019-07-11 stsp if (error)
7288 818c7501 2019-07-11 stsp goto done;
7291 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7292 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7293 818c7501 2019-07-11 stsp if (error)
7294 818c7501 2019-07-11 stsp goto done;
7295 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7296 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7298 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7299 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7301 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7302 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7303 818c7501 2019-07-11 stsp free(resume_commit_id);
7304 818c7501 2019-07-11 stsp free(yca_id);
7305 818c7501 2019-07-11 stsp if (commit)
7306 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7307 818c7501 2019-07-11 stsp if (branch)
7308 818c7501 2019-07-11 stsp got_ref_close(branch);
7309 818c7501 2019-07-11 stsp if (new_base_branch)
7310 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7311 818c7501 2019-07-11 stsp if (tmp_branch)
7312 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7313 5ef14e63 2019-06-02 stsp if (worktree)
7314 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7316 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7317 5ef14e63 2019-06-02 stsp return error;
7320 0ebf8283 2019-07-24 stsp __dead static void
7321 0ebf8283 2019-07-24 stsp usage_histedit(void)
7323 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7324 0ebf8283 2019-07-24 stsp getprogname());
7328 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7329 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7330 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7331 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7332 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7334 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7335 0ebf8283 2019-07-24 stsp unsigned char code;
7336 0ebf8283 2019-07-24 stsp const char *name;
7337 0ebf8283 2019-07-24 stsp const char *desc;
7338 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7339 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7340 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7341 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7342 82997472 2020-01-29 stsp "be used" },
7343 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7344 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7345 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7348 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7349 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7350 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7351 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7352 0ebf8283 2019-07-24 stsp char *logmsg;
7354 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7356 0ebf8283 2019-07-24 stsp static const struct got_error *
7357 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7358 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7360 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7361 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7362 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7365 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7367 0ebf8283 2019-07-24 stsp goto done;
7369 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7371 0ebf8283 2019-07-24 stsp goto done;
7373 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7375 0ebf8283 2019-07-24 stsp goto done;
7377 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7378 0ebf8283 2019-07-24 stsp if (n < 0)
7379 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7381 0ebf8283 2019-07-24 stsp if (commit)
7382 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7383 0ebf8283 2019-07-24 stsp free(id_str);
7384 0ebf8283 2019-07-24 stsp free(logmsg);
7385 0ebf8283 2019-07-24 stsp return err;
7388 0ebf8283 2019-07-24 stsp static const struct got_error *
7389 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7390 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7392 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7393 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7395 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7396 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7398 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7399 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7403 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7404 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7405 083957f4 2020-02-24 stsp if (n < 0) {
7406 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7412 0ebf8283 2019-07-24 stsp return err;
7415 0ebf8283 2019-07-24 stsp static const struct got_error *
7416 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7417 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7419 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7421 514f2ffe 2020-01-29 stsp char *id_str;
7422 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7424 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7425 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7427 514f2ffe 2020-01-29 stsp return err;
7429 514f2ffe 2020-01-29 stsp n = fprintf(f,
7430 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7431 514f2ffe 2020-01-29 stsp "# commit %s\n"
7432 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7433 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7434 514f2ffe 2020-01-29 stsp if (n < 0) {
7435 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7436 514f2ffe 2020-01-29 stsp goto done;
7439 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7440 514f2ffe 2020-01-29 stsp if (n < 0) {
7441 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7442 514f2ffe 2020-01-29 stsp goto done;
7445 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7446 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7447 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7448 0ebf8283 2019-07-24 stsp cmd->desc);
7449 0ebf8283 2019-07-24 stsp if (n < 0) {
7450 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7455 514f2ffe 2020-01-29 stsp free(id_str);
7456 0ebf8283 2019-07-24 stsp return err;
7459 0ebf8283 2019-07-24 stsp static const struct got_error *
7460 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7462 0ebf8283 2019-07-24 stsp static char msg[42];
7465 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7467 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7468 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7470 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7473 0ebf8283 2019-07-24 stsp static const struct got_error *
7474 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7475 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7477 0ebf8283 2019-07-24 stsp const struct got_error *err;
7478 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7479 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7481 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7483 0ebf8283 2019-07-24 stsp return err;
7485 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7487 0ebf8283 2019-07-24 stsp goto done;
7489 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7491 5943eee2 2019-08-13 stsp goto done;
7492 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7493 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7494 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7495 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7498 0ebf8283 2019-07-24 stsp if (folded_commit)
7499 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7500 0ebf8283 2019-07-24 stsp free(id_str);
7501 5943eee2 2019-08-13 stsp free(folded_logmsg);
7502 0ebf8283 2019-07-24 stsp return err;
7505 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7506 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7508 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7510 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7511 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7512 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7513 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7514 3f9de99f 2019-07-24 stsp folded = prev;
7515 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7518 0ebf8283 2019-07-24 stsp return folded;
7521 0ebf8283 2019-07-24 stsp static const struct got_error *
7522 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7523 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7525 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7526 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7527 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7528 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7530 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7532 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7534 0ebf8283 2019-07-24 stsp return err;
7536 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7537 0ebf8283 2019-07-24 stsp if (folded) {
7538 0ebf8283 2019-07-24 stsp while (folded != hle) {
7539 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7540 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7543 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7544 0ebf8283 2019-07-24 stsp logmsg, repo);
7546 0ebf8283 2019-07-24 stsp goto done;
7547 0ebf8283 2019-07-24 stsp free(logmsg);
7548 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7549 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7553 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7555 0ebf8283 2019-07-24 stsp goto done;
7556 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7558 5943eee2 2019-08-13 stsp goto done;
7559 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
7560 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7561 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7562 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7563 0ebf8283 2019-07-24 stsp goto done;
7565 0ebf8283 2019-07-24 stsp free(logmsg);
7566 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7568 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7570 0ebf8283 2019-07-24 stsp goto done;
7572 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
7573 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
7575 0ebf8283 2019-07-24 stsp goto done;
7577 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
7578 0ebf8283 2019-07-24 stsp close(fd);
7580 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7582 0ebf8283 2019-07-24 stsp goto done;
7584 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7585 0ebf8283 2019-07-24 stsp if (err) {
7586 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7587 0ebf8283 2019-07-24 stsp goto done;
7588 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7591 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7592 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
7593 0ebf8283 2019-07-24 stsp free(logmsg_path);
7594 0ebf8283 2019-07-24 stsp free(logmsg);
7595 5943eee2 2019-08-13 stsp free(orig_logmsg);
7596 0ebf8283 2019-07-24 stsp free(editor);
7597 0ebf8283 2019-07-24 stsp if (commit)
7598 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7599 0ebf8283 2019-07-24 stsp return err;
7602 0ebf8283 2019-07-24 stsp static const struct got_error *
7603 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
7604 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7606 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7607 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
7608 0ebf8283 2019-07-24 stsp size_t size;
7609 0ebf8283 2019-07-24 stsp ssize_t len;
7610 0ebf8283 2019-07-24 stsp int lineno = 0, i;
7611 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7612 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
7613 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
7615 0ebf8283 2019-07-24 stsp for (;;) {
7616 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
7617 0ebf8283 2019-07-24 stsp if (len == -1) {
7618 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
7619 0ebf8283 2019-07-24 stsp if (feof(f))
7621 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
7622 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
7627 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7629 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
7630 0ebf8283 2019-07-24 stsp free(line);
7631 0ebf8283 2019-07-24 stsp line = NULL;
7634 0ebf8283 2019-07-24 stsp cmd = NULL;
7635 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7636 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
7637 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7638 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
7639 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
7642 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7647 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
7648 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7651 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7653 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
7654 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
7655 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
7658 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
7659 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7663 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
7664 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
7665 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7669 0ebf8283 2019-07-24 stsp free(line);
7670 0ebf8283 2019-07-24 stsp line = NULL;
7674 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
7676 0ebf8283 2019-07-24 stsp *end = '\0';
7678 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
7679 0ebf8283 2019-07-24 stsp if (err) {
7680 0ebf8283 2019-07-24 stsp /* override error code */
7681 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7685 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
7686 0ebf8283 2019-07-24 stsp if (hle == NULL) {
7687 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
7690 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
7691 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
7692 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
7693 0ebf8283 2019-07-24 stsp commit_id = NULL;
7694 0ebf8283 2019-07-24 stsp free(line);
7695 0ebf8283 2019-07-24 stsp line = NULL;
7696 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7699 0ebf8283 2019-07-24 stsp free(line);
7700 0ebf8283 2019-07-24 stsp free(commit_id);
7701 0ebf8283 2019-07-24 stsp return err;
7704 0ebf8283 2019-07-24 stsp static const struct got_error *
7705 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
7706 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
7708 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
7709 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
7710 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7711 5b87815e 2020-03-05 stsp static char msg[92];
7712 bfce7f83 2019-07-27 stsp char *id_str;
7714 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
7715 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7716 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
7717 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
7718 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7720 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7721 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
7722 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7723 5b87815e 2020-03-05 stsp if (hle == hle2)
7725 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
7726 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
7728 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
7730 5b87815e 2020-03-05 stsp return err;
7731 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
7732 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
7733 5b87815e 2020-03-05 stsp free(id_str);
7734 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7738 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7739 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7740 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7743 bfce7f83 2019-07-27 stsp if (hle == NULL) {
7744 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
7746 bfce7f83 2019-07-27 stsp return err;
7747 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
7748 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
7749 bfce7f83 2019-07-27 stsp free(id_str);
7750 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7754 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7755 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7756 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7757 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
7759 bfce7f83 2019-07-27 stsp return NULL;
7762 bfce7f83 2019-07-27 stsp static const struct got_error *
7763 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
7764 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
7765 bfce7f83 2019-07-27 stsp struct got_repository *repo)
7767 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7768 0ebf8283 2019-07-24 stsp char *editor;
7769 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7771 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7773 0ebf8283 2019-07-24 stsp return err;
7775 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
7776 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
7777 0ebf8283 2019-07-24 stsp goto done;
7780 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7781 0ebf8283 2019-07-24 stsp if (f == NULL) {
7782 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
7783 0ebf8283 2019-07-24 stsp goto done;
7785 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7787 bfce7f83 2019-07-27 stsp goto done;
7789 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
7791 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7792 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7793 0ebf8283 2019-07-24 stsp free(editor);
7794 0ebf8283 2019-07-24 stsp return err;
7797 0ebf8283 2019-07-24 stsp static const struct got_error *
7798 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7799 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
7800 514f2ffe 2020-01-29 stsp struct got_repository *);
7802 0ebf8283 2019-07-24 stsp static const struct got_error *
7803 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
7804 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
7805 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
7807 0ebf8283 2019-07-24 stsp const struct got_error *err;
7808 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7809 0ebf8283 2019-07-24 stsp char *path = NULL;
7811 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
7813 0ebf8283 2019-07-24 stsp return err;
7815 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
7817 0ebf8283 2019-07-24 stsp goto done;
7819 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7821 0ebf8283 2019-07-24 stsp goto done;
7823 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7824 083957f4 2020-02-24 stsp rewind(f);
7825 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7827 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
7828 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
7829 0ebf8283 2019-07-24 stsp goto done;
7832 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
7833 083957f4 2020-02-24 stsp if (err) {
7834 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7835 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7836 083957f4 2020-02-24 stsp goto done;
7837 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
7838 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
7842 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7843 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7844 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
7845 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
7846 0ebf8283 2019-07-24 stsp free(path);
7847 0ebf8283 2019-07-24 stsp return err;
7850 0ebf8283 2019-07-24 stsp static const struct got_error *
7851 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
7852 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7854 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7855 0ebf8283 2019-07-24 stsp char *path = NULL;
7856 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7857 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7858 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7860 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
7862 0ebf8283 2019-07-24 stsp return err;
7864 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
7865 0ebf8283 2019-07-24 stsp if (f == NULL) {
7866 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7867 0ebf8283 2019-07-24 stsp goto done;
7869 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7870 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7875 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7876 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
7877 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
7878 0ebf8283 2019-07-24 stsp if (n < 0) {
7879 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7885 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7886 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7887 0ebf8283 2019-07-24 stsp free(path);
7888 0ebf8283 2019-07-24 stsp if (commit)
7889 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7890 0ebf8283 2019-07-24 stsp return err;
7894 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
7896 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7898 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
7899 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
7900 bfce7f83 2019-07-27 stsp free(hle);
7904 0ebf8283 2019-07-24 stsp static const struct got_error *
7905 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
7906 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
7908 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7909 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7911 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7912 0ebf8283 2019-07-24 stsp if (f == NULL) {
7913 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7914 0ebf8283 2019-07-24 stsp goto done;
7917 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7919 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7920 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7921 0ebf8283 2019-07-24 stsp return err;
7924 0ebf8283 2019-07-24 stsp static const struct got_error *
7925 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7926 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
7927 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
7929 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
7930 0ebf8283 2019-07-24 stsp int resp = ' ';
7932 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
7933 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7934 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
7935 0ebf8283 2019-07-24 stsp resp = getchar();
7936 a61a4414 2019-08-07 stsp if (resp == '\n')
7937 a61a4414 2019-08-07 stsp resp = getchar();
7938 426ebf2e 2019-07-25 stsp if (resp == 'c') {
7939 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7940 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
7942 426ebf2e 2019-07-25 stsp if (err) {
7943 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7944 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7946 bfce7f83 2019-07-27 stsp prev_err = err;
7947 426ebf2e 2019-07-25 stsp resp = ' ';
7951 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
7952 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7953 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
7954 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
7955 426ebf2e 2019-07-25 stsp if (err) {
7956 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7957 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7959 bfce7f83 2019-07-27 stsp prev_err = err;
7960 426ebf2e 2019-07-25 stsp resp = ' ';
7964 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
7965 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7968 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
7971 0ebf8283 2019-07-24 stsp return err;
7974 0ebf8283 2019-07-24 stsp static const struct got_error *
7975 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
7976 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7977 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
7979 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7980 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7981 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7982 3e3a69f1 2019-07-25 stsp branch, repo);
7985 0ebf8283 2019-07-24 stsp static const struct got_error *
7986 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
7987 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7989 0ebf8283 2019-07-24 stsp const struct got_error *err;
7990 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7992 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
7994 0ebf8283 2019-07-24 stsp goto done;
7996 0ebf8283 2019-07-24 stsp if (new_id) {
7997 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
7999 0ebf8283 2019-07-24 stsp goto done;
8002 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
8003 0ebf8283 2019-07-24 stsp if (new_id_str)
8004 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
8006 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
8007 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
8008 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
8009 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
8010 0ebf8283 2019-07-24 stsp goto done;
8012 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
8014 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
8016 0ebf8283 2019-07-24 stsp goto done;
8019 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
8020 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
8021 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
8022 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
8023 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
8025 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
8026 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
8027 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8034 0ebf8283 2019-07-24 stsp free(old_id_str);
8035 0ebf8283 2019-07-24 stsp free(new_id_str);
8036 0ebf8283 2019-07-24 stsp return err;
8039 0ebf8283 2019-07-24 stsp static const struct got_error *
8040 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
8041 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
8042 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8043 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
8045 0ebf8283 2019-07-24 stsp const struct got_error *err;
8046 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8047 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
8049 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8050 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
8051 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
8053 0ebf8283 2019-07-24 stsp return err;
8056 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8058 0ebf8283 2019-07-24 stsp return err;
8060 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8061 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
8062 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
8063 0ebf8283 2019-07-24 stsp if (err) {
8064 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8065 0ebf8283 2019-07-24 stsp goto done;
8066 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
8068 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
8069 0ebf8283 2019-07-24 stsp free(new_commit_id);
8072 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8073 0ebf8283 2019-07-24 stsp return err;
8076 0ebf8283 2019-07-24 stsp static const struct got_error *
8077 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
8078 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8080 0ebf8283 2019-07-24 stsp const struct got_error *error;
8081 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
8083 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8085 0ebf8283 2019-07-24 stsp if (error)
8086 0ebf8283 2019-07-24 stsp return error;
8088 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8089 0ebf8283 2019-07-24 stsp if (error)
8090 0ebf8283 2019-07-24 stsp return error;
8092 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
8093 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8094 0ebf8283 2019-07-24 stsp return error;
8097 ab20a43a 2020-01-29 stsp static const struct got_error *
8098 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
8099 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
8100 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8101 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8103 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
8105 ab20a43a 2020-01-29 stsp switch (status) {
8106 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8107 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8108 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8109 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
8110 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8111 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8116 ab20a43a 2020-01-29 stsp switch (staged_status) {
8117 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
8118 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
8119 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8120 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8121 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8126 ab20a43a 2020-01-29 stsp return NULL;
8129 0ebf8283 2019-07-24 stsp static const struct got_error *
8130 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8132 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8133 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8134 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8135 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8136 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8137 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8138 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8139 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8140 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8141 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8142 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8143 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8144 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8145 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8146 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
8147 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8148 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8149 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8150 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8151 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8152 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8153 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8154 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8156 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8157 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8158 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8159 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8161 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8162 0ebf8283 2019-07-24 stsp switch (ch) {
8164 0ebf8283 2019-07-24 stsp abort_edit = 1;
8167 0ebf8283 2019-07-24 stsp continue_edit = 1;
8170 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8173 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8176 0ebf8283 2019-07-24 stsp usage_histedit();
8177 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8181 0ebf8283 2019-07-24 stsp argc -= optind;
8182 0ebf8283 2019-07-24 stsp argv += optind;
8184 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8185 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8186 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8187 0ebf8283 2019-07-24 stsp err(1, "pledge");
8189 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8190 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
8191 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8192 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
8193 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8194 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
8195 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8196 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
8197 0ebf8283 2019-07-24 stsp if (argc != 0)
8198 0ebf8283 2019-07-24 stsp usage_histedit();
8201 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8202 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8203 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8204 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8205 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8206 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8209 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8210 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8211 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8212 0ebf8283 2019-07-24 stsp goto done;
8214 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8215 fa51e947 2020-03-27 stsp if (error) {
8216 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8217 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8218 0ebf8283 2019-07-24 stsp goto done;
8221 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8223 0ebf8283 2019-07-24 stsp if (error != NULL)
8224 0ebf8283 2019-07-24 stsp goto done;
8226 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8227 0ebf8283 2019-07-24 stsp if (error)
8228 0ebf8283 2019-07-24 stsp goto done;
8229 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8230 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8231 0ebf8283 2019-07-24 stsp goto done;
8234 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8235 0ebf8283 2019-07-24 stsp if (error)
8236 0ebf8283 2019-07-24 stsp goto done;
8238 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8239 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8240 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8241 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8242 083957f4 2020-02-24 stsp "before the -m option can be used");
8243 083957f4 2020-02-24 stsp goto done;
8246 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8247 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8248 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8249 3e3a69f1 2019-07-25 stsp worktree, repo);
8250 0ebf8283 2019-07-24 stsp if (error)
8251 0ebf8283 2019-07-24 stsp goto done;
8252 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8253 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8254 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8255 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8256 0ebf8283 2019-07-24 stsp if (error)
8257 0ebf8283 2019-07-24 stsp goto done;
8258 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8259 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8260 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8261 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8262 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8263 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8264 0ebf8283 2019-07-24 stsp goto done;
8267 0ebf8283 2019-07-24 stsp if (continue_edit) {
8268 0ebf8283 2019-07-24 stsp char *path;
8270 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8271 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8272 0ebf8283 2019-07-24 stsp goto done;
8275 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8276 0ebf8283 2019-07-24 stsp if (error)
8277 0ebf8283 2019-07-24 stsp goto done;
8279 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8280 0ebf8283 2019-07-24 stsp free(path);
8281 0ebf8283 2019-07-24 stsp if (error)
8282 0ebf8283 2019-07-24 stsp goto done;
8284 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8285 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8286 3e3a69f1 2019-07-25 stsp worktree, repo);
8287 0ebf8283 2019-07-24 stsp if (error)
8288 0ebf8283 2019-07-24 stsp goto done;
8290 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8291 0ebf8283 2019-07-24 stsp if (error)
8292 0ebf8283 2019-07-24 stsp goto done;
8294 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8295 0ebf8283 2019-07-24 stsp head_commit_id);
8296 0ebf8283 2019-07-24 stsp if (error)
8297 0ebf8283 2019-07-24 stsp goto done;
8298 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8299 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8300 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8301 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8302 3aac7cf7 2019-07-25 stsp goto done;
8304 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8305 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8306 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8307 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8308 0ebf8283 2019-07-24 stsp commit = NULL;
8309 0ebf8283 2019-07-24 stsp if (error)
8310 0ebf8283 2019-07-24 stsp goto done;
8312 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8313 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8314 0ebf8283 2019-07-24 stsp goto done;
8317 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8318 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8319 0ebf8283 2019-07-24 stsp if (error != NULL)
8320 0ebf8283 2019-07-24 stsp goto done;
8322 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8323 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8324 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8325 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8326 c7d20a3f 2019-07-30 stsp goto done;
8329 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8330 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8331 bfce7f83 2019-07-27 stsp branch = NULL;
8332 0ebf8283 2019-07-24 stsp if (error)
8333 0ebf8283 2019-07-24 stsp goto done;
8335 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8336 0ebf8283 2019-07-24 stsp head_commit_id);
8337 0ebf8283 2019-07-24 stsp if (error)
8338 0ebf8283 2019-07-24 stsp goto done;
8339 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8340 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8341 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8342 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8343 3aac7cf7 2019-07-25 stsp goto done;
8345 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8346 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8347 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8348 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8349 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8350 0ebf8283 2019-07-24 stsp commit = NULL;
8351 0ebf8283 2019-07-24 stsp if (error)
8352 0ebf8283 2019-07-24 stsp goto done;
8354 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8355 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8356 c5996fff 2020-01-29 stsp goto done;
8359 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8360 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8361 bfce7f83 2019-07-27 stsp if (error)
8362 bfce7f83 2019-07-27 stsp goto done;
8364 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8365 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8366 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8367 6ba2bea2 2019-07-27 stsp if (error) {
8368 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8369 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8370 9627c110 2020-04-18 stsp update_progress, &upa);
8371 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8372 0ebf8283 2019-07-24 stsp goto done;
8375 514f2ffe 2020-01-29 stsp const char *branch_name;
8376 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8377 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8378 514f2ffe 2020-01-29 stsp branch_name += 11;
8379 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8380 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8381 6ba2bea2 2019-07-27 stsp if (error) {
8382 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8383 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8384 9627c110 2020-04-18 stsp update_progress, &upa);
8385 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8386 0ebf8283 2019-07-24 stsp goto done;
8391 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8393 6ba2bea2 2019-07-27 stsp if (error) {
8394 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8395 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8396 9627c110 2020-04-18 stsp update_progress, &upa);
8397 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8398 0ebf8283 2019-07-24 stsp goto done;
8403 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8404 4ec14e60 2019-08-28 hiltjo if (error)
8405 0ebf8283 2019-07-24 stsp goto done;
8407 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8408 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8409 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8410 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8413 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8414 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8415 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8416 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8418 ab20a43a 2020-01-29 stsp if (error)
8419 ab20a43a 2020-01-29 stsp goto done;
8421 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8422 ab20a43a 2020-01-29 stsp int have_changes = 0;
8424 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8425 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8426 ab20a43a 2020-01-29 stsp if (error)
8427 ab20a43a 2020-01-29 stsp goto done;
8428 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8429 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8430 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8431 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8432 ab20a43a 2020-01-29 stsp if (error) {
8433 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8434 ab20a43a 2020-01-29 stsp goto done;
8435 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8436 ab20a43a 2020-01-29 stsp goto done;
8438 ab20a43a 2020-01-29 stsp if (have_changes) {
8439 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8440 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8441 ab20a43a 2020-01-29 stsp if (error)
8442 ab20a43a 2020-01-29 stsp goto done;
8444 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8445 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8446 ab20a43a 2020-01-29 stsp if (error)
8447 ab20a43a 2020-01-29 stsp goto done;
8448 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8449 ab20a43a 2020-01-29 stsp hle, NULL);
8450 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8451 ab20a43a 2020-01-29 stsp commit = NULL;
8452 ab20a43a 2020-01-29 stsp if (error)
8453 ab20a43a 2020-01-29 stsp goto done;
8459 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8460 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8461 0ebf8283 2019-07-24 stsp if (error)
8462 0ebf8283 2019-07-24 stsp goto done;
8466 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8467 0ebf8283 2019-07-24 stsp hle->commit_id);
8468 0ebf8283 2019-07-24 stsp if (error)
8469 0ebf8283 2019-07-24 stsp goto done;
8470 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8471 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8473 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8474 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8475 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8476 0ebf8283 2019-07-24 stsp if (error)
8477 0ebf8283 2019-07-24 stsp goto done;
8478 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8479 0ebf8283 2019-07-24 stsp commit = NULL;
8481 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8482 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8483 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8485 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8486 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8488 a0ea4fc0 2020-02-28 stsp if (error)
8489 a0ea4fc0 2020-02-28 stsp goto done;
8490 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8494 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8495 0ebf8283 2019-07-24 stsp char *id_str;
8496 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8497 0ebf8283 2019-07-24 stsp if (error)
8498 0ebf8283 2019-07-24 stsp goto done;
8499 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8501 0ebf8283 2019-07-24 stsp free(id_str);
8502 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8503 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8504 3e3a69f1 2019-07-25 stsp fileindex);
8505 0ebf8283 2019-07-24 stsp goto done;
8508 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8509 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8510 0ebf8283 2019-07-24 stsp if (error)
8511 0ebf8283 2019-07-24 stsp goto done;
8515 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8516 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8517 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8518 0ebf8283 2019-07-24 stsp if (error)
8519 0ebf8283 2019-07-24 stsp goto done;
8522 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8523 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8524 0ebf8283 2019-07-24 stsp if (error)
8525 0ebf8283 2019-07-24 stsp goto done;
8526 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8527 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8529 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8530 3e3a69f1 2019-07-25 stsp branch, repo);
8532 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8533 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8534 0ebf8283 2019-07-24 stsp free(head_commit_id);
8535 0ebf8283 2019-07-24 stsp free(base_commit_id);
8536 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8537 0ebf8283 2019-07-24 stsp if (commit)
8538 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8539 0ebf8283 2019-07-24 stsp if (branch)
8540 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8541 0ebf8283 2019-07-24 stsp if (tmp_branch)
8542 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8543 0ebf8283 2019-07-24 stsp if (worktree)
8544 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8546 2822a352 2019-10-15 stsp got_repo_close(repo);
8547 2822a352 2019-10-15 stsp return error;
8550 2822a352 2019-10-15 stsp __dead static void
8551 2822a352 2019-10-15 stsp usage_integrate(void)
8553 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8557 2822a352 2019-10-15 stsp static const struct got_error *
8558 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8560 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8561 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8562 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8563 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8564 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8565 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8566 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8567 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8569 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8571 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8572 2822a352 2019-10-15 stsp switch (ch) {
8574 2822a352 2019-10-15 stsp usage_integrate();
8575 2822a352 2019-10-15 stsp /* NOTREACHED */
8579 2822a352 2019-10-15 stsp argc -= optind;
8580 2822a352 2019-10-15 stsp argv += optind;
8582 2822a352 2019-10-15 stsp if (argc != 1)
8583 2822a352 2019-10-15 stsp usage_integrate();
8584 2822a352 2019-10-15 stsp branch_arg = argv[0];
8586 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8587 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
8588 2822a352 2019-10-15 stsp err(1, "pledge");
8590 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
8591 2822a352 2019-10-15 stsp if (cwd == NULL) {
8592 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
8593 2822a352 2019-10-15 stsp goto done;
8596 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
8597 fa51e947 2020-03-27 stsp if (error) {
8598 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8599 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
8601 2822a352 2019-10-15 stsp goto done;
8604 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
8605 2822a352 2019-10-15 stsp if (error)
8606 2822a352 2019-10-15 stsp goto done;
8608 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8610 2822a352 2019-10-15 stsp if (error != NULL)
8611 2822a352 2019-10-15 stsp goto done;
8613 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8614 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
8615 2822a352 2019-10-15 stsp if (error)
8616 2822a352 2019-10-15 stsp goto done;
8618 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8619 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
8620 2822a352 2019-10-15 stsp goto done;
8623 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8624 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
8625 2822a352 2019-10-15 stsp if (error)
8626 2822a352 2019-10-15 stsp goto done;
8628 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
8629 2822a352 2019-10-15 stsp if (refname == NULL) {
8630 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8631 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8632 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8633 2822a352 2019-10-15 stsp goto done;
8635 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
8636 2822a352 2019-10-15 stsp if (base_refname == NULL) {
8637 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8638 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8639 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8640 2822a352 2019-10-15 stsp goto done;
8643 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
8644 2822a352 2019-10-15 stsp if (error)
8645 2822a352 2019-10-15 stsp goto done;
8647 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8648 2822a352 2019-10-15 stsp if (error)
8649 2822a352 2019-10-15 stsp goto done;
8651 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8652 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
8653 2822a352 2019-10-15 stsp "specified branch has already been integrated");
8654 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8655 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8656 2822a352 2019-10-15 stsp goto done;
8659 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8660 2822a352 2019-10-15 stsp if (error) {
8661 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
8662 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
8663 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8664 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8665 2822a352 2019-10-15 stsp goto done;
8668 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8669 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
8670 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
8671 2822a352 2019-10-15 stsp check_cancelled, NULL);
8672 2822a352 2019-10-15 stsp if (error)
8673 2822a352 2019-10-15 stsp goto done;
8675 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
8676 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8679 715dc77e 2019-08-03 stsp got_repo_close(repo);
8680 2822a352 2019-10-15 stsp if (worktree)
8681 2822a352 2019-10-15 stsp got_worktree_close(worktree);
8682 2822a352 2019-10-15 stsp free(cwd);
8683 2822a352 2019-10-15 stsp free(base_commit_id);
8684 2822a352 2019-10-15 stsp free(commit_id);
8685 2822a352 2019-10-15 stsp free(refname);
8686 2822a352 2019-10-15 stsp free(base_refname);
8687 715dc77e 2019-08-03 stsp return error;
8690 715dc77e 2019-08-03 stsp __dead static void
8691 715dc77e 2019-08-03 stsp usage_stage(void)
8693 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8694 f3055044 2019-08-07 stsp "[file-path ...]\n",
8695 715dc77e 2019-08-03 stsp getprogname());
8699 715dc77e 2019-08-03 stsp static const struct got_error *
8700 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
8701 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
8702 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8703 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
8705 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
8706 408b4ebc 2019-08-03 stsp char *id_str = NULL;
8708 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
8709 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
8710 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
8711 408b4ebc 2019-08-03 stsp return NULL;
8713 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
8714 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
8715 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
8717 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
8719 408b4ebc 2019-08-03 stsp return err;
8721 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
8722 408b4ebc 2019-08-03 stsp free(id_str);
8723 dc424a06 2019-08-07 stsp return NULL;
8726 dc424a06 2019-08-07 stsp static const struct got_error *
8727 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
8729 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
8730 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
8731 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
8732 715dc77e 2019-08-03 stsp char *cwd = NULL;
8733 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
8734 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
8735 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
8736 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
8737 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8738 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8740 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
8742 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8743 715dc77e 2019-08-03 stsp switch (ch) {
8745 408b4ebc 2019-08-03 stsp list_stage = 1;
8748 dc424a06 2019-08-07 stsp pflag = 1;
8751 dc424a06 2019-08-07 stsp patch_script_path = optarg;
8754 715dc77e 2019-08-03 stsp usage_stage();
8755 715dc77e 2019-08-03 stsp /* NOTREACHED */
8759 715dc77e 2019-08-03 stsp argc -= optind;
8760 715dc77e 2019-08-03 stsp argv += optind;
8762 715dc77e 2019-08-03 stsp #ifndef PROFILE
8763 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8764 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
8765 715dc77e 2019-08-03 stsp err(1, "pledge");
8767 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
8768 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
8769 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
8770 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
8772 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
8773 715dc77e 2019-08-03 stsp if (cwd == NULL) {
8774 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
8775 715dc77e 2019-08-03 stsp goto done;
8778 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8779 fa51e947 2020-03-27 stsp if (error) {
8780 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8781 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
8782 715dc77e 2019-08-03 stsp goto done;
8785 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8787 715dc77e 2019-08-03 stsp if (error != NULL)
8788 715dc77e 2019-08-03 stsp goto done;
8790 dc424a06 2019-08-07 stsp if (patch_script_path) {
8791 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
8792 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
8793 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
8794 dc424a06 2019-08-07 stsp patch_script_path);
8795 dc424a06 2019-08-07 stsp goto done;
8798 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8799 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
8800 715dc77e 2019-08-03 stsp if (error)
8801 715dc77e 2019-08-03 stsp goto done;
8803 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8804 6d022e97 2019-08-04 stsp if (error)
8805 6d022e97 2019-08-04 stsp goto done;
8807 6d022e97 2019-08-04 stsp if (list_stage)
8808 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
8809 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
8811 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8812 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
8813 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
8814 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
8815 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
8818 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8819 2e1f37b0 2019-08-08 stsp error == NULL)
8820 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8822 ad493afc 2019-08-03 stsp got_repo_close(repo);
8823 ad493afc 2019-08-03 stsp if (worktree)
8824 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
8825 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8826 ad493afc 2019-08-03 stsp free((char *)pe->path);
8827 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
8828 ad493afc 2019-08-03 stsp free(cwd);
8829 ad493afc 2019-08-03 stsp return error;
8832 ad493afc 2019-08-03 stsp __dead static void
8833 ad493afc 2019-08-03 stsp usage_unstage(void)
8835 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8836 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
8837 ad493afc 2019-08-03 stsp getprogname());
8842 ad493afc 2019-08-03 stsp static const struct got_error *
8843 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
8845 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
8846 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
8847 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
8848 ad493afc 2019-08-03 stsp char *cwd = NULL;
8849 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
8850 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8851 9627c110 2020-04-18 stsp int ch, pflag = 0;
8852 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8853 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
8854 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8855 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8857 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
8859 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
8860 ad493afc 2019-08-03 stsp switch (ch) {
8862 2e1f37b0 2019-08-08 stsp pflag = 1;
8865 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
8868 ad493afc 2019-08-03 stsp usage_unstage();
8869 ad493afc 2019-08-03 stsp /* NOTREACHED */
8873 ad493afc 2019-08-03 stsp argc -= optind;
8874 ad493afc 2019-08-03 stsp argv += optind;
8876 ad493afc 2019-08-03 stsp #ifndef PROFILE
8877 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8878 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
8879 ad493afc 2019-08-03 stsp err(1, "pledge");
8881 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
8882 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
8884 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
8885 ad493afc 2019-08-03 stsp if (cwd == NULL) {
8886 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
8887 ad493afc 2019-08-03 stsp goto done;
8890 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8891 fa51e947 2020-03-27 stsp if (error) {
8892 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8893 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
8894 ad493afc 2019-08-03 stsp goto done;
8897 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8899 ad493afc 2019-08-03 stsp if (error != NULL)
8900 ad493afc 2019-08-03 stsp goto done;
8902 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
8903 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
8904 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
8905 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
8906 2e1f37b0 2019-08-08 stsp patch_script_path);
8907 2e1f37b0 2019-08-08 stsp goto done;
8911 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8912 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
8913 ad493afc 2019-08-03 stsp if (error)
8914 ad493afc 2019-08-03 stsp goto done;
8916 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8917 ad493afc 2019-08-03 stsp if (error)
8918 ad493afc 2019-08-03 stsp goto done;
8920 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8921 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
8922 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8923 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
8924 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
8925 9627c110 2020-04-18 stsp if (!error)
8926 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8928 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8929 2e1f37b0 2019-08-08 stsp error == NULL)
8930 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8932 0ebf8283 2019-07-24 stsp got_repo_close(repo);
8933 715dc77e 2019-08-03 stsp if (worktree)
8934 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
8935 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8936 715dc77e 2019-08-03 stsp free((char *)pe->path);
8937 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
8938 715dc77e 2019-08-03 stsp free(cwd);
8939 01073a5d 2019-08-22 stsp return error;
8942 01073a5d 2019-08-22 stsp __dead static void
8943 01073a5d 2019-08-22 stsp usage_cat(void)
8945 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8946 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
8950 01073a5d 2019-08-22 stsp static const struct got_error *
8951 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8953 01073a5d 2019-08-22 stsp const struct got_error *err;
8954 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
8956 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
8958 01073a5d 2019-08-22 stsp return err;
8960 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8961 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
8962 01073a5d 2019-08-22 stsp return err;
8965 01073a5d 2019-08-22 stsp static const struct got_error *
8966 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8968 01073a5d 2019-08-22 stsp const struct got_error *err;
8969 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
8970 56e0773d 2019-11-28 stsp int nentries, i;
8972 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
8974 01073a5d 2019-08-22 stsp return err;
8976 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
8977 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
8978 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
8979 01073a5d 2019-08-22 stsp char *id_str;
8980 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
8982 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
8983 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8986 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
8987 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
8988 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
8989 01073a5d 2019-08-22 stsp free(id_str);
8992 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
8993 01073a5d 2019-08-22 stsp return err;
8996 01073a5d 2019-08-22 stsp static const struct got_error *
8997 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8999 01073a5d 2019-08-22 stsp const struct got_error *err;
9000 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
9001 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
9002 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
9003 01073a5d 2019-08-22 stsp char *id_str = NULL;
9004 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
9006 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
9008 01073a5d 2019-08-22 stsp return err;
9010 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9012 01073a5d 2019-08-22 stsp goto done;
9014 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9015 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
9016 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
9017 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
9018 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9019 01073a5d 2019-08-22 stsp char *pid_str;
9020 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
9022 01073a5d 2019-08-22 stsp goto done;
9023 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9024 01073a5d 2019-08-22 stsp free(pid_str);
9026 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9027 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9028 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
9030 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9031 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
9032 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
9034 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
9035 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9036 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
9038 01073a5d 2019-08-22 stsp free(id_str);
9039 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
9040 01073a5d 2019-08-22 stsp return err;
9043 01073a5d 2019-08-22 stsp static const struct got_error *
9044 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9046 01073a5d 2019-08-22 stsp const struct got_error *err;
9047 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
9048 01073a5d 2019-08-22 stsp char *id_str = NULL;
9049 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
9051 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
9053 01073a5d 2019-08-22 stsp return err;
9055 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9057 01073a5d 2019-08-22 stsp goto done;
9059 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9061 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
9062 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9063 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9064 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
9066 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9067 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9068 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
9070 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9071 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9072 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
9074 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9075 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9076 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
9082 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9083 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
9085 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9086 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
9087 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
9089 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
9090 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9091 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
9093 01073a5d 2019-08-22 stsp free(id_str);
9094 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
9095 01073a5d 2019-08-22 stsp return err;
9098 01073a5d 2019-08-22 stsp static const struct got_error *
9099 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
9101 01073a5d 2019-08-22 stsp const struct got_error *error;
9102 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
9103 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
9104 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
9105 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
9106 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
9107 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
9109 01073a5d 2019-08-22 stsp #ifndef PROFILE
9110 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9111 01073a5d 2019-08-22 stsp NULL) == -1)
9112 01073a5d 2019-08-22 stsp err(1, "pledge");
9115 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9116 01073a5d 2019-08-22 stsp switch (ch) {
9118 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9121 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9122 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9123 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9125 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9128 896e9b6f 2019-08-26 stsp force_path = 1;
9131 01073a5d 2019-08-22 stsp usage_cat();
9132 01073a5d 2019-08-22 stsp /* NOTREACHED */
9136 01073a5d 2019-08-22 stsp argc -= optind;
9137 01073a5d 2019-08-22 stsp argv += optind;
9139 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9140 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9141 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9142 01073a5d 2019-08-22 stsp goto done;
9144 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9145 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9146 01073a5d 2019-08-22 stsp goto done;
9147 01073a5d 2019-08-22 stsp if (worktree) {
9148 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9149 01073a5d 2019-08-22 stsp repo_path = strdup(
9150 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9151 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9152 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9153 01073a5d 2019-08-22 stsp goto done;
9158 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9159 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9160 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9161 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9164 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9165 01073a5d 2019-08-22 stsp free(repo_path);
9166 01073a5d 2019-08-22 stsp if (error != NULL)
9167 01073a5d 2019-08-22 stsp goto done;
9169 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9170 896e9b6f 2019-08-26 stsp if (error)
9171 896e9b6f 2019-08-26 stsp goto done;
9173 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9174 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9175 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9176 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9177 01073a5d 2019-08-22 stsp if (error)
9178 01073a5d 2019-08-22 stsp goto done;
9180 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9181 896e9b6f 2019-08-26 stsp if (force_path) {
9182 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9184 896e9b6f 2019-08-26 stsp if (error)
9187 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9188 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9189 896e9b6f 2019-08-26 stsp if (error) {
9190 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9191 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9193 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9194 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9195 896e9b6f 2019-08-26 stsp if (error)
9200 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9201 01073a5d 2019-08-22 stsp if (error)
9204 01073a5d 2019-08-22 stsp switch (obj_type) {
9205 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9206 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9208 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9209 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9211 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9212 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9214 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9215 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9218 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9221 01073a5d 2019-08-22 stsp if (error)
9223 01073a5d 2019-08-22 stsp free(label);
9224 01073a5d 2019-08-22 stsp label = NULL;
9226 01073a5d 2019-08-22 stsp id = NULL;
9229 01073a5d 2019-08-22 stsp free(label);
9231 896e9b6f 2019-08-26 stsp free(commit_id);
9232 01073a5d 2019-08-22 stsp if (worktree)
9233 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9234 01073a5d 2019-08-22 stsp if (repo) {
9235 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9236 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9237 01073a5d 2019-08-22 stsp if (error == NULL)
9238 01073a5d 2019-08-22 stsp error = repo_error;
9240 0ebf8283 2019-07-24 stsp return error;
