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 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1181 9c52365f 2020-03-21 stsp server_path, verbosity);
1182 39c64a6a 2020-03-18 stsp if (error)
1183 bb64b798 2020-03-18 stsp goto done;
1185 68999b92 2020-03-18 stsp if (verbosity >= 0)
1186 62a4c94c 2020-03-20 stsp printf("Connected to %s%s%s\n", host,
1187 62a4c94c 2020-03-20 stsp port ? ":" : "", port ? port : "");
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 6338a6a1 2020-03-21 stsp printf("Updated reference %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 bcf34b0e 2020-03-26 stsp printf("Updated reference %s: %s\n",
1547 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1548 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1552 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1553 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1554 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1555 bcf34b0e 2020-03-26 stsp err = unlock_err;
1557 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1558 f1bcca34 2020-03-25 stsp return err;
1561 2ab43947 2020-03-18 stsp __dead static void
1562 7848a0e1 2020-03-19 stsp usage_fetch(void)
1564 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1565 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1566 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1567 13f12b09 2020-03-21 stsp getprogname());
1571 7848a0e1 2020-03-19 stsp static const struct got_error *
1572 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1573 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1575 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1576 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1577 3789fd73 2020-03-26 stsp char *id_str = NULL;
1579 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1580 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1582 3789fd73 2020-03-26 stsp return err;
1583 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1584 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1585 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1586 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1589 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1591 3789fd73 2020-03-26 stsp return err;
1592 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1594 3789fd73 2020-03-26 stsp goto done;
1596 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1598 3789fd73 2020-03-26 stsp goto done;
1599 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1600 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1601 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1606 3789fd73 2020-03-26 stsp free(id_str);
1607 3789fd73 2020-03-26 stsp return NULL;
1610 3789fd73 2020-03-26 stsp static const struct got_error *
1611 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1612 3789fd73 2020-03-26 stsp struct got_pathlist_head *their_symrefs, struct got_remote_repo *remote,
1613 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1615 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
1616 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1617 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1618 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1619 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
1620 3789fd73 2020-03-26 stsp char *local_refname = NULL;
1622 f21ec2f0 2020-03-21 stsp SIMPLEQ_INIT(&my_refs);
1624 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1626 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
1628 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1630 3789fd73 2020-03-26 stsp goto done;
1632 f21ec2f0 2020-03-21 stsp SIMPLEQ_FOREACH(re, &my_refs, entry) {
1633 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1635 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
1636 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
1637 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
1638 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
1639 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
1641 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
1642 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
1643 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
1644 3789fd73 2020-03-26 stsp goto done;
1646 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
1650 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1651 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1654 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1657 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
1658 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1661 3789fd73 2020-03-26 stsp if (pe != NULL)
1664 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
1668 3789fd73 2020-03-26 stsp if (local_refname) {
1669 3789fd73 2020-03-26 stsp struct got_reference *ref;
1670 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
1671 3789fd73 2020-03-26 stsp if (err) {
1672 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1674 3789fd73 2020-03-26 stsp free(local_refname);
1675 3789fd73 2020-03-26 stsp local_refname = NULL;
1678 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
1681 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
1682 3789fd73 2020-03-26 stsp got_ref_close(ref);
1683 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
1684 3789fd73 2020-03-26 stsp err = unlock_err;
1688 3789fd73 2020-03-26 stsp free(local_refname);
1689 3789fd73 2020-03-26 stsp local_refname = NULL;
1693 3789fd73 2020-03-26 stsp free(remote_namespace);
1694 3789fd73 2020-03-26 stsp free(local_refname);
1695 0e4002ca 2020-03-21 stsp return err;
1698 0e4002ca 2020-03-21 stsp static const struct got_error *
1699 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1700 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1702 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1703 0e4002ca 2020-03-21 stsp char *remote_refname;
1704 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1706 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1707 0e4002ca 2020-03-21 stsp refname += 5;
1709 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1710 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1711 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1713 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1714 0e4002ca 2020-03-21 stsp if (err) {
1715 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1716 0e4002ca 2020-03-21 stsp goto done;
1717 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1719 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1720 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1721 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1722 9f142382 2020-03-21 stsp err = unlock_err;
1723 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1726 0e4002ca 2020-03-21 stsp free(remote_refname);
1727 f21ec2f0 2020-03-21 stsp return err;
1730 f21ec2f0 2020-03-21 stsp static const struct got_error *
1731 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1733 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1734 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1735 7848a0e1 2020-03-19 stsp const char *remote_name;
1736 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1737 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
1738 7848a0e1 2020-03-19 stsp struct got_remote_repo *remotes, *remote = NULL;
1739 7848a0e1 2020-03-19 stsp int nremotes;
1740 7848a0e1 2020-03-19 stsp char *id_str = NULL;
1741 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
1742 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
1743 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1744 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
1745 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
1746 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
1747 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1748 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
1749 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1750 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
1752 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
1753 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
1754 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1755 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1757 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1758 7848a0e1 2020-03-19 stsp switch (ch) {
1760 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1763 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1764 4ba14133 2020-03-20 stsp optarg, NULL);
1765 4ba14133 2020-03-20 stsp if (error)
1766 4ba14133 2020-03-20 stsp return error;
1769 f21ec2f0 2020-03-21 stsp delete_refs = 1;
1772 41b0de12 2020-03-21 stsp list_refs_only = 1;
1775 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
1776 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1777 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
1779 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
1782 db6d8ad8 2020-03-21 stsp replace_tags = 1;
1785 7848a0e1 2020-03-19 stsp if (verbosity < 0)
1786 7848a0e1 2020-03-19 stsp verbosity = 0;
1787 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
1788 7848a0e1 2020-03-19 stsp verbosity++;
1791 7848a0e1 2020-03-19 stsp verbosity = -1;
1794 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1795 0e4002ca 2020-03-21 stsp optarg, NULL);
1796 0e4002ca 2020-03-21 stsp if (error)
1797 0e4002ca 2020-03-21 stsp return error;
1800 7848a0e1 2020-03-19 stsp usage_fetch();
1804 7848a0e1 2020-03-19 stsp argc -= optind;
1805 7848a0e1 2020-03-19 stsp argv += optind;
1807 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1808 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1809 41b0de12 2020-03-21 stsp if (list_refs_only) {
1810 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1811 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1812 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1813 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1814 f21ec2f0 2020-03-21 stsp if (delete_refs)
1815 f21ec2f0 2020-03-21 stsp errx(1, "-l and -d options are mutually exclusive");
1816 41b0de12 2020-03-21 stsp if (verbosity == -1)
1817 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1820 7848a0e1 2020-03-19 stsp if (argc == 0)
1821 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1822 7848a0e1 2020-03-19 stsp else if (argc == 1)
1823 7848a0e1 2020-03-19 stsp remote_name = argv[0];
1825 7848a0e1 2020-03-19 stsp usage_fetch();
1827 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
1828 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
1829 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
1830 7848a0e1 2020-03-19 stsp goto done;
1833 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1834 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
1835 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1836 7848a0e1 2020-03-19 stsp goto done;
1838 7848a0e1 2020-03-19 stsp error = NULL;
1839 7848a0e1 2020-03-19 stsp if (worktree) {
1840 7848a0e1 2020-03-19 stsp repo_path =
1841 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
1842 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1843 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1844 7848a0e1 2020-03-19 stsp if (error)
1845 7848a0e1 2020-03-19 stsp goto done;
1847 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
1848 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1849 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1850 7848a0e1 2020-03-19 stsp goto done;
1855 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
1856 7848a0e1 2020-03-19 stsp if (error)
1857 7848a0e1 2020-03-19 stsp goto done;
1859 7848a0e1 2020-03-19 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1860 7848a0e1 2020-03-19 stsp for (i = 0; i < nremotes; i++) {
1861 7848a0e1 2020-03-19 stsp remote = &remotes[i];
1862 7848a0e1 2020-03-19 stsp if (strcmp(remote->name, remote_name) == 0)
1865 7848a0e1 2020-03-19 stsp if (i == nremotes) {
1866 7848a0e1 2020-03-19 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1867 7848a0e1 2020-03-19 stsp goto done;
1870 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1871 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
1872 7848a0e1 2020-03-19 stsp if (error)
1873 7848a0e1 2020-03-19 stsp goto done;
1875 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
1876 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1877 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1878 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
1879 7848a0e1 2020-03-19 stsp err(1, "pledge");
1881 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1882 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
1883 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1884 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1885 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
1886 7848a0e1 2020-03-19 stsp err(1, "pledge");
1888 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
1889 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
1890 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1891 7848a0e1 2020-03-19 stsp goto done;
1893 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1894 7848a0e1 2020-03-19 stsp goto done;
1897 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1898 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1899 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
1900 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
1901 7848a0e1 2020-03-19 stsp goto done;
1904 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
1905 7848a0e1 2020-03-19 stsp if (error)
1906 7848a0e1 2020-03-19 stsp goto done;
1908 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1909 9c52365f 2020-03-21 stsp server_path, verbosity);
1910 7848a0e1 2020-03-19 stsp if (error)
1911 7848a0e1 2020-03-19 stsp goto done;
1913 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
1914 62a4c94c 2020-03-20 stsp printf("Connected to \"%s\" %s%s%s\n", remote->name, host,
1915 62a4c94c 2020-03-20 stsp port ? ":" : "", port ? port : "");
1917 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
1918 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
1919 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
1920 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
1921 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
1922 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
1923 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
1924 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1925 7848a0e1 2020-03-19 stsp if (error)
1926 7848a0e1 2020-03-19 stsp goto done;
1928 41b0de12 2020-03-21 stsp if (list_refs_only) {
1929 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1930 41b0de12 2020-03-21 stsp goto done;
1933 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
1934 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
1935 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
1936 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
1937 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
1938 984065c8 2020-03-19 stsp if (error)
1939 984065c8 2020-03-19 stsp goto done;
1940 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1941 984065c8 2020-03-19 stsp free(id_str);
1942 984065c8 2020-03-19 stsp id_str = NULL;
1945 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
1946 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
1947 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
1948 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
1949 7848a0e1 2020-03-19 stsp struct got_reference *ref;
1950 7848a0e1 2020-03-19 stsp char *remote_refname;
1952 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1953 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
1954 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
1955 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
1956 0e4002ca 2020-03-21 stsp if (error)
1957 0e4002ca 2020-03-21 stsp goto done;
1961 1510c839 2020-03-20 stsp if (remote->mirror_references ||
1962 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
1963 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
1964 7848a0e1 2020-03-19 stsp if (error) {
1965 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1966 7848a0e1 2020-03-19 stsp goto done;
1967 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
1969 7848a0e1 2020-03-19 stsp if (error)
1970 7848a0e1 2020-03-19 stsp goto done;
1972 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1973 db6d8ad8 2020-03-21 stsp verbosity, repo);
1974 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1975 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
1976 9f142382 2020-03-21 stsp error = unlock_err;
1977 7848a0e1 2020-03-19 stsp got_ref_close(ref);
1978 7848a0e1 2020-03-19 stsp if (error)
1979 7848a0e1 2020-03-19 stsp goto done;
1981 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
1982 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1983 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
1984 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
1985 7848a0e1 2020-03-19 stsp goto done;
1988 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
1989 7848a0e1 2020-03-19 stsp if (error) {
1990 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1991 7848a0e1 2020-03-19 stsp goto done;
1992 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
1993 688f11b3 2020-03-21 stsp verbosity, repo);
1994 7848a0e1 2020-03-19 stsp if (error)
1995 7848a0e1 2020-03-19 stsp goto done;
1997 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1998 db6d8ad8 2020-03-21 stsp verbosity, repo);
1999 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2000 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2001 9f142382 2020-03-21 stsp error = unlock_err;
2002 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2003 7848a0e1 2020-03-19 stsp if (error)
2004 7848a0e1 2020-03-19 stsp goto done;
2007 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2008 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2009 2ec30c80 2020-03-20 stsp if (error) {
2010 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2011 2ec30c80 2020-03-20 stsp goto done;
2012 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2014 2ec30c80 2020-03-20 stsp if (error)
2015 2ec30c80 2020-03-20 stsp goto done;
2017 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2018 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2019 9f142382 2020-03-21 stsp error = unlock_err;
2020 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2024 f1bcca34 2020-03-25 stsp if (delete_refs) {
2025 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2026 3789fd73 2020-03-26 stsp verbosity, repo);
2027 f1bcca34 2020-03-25 stsp if (error)
2028 f1bcca34 2020-03-25 stsp goto done;
2031 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2032 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2033 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2034 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2035 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2036 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2037 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2039 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2042 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2045 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2046 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2047 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2048 f1bcca34 2020-03-25 stsp goto done;
2050 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2051 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2052 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2053 f1bcca34 2020-03-25 stsp free(remote_refname);
2054 f1bcca34 2020-03-25 stsp goto done;
2057 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2059 f1bcca34 2020-03-25 stsp if (error) {
2060 f1bcca34 2020-03-25 stsp free(remote_refname);
2061 f1bcca34 2020-03-25 stsp free(remote_target);
2062 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2063 f1bcca34 2020-03-25 stsp error = NULL;
2066 f1bcca34 2020-03-25 stsp goto done;
2068 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2069 f1bcca34 2020-03-25 stsp verbosity, repo);
2070 f1bcca34 2020-03-25 stsp free(remote_refname);
2071 f1bcca34 2020-03-25 stsp free(remote_target);
2072 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2073 f1bcca34 2020-03-25 stsp if (error)
2074 f1bcca34 2020-03-25 stsp goto done;
2078 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2079 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2080 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2081 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2082 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2084 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2085 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2087 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2088 7848a0e1 2020-03-19 stsp if (worktree)
2089 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2090 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2091 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2092 7848a0e1 2020-03-19 stsp free(pe->data);
2094 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2095 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2096 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2097 7848a0e1 2020-03-19 stsp free(pe->data);
2099 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2100 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2101 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2102 7848a0e1 2020-03-19 stsp free(id_str);
2103 7848a0e1 2020-03-19 stsp free(cwd);
2104 7848a0e1 2020-03-19 stsp free(repo_path);
2105 7848a0e1 2020-03-19 stsp free(pack_hash);
2106 7848a0e1 2020-03-19 stsp free(proto);
2107 7848a0e1 2020-03-19 stsp free(host);
2108 7848a0e1 2020-03-19 stsp free(port);
2109 7848a0e1 2020-03-19 stsp free(server_path);
2110 7848a0e1 2020-03-19 stsp free(repo_name);
2111 7848a0e1 2020-03-19 stsp return error;
2115 7848a0e1 2020-03-19 stsp __dead static void
2116 2ab43947 2020-03-18 stsp usage_checkout(void)
2118 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2119 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2123 2ab43947 2020-03-18 stsp static void
2124 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2126 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2127 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2128 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2129 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2130 2ab43947 2020-03-18 stsp getprogname());
2133 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2134 2ab43947 2020-03-18 stsp const char *worktree_path;
2135 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2138 2ab43947 2020-03-18 stsp static const struct got_error *
2139 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2141 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2143 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2144 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2145 2ab43947 2020-03-18 stsp return NULL;
2147 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2148 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2149 2ab43947 2020-03-18 stsp return NULL;
2152 2ab43947 2020-03-18 stsp while (path[0] == '/')
2155 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2156 2ab43947 2020-03-18 stsp return NULL;
2159 2ab43947 2020-03-18 stsp static const struct got_error *
2160 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2162 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2163 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2164 2ab43947 2020-03-18 stsp return NULL;
2167 2ab43947 2020-03-18 stsp static const struct got_error *
2168 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2169 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2170 2ab43947 2020-03-18 stsp struct got_repository *repo)
2172 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2173 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2175 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2176 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2178 2ab43947 2020-03-18 stsp return err;
2180 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2181 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2184 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2185 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2187 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2189 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2197 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2198 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2199 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2201 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2202 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2203 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2204 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2205 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2206 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2208 2ab43947 2020-03-18 stsp free(yca_id);
2209 2ab43947 2020-03-18 stsp return NULL;
2212 2ab43947 2020-03-18 stsp static const struct got_error *
2213 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2214 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2215 2ab43947 2020-03-18 stsp struct got_repository *repo)
2217 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2218 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2219 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2220 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2222 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2224 2ab43947 2020-03-18 stsp goto done;
2226 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2227 2ab43947 2020-03-18 stsp is_same_branch = 1;
2228 2ab43947 2020-03-18 stsp goto done;
2230 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2231 2ab43947 2020-03-18 stsp is_same_branch = 1;
2232 2ab43947 2020-03-18 stsp goto done;
2235 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2237 2ab43947 2020-03-18 stsp goto done;
2239 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2240 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2242 2ab43947 2020-03-18 stsp goto done;
2244 2ab43947 2020-03-18 stsp for (;;) {
2245 2ab43947 2020-03-18 stsp struct got_object_id *id;
2246 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2247 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2248 2ab43947 2020-03-18 stsp if (err) {
2249 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2250 2ab43947 2020-03-18 stsp err = NULL;
2255 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2257 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2258 2ab43947 2020-03-18 stsp is_same_branch = 1;
2264 2ab43947 2020-03-18 stsp if (graph)
2265 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2266 2ab43947 2020-03-18 stsp free(head_commit_id);
2267 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2268 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2269 2ab43947 2020-03-18 stsp return err;
2272 4ed7e80c 2018-05-20 stsp static const struct got_error *
2273 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2275 4b6c9460 2020-03-05 stsp static char msg[512];
2276 4b6c9460 2020-03-05 stsp const char *branch_name;
2278 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2279 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2281 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2283 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2284 4b6c9460 2020-03-05 stsp branch_name += 11;
2286 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2287 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2288 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2289 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2290 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2291 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2293 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2296 4b6c9460 2020-03-05 stsp static const struct got_error *
2297 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2299 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2300 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2301 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2302 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2303 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2304 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2305 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2306 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2307 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2308 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2309 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2310 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2312 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2314 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2315 0bb8a95e 2018-03-12 stsp switch (ch) {
2317 08573d5b 2019-05-14 stsp branch_name = optarg;
2320 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2321 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2322 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2325 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2328 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2331 2deda0b9 2019-03-07 stsp usage_checkout();
2332 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2336 0bb8a95e 2018-03-12 stsp argc -= optind;
2337 0bb8a95e 2018-03-12 stsp argv += optind;
2339 6715a751 2018-03-16 stsp #ifndef PROFILE
2340 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2341 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2342 c09a553d 2018-03-12 stsp err(1, "pledge");
2344 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2345 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
2346 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2347 76089277 2018-04-01 stsp if (repo_path == NULL)
2348 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2349 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2350 76089277 2018-04-01 stsp if (cwd == NULL) {
2351 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2352 76089277 2018-04-01 stsp goto done;
2354 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
2355 230a42bd 2019-05-11 jcs base = basename(path_prefix);
2356 230a42bd 2019-05-11 jcs if (base == NULL) {
2357 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2358 230a42bd 2019-05-11 jcs path_prefix);
2362 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
2363 230a42bd 2019-05-11 jcs if (base == NULL) {
2364 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2365 230a42bd 2019-05-11 jcs repo_path);
2369 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2370 c09a553d 2018-03-12 stsp if (dotgit)
2371 c09a553d 2018-03-12 stsp *dotgit = '\0';
2372 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2373 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2374 c09a553d 2018-03-12 stsp free(cwd);
2375 76089277 2018-04-01 stsp goto done;
2377 c09a553d 2018-03-12 stsp free(cwd);
2378 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2379 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2380 76089277 2018-04-01 stsp if (repo_path == NULL) {
2381 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2382 76089277 2018-04-01 stsp goto done;
2384 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2385 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2386 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2387 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2389 b4b3a7dd 2019-07-22 stsp goto done;
2391 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2392 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2393 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2394 b4b3a7dd 2019-07-22 stsp goto done;
2398 c09a553d 2018-03-12 stsp usage_checkout();
2400 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2401 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2403 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2404 c09a553d 2018-03-12 stsp if (error != NULL)
2405 c02c541e 2019-03-29 stsp goto done;
2407 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2408 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2409 c530dc23 2019-07-23 stsp if (error) {
2410 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2411 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2412 c530dc23 2019-07-23 stsp goto done;
2413 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2414 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2415 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2416 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2417 c530dc23 2019-07-23 stsp goto done;
2421 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2422 c02c541e 2019-03-29 stsp if (error)
2423 c09a553d 2018-03-12 stsp goto done;
2425 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2426 c09a553d 2018-03-12 stsp if (error != NULL)
2427 c09a553d 2018-03-12 stsp goto done;
2429 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2430 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2431 c09a553d 2018-03-12 stsp goto done;
2433 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2434 c09a553d 2018-03-12 stsp if (error != NULL)
2435 c09a553d 2018-03-12 stsp goto done;
2437 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2438 e5dc7198 2018-12-29 stsp path_prefix);
2439 e5dc7198 2018-12-29 stsp if (error != NULL)
2440 e5dc7198 2018-12-29 stsp goto done;
2441 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2442 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2443 49520a32 2018-12-29 stsp goto done;
2446 8069f636 2019-01-12 stsp if (commit_id_str) {
2447 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2448 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2449 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2450 30837e32 2019-07-25 stsp if (error)
2451 8069f636 2019-01-12 stsp goto done;
2452 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2453 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2454 8069f636 2019-01-12 stsp if (error != NULL) {
2455 8069f636 2019-01-12 stsp free(commit_id);
2456 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2457 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2458 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2460 8069f636 2019-01-12 stsp goto done;
2462 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2463 4b6c9460 2020-03-05 stsp if (error) {
2464 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2465 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2466 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2468 45d344f6 2019-05-14 stsp goto done;
2470 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2471 8069f636 2019-01-12 stsp commit_id);
2472 8069f636 2019-01-12 stsp free(commit_id);
2473 8069f636 2019-01-12 stsp if (error)
2474 8069f636 2019-01-12 stsp goto done;
2477 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2478 f2ea84fa 2019-07-27 stsp if (error)
2479 f2ea84fa 2019-07-27 stsp goto done;
2480 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2481 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2482 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2483 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2484 c09a553d 2018-03-12 stsp if (error != NULL)
2485 c09a553d 2018-03-12 stsp goto done;
2487 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2488 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2489 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2491 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2492 8069f636 2019-01-12 stsp free(commit_id_str);
2493 76089277 2018-04-01 stsp free(repo_path);
2494 507dc3bb 2018-12-29 stsp free(worktree_path);
2495 507dc3bb 2018-12-29 stsp return error;
2498 507dc3bb 2018-12-29 stsp __dead static void
2499 507dc3bb 2018-12-29 stsp usage_update(void)
2501 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2502 507dc3bb 2018-12-29 stsp getprogname());
2506 1ee397ad 2019-07-12 stsp static const struct got_error *
2507 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2509 784955db 2019-01-12 stsp int *did_something = arg;
2511 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2512 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2513 1ee397ad 2019-07-12 stsp return NULL;
2515 1545c615 2019-02-10 stsp *did_something = 1;
2517 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2518 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2519 1ee397ad 2019-07-12 stsp return NULL;
2521 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2523 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2524 1ee397ad 2019-07-12 stsp return NULL;
2527 be7061eb 2018-12-30 stsp static const struct got_error *
2528 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2529 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2530 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2532 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2533 a1fb16d8 2019-05-24 stsp char *base_id_str;
2534 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2536 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2537 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2538 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2539 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2540 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2541 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2542 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2545 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2546 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2547 a1fb16d8 2019-05-24 stsp if (err) {
2548 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2549 a1fb16d8 2019-05-24 stsp return err;
2550 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2552 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2553 a1fb16d8 2019-05-24 stsp return NULL;
2555 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2556 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2557 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2559 a1fb16d8 2019-05-24 stsp return err;
2560 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2561 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2562 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2563 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2564 0ebf8283 2019-07-24 stsp return NULL;
2567 0ebf8283 2019-07-24 stsp static const struct got_error *
2568 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2570 0ebf8283 2019-07-24 stsp const struct got_error *err;
2571 0ebf8283 2019-07-24 stsp int in_progress;
2573 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2575 0ebf8283 2019-07-24 stsp return err;
2576 0ebf8283 2019-07-24 stsp if (in_progress)
2577 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2579 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2581 0ebf8283 2019-07-24 stsp return err;
2582 0ebf8283 2019-07-24 stsp if (in_progress)
2583 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2585 a1fb16d8 2019-05-24 stsp return NULL;
2588 a5edda0a 2019-07-27 stsp static const struct got_error *
2589 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2590 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2592 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2593 a5edda0a 2019-07-27 stsp char *path;
2596 a5edda0a 2019-07-27 stsp if (argc == 0) {
2597 a5edda0a 2019-07-27 stsp path = strdup("");
2598 a5edda0a 2019-07-27 stsp if (path == NULL)
2599 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2600 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2603 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2604 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2607 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2608 a5edda0a 2019-07-27 stsp if (err) {
2609 a5edda0a 2019-07-27 stsp free(path);
2614 a5edda0a 2019-07-27 stsp return err;
2617 a1fb16d8 2019-05-24 stsp static const struct got_error *
2618 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2619 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2621 fa51e947 2020-03-27 stsp const struct got_error *err;
2622 fa51e947 2020-03-27 stsp struct got_repository *repo;
2623 fa51e947 2020-03-27 stsp static char msg[512];
2625 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2627 fa51e947 2020-03-27 stsp return orig_err;
2629 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2630 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2631 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2632 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2633 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2634 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2635 fa51e947 2020-03-27 stsp got_repo_close(repo);
2636 fa51e947 2020-03-27 stsp return err;
2639 fa51e947 2020-03-27 stsp static const struct got_error *
2640 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2642 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2643 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2644 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2645 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2646 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2647 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2648 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2649 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2650 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2651 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2652 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
2654 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2656 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2657 507dc3bb 2018-12-29 stsp switch (ch) {
2659 024e9686 2019-05-14 stsp branch_name = optarg;
2662 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2663 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2664 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2667 2deda0b9 2019-03-07 stsp usage_update();
2668 507dc3bb 2018-12-29 stsp /* NOTREACHED */
2672 507dc3bb 2018-12-29 stsp argc -= optind;
2673 507dc3bb 2018-12-29 stsp argv += optind;
2675 507dc3bb 2018-12-29 stsp #ifndef PROFILE
2676 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2677 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2678 507dc3bb 2018-12-29 stsp err(1, "pledge");
2680 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
2681 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
2682 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2683 c4cdcb68 2019-04-03 stsp goto done;
2685 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
2686 fa51e947 2020-03-27 stsp if (error) {
2687 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
2688 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
2689 fa51e947 2020-03-27 stsp worktree_path);
2690 7d5807f4 2019-07-11 stsp goto done;
2693 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
2694 f2ea84fa 2019-07-27 stsp if (error)
2695 f2ea84fa 2019-07-27 stsp goto done;
2697 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2699 507dc3bb 2018-12-29 stsp if (error != NULL)
2700 507dc3bb 2018-12-29 stsp goto done;
2702 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2703 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2704 087fb88c 2019-08-04 stsp if (error)
2705 087fb88c 2019-08-04 stsp goto done;
2707 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2708 0266afb7 2019-01-04 stsp if (error)
2709 0266afb7 2019-01-04 stsp goto done;
2711 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2712 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
2713 024e9686 2019-05-14 stsp if (error != NULL)
2714 024e9686 2019-05-14 stsp goto done;
2715 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
2716 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2717 9c4b8182 2019-01-02 stsp if (error != NULL)
2718 9c4b8182 2019-01-02 stsp goto done;
2719 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
2720 507dc3bb 2018-12-29 stsp if (error != NULL)
2721 507dc3bb 2018-12-29 stsp goto done;
2723 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2724 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2725 04f57cb3 2019-07-25 stsp free(commit_id_str);
2726 bb787f09 2019-07-25 stsp commit_id_str = NULL;
2727 30837e32 2019-07-25 stsp if (error)
2728 a297e751 2019-07-11 stsp goto done;
2729 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
2730 a297e751 2019-07-11 stsp if (error)
2731 507dc3bb 2018-12-29 stsp goto done;
2734 a1fb16d8 2019-05-24 stsp if (branch_name) {
2735 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
2736 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
2737 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
2739 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
2740 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
2741 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
2742 024e9686 2019-05-14 stsp goto done;
2744 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
2745 024e9686 2019-05-14 stsp if (error)
2746 024e9686 2019-05-14 stsp goto done;
2747 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
2749 a367ff0f 2019-05-14 stsp free(head_commit_id);
2750 024e9686 2019-05-14 stsp if (error != NULL)
2751 024e9686 2019-05-14 stsp goto done;
2752 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2753 a367ff0f 2019-05-14 stsp if (error)
2754 a367ff0f 2019-05-14 stsp goto done;
2755 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
2756 024e9686 2019-05-14 stsp if (error)
2757 024e9686 2019-05-14 stsp goto done;
2759 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2760 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2761 a367ff0f 2019-05-14 stsp if (error != NULL) {
2762 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
2763 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
2764 024e9686 2019-05-14 stsp goto done;
2766 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2767 a367ff0f 2019-05-14 stsp if (error)
2768 a367ff0f 2019-05-14 stsp goto done;
2771 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2772 507dc3bb 2018-12-29 stsp commit_id) != 0) {
2773 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2774 507dc3bb 2018-12-29 stsp commit_id);
2775 507dc3bb 2018-12-29 stsp if (error)
2776 507dc3bb 2018-12-29 stsp goto done;
2779 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2780 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
2781 507dc3bb 2018-12-29 stsp if (error != NULL)
2782 507dc3bb 2018-12-29 stsp goto done;
2784 784955db 2019-01-12 stsp if (did_something)
2785 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
2787 784955db 2019-01-12 stsp printf("Already up-to-date\n");
2789 c09a553d 2018-03-12 stsp free(worktree_path);
2790 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2791 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
2792 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2793 507dc3bb 2018-12-29 stsp free(commit_id);
2794 9c4b8182 2019-01-02 stsp free(commit_id_str);
2795 c09a553d 2018-03-12 stsp return error;
2798 f42b1b34 2018-03-12 stsp static const struct got_error *
2799 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2800 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2801 63035f9f 2019-10-06 stsp struct got_repository *repo)
2803 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
2804 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2806 44392932 2019-08-25 stsp if (blob_id1) {
2807 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2809 44392932 2019-08-25 stsp goto done;
2812 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2814 44392932 2019-08-25 stsp goto done;
2816 44392932 2019-08-25 stsp while (path[0] == '/')
2818 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
2819 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
2821 44392932 2019-08-25 stsp if (blob1)
2822 44392932 2019-08-25 stsp got_object_blob_close(blob1);
2823 44392932 2019-08-25 stsp got_object_blob_close(blob2);
2824 44392932 2019-08-25 stsp return err;
2827 44392932 2019-08-25 stsp static const struct got_error *
2828 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2829 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2830 63035f9f 2019-10-06 stsp struct got_repository *repo)
2832 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2833 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2834 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
2836 44392932 2019-08-25 stsp if (tree_id1) {
2837 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2839 44392932 2019-08-25 stsp goto done;
2842 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2844 0f2b3dca 2018-12-22 stsp goto done;
2846 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
2847 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2848 aaa13589 2019-06-01 stsp arg.outfile = stdout;
2849 44392932 2019-08-25 stsp while (path[0] == '/')
2851 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
2852 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
2854 79109fed 2018-03-27 stsp if (tree1)
2855 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
2856 366e0a5f 2019-10-10 stsp if (tree2)
2857 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
2858 44392932 2019-08-25 stsp return err;
2861 44392932 2019-08-25 stsp static const struct got_error *
2862 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
2863 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
2865 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2866 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
2867 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
2868 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2869 44392932 2019-08-25 stsp struct got_object_qid *qid;
2871 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2872 44392932 2019-08-25 stsp if (qid != NULL) {
2873 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
2876 44392932 2019-08-25 stsp return err;
2879 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
2880 44392932 2019-08-25 stsp int obj_type;
2881 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
2883 44392932 2019-08-25 stsp goto done;
2884 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2885 44392932 2019-08-25 stsp if (err) {
2886 44392932 2019-08-25 stsp free(obj_id2);
2887 44392932 2019-08-25 stsp goto done;
2889 44392932 2019-08-25 stsp if (pcommit) {
2890 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
2891 44392932 2019-08-25 stsp qid->id, path);
2892 44392932 2019-08-25 stsp if (err) {
2893 44392932 2019-08-25 stsp free(obj_id2);
2894 44392932 2019-08-25 stsp goto done;
2896 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2897 44392932 2019-08-25 stsp if (err) {
2898 44392932 2019-08-25 stsp free(obj_id2);
2899 44392932 2019-08-25 stsp goto done;
2902 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
2903 44392932 2019-08-25 stsp if (err) {
2904 44392932 2019-08-25 stsp free(obj_id2);
2905 44392932 2019-08-25 stsp goto done;
2907 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2908 44392932 2019-08-25 stsp switch (obj_type) {
2909 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
2910 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2913 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
2914 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
2918 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2921 44392932 2019-08-25 stsp free(obj_id1);
2922 44392932 2019-08-25 stsp free(obj_id2);
2924 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
2925 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2927 44392932 2019-08-25 stsp goto done;
2928 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
2929 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2931 44392932 2019-08-25 stsp goto done;
2932 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2933 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
2936 0f2b3dca 2018-12-22 stsp free(id_str1);
2937 0f2b3dca 2018-12-22 stsp free(id_str2);
2938 44392932 2019-08-25 stsp if (pcommit)
2939 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
2940 79109fed 2018-03-27 stsp return err;
2943 4bb494d5 2018-06-16 stsp static char *
2944 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
2946 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2947 09867e48 2019-08-13 stsp char *p, *s;
2949 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2950 09867e48 2019-08-13 stsp if (tm == NULL)
2951 09867e48 2019-08-13 stsp return NULL;
2952 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2953 09867e48 2019-08-13 stsp if (s == NULL)
2954 09867e48 2019-08-13 stsp return NULL;
2955 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
2957 6c281f94 2018-06-11 stsp *p = '\0';
2961 6841bf13 2019-11-29 kn static const struct got_error *
2962 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
2963 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
2965 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
2966 6841bf13 2019-11-29 kn regmatch_t regmatch;
2967 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
2969 6841bf13 2019-11-29 kn *have_match = 0;
2971 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
2975 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
2979 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
2980 6841bf13 2019-11-29 kn *have_match = 1;
2982 6841bf13 2019-11-29 kn free(id_str);
2983 6841bf13 2019-11-29 kn free(logmsg);
2987 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
2989 79109fed 2018-03-27 stsp static const struct got_error *
2990 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
2991 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
2992 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
2994 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
2995 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
2996 6c281f94 2018-06-11 stsp char datebuf[26];
2997 45d799e2 2018-12-23 stsp time_t committer_time;
2998 45d799e2 2018-12-23 stsp const char *author, *committer;
2999 199a4027 2019-02-02 stsp char *refs_str = NULL;
3000 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3002 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3004 199a4027 2019-02-02 stsp const char *name;
3005 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3008 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3009 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3011 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3012 199a4027 2019-02-02 stsp name += 5;
3013 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3015 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3016 e34f9ed6 2019-02-02 stsp name += 6;
3017 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
3018 141c2bff 2019-02-04 stsp name += 8;
3019 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3020 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
3021 5d844a1e 2019-08-13 stsp if (err) {
3022 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
3023 5d844a1e 2019-08-13 stsp return err;
3024 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3025 5d844a1e 2019-08-13 stsp err = NULL;
3026 5d844a1e 2019-08-13 stsp tag = NULL;
3029 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3030 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
3032 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3033 a436ad14 2019-08-13 stsp if (cmp != 0)
3035 199a4027 2019-02-02 stsp s = refs_str;
3036 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3037 199a4027 2019-02-02 stsp name) == -1) {
3038 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3040 34ca4898 2019-08-13 stsp return err;
3044 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3046 8bf5b3c9 2018-03-17 stsp return err;
3048 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3049 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3050 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3051 832c249c 2018-06-10 stsp free(id_str);
3052 d3d493d7 2019-02-21 stsp id_str = NULL;
3053 d3d493d7 2019-02-21 stsp free(refs_str);
3054 d3d493d7 2019-02-21 stsp refs_str = NULL;
3055 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3056 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3057 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3058 09867e48 2019-08-13 stsp if (datestr)
3059 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3060 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3061 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3062 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3063 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3064 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3065 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3066 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3067 3fe1abad 2018-06-10 stsp int n = 1;
3068 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3069 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3070 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3072 a0603db2 2018-06-10 stsp return err;
3073 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3074 a0603db2 2018-06-10 stsp free(id_str);
3078 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3080 5943eee2 2019-08-13 stsp return err;
3082 621015ac 2018-07-23 stsp logmsg = logmsg0;
3084 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3086 832c249c 2018-06-10 stsp printf(" %s\n", line);
3087 832c249c 2018-06-10 stsp } while (line);
3088 621015ac 2018-07-23 stsp free(logmsg0);
3090 971751ac 2018-03-27 stsp if (show_patch) {
3091 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3092 971751ac 2018-03-27 stsp if (err == 0)
3093 971751ac 2018-03-27 stsp printf("\n");
3096 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3097 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3098 07862c20 2018-09-15 stsp return err;
3101 f42b1b34 2018-03-12 stsp static const struct got_error *
3102 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
3103 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
3104 48c8c60d 2020-01-27 stsp int diff_context, int limit, int log_branches,
3105 463a997a 2019-12-08 kn struct got_reflist_head *refs)
3107 f42b1b34 2018-03-12 stsp const struct got_error *err;
3108 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3109 6841bf13 2019-11-29 kn regex_t regex;
3110 6841bf13 2019-11-29 kn int have_match;
3112 6841bf13 2019-11-29 kn if (search_pattern &&
3113 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3114 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3116 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3118 f42b1b34 2018-03-12 stsp return err;
3119 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3120 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3122 fcc85cad 2018-07-22 stsp goto done;
3124 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
3125 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3127 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3130 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3131 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3132 372ccdbb 2018-06-10 stsp if (err) {
3133 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3134 9ba79e04 2018-06-11 stsp err = NULL;
3137 b43fbaa0 2018-06-11 stsp if (id == NULL)
3140 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3144 6841bf13 2019-11-29 kn if (search_pattern) {
3145 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3147 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3150 6841bf13 2019-11-29 kn if (have_match == 0) {
3151 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3156 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
3157 44392932 2019-08-25 stsp diff_context, refs);
3158 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
3159 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
3163 6841bf13 2019-11-29 kn if (search_pattern)
3164 6841bf13 2019-11-29 kn regfree(®ex);
3165 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3166 f42b1b34 2018-03-12 stsp return err;
3169 4ed7e80c 2018-05-20 stsp __dead static void
3170 6f3d1eb0 2018-03-12 stsp usage_log(void)
3172 48c8c60d 2020-01-27 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
3173 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
3177 b1ebc001 2019-08-13 stsp static int
3178 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3180 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3181 b1ebc001 2019-08-13 stsp long long n;
3182 b1ebc001 2019-08-13 stsp const char *errstr;
3184 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3185 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3187 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3188 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3193 4ed7e80c 2018-05-20 stsp static const struct got_error *
3194 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3196 f42b1b34 2018-03-12 stsp const struct got_error *error;
3197 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3198 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3199 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
3200 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
3201 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3202 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
3203 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3204 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
3205 64a96a6d 2018-04-01 stsp const char *errstr;
3206 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3208 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3210 6715a751 2018-03-16 stsp #ifndef PROFILE
3211 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3214 f42b1b34 2018-03-12 stsp err(1, "pledge");
3217 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3219 48c8c60d 2020-01-27 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
3220 79109fed 2018-03-27 stsp switch (ch) {
3222 79109fed 2018-03-27 stsp show_patch = 1;
3225 d142fc45 2018-04-01 stsp start_commit = optarg;
3228 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3230 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3231 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3234 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3235 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3236 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3239 48c8c60d 2020-01-27 stsp log_branches = 1;
3242 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3243 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3244 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3246 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3249 6841bf13 2019-11-29 kn search_pattern = optarg;
3252 2deda0b9 2019-03-07 stsp usage_log();
3253 79109fed 2018-03-27 stsp /* NOTREACHED */
3257 79109fed 2018-03-27 stsp argc -= optind;
3258 79109fed 2018-03-27 stsp argv += optind;
3260 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3261 dc1edbfa 2019-11-29 kn diff_context = 3;
3262 dc1edbfa 2019-11-29 kn else if (!show_patch)
3263 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
3265 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3266 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3267 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3268 04ca23f4 2018-07-16 stsp goto done;
3271 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3272 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3273 cffc0aa4 2019-02-05 stsp goto done;
3274 cffc0aa4 2019-02-05 stsp error = NULL;
3276 e7301579 2019-03-18 stsp if (argc == 0) {
3277 cbd1af7a 2019-03-18 stsp path = strdup("");
3278 e7301579 2019-03-18 stsp if (path == NULL) {
3279 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3280 cbd1af7a 2019-03-18 stsp goto done;
3282 e7301579 2019-03-18 stsp } else if (argc == 1) {
3283 e7301579 2019-03-18 stsp if (worktree) {
3284 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3286 e7301579 2019-03-18 stsp if (error)
3287 e7301579 2019-03-18 stsp goto done;
3289 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3290 e7301579 2019-03-18 stsp if (path == NULL) {
3291 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3292 e7301579 2019-03-18 stsp goto done;
3296 cbd1af7a 2019-03-18 stsp usage_log();
3298 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3299 5486daa2 2019-05-11 stsp repo_path = worktree ?
3300 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3302 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3303 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3304 cffc0aa4 2019-02-05 stsp goto done;
3307 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3308 d7d4f210 2018-03-12 stsp if (error != NULL)
3309 04ca23f4 2018-07-16 stsp goto done;
3311 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3312 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3313 c02c541e 2019-03-29 stsp if (error)
3314 c02c541e 2019-03-29 stsp goto done;
3316 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3317 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3318 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3319 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3320 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3321 3235492e 2018-04-01 stsp if (error != NULL)
3322 3235492e 2018-04-01 stsp return error;
3323 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
3324 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3325 3235492e 2018-04-01 stsp if (error != NULL)
3326 3235492e 2018-04-01 stsp return error;
3327 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
3329 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
3330 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
3331 3235492e 2018-04-01 stsp if (error == NULL) {
3332 1caad61b 2019-02-01 stsp int obj_type;
3333 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
3334 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
3335 d1f2edc9 2018-06-13 stsp if (error != NULL)
3336 1caad61b 2019-02-01 stsp goto done;
3337 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
3338 1caad61b 2019-02-01 stsp if (error != NULL)
3339 1caad61b 2019-02-01 stsp goto done;
3340 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
3341 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
3342 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
3343 1caad61b 2019-02-01 stsp if (error != NULL)
3344 1caad61b 2019-02-01 stsp goto done;
3345 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
3346 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
3347 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
3348 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3349 1caad61b 2019-02-01 stsp goto done;
3352 1caad61b 2019-02-01 stsp id = got_object_id_dup(
3353 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
3354 1caad61b 2019-02-01 stsp if (id == NULL)
3355 638f9024 2019-05-13 stsp error = got_error_from_errno(
3356 230a42bd 2019-05-11 jcs "got_object_id_dup");
3357 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
3358 1caad61b 2019-02-01 stsp if (error)
3359 1caad61b 2019-02-01 stsp goto done;
3360 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
3361 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3362 1caad61b 2019-02-01 stsp goto done;
3364 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
3365 d1f2edc9 2018-06-13 stsp if (error != NULL)
3366 1caad61b 2019-02-01 stsp goto done;
3368 15a94983 2018-12-23 stsp if (commit == NULL) {
3369 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
3370 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
3371 d1f2edc9 2018-06-13 stsp if (error != NULL)
3372 d1f2edc9 2018-06-13 stsp return error;
3375 d7d4f210 2018-03-12 stsp if (error != NULL)
3376 04ca23f4 2018-07-16 stsp goto done;
3378 deeabeae 2019-08-27 stsp if (worktree) {
3379 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3381 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
3382 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3383 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
3384 deeabeae 2019-08-27 stsp goto done;
3386 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3389 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3390 04ca23f4 2018-07-16 stsp if (error != NULL)
3391 04ca23f4 2018-07-16 stsp goto done;
3392 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3393 04ca23f4 2018-07-16 stsp free(path);
3394 04ca23f4 2018-07-16 stsp path = in_repo_path;
3397 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3398 199a4027 2019-02-02 stsp if (error)
3399 199a4027 2019-02-02 stsp goto done;
3401 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
3402 48c8c60d 2020-01-27 stsp diff_context, limit, log_branches, &refs);
3404 04ca23f4 2018-07-16 stsp free(path);
3405 04ca23f4 2018-07-16 stsp free(repo_path);
3406 04ca23f4 2018-07-16 stsp free(cwd);
3408 cffc0aa4 2019-02-05 stsp if (worktree)
3409 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3410 ad242220 2018-09-08 stsp if (repo) {
3411 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3412 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3413 ad242220 2018-09-08 stsp if (error == NULL)
3414 ad242220 2018-09-08 stsp error = repo_error;
3416 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3417 8bf5b3c9 2018-03-17 stsp return error;
3420 4ed7e80c 2018-05-20 stsp __dead static void
3421 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3423 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3424 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
3428 b72f483a 2019-02-05 stsp struct print_diff_arg {
3429 b72f483a 2019-02-05 stsp struct got_repository *repo;
3430 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3431 b72f483a 2019-02-05 stsp int diff_context;
3432 3fc0c068 2019-02-10 stsp const char *id_str;
3433 3fc0c068 2019-02-10 stsp int header_shown;
3434 98eaaa12 2019-08-03 stsp int diff_staged;
3435 63035f9f 2019-10-06 stsp int ignore_whitespace;
3438 4ed7e80c 2018-05-20 stsp static const struct got_error *
3439 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3440 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3441 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3442 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3444 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3445 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3446 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3447 12463d8b 2019-12-13 stsp int fd = -1;
3448 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3449 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3450 b72f483a 2019-02-05 stsp struct stat sb;
3452 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3453 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3454 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3455 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3456 98eaaa12 2019-08-03 stsp return NULL;
3458 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3459 98eaaa12 2019-08-03 stsp return NULL;
3460 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3461 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3462 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3463 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3464 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3465 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3466 98eaaa12 2019-08-03 stsp return NULL;
3469 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3470 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3471 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3472 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3473 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3476 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3477 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
3478 98eaaa12 2019-08-03 stsp switch (staged_status) {
3479 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
3480 98eaaa12 2019-08-03 stsp label1 = path;
3481 98eaaa12 2019-08-03 stsp label2 = path;
3483 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
3484 98eaaa12 2019-08-03 stsp label2 = path;
3486 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
3487 98eaaa12 2019-08-03 stsp label1 = path;
3490 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
3492 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3493 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
3494 63035f9f 2019-10-06 stsp a->repo, stdout);
3497 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3498 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
3499 4ce46740 2019-08-08 stsp char *id_str;
3500 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3503 4ce46740 2019-08-08 stsp goto done;
3504 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
3506 4ce46740 2019-08-08 stsp goto done;
3507 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3508 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
3509 4ce46740 2019-08-08 stsp free(id_str);
3510 4ce46740 2019-08-08 stsp goto done;
3512 4ce46740 2019-08-08 stsp free(id_str);
3513 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
3514 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3516 4ce46740 2019-08-08 stsp goto done;
3519 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
3520 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
3521 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
3522 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3523 2ec1f75b 2019-03-26 stsp goto done;
3526 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3527 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3528 12463d8b 2019-12-13 stsp if (fd == -1) {
3529 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
3530 12463d8b 2019-12-13 stsp goto done;
3533 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3534 12463d8b 2019-12-13 stsp if (fd == -1) {
3535 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
3536 12463d8b 2019-12-13 stsp goto done;
3539 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
3540 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
3541 2ec1f75b 2019-03-26 stsp goto done;
3543 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
3544 12463d8b 2019-12-13 stsp if (f2 == NULL) {
3545 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
3546 2ec1f75b 2019-03-26 stsp goto done;
3550 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
3552 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3553 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
3555 b72f483a 2019-02-05 stsp if (blob1)
3556 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
3557 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3558 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3559 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3560 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
3561 b72f483a 2019-02-05 stsp free(abspath);
3562 927df6b7 2019-02-10 stsp return err;
3565 927df6b7 2019-02-10 stsp static const struct got_error *
3566 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
3568 b00d56cd 2018-04-01 stsp const struct got_error *error;
3569 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
3570 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
3571 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
3572 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3573 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
3574 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
3575 15a94983 2018-12-23 stsp int type1, type2;
3576 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3577 c0cc5c62 2018-10-18 stsp const char *errstr;
3578 927df6b7 2019-02-10 stsp char *path = NULL;
3580 b00d56cd 2018-04-01 stsp #ifndef PROFILE
3581 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3582 25eccc22 2019-01-04 stsp NULL) == -1)
3583 b00d56cd 2018-04-01 stsp err(1, "pledge");
3586 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3587 b00d56cd 2018-04-01 stsp switch (ch) {
3589 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3591 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3592 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3595 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
3596 b72f483a 2019-02-05 stsp if (repo_path == NULL)
3597 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3599 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3602 98eaaa12 2019-08-03 stsp diff_staged = 1;
3605 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
3608 2deda0b9 2019-03-07 stsp usage_diff();
3609 b00d56cd 2018-04-01 stsp /* NOTREACHED */
3613 b00d56cd 2018-04-01 stsp argc -= optind;
3614 b00d56cd 2018-04-01 stsp argv += optind;
3616 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
3617 b72f483a 2019-02-05 stsp if (cwd == NULL) {
3618 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3619 b72f483a 2019-02-05 stsp goto done;
3621 927df6b7 2019-02-10 stsp if (argc <= 1) {
3622 b72f483a 2019-02-05 stsp if (repo_path)
3624 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
3625 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3626 fa51e947 2020-03-27 stsp if (error) {
3627 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3628 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
3630 1f03b8da 2020-03-20 stsp goto done;
3632 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
3633 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
3634 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3635 927df6b7 2019-02-10 stsp goto done;
3637 927df6b7 2019-02-10 stsp if (argc == 1) {
3638 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3640 927df6b7 2019-02-10 stsp if (error)
3641 927df6b7 2019-02-10 stsp goto done;
3643 927df6b7 2019-02-10 stsp path = strdup("");
3644 927df6b7 2019-02-10 stsp if (path == NULL) {
3645 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3646 927df6b7 2019-02-10 stsp goto done;
3649 b72f483a 2019-02-05 stsp } else if (argc == 2) {
3650 98eaaa12 2019-08-03 stsp if (diff_staged)
3651 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
3652 98eaaa12 2019-08-03 stsp "objects in repository");
3653 15a94983 2018-12-23 stsp id_str1 = argv[0];
3654 15a94983 2018-12-23 stsp id_str2 = argv[1];
3655 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3656 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3657 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3658 30db809c 2019-06-05 stsp goto done;
3659 1f03b8da 2020-03-20 stsp if (worktree) {
3660 1f03b8da 2020-03-20 stsp repo_path = strdup(
3661 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
3662 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3663 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3664 1f03b8da 2020-03-20 stsp goto done;
3667 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
3668 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3669 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3670 1f03b8da 2020-03-20 stsp goto done;
3675 b00d56cd 2018-04-01 stsp usage_diff();
3677 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3678 76089277 2018-04-01 stsp free(repo_path);
3679 b00d56cd 2018-04-01 stsp if (error != NULL)
3680 b00d56cd 2018-04-01 stsp goto done;
3682 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3683 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3684 c02c541e 2019-03-29 stsp if (error)
3685 c02c541e 2019-03-29 stsp goto done;
3687 30db809c 2019-06-05 stsp if (argc <= 1) {
3688 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
3689 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3690 b72f483a 2019-02-05 stsp char *id_str;
3692 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3694 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
3695 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
3696 b72f483a 2019-02-05 stsp if (error)
3697 b72f483a 2019-02-05 stsp goto done;
3698 b72f483a 2019-02-05 stsp arg.repo = repo;
3699 b72f483a 2019-02-05 stsp arg.worktree = worktree;
3700 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
3701 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
3702 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
3703 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
3704 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3706 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
3707 72ea6654 2019-07-27 stsp if (error)
3708 72ea6654 2019-07-27 stsp goto done;
3710 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
3711 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
3712 b72f483a 2019-02-05 stsp free(id_str);
3713 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3714 b72f483a 2019-02-05 stsp goto done;
3717 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3718 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3719 0adb7196 2019-08-11 stsp if (error)
3720 0adb7196 2019-08-11 stsp goto done;
3722 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3723 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3724 0adb7196 2019-08-11 stsp if (error)
3725 0adb7196 2019-08-11 stsp goto done;
3727 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
3728 15a94983 2018-12-23 stsp if (error)
3729 15a94983 2018-12-23 stsp goto done;
3731 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
3732 15a94983 2018-12-23 stsp if (error)
3733 15a94983 2018-12-23 stsp goto done;
3735 15a94983 2018-12-23 stsp if (type1 != type2) {
3736 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3737 b00d56cd 2018-04-01 stsp goto done;
3740 15a94983 2018-12-23 stsp switch (type1) {
3741 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
3742 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3743 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3745 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
3746 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
3747 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3749 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
3750 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
3751 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
3752 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
3755 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3758 5e70831e 2019-05-28 stsp free(label1);
3759 5e70831e 2019-05-28 stsp free(label2);
3760 15a94983 2018-12-23 stsp free(id1);
3761 15a94983 2018-12-23 stsp free(id2);
3762 927df6b7 2019-02-10 stsp free(path);
3763 b72f483a 2019-02-05 stsp if (worktree)
3764 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
3765 ad242220 2018-09-08 stsp if (repo) {
3766 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3767 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3768 ad242220 2018-09-08 stsp if (error == NULL)
3769 ad242220 2018-09-08 stsp error = repo_error;
3771 b00d56cd 2018-04-01 stsp return error;
3774 404c43c4 2018-06-21 stsp __dead static void
3775 404c43c4 2018-06-21 stsp usage_blame(void)
3777 9270e621 2019-02-05 stsp fprintf(stderr,
3778 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
3779 404c43c4 2018-06-21 stsp getprogname());
3783 28315671 2019-08-14 stsp struct blame_line {
3784 28315671 2019-08-14 stsp int annotated;
3785 28315671 2019-08-14 stsp char *id_str;
3786 82f6abb8 2019-08-14 stsp char *committer;
3787 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
3790 28315671 2019-08-14 stsp struct blame_cb_args {
3791 28315671 2019-08-14 stsp struct blame_line *lines;
3792 28315671 2019-08-14 stsp int nlines;
3793 7ef28ff8 2019-08-14 stsp int nlines_prec;
3794 28315671 2019-08-14 stsp int lineno_cur;
3795 28315671 2019-08-14 stsp off_t *line_offsets;
3797 82f6abb8 2019-08-14 stsp struct got_repository *repo;
3800 404c43c4 2018-06-21 stsp static const struct got_error *
3801 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3803 28315671 2019-08-14 stsp const struct got_error *err = NULL;
3804 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
3805 28315671 2019-08-14 stsp struct blame_line *bline;
3806 82f6abb8 2019-08-14 stsp char *line = NULL;
3807 28315671 2019-08-14 stsp size_t linesize = 0;
3808 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
3809 28315671 2019-08-14 stsp off_t offset;
3810 bcb49d15 2019-08-14 stsp struct tm tm;
3811 bcb49d15 2019-08-14 stsp time_t committer_time;
3813 28315671 2019-08-14 stsp if (nlines != a->nlines ||
3814 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3815 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
3817 28315671 2019-08-14 stsp if (sigint_received)
3818 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
3820 2839f8b9 2019-08-18 stsp if (lineno == -1)
3821 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
3823 28315671 2019-08-14 stsp /* Annotate this line. */
3824 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
3825 28315671 2019-08-14 stsp if (bline->annotated)
3826 28315671 2019-08-14 stsp return NULL;
3827 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
3829 28315671 2019-08-14 stsp return err;
3831 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
3833 82f6abb8 2019-08-14 stsp goto done;
3835 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
3836 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
3837 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
3838 bcb49d15 2019-08-14 stsp goto done;
3841 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
3842 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
3843 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
3844 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
3845 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
3846 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
3847 82f6abb8 2019-08-14 stsp goto done;
3849 28315671 2019-08-14 stsp bline->annotated = 1;
3851 28315671 2019-08-14 stsp /* Print lines annotated so far. */
3852 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3853 28315671 2019-08-14 stsp if (!bline->annotated)
3854 82f6abb8 2019-08-14 stsp goto done;
3856 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
3857 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
3858 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
3859 82f6abb8 2019-08-14 stsp goto done;
3862 28315671 2019-08-14 stsp while (bline->annotated) {
3863 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
3864 82f6abb8 2019-08-14 stsp size_t len;
3866 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
3867 28315671 2019-08-14 stsp if (ferror(a->f))
3868 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
3872 82f6abb8 2019-08-14 stsp committer = bline->committer;
3873 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
3874 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
3875 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
3876 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
3878 82f6abb8 2019-08-14 stsp *at = '\0';
3879 82f6abb8 2019-08-14 stsp len = strlen(committer);
3880 82f6abb8 2019-08-14 stsp if (len >= 9)
3881 82f6abb8 2019-08-14 stsp committer[8] = '\0';
3883 28315671 2019-08-14 stsp nl = strchr(line, '\n');
3885 28315671 2019-08-14 stsp *nl = '\0';
3886 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
3887 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
3889 28315671 2019-08-14 stsp a->lineno_cur++;
3890 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3893 82f6abb8 2019-08-14 stsp if (commit)
3894 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
3895 28315671 2019-08-14 stsp free(line);
3896 28315671 2019-08-14 stsp return err;
3899 28315671 2019-08-14 stsp static const struct got_error *
3900 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
3902 404c43c4 2018-06-21 stsp const struct got_error *error;
3903 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
3904 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
3905 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3906 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
3907 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
3908 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
3909 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
3910 28315671 2019-08-14 stsp struct blame_cb_args bca;
3911 28315671 2019-08-14 stsp int ch, obj_type, i;
3912 b02560ec 2019-08-19 stsp size_t filesize;
3914 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
3916 404c43c4 2018-06-21 stsp #ifndef PROFILE
3917 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3918 36e2fb66 2019-01-04 stsp NULL) == -1)
3919 404c43c4 2018-06-21 stsp err(1, "pledge");
3922 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3923 404c43c4 2018-06-21 stsp switch (ch) {
3925 404c43c4 2018-06-21 stsp commit_id_str = optarg;
3928 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3929 66bea077 2018-08-02 stsp if (repo_path == NULL)
3930 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3932 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3935 2deda0b9 2019-03-07 stsp usage_blame();
3936 404c43c4 2018-06-21 stsp /* NOTREACHED */
3940 404c43c4 2018-06-21 stsp argc -= optind;
3941 404c43c4 2018-06-21 stsp argv += optind;
3943 a39318fd 2018-08-02 stsp if (argc == 1)
3944 404c43c4 2018-06-21 stsp path = argv[0];
3946 404c43c4 2018-06-21 stsp usage_blame();
3948 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
3949 66bea077 2018-08-02 stsp if (cwd == NULL) {
3950 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3951 66bea077 2018-08-02 stsp goto done;
3953 66bea077 2018-08-02 stsp if (repo_path == NULL) {
3954 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3955 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3956 66bea077 2018-08-02 stsp goto done;
3958 0c06baac 2019-02-05 stsp error = NULL;
3959 0c06baac 2019-02-05 stsp if (worktree) {
3960 0c06baac 2019-02-05 stsp repo_path =
3961 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3962 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3963 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3964 1f03b8da 2020-03-20 stsp if (error)
3965 1f03b8da 2020-03-20 stsp goto done;
3968 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
3969 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
3970 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3971 0c06baac 2019-02-05 stsp goto done;
3976 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3977 c02c541e 2019-03-29 stsp if (error != NULL)
3978 36e2fb66 2019-01-04 stsp goto done;
3980 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3981 c02c541e 2019-03-29 stsp if (error)
3982 404c43c4 2018-06-21 stsp goto done;
3984 0c06baac 2019-02-05 stsp if (worktree) {
3985 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3986 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3987 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3988 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3989 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3990 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3991 6efaaa2d 2019-02-05 stsp path) == -1) {
3992 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3993 0c06baac 2019-02-05 stsp goto done;
3995 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3998 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4000 0c06baac 2019-02-05 stsp if (error)
4001 66bea077 2018-08-02 stsp goto done;
4003 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4004 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4005 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4006 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4007 404c43c4 2018-06-21 stsp if (error != NULL)
4008 66bea077 2018-08-02 stsp goto done;
4009 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4010 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4011 404c43c4 2018-06-21 stsp if (error != NULL)
4012 66bea077 2018-08-02 stsp goto done;
4014 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4015 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4016 30837e32 2019-07-25 stsp if (error)
4017 66bea077 2018-08-02 stsp goto done;
4020 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4021 28315671 2019-08-14 stsp if (error)
4022 28315671 2019-08-14 stsp goto done;
4024 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4025 28315671 2019-08-14 stsp if (error)
4026 28315671 2019-08-14 stsp goto done;
4028 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4029 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4030 28315671 2019-08-14 stsp goto done;
4033 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4034 28315671 2019-08-14 stsp if (error)
4035 28315671 2019-08-14 stsp goto done;
4036 28315671 2019-08-14 stsp bca.f = got_opentemp();
4037 28315671 2019-08-14 stsp if (bca.f == NULL) {
4038 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4039 28315671 2019-08-14 stsp goto done;
4041 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4042 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4043 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4044 28315671 2019-08-14 stsp goto done;
4046 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4047 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4048 b02560ec 2019-08-19 stsp bca.nlines--;
4050 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4051 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4052 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4053 28315671 2019-08-14 stsp goto done;
4055 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4056 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4057 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4058 7ef28ff8 2019-08-14 stsp while (i > 0) {
4060 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4062 82f6abb8 2019-08-14 stsp bca.repo = repo;
4064 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4065 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
4067 66bea077 2018-08-02 stsp free(in_repo_path);
4068 66bea077 2018-08-02 stsp free(repo_path);
4069 66bea077 2018-08-02 stsp free(cwd);
4070 404c43c4 2018-06-21 stsp free(commit_id);
4071 28315671 2019-08-14 stsp free(obj_id);
4073 28315671 2019-08-14 stsp got_object_blob_close(blob);
4074 0c06baac 2019-02-05 stsp if (worktree)
4075 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4076 ad242220 2018-09-08 stsp if (repo) {
4077 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4078 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4079 ad242220 2018-09-08 stsp if (error == NULL)
4080 ad242220 2018-09-08 stsp error = repo_error;
4082 3affba96 2019-09-22 stsp if (bca.lines) {
4083 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4084 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4085 3affba96 2019-09-22 stsp free(bline->id_str);
4086 3affba96 2019-09-22 stsp free(bline->committer);
4088 3affba96 2019-09-22 stsp free(bca.lines);
4090 28315671 2019-08-14 stsp free(bca.line_offsets);
4091 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4092 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4093 404c43c4 2018-06-21 stsp return error;
4096 5de5890b 2018-10-18 stsp __dead static void
4097 5de5890b 2018-10-18 stsp usage_tree(void)
4099 c1669e2e 2019-01-09 stsp fprintf(stderr,
4100 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
4101 5de5890b 2018-10-18 stsp getprogname());
4105 c1669e2e 2019-01-09 stsp static void
4106 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4107 c1669e2e 2019-01-09 stsp const char *root_path)
4109 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4110 848d6979 2019-08-12 stsp const char *modestr = "";
4111 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4113 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4114 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4117 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4118 63c5ca5d 2019-08-24 stsp modestr = "$";
4119 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
4120 848d6979 2019-08-12 stsp modestr = "@";
4121 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4122 848d6979 2019-08-12 stsp modestr = "/";
4123 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4124 848d6979 2019-08-12 stsp modestr = "*";
4126 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
4127 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
4130 5de5890b 2018-10-18 stsp static const struct got_error *
4131 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4132 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4133 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4135 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4136 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4137 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4138 56e0773d 2019-11-28 stsp int nentries, i;
4140 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4142 5de5890b 2018-10-18 stsp goto done;
4144 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4146 5de5890b 2018-10-18 stsp goto done;
4147 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4148 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4149 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4150 5de5890b 2018-10-18 stsp char *id = NULL;
4152 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4155 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4156 5de5890b 2018-10-18 stsp if (show_ids) {
4157 5de5890b 2018-10-18 stsp char *id_str;
4158 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4159 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4161 5de5890b 2018-10-18 stsp goto done;
4162 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4163 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4164 5de5890b 2018-10-18 stsp free(id_str);
4165 5de5890b 2018-10-18 stsp goto done;
4167 5de5890b 2018-10-18 stsp free(id_str);
4169 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
4172 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4173 c1669e2e 2019-01-09 stsp char *child_path;
4174 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4175 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4176 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4177 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4178 c1669e2e 2019-01-09 stsp goto done;
4180 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4181 c1669e2e 2019-01-09 stsp root_path, repo);
4182 c1669e2e 2019-01-09 stsp free(child_path);
4184 c1669e2e 2019-01-09 stsp goto done;
4189 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4190 5de5890b 2018-10-18 stsp free(tree_id);
4191 5de5890b 2018-10-18 stsp return err;
4194 5de5890b 2018-10-18 stsp static const struct got_error *
4195 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4197 5de5890b 2018-10-18 stsp const struct got_error *error;
4198 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4199 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4200 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4201 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4202 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4203 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4204 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4207 5de5890b 2018-10-18 stsp #ifndef PROFILE
4208 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4209 0f8d269b 2019-01-04 stsp NULL) == -1)
4210 5de5890b 2018-10-18 stsp err(1, "pledge");
4213 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4214 5de5890b 2018-10-18 stsp switch (ch) {
4216 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4219 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4220 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4221 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4223 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4226 5de5890b 2018-10-18 stsp show_ids = 1;
4229 c1669e2e 2019-01-09 stsp recurse = 1;
4232 2deda0b9 2019-03-07 stsp usage_tree();
4233 5de5890b 2018-10-18 stsp /* NOTREACHED */
4237 5de5890b 2018-10-18 stsp argc -= optind;
4238 5de5890b 2018-10-18 stsp argv += optind;
4240 5de5890b 2018-10-18 stsp if (argc == 1)
4241 5de5890b 2018-10-18 stsp path = argv[0];
4242 5de5890b 2018-10-18 stsp else if (argc > 1)
4243 5de5890b 2018-10-18 stsp usage_tree();
4245 7a2c19d6 2019-02-05 stsp path = NULL;
4247 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4248 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4249 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4250 9bf7a39b 2019-02-05 stsp goto done;
4252 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4253 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4254 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4255 7a2c19d6 2019-02-05 stsp goto done;
4257 7a2c19d6 2019-02-05 stsp error = NULL;
4258 7a2c19d6 2019-02-05 stsp if (worktree) {
4259 7a2c19d6 2019-02-05 stsp repo_path =
4260 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4261 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4262 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4263 7a2c19d6 2019-02-05 stsp if (error)
4264 7a2c19d6 2019-02-05 stsp goto done;
4266 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4267 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4268 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4269 7a2c19d6 2019-02-05 stsp goto done;
4274 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4275 5de5890b 2018-10-18 stsp if (error != NULL)
4276 c02c541e 2019-03-29 stsp goto done;
4278 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4279 c02c541e 2019-03-29 stsp if (error)
4280 5de5890b 2018-10-18 stsp goto done;
4282 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4283 9bf7a39b 2019-02-05 stsp if (worktree) {
4284 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4285 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4286 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4287 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4288 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4289 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4290 9bf7a39b 2019-02-05 stsp goto done;
4292 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4294 9bf7a39b 2019-02-05 stsp if (error)
4295 9bf7a39b 2019-02-05 stsp goto done;
4297 9bf7a39b 2019-02-05 stsp path = "/";
4299 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4300 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4301 9bf7a39b 2019-02-05 stsp if (error != NULL)
4302 9bf7a39b 2019-02-05 stsp goto done;
4305 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4306 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4307 4e0a20a4 2020-03-23 tracey if (worktree)
4308 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4310 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4311 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4312 5de5890b 2018-10-18 stsp if (error != NULL)
4313 5de5890b 2018-10-18 stsp goto done;
4314 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4315 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4316 5de5890b 2018-10-18 stsp if (error != NULL)
4317 5de5890b 2018-10-18 stsp goto done;
4319 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4320 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4321 30837e32 2019-07-25 stsp if (error)
4322 5de5890b 2018-10-18 stsp goto done;
4325 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4326 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4328 5de5890b 2018-10-18 stsp free(in_repo_path);
4329 5de5890b 2018-10-18 stsp free(repo_path);
4330 5de5890b 2018-10-18 stsp free(cwd);
4331 5de5890b 2018-10-18 stsp free(commit_id);
4332 7a2c19d6 2019-02-05 stsp if (worktree)
4333 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4334 5de5890b 2018-10-18 stsp if (repo) {
4335 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4336 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4337 5de5890b 2018-10-18 stsp if (error == NULL)
4338 5de5890b 2018-10-18 stsp error = repo_error;
4340 5de5890b 2018-10-18 stsp return error;
4343 6bad629b 2019-02-04 stsp __dead static void
4344 6bad629b 2019-02-04 stsp usage_status(void)
4346 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4350 b72f483a 2019-02-05 stsp static const struct got_error *
4351 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4352 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4353 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4354 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4356 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4357 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4358 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4359 b72f483a 2019-02-05 stsp return NULL;
4362 6bad629b 2019-02-04 stsp static const struct got_error *
4363 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4365 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4366 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4367 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4368 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
4369 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4370 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4373 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4375 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4376 6bad629b 2019-02-04 stsp switch (ch) {
4378 2deda0b9 2019-03-07 stsp usage_status();
4379 6bad629b 2019-02-04 stsp /* NOTREACHED */
4383 6bad629b 2019-02-04 stsp argc -= optind;
4384 6bad629b 2019-02-04 stsp argv += optind;
4386 6bad629b 2019-02-04 stsp #ifndef PROFILE
4387 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4388 6bad629b 2019-02-04 stsp NULL) == -1)
4389 6bad629b 2019-02-04 stsp err(1, "pledge");
4391 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4392 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4393 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4394 927df6b7 2019-02-10 stsp goto done;
4397 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
4398 fa51e947 2020-03-27 stsp if (error) {
4399 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4400 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
4401 a5edda0a 2019-07-27 stsp goto done;
4404 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4406 6bad629b 2019-02-04 stsp if (error != NULL)
4407 6bad629b 2019-02-04 stsp goto done;
4409 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4410 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4411 087fb88c 2019-08-04 stsp if (error)
4412 087fb88c 2019-08-04 stsp goto done;
4414 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4415 6bad629b 2019-02-04 stsp if (error)
4416 6bad629b 2019-02-04 stsp goto done;
4418 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4419 6bad629b 2019-02-04 stsp check_cancelled, NULL);
4421 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
4422 a5edda0a 2019-07-27 stsp free((char *)pe->path);
4423 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4424 927df6b7 2019-02-10 stsp free(cwd);
4425 d0eebce4 2019-03-11 stsp return error;
4428 d0eebce4 2019-03-11 stsp __dead static void
4429 d0eebce4 2019-03-11 stsp usage_ref(void)
4431 d0eebce4 2019-03-11 stsp fprintf(stderr,
4432 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4433 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
4434 d0eebce4 2019-03-11 stsp getprogname());
4438 d0eebce4 2019-03-11 stsp static const struct got_error *
4439 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
4441 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
4442 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
4443 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
4445 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
4446 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4448 d0eebce4 2019-03-11 stsp return err;
4450 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4451 d0eebce4 2019-03-11 stsp char *refstr;
4452 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
4453 d0eebce4 2019-03-11 stsp if (refstr == NULL)
4454 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
4455 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4456 d0eebce4 2019-03-11 stsp free(refstr);
4459 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4460 d0eebce4 2019-03-11 stsp return NULL;
4463 d0eebce4 2019-03-11 stsp static const struct got_error *
4464 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
4466 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4467 d0eebce4 2019-03-11 stsp struct got_reference *ref;
4469 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
4471 d0eebce4 2019-03-11 stsp return err;
4473 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
4474 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4475 d0eebce4 2019-03-11 stsp return err;
4478 d0eebce4 2019-03-11 stsp static const struct got_error *
4479 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
4481 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4482 d0eebce4 2019-03-11 stsp struct got_object_id *id;
4483 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
4486 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4487 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
4488 d1644381 2019-07-14 stsp * an unintended typo.
4490 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4491 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4493 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4495 d83d9d5c 2019-05-13 stsp if (err) {
4496 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
4498 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4499 d83d9d5c 2019-05-13 stsp return err;
4500 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
4502 d83d9d5c 2019-05-13 stsp return err;
4503 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
4504 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
4506 d83d9d5c 2019-05-13 stsp return err;
4509 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
4511 d0eebce4 2019-03-11 stsp goto done;
4513 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
4516 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4518 d1c1ae5f 2019-08-12 stsp return err;
4521 d1c1ae5f 2019-08-12 stsp static const struct got_error *
4522 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
4524 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
4525 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
4526 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
4529 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4530 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
4531 d1c1ae5f 2019-08-12 stsp * an unintended typo.
4533 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4534 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4536 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
4538 d1c1ae5f 2019-08-12 stsp return err;
4540 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
4542 d1c1ae5f 2019-08-12 stsp goto done;
4544 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
4546 d1c1ae5f 2019-08-12 stsp if (target_ref)
4547 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
4549 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
4550 d0eebce4 2019-03-11 stsp return err;
4553 d0eebce4 2019-03-11 stsp static const struct got_error *
4554 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
4556 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
4557 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
4558 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
4559 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
4560 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
4561 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
4562 b2070a3f 2020-03-22 stsp char *refname = NULL;
4564 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4565 d0eebce4 2019-03-11 stsp switch (ch) {
4567 e31abbf2 2020-03-22 stsp obj_arg = optarg;
4570 e31abbf2 2020-03-22 stsp do_delete = 1;
4573 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
4574 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4575 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4577 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4580 d0eebce4 2019-03-11 stsp do_list = 1;
4583 e31abbf2 2020-03-22 stsp symref_target = optarg;
4586 d0eebce4 2019-03-11 stsp usage_ref();
4587 d0eebce4 2019-03-11 stsp /* NOTREACHED */
4591 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
4592 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
4593 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
4594 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
4595 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
4596 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
4597 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
4598 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
4599 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
4600 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
4601 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
4602 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
4604 d0eebce4 2019-03-11 stsp argc -= optind;
4605 d0eebce4 2019-03-11 stsp argv += optind;
4607 e31abbf2 2020-03-22 stsp if (do_list) {
4608 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
4609 d0eebce4 2019-03-11 stsp usage_ref();
4610 b2070a3f 2020-03-22 stsp if (argc == 1) {
4611 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4612 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4613 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4614 b2070a3f 2020-03-22 stsp goto done;
4618 e31abbf2 2020-03-22 stsp if (argc != 1)
4619 e31abbf2 2020-03-22 stsp usage_ref();
4620 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4621 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4622 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4623 b2070a3f 2020-03-22 stsp goto done;
4627 b2070a3f 2020-03-22 stsp if (refname)
4628 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
4630 d0eebce4 2019-03-11 stsp #ifndef PROFILE
4631 e0b57350 2019-03-12 stsp if (do_list) {
4632 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4633 e0b57350 2019-03-12 stsp NULL) == -1)
4634 e0b57350 2019-03-12 stsp err(1, "pledge");
4636 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4637 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
4638 e0b57350 2019-03-12 stsp err(1, "pledge");
4641 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
4642 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
4643 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4644 d0eebce4 2019-03-11 stsp goto done;
4647 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4648 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
4649 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4650 d0eebce4 2019-03-11 stsp goto done;
4652 d0eebce4 2019-03-11 stsp error = NULL;
4653 d0eebce4 2019-03-11 stsp if (worktree) {
4654 d0eebce4 2019-03-11 stsp repo_path =
4655 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
4656 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4657 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4658 d0eebce4 2019-03-11 stsp if (error)
4659 d0eebce4 2019-03-11 stsp goto done;
4661 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
4662 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4663 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4664 d0eebce4 2019-03-11 stsp goto done;
4669 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4670 d0eebce4 2019-03-11 stsp if (error != NULL)
4671 d0eebce4 2019-03-11 stsp goto done;
4673 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4674 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4675 c02c541e 2019-03-29 stsp if (error)
4676 c02c541e 2019-03-29 stsp goto done;
4678 d0eebce4 2019-03-11 stsp if (do_list)
4679 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
4680 e31abbf2 2020-03-22 stsp else if (do_delete)
4681 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
4682 e31abbf2 2020-03-22 stsp else if (symref_target)
4683 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
4685 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
4686 e31abbf2 2020-03-22 stsp usage_ref();
4687 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
4690 b2070a3f 2020-03-22 stsp free(refname);
4692 4e759de4 2019-06-26 stsp got_repo_close(repo);
4693 4e759de4 2019-06-26 stsp if (worktree)
4694 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
4695 4e759de4 2019-06-26 stsp free(cwd);
4696 4e759de4 2019-06-26 stsp free(repo_path);
4697 4e759de4 2019-06-26 stsp return error;
4700 4e759de4 2019-06-26 stsp __dead static void
4701 4e759de4 2019-06-26 stsp usage_branch(void)
4703 4e759de4 2019-06-26 stsp fprintf(stderr,
4704 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4705 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
4709 4e759de4 2019-06-26 stsp static const struct got_error *
4710 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
4711 4e99b47e 2019-10-04 stsp struct got_reference *ref)
4713 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
4714 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
4715 4e99b47e 2019-10-04 stsp char *refstr;
4717 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
4718 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
4719 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
4720 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
4722 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
4724 4e99b47e 2019-10-04 stsp return err;
4725 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
4726 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
4727 4e99b47e 2019-10-04 stsp marker = "* ";
4729 4e99b47e 2019-10-04 stsp marker = "~ ";
4733 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4734 4e99b47e 2019-10-04 stsp refname += 11;
4735 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4736 4e99b47e 2019-10-04 stsp refname += 18;
4738 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
4739 4e99b47e 2019-10-04 stsp if (refstr == NULL)
4740 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
4742 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
4743 4e99b47e 2019-10-04 stsp free(refstr);
4744 4e99b47e 2019-10-04 stsp return NULL;
4747 4e99b47e 2019-10-04 stsp static const struct got_error *
4748 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4750 ad89fa31 2019-10-04 stsp const char *refname;
4752 ad89fa31 2019-10-04 stsp if (worktree == NULL)
4753 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
4755 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
4757 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4758 ad89fa31 2019-10-04 stsp refname += 11;
4759 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4760 ad89fa31 2019-10-04 stsp refname += 18;
4762 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
4764 ad89fa31 2019-10-04 stsp return NULL;
4767 ad89fa31 2019-10-04 stsp static const struct got_error *
4768 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
4770 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
4771 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
4772 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
4773 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
4774 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
4776 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
4778 4e99b47e 2019-10-04 stsp if (worktree) {
4779 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
4780 4e99b47e 2019-10-04 stsp worktree);
4782 4e99b47e 2019-10-04 stsp return err;
4784 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
4785 4e99b47e 2019-10-04 stsp worktree);
4787 4e99b47e 2019-10-04 stsp return err;
4789 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
4790 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
4791 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
4793 4e99b47e 2019-10-04 stsp return err;
4794 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
4795 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
4799 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
4800 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
4802 4e759de4 2019-06-26 stsp return err;
4804 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
4805 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
4807 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
4808 4e759de4 2019-06-26 stsp return NULL;
4811 4e759de4 2019-06-26 stsp static const struct got_error *
4812 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
4813 45cd4e47 2019-08-25 stsp const char *branch_name)
4815 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4816 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
4817 4e759de4 2019-06-26 stsp char *refname;
4819 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
4820 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
4822 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4824 4e759de4 2019-06-26 stsp goto done;
4826 45cd4e47 2019-08-25 stsp if (worktree &&
4827 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
4828 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
4829 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
4830 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
4831 45cd4e47 2019-08-25 stsp goto done;
4834 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
4837 45cd4e47 2019-08-25 stsp got_ref_close(ref);
4838 4e759de4 2019-06-26 stsp free(refname);
4839 4e759de4 2019-06-26 stsp return err;
4842 4e759de4 2019-06-26 stsp static const struct got_error *
4843 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
4844 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
4846 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4847 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
4848 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
4851 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
4852 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
4853 d3f84d51 2019-07-11 stsp * an unintended typo.
4855 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
4856 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
4858 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
4859 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
4860 4e759de4 2019-06-26 stsp goto done;
4863 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4864 4e759de4 2019-06-26 stsp if (err == NULL) {
4865 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
4866 4e759de4 2019-06-26 stsp goto done;
4867 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
4868 4e759de4 2019-06-26 stsp goto done;
4870 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
4872 4e759de4 2019-06-26 stsp goto done;
4874 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
4877 4e759de4 2019-06-26 stsp got_ref_close(ref);
4878 4e759de4 2019-06-26 stsp free(base_refname);
4879 4e759de4 2019-06-26 stsp free(refname);
4880 4e759de4 2019-06-26 stsp return err;
4883 4e759de4 2019-06-26 stsp static const struct got_error *
4884 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
4886 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
4887 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
4888 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
4889 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
4890 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
4891 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
4892 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
4893 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
4894 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
4895 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
4896 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
4898 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
4900 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
4901 4e759de4 2019-06-26 stsp switch (ch) {
4903 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
4906 4e759de4 2019-06-26 stsp delref = optarg;
4909 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
4910 4e759de4 2019-06-26 stsp if (repo_path == NULL)
4911 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4913 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
4916 4e759de4 2019-06-26 stsp do_list = 1;
4919 da76fce2 2020-02-24 stsp do_update = 0;
4922 4e759de4 2019-06-26 stsp usage_branch();
4923 4e759de4 2019-06-26 stsp /* NOTREACHED */
4927 4e759de4 2019-06-26 stsp if (do_list && delref)
4928 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
4930 4e759de4 2019-06-26 stsp argc -= optind;
4931 4e759de4 2019-06-26 stsp argv += optind;
4933 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
4934 ad89fa31 2019-10-04 stsp do_show = 1;
4936 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
4937 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
4939 4e759de4 2019-06-26 stsp if (do_list || delref) {
4940 4e759de4 2019-06-26 stsp if (argc > 0)
4941 4e759de4 2019-06-26 stsp usage_branch();
4942 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
4943 4e759de4 2019-06-26 stsp usage_branch();
4945 4e759de4 2019-06-26 stsp #ifndef PROFILE
4946 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
4947 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4948 4e759de4 2019-06-26 stsp NULL) == -1)
4949 4e759de4 2019-06-26 stsp err(1, "pledge");
4951 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4952 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
4953 4e759de4 2019-06-26 stsp err(1, "pledge");
4956 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
4957 4e759de4 2019-06-26 stsp if (cwd == NULL) {
4958 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
4959 4e759de4 2019-06-26 stsp goto done;
4962 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
4963 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
4964 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4965 4e759de4 2019-06-26 stsp goto done;
4967 4e759de4 2019-06-26 stsp error = NULL;
4968 4e759de4 2019-06-26 stsp if (worktree) {
4969 4e759de4 2019-06-26 stsp repo_path =
4970 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
4971 4e759de4 2019-06-26 stsp if (repo_path == NULL)
4972 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
4973 4e759de4 2019-06-26 stsp if (error)
4974 4e759de4 2019-06-26 stsp goto done;
4976 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
4977 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
4978 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
4979 4e759de4 2019-06-26 stsp goto done;
4984 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4985 4e759de4 2019-06-26 stsp if (error != NULL)
4986 4e759de4 2019-06-26 stsp goto done;
4988 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4989 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4990 4e759de4 2019-06-26 stsp if (error)
4991 4e759de4 2019-06-26 stsp goto done;
4993 ad89fa31 2019-10-04 stsp if (do_show)
4994 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
4995 ad89fa31 2019-10-04 stsp else if (do_list)
4996 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
4997 4e759de4 2019-06-26 stsp else if (delref)
4998 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5000 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5001 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5002 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5003 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5004 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5005 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5006 a74f7e83 2019-11-10 stsp if (error)
5007 a74f7e83 2019-11-10 stsp goto done;
5008 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5009 da76fce2 2020-02-24 stsp if (error)
5010 da76fce2 2020-02-24 stsp goto done;
5011 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5012 da76fce2 2020-02-24 stsp int did_something = 0;
5013 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5015 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5016 da76fce2 2020-02-24 stsp if (error)
5017 da76fce2 2020-02-24 stsp goto done;
5018 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5019 da76fce2 2020-02-24 stsp worktree);
5020 da76fce2 2020-02-24 stsp if (error)
5021 da76fce2 2020-02-24 stsp goto done;
5022 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5024 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5025 da76fce2 2020-02-24 stsp goto done;
5027 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5028 da76fce2 2020-02-24 stsp free(branch_refname);
5029 da76fce2 2020-02-24 stsp if (error)
5030 da76fce2 2020-02-24 stsp goto done;
5031 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5033 da76fce2 2020-02-24 stsp if (error)
5034 da76fce2 2020-02-24 stsp goto done;
5035 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5036 da76fce2 2020-02-24 stsp commit_id);
5037 da76fce2 2020-02-24 stsp if (error)
5038 da76fce2 2020-02-24 stsp goto done;
5039 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5040 da76fce2 2020-02-24 stsp repo, update_progress, &did_something,
5041 da76fce2 2020-02-24 stsp check_cancelled, NULL);
5042 da76fce2 2020-02-24 stsp if (error)
5043 da76fce2 2020-02-24 stsp goto done;
5044 da76fce2 2020-02-24 stsp if (did_something)
5045 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5050 da76fce2 2020-02-24 stsp got_ref_close(ref);
5052 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5053 d0eebce4 2019-03-11 stsp if (worktree)
5054 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5055 d0eebce4 2019-03-11 stsp free(cwd);
5056 d0eebce4 2019-03-11 stsp free(repo_path);
5057 da76fce2 2020-02-24 stsp free(commit_id);
5058 da76fce2 2020-02-24 stsp free(commit_id_str);
5059 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5060 da76fce2 2020-02-24 stsp free((char *)pe->path);
5061 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5062 d00136be 2019-03-26 stsp return error;
5066 d00136be 2019-03-26 stsp __dead static void
5067 8e7bd50a 2019-08-22 stsp usage_tag(void)
5069 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5070 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5071 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5076 b8bad2ba 2019-08-23 stsp static const struct got_error *
5077 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5079 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5080 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5081 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5082 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5083 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5085 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5086 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5087 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5088 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5090 b8bad2ba 2019-08-23 stsp return err;
5091 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5094 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5097 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5098 b8bad2ba 2019-08-23 stsp free(re_id);
5101 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5102 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5105 b8bad2ba 2019-08-23 stsp while (se) {
5106 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5109 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5110 b8bad2ba 2019-08-23 stsp free(se_id);
5113 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5114 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5116 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5117 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5119 b8bad2ba 2019-08-23 stsp return err;
5120 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5123 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5128 b8bad2ba 2019-08-23 stsp return err;
5132 b8bad2ba 2019-08-23 stsp static const struct got_error *
5133 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5135 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5136 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5137 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5139 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5141 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5143 8e7bd50a 2019-08-22 stsp return err;
5145 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5146 8e7bd50a 2019-08-22 stsp const char *refname;
5147 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5148 8e7bd50a 2019-08-22 stsp char datebuf[26];
5149 d4efa91b 2020-01-14 stsp const char *tagger;
5150 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5151 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5152 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5153 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5155 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5156 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5158 8e7bd50a 2019-08-22 stsp refname += 10;
5159 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5160 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5161 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5164 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5165 8e7bd50a 2019-08-22 stsp free(refstr);
5167 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5170 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5171 d4efa91b 2020-01-14 stsp if (err) {
5172 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5176 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5177 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5178 d4efa91b 2020-01-14 stsp if (err) {
5182 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5183 d4efa91b 2020-01-14 stsp tagger_time =
5184 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5185 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5191 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5192 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5193 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5194 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5198 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5199 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5200 2417344c 2019-08-23 stsp if (datestr)
5201 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5202 d4efa91b 2020-01-14 stsp if (commit)
5203 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5205 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5206 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5207 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5210 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5211 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5214 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5215 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5218 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5219 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5226 8e7bd50a 2019-08-22 stsp free(id_str);
5227 d4efa91b 2020-01-14 stsp if (commit) {
5228 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5231 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5233 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5234 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5235 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5236 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5241 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5243 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5245 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5246 8e7bd50a 2019-08-22 stsp } while (line);
5247 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5250 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5251 8e7bd50a 2019-08-22 stsp return NULL;
5254 8e7bd50a 2019-08-22 stsp static const struct got_error *
5255 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5256 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5258 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5259 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5260 f372d5cd 2019-10-21 stsp char *editor = NULL;
5261 8e7bd50a 2019-08-22 stsp int fd = -1;
5263 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5264 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5265 8e7bd50a 2019-08-22 stsp goto done;
5268 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5269 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
5270 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5271 8e7bd50a 2019-08-22 stsp goto done;
5274 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5276 8e7bd50a 2019-08-22 stsp goto done;
5278 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
5279 8e7bd50a 2019-08-22 stsp close(fd);
5281 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5283 8e7bd50a 2019-08-22 stsp goto done;
5284 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5286 8e7bd50a 2019-08-22 stsp free(initial_content);
5287 8e7bd50a 2019-08-22 stsp free(template);
5288 8e7bd50a 2019-08-22 stsp free(editor);
5290 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5291 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5292 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5293 8e7bd50a 2019-08-22 stsp if (err) {
5294 8e7bd50a 2019-08-22 stsp free(*tagmsg);
5295 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
5298 8e7bd50a 2019-08-22 stsp return err;
5301 8e7bd50a 2019-08-22 stsp static const struct got_error *
5302 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
5303 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
5305 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5306 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5307 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5308 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5309 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5310 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5311 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5314 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5315 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5316 8e7bd50a 2019-08-22 stsp * an unintended typo.
5318 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5319 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5321 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
5323 8e7bd50a 2019-08-22 stsp return err;
5325 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5326 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5328 8e7bd50a 2019-08-22 stsp goto done;
5330 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5332 8e7bd50a 2019-08-22 stsp goto done;
5334 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5335 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5336 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5337 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
5338 8e7bd50a 2019-08-22 stsp goto done;
5340 8e7bd50a 2019-08-22 stsp tag_name += 10;
5341 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5342 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5343 8e7bd50a 2019-08-22 stsp goto done;
5346 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5347 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5348 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5349 8e7bd50a 2019-08-22 stsp goto done;
5350 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5351 8e7bd50a 2019-08-22 stsp goto done;
5353 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5354 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5355 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5356 f372d5cd 2019-10-21 stsp if (err) {
5357 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5358 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5359 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5360 8e7bd50a 2019-08-22 stsp goto done;
5364 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5365 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5366 f372d5cd 2019-10-21 stsp if (err) {
5367 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5368 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5369 8e7bd50a 2019-08-22 stsp goto done;
5372 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5373 f372d5cd 2019-10-21 stsp if (err) {
5374 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5375 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5376 8e7bd50a 2019-08-22 stsp goto done;
5379 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5380 f372d5cd 2019-10-21 stsp if (err) {
5381 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5382 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5383 f372d5cd 2019-10-21 stsp goto done;
5386 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
5387 f372d5cd 2019-10-21 stsp if (err) {
5388 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5389 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5390 f372d5cd 2019-10-21 stsp goto done;
5392 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
5394 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
5395 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
5396 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
5397 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5398 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
5399 f372d5cd 2019-10-21 stsp free(tag_id_str);
5401 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
5402 8e7bd50a 2019-08-22 stsp free(commit_id);
5403 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5404 8e7bd50a 2019-08-22 stsp free(refname);
5405 8e7bd50a 2019-08-22 stsp free(tagmsg);
5406 f372d5cd 2019-10-21 stsp free(tagmsg_path);
5407 aba9c984 2019-09-08 stsp free(tagger);
5408 8e7bd50a 2019-08-22 stsp return err;
5411 8e7bd50a 2019-08-22 stsp static const struct got_error *
5412 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
5414 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
5415 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
5416 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
5417 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5418 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
5419 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5420 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
5422 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5423 8e7bd50a 2019-08-22 stsp switch (ch) {
5425 80106605 2020-02-24 stsp commit_id_arg = optarg;
5428 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
5431 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
5432 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5433 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5435 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
5438 8e7bd50a 2019-08-22 stsp do_list = 1;
5441 8e7bd50a 2019-08-22 stsp usage_tag();
5442 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
5446 8e7bd50a 2019-08-22 stsp argc -= optind;
5447 8e7bd50a 2019-08-22 stsp argv += optind;
5449 8e7bd50a 2019-08-22 stsp if (do_list) {
5450 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
5452 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
5453 8e7bd50a 2019-08-22 stsp if (tagmsg)
5454 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
5455 8e7bd50a 2019-08-22 stsp if (argc > 0)
5456 8e7bd50a 2019-08-22 stsp usage_tag();
5457 80106605 2020-02-24 stsp } else if (argc != 1)
5458 8e7bd50a 2019-08-22 stsp usage_tag();
5460 a2887370 2019-08-23 stsp tag_name = argv[0];
5462 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
5463 8e7bd50a 2019-08-22 stsp if (do_list) {
5464 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5465 8e7bd50a 2019-08-22 stsp NULL) == -1)
5466 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5468 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5469 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
5470 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5473 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
5474 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
5475 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
5476 8e7bd50a 2019-08-22 stsp goto done;
5479 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5480 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
5481 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5482 8e7bd50a 2019-08-22 stsp goto done;
5484 8e7bd50a 2019-08-22 stsp error = NULL;
5485 8e7bd50a 2019-08-22 stsp if (worktree) {
5486 8e7bd50a 2019-08-22 stsp repo_path =
5487 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
5488 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5489 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5490 8e7bd50a 2019-08-22 stsp if (error)
5491 8e7bd50a 2019-08-22 stsp goto done;
5493 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
5494 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5495 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5496 8e7bd50a 2019-08-22 stsp goto done;
5501 8e7bd50a 2019-08-22 stsp if (do_list) {
5502 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5503 c9956ddf 2019-09-08 stsp if (error != NULL)
5504 c9956ddf 2019-09-08 stsp goto done;
5505 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5506 8e7bd50a 2019-08-22 stsp if (error)
5507 8e7bd50a 2019-08-22 stsp goto done;
5508 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
5510 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5511 c9956ddf 2019-09-08 stsp if (error)
5512 c9956ddf 2019-09-08 stsp goto done;
5513 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
5514 c9956ddf 2019-09-08 stsp if (error != NULL)
5515 c9956ddf 2019-09-08 stsp goto done;
5517 8e7bd50a 2019-08-22 stsp if (tagmsg) {
5518 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5519 8e7bd50a 2019-08-22 stsp if (error)
5520 8e7bd50a 2019-08-22 stsp goto done;
5523 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
5524 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
5525 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
5526 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
5527 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
5528 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
5529 8e7bd50a 2019-08-22 stsp if (error)
5530 8e7bd50a 2019-08-22 stsp goto done;
5531 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5532 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
5533 8e7bd50a 2019-08-22 stsp if (error)
5534 8e7bd50a 2019-08-22 stsp goto done;
5535 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
5536 8e7bd50a 2019-08-22 stsp free(commit_id);
5537 8e7bd50a 2019-08-22 stsp if (error)
5538 8e7bd50a 2019-08-22 stsp goto done;
5541 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
5542 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5546 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
5547 8e7bd50a 2019-08-22 stsp if (worktree)
5548 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
5549 8e7bd50a 2019-08-22 stsp free(cwd);
5550 8e7bd50a 2019-08-22 stsp free(repo_path);
5551 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5552 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5553 8e7bd50a 2019-08-22 stsp return error;
5556 8e7bd50a 2019-08-22 stsp __dead static void
5557 d00136be 2019-03-26 stsp usage_add(void)
5559 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5560 022fae89 2019-12-06 tracey getprogname());
5564 d00136be 2019-03-26 stsp static const struct got_error *
5565 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
5567 4e68cba3 2019-11-23 stsp while (path[0] == '/')
5569 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
5570 4e68cba3 2019-11-23 stsp return NULL;
5573 4e68cba3 2019-11-23 stsp static const struct got_error *
5574 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
5576 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
5577 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
5578 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
5579 1dd54920 2019-05-11 stsp char *cwd = NULL;
5580 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
5581 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
5582 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
5584 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
5586 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
5587 d00136be 2019-03-26 stsp switch (ch) {
5588 022fae89 2019-12-06 tracey case 'I':
5589 022fae89 2019-12-06 tracey no_ignores = 1;
5592 4e68cba3 2019-11-23 stsp can_recurse = 1;
5595 d00136be 2019-03-26 stsp usage_add();
5596 d00136be 2019-03-26 stsp /* NOTREACHED */
5600 d00136be 2019-03-26 stsp argc -= optind;
5601 d00136be 2019-03-26 stsp argv += optind;
5603 43012d58 2019-07-14 stsp #ifndef PROFILE
5604 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5605 43012d58 2019-07-14 stsp NULL) == -1)
5606 43012d58 2019-07-14 stsp err(1, "pledge");
5608 723c305c 2019-05-11 jcs if (argc < 1)
5609 d00136be 2019-03-26 stsp usage_add();
5611 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
5612 d00136be 2019-03-26 stsp if (cwd == NULL) {
5613 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5614 d00136be 2019-03-26 stsp goto done;
5617 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5618 fa51e947 2020-03-27 stsp if (error) {
5619 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5620 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
5621 d00136be 2019-03-26 stsp goto done;
5624 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5626 031a5338 2019-03-26 stsp if (error != NULL)
5627 031a5338 2019-03-26 stsp goto done;
5629 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5630 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5631 d00136be 2019-03-26 stsp if (error)
5632 d00136be 2019-03-26 stsp goto done;
5634 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5635 6d022e97 2019-08-04 stsp if (error)
5636 022fae89 2019-12-06 tracey goto done;
5638 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
5639 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5640 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
5641 6d022e97 2019-08-04 stsp goto done;
5645 4e68cba3 2019-11-23 stsp if (!can_recurse) {
5646 4e68cba3 2019-11-23 stsp char *ondisk_path;
5647 4e68cba3 2019-11-23 stsp struct stat sb;
5648 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
5649 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
5650 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
5651 4e68cba3 2019-11-23 stsp pe->path) == -1) {
5652 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
5653 4e68cba3 2019-11-23 stsp goto done;
5655 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
5656 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
5657 4e68cba3 2019-11-23 stsp free(ondisk_path);
5660 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
5661 4e68cba3 2019-11-23 stsp ondisk_path);
5662 4e68cba3 2019-11-23 stsp free(ondisk_path);
5663 4e68cba3 2019-11-23 stsp goto done;
5665 4e68cba3 2019-11-23 stsp free(ondisk_path);
5666 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
5667 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5668 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
5669 4e68cba3 2019-11-23 stsp goto done;
5674 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
5675 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
5678 031a5338 2019-03-26 stsp got_repo_close(repo);
5679 d00136be 2019-03-26 stsp if (worktree)
5680 d00136be 2019-03-26 stsp got_worktree_close(worktree);
5681 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
5682 1dd54920 2019-05-11 stsp free((char *)pe->path);
5683 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
5684 2ec1f75b 2019-03-26 stsp free(cwd);
5685 2ec1f75b 2019-03-26 stsp return error;
5688 2ec1f75b 2019-03-26 stsp __dead static void
5689 648e4ef7 2019-07-09 stsp usage_remove(void)
5691 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5692 f2a9dc41 2019-12-13 tracey getprogname());
5696 2a06fe5f 2019-08-24 stsp static const struct got_error *
5697 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
5698 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
5700 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
5702 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5703 2a06fe5f 2019-08-24 stsp return NULL;
5704 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5705 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
5706 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
5707 2a06fe5f 2019-08-24 stsp return NULL;
5710 2ec1f75b 2019-03-26 stsp static const struct got_error *
5711 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
5713 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
5714 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
5715 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
5716 17ed4618 2019-06-02 stsp char *cwd = NULL;
5717 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
5718 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
5719 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5721 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
5723 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
5724 2ec1f75b 2019-03-26 stsp switch (ch) {
5726 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
5728 70e3e7f5 2019-12-13 tracey case 'k':
5729 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
5731 f2a9dc41 2019-12-13 tracey case 'R':
5732 f2a9dc41 2019-12-13 tracey can_recurse = 1;
5735 f2a9dc41 2019-12-13 tracey usage_remove();
5736 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
5740 2ec1f75b 2019-03-26 stsp argc -= optind;
5741 2ec1f75b 2019-03-26 stsp argv += optind;
5743 43012d58 2019-07-14 stsp #ifndef PROFILE
5744 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5745 43012d58 2019-07-14 stsp NULL) == -1)
5746 43012d58 2019-07-14 stsp err(1, "pledge");
5748 17ed4618 2019-06-02 stsp if (argc < 1)
5749 648e4ef7 2019-07-09 stsp usage_remove();
5751 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
5752 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
5753 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5754 2ec1f75b 2019-03-26 stsp goto done;
5756 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5757 fa51e947 2020-03-27 stsp if (error) {
5758 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5759 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
5760 2ec1f75b 2019-03-26 stsp goto done;
5763 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5766 2ec1f75b 2019-03-26 stsp goto done;
5768 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5769 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5770 2ec1f75b 2019-03-26 stsp if (error)
5771 2ec1f75b 2019-03-26 stsp goto done;
5773 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5774 6d022e97 2019-08-04 stsp if (error)
5775 6d022e97 2019-08-04 stsp goto done;
5777 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
5778 f2a9dc41 2019-12-13 tracey char *ondisk_path;
5779 f2a9dc41 2019-12-13 tracey struct stat sb;
5780 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
5781 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
5782 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
5783 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
5784 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
5785 f2a9dc41 2019-12-13 tracey goto done;
5787 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
5788 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
5789 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5790 f2a9dc41 2019-12-13 tracey continue;
5792 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
5793 f2a9dc41 2019-12-13 tracey ondisk_path);
5794 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5795 f2a9dc41 2019-12-13 tracey goto done;
5797 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5798 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
5799 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5800 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
5801 f2a9dc41 2019-12-13 tracey goto done;
5806 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
5807 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
5810 a129376b 2019-03-28 stsp got_repo_close(repo);
5811 a129376b 2019-03-28 stsp if (worktree)
5812 a129376b 2019-03-28 stsp got_worktree_close(worktree);
5813 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
5814 17ed4618 2019-06-02 stsp free((char *)pe->path);
5815 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
5816 a129376b 2019-03-28 stsp free(cwd);
5817 a129376b 2019-03-28 stsp return error;
5820 a129376b 2019-03-28 stsp __dead static void
5821 a129376b 2019-03-28 stsp usage_revert(void)
5823 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
5824 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
5828 1ee397ad 2019-07-12 stsp static const struct got_error *
5829 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
5831 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
5832 fb9704af 2020-01-27 stsp return NULL;
5834 a129376b 2019-03-28 stsp while (path[0] == '/')
5836 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
5837 33aa809d 2019-08-08 stsp return NULL;
5840 33aa809d 2019-08-08 stsp struct choose_patch_arg {
5841 33aa809d 2019-08-08 stsp FILE *patch_script_file;
5842 33aa809d 2019-08-08 stsp const char *action;
5845 33aa809d 2019-08-08 stsp static const struct got_error *
5846 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5847 33aa809d 2019-08-08 stsp int nchanges, const char *action)
5849 33aa809d 2019-08-08 stsp char *line = NULL;
5850 33aa809d 2019-08-08 stsp size_t linesize = 0;
5851 33aa809d 2019-08-08 stsp ssize_t linelen;
5853 33aa809d 2019-08-08 stsp switch (status) {
5854 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
5855 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
5857 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
5858 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
5860 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
5861 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
5862 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
5863 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5864 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
5865 33aa809d 2019-08-08 stsp printf("%s", line);
5866 33aa809d 2019-08-08 stsp if (ferror(patch_file))
5867 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5868 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5869 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5870 33aa809d 2019-08-08 stsp path, n, nchanges, action);
5873 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
5876 33aa809d 2019-08-08 stsp return NULL;
5879 33aa809d 2019-08-08 stsp static const struct got_error *
5880 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5881 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
5883 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
5884 33aa809d 2019-08-08 stsp char *line = NULL;
5885 33aa809d 2019-08-08 stsp size_t linesize = 0;
5886 33aa809d 2019-08-08 stsp ssize_t linelen;
5887 33aa809d 2019-08-08 stsp int resp = ' ';
5888 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
5890 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
5892 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
5894 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5895 33aa809d 2019-08-08 stsp a->action);
5897 33aa809d 2019-08-08 stsp return err;
5898 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
5899 33aa809d 2019-08-08 stsp if (linelen == -1) {
5900 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
5901 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5902 33aa809d 2019-08-08 stsp return NULL;
5904 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
5906 33aa809d 2019-08-08 stsp *nl = '\0';
5907 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
5908 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
5909 33aa809d 2019-08-08 stsp printf("y\n");
5910 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
5911 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
5912 33aa809d 2019-08-08 stsp printf("n\n");
5913 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
5914 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
5915 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
5916 33aa809d 2019-08-08 stsp printf("q\n");
5918 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
5919 33aa809d 2019-08-08 stsp free(line);
5920 33aa809d 2019-08-08 stsp return NULL;
5923 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
5924 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5925 33aa809d 2019-08-08 stsp a->action);
5927 33aa809d 2019-08-08 stsp return err;
5928 33aa809d 2019-08-08 stsp resp = getchar();
5929 33aa809d 2019-08-08 stsp if (resp == '\n')
5930 33aa809d 2019-08-08 stsp resp = getchar();
5931 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
5932 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
5933 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
5934 33aa809d 2019-08-08 stsp resp = ' ';
5936 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
5937 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
5938 33aa809d 2019-08-08 stsp resp = ' ';
5942 33aa809d 2019-08-08 stsp if (resp == 'y')
5943 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
5944 33aa809d 2019-08-08 stsp else if (resp == 'n')
5945 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
5946 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
5947 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
5949 1ee397ad 2019-07-12 stsp return NULL;
5953 a129376b 2019-03-28 stsp static const struct got_error *
5954 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
5956 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
5957 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
5958 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
5959 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
5960 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
5961 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
5962 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
5963 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
5964 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
5965 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
5967 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
5969 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
5970 a129376b 2019-03-28 stsp switch (ch) {
5972 33aa809d 2019-08-08 stsp pflag = 1;
5975 33aa809d 2019-08-08 stsp patch_script_path = optarg;
5978 0f6d7415 2019-08-08 stsp can_recurse = 1;
5981 a129376b 2019-03-28 stsp usage_revert();
5982 a129376b 2019-03-28 stsp /* NOTREACHED */
5986 a129376b 2019-03-28 stsp argc -= optind;
5987 a129376b 2019-03-28 stsp argv += optind;
5989 43012d58 2019-07-14 stsp #ifndef PROFILE
5990 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5991 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5992 43012d58 2019-07-14 stsp err(1, "pledge");
5994 e20a8b6f 2019-06-04 stsp if (argc < 1)
5995 a129376b 2019-03-28 stsp usage_revert();
5996 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
5997 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
5999 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6000 a129376b 2019-03-28 stsp if (cwd == NULL) {
6001 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6002 a129376b 2019-03-28 stsp goto done;
6004 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6005 fa51e947 2020-03-27 stsp if (error) {
6006 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6007 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6008 2ec1f75b 2019-03-26 stsp goto done;
6011 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6013 a129376b 2019-03-28 stsp if (error != NULL)
6014 a129376b 2019-03-28 stsp goto done;
6016 33aa809d 2019-08-08 stsp if (patch_script_path) {
6017 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6018 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6019 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6020 33aa809d 2019-08-08 stsp patch_script_path);
6021 33aa809d 2019-08-08 stsp goto done;
6024 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6025 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6026 a129376b 2019-03-28 stsp if (error)
6027 a129376b 2019-03-28 stsp goto done;
6029 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6030 6d022e97 2019-08-04 stsp if (error)
6031 6d022e97 2019-08-04 stsp goto done;
6033 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6034 0f6d7415 2019-08-08 stsp char *ondisk_path;
6035 0f6d7415 2019-08-08 stsp struct stat sb;
6036 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6037 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6038 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6039 0f6d7415 2019-08-08 stsp pe->path) == -1) {
6040 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6041 0f6d7415 2019-08-08 stsp goto done;
6043 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6044 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6045 0f6d7415 2019-08-08 stsp free(ondisk_path);
6048 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6049 0f6d7415 2019-08-08 stsp ondisk_path);
6050 0f6d7415 2019-08-08 stsp free(ondisk_path);
6051 0f6d7415 2019-08-08 stsp goto done;
6053 0f6d7415 2019-08-08 stsp free(ondisk_path);
6054 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6055 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6056 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6057 0f6d7415 2019-08-08 stsp goto done;
6062 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6063 33aa809d 2019-08-08 stsp cpa.action = "revert";
6064 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6065 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6067 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6068 33aa809d 2019-08-08 stsp error == NULL)
6069 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6071 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6072 2ec1f75b 2019-03-26 stsp if (worktree)
6073 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6074 2ec1f75b 2019-03-26 stsp free(path);
6075 d00136be 2019-03-26 stsp free(cwd);
6076 6bad629b 2019-02-04 stsp return error;
6079 c4296144 2019-05-09 stsp __dead static void
6080 c4296144 2019-05-09 stsp usage_commit(void)
6082 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6083 5c1e53bc 2019-07-28 stsp getprogname());
6087 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6088 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6089 e2ba3d07 2019-05-13 stsp const char *editor;
6090 e0870e44 2019-05-13 stsp const char *worktree_path;
6091 76d98825 2019-06-03 stsp const char *branch_name;
6092 314a6357 2019-05-13 stsp const char *repo_path;
6093 e0870e44 2019-05-13 stsp char *logmsg_path;
6097 33ad4cbe 2019-05-12 jcs static const struct got_error *
6098 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6101 76d98825 2019-06-03 stsp char *initial_content = NULL;
6102 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6103 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6104 e0870e44 2019-05-13 stsp char *template = NULL;
6105 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6107 33ad4cbe 2019-05-12 jcs size_t len;
6109 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6110 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6111 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6112 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6113 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6114 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6115 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6116 33ad4cbe 2019-05-12 jcs return NULL;
6119 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6120 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6122 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
6123 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6124 76d98825 2019-06-03 stsp a->branch_name) == -1)
6125 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6127 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6129 e0870e44 2019-05-13 stsp goto done;
6131 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
6133 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6134 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6135 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6136 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6137 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6141 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6143 76d98825 2019-06-03 stsp free(initial_content);
6144 e0870e44 2019-05-13 stsp free(template);
6146 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6147 3ce1b845 2019-07-15 stsp if (err == NULL) {
6148 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6149 3ce1b845 2019-07-15 stsp if (err) {
6150 3ce1b845 2019-07-15 stsp free(*logmsg);
6151 3ce1b845 2019-07-15 stsp *logmsg = NULL;
6154 33ad4cbe 2019-05-12 jcs return err;
6157 c4296144 2019-05-09 stsp static const struct got_error *
6158 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6160 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6161 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6162 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6163 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6164 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6165 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6166 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6167 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6168 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6169 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6171 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6172 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6174 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
6175 c4296144 2019-05-09 stsp switch (ch) {
6177 c4296144 2019-05-09 stsp logmsg = optarg;
6180 c4296144 2019-05-09 stsp usage_commit();
6181 c4296144 2019-05-09 stsp /* NOTREACHED */
6185 c4296144 2019-05-09 stsp argc -= optind;
6186 c4296144 2019-05-09 stsp argv += optind;
6188 43012d58 2019-07-14 stsp #ifndef PROFILE
6189 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6190 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6191 43012d58 2019-07-14 stsp err(1, "pledge");
6193 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6194 c4296144 2019-05-09 stsp if (cwd == NULL) {
6195 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6196 c4296144 2019-05-09 stsp goto done;
6198 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6199 fa51e947 2020-03-27 stsp if (error) {
6200 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6201 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6202 7d5807f4 2019-07-11 stsp goto done;
6205 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6206 c4296144 2019-05-09 stsp if (error)
6207 a698f62e 2019-07-25 stsp goto done;
6208 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6209 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6210 c4296144 2019-05-09 stsp goto done;
6213 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6214 916f288c 2019-07-30 stsp worktree);
6215 5c1e53bc 2019-07-28 stsp if (error)
6216 5c1e53bc 2019-07-28 stsp goto done;
6218 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6219 c9956ddf 2019-09-08 stsp if (error)
6220 c9956ddf 2019-09-08 stsp goto done;
6221 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6222 c9956ddf 2019-09-08 stsp gitconfig_path);
6223 c4296144 2019-05-09 stsp if (error != NULL)
6224 c4296144 2019-05-09 stsp goto done;
6226 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
6227 aba9c984 2019-09-08 stsp if (error)
6228 aba9c984 2019-09-08 stsp return error;
6231 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6232 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6234 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6235 314a6357 2019-05-13 stsp error = get_editor(&editor);
6237 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6238 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6239 c4296144 2019-05-09 stsp if (error)
6240 c4296144 2019-05-09 stsp goto done;
6242 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6243 087fb88c 2019-08-04 stsp if (error)
6244 087fb88c 2019-08-04 stsp goto done;
6246 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6247 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6248 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6249 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6250 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6251 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6252 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6253 916f288c 2019-07-30 stsp goto done;
6255 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6257 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6258 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6259 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6260 e0870e44 2019-05-13 stsp if (error) {
6261 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6262 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6263 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6264 c4296144 2019-05-09 stsp goto done;
6267 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6268 c4296144 2019-05-09 stsp if (error)
6269 c4296144 2019-05-09 stsp goto done;
6270 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6272 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6273 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6274 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6275 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6276 7266f21f 2019-10-21 stsp error == NULL)
6277 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6278 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6280 c4296144 2019-05-09 stsp got_repo_close(repo);
6281 c4296144 2019-05-09 stsp if (worktree)
6282 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6283 c4296144 2019-05-09 stsp free(cwd);
6284 c4296144 2019-05-09 stsp free(id_str);
6285 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6286 e2ba3d07 2019-05-13 stsp free(editor);
6287 aba9c984 2019-09-08 stsp free(author);
6288 234035bc 2019-06-01 stsp return error;
6291 234035bc 2019-06-01 stsp __dead static void
6292 234035bc 2019-06-01 stsp usage_cherrypick(void)
6294 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6298 234035bc 2019-06-01 stsp static const struct got_error *
6299 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6301 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6302 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6303 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6304 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6305 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6306 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6307 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6308 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6309 234035bc 2019-06-01 stsp int ch, did_something = 0;
6311 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6312 234035bc 2019-06-01 stsp switch (ch) {
6314 234035bc 2019-06-01 stsp usage_cherrypick();
6315 234035bc 2019-06-01 stsp /* NOTREACHED */
6319 234035bc 2019-06-01 stsp argc -= optind;
6320 234035bc 2019-06-01 stsp argv += optind;
6322 43012d58 2019-07-14 stsp #ifndef PROFILE
6323 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6324 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6325 43012d58 2019-07-14 stsp err(1, "pledge");
6327 234035bc 2019-06-01 stsp if (argc != 1)
6328 234035bc 2019-06-01 stsp usage_cherrypick();
6330 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6331 234035bc 2019-06-01 stsp if (cwd == NULL) {
6332 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6333 234035bc 2019-06-01 stsp goto done;
6335 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6336 fa51e947 2020-03-27 stsp if (error) {
6337 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6338 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6340 234035bc 2019-06-01 stsp goto done;
6343 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6345 234035bc 2019-06-01 stsp if (error != NULL)
6346 234035bc 2019-06-01 stsp goto done;
6348 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6349 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6350 234035bc 2019-06-01 stsp if (error)
6351 234035bc 2019-06-01 stsp goto done;
6353 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6354 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6355 234035bc 2019-06-01 stsp if (error != NULL) {
6356 234035bc 2019-06-01 stsp struct got_reference *ref;
6357 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6358 234035bc 2019-06-01 stsp goto done;
6359 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6360 234035bc 2019-06-01 stsp if (error != NULL)
6361 234035bc 2019-06-01 stsp goto done;
6362 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
6363 234035bc 2019-06-01 stsp got_ref_close(ref);
6364 234035bc 2019-06-01 stsp if (error != NULL)
6365 234035bc 2019-06-01 stsp goto done;
6367 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
6368 234035bc 2019-06-01 stsp if (error)
6369 234035bc 2019-06-01 stsp goto done;
6371 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
6372 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
6373 234035bc 2019-06-01 stsp if (error != NULL)
6374 234035bc 2019-06-01 stsp goto done;
6376 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6377 234035bc 2019-06-01 stsp if (error) {
6378 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
6379 234035bc 2019-06-01 stsp goto done;
6380 234035bc 2019-06-01 stsp error = NULL;
6382 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
6383 234035bc 2019-06-01 stsp goto done;
6386 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6387 234035bc 2019-06-01 stsp if (error)
6388 234035bc 2019-06-01 stsp goto done;
6389 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6390 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6391 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
6393 234035bc 2019-06-01 stsp if (error != NULL)
6394 234035bc 2019-06-01 stsp goto done;
6396 234035bc 2019-06-01 stsp if (did_something)
6397 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
6399 234035bc 2019-06-01 stsp if (commit)
6400 234035bc 2019-06-01 stsp got_object_commit_close(commit);
6401 234035bc 2019-06-01 stsp free(commit_id_str);
6402 234035bc 2019-06-01 stsp if (head_ref)
6403 234035bc 2019-06-01 stsp got_ref_close(head_ref);
6404 234035bc 2019-06-01 stsp if (worktree)
6405 234035bc 2019-06-01 stsp got_worktree_close(worktree);
6407 234035bc 2019-06-01 stsp got_repo_close(repo);
6408 c4296144 2019-05-09 stsp return error;
6411 5ef14e63 2019-06-02 stsp __dead static void
6412 5ef14e63 2019-06-02 stsp usage_backout(void)
6414 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6418 5ef14e63 2019-06-02 stsp static const struct got_error *
6419 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
6421 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
6422 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
6423 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
6424 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
6425 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
6426 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
6427 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
6428 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
6429 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
6431 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6432 5ef14e63 2019-06-02 stsp switch (ch) {
6434 5ef14e63 2019-06-02 stsp usage_backout();
6435 5ef14e63 2019-06-02 stsp /* NOTREACHED */
6439 5ef14e63 2019-06-02 stsp argc -= optind;
6440 5ef14e63 2019-06-02 stsp argv += optind;
6442 43012d58 2019-07-14 stsp #ifndef PROFILE
6443 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6444 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6445 43012d58 2019-07-14 stsp err(1, "pledge");
6447 5ef14e63 2019-06-02 stsp if (argc != 1)
6448 5ef14e63 2019-06-02 stsp usage_backout();
6450 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
6451 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
6452 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
6453 5ef14e63 2019-06-02 stsp goto done;
6455 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
6456 fa51e947 2020-03-27 stsp if (error) {
6457 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6458 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
6459 5ef14e63 2019-06-02 stsp goto done;
6462 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6464 5ef14e63 2019-06-02 stsp if (error != NULL)
6465 5ef14e63 2019-06-02 stsp goto done;
6467 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6468 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6469 5ef14e63 2019-06-02 stsp if (error)
6470 5ef14e63 2019-06-02 stsp goto done;
6472 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6473 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6474 5ef14e63 2019-06-02 stsp if (error != NULL) {
6475 5ef14e63 2019-06-02 stsp struct got_reference *ref;
6476 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6477 5ef14e63 2019-06-02 stsp goto done;
6478 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6479 5ef14e63 2019-06-02 stsp if (error != NULL)
6480 5ef14e63 2019-06-02 stsp goto done;
6481 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
6482 5ef14e63 2019-06-02 stsp got_ref_close(ref);
6483 5ef14e63 2019-06-02 stsp if (error != NULL)
6484 5ef14e63 2019-06-02 stsp goto done;
6486 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
6487 5ef14e63 2019-06-02 stsp if (error)
6488 5ef14e63 2019-06-02 stsp goto done;
6490 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
6491 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
6492 5ef14e63 2019-06-02 stsp if (error != NULL)
6493 5ef14e63 2019-06-02 stsp goto done;
6495 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6496 5ef14e63 2019-06-02 stsp if (error)
6497 5ef14e63 2019-06-02 stsp goto done;
6499 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6500 5ef14e63 2019-06-02 stsp if (error)
6501 5ef14e63 2019-06-02 stsp goto done;
6502 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6503 5ef14e63 2019-06-02 stsp if (pid == NULL) {
6504 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
6505 5ef14e63 2019-06-02 stsp goto done;
6508 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6509 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
6510 5ef14e63 2019-06-02 stsp if (error != NULL)
6511 5ef14e63 2019-06-02 stsp goto done;
6513 5ef14e63 2019-06-02 stsp if (did_something)
6514 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
6516 5ef14e63 2019-06-02 stsp if (commit)
6517 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
6518 5ef14e63 2019-06-02 stsp free(commit_id_str);
6519 5ef14e63 2019-06-02 stsp if (head_ref)
6520 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
6521 818c7501 2019-07-11 stsp if (worktree)
6522 818c7501 2019-07-11 stsp got_worktree_close(worktree);
6524 818c7501 2019-07-11 stsp got_repo_close(repo);
6525 818c7501 2019-07-11 stsp return error;
6528 818c7501 2019-07-11 stsp __dead static void
6529 818c7501 2019-07-11 stsp usage_rebase(void)
6531 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6532 af54c8f8 2019-07-11 stsp getprogname());
6537 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
6540 0ebf8283 2019-07-24 stsp size_t len;
6542 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
6543 0ebf8283 2019-07-24 stsp if (len > limit)
6544 0ebf8283 2019-07-24 stsp len = limit;
6545 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
6546 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
6548 0ebf8283 2019-07-24 stsp *nl = '\0';
6551 0ebf8283 2019-07-24 stsp static const struct got_error *
6552 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6554 5943eee2 2019-08-13 stsp const struct got_error *err;
6555 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
6556 5943eee2 2019-08-13 stsp const char *s;
6558 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
6560 5943eee2 2019-08-13 stsp return err;
6562 5943eee2 2019-08-13 stsp s = logmsg0;
6563 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
6566 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
6567 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
6568 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6569 5943eee2 2019-08-13 stsp goto done;
6572 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
6574 5943eee2 2019-08-13 stsp free(logmsg0);
6575 a0ea4fc0 2020-02-28 stsp return err;
6578 a0ea4fc0 2020-02-28 stsp static const struct got_error *
6579 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6581 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
6582 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
6583 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
6585 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
6587 a0ea4fc0 2020-02-28 stsp return err;
6589 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
6591 a0ea4fc0 2020-02-28 stsp goto done;
6593 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
6595 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
6597 a0ea4fc0 2020-02-28 stsp goto done;
6599 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
6601 a0ea4fc0 2020-02-28 stsp free(id_str);
6602 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
6603 a0ea4fc0 2020-02-28 stsp free(logmsg);
6604 5943eee2 2019-08-13 stsp return err;
6607 818c7501 2019-07-11 stsp static const struct got_error *
6608 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
6609 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
6611 818c7501 2019-07-11 stsp const struct got_error *err;
6612 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6614 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
6616 818c7501 2019-07-11 stsp goto done;
6618 ff0d2220 2019-07-11 stsp if (new_id) {
6619 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
6621 ff0d2220 2019-07-11 stsp goto done;
6624 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
6625 ff0d2220 2019-07-11 stsp if (new_id_str)
6626 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
6628 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6630 0ebf8283 2019-07-24 stsp goto done;
6632 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
6633 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6635 818c7501 2019-07-11 stsp free(old_id_str);
6636 818c7501 2019-07-11 stsp free(new_id_str);
6637 272a1371 2020-02-28 stsp free(logmsg);
6638 818c7501 2019-07-11 stsp return err;
6641 1ee397ad 2019-07-12 stsp static const struct got_error *
6642 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
6644 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
6646 818c7501 2019-07-11 stsp while (path[0] == '/')
6648 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
6650 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
6651 1ee397ad 2019-07-12 stsp return NULL;
6652 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
6653 818c7501 2019-07-11 stsp *rebase_status = status;
6654 1ee397ad 2019-07-12 stsp return NULL;
6657 818c7501 2019-07-11 stsp static const struct got_error *
6658 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6659 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
6660 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
6662 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
6663 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
6664 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
6667 818c7501 2019-07-11 stsp static const struct got_error *
6668 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
6669 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6670 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
6671 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6673 ff0d2220 2019-07-11 stsp const struct got_error *error;
6674 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
6675 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
6677 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6678 ff0d2220 2019-07-11 stsp if (error)
6679 ff0d2220 2019-07-11 stsp return error;
6681 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6682 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
6683 ff0d2220 2019-07-11 stsp if (error) {
6684 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6685 ff0d2220 2019-07-11 stsp goto done;
6686 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
6688 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
6689 ff0d2220 2019-07-11 stsp free(new_commit_id);
6692 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
6693 ff0d2220 2019-07-11 stsp return error;
6696 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
6697 64c6d990 2019-07-11 stsp const char *path_prefix;
6698 64c6d990 2019-07-11 stsp size_t len;
6699 8ca9bd68 2019-07-25 stsp int errcode;
6702 64c6d990 2019-07-11 stsp static const struct got_error *
6703 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6704 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
6705 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
6706 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
6708 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
6710 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6711 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6712 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
6714 64c6d990 2019-07-11 stsp return NULL;
6717 64c6d990 2019-07-11 stsp static const struct got_error *
6718 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
6719 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
6720 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
6722 64c6d990 2019-07-11 stsp const struct got_error *err;
6723 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6724 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
6725 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
6727 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
6728 64c6d990 2019-07-11 stsp return NULL;
6730 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6732 64c6d990 2019-07-11 stsp goto done;
6734 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6736 64c6d990 2019-07-11 stsp goto done;
6738 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
6739 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
6741 64c6d990 2019-07-11 stsp goto done;
6743 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
6744 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
6746 64c6d990 2019-07-11 stsp goto done;
6748 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
6749 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
6750 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
6751 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
6752 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
6753 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
6754 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
6756 64c6d990 2019-07-11 stsp if (tree1)
6757 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
6758 64c6d990 2019-07-11 stsp if (tree2)
6759 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
6760 64c6d990 2019-07-11 stsp if (commit)
6761 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
6762 64c6d990 2019-07-11 stsp if (parent_commit)
6763 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
6764 64c6d990 2019-07-11 stsp return err;
6767 ff0d2220 2019-07-11 stsp static const struct got_error *
6768 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
6769 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
6770 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6771 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
6772 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
6774 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
6775 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
6776 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
6777 af61c510 2019-07-19 stsp struct got_object_qid *qid;
6778 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
6780 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
6782 af61c510 2019-07-19 stsp return err;
6784 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6785 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6787 af61c510 2019-07-19 stsp goto done;
6788 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6789 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
6790 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
6791 af61c510 2019-07-19 stsp if (err) {
6792 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
6793 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
6794 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
6795 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
6796 af61c510 2019-07-19 stsp "been reached?!?");
6798 ee780d5c 2020-01-04 stsp goto done;
6800 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
6801 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
6803 af61c510 2019-07-19 stsp goto done;
6805 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
6807 af61c510 2019-07-19 stsp goto done;
6808 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6809 af61c510 2019-07-19 stsp commit_id = parent_id;
6813 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
6814 af61c510 2019-07-19 stsp return err;
6817 af61c510 2019-07-19 stsp static const struct got_error *
6818 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
6820 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
6821 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
6822 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
6823 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6824 818c7501 2019-07-11 stsp char *cwd = NULL;
6825 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
6826 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
6827 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
6828 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
6829 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
6830 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
6831 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
6832 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
6833 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6834 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
6835 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
6836 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
6837 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
6839 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
6840 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
6842 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
6843 818c7501 2019-07-11 stsp switch (ch) {
6845 818c7501 2019-07-11 stsp abort_rebase = 1;
6848 818c7501 2019-07-11 stsp continue_rebase = 1;
6851 818c7501 2019-07-11 stsp usage_rebase();
6852 818c7501 2019-07-11 stsp /* NOTREACHED */
6856 818c7501 2019-07-11 stsp argc -= optind;
6857 818c7501 2019-07-11 stsp argv += optind;
6859 43012d58 2019-07-14 stsp #ifndef PROFILE
6860 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6861 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6862 43012d58 2019-07-14 stsp err(1, "pledge");
6864 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
6865 818c7501 2019-07-11 stsp usage_rebase();
6866 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
6867 818c7501 2019-07-11 stsp if (argc != 0)
6868 818c7501 2019-07-11 stsp usage_rebase();
6869 818c7501 2019-07-11 stsp } else if (argc != 1)
6870 818c7501 2019-07-11 stsp usage_rebase();
6872 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
6873 818c7501 2019-07-11 stsp if (cwd == NULL) {
6874 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
6875 818c7501 2019-07-11 stsp goto done;
6877 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
6878 fa51e947 2020-03-27 stsp if (error) {
6879 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6880 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
6881 818c7501 2019-07-11 stsp goto done;
6884 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6886 818c7501 2019-07-11 stsp if (error != NULL)
6887 818c7501 2019-07-11 stsp goto done;
6889 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6890 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6891 7ef62c4e 2020-02-24 stsp if (error)
6892 7ef62c4e 2020-02-24 stsp goto done;
6894 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6895 7ef62c4e 2020-02-24 stsp worktree);
6896 818c7501 2019-07-11 stsp if (error)
6897 7ef62c4e 2020-02-24 stsp goto done;
6898 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
6899 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6900 818c7501 2019-07-11 stsp goto done;
6903 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6904 818c7501 2019-07-11 stsp if (error)
6905 818c7501 2019-07-11 stsp goto done;
6907 f6794adc 2019-07-23 stsp if (abort_rebase) {
6908 818c7501 2019-07-11 stsp int did_something;
6909 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
6910 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
6911 f6794adc 2019-07-23 stsp goto done;
6913 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
6914 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
6915 3e3a69f1 2019-07-25 stsp worktree, repo);
6916 818c7501 2019-07-11 stsp if (error)
6917 818c7501 2019-07-11 stsp goto done;
6918 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
6919 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
6920 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
6921 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
6922 818c7501 2019-07-11 stsp if (error)
6923 818c7501 2019-07-11 stsp goto done;
6924 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
6925 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
6928 818c7501 2019-07-11 stsp if (continue_rebase) {
6929 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
6930 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
6931 f6794adc 2019-07-23 stsp goto done;
6933 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
6934 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
6935 3e3a69f1 2019-07-25 stsp worktree, repo);
6936 818c7501 2019-07-11 stsp if (error)
6937 818c7501 2019-07-11 stsp goto done;
6939 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
6940 01757395 2019-07-12 stsp resume_commit_id, repo);
6941 818c7501 2019-07-11 stsp if (error)
6942 818c7501 2019-07-11 stsp goto done;
6944 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
6945 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
6946 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
6947 818c7501 2019-07-11 stsp goto done;
6950 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
6951 818c7501 2019-07-11 stsp if (error != NULL)
6952 818c7501 2019-07-11 stsp goto done;
6955 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
6956 ff0d2220 2019-07-11 stsp if (error)
6957 ff0d2220 2019-07-11 stsp goto done;
6959 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
6960 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
6962 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
6963 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
6964 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
6965 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6966 818c7501 2019-07-11 stsp if (error)
6967 818c7501 2019-07-11 stsp goto done;
6968 818c7501 2019-07-11 stsp if (yca_id == NULL) {
6969 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
6970 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
6971 818c7501 2019-07-11 stsp "with work tree's branch");
6972 818c7501 2019-07-11 stsp goto done;
6975 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
6976 a51a74b3 2019-07-27 stsp if (error) {
6977 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
6978 a51a74b3 2019-07-27 stsp goto done;
6979 a51a74b3 2019-07-27 stsp error = NULL;
6981 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6982 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
6983 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
6984 a51a74b3 2019-07-27 stsp goto done;
6986 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
6987 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
6988 818c7501 2019-07-11 stsp if (error)
6989 818c7501 2019-07-11 stsp goto done;
6992 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
6993 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6994 818c7501 2019-07-11 stsp if (error)
6995 818c7501 2019-07-11 stsp goto done;
6997 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6998 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
6999 fc66b545 2019-08-12 stsp if (pid == NULL) {
7000 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7001 fc66b545 2019-08-12 stsp int did_something;
7002 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7003 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
7004 fc66b545 2019-08-12 stsp &did_something);
7005 fc66b545 2019-08-12 stsp if (error)
7006 fc66b545 2019-08-12 stsp goto done;
7007 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7008 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7010 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7011 fc66b545 2019-08-12 stsp goto done;
7013 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7014 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7015 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7016 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7017 818c7501 2019-07-11 stsp commit = NULL;
7018 818c7501 2019-07-11 stsp if (error)
7019 818c7501 2019-07-11 stsp goto done;
7021 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7022 38b0338b 2019-11-29 stsp if (continue_rebase) {
7023 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7024 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7025 38b0338b 2019-11-29 stsp goto done;
7027 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7028 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7029 38b0338b 2019-11-29 stsp char *id_str;
7030 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7031 38b0338b 2019-11-29 stsp new_base_branch);
7032 38b0338b 2019-11-29 stsp if (error)
7033 38b0338b 2019-11-29 stsp goto done;
7034 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7035 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7036 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7037 38b0338b 2019-11-29 stsp free(id_str);
7038 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7039 38b0338b 2019-11-29 stsp new_head_commit_id);
7040 38b0338b 2019-11-29 stsp if (error)
7041 38b0338b 2019-11-29 stsp goto done;
7045 818c7501 2019-07-11 stsp pid = NULL;
7046 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7047 818c7501 2019-07-11 stsp commit_id = qid->id;
7048 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7049 818c7501 2019-07-11 stsp pid = qid;
7051 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7052 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7053 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
7054 818c7501 2019-07-11 stsp if (error)
7055 818c7501 2019-07-11 stsp goto done;
7057 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7058 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7059 a0ea4fc0 2020-02-28 stsp if (error)
7060 a0ea4fc0 2020-02-28 stsp goto done;
7061 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7065 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7066 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7067 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7068 818c7501 2019-07-11 stsp if (error)
7069 818c7501 2019-07-11 stsp goto done;
7072 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7073 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7074 818c7501 2019-07-11 stsp if (error)
7075 818c7501 2019-07-11 stsp goto done;
7076 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7077 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7079 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7080 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7082 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7083 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7084 818c7501 2019-07-11 stsp free(resume_commit_id);
7085 818c7501 2019-07-11 stsp free(yca_id);
7086 818c7501 2019-07-11 stsp if (commit)
7087 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7088 818c7501 2019-07-11 stsp if (branch)
7089 818c7501 2019-07-11 stsp got_ref_close(branch);
7090 818c7501 2019-07-11 stsp if (new_base_branch)
7091 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7092 818c7501 2019-07-11 stsp if (tmp_branch)
7093 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7094 5ef14e63 2019-06-02 stsp if (worktree)
7095 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7097 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7098 5ef14e63 2019-06-02 stsp return error;
7101 0ebf8283 2019-07-24 stsp __dead static void
7102 0ebf8283 2019-07-24 stsp usage_histedit(void)
7104 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7105 0ebf8283 2019-07-24 stsp getprogname());
7109 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7110 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7111 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7112 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7113 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7115 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7116 0ebf8283 2019-07-24 stsp unsigned char code;
7117 0ebf8283 2019-07-24 stsp const char *name;
7118 0ebf8283 2019-07-24 stsp const char *desc;
7119 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7120 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7121 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7122 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7123 82997472 2020-01-29 stsp "be used" },
7124 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7125 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7126 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7129 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7130 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7131 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7132 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7133 0ebf8283 2019-07-24 stsp char *logmsg;
7135 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7137 0ebf8283 2019-07-24 stsp static const struct got_error *
7138 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7139 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7141 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7142 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7143 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7146 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7148 0ebf8283 2019-07-24 stsp goto done;
7150 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7152 0ebf8283 2019-07-24 stsp goto done;
7154 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7156 0ebf8283 2019-07-24 stsp goto done;
7158 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7159 0ebf8283 2019-07-24 stsp if (n < 0)
7160 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7162 0ebf8283 2019-07-24 stsp if (commit)
7163 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7164 0ebf8283 2019-07-24 stsp free(id_str);
7165 0ebf8283 2019-07-24 stsp free(logmsg);
7166 0ebf8283 2019-07-24 stsp return err;
7169 0ebf8283 2019-07-24 stsp static const struct got_error *
7170 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7171 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7173 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7174 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7176 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7177 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7179 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7180 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7184 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7185 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7186 083957f4 2020-02-24 stsp if (n < 0) {
7187 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7193 0ebf8283 2019-07-24 stsp return err;
7196 0ebf8283 2019-07-24 stsp static const struct got_error *
7197 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7198 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7200 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7202 514f2ffe 2020-01-29 stsp char *id_str;
7203 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7205 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7206 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7208 514f2ffe 2020-01-29 stsp return err;
7210 514f2ffe 2020-01-29 stsp n = fprintf(f,
7211 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7212 514f2ffe 2020-01-29 stsp "# commit %s\n"
7213 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7214 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7215 514f2ffe 2020-01-29 stsp if (n < 0) {
7216 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7217 514f2ffe 2020-01-29 stsp goto done;
7220 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7221 514f2ffe 2020-01-29 stsp if (n < 0) {
7222 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7223 514f2ffe 2020-01-29 stsp goto done;
7226 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7227 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7228 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7229 0ebf8283 2019-07-24 stsp cmd->desc);
7230 0ebf8283 2019-07-24 stsp if (n < 0) {
7231 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7236 514f2ffe 2020-01-29 stsp free(id_str);
7237 0ebf8283 2019-07-24 stsp return err;
7240 0ebf8283 2019-07-24 stsp static const struct got_error *
7241 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7243 0ebf8283 2019-07-24 stsp static char msg[42];
7246 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7248 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7249 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7251 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7254 0ebf8283 2019-07-24 stsp static const struct got_error *
7255 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7256 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7258 0ebf8283 2019-07-24 stsp const struct got_error *err;
7259 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7260 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7262 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7264 0ebf8283 2019-07-24 stsp return err;
7266 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7268 0ebf8283 2019-07-24 stsp goto done;
7270 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7272 5943eee2 2019-08-13 stsp goto done;
7273 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7274 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7275 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7276 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7279 0ebf8283 2019-07-24 stsp if (folded_commit)
7280 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7281 0ebf8283 2019-07-24 stsp free(id_str);
7282 5943eee2 2019-08-13 stsp free(folded_logmsg);
7283 0ebf8283 2019-07-24 stsp return err;
7286 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7287 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7289 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7291 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7292 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7293 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7294 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7295 3f9de99f 2019-07-24 stsp folded = prev;
7296 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7299 0ebf8283 2019-07-24 stsp return folded;
7302 0ebf8283 2019-07-24 stsp static const struct got_error *
7303 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7304 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7306 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7307 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7308 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7309 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7311 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7313 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7315 0ebf8283 2019-07-24 stsp return err;
7317 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7318 0ebf8283 2019-07-24 stsp if (folded) {
7319 0ebf8283 2019-07-24 stsp while (folded != hle) {
7320 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7321 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7324 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7325 0ebf8283 2019-07-24 stsp logmsg, repo);
7327 0ebf8283 2019-07-24 stsp goto done;
7328 0ebf8283 2019-07-24 stsp free(logmsg);
7329 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7330 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7334 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7336 0ebf8283 2019-07-24 stsp goto done;
7337 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7339 5943eee2 2019-08-13 stsp goto done;
7340 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
7341 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7342 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7343 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7344 0ebf8283 2019-07-24 stsp goto done;
7346 0ebf8283 2019-07-24 stsp free(logmsg);
7347 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7349 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7351 0ebf8283 2019-07-24 stsp goto done;
7353 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
7354 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
7356 0ebf8283 2019-07-24 stsp goto done;
7358 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
7359 0ebf8283 2019-07-24 stsp close(fd);
7361 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7363 0ebf8283 2019-07-24 stsp goto done;
7365 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7366 0ebf8283 2019-07-24 stsp if (err) {
7367 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7368 0ebf8283 2019-07-24 stsp goto done;
7369 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7372 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7373 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
7374 0ebf8283 2019-07-24 stsp free(logmsg_path);
7375 0ebf8283 2019-07-24 stsp free(logmsg);
7376 5943eee2 2019-08-13 stsp free(orig_logmsg);
7377 0ebf8283 2019-07-24 stsp free(editor);
7378 0ebf8283 2019-07-24 stsp if (commit)
7379 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7380 0ebf8283 2019-07-24 stsp return err;
7383 0ebf8283 2019-07-24 stsp static const struct got_error *
7384 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
7385 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7387 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7388 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
7389 0ebf8283 2019-07-24 stsp size_t size;
7390 0ebf8283 2019-07-24 stsp ssize_t len;
7391 0ebf8283 2019-07-24 stsp int lineno = 0, i;
7392 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7393 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
7394 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
7396 0ebf8283 2019-07-24 stsp for (;;) {
7397 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
7398 0ebf8283 2019-07-24 stsp if (len == -1) {
7399 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
7400 0ebf8283 2019-07-24 stsp if (feof(f))
7402 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
7403 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
7408 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7410 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
7411 0ebf8283 2019-07-24 stsp free(line);
7412 0ebf8283 2019-07-24 stsp line = NULL;
7415 0ebf8283 2019-07-24 stsp cmd = NULL;
7416 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7417 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
7418 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7419 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
7420 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
7423 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7428 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
7429 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7432 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7434 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
7435 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
7436 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
7439 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
7440 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7444 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
7445 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
7446 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7450 0ebf8283 2019-07-24 stsp free(line);
7451 0ebf8283 2019-07-24 stsp line = NULL;
7455 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
7457 0ebf8283 2019-07-24 stsp *end = '\0';
7459 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
7460 0ebf8283 2019-07-24 stsp if (err) {
7461 0ebf8283 2019-07-24 stsp /* override error code */
7462 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7466 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
7467 0ebf8283 2019-07-24 stsp if (hle == NULL) {
7468 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
7471 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
7472 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
7473 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
7474 0ebf8283 2019-07-24 stsp commit_id = NULL;
7475 0ebf8283 2019-07-24 stsp free(line);
7476 0ebf8283 2019-07-24 stsp line = NULL;
7477 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7480 0ebf8283 2019-07-24 stsp free(line);
7481 0ebf8283 2019-07-24 stsp free(commit_id);
7482 0ebf8283 2019-07-24 stsp return err;
7485 0ebf8283 2019-07-24 stsp static const struct got_error *
7486 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
7487 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
7489 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
7490 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
7491 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7492 5b87815e 2020-03-05 stsp static char msg[92];
7493 bfce7f83 2019-07-27 stsp char *id_str;
7495 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
7496 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7497 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
7498 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
7499 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7501 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7502 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
7503 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7504 5b87815e 2020-03-05 stsp if (hle == hle2)
7506 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
7507 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
7509 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
7511 5b87815e 2020-03-05 stsp return err;
7512 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
7513 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
7514 5b87815e 2020-03-05 stsp free(id_str);
7515 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7519 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7520 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7521 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7524 bfce7f83 2019-07-27 stsp if (hle == NULL) {
7525 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
7527 bfce7f83 2019-07-27 stsp return err;
7528 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
7529 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
7530 bfce7f83 2019-07-27 stsp free(id_str);
7531 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7535 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7536 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7537 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7538 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
7540 bfce7f83 2019-07-27 stsp return NULL;
7543 bfce7f83 2019-07-27 stsp static const struct got_error *
7544 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
7545 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
7546 bfce7f83 2019-07-27 stsp struct got_repository *repo)
7548 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7549 0ebf8283 2019-07-24 stsp char *editor;
7550 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7552 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7554 0ebf8283 2019-07-24 stsp return err;
7556 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
7557 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
7558 0ebf8283 2019-07-24 stsp goto done;
7561 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7562 0ebf8283 2019-07-24 stsp if (f == NULL) {
7563 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
7564 0ebf8283 2019-07-24 stsp goto done;
7566 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7568 bfce7f83 2019-07-27 stsp goto done;
7570 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
7572 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7573 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7574 0ebf8283 2019-07-24 stsp free(editor);
7575 0ebf8283 2019-07-24 stsp return err;
7578 0ebf8283 2019-07-24 stsp static const struct got_error *
7579 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7580 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
7581 514f2ffe 2020-01-29 stsp struct got_repository *);
7583 0ebf8283 2019-07-24 stsp static const struct got_error *
7584 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
7585 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
7586 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
7588 0ebf8283 2019-07-24 stsp const struct got_error *err;
7589 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7590 0ebf8283 2019-07-24 stsp char *path = NULL;
7592 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
7594 0ebf8283 2019-07-24 stsp return err;
7596 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
7598 0ebf8283 2019-07-24 stsp goto done;
7600 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7602 0ebf8283 2019-07-24 stsp goto done;
7604 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7605 083957f4 2020-02-24 stsp rewind(f);
7606 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7608 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
7609 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
7610 0ebf8283 2019-07-24 stsp goto done;
7613 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
7614 083957f4 2020-02-24 stsp if (err) {
7615 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7616 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7617 083957f4 2020-02-24 stsp goto done;
7618 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
7619 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
7623 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7624 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7625 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
7626 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
7627 0ebf8283 2019-07-24 stsp free(path);
7628 0ebf8283 2019-07-24 stsp return err;
7631 0ebf8283 2019-07-24 stsp static const struct got_error *
7632 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
7633 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7635 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7636 0ebf8283 2019-07-24 stsp char *path = NULL;
7637 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7638 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7639 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7641 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
7643 0ebf8283 2019-07-24 stsp return err;
7645 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
7646 0ebf8283 2019-07-24 stsp if (f == NULL) {
7647 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7648 0ebf8283 2019-07-24 stsp goto done;
7650 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7651 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7656 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7657 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
7658 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
7659 0ebf8283 2019-07-24 stsp if (n < 0) {
7660 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7666 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7667 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7668 0ebf8283 2019-07-24 stsp free(path);
7669 0ebf8283 2019-07-24 stsp if (commit)
7670 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7671 0ebf8283 2019-07-24 stsp return err;
7675 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
7677 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7679 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
7680 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
7681 bfce7f83 2019-07-27 stsp free(hle);
7685 0ebf8283 2019-07-24 stsp static const struct got_error *
7686 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
7687 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
7689 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7690 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7692 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7693 0ebf8283 2019-07-24 stsp if (f == NULL) {
7694 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7695 0ebf8283 2019-07-24 stsp goto done;
7698 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7700 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7701 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7702 0ebf8283 2019-07-24 stsp return err;
7705 0ebf8283 2019-07-24 stsp static const struct got_error *
7706 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7707 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
7708 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
7710 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
7711 0ebf8283 2019-07-24 stsp int resp = ' ';
7713 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
7714 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7715 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
7716 0ebf8283 2019-07-24 stsp resp = getchar();
7717 a61a4414 2019-08-07 stsp if (resp == '\n')
7718 a61a4414 2019-08-07 stsp resp = getchar();
7719 426ebf2e 2019-07-25 stsp if (resp == 'c') {
7720 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7721 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
7723 426ebf2e 2019-07-25 stsp if (err) {
7724 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7725 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7727 bfce7f83 2019-07-27 stsp prev_err = err;
7728 426ebf2e 2019-07-25 stsp resp = ' ';
7732 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
7733 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7734 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
7735 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
7736 426ebf2e 2019-07-25 stsp if (err) {
7737 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7738 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7740 bfce7f83 2019-07-27 stsp prev_err = err;
7741 426ebf2e 2019-07-25 stsp resp = ' ';
7745 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
7746 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7749 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
7752 0ebf8283 2019-07-24 stsp return err;
7755 0ebf8283 2019-07-24 stsp static const struct got_error *
7756 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
7757 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7758 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
7760 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7761 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7762 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7763 3e3a69f1 2019-07-25 stsp branch, repo);
7766 0ebf8283 2019-07-24 stsp static const struct got_error *
7767 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
7768 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7770 0ebf8283 2019-07-24 stsp const struct got_error *err;
7771 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7773 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
7775 0ebf8283 2019-07-24 stsp goto done;
7777 0ebf8283 2019-07-24 stsp if (new_id) {
7778 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
7780 0ebf8283 2019-07-24 stsp goto done;
7783 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
7784 0ebf8283 2019-07-24 stsp if (new_id_str)
7785 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
7787 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7788 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
7789 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
7790 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7791 0ebf8283 2019-07-24 stsp goto done;
7793 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
7795 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7797 0ebf8283 2019-07-24 stsp goto done;
7800 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
7801 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
7802 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
7803 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
7804 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7806 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
7807 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
7808 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
7815 0ebf8283 2019-07-24 stsp free(old_id_str);
7816 0ebf8283 2019-07-24 stsp free(new_id_str);
7817 0ebf8283 2019-07-24 stsp return err;
7820 0ebf8283 2019-07-24 stsp static const struct got_error *
7821 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
7822 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7823 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
7824 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7826 0ebf8283 2019-07-24 stsp const struct got_error *err;
7827 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7828 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
7830 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
7831 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
7832 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7834 0ebf8283 2019-07-24 stsp return err;
7837 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7839 0ebf8283 2019-07-24 stsp return err;
7841 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
7842 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
7843 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
7844 0ebf8283 2019-07-24 stsp if (err) {
7845 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
7846 0ebf8283 2019-07-24 stsp goto done;
7847 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
7849 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
7850 0ebf8283 2019-07-24 stsp free(new_commit_id);
7853 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7854 0ebf8283 2019-07-24 stsp return err;
7857 0ebf8283 2019-07-24 stsp static const struct got_error *
7858 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
7859 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7861 0ebf8283 2019-07-24 stsp const struct got_error *error;
7862 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7864 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
7866 0ebf8283 2019-07-24 stsp if (error)
7867 0ebf8283 2019-07-24 stsp return error;
7869 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
7870 0ebf8283 2019-07-24 stsp if (error)
7871 0ebf8283 2019-07-24 stsp return error;
7873 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
7874 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7875 0ebf8283 2019-07-24 stsp return error;
7878 ab20a43a 2020-01-29 stsp static const struct got_error *
7879 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
7880 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
7881 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7882 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7884 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
7886 ab20a43a 2020-01-29 stsp switch (status) {
7887 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7888 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7889 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7890 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
7891 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7892 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
7897 ab20a43a 2020-01-29 stsp switch (staged_status) {
7898 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7899 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7900 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7901 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7902 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
7907 ab20a43a 2020-01-29 stsp return NULL;
7910 0ebf8283 2019-07-24 stsp static const struct got_error *
7911 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
7913 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
7914 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
7915 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7916 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
7917 0ebf8283 2019-07-24 stsp char *cwd = NULL;
7918 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
7919 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
7920 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
7921 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
7922 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
7923 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7924 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
7925 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
7926 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
7927 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
7928 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7929 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
7930 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
7931 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
7932 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
7933 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
7934 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7936 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
7937 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
7938 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
7940 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
7941 0ebf8283 2019-07-24 stsp switch (ch) {
7943 0ebf8283 2019-07-24 stsp abort_edit = 1;
7946 0ebf8283 2019-07-24 stsp continue_edit = 1;
7949 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
7952 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
7955 0ebf8283 2019-07-24 stsp usage_histedit();
7956 0ebf8283 2019-07-24 stsp /* NOTREACHED */
7960 0ebf8283 2019-07-24 stsp argc -= optind;
7961 0ebf8283 2019-07-24 stsp argv += optind;
7963 0ebf8283 2019-07-24 stsp #ifndef PROFILE
7964 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7965 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
7966 0ebf8283 2019-07-24 stsp err(1, "pledge");
7968 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
7969 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
7970 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
7971 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
7972 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
7973 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
7974 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
7975 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
7976 0ebf8283 2019-07-24 stsp if (argc != 0)
7977 0ebf8283 2019-07-24 stsp usage_histedit();
7980 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
7981 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
7982 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
7983 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
7984 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
7985 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
7988 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
7989 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
7990 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
7991 0ebf8283 2019-07-24 stsp goto done;
7993 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
7994 fa51e947 2020-03-27 stsp if (error) {
7995 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
7996 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
7997 0ebf8283 2019-07-24 stsp goto done;
8000 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8002 0ebf8283 2019-07-24 stsp if (error != NULL)
8003 0ebf8283 2019-07-24 stsp goto done;
8005 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8006 0ebf8283 2019-07-24 stsp if (error)
8007 0ebf8283 2019-07-24 stsp goto done;
8008 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8009 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8010 0ebf8283 2019-07-24 stsp goto done;
8013 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8014 0ebf8283 2019-07-24 stsp if (error)
8015 0ebf8283 2019-07-24 stsp goto done;
8017 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8018 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8019 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8020 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8021 083957f4 2020-02-24 stsp "before the -m option can be used");
8022 083957f4 2020-02-24 stsp goto done;
8025 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8026 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8027 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8028 3e3a69f1 2019-07-25 stsp worktree, repo);
8029 0ebf8283 2019-07-24 stsp if (error)
8030 0ebf8283 2019-07-24 stsp goto done;
8031 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8032 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8033 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8034 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
8035 0ebf8283 2019-07-24 stsp if (error)
8036 0ebf8283 2019-07-24 stsp goto done;
8037 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8038 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8039 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8040 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8041 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8042 0ebf8283 2019-07-24 stsp goto done;
8045 0ebf8283 2019-07-24 stsp if (continue_edit) {
8046 0ebf8283 2019-07-24 stsp char *path;
8048 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8049 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8050 0ebf8283 2019-07-24 stsp goto done;
8053 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8054 0ebf8283 2019-07-24 stsp if (error)
8055 0ebf8283 2019-07-24 stsp goto done;
8057 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8058 0ebf8283 2019-07-24 stsp free(path);
8059 0ebf8283 2019-07-24 stsp if (error)
8060 0ebf8283 2019-07-24 stsp goto done;
8062 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8063 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8064 3e3a69f1 2019-07-25 stsp worktree, repo);
8065 0ebf8283 2019-07-24 stsp if (error)
8066 0ebf8283 2019-07-24 stsp goto done;
8068 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8069 0ebf8283 2019-07-24 stsp if (error)
8070 0ebf8283 2019-07-24 stsp goto done;
8072 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8073 0ebf8283 2019-07-24 stsp head_commit_id);
8074 0ebf8283 2019-07-24 stsp if (error)
8075 0ebf8283 2019-07-24 stsp goto done;
8076 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8077 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8078 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8079 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8080 3aac7cf7 2019-07-25 stsp goto done;
8082 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8083 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8084 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8085 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8086 0ebf8283 2019-07-24 stsp commit = NULL;
8087 0ebf8283 2019-07-24 stsp if (error)
8088 0ebf8283 2019-07-24 stsp goto done;
8090 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8091 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8092 0ebf8283 2019-07-24 stsp goto done;
8095 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8096 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8097 0ebf8283 2019-07-24 stsp if (error != NULL)
8098 0ebf8283 2019-07-24 stsp goto done;
8100 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8101 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8102 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8103 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8104 c7d20a3f 2019-07-30 stsp goto done;
8107 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8108 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8109 bfce7f83 2019-07-27 stsp branch = NULL;
8110 0ebf8283 2019-07-24 stsp if (error)
8111 0ebf8283 2019-07-24 stsp goto done;
8113 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8114 0ebf8283 2019-07-24 stsp head_commit_id);
8115 0ebf8283 2019-07-24 stsp if (error)
8116 0ebf8283 2019-07-24 stsp goto done;
8117 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8118 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8119 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8120 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8121 3aac7cf7 2019-07-25 stsp goto done;
8123 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8124 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8125 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8126 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8127 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8128 0ebf8283 2019-07-24 stsp commit = NULL;
8129 0ebf8283 2019-07-24 stsp if (error)
8130 0ebf8283 2019-07-24 stsp goto done;
8132 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8133 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8134 c5996fff 2020-01-29 stsp goto done;
8137 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8138 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8139 bfce7f83 2019-07-27 stsp if (error)
8140 bfce7f83 2019-07-27 stsp goto done;
8142 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8143 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8144 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8145 6ba2bea2 2019-07-27 stsp if (error) {
8146 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8147 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8148 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
8149 0ebf8283 2019-07-24 stsp goto done;
8152 514f2ffe 2020-01-29 stsp const char *branch_name;
8153 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8154 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8155 514f2ffe 2020-01-29 stsp branch_name += 11;
8156 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8157 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8158 6ba2bea2 2019-07-27 stsp if (error) {
8159 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8160 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8161 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
8162 0ebf8283 2019-07-24 stsp goto done;
8167 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8169 6ba2bea2 2019-07-27 stsp if (error) {
8170 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8171 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8172 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
8173 0ebf8283 2019-07-24 stsp goto done;
8178 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8179 4ec14e60 2019-08-28 hiltjo if (error)
8180 0ebf8283 2019-07-24 stsp goto done;
8182 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8183 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8184 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8185 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8188 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8189 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8190 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8191 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8193 ab20a43a 2020-01-29 stsp if (error)
8194 ab20a43a 2020-01-29 stsp goto done;
8196 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8197 ab20a43a 2020-01-29 stsp int have_changes = 0;
8199 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8200 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8201 ab20a43a 2020-01-29 stsp if (error)
8202 ab20a43a 2020-01-29 stsp goto done;
8203 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8204 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8205 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8206 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8207 ab20a43a 2020-01-29 stsp if (error) {
8208 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8209 ab20a43a 2020-01-29 stsp goto done;
8210 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8211 ab20a43a 2020-01-29 stsp goto done;
8213 ab20a43a 2020-01-29 stsp if (have_changes) {
8214 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8215 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8216 ab20a43a 2020-01-29 stsp if (error)
8217 ab20a43a 2020-01-29 stsp goto done;
8219 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8220 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8221 ab20a43a 2020-01-29 stsp if (error)
8222 ab20a43a 2020-01-29 stsp goto done;
8223 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8224 ab20a43a 2020-01-29 stsp hle, NULL);
8225 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8226 ab20a43a 2020-01-29 stsp commit = NULL;
8227 ab20a43a 2020-01-29 stsp if (error)
8228 ab20a43a 2020-01-29 stsp goto done;
8234 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8235 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8236 0ebf8283 2019-07-24 stsp if (error)
8237 0ebf8283 2019-07-24 stsp goto done;
8241 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8242 0ebf8283 2019-07-24 stsp hle->commit_id);
8243 0ebf8283 2019-07-24 stsp if (error)
8244 0ebf8283 2019-07-24 stsp goto done;
8245 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8246 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8248 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8249 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8250 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
8251 0ebf8283 2019-07-24 stsp if (error)
8252 0ebf8283 2019-07-24 stsp goto done;
8253 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8254 0ebf8283 2019-07-24 stsp commit = NULL;
8256 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8257 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8259 a0ea4fc0 2020-02-28 stsp if (error)
8260 a0ea4fc0 2020-02-28 stsp goto done;
8261 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8265 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8266 0ebf8283 2019-07-24 stsp char *id_str;
8267 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8268 0ebf8283 2019-07-24 stsp if (error)
8269 0ebf8283 2019-07-24 stsp goto done;
8270 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8272 0ebf8283 2019-07-24 stsp free(id_str);
8273 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8274 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8275 3e3a69f1 2019-07-25 stsp fileindex);
8276 0ebf8283 2019-07-24 stsp goto done;
8279 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8280 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8281 0ebf8283 2019-07-24 stsp if (error)
8282 0ebf8283 2019-07-24 stsp goto done;
8286 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8287 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8288 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8289 0ebf8283 2019-07-24 stsp if (error)
8290 0ebf8283 2019-07-24 stsp goto done;
8293 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8294 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8295 0ebf8283 2019-07-24 stsp if (error)
8296 0ebf8283 2019-07-24 stsp goto done;
8297 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8298 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8300 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8301 3e3a69f1 2019-07-25 stsp branch, repo);
8303 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8304 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8305 0ebf8283 2019-07-24 stsp free(head_commit_id);
8306 0ebf8283 2019-07-24 stsp free(base_commit_id);
8307 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8308 0ebf8283 2019-07-24 stsp if (commit)
8309 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8310 0ebf8283 2019-07-24 stsp if (branch)
8311 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8312 0ebf8283 2019-07-24 stsp if (tmp_branch)
8313 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8314 0ebf8283 2019-07-24 stsp if (worktree)
8315 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8317 2822a352 2019-10-15 stsp got_repo_close(repo);
8318 2822a352 2019-10-15 stsp return error;
8321 2822a352 2019-10-15 stsp __dead static void
8322 2822a352 2019-10-15 stsp usage_integrate(void)
8324 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8328 2822a352 2019-10-15 stsp static const struct got_error *
8329 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8331 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8332 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8333 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8334 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8335 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8336 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8337 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8338 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8339 2822a352 2019-10-15 stsp int ch, did_something = 0;
8341 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8342 2822a352 2019-10-15 stsp switch (ch) {
8344 2822a352 2019-10-15 stsp usage_integrate();
8345 2822a352 2019-10-15 stsp /* NOTREACHED */
8349 2822a352 2019-10-15 stsp argc -= optind;
8350 2822a352 2019-10-15 stsp argv += optind;
8352 2822a352 2019-10-15 stsp if (argc != 1)
8353 2822a352 2019-10-15 stsp usage_integrate();
8354 2822a352 2019-10-15 stsp branch_arg = argv[0];
8356 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8357 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
8358 2822a352 2019-10-15 stsp err(1, "pledge");
8360 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
8361 2822a352 2019-10-15 stsp if (cwd == NULL) {
8362 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
8363 2822a352 2019-10-15 stsp goto done;
8366 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
8367 fa51e947 2020-03-27 stsp if (error) {
8368 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8369 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
8371 2822a352 2019-10-15 stsp goto done;
8374 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
8375 2822a352 2019-10-15 stsp if (error)
8376 2822a352 2019-10-15 stsp goto done;
8378 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8380 2822a352 2019-10-15 stsp if (error != NULL)
8381 2822a352 2019-10-15 stsp goto done;
8383 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8384 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
8385 2822a352 2019-10-15 stsp if (error)
8386 2822a352 2019-10-15 stsp goto done;
8388 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8389 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
8390 2822a352 2019-10-15 stsp goto done;
8393 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8394 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
8395 2822a352 2019-10-15 stsp if (error)
8396 2822a352 2019-10-15 stsp goto done;
8398 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
8399 2822a352 2019-10-15 stsp if (refname == NULL) {
8400 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8401 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8402 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8403 2822a352 2019-10-15 stsp goto done;
8405 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
8406 2822a352 2019-10-15 stsp if (base_refname == NULL) {
8407 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8408 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8409 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8410 2822a352 2019-10-15 stsp goto done;
8413 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
8414 2822a352 2019-10-15 stsp if (error)
8415 2822a352 2019-10-15 stsp goto done;
8417 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8418 2822a352 2019-10-15 stsp if (error)
8419 2822a352 2019-10-15 stsp goto done;
8421 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8422 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
8423 2822a352 2019-10-15 stsp "specified branch has already been integrated");
8424 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8425 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8426 2822a352 2019-10-15 stsp goto done;
8429 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8430 2822a352 2019-10-15 stsp if (error) {
8431 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
8432 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
8433 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8434 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8435 2822a352 2019-10-15 stsp goto done;
8438 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
8439 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
8440 2822a352 2019-10-15 stsp check_cancelled, NULL);
8441 2822a352 2019-10-15 stsp if (error)
8442 2822a352 2019-10-15 stsp goto done;
8444 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
8447 715dc77e 2019-08-03 stsp got_repo_close(repo);
8448 2822a352 2019-10-15 stsp if (worktree)
8449 2822a352 2019-10-15 stsp got_worktree_close(worktree);
8450 2822a352 2019-10-15 stsp free(cwd);
8451 2822a352 2019-10-15 stsp free(base_commit_id);
8452 2822a352 2019-10-15 stsp free(commit_id);
8453 2822a352 2019-10-15 stsp free(refname);
8454 2822a352 2019-10-15 stsp free(base_refname);
8455 715dc77e 2019-08-03 stsp return error;
8458 715dc77e 2019-08-03 stsp __dead static void
8459 715dc77e 2019-08-03 stsp usage_stage(void)
8461 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8462 f3055044 2019-08-07 stsp "[file-path ...]\n",
8463 715dc77e 2019-08-03 stsp getprogname());
8467 715dc77e 2019-08-03 stsp static const struct got_error *
8468 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
8469 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
8470 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8471 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
8473 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
8474 408b4ebc 2019-08-03 stsp char *id_str = NULL;
8476 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
8477 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
8478 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
8479 408b4ebc 2019-08-03 stsp return NULL;
8481 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
8482 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
8483 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
8485 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
8487 408b4ebc 2019-08-03 stsp return err;
8489 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
8490 408b4ebc 2019-08-03 stsp free(id_str);
8491 dc424a06 2019-08-07 stsp return NULL;
8494 dc424a06 2019-08-07 stsp static const struct got_error *
8495 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
8497 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
8498 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
8499 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
8500 715dc77e 2019-08-03 stsp char *cwd = NULL;
8501 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
8502 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
8503 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
8504 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
8505 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8506 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8508 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
8510 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8511 715dc77e 2019-08-03 stsp switch (ch) {
8513 408b4ebc 2019-08-03 stsp list_stage = 1;
8516 dc424a06 2019-08-07 stsp pflag = 1;
8519 dc424a06 2019-08-07 stsp patch_script_path = optarg;
8522 715dc77e 2019-08-03 stsp usage_stage();
8523 715dc77e 2019-08-03 stsp /* NOTREACHED */
8527 715dc77e 2019-08-03 stsp argc -= optind;
8528 715dc77e 2019-08-03 stsp argv += optind;
8530 715dc77e 2019-08-03 stsp #ifndef PROFILE
8531 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8532 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
8533 715dc77e 2019-08-03 stsp err(1, "pledge");
8535 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
8536 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
8537 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
8538 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
8540 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
8541 715dc77e 2019-08-03 stsp if (cwd == NULL) {
8542 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
8543 715dc77e 2019-08-03 stsp goto done;
8546 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8547 fa51e947 2020-03-27 stsp if (error) {
8548 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8549 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
8550 715dc77e 2019-08-03 stsp goto done;
8553 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8555 715dc77e 2019-08-03 stsp if (error != NULL)
8556 715dc77e 2019-08-03 stsp goto done;
8558 dc424a06 2019-08-07 stsp if (patch_script_path) {
8559 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
8560 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
8561 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
8562 dc424a06 2019-08-07 stsp patch_script_path);
8563 dc424a06 2019-08-07 stsp goto done;
8566 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8567 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
8568 715dc77e 2019-08-03 stsp if (error)
8569 715dc77e 2019-08-03 stsp goto done;
8571 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8572 6d022e97 2019-08-04 stsp if (error)
8573 6d022e97 2019-08-04 stsp goto done;
8575 6d022e97 2019-08-04 stsp if (list_stage)
8576 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
8577 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
8579 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8580 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
8581 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
8582 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
8583 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
8586 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8587 2e1f37b0 2019-08-08 stsp error == NULL)
8588 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8590 ad493afc 2019-08-03 stsp got_repo_close(repo);
8591 ad493afc 2019-08-03 stsp if (worktree)
8592 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
8593 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8594 ad493afc 2019-08-03 stsp free((char *)pe->path);
8595 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
8596 ad493afc 2019-08-03 stsp free(cwd);
8597 ad493afc 2019-08-03 stsp return error;
8600 ad493afc 2019-08-03 stsp __dead static void
8601 ad493afc 2019-08-03 stsp usage_unstage(void)
8603 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8604 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
8605 ad493afc 2019-08-03 stsp getprogname());
8610 ad493afc 2019-08-03 stsp static const struct got_error *
8611 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
8613 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
8614 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
8615 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
8616 ad493afc 2019-08-03 stsp char *cwd = NULL;
8617 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
8618 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8619 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
8620 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
8621 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8622 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8624 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
8626 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
8627 ad493afc 2019-08-03 stsp switch (ch) {
8629 2e1f37b0 2019-08-08 stsp pflag = 1;
8632 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
8635 ad493afc 2019-08-03 stsp usage_unstage();
8636 ad493afc 2019-08-03 stsp /* NOTREACHED */
8640 ad493afc 2019-08-03 stsp argc -= optind;
8641 ad493afc 2019-08-03 stsp argv += optind;
8643 ad493afc 2019-08-03 stsp #ifndef PROFILE
8644 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8645 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
8646 ad493afc 2019-08-03 stsp err(1, "pledge");
8648 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
8649 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
8651 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
8652 ad493afc 2019-08-03 stsp if (cwd == NULL) {
8653 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
8654 ad493afc 2019-08-03 stsp goto done;
8657 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8658 fa51e947 2020-03-27 stsp if (error) {
8659 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8660 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
8661 ad493afc 2019-08-03 stsp goto done;
8664 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8666 ad493afc 2019-08-03 stsp if (error != NULL)
8667 ad493afc 2019-08-03 stsp goto done;
8669 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
8670 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
8671 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
8672 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
8673 2e1f37b0 2019-08-08 stsp patch_script_path);
8674 2e1f37b0 2019-08-08 stsp goto done;
8678 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8679 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
8680 ad493afc 2019-08-03 stsp if (error)
8681 ad493afc 2019-08-03 stsp goto done;
8683 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8684 ad493afc 2019-08-03 stsp if (error)
8685 ad493afc 2019-08-03 stsp goto done;
8687 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8688 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
8689 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
8690 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
8692 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8693 2e1f37b0 2019-08-08 stsp error == NULL)
8694 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8696 0ebf8283 2019-07-24 stsp got_repo_close(repo);
8697 715dc77e 2019-08-03 stsp if (worktree)
8698 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
8699 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8700 715dc77e 2019-08-03 stsp free((char *)pe->path);
8701 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
8702 715dc77e 2019-08-03 stsp free(cwd);
8703 01073a5d 2019-08-22 stsp return error;
8706 01073a5d 2019-08-22 stsp __dead static void
8707 01073a5d 2019-08-22 stsp usage_cat(void)
8709 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8710 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
8714 01073a5d 2019-08-22 stsp static const struct got_error *
8715 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8717 01073a5d 2019-08-22 stsp const struct got_error *err;
8718 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
8720 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
8722 01073a5d 2019-08-22 stsp return err;
8724 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8725 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
8726 01073a5d 2019-08-22 stsp return err;
8729 01073a5d 2019-08-22 stsp static const struct got_error *
8730 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8732 01073a5d 2019-08-22 stsp const struct got_error *err;
8733 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
8734 56e0773d 2019-11-28 stsp int nentries, i;
8736 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
8738 01073a5d 2019-08-22 stsp return err;
8740 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
8741 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
8742 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
8743 01073a5d 2019-08-22 stsp char *id_str;
8744 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
8746 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
8747 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8750 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
8751 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
8752 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
8753 01073a5d 2019-08-22 stsp free(id_str);
8756 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
8757 01073a5d 2019-08-22 stsp return err;
8760 01073a5d 2019-08-22 stsp static const struct got_error *
8761 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8763 01073a5d 2019-08-22 stsp const struct got_error *err;
8764 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
8765 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
8766 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
8767 01073a5d 2019-08-22 stsp char *id_str = NULL;
8768 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
8770 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
8772 01073a5d 2019-08-22 stsp return err;
8774 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8776 01073a5d 2019-08-22 stsp goto done;
8778 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8779 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8780 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
8781 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
8782 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
8783 01073a5d 2019-08-22 stsp char *pid_str;
8784 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
8786 01073a5d 2019-08-22 stsp goto done;
8787 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8788 01073a5d 2019-08-22 stsp free(pid_str);
8790 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
8791 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8792 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
8794 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
8795 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8796 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
8798 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
8799 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8800 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
8802 01073a5d 2019-08-22 stsp free(id_str);
8803 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
8804 01073a5d 2019-08-22 stsp return err;
8807 01073a5d 2019-08-22 stsp static const struct got_error *
8808 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8810 01073a5d 2019-08-22 stsp const struct got_error *err;
8811 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
8812 01073a5d 2019-08-22 stsp char *id_str = NULL;
8813 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
8815 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
8817 01073a5d 2019-08-22 stsp return err;
8819 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8821 01073a5d 2019-08-22 stsp goto done;
8823 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8825 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
8826 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
8827 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8828 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
8830 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
8831 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8832 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
8834 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
8835 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8836 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
8838 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
8839 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8840 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
8846 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8847 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
8849 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
8850 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
8851 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
8853 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
8854 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8855 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
8857 01073a5d 2019-08-22 stsp free(id_str);
8858 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
8859 01073a5d 2019-08-22 stsp return err;
8862 01073a5d 2019-08-22 stsp static const struct got_error *
8863 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
8865 01073a5d 2019-08-22 stsp const struct got_error *error;
8866 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
8867 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
8868 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
8869 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
8870 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
8871 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
8873 01073a5d 2019-08-22 stsp #ifndef PROFILE
8874 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8875 01073a5d 2019-08-22 stsp NULL) == -1)
8876 01073a5d 2019-08-22 stsp err(1, "pledge");
8879 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
8880 01073a5d 2019-08-22 stsp switch (ch) {
8882 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
8885 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
8886 01073a5d 2019-08-22 stsp if (repo_path == NULL)
8887 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
8889 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
8892 896e9b6f 2019-08-26 stsp force_path = 1;
8895 01073a5d 2019-08-22 stsp usage_cat();
8896 01073a5d 2019-08-22 stsp /* NOTREACHED */
8900 01073a5d 2019-08-22 stsp argc -= optind;
8901 01073a5d 2019-08-22 stsp argv += optind;
8903 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
8904 01073a5d 2019-08-22 stsp if (cwd == NULL) {
8905 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
8906 01073a5d 2019-08-22 stsp goto done;
8908 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
8909 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
8910 01073a5d 2019-08-22 stsp goto done;
8911 01073a5d 2019-08-22 stsp if (worktree) {
8912 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
8913 01073a5d 2019-08-22 stsp repo_path = strdup(
8914 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
8915 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
8916 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
8917 01073a5d 2019-08-22 stsp goto done;
8922 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
8923 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
8924 01073a5d 2019-08-22 stsp if (repo_path == NULL)
8925 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
8928 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
8929 01073a5d 2019-08-22 stsp free(repo_path);
8930 01073a5d 2019-08-22 stsp if (error != NULL)
8931 01073a5d 2019-08-22 stsp goto done;
8933 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8934 896e9b6f 2019-08-26 stsp if (error)
8935 896e9b6f 2019-08-26 stsp goto done;
8937 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
8938 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
8939 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
8940 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
8941 01073a5d 2019-08-22 stsp if (error)
8942 01073a5d 2019-08-22 stsp goto done;
8944 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
8945 896e9b6f 2019-08-26 stsp if (force_path) {
8946 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
8948 896e9b6f 2019-08-26 stsp if (error)
8951 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
8952 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
8953 896e9b6f 2019-08-26 stsp if (error) {
8954 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8955 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
8957 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
8958 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
8959 896e9b6f 2019-08-26 stsp if (error)
8964 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
8965 01073a5d 2019-08-22 stsp if (error)
8968 01073a5d 2019-08-22 stsp switch (obj_type) {
8969 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
8970 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
8972 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
8973 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
8975 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
8976 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
8978 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
8979 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
8982 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
8985 01073a5d 2019-08-22 stsp if (error)
8987 01073a5d 2019-08-22 stsp free(label);
8988 01073a5d 2019-08-22 stsp label = NULL;
8990 01073a5d 2019-08-22 stsp id = NULL;
8993 01073a5d 2019-08-22 stsp free(label);
8995 896e9b6f 2019-08-26 stsp free(commit_id);
8996 01073a5d 2019-08-22 stsp if (worktree)
8997 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
8998 01073a5d 2019-08-22 stsp if (repo) {
8999 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9000 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9001 01073a5d 2019-08-22 stsp if (error == NULL)
9002 01073a5d 2019-08-22 stsp error = repo_error;
9004 0ebf8283 2019-07-24 stsp return error;
