2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 93658fb9 2020-03-18 stsp * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
7 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
8 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
10 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 12463d8b 2019-12-13 stsp #include <fcntl.h>
28 12ce7a6c 2019-08-12 stsp #include <limits.h>
29 5c860e29 2018-03-12 stsp #include <locale.h>
30 818c7501 2019-07-11 stsp #include <ctype.h>
31 99437157 2018-11-11 stsp #include <signal.h>
32 5c860e29 2018-03-12 stsp #include <stdio.h>
33 5c860e29 2018-03-12 stsp #include <stdlib.h>
34 5c860e29 2018-03-12 stsp #include <string.h>
35 5c860e29 2018-03-12 stsp #include <unistd.h>
36 c09a553d 2018-03-12 stsp #include <libgen.h>
37 c0768b0f 2018-06-10 stsp #include <time.h>
38 33ad4cbe 2019-05-12 jcs #include <paths.h>
39 6841bf13 2019-11-29 kn #include <regex.h>
40 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 d2cdc636 2020-03-18 stsp #include <util.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 f42b1b34 2018-03-12 stsp #include "got_error.h"
45 f42b1b34 2018-03-12 stsp #include "got_object.h"
46 5261c201 2018-04-01 stsp #include "got_reference.h"
47 f42b1b34 2018-03-12 stsp #include "got_repository.h"
48 1dd54920 2019-05-11 stsp #include "got_path.h"
49 e6209546 2019-08-22 stsp #include "got_cancel.h"
50 c09a553d 2018-03-12 stsp #include "got_worktree.h"
51 79109fed 2018-03-27 stsp #include "got_diff.h"
52 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
53 6f23baec 2020-03-18 stsp #include "got_fetch.h"
54 404c43c4 2018-06-21 stsp #include "got_blame.h"
55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
58 5c860e29 2018-03-12 stsp #ifndef nitems
59 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
62 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
66 99437157 2018-11-11 stsp catch_sigint(int signo)
68 99437157 2018-11-11 stsp sigint_received = 1;
72 99437157 2018-11-11 stsp catch_sigpipe(int signo)
74 99437157 2018-11-11 stsp sigpipe_received = 1;
78 8cfb4057 2019-07-09 stsp struct got_cmd {
79 5c860e29 2018-03-12 stsp const char *cmd_name;
80 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
81 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
82 97b3a7be 2019-07-09 stsp const char *cmd_alias;
85 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
86 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
87 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
88 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
89 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
90 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
91 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
92 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
93 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
94 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
95 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
96 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
97 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
98 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
99 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
100 d00136be 2019-03-26 stsp __dead static void usage_add(void);
101 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
102 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
103 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
104 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
105 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
106 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
107 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
108 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
109 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
110 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
111 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
113 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
114 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
115 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
116 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
117 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
118 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
119 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
120 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
121 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
122 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
123 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
124 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
125 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
126 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
127 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
128 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
129 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
130 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
131 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
132 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
133 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
134 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
135 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
136 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
137 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
138 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
140 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
141 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
142 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
143 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
144 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
145 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
146 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
147 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
148 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
149 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
150 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
151 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
152 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
153 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
154 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
155 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
156 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
157 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
158 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
159 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
160 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
161 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
162 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
163 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
164 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
165 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
166 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
169 ce5b7c56 2019-07-09 stsp static void
170 ce5b7c56 2019-07-09 stsp list_commands(void)
174 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
175 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
176 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
177 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
179 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
183 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
185 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
186 5c860e29 2018-03-12 stsp unsigned int i;
188 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
189 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
190 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
191 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
194 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
196 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
197 5c860e29 2018-03-12 stsp switch (ch) {
205 ce5b7c56 2019-07-09 stsp usage(hflag);
206 5c860e29 2018-03-12 stsp /* NOTREACHED */
210 5c860e29 2018-03-12 stsp argc -= optind;
211 5c860e29 2018-03-12 stsp argv += optind;
212 1e70621d 2018-03-27 stsp optind = 0;
214 53ccebc2 2019-07-30 stsp if (Vflag) {
215 53ccebc2 2019-07-30 stsp got_version_print_str();
219 5c860e29 2018-03-12 stsp if (argc <= 0)
220 ce5b7c56 2019-07-09 stsp usage(hflag);
222 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
223 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
225 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
226 d7d4f210 2018-03-12 stsp const struct got_error *error;
228 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
230 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
231 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
235 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
237 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
238 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
239 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
240 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
241 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
242 70015d7a 2019-11-08 stsp !(sigint_received &&
243 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
244 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
251 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
252 ce5b7c56 2019-07-09 stsp list_commands();
256 4ed7e80c 2018-05-20 stsp __dead static void
257 ce5b7c56 2019-07-09 stsp usage(int hflag)
259 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
260 53ccebc2 2019-07-30 stsp getprogname());
262 ce5b7c56 2019-07-09 stsp list_commands();
266 0266afb7 2019-01-04 stsp static const struct got_error *
267 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
269 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
270 e2ba3d07 2019-05-13 stsp const char *editor;
272 8920fa04 2019-08-18 stsp *abspath = NULL;
274 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
275 e2ba3d07 2019-05-13 stsp if (editor == NULL)
276 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
278 0ee7065d 2019-05-13 stsp if (editor) {
279 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
281 0ee7065d 2019-05-13 stsp return err;
284 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
285 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
286 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
287 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
290 e2ba3d07 2019-05-13 stsp return NULL;
293 e2ba3d07 2019-05-13 stsp static const struct got_error *
294 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
295 c530dc23 2019-07-23 stsp const char *worktree_path)
297 163ce85a 2019-05-13 stsp const struct got_error *err;
299 37c06ea4 2019-07-15 stsp #ifdef PROFILE
300 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
301 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
303 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
304 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
306 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
307 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
309 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
310 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
312 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
313 163ce85a 2019-05-13 stsp if (err != NULL)
314 163ce85a 2019-05-13 stsp return err;
316 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
317 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
319 0266afb7 2019-01-04 stsp return NULL;
322 2c7829a4 2019-06-17 stsp __dead static void
323 2c7829a4 2019-06-17 stsp usage_init(void)
325 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
329 2c7829a4 2019-06-17 stsp static const struct got_error *
330 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
332 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
333 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
336 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
337 2c7829a4 2019-06-17 stsp switch (ch) {
339 2c7829a4 2019-06-17 stsp usage_init();
340 2c7829a4 2019-06-17 stsp /* NOTREACHED */
344 2c7829a4 2019-06-17 stsp argc -= optind;
345 2c7829a4 2019-06-17 stsp argv += optind;
347 2c7829a4 2019-06-17 stsp #ifndef PROFILE
348 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
349 2c7829a4 2019-06-17 stsp err(1, "pledge");
351 2c7829a4 2019-06-17 stsp if (argc != 1)
352 bc20e173 2019-06-17 stsp usage_init();
354 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
355 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
356 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
358 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
360 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
361 2c7829a4 2019-06-17 stsp if (error &&
362 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
365 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
369 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
371 3ce1b845 2019-07-15 stsp free(repo_path);
372 3ce1b845 2019-07-15 stsp return error;
375 3ce1b845 2019-07-15 stsp __dead static void
376 3ce1b845 2019-07-15 stsp usage_import(void)
378 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
379 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
384 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
387 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
388 3ce1b845 2019-07-15 stsp int st = -1;
390 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
391 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
392 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
394 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
396 3ce1b845 2019-07-15 stsp goto doneediting;
398 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
399 3ce1b845 2019-07-15 stsp _exit(127);
402 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
403 3ce1b845 2019-07-15 stsp if (errno != EINTR)
406 3ce1b845 2019-07-15 stsp doneediting:
407 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
408 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
409 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
411 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
412 3ce1b845 2019-07-15 stsp errno = EINTR;
416 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
419 3ce1b845 2019-07-15 stsp static const struct got_error *
420 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
421 3ce1b845 2019-07-15 stsp const char *initial_content)
423 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
424 3ce1b845 2019-07-15 stsp char buf[1024];
425 3ce1b845 2019-07-15 stsp struct stat st, st2;
427 3ce1b845 2019-07-15 stsp int content_changed = 0;
428 3ce1b845 2019-07-15 stsp size_t len;
430 3ce1b845 2019-07-15 stsp *logmsg = NULL;
432 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
433 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
435 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
438 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
439 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
441 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
442 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
443 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
445 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
446 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
447 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
448 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
451 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
452 3ce1b845 2019-07-15 stsp if (fp == NULL) {
453 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
456 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
457 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
458 3ce1b845 2019-07-15 stsp content_changed = 1;
459 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
460 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
461 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
463 3ce1b845 2019-07-15 stsp fclose(fp);
465 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
466 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
470 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
471 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
475 3ce1b845 2019-07-15 stsp free(*logmsg);
476 3ce1b845 2019-07-15 stsp *logmsg = NULL;
478 3ce1b845 2019-07-15 stsp return err;
481 3ce1b845 2019-07-15 stsp static const struct got_error *
482 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
483 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
485 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
486 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
489 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
490 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
491 3ce1b845 2019-07-15 stsp branch_name) == -1)
492 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
494 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
495 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
499 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
502 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
504 3ce1b845 2019-07-15 stsp free(initial_content);
505 3ce1b845 2019-07-15 stsp return err;
508 3ce1b845 2019-07-15 stsp static const struct got_error *
509 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
511 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
512 3ce1b845 2019-07-15 stsp return NULL;
515 3ce1b845 2019-07-15 stsp static const struct got_error *
516 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
518 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
519 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
521 84792843 2019-08-09 stsp *author = NULL;
523 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
524 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
525 c9956ddf 2019-09-08 stsp if (name && email) {
526 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
527 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
528 aba9c984 2019-09-08 stsp return NULL;
531 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
532 84792843 2019-08-09 stsp if (got_author == NULL) {
533 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
534 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
535 c9956ddf 2019-09-08 stsp if (name && email) {
536 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
537 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
538 c9956ddf 2019-09-08 stsp return NULL;
540 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
541 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
544 aba9c984 2019-09-08 stsp *author = strdup(got_author);
545 aba9c984 2019-09-08 stsp if (*author == NULL)
546 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
549 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
550 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
552 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
553 84792843 2019-08-09 stsp got_author++;
554 aba9c984 2019-09-08 stsp if (*got_author != '<') {
555 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
559 84792843 2019-08-09 stsp got_author++;
560 aba9c984 2019-09-08 stsp if (*got_author != '@') {
561 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
564 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
565 84792843 2019-08-09 stsp got_author++;
566 84792843 2019-08-09 stsp if (*got_author != '>')
567 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
570 aba9c984 2019-09-08 stsp free(*author);
571 aba9c984 2019-09-08 stsp *author = NULL;
573 aba9c984 2019-09-08 stsp return err;
576 c9956ddf 2019-09-08 stsp static const struct got_error *
577 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
579 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
581 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
582 c9956ddf 2019-09-08 stsp if (homedir) {
583 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
584 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
587 c9956ddf 2019-09-08 stsp return NULL;
590 84792843 2019-08-09 stsp static const struct got_error *
591 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
593 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
594 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
595 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
596 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
597 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
598 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
599 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
600 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
602 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
603 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
604 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
606 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
608 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
609 3ce1b845 2019-07-15 stsp switch (ch) {
611 3ce1b845 2019-07-15 stsp branch_name = optarg;
614 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
615 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
616 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
621 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
622 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
623 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
629 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
631 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
637 b2b65d18 2019-08-22 stsp usage_import();
638 3ce1b845 2019-07-15 stsp /* NOTREACHED */
642 3ce1b845 2019-07-15 stsp argc -= optind;
643 3ce1b845 2019-07-15 stsp argv += optind;
645 3ce1b845 2019-07-15 stsp #ifndef PROFILE
646 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
648 3ce1b845 2019-07-15 stsp NULL) == -1)
649 3ce1b845 2019-07-15 stsp err(1, "pledge");
651 3ce1b845 2019-07-15 stsp if (argc != 1)
652 3ce1b845 2019-07-15 stsp usage_import();
654 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
655 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
656 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
657 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
659 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
660 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
663 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
667 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
669 aba9c984 2019-09-08 stsp return error;
672 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
673 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
674 e560b7e0 2019-11-28 stsp * an unintended typo.
676 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
677 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
679 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
680 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
684 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
685 3ce1b845 2019-07-15 stsp if (error) {
686 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
689 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
690 3ce1b845 2019-07-15 stsp "import target branch already exists");
694 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
695 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
696 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
699 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
702 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
703 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
705 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
706 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
709 8e158b01 2019-09-22 stsp free(logmsg);
710 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
711 ef293bdd 2019-10-21 stsp path_dir, refname);
712 ef293bdd 2019-10-21 stsp if (error) {
713 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
714 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
715 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
720 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
721 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
722 ef293bdd 2019-10-21 stsp if (logmsg_path)
723 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
727 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
728 ef293bdd 2019-10-21 stsp if (error) {
729 ef293bdd 2019-10-21 stsp if (logmsg_path)
730 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
734 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
735 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
736 ef293bdd 2019-10-21 stsp if (error) {
737 ef293bdd 2019-10-21 stsp if (logmsg_path)
738 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
742 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
743 ef293bdd 2019-10-21 stsp if (error) {
744 ef293bdd 2019-10-21 stsp if (logmsg_path)
745 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
749 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
750 ef293bdd 2019-10-21 stsp if (error) {
751 ef293bdd 2019-10-21 stsp if (logmsg_path)
752 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
756 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
757 ef293bdd 2019-10-21 stsp if (error) {
758 ef293bdd 2019-10-21 stsp if (logmsg_path)
759 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
763 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
764 3ce1b845 2019-07-15 stsp if (error) {
765 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
766 ef293bdd 2019-10-21 stsp if (logmsg_path)
767 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
771 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
772 3ce1b845 2019-07-15 stsp branch_ref);
773 ef293bdd 2019-10-21 stsp if (error) {
774 ef293bdd 2019-10-21 stsp if (logmsg_path)
775 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
779 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
780 ef293bdd 2019-10-21 stsp if (error) {
781 ef293bdd 2019-10-21 stsp if (logmsg_path)
782 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
787 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
788 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
790 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
791 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
792 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
793 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
794 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
795 8e158b01 2019-09-22 stsp free(logmsg);
796 ef293bdd 2019-10-21 stsp free(logmsg_path);
797 2c7829a4 2019-06-17 stsp free(repo_path);
798 3ce1b845 2019-07-15 stsp free(editor);
799 3ce1b845 2019-07-15 stsp free(refname);
800 3ce1b845 2019-07-15 stsp free(new_commit_id);
801 3ce1b845 2019-07-15 stsp free(id_str);
802 aba9c984 2019-09-08 stsp free(author);
803 c9956ddf 2019-09-08 stsp free(gitconfig_path);
804 3ce1b845 2019-07-15 stsp if (branch_ref)
805 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
806 3ce1b845 2019-07-15 stsp if (head_ref)
807 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
808 2c7829a4 2019-06-17 stsp return error;
811 93658fb9 2020-03-18 stsp __dead static void
812 93658fb9 2020-03-18 stsp usage_clone(void)
814 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
815 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
819 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
820 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
821 892ac3b6 2020-03-18 stsp int last_p_indexed;
822 892ac3b6 2020-03-18 stsp int last_p_resolved;
823 68999b92 2020-03-18 stsp int verbosity;
826 93658fb9 2020-03-18 stsp static const struct got_error *
827 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
828 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
830 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
831 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
832 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
833 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
835 68999b92 2020-03-18 stsp if (a->verbosity < 0)
836 68999b92 2020-03-18 stsp return NULL;
838 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
839 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
840 892ac3b6 2020-03-18 stsp fflush(stdout);
841 12d1281e 2020-03-19 stsp return NULL;
844 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
845 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
846 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
847 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
848 892ac3b6 2020-03-18 stsp print_size = 1;
849 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
850 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
851 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
853 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
854 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
855 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
856 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
857 892ac3b6 2020-03-18 stsp print_indexed = 1;
858 892ac3b6 2020-03-18 stsp print_size = 1;
861 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
862 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
863 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
864 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
865 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
866 892ac3b6 2020-03-18 stsp print_resolved = 1;
867 892ac3b6 2020-03-18 stsp print_indexed = 1;
868 892ac3b6 2020-03-18 stsp print_size = 1;
873 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
874 892ac3b6 2020-03-18 stsp printf("\r");
875 892ac3b6 2020-03-18 stsp if (print_size)
876 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
877 d715f13e 2020-03-19 stsp if (print_indexed)
878 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
879 d715f13e 2020-03-19 stsp if (print_resolved)
880 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
881 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
882 892ac3b6 2020-03-18 stsp fflush(stdout);
884 531c3985 2020-03-18 stsp return NULL;
887 531c3985 2020-03-18 stsp static const struct got_error *
888 f298ae0f 2020-03-25 stsp create_symref(const char *refname, struct got_reference *target_ref,
889 f298ae0f 2020-03-25 stsp int verbosity, struct got_repository *repo)
891 4ba14133 2020-03-20 stsp const struct got_error *err;
892 4ba14133 2020-03-20 stsp struct got_reference *head_symref;
894 f298ae0f 2020-03-25 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
896 4ba14133 2020-03-20 stsp return err;
898 4ba14133 2020-03-20 stsp err = got_ref_write(head_symref, repo);
899 4ba14133 2020-03-20 stsp got_ref_close(head_symref);
900 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
901 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
902 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
904 4ba14133 2020-03-20 stsp return err;
907 4ba14133 2020-03-20 stsp static const struct got_error *
908 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
909 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
911 41b0de12 2020-03-21 stsp const struct got_error *err;
912 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
914 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
915 41b0de12 2020-03-21 stsp const char *refname = pe->path;
916 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
918 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
921 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
922 41b0de12 2020-03-21 stsp const char *refname = pe->path;
923 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
924 41b0de12 2020-03-21 stsp char *id_str;
926 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
928 41b0de12 2020-03-21 stsp return err;
929 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
930 41b0de12 2020-03-21 stsp free(id_str);
933 41b0de12 2020-03-21 stsp return NULL;
936 6338a6a1 2020-03-21 stsp static const struct got_error *
937 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
938 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
940 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
941 6338a6a1 2020-03-21 stsp struct got_reference *ref;
942 6338a6a1 2020-03-21 stsp char *id_str;
944 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
946 6338a6a1 2020-03-21 stsp return err;
948 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
952 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
953 6338a6a1 2020-03-21 stsp got_ref_close(ref);
955 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
956 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
958 6338a6a1 2020-03-21 stsp free(id_str);
959 6338a6a1 2020-03-21 stsp return err;
963 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
965 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
967 0e4002ca 2020-03-21 stsp refname += 5;
970 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
971 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
973 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
975 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
978 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
979 0e4002ca 2020-03-21 stsp wanted_ref += 5;
981 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
982 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
985 0e4002ca 2020-03-21 stsp /* Allow exact match. */
986 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
990 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
992 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
994 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
995 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1002 41b0de12 2020-03-21 stsp static const struct got_error *
1003 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1004 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1006 0e4002ca 2020-03-21 stsp const struct got_error *err;
1007 0e4002ca 2020-03-21 stsp char *remote_refname;
1009 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1010 0e4002ca 2020-03-21 stsp refname += 5;
1012 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1013 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1014 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1016 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1017 0e4002ca 2020-03-21 stsp free(remote_refname);
1018 0e4002ca 2020-03-21 stsp return err;
1021 0e4002ca 2020-03-21 stsp static const struct got_error *
1022 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1024 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1025 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1026 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1027 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1028 bb64b798 2020-03-18 stsp const char *repo_path;
1029 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1030 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1031 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1032 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1033 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1034 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1035 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1036 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1037 b46f3e71 2020-03-18 stsp char *gitconfig_path = NULL;
1038 b46f3e71 2020-03-18 stsp char *gitconfig = NULL;
1039 b46f3e71 2020-03-18 stsp FILE *gitconfig_file = NULL;
1040 b46f3e71 2020-03-18 stsp ssize_t n;
1041 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1042 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1043 659e7fbd 2020-03-20 stsp struct got_reference *head_symref = NULL;
1045 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1046 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1047 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1048 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1050 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1051 93658fb9 2020-03-18 stsp switch (ch) {
1053 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1056 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1057 4ba14133 2020-03-20 stsp optarg, NULL);
1058 4ba14133 2020-03-20 stsp if (error)
1059 4ba14133 2020-03-20 stsp return error;
1062 41b0de12 2020-03-21 stsp list_refs_only = 1;
1065 469dd726 2020-03-20 stsp mirror_references = 1;
1068 68999b92 2020-03-18 stsp if (verbosity < 0)
1069 68999b92 2020-03-18 stsp verbosity = 0;
1070 68999b92 2020-03-18 stsp else if (verbosity < 3)
1071 68999b92 2020-03-18 stsp verbosity++;
1074 68999b92 2020-03-18 stsp verbosity = -1;
1077 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1078 0e4002ca 2020-03-21 stsp optarg, NULL);
1079 0e4002ca 2020-03-21 stsp if (error)
1080 0e4002ca 2020-03-21 stsp return error;
1083 93658fb9 2020-03-18 stsp usage_clone();
1087 93658fb9 2020-03-18 stsp argc -= optind;
1088 93658fb9 2020-03-18 stsp argv += optind;
1090 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1091 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1092 41b0de12 2020-03-21 stsp if (list_refs_only) {
1093 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1094 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1095 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1096 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1097 41b0de12 2020-03-21 stsp if (mirror_references)
1098 41b0de12 2020-03-21 stsp errx(1, "-l and -m options are mutually exclusive");
1099 41b0de12 2020-03-21 stsp if (verbosity == -1)
1100 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1101 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1102 0e4002ca 2020-03-21 stsp errx(1, "-l and -R options are mutually exclusive");
1105 93658fb9 2020-03-18 stsp uri = argv[0];
1107 9df6f38b 2020-03-18 stsp if (argc == 1)
1108 93658fb9 2020-03-18 stsp dirname = NULL;
1109 9df6f38b 2020-03-18 stsp else if (argc == 2)
1110 93658fb9 2020-03-18 stsp dirname = argv[1];
1112 93658fb9 2020-03-18 stsp usage_clone();
1114 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1115 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1116 39c64a6a 2020-03-18 stsp if (error)
1117 09f63084 2020-03-20 stsp goto done;
1119 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1120 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1121 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1122 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1123 09838ffc 2020-03-18 stsp goto done;
1126 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1127 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1128 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1129 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1130 39c64a6a 2020-03-18 stsp err(1, "pledge");
1132 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1133 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1134 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1135 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1136 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1137 39c64a6a 2020-03-18 stsp err(1, "pledge");
1139 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1140 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1141 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1142 39c64a6a 2020-03-18 stsp goto done;
1144 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1145 39c64a6a 2020-03-18 stsp goto done;
1147 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1148 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1149 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1150 bb64b798 2020-03-18 stsp goto done;
1152 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1154 bb64b798 2020-03-18 stsp repo_path = dirname;
1156 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1157 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1158 41b0de12 2020-03-21 stsp if (error)
1159 41b0de12 2020-03-21 stsp goto done;
1161 41b0de12 2020-03-21 stsp error = got_repo_init(repo_path);
1162 41b0de12 2020-03-21 stsp if (error)
1163 41b0de12 2020-03-21 stsp goto done;
1164 41b0de12 2020-03-21 stsp error = got_repo_open(&repo, repo_path, NULL);
1165 41b0de12 2020-03-21 stsp if (error)
1166 41b0de12 2020-03-21 stsp goto done;
1169 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1170 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1171 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1172 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1173 ee448f5f 2020-03-18 stsp goto done;
1176 41b0de12 2020-03-21 stsp error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1177 ee448f5f 2020-03-18 stsp if (error)
1178 ee448f5f 2020-03-18 stsp goto done;
1180 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1181 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1182 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1184 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1185 9c52365f 2020-03-21 stsp server_path, verbosity);
1186 39c64a6a 2020-03-18 stsp if (error)
1187 bb64b798 2020-03-18 stsp goto done;
1189 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1190 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1191 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1192 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1193 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1194 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1195 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1196 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1197 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1198 39c64a6a 2020-03-18 stsp if (error)
1199 d9b4d0c0 2020-03-18 stsp goto done;
1201 41b0de12 2020-03-21 stsp if (list_refs_only) {
1202 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1203 41b0de12 2020-03-21 stsp goto done;
1206 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1207 39c64a6a 2020-03-18 stsp if (error)
1208 d9b4d0c0 2020-03-18 stsp goto done;
1209 68999b92 2020-03-18 stsp if (verbosity >= 0)
1210 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1211 d9b4d0c0 2020-03-18 stsp free(id_str);
1213 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1214 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1215 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1216 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1217 7ebc0570 2020-03-18 stsp char *remote_refname;
1219 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1220 0e4002ca 2020-03-21 stsp !mirror_references) {
1221 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1222 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1223 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1224 0e4002ca 2020-03-21 stsp if (error)
1225 0e4002ca 2020-03-21 stsp goto done;
1229 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1230 39c64a6a 2020-03-18 stsp if (error)
1231 d9b4d0c0 2020-03-18 stsp goto done;
1233 469dd726 2020-03-20 stsp if (mirror_references)
1236 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1239 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1240 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1241 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1242 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1243 7ebc0570 2020-03-18 stsp goto done;
1245 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1246 f298ae0f 2020-03-25 stsp free(remote_refname);
1247 39c64a6a 2020-03-18 stsp if (error)
1248 d9b4d0c0 2020-03-18 stsp goto done;
1251 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1252 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1253 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1254 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1255 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1256 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1258 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1261 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1262 39c64a6a 2020-03-18 stsp if (error) {
1263 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1264 55330abe 2020-03-20 stsp error = NULL;
1267 d9b4d0c0 2020-03-18 stsp goto done;
1270 f298ae0f 2020-03-25 stsp error = create_symref(refname, target_ref, verbosity, repo);
1271 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1272 f298ae0f 2020-03-25 stsp if (error)
1273 f298ae0f 2020-03-25 stsp goto done;
1275 f298ae0f 2020-03-25 stsp if (mirror_references)
1278 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1281 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1282 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1283 f298ae0f 2020-03-25 stsp refname) == -1) {
1284 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1285 f298ae0f 2020-03-25 stsp goto done;
1287 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1288 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1289 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1290 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1291 f298ae0f 2020-03-25 stsp free(remote_refname);
1292 f298ae0f 2020-03-25 stsp goto done;
1294 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1295 f298ae0f 2020-03-25 stsp if (error) {
1296 f298ae0f 2020-03-25 stsp free(remote_refname);
1297 f298ae0f 2020-03-25 stsp free(remote_target);
1298 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1299 f298ae0f 2020-03-25 stsp error = NULL;
1302 f298ae0f 2020-03-25 stsp goto done;
1304 f298ae0f 2020-03-25 stsp error = create_symref(remote_refname, target_ref,
1305 f298ae0f 2020-03-25 stsp verbosity - 1, repo);
1306 f298ae0f 2020-03-25 stsp free(remote_refname);
1307 f298ae0f 2020-03-25 stsp free(remote_target);
1308 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1309 39c64a6a 2020-03-18 stsp if (error)
1310 d9b4d0c0 2020-03-18 stsp goto done;
1312 4ba14133 2020-03-20 stsp if (pe == NULL) {
1314 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1315 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1316 4ba14133 2020-03-20 stsp * which could be fetched instead.
1318 4ba14133 2020-03-20 stsp TAILQ_FOREACH(pe, &wanted_branches, entry) {
1319 4ba14133 2020-03-20 stsp const char *target = pe->path;
1320 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1322 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1323 4ba14133 2020-03-20 stsp if (error) {
1324 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1325 4ba14133 2020-03-20 stsp error = NULL;
1328 4ba14133 2020-03-20 stsp goto done;
1331 f298ae0f 2020-03-25 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1332 f298ae0f 2020-03-25 stsp verbosity, repo);
1333 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1334 4ba14133 2020-03-20 stsp if (error)
1335 4ba14133 2020-03-20 stsp goto done;
1340 659e7fbd 2020-03-20 stsp /* Create a config file git-fetch(1) can understand. */
1341 659e7fbd 2020-03-20 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1342 659e7fbd 2020-03-20 stsp if (gitconfig_path == NULL) {
1343 659e7fbd 2020-03-20 stsp error = got_error_from_errno("got_repo_get_path_gitconfig");
1344 659e7fbd 2020-03-20 stsp goto done;
1346 659e7fbd 2020-03-20 stsp gitconfig_file = fopen(gitconfig_path, "a");
1347 659e7fbd 2020-03-20 stsp if (gitconfig_file == NULL) {
1348 659e7fbd 2020-03-20 stsp error = got_error_from_errno2("fopen", gitconfig_path);
1349 659e7fbd 2020-03-20 stsp goto done;
1351 659e7fbd 2020-03-20 stsp if (mirror_references) {
1352 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1353 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1354 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1355 8ceee112 2020-03-20 stsp "\tfetch = +refs/*:refs/*\n"
1356 659e7fbd 2020-03-20 stsp "\tmirror = true\n",
1357 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1358 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1359 659e7fbd 2020-03-20 stsp goto done;
1361 659e7fbd 2020-03-20 stsp } else if (fetch_all_branches) {
1362 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1363 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1364 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1365 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1366 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1367 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1368 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1369 659e7fbd 2020-03-20 stsp goto done;
1372 659e7fbd 2020-03-20 stsp const char *branchname;
1375 659e7fbd 2020-03-20 stsp * If the server specified a default branch, use just that one.
1376 659e7fbd 2020-03-20 stsp * Otherwise fall back to fetching all branches on next fetch.
1378 659e7fbd 2020-03-20 stsp if (head_symref) {
1379 659e7fbd 2020-03-20 stsp branchname = got_ref_get_symref_target(head_symref);
1380 659e7fbd 2020-03-20 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1381 659e7fbd 2020-03-20 stsp branchname += 11;
1383 659e7fbd 2020-03-20 stsp branchname = "*"; /* fall back to all branches */
1384 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1385 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1386 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1387 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1388 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1389 659e7fbd 2020-03-20 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1390 659e7fbd 2020-03-20 stsp branchname) == -1) {
1391 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1392 659e7fbd 2020-03-20 stsp goto done;
1395 659e7fbd 2020-03-20 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1396 659e7fbd 2020-03-20 stsp if (n != strlen(gitconfig)) {
1397 659e7fbd 2020-03-20 stsp error = got_ferror(gitconfig_file, GOT_ERR_IO);
1398 659e7fbd 2020-03-20 stsp goto done;
1401 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1402 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1403 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1405 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1406 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1407 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1408 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1409 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1411 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1412 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1413 b46f3e71 2020-03-18 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1414 b46f3e71 2020-03-18 stsp error = got_error_from_errno("fclose");
1416 bb64b798 2020-03-18 stsp got_repo_close(repo);
1417 659e7fbd 2020-03-20 stsp if (head_symref)
1418 659e7fbd 2020-03-20 stsp got_ref_close(head_symref);
1419 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1420 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1421 d9b4d0c0 2020-03-18 stsp free(pe->data);
1423 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1424 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1425 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1426 d9b4d0c0 2020-03-18 stsp free(pe->data);
1428 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1429 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1430 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1431 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1432 09838ffc 2020-03-18 stsp free(proto);
1433 09838ffc 2020-03-18 stsp free(host);
1434 09838ffc 2020-03-18 stsp free(port);
1435 09838ffc 2020-03-18 stsp free(server_path);
1436 09838ffc 2020-03-18 stsp free(repo_name);
1437 bb64b798 2020-03-18 stsp free(default_destdir);
1438 b46f3e71 2020-03-18 stsp free(gitconfig_path);
1439 b46f3e71 2020-03-18 stsp free(git_url);
1440 39c64a6a 2020-03-18 stsp return error;
1443 7848a0e1 2020-03-19 stsp static const struct got_error *
1444 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1445 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1447 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1448 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1449 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1451 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1453 7848a0e1 2020-03-19 stsp goto done;
1455 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1456 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1457 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1459 88609724 2020-03-21 stsp goto done;
1460 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1461 88609724 2020-03-21 stsp goto done;
1462 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1463 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1464 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1466 db6d8ad8 2020-03-21 stsp goto done;
1469 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1470 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1471 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1472 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1473 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1475 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1477 7848a0e1 2020-03-19 stsp goto done;
1478 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1480 e8a967e0 2020-03-21 stsp goto done;
1482 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1484 7848a0e1 2020-03-19 stsp goto done;
1485 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1486 6338a6a1 2020-03-21 stsp goto done;
1488 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1490 6338a6a1 2020-03-21 stsp goto done;
1491 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1493 6338a6a1 2020-03-21 stsp goto done;
1496 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1497 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 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1909 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
1910 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1912 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1913 9c52365f 2020-03-21 stsp server_path, verbosity);
1914 7848a0e1 2020-03-19 stsp if (error)
1915 7848a0e1 2020-03-19 stsp goto done;
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 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2499 9627c110 2020-04-18 stsp int did_something;
2500 9627c110 2020-04-18 stsp int conflicts;
2501 9627c110 2020-04-18 stsp int obstructed;
2502 9627c110 2020-04-18 stsp int not_updated;
2506 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2508 9627c110 2020-04-18 stsp if (!upa->did_something)
2511 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2512 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2513 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2514 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2515 9627c110 2020-04-18 stsp upa->obstructed);
2516 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2517 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2518 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2521 507dc3bb 2018-12-29 stsp __dead static void
2522 507dc3bb 2018-12-29 stsp usage_update(void)
2524 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2525 507dc3bb 2018-12-29 stsp getprogname());
2529 1ee397ad 2019-07-12 stsp static const struct got_error *
2530 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2532 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2534 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2535 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2536 1ee397ad 2019-07-12 stsp return NULL;
2538 9627c110 2020-04-18 stsp upa->did_something = 1;
2540 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2541 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2542 1ee397ad 2019-07-12 stsp return NULL;
2544 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2545 9627c110 2020-04-18 stsp upa->conflicts++;
2546 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2547 9627c110 2020-04-18 stsp upa->obstructed++;
2548 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2549 9627c110 2020-04-18 stsp upa->not_updated++;
2551 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2553 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2554 1ee397ad 2019-07-12 stsp return NULL;
2557 be7061eb 2018-12-30 stsp static const struct got_error *
2558 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2559 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2560 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2562 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2563 a1fb16d8 2019-05-24 stsp char *base_id_str;
2564 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2566 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2567 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2568 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2569 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2570 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2571 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2572 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2575 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2576 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2577 a1fb16d8 2019-05-24 stsp if (err) {
2578 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2579 a1fb16d8 2019-05-24 stsp return err;
2580 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2582 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2583 a1fb16d8 2019-05-24 stsp return NULL;
2585 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2586 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2587 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2589 a1fb16d8 2019-05-24 stsp return err;
2590 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2591 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2592 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2593 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2594 0ebf8283 2019-07-24 stsp return NULL;
2597 0ebf8283 2019-07-24 stsp static const struct got_error *
2598 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2600 0ebf8283 2019-07-24 stsp const struct got_error *err;
2601 0ebf8283 2019-07-24 stsp int in_progress;
2603 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2605 0ebf8283 2019-07-24 stsp return err;
2606 0ebf8283 2019-07-24 stsp if (in_progress)
2607 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2609 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2611 0ebf8283 2019-07-24 stsp return err;
2612 0ebf8283 2019-07-24 stsp if (in_progress)
2613 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2615 a1fb16d8 2019-05-24 stsp return NULL;
2618 a5edda0a 2019-07-27 stsp static const struct got_error *
2619 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2620 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2622 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2623 a5edda0a 2019-07-27 stsp char *path;
2626 a5edda0a 2019-07-27 stsp if (argc == 0) {
2627 a5edda0a 2019-07-27 stsp path = strdup("");
2628 a5edda0a 2019-07-27 stsp if (path == NULL)
2629 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2630 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2633 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2634 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2637 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2638 a5edda0a 2019-07-27 stsp if (err) {
2639 a5edda0a 2019-07-27 stsp free(path);
2644 a5edda0a 2019-07-27 stsp return err;
2647 a1fb16d8 2019-05-24 stsp static const struct got_error *
2648 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2649 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2651 fa51e947 2020-03-27 stsp const struct got_error *err;
2652 fa51e947 2020-03-27 stsp struct got_repository *repo;
2653 fa51e947 2020-03-27 stsp static char msg[512];
2655 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2657 fa51e947 2020-03-27 stsp return orig_err;
2659 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2660 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2661 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2662 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2663 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2664 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2665 fa51e947 2020-03-27 stsp got_repo_close(repo);
2666 fa51e947 2020-03-27 stsp return err;
2669 fa51e947 2020-03-27 stsp static const struct got_error *
2670 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2672 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2673 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2674 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2675 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2676 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2677 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2678 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2679 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2680 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2681 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2683 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
2685 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2687 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2688 507dc3bb 2018-12-29 stsp switch (ch) {
2690 024e9686 2019-05-14 stsp branch_name = optarg;
2693 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2694 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2695 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2698 2deda0b9 2019-03-07 stsp usage_update();
2699 507dc3bb 2018-12-29 stsp /* NOTREACHED */
2703 507dc3bb 2018-12-29 stsp argc -= optind;
2704 507dc3bb 2018-12-29 stsp argv += optind;
2706 507dc3bb 2018-12-29 stsp #ifndef PROFILE
2707 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2708 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2709 507dc3bb 2018-12-29 stsp err(1, "pledge");
2711 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
2712 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
2713 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2714 c4cdcb68 2019-04-03 stsp goto done;
2716 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
2717 fa51e947 2020-03-27 stsp if (error) {
2718 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
2719 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
2720 fa51e947 2020-03-27 stsp worktree_path);
2721 7d5807f4 2019-07-11 stsp goto done;
2724 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
2725 f2ea84fa 2019-07-27 stsp if (error)
2726 f2ea84fa 2019-07-27 stsp goto done;
2728 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2730 507dc3bb 2018-12-29 stsp if (error != NULL)
2731 507dc3bb 2018-12-29 stsp goto done;
2733 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2734 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2735 087fb88c 2019-08-04 stsp if (error)
2736 087fb88c 2019-08-04 stsp goto done;
2738 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2739 0266afb7 2019-01-04 stsp if (error)
2740 0266afb7 2019-01-04 stsp goto done;
2742 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2743 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
2744 024e9686 2019-05-14 stsp if (error != NULL)
2745 024e9686 2019-05-14 stsp goto done;
2746 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
2747 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2748 9c4b8182 2019-01-02 stsp if (error != NULL)
2749 9c4b8182 2019-01-02 stsp goto done;
2750 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
2751 507dc3bb 2018-12-29 stsp if (error != NULL)
2752 507dc3bb 2018-12-29 stsp goto done;
2754 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2755 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2756 04f57cb3 2019-07-25 stsp free(commit_id_str);
2757 bb787f09 2019-07-25 stsp commit_id_str = NULL;
2758 30837e32 2019-07-25 stsp if (error)
2759 a297e751 2019-07-11 stsp goto done;
2760 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
2761 a297e751 2019-07-11 stsp if (error)
2762 507dc3bb 2018-12-29 stsp goto done;
2765 a1fb16d8 2019-05-24 stsp if (branch_name) {
2766 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
2767 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
2768 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
2770 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
2771 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
2772 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
2773 024e9686 2019-05-14 stsp goto done;
2775 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
2776 024e9686 2019-05-14 stsp if (error)
2777 024e9686 2019-05-14 stsp goto done;
2778 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
2780 a367ff0f 2019-05-14 stsp free(head_commit_id);
2781 024e9686 2019-05-14 stsp if (error != NULL)
2782 024e9686 2019-05-14 stsp goto done;
2783 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2784 a367ff0f 2019-05-14 stsp if (error)
2785 a367ff0f 2019-05-14 stsp goto done;
2786 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
2787 024e9686 2019-05-14 stsp if (error)
2788 024e9686 2019-05-14 stsp goto done;
2790 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2791 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2792 a367ff0f 2019-05-14 stsp if (error != NULL) {
2793 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
2794 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
2795 024e9686 2019-05-14 stsp goto done;
2797 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2798 a367ff0f 2019-05-14 stsp if (error)
2799 a367ff0f 2019-05-14 stsp goto done;
2802 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2803 507dc3bb 2018-12-29 stsp commit_id) != 0) {
2804 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2805 507dc3bb 2018-12-29 stsp commit_id);
2806 507dc3bb 2018-12-29 stsp if (error)
2807 507dc3bb 2018-12-29 stsp goto done;
2810 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
2811 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2812 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
2813 507dc3bb 2018-12-29 stsp if (error != NULL)
2814 507dc3bb 2018-12-29 stsp goto done;
2816 9627c110 2020-04-18 stsp if (upa.did_something)
2817 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
2819 784955db 2019-01-12 stsp printf("Already up-to-date\n");
2820 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
2822 c09a553d 2018-03-12 stsp free(worktree_path);
2823 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2824 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
2825 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2826 507dc3bb 2018-12-29 stsp free(commit_id);
2827 9c4b8182 2019-01-02 stsp free(commit_id_str);
2828 c09a553d 2018-03-12 stsp return error;
2831 f42b1b34 2018-03-12 stsp static const struct got_error *
2832 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2833 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2834 63035f9f 2019-10-06 stsp struct got_repository *repo)
2836 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
2837 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2839 44392932 2019-08-25 stsp if (blob_id1) {
2840 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2842 44392932 2019-08-25 stsp goto done;
2845 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2847 44392932 2019-08-25 stsp goto done;
2849 44392932 2019-08-25 stsp while (path[0] == '/')
2851 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
2852 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
2854 44392932 2019-08-25 stsp if (blob1)
2855 44392932 2019-08-25 stsp got_object_blob_close(blob1);
2856 44392932 2019-08-25 stsp got_object_blob_close(blob2);
2857 44392932 2019-08-25 stsp return err;
2860 44392932 2019-08-25 stsp static const struct got_error *
2861 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2862 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2863 63035f9f 2019-10-06 stsp struct got_repository *repo)
2865 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2866 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2867 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
2869 44392932 2019-08-25 stsp if (tree_id1) {
2870 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2872 44392932 2019-08-25 stsp goto done;
2875 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2877 0f2b3dca 2018-12-22 stsp goto done;
2879 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
2880 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2881 aaa13589 2019-06-01 stsp arg.outfile = stdout;
2882 44392932 2019-08-25 stsp while (path[0] == '/')
2884 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
2885 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
2887 79109fed 2018-03-27 stsp if (tree1)
2888 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
2889 366e0a5f 2019-10-10 stsp if (tree2)
2890 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
2891 44392932 2019-08-25 stsp return err;
2894 44392932 2019-08-25 stsp static const struct got_error *
2895 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
2896 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
2898 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2899 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
2900 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
2901 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2902 44392932 2019-08-25 stsp struct got_object_qid *qid;
2904 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2905 44392932 2019-08-25 stsp if (qid != NULL) {
2906 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
2909 44392932 2019-08-25 stsp return err;
2912 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
2913 44392932 2019-08-25 stsp int obj_type;
2914 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
2916 44392932 2019-08-25 stsp goto done;
2917 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2918 44392932 2019-08-25 stsp if (err) {
2919 44392932 2019-08-25 stsp free(obj_id2);
2920 44392932 2019-08-25 stsp goto done;
2922 44392932 2019-08-25 stsp if (pcommit) {
2923 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
2924 44392932 2019-08-25 stsp qid->id, path);
2925 44392932 2019-08-25 stsp if (err) {
2926 44392932 2019-08-25 stsp free(obj_id2);
2927 44392932 2019-08-25 stsp goto done;
2929 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2930 44392932 2019-08-25 stsp if (err) {
2931 44392932 2019-08-25 stsp free(obj_id2);
2932 44392932 2019-08-25 stsp goto done;
2935 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
2936 44392932 2019-08-25 stsp if (err) {
2937 44392932 2019-08-25 stsp free(obj_id2);
2938 44392932 2019-08-25 stsp goto done;
2940 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2941 44392932 2019-08-25 stsp switch (obj_type) {
2942 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
2943 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2946 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
2947 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
2951 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2954 44392932 2019-08-25 stsp free(obj_id1);
2955 44392932 2019-08-25 stsp free(obj_id2);
2957 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
2958 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2960 44392932 2019-08-25 stsp goto done;
2961 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
2962 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2964 44392932 2019-08-25 stsp goto done;
2965 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2966 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
2969 0f2b3dca 2018-12-22 stsp free(id_str1);
2970 0f2b3dca 2018-12-22 stsp free(id_str2);
2971 44392932 2019-08-25 stsp if (pcommit)
2972 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
2973 79109fed 2018-03-27 stsp return err;
2976 4bb494d5 2018-06-16 stsp static char *
2977 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
2979 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2980 09867e48 2019-08-13 stsp char *p, *s;
2982 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2983 09867e48 2019-08-13 stsp if (tm == NULL)
2984 09867e48 2019-08-13 stsp return NULL;
2985 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2986 09867e48 2019-08-13 stsp if (s == NULL)
2987 09867e48 2019-08-13 stsp return NULL;
2988 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
2990 6c281f94 2018-06-11 stsp *p = '\0';
2994 6841bf13 2019-11-29 kn static const struct got_error *
2995 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
2996 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
2998 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
2999 6841bf13 2019-11-29 kn regmatch_t regmatch;
3000 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3002 6841bf13 2019-11-29 kn *have_match = 0;
3004 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3008 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3012 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3013 6841bf13 2019-11-29 kn *have_match = 1;
3015 6841bf13 2019-11-29 kn free(id_str);
3016 6841bf13 2019-11-29 kn free(logmsg);
3020 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3022 79109fed 2018-03-27 stsp static const struct got_error *
3023 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3024 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
3025 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3027 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3028 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3029 6c281f94 2018-06-11 stsp char datebuf[26];
3030 45d799e2 2018-12-23 stsp time_t committer_time;
3031 45d799e2 2018-12-23 stsp const char *author, *committer;
3032 199a4027 2019-02-02 stsp char *refs_str = NULL;
3033 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3035 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3037 199a4027 2019-02-02 stsp const char *name;
3038 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3041 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3042 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3044 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3045 199a4027 2019-02-02 stsp name += 5;
3046 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3048 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3049 e34f9ed6 2019-02-02 stsp name += 6;
3050 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3051 141c2bff 2019-02-04 stsp name += 8;
3052 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3053 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3056 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3057 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
3058 5d844a1e 2019-08-13 stsp if (err) {
3059 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
3060 5d844a1e 2019-08-13 stsp return err;
3061 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3062 5d844a1e 2019-08-13 stsp err = NULL;
3063 5d844a1e 2019-08-13 stsp tag = NULL;
3066 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3067 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
3069 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3070 a436ad14 2019-08-13 stsp if (cmp != 0)
3072 199a4027 2019-02-02 stsp s = refs_str;
3073 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3074 199a4027 2019-02-02 stsp name) == -1) {
3075 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3077 34ca4898 2019-08-13 stsp return err;
3081 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3083 8bf5b3c9 2018-03-17 stsp return err;
3085 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3086 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3087 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3088 832c249c 2018-06-10 stsp free(id_str);
3089 d3d493d7 2019-02-21 stsp id_str = NULL;
3090 d3d493d7 2019-02-21 stsp free(refs_str);
3091 d3d493d7 2019-02-21 stsp refs_str = NULL;
3092 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3093 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3094 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3095 09867e48 2019-08-13 stsp if (datestr)
3096 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3097 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3098 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3099 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3100 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3101 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3102 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3103 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3104 3fe1abad 2018-06-10 stsp int n = 1;
3105 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3106 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3107 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3109 a0603db2 2018-06-10 stsp return err;
3110 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3111 a0603db2 2018-06-10 stsp free(id_str);
3115 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3117 5943eee2 2019-08-13 stsp return err;
3119 621015ac 2018-07-23 stsp logmsg = logmsg0;
3121 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3123 832c249c 2018-06-10 stsp printf(" %s\n", line);
3124 832c249c 2018-06-10 stsp } while (line);
3125 621015ac 2018-07-23 stsp free(logmsg0);
3127 971751ac 2018-03-27 stsp if (show_patch) {
3128 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3129 971751ac 2018-03-27 stsp if (err == 0)
3130 971751ac 2018-03-27 stsp printf("\n");
3133 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3134 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3135 07862c20 2018-09-15 stsp return err;
3138 f42b1b34 2018-03-12 stsp static const struct got_error *
3139 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3140 d1fe46f9 2020-04-18 stsp struct got_repository *repo, const char *path, int show_patch,
3141 d1fe46f9 2020-04-18 stsp const char *search_pattern, int diff_context, int limit, int log_branches,
3142 dbec59df 2020-04-18 stsp int reverse_display_order, struct got_reflist_head *refs)
3144 f42b1b34 2018-03-12 stsp const struct got_error *err;
3145 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3146 6841bf13 2019-11-29 kn regex_t regex;
3147 6841bf13 2019-11-29 kn int have_match;
3148 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3149 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3150 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3152 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3154 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3155 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3156 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3158 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3160 f42b1b34 2018-03-12 stsp return err;
3161 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3162 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3164 fcc85cad 2018-07-22 stsp goto done;
3166 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3168 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3171 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3172 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3173 372ccdbb 2018-06-10 stsp if (err) {
3174 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3175 9ba79e04 2018-06-11 stsp err = NULL;
3178 b43fbaa0 2018-06-11 stsp if (id == NULL)
3181 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3185 6841bf13 2019-11-29 kn if (search_pattern) {
3186 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3188 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3191 6841bf13 2019-11-29 kn if (have_match == 0) {
3192 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3197 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3198 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3201 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3202 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3204 dbec59df 2020-04-18 stsp err = print_commit(commit, id, repo, path, show_patch,
3205 dbec59df 2020-04-18 stsp diff_context, refs);
3206 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3210 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3211 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3214 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3215 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3216 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3219 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3220 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3221 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3227 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3228 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3229 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3230 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3232 6841bf13 2019-11-29 kn if (search_pattern)
3233 6841bf13 2019-11-29 kn regfree(®ex);
3234 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3235 f42b1b34 2018-03-12 stsp return err;
3238 4ed7e80c 2018-05-20 stsp __dead static void
3239 6f3d1eb0 2018-03-12 stsp usage_log(void)
3241 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3242 dbec59df 2020-04-18 stsp "[-p] [-x commit] [-s search-pattern] [-r repository-path] [-R] "
3243 d1fe46f9 2020-04-18 stsp "[path]\n", getprogname());
3247 b1ebc001 2019-08-13 stsp static int
3248 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3250 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3251 b1ebc001 2019-08-13 stsp long long n;
3252 b1ebc001 2019-08-13 stsp const char *errstr;
3254 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3255 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3257 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3258 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3263 d1fe46f9 2020-04-18 stsp static const struct got_error *
3264 d1fe46f9 2020-04-18 stsp resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3265 d1fe46f9 2020-04-18 stsp struct got_repository *repo)
3267 d1fe46f9 2020-04-18 stsp const struct got_error *err = NULL;
3268 d1fe46f9 2020-04-18 stsp struct got_reference *ref;
3270 d1fe46f9 2020-04-18 stsp *id = NULL;
3272 d1fe46f9 2020-04-18 stsp err = got_ref_open(&ref, repo, commit_arg, 0);
3273 d1fe46f9 2020-04-18 stsp if (err == NULL) {
3274 d1fe46f9 2020-04-18 stsp int obj_type;
3275 d1fe46f9 2020-04-18 stsp err = got_ref_resolve(id, repo, ref);
3276 d1fe46f9 2020-04-18 stsp got_ref_close(ref);
3278 d1fe46f9 2020-04-18 stsp return err;
3279 d1fe46f9 2020-04-18 stsp err = got_object_get_type(&obj_type, repo, *id);
3281 d1fe46f9 2020-04-18 stsp return err;
3282 d1fe46f9 2020-04-18 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
3283 d1fe46f9 2020-04-18 stsp struct got_tag_object *tag;
3284 d1fe46f9 2020-04-18 stsp err = got_object_open_as_tag(&tag, repo, *id);
3286 d1fe46f9 2020-04-18 stsp return err;
3287 d1fe46f9 2020-04-18 stsp if (got_object_tag_get_object_type(tag) !=
3288 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT) {
3289 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3290 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3292 d1fe46f9 2020-04-18 stsp free(*id);
3293 d1fe46f9 2020-04-18 stsp *id = got_object_id_dup(
3294 d1fe46f9 2020-04-18 stsp got_object_tag_get_object_id(tag));
3295 d1fe46f9 2020-04-18 stsp if (*id == NULL)
3296 d1fe46f9 2020-04-18 stsp err = got_error_from_errno(
3297 d1fe46f9 2020-04-18 stsp "got_object_id_dup");
3298 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3300 d1fe46f9 2020-04-18 stsp return err;
3301 d1fe46f9 2020-04-18 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3302 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3304 d1fe46f9 2020-04-18 stsp err = got_repo_match_object_id_prefix(id, commit_arg,
3305 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT, repo);
3308 d1fe46f9 2020-04-18 stsp return err;
3311 4ed7e80c 2018-05-20 stsp static const struct got_error *
3312 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3314 f42b1b34 2018-03-12 stsp const struct got_error *error;
3315 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3316 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3317 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3318 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3319 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3320 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3321 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3322 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
3323 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3324 64a96a6d 2018-04-01 stsp const char *errstr;
3325 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3327 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3329 6715a751 2018-03-16 stsp #ifndef PROFILE
3330 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3333 f42b1b34 2018-03-12 stsp err(1, "pledge");
3336 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3338 dbec59df 2020-04-18 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:Rs:x:")) != -1) {
3339 79109fed 2018-03-27 stsp switch (ch) {
3341 79109fed 2018-03-27 stsp show_patch = 1;
3344 d142fc45 2018-04-01 stsp start_commit = optarg;
3347 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3349 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3350 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3353 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3354 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3355 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3358 48c8c60d 2020-01-27 stsp log_branches = 1;
3361 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3362 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3363 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3365 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3368 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3371 6841bf13 2019-11-29 kn search_pattern = optarg;
3374 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3377 2deda0b9 2019-03-07 stsp usage_log();
3378 79109fed 2018-03-27 stsp /* NOTREACHED */
3382 79109fed 2018-03-27 stsp argc -= optind;
3383 79109fed 2018-03-27 stsp argv += optind;
3385 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3386 dc1edbfa 2019-11-29 kn diff_context = 3;
3387 dc1edbfa 2019-11-29 kn else if (!show_patch)
3388 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
3390 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3391 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3392 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3393 04ca23f4 2018-07-16 stsp goto done;
3396 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3397 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3398 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3399 50f2fada 2020-04-24 stsp goto done;
3400 50f2fada 2020-04-24 stsp error = NULL;
3403 e7301579 2019-03-18 stsp if (argc == 0) {
3404 cbd1af7a 2019-03-18 stsp path = strdup("");
3405 e7301579 2019-03-18 stsp if (path == NULL) {
3406 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3407 cbd1af7a 2019-03-18 stsp goto done;
3409 e7301579 2019-03-18 stsp } else if (argc == 1) {
3410 e7301579 2019-03-18 stsp if (worktree) {
3411 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3413 e7301579 2019-03-18 stsp if (error)
3414 e7301579 2019-03-18 stsp goto done;
3416 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3417 e7301579 2019-03-18 stsp if (path == NULL) {
3418 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3419 e7301579 2019-03-18 stsp goto done;
3423 cbd1af7a 2019-03-18 stsp usage_log();
3425 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3426 5486daa2 2019-05-11 stsp repo_path = worktree ?
3427 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3429 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3430 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3431 cffc0aa4 2019-02-05 stsp goto done;
3434 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3435 d7d4f210 2018-03-12 stsp if (error != NULL)
3436 04ca23f4 2018-07-16 stsp goto done;
3438 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3439 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3440 c02c541e 2019-03-29 stsp if (error)
3441 c02c541e 2019-03-29 stsp goto done;
3443 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3444 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3445 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3446 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3447 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3448 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3449 3235492e 2018-04-01 stsp if (error != NULL)
3450 d1fe46f9 2020-04-18 stsp goto done;
3451 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3452 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3453 3235492e 2018-04-01 stsp if (error != NULL)
3454 d1fe46f9 2020-04-18 stsp goto done;
3455 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3456 d1fe46f9 2020-04-18 stsp start_id);
3457 d1fe46f9 2020-04-18 stsp if (error != NULL)
3458 d1fe46f9 2020-04-18 stsp goto done;
3459 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3461 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&start_id, start_commit, repo);
3462 d1fe46f9 2020-04-18 stsp if (error != NULL)
3463 d1fe46f9 2020-04-18 stsp goto done;
3465 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3466 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&end_id, end_commit, repo);
3467 d1fe46f9 2020-04-18 stsp if (error != NULL)
3468 d1fe46f9 2020-04-18 stsp goto done;
3471 deeabeae 2019-08-27 stsp if (worktree) {
3472 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3474 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
3475 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3476 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
3477 deeabeae 2019-08-27 stsp goto done;
3479 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3482 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3483 04ca23f4 2018-07-16 stsp if (error != NULL)
3484 04ca23f4 2018-07-16 stsp goto done;
3485 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3486 04ca23f4 2018-07-16 stsp free(path);
3487 04ca23f4 2018-07-16 stsp path = in_repo_path;
3490 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3491 199a4027 2019-02-02 stsp if (error)
3492 199a4027 2019-02-02 stsp goto done;
3494 d1fe46f9 2020-04-18 stsp error = print_commits(start_id, end_id, repo, path, show_patch,
3495 dbec59df 2020-04-18 stsp search_pattern, diff_context, limit, log_branches,
3496 dbec59df 2020-04-18 stsp reverse_display_order, &refs);
3498 04ca23f4 2018-07-16 stsp free(path);
3499 04ca23f4 2018-07-16 stsp free(repo_path);
3500 04ca23f4 2018-07-16 stsp free(cwd);
3501 cffc0aa4 2019-02-05 stsp if (worktree)
3502 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3503 ad242220 2018-09-08 stsp if (repo) {
3504 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3505 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3506 ad242220 2018-09-08 stsp if (error == NULL)
3507 ad242220 2018-09-08 stsp error = repo_error;
3509 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3510 8bf5b3c9 2018-03-17 stsp return error;
3513 4ed7e80c 2018-05-20 stsp __dead static void
3514 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3516 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3517 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
3521 b72f483a 2019-02-05 stsp struct print_diff_arg {
3522 b72f483a 2019-02-05 stsp struct got_repository *repo;
3523 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3524 b72f483a 2019-02-05 stsp int diff_context;
3525 3fc0c068 2019-02-10 stsp const char *id_str;
3526 3fc0c068 2019-02-10 stsp int header_shown;
3527 98eaaa12 2019-08-03 stsp int diff_staged;
3528 63035f9f 2019-10-06 stsp int ignore_whitespace;
3531 4ed7e80c 2018-05-20 stsp static const struct got_error *
3532 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3533 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3534 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3535 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3537 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3538 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3539 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3540 12463d8b 2019-12-13 stsp int fd = -1;
3541 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3542 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3543 b72f483a 2019-02-05 stsp struct stat sb;
3545 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3546 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3547 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3548 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3549 98eaaa12 2019-08-03 stsp return NULL;
3551 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3552 98eaaa12 2019-08-03 stsp return NULL;
3553 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3554 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3555 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3556 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3557 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3558 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3559 98eaaa12 2019-08-03 stsp return NULL;
3562 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3563 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3564 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3565 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3566 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3569 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3570 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
3571 98eaaa12 2019-08-03 stsp switch (staged_status) {
3572 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
3573 98eaaa12 2019-08-03 stsp label1 = path;
3574 98eaaa12 2019-08-03 stsp label2 = path;
3576 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
3577 98eaaa12 2019-08-03 stsp label2 = path;
3579 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
3580 98eaaa12 2019-08-03 stsp label1 = path;
3583 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
3585 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3586 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
3587 63035f9f 2019-10-06 stsp a->repo, stdout);
3590 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3591 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
3592 4ce46740 2019-08-08 stsp char *id_str;
3593 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3596 4ce46740 2019-08-08 stsp goto done;
3597 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
3599 4ce46740 2019-08-08 stsp goto done;
3600 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3601 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
3602 4ce46740 2019-08-08 stsp free(id_str);
3603 4ce46740 2019-08-08 stsp goto done;
3605 4ce46740 2019-08-08 stsp free(id_str);
3606 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
3607 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3609 4ce46740 2019-08-08 stsp goto done;
3612 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
3613 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
3614 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
3615 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3616 2ec1f75b 2019-03-26 stsp goto done;
3619 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3620 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3621 12463d8b 2019-12-13 stsp if (fd == -1) {
3622 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
3623 12463d8b 2019-12-13 stsp goto done;
3626 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3627 12463d8b 2019-12-13 stsp if (fd == -1) {
3628 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
3629 12463d8b 2019-12-13 stsp goto done;
3632 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
3633 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
3634 2ec1f75b 2019-03-26 stsp goto done;
3636 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
3637 12463d8b 2019-12-13 stsp if (f2 == NULL) {
3638 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
3639 2ec1f75b 2019-03-26 stsp goto done;
3643 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
3645 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3646 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
3648 b72f483a 2019-02-05 stsp if (blob1)
3649 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
3650 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3651 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3652 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3653 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
3654 b72f483a 2019-02-05 stsp free(abspath);
3655 927df6b7 2019-02-10 stsp return err;
3658 927df6b7 2019-02-10 stsp static const struct got_error *
3659 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
3661 b00d56cd 2018-04-01 stsp const struct got_error *error;
3662 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
3663 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
3664 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
3665 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3666 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
3667 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
3668 15a94983 2018-12-23 stsp int type1, type2;
3669 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3670 c0cc5c62 2018-10-18 stsp const char *errstr;
3671 927df6b7 2019-02-10 stsp char *path = NULL;
3673 b00d56cd 2018-04-01 stsp #ifndef PROFILE
3674 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3675 25eccc22 2019-01-04 stsp NULL) == -1)
3676 b00d56cd 2018-04-01 stsp err(1, "pledge");
3679 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3680 b00d56cd 2018-04-01 stsp switch (ch) {
3682 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3684 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3685 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3688 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
3689 b72f483a 2019-02-05 stsp if (repo_path == NULL)
3690 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3692 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3695 98eaaa12 2019-08-03 stsp diff_staged = 1;
3698 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
3701 2deda0b9 2019-03-07 stsp usage_diff();
3702 b00d56cd 2018-04-01 stsp /* NOTREACHED */
3706 b00d56cd 2018-04-01 stsp argc -= optind;
3707 b00d56cd 2018-04-01 stsp argv += optind;
3709 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
3710 b72f483a 2019-02-05 stsp if (cwd == NULL) {
3711 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3712 b72f483a 2019-02-05 stsp goto done;
3714 927df6b7 2019-02-10 stsp if (argc <= 1) {
3715 b72f483a 2019-02-05 stsp if (repo_path)
3717 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
3718 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3719 fa51e947 2020-03-27 stsp if (error) {
3720 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3721 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
3723 1f03b8da 2020-03-20 stsp goto done;
3725 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
3726 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
3727 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3728 927df6b7 2019-02-10 stsp goto done;
3730 927df6b7 2019-02-10 stsp if (argc == 1) {
3731 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3733 927df6b7 2019-02-10 stsp if (error)
3734 927df6b7 2019-02-10 stsp goto done;
3736 927df6b7 2019-02-10 stsp path = strdup("");
3737 927df6b7 2019-02-10 stsp if (path == NULL) {
3738 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3739 927df6b7 2019-02-10 stsp goto done;
3742 b72f483a 2019-02-05 stsp } else if (argc == 2) {
3743 98eaaa12 2019-08-03 stsp if (diff_staged)
3744 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
3745 98eaaa12 2019-08-03 stsp "objects in repository");
3746 15a94983 2018-12-23 stsp id_str1 = argv[0];
3747 15a94983 2018-12-23 stsp id_str2 = argv[1];
3748 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3749 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3750 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3751 30db809c 2019-06-05 stsp goto done;
3752 1f03b8da 2020-03-20 stsp if (worktree) {
3753 1f03b8da 2020-03-20 stsp repo_path = strdup(
3754 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
3755 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3756 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3757 1f03b8da 2020-03-20 stsp goto done;
3760 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
3761 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3762 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3763 1f03b8da 2020-03-20 stsp goto done;
3768 b00d56cd 2018-04-01 stsp usage_diff();
3770 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3771 76089277 2018-04-01 stsp free(repo_path);
3772 b00d56cd 2018-04-01 stsp if (error != NULL)
3773 b00d56cd 2018-04-01 stsp goto done;
3775 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3776 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3777 c02c541e 2019-03-29 stsp if (error)
3778 c02c541e 2019-03-29 stsp goto done;
3780 30db809c 2019-06-05 stsp if (argc <= 1) {
3781 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
3782 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3783 b72f483a 2019-02-05 stsp char *id_str;
3785 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3787 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
3788 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
3789 b72f483a 2019-02-05 stsp if (error)
3790 b72f483a 2019-02-05 stsp goto done;
3791 b72f483a 2019-02-05 stsp arg.repo = repo;
3792 b72f483a 2019-02-05 stsp arg.worktree = worktree;
3793 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
3794 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
3795 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
3796 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
3797 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3799 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
3800 72ea6654 2019-07-27 stsp if (error)
3801 72ea6654 2019-07-27 stsp goto done;
3803 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
3804 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
3805 b72f483a 2019-02-05 stsp free(id_str);
3806 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3807 b72f483a 2019-02-05 stsp goto done;
3810 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3811 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3812 0adb7196 2019-08-11 stsp if (error)
3813 0adb7196 2019-08-11 stsp goto done;
3815 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3816 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3817 0adb7196 2019-08-11 stsp if (error)
3818 0adb7196 2019-08-11 stsp goto done;
3820 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
3821 15a94983 2018-12-23 stsp if (error)
3822 15a94983 2018-12-23 stsp goto done;
3824 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
3825 15a94983 2018-12-23 stsp if (error)
3826 15a94983 2018-12-23 stsp goto done;
3828 15a94983 2018-12-23 stsp if (type1 != type2) {
3829 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3830 b00d56cd 2018-04-01 stsp goto done;
3833 15a94983 2018-12-23 stsp switch (type1) {
3834 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
3835 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3836 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3838 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
3839 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
3840 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3842 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
3843 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
3844 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
3845 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
3848 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3851 5e70831e 2019-05-28 stsp free(label1);
3852 5e70831e 2019-05-28 stsp free(label2);
3853 15a94983 2018-12-23 stsp free(id1);
3854 15a94983 2018-12-23 stsp free(id2);
3855 927df6b7 2019-02-10 stsp free(path);
3856 b72f483a 2019-02-05 stsp if (worktree)
3857 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
3858 ad242220 2018-09-08 stsp if (repo) {
3859 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3860 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3861 ad242220 2018-09-08 stsp if (error == NULL)
3862 ad242220 2018-09-08 stsp error = repo_error;
3864 b00d56cd 2018-04-01 stsp return error;
3867 404c43c4 2018-06-21 stsp __dead static void
3868 404c43c4 2018-06-21 stsp usage_blame(void)
3870 9270e621 2019-02-05 stsp fprintf(stderr,
3871 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
3872 404c43c4 2018-06-21 stsp getprogname());
3876 28315671 2019-08-14 stsp struct blame_line {
3877 28315671 2019-08-14 stsp int annotated;
3878 28315671 2019-08-14 stsp char *id_str;
3879 82f6abb8 2019-08-14 stsp char *committer;
3880 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
3883 28315671 2019-08-14 stsp struct blame_cb_args {
3884 28315671 2019-08-14 stsp struct blame_line *lines;
3885 28315671 2019-08-14 stsp int nlines;
3886 7ef28ff8 2019-08-14 stsp int nlines_prec;
3887 28315671 2019-08-14 stsp int lineno_cur;
3888 28315671 2019-08-14 stsp off_t *line_offsets;
3890 82f6abb8 2019-08-14 stsp struct got_repository *repo;
3893 404c43c4 2018-06-21 stsp static const struct got_error *
3894 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3896 28315671 2019-08-14 stsp const struct got_error *err = NULL;
3897 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
3898 28315671 2019-08-14 stsp struct blame_line *bline;
3899 82f6abb8 2019-08-14 stsp char *line = NULL;
3900 28315671 2019-08-14 stsp size_t linesize = 0;
3901 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
3902 28315671 2019-08-14 stsp off_t offset;
3903 bcb49d15 2019-08-14 stsp struct tm tm;
3904 bcb49d15 2019-08-14 stsp time_t committer_time;
3906 28315671 2019-08-14 stsp if (nlines != a->nlines ||
3907 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3908 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
3910 28315671 2019-08-14 stsp if (sigint_received)
3911 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
3913 2839f8b9 2019-08-18 stsp if (lineno == -1)
3914 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
3916 28315671 2019-08-14 stsp /* Annotate this line. */
3917 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
3918 28315671 2019-08-14 stsp if (bline->annotated)
3919 28315671 2019-08-14 stsp return NULL;
3920 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
3922 28315671 2019-08-14 stsp return err;
3924 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
3926 82f6abb8 2019-08-14 stsp goto done;
3928 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
3929 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
3930 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
3931 bcb49d15 2019-08-14 stsp goto done;
3934 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
3935 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
3936 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
3937 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
3938 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
3939 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
3940 82f6abb8 2019-08-14 stsp goto done;
3942 28315671 2019-08-14 stsp bline->annotated = 1;
3944 28315671 2019-08-14 stsp /* Print lines annotated so far. */
3945 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3946 28315671 2019-08-14 stsp if (!bline->annotated)
3947 82f6abb8 2019-08-14 stsp goto done;
3949 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
3950 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
3951 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
3952 82f6abb8 2019-08-14 stsp goto done;
3955 28315671 2019-08-14 stsp while (bline->annotated) {
3956 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
3957 82f6abb8 2019-08-14 stsp size_t len;
3959 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
3960 28315671 2019-08-14 stsp if (ferror(a->f))
3961 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
3965 82f6abb8 2019-08-14 stsp committer = bline->committer;
3966 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
3967 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
3968 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
3969 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
3971 82f6abb8 2019-08-14 stsp *at = '\0';
3972 82f6abb8 2019-08-14 stsp len = strlen(committer);
3973 82f6abb8 2019-08-14 stsp if (len >= 9)
3974 82f6abb8 2019-08-14 stsp committer[8] = '\0';
3976 28315671 2019-08-14 stsp nl = strchr(line, '\n');
3978 28315671 2019-08-14 stsp *nl = '\0';
3979 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
3980 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
3982 28315671 2019-08-14 stsp a->lineno_cur++;
3983 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3986 82f6abb8 2019-08-14 stsp if (commit)
3987 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
3988 28315671 2019-08-14 stsp free(line);
3989 28315671 2019-08-14 stsp return err;
3992 28315671 2019-08-14 stsp static const struct got_error *
3993 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
3995 404c43c4 2018-06-21 stsp const struct got_error *error;
3996 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
3997 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
3998 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3999 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4000 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4001 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4002 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4003 28315671 2019-08-14 stsp struct blame_cb_args bca;
4004 28315671 2019-08-14 stsp int ch, obj_type, i;
4005 b02560ec 2019-08-19 stsp size_t filesize;
4007 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4009 404c43c4 2018-06-21 stsp #ifndef PROFILE
4010 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4011 36e2fb66 2019-01-04 stsp NULL) == -1)
4012 404c43c4 2018-06-21 stsp err(1, "pledge");
4015 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4016 404c43c4 2018-06-21 stsp switch (ch) {
4018 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4021 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4022 66bea077 2018-08-02 stsp if (repo_path == NULL)
4023 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4025 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4028 2deda0b9 2019-03-07 stsp usage_blame();
4029 404c43c4 2018-06-21 stsp /* NOTREACHED */
4033 404c43c4 2018-06-21 stsp argc -= optind;
4034 404c43c4 2018-06-21 stsp argv += optind;
4036 a39318fd 2018-08-02 stsp if (argc == 1)
4037 404c43c4 2018-06-21 stsp path = argv[0];
4039 404c43c4 2018-06-21 stsp usage_blame();
4041 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4042 66bea077 2018-08-02 stsp if (cwd == NULL) {
4043 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4044 66bea077 2018-08-02 stsp goto done;
4046 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4047 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4048 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4049 66bea077 2018-08-02 stsp goto done;
4051 0c06baac 2019-02-05 stsp error = NULL;
4052 0c06baac 2019-02-05 stsp if (worktree) {
4053 0c06baac 2019-02-05 stsp repo_path =
4054 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4055 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4056 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4057 1f03b8da 2020-03-20 stsp if (error)
4058 1f03b8da 2020-03-20 stsp goto done;
4061 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4062 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4063 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4064 0c06baac 2019-02-05 stsp goto done;
4069 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4070 c02c541e 2019-03-29 stsp if (error != NULL)
4071 36e2fb66 2019-01-04 stsp goto done;
4073 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4074 c02c541e 2019-03-29 stsp if (error)
4075 404c43c4 2018-06-21 stsp goto done;
4077 0c06baac 2019-02-05 stsp if (worktree) {
4078 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4079 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4080 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4081 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
4082 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4083 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
4084 6efaaa2d 2019-02-05 stsp path) == -1) {
4085 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4086 0c06baac 2019-02-05 stsp goto done;
4088 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4091 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4093 0c06baac 2019-02-05 stsp if (error)
4094 66bea077 2018-08-02 stsp goto done;
4096 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4097 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4098 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4099 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4100 404c43c4 2018-06-21 stsp if (error != NULL)
4101 66bea077 2018-08-02 stsp goto done;
4102 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4103 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4104 404c43c4 2018-06-21 stsp if (error != NULL)
4105 66bea077 2018-08-02 stsp goto done;
4107 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4108 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4109 30837e32 2019-07-25 stsp if (error)
4110 66bea077 2018-08-02 stsp goto done;
4113 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4114 28315671 2019-08-14 stsp if (error)
4115 28315671 2019-08-14 stsp goto done;
4117 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4118 28315671 2019-08-14 stsp if (error)
4119 28315671 2019-08-14 stsp goto done;
4121 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4122 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4123 28315671 2019-08-14 stsp goto done;
4126 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4127 28315671 2019-08-14 stsp if (error)
4128 28315671 2019-08-14 stsp goto done;
4129 28315671 2019-08-14 stsp bca.f = got_opentemp();
4130 28315671 2019-08-14 stsp if (bca.f == NULL) {
4131 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4132 28315671 2019-08-14 stsp goto done;
4134 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4135 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4136 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4137 28315671 2019-08-14 stsp goto done;
4139 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4140 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4141 b02560ec 2019-08-19 stsp bca.nlines--;
4143 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4144 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4145 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4146 28315671 2019-08-14 stsp goto done;
4148 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4149 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4150 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4151 7ef28ff8 2019-08-14 stsp while (i > 0) {
4153 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4155 82f6abb8 2019-08-14 stsp bca.repo = repo;
4157 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4158 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
4160 66bea077 2018-08-02 stsp free(in_repo_path);
4161 66bea077 2018-08-02 stsp free(repo_path);
4162 66bea077 2018-08-02 stsp free(cwd);
4163 404c43c4 2018-06-21 stsp free(commit_id);
4164 28315671 2019-08-14 stsp free(obj_id);
4166 28315671 2019-08-14 stsp got_object_blob_close(blob);
4167 0c06baac 2019-02-05 stsp if (worktree)
4168 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4169 ad242220 2018-09-08 stsp if (repo) {
4170 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4171 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4172 ad242220 2018-09-08 stsp if (error == NULL)
4173 ad242220 2018-09-08 stsp error = repo_error;
4175 3affba96 2019-09-22 stsp if (bca.lines) {
4176 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4177 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4178 3affba96 2019-09-22 stsp free(bline->id_str);
4179 3affba96 2019-09-22 stsp free(bline->committer);
4181 3affba96 2019-09-22 stsp free(bca.lines);
4183 28315671 2019-08-14 stsp free(bca.line_offsets);
4184 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4185 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4186 404c43c4 2018-06-21 stsp return error;
4189 5de5890b 2018-10-18 stsp __dead static void
4190 5de5890b 2018-10-18 stsp usage_tree(void)
4192 c1669e2e 2019-01-09 stsp fprintf(stderr,
4193 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
4194 5de5890b 2018-10-18 stsp getprogname());
4198 c1669e2e 2019-01-09 stsp static void
4199 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4200 c1669e2e 2019-01-09 stsp const char *root_path)
4202 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4203 848d6979 2019-08-12 stsp const char *modestr = "";
4204 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4206 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4207 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4210 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4211 63c5ca5d 2019-08-24 stsp modestr = "$";
4212 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
4213 848d6979 2019-08-12 stsp modestr = "@";
4214 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4215 848d6979 2019-08-12 stsp modestr = "/";
4216 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4217 848d6979 2019-08-12 stsp modestr = "*";
4219 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
4220 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
4223 5de5890b 2018-10-18 stsp static const struct got_error *
4224 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4225 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4226 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4228 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4229 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4230 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4231 56e0773d 2019-11-28 stsp int nentries, i;
4233 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4235 5de5890b 2018-10-18 stsp goto done;
4237 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4239 5de5890b 2018-10-18 stsp goto done;
4240 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4241 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4242 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4243 5de5890b 2018-10-18 stsp char *id = NULL;
4245 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4248 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4249 5de5890b 2018-10-18 stsp if (show_ids) {
4250 5de5890b 2018-10-18 stsp char *id_str;
4251 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4252 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4254 5de5890b 2018-10-18 stsp goto done;
4255 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4256 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4257 5de5890b 2018-10-18 stsp free(id_str);
4258 5de5890b 2018-10-18 stsp goto done;
4260 5de5890b 2018-10-18 stsp free(id_str);
4262 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
4265 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4266 c1669e2e 2019-01-09 stsp char *child_path;
4267 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4268 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4269 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4270 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4271 c1669e2e 2019-01-09 stsp goto done;
4273 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4274 c1669e2e 2019-01-09 stsp root_path, repo);
4275 c1669e2e 2019-01-09 stsp free(child_path);
4277 c1669e2e 2019-01-09 stsp goto done;
4282 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4283 5de5890b 2018-10-18 stsp free(tree_id);
4284 5de5890b 2018-10-18 stsp return err;
4287 5de5890b 2018-10-18 stsp static const struct got_error *
4288 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4290 5de5890b 2018-10-18 stsp const struct got_error *error;
4291 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4292 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4293 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4294 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4295 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4296 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4297 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4300 5de5890b 2018-10-18 stsp #ifndef PROFILE
4301 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4302 0f8d269b 2019-01-04 stsp NULL) == -1)
4303 5de5890b 2018-10-18 stsp err(1, "pledge");
4306 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4307 5de5890b 2018-10-18 stsp switch (ch) {
4309 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4312 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4313 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4314 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4316 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4319 5de5890b 2018-10-18 stsp show_ids = 1;
4322 c1669e2e 2019-01-09 stsp recurse = 1;
4325 2deda0b9 2019-03-07 stsp usage_tree();
4326 5de5890b 2018-10-18 stsp /* NOTREACHED */
4330 5de5890b 2018-10-18 stsp argc -= optind;
4331 5de5890b 2018-10-18 stsp argv += optind;
4333 5de5890b 2018-10-18 stsp if (argc == 1)
4334 5de5890b 2018-10-18 stsp path = argv[0];
4335 5de5890b 2018-10-18 stsp else if (argc > 1)
4336 5de5890b 2018-10-18 stsp usage_tree();
4338 7a2c19d6 2019-02-05 stsp path = NULL;
4340 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4341 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4342 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4343 9bf7a39b 2019-02-05 stsp goto done;
4345 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4346 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4347 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4348 7a2c19d6 2019-02-05 stsp goto done;
4350 7a2c19d6 2019-02-05 stsp error = NULL;
4351 7a2c19d6 2019-02-05 stsp if (worktree) {
4352 7a2c19d6 2019-02-05 stsp repo_path =
4353 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4354 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4355 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4356 7a2c19d6 2019-02-05 stsp if (error)
4357 7a2c19d6 2019-02-05 stsp goto done;
4359 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4360 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4361 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4362 7a2c19d6 2019-02-05 stsp goto done;
4367 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4368 5de5890b 2018-10-18 stsp if (error != NULL)
4369 c02c541e 2019-03-29 stsp goto done;
4371 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4372 c02c541e 2019-03-29 stsp if (error)
4373 5de5890b 2018-10-18 stsp goto done;
4375 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4376 9bf7a39b 2019-02-05 stsp if (worktree) {
4377 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4378 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4379 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4380 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4381 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4382 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4383 9bf7a39b 2019-02-05 stsp goto done;
4385 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4387 9bf7a39b 2019-02-05 stsp if (error)
4388 9bf7a39b 2019-02-05 stsp goto done;
4390 9bf7a39b 2019-02-05 stsp path = "/";
4392 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4393 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4394 9bf7a39b 2019-02-05 stsp if (error != NULL)
4395 9bf7a39b 2019-02-05 stsp goto done;
4398 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4399 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4400 4e0a20a4 2020-03-23 tracey if (worktree)
4401 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4403 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4404 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4405 5de5890b 2018-10-18 stsp if (error != NULL)
4406 5de5890b 2018-10-18 stsp goto done;
4407 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4408 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4409 5de5890b 2018-10-18 stsp if (error != NULL)
4410 5de5890b 2018-10-18 stsp goto done;
4412 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4413 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4414 30837e32 2019-07-25 stsp if (error)
4415 5de5890b 2018-10-18 stsp goto done;
4418 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4419 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4421 5de5890b 2018-10-18 stsp free(in_repo_path);
4422 5de5890b 2018-10-18 stsp free(repo_path);
4423 5de5890b 2018-10-18 stsp free(cwd);
4424 5de5890b 2018-10-18 stsp free(commit_id);
4425 7a2c19d6 2019-02-05 stsp if (worktree)
4426 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4427 5de5890b 2018-10-18 stsp if (repo) {
4428 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4429 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4430 5de5890b 2018-10-18 stsp if (error == NULL)
4431 5de5890b 2018-10-18 stsp error = repo_error;
4433 5de5890b 2018-10-18 stsp return error;
4436 6bad629b 2019-02-04 stsp __dead static void
4437 6bad629b 2019-02-04 stsp usage_status(void)
4439 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4443 b72f483a 2019-02-05 stsp static const struct got_error *
4444 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4445 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4446 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4447 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4449 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4450 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4451 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4452 b72f483a 2019-02-05 stsp return NULL;
4455 6bad629b 2019-02-04 stsp static const struct got_error *
4456 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4458 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4459 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4460 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4461 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
4462 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4463 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4466 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4468 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4469 6bad629b 2019-02-04 stsp switch (ch) {
4471 2deda0b9 2019-03-07 stsp usage_status();
4472 6bad629b 2019-02-04 stsp /* NOTREACHED */
4476 6bad629b 2019-02-04 stsp argc -= optind;
4477 6bad629b 2019-02-04 stsp argv += optind;
4479 6bad629b 2019-02-04 stsp #ifndef PROFILE
4480 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4481 6bad629b 2019-02-04 stsp NULL) == -1)
4482 6bad629b 2019-02-04 stsp err(1, "pledge");
4484 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4485 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4486 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4487 927df6b7 2019-02-10 stsp goto done;
4490 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
4491 fa51e947 2020-03-27 stsp if (error) {
4492 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4493 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
4494 a5edda0a 2019-07-27 stsp goto done;
4497 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4499 6bad629b 2019-02-04 stsp if (error != NULL)
4500 6bad629b 2019-02-04 stsp goto done;
4502 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4503 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4504 087fb88c 2019-08-04 stsp if (error)
4505 087fb88c 2019-08-04 stsp goto done;
4507 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4508 6bad629b 2019-02-04 stsp if (error)
4509 6bad629b 2019-02-04 stsp goto done;
4511 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4512 6bad629b 2019-02-04 stsp check_cancelled, NULL);
4514 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
4515 a5edda0a 2019-07-27 stsp free((char *)pe->path);
4516 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4517 927df6b7 2019-02-10 stsp free(cwd);
4518 d0eebce4 2019-03-11 stsp return error;
4521 d0eebce4 2019-03-11 stsp __dead static void
4522 d0eebce4 2019-03-11 stsp usage_ref(void)
4524 d0eebce4 2019-03-11 stsp fprintf(stderr,
4525 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4526 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
4527 d0eebce4 2019-03-11 stsp getprogname());
4531 d0eebce4 2019-03-11 stsp static const struct got_error *
4532 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
4534 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
4535 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
4536 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
4538 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
4539 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4541 d0eebce4 2019-03-11 stsp return err;
4543 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4544 d0eebce4 2019-03-11 stsp char *refstr;
4545 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
4546 d0eebce4 2019-03-11 stsp if (refstr == NULL)
4547 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
4548 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4549 d0eebce4 2019-03-11 stsp free(refstr);
4552 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4553 d0eebce4 2019-03-11 stsp return NULL;
4556 d0eebce4 2019-03-11 stsp static const struct got_error *
4557 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
4559 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4560 d0eebce4 2019-03-11 stsp struct got_reference *ref;
4562 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
4564 d0eebce4 2019-03-11 stsp return err;
4566 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
4567 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4568 d0eebce4 2019-03-11 stsp return err;
4571 d0eebce4 2019-03-11 stsp static const struct got_error *
4572 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
4574 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4575 d0eebce4 2019-03-11 stsp struct got_object_id *id;
4576 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
4579 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4580 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
4581 d1644381 2019-07-14 stsp * an unintended typo.
4583 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4584 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4586 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4588 d83d9d5c 2019-05-13 stsp if (err) {
4589 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
4591 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4592 d83d9d5c 2019-05-13 stsp return err;
4593 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
4595 d83d9d5c 2019-05-13 stsp return err;
4596 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
4597 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
4599 d83d9d5c 2019-05-13 stsp return err;
4602 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
4604 d0eebce4 2019-03-11 stsp goto done;
4606 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
4609 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4611 d1c1ae5f 2019-08-12 stsp return err;
4614 d1c1ae5f 2019-08-12 stsp static const struct got_error *
4615 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
4617 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
4618 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
4619 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
4622 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4623 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
4624 d1c1ae5f 2019-08-12 stsp * an unintended typo.
4626 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4627 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4629 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
4631 d1c1ae5f 2019-08-12 stsp return err;
4633 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
4635 d1c1ae5f 2019-08-12 stsp goto done;
4637 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
4639 d1c1ae5f 2019-08-12 stsp if (target_ref)
4640 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
4642 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
4643 d0eebce4 2019-03-11 stsp return err;
4646 d0eebce4 2019-03-11 stsp static const struct got_error *
4647 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
4649 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
4650 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
4651 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
4652 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
4653 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
4654 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
4655 b2070a3f 2020-03-22 stsp char *refname = NULL;
4657 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4658 d0eebce4 2019-03-11 stsp switch (ch) {
4660 e31abbf2 2020-03-22 stsp obj_arg = optarg;
4663 e31abbf2 2020-03-22 stsp do_delete = 1;
4666 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
4667 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4668 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4670 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4673 d0eebce4 2019-03-11 stsp do_list = 1;
4676 e31abbf2 2020-03-22 stsp symref_target = optarg;
4679 d0eebce4 2019-03-11 stsp usage_ref();
4680 d0eebce4 2019-03-11 stsp /* NOTREACHED */
4684 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
4685 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
4686 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
4687 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
4688 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
4689 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
4690 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
4691 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
4692 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
4693 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
4694 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
4695 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
4697 d0eebce4 2019-03-11 stsp argc -= optind;
4698 d0eebce4 2019-03-11 stsp argv += optind;
4700 e31abbf2 2020-03-22 stsp if (do_list) {
4701 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
4702 d0eebce4 2019-03-11 stsp usage_ref();
4703 b2070a3f 2020-03-22 stsp if (argc == 1) {
4704 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4705 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4706 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4707 b2070a3f 2020-03-22 stsp goto done;
4711 e31abbf2 2020-03-22 stsp if (argc != 1)
4712 e31abbf2 2020-03-22 stsp usage_ref();
4713 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4714 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4715 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4716 b2070a3f 2020-03-22 stsp goto done;
4720 b2070a3f 2020-03-22 stsp if (refname)
4721 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
4723 d0eebce4 2019-03-11 stsp #ifndef PROFILE
4724 e0b57350 2019-03-12 stsp if (do_list) {
4725 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4726 e0b57350 2019-03-12 stsp NULL) == -1)
4727 e0b57350 2019-03-12 stsp err(1, "pledge");
4729 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4730 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
4731 e0b57350 2019-03-12 stsp err(1, "pledge");
4734 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
4735 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
4736 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4737 d0eebce4 2019-03-11 stsp goto done;
4740 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4741 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
4742 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4743 d0eebce4 2019-03-11 stsp goto done;
4745 d0eebce4 2019-03-11 stsp error = NULL;
4746 d0eebce4 2019-03-11 stsp if (worktree) {
4747 d0eebce4 2019-03-11 stsp repo_path =
4748 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
4749 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4750 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4751 d0eebce4 2019-03-11 stsp if (error)
4752 d0eebce4 2019-03-11 stsp goto done;
4754 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
4755 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4756 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4757 d0eebce4 2019-03-11 stsp goto done;
4762 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4763 d0eebce4 2019-03-11 stsp if (error != NULL)
4764 d0eebce4 2019-03-11 stsp goto done;
4766 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4767 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4768 c02c541e 2019-03-29 stsp if (error)
4769 c02c541e 2019-03-29 stsp goto done;
4771 d0eebce4 2019-03-11 stsp if (do_list)
4772 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
4773 e31abbf2 2020-03-22 stsp else if (do_delete)
4774 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
4775 e31abbf2 2020-03-22 stsp else if (symref_target)
4776 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
4778 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
4779 e31abbf2 2020-03-22 stsp usage_ref();
4780 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
4783 b2070a3f 2020-03-22 stsp free(refname);
4785 4e759de4 2019-06-26 stsp got_repo_close(repo);
4786 4e759de4 2019-06-26 stsp if (worktree)
4787 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
4788 4e759de4 2019-06-26 stsp free(cwd);
4789 4e759de4 2019-06-26 stsp free(repo_path);
4790 4e759de4 2019-06-26 stsp return error;
4793 4e759de4 2019-06-26 stsp __dead static void
4794 4e759de4 2019-06-26 stsp usage_branch(void)
4796 4e759de4 2019-06-26 stsp fprintf(stderr,
4797 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4798 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
4802 4e759de4 2019-06-26 stsp static const struct got_error *
4803 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
4804 4e99b47e 2019-10-04 stsp struct got_reference *ref)
4806 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
4807 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
4808 4e99b47e 2019-10-04 stsp char *refstr;
4810 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
4811 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
4812 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
4813 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
4815 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
4817 4e99b47e 2019-10-04 stsp return err;
4818 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
4819 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
4820 4e99b47e 2019-10-04 stsp marker = "* ";
4822 4e99b47e 2019-10-04 stsp marker = "~ ";
4826 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4827 4e99b47e 2019-10-04 stsp refname += 11;
4828 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4829 4e99b47e 2019-10-04 stsp refname += 18;
4831 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
4832 4e99b47e 2019-10-04 stsp if (refstr == NULL)
4833 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
4835 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
4836 4e99b47e 2019-10-04 stsp free(refstr);
4837 4e99b47e 2019-10-04 stsp return NULL;
4840 4e99b47e 2019-10-04 stsp static const struct got_error *
4841 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4843 ad89fa31 2019-10-04 stsp const char *refname;
4845 ad89fa31 2019-10-04 stsp if (worktree == NULL)
4846 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
4848 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
4850 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4851 ad89fa31 2019-10-04 stsp refname += 11;
4852 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4853 ad89fa31 2019-10-04 stsp refname += 18;
4855 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
4857 ad89fa31 2019-10-04 stsp return NULL;
4860 ad89fa31 2019-10-04 stsp static const struct got_error *
4861 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
4863 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
4864 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
4865 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
4866 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
4867 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
4869 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
4871 4e99b47e 2019-10-04 stsp if (worktree) {
4872 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
4873 4e99b47e 2019-10-04 stsp worktree);
4875 4e99b47e 2019-10-04 stsp return err;
4877 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
4878 4e99b47e 2019-10-04 stsp worktree);
4880 4e99b47e 2019-10-04 stsp return err;
4882 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
4883 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
4884 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
4886 4e99b47e 2019-10-04 stsp return err;
4887 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
4888 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
4892 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
4893 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
4895 4e759de4 2019-06-26 stsp return err;
4897 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
4898 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
4900 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
4901 4e759de4 2019-06-26 stsp return NULL;
4904 4e759de4 2019-06-26 stsp static const struct got_error *
4905 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
4906 45cd4e47 2019-08-25 stsp const char *branch_name)
4908 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4909 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
4910 4e759de4 2019-06-26 stsp char *refname;
4912 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
4913 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
4915 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4917 4e759de4 2019-06-26 stsp goto done;
4919 45cd4e47 2019-08-25 stsp if (worktree &&
4920 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
4921 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
4922 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
4923 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
4924 45cd4e47 2019-08-25 stsp goto done;
4927 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
4930 45cd4e47 2019-08-25 stsp got_ref_close(ref);
4931 4e759de4 2019-06-26 stsp free(refname);
4932 4e759de4 2019-06-26 stsp return err;
4935 4e759de4 2019-06-26 stsp static const struct got_error *
4936 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
4937 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
4939 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4940 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
4941 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
4944 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
4945 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
4946 d3f84d51 2019-07-11 stsp * an unintended typo.
4948 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
4949 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
4951 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
4952 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
4953 4e759de4 2019-06-26 stsp goto done;
4956 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4957 4e759de4 2019-06-26 stsp if (err == NULL) {
4958 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
4959 4e759de4 2019-06-26 stsp goto done;
4960 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
4961 4e759de4 2019-06-26 stsp goto done;
4963 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
4965 4e759de4 2019-06-26 stsp goto done;
4967 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
4970 4e759de4 2019-06-26 stsp got_ref_close(ref);
4971 4e759de4 2019-06-26 stsp free(base_refname);
4972 4e759de4 2019-06-26 stsp free(refname);
4973 4e759de4 2019-06-26 stsp return err;
4976 4e759de4 2019-06-26 stsp static const struct got_error *
4977 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
4979 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
4980 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
4981 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
4982 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
4983 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
4984 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
4985 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
4986 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
4987 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
4988 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
4989 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
4991 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
4993 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
4994 4e759de4 2019-06-26 stsp switch (ch) {
4996 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
4999 4e759de4 2019-06-26 stsp delref = optarg;
5002 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5003 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5004 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5006 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5009 4e759de4 2019-06-26 stsp do_list = 1;
5012 da76fce2 2020-02-24 stsp do_update = 0;
5015 4e759de4 2019-06-26 stsp usage_branch();
5016 4e759de4 2019-06-26 stsp /* NOTREACHED */
5020 4e759de4 2019-06-26 stsp if (do_list && delref)
5021 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
5023 4e759de4 2019-06-26 stsp argc -= optind;
5024 4e759de4 2019-06-26 stsp argv += optind;
5026 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5027 ad89fa31 2019-10-04 stsp do_show = 1;
5029 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5030 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5032 4e759de4 2019-06-26 stsp if (do_list || delref) {
5033 4e759de4 2019-06-26 stsp if (argc > 0)
5034 4e759de4 2019-06-26 stsp usage_branch();
5035 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5036 4e759de4 2019-06-26 stsp usage_branch();
5038 4e759de4 2019-06-26 stsp #ifndef PROFILE
5039 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5040 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5041 4e759de4 2019-06-26 stsp NULL) == -1)
5042 4e759de4 2019-06-26 stsp err(1, "pledge");
5044 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5045 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5046 4e759de4 2019-06-26 stsp err(1, "pledge");
5049 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5050 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5051 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5052 4e759de4 2019-06-26 stsp goto done;
5055 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5056 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5057 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5058 4e759de4 2019-06-26 stsp goto done;
5060 4e759de4 2019-06-26 stsp error = NULL;
5061 4e759de4 2019-06-26 stsp if (worktree) {
5062 4e759de4 2019-06-26 stsp repo_path =
5063 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5064 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5065 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5066 4e759de4 2019-06-26 stsp if (error)
5067 4e759de4 2019-06-26 stsp goto done;
5069 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5070 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5071 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5072 4e759de4 2019-06-26 stsp goto done;
5077 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5078 4e759de4 2019-06-26 stsp if (error != NULL)
5079 4e759de4 2019-06-26 stsp goto done;
5081 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5082 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5083 4e759de4 2019-06-26 stsp if (error)
5084 4e759de4 2019-06-26 stsp goto done;
5086 ad89fa31 2019-10-04 stsp if (do_show)
5087 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5088 ad89fa31 2019-10-04 stsp else if (do_list)
5089 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5090 4e759de4 2019-06-26 stsp else if (delref)
5091 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5093 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5094 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5095 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5096 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5097 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5098 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5099 a74f7e83 2019-11-10 stsp if (error)
5100 a74f7e83 2019-11-10 stsp goto done;
5101 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5102 da76fce2 2020-02-24 stsp if (error)
5103 da76fce2 2020-02-24 stsp goto done;
5104 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5105 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5106 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5108 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5109 da76fce2 2020-02-24 stsp if (error)
5110 da76fce2 2020-02-24 stsp goto done;
5111 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5112 da76fce2 2020-02-24 stsp worktree);
5113 da76fce2 2020-02-24 stsp if (error)
5114 da76fce2 2020-02-24 stsp goto done;
5115 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5117 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5118 da76fce2 2020-02-24 stsp goto done;
5120 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5121 da76fce2 2020-02-24 stsp free(branch_refname);
5122 da76fce2 2020-02-24 stsp if (error)
5123 da76fce2 2020-02-24 stsp goto done;
5124 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5126 da76fce2 2020-02-24 stsp if (error)
5127 da76fce2 2020-02-24 stsp goto done;
5128 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5129 da76fce2 2020-02-24 stsp commit_id);
5130 da76fce2 2020-02-24 stsp if (error)
5131 da76fce2 2020-02-24 stsp goto done;
5132 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5133 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5134 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5136 da76fce2 2020-02-24 stsp if (error)
5137 da76fce2 2020-02-24 stsp goto done;
5138 9627c110 2020-04-18 stsp if (upa.did_something)
5139 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5140 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5145 da76fce2 2020-02-24 stsp got_ref_close(ref);
5147 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5148 d0eebce4 2019-03-11 stsp if (worktree)
5149 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5150 d0eebce4 2019-03-11 stsp free(cwd);
5151 d0eebce4 2019-03-11 stsp free(repo_path);
5152 da76fce2 2020-02-24 stsp free(commit_id);
5153 da76fce2 2020-02-24 stsp free(commit_id_str);
5154 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5155 da76fce2 2020-02-24 stsp free((char *)pe->path);
5156 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5157 d00136be 2019-03-26 stsp return error;
5161 d00136be 2019-03-26 stsp __dead static void
5162 8e7bd50a 2019-08-22 stsp usage_tag(void)
5164 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5165 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5166 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5171 b8bad2ba 2019-08-23 stsp static const struct got_error *
5172 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5174 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5175 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5176 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5177 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5178 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5180 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5181 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5182 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5183 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5185 b8bad2ba 2019-08-23 stsp return err;
5186 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5189 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5192 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5193 b8bad2ba 2019-08-23 stsp free(re_id);
5196 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5197 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5200 b8bad2ba 2019-08-23 stsp while (se) {
5201 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5204 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5205 b8bad2ba 2019-08-23 stsp free(se_id);
5208 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5209 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5211 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5212 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5214 b8bad2ba 2019-08-23 stsp return err;
5215 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5218 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5223 b8bad2ba 2019-08-23 stsp return err;
5227 b8bad2ba 2019-08-23 stsp static const struct got_error *
5228 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5230 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5231 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5232 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5234 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5236 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5238 8e7bd50a 2019-08-22 stsp return err;
5240 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5241 8e7bd50a 2019-08-22 stsp const char *refname;
5242 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5243 8e7bd50a 2019-08-22 stsp char datebuf[26];
5244 d4efa91b 2020-01-14 stsp const char *tagger;
5245 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5246 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5247 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5248 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5250 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5251 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5253 8e7bd50a 2019-08-22 stsp refname += 10;
5254 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5255 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5256 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5259 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5260 8e7bd50a 2019-08-22 stsp free(refstr);
5262 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5265 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5266 d4efa91b 2020-01-14 stsp if (err) {
5267 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5271 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5272 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5273 d4efa91b 2020-01-14 stsp if (err) {
5277 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5278 d4efa91b 2020-01-14 stsp tagger_time =
5279 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5280 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5286 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5287 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5288 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5289 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5293 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5294 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5295 2417344c 2019-08-23 stsp if (datestr)
5296 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5297 d4efa91b 2020-01-14 stsp if (commit)
5298 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5300 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5301 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5302 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5305 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5306 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5309 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5310 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5313 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5314 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5321 8e7bd50a 2019-08-22 stsp free(id_str);
5322 d4efa91b 2020-01-14 stsp if (commit) {
5323 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5326 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5328 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5329 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5330 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5331 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5336 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5338 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5340 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5341 8e7bd50a 2019-08-22 stsp } while (line);
5342 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5345 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5346 8e7bd50a 2019-08-22 stsp return NULL;
5349 8e7bd50a 2019-08-22 stsp static const struct got_error *
5350 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5351 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5353 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5354 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5355 f372d5cd 2019-10-21 stsp char *editor = NULL;
5356 8e7bd50a 2019-08-22 stsp int fd = -1;
5358 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5359 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5360 8e7bd50a 2019-08-22 stsp goto done;
5363 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5364 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
5365 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5366 8e7bd50a 2019-08-22 stsp goto done;
5369 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5371 8e7bd50a 2019-08-22 stsp goto done;
5373 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
5374 8e7bd50a 2019-08-22 stsp close(fd);
5376 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5378 8e7bd50a 2019-08-22 stsp goto done;
5379 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5381 8e7bd50a 2019-08-22 stsp free(initial_content);
5382 8e7bd50a 2019-08-22 stsp free(template);
5383 8e7bd50a 2019-08-22 stsp free(editor);
5385 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5386 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5387 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5388 8e7bd50a 2019-08-22 stsp if (err) {
5389 8e7bd50a 2019-08-22 stsp free(*tagmsg);
5390 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
5393 8e7bd50a 2019-08-22 stsp return err;
5396 8e7bd50a 2019-08-22 stsp static const struct got_error *
5397 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
5398 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
5400 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5401 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5402 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5403 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5404 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5405 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5406 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5409 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5410 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5411 8e7bd50a 2019-08-22 stsp * an unintended typo.
5413 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5414 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5416 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
5418 8e7bd50a 2019-08-22 stsp return err;
5420 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5421 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5423 8e7bd50a 2019-08-22 stsp goto done;
5425 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5427 8e7bd50a 2019-08-22 stsp goto done;
5429 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5430 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5431 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5432 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
5433 8e7bd50a 2019-08-22 stsp goto done;
5435 8e7bd50a 2019-08-22 stsp tag_name += 10;
5436 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5437 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5438 8e7bd50a 2019-08-22 stsp goto done;
5441 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5442 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5443 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5444 8e7bd50a 2019-08-22 stsp goto done;
5445 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5446 8e7bd50a 2019-08-22 stsp goto done;
5448 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5449 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5450 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5451 f372d5cd 2019-10-21 stsp if (err) {
5452 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5453 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5454 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5455 8e7bd50a 2019-08-22 stsp goto done;
5459 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5460 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5461 f372d5cd 2019-10-21 stsp if (err) {
5462 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5463 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5464 8e7bd50a 2019-08-22 stsp goto done;
5467 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5468 f372d5cd 2019-10-21 stsp if (err) {
5469 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5470 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5471 8e7bd50a 2019-08-22 stsp goto done;
5474 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5475 f372d5cd 2019-10-21 stsp if (err) {
5476 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5477 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5478 f372d5cd 2019-10-21 stsp goto done;
5481 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
5482 f372d5cd 2019-10-21 stsp if (err) {
5483 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5484 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5485 f372d5cd 2019-10-21 stsp goto done;
5487 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
5489 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
5490 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
5491 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
5492 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5493 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
5494 f372d5cd 2019-10-21 stsp free(tag_id_str);
5496 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
5497 8e7bd50a 2019-08-22 stsp free(commit_id);
5498 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5499 8e7bd50a 2019-08-22 stsp free(refname);
5500 8e7bd50a 2019-08-22 stsp free(tagmsg);
5501 f372d5cd 2019-10-21 stsp free(tagmsg_path);
5502 aba9c984 2019-09-08 stsp free(tagger);
5503 8e7bd50a 2019-08-22 stsp return err;
5506 8e7bd50a 2019-08-22 stsp static const struct got_error *
5507 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
5509 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
5510 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
5511 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
5512 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5513 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
5514 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5515 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
5517 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5518 8e7bd50a 2019-08-22 stsp switch (ch) {
5520 80106605 2020-02-24 stsp commit_id_arg = optarg;
5523 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
5526 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
5527 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5528 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5530 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
5533 8e7bd50a 2019-08-22 stsp do_list = 1;
5536 8e7bd50a 2019-08-22 stsp usage_tag();
5537 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
5541 8e7bd50a 2019-08-22 stsp argc -= optind;
5542 8e7bd50a 2019-08-22 stsp argv += optind;
5544 8e7bd50a 2019-08-22 stsp if (do_list) {
5545 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
5547 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
5548 8e7bd50a 2019-08-22 stsp if (tagmsg)
5549 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
5550 8e7bd50a 2019-08-22 stsp if (argc > 0)
5551 8e7bd50a 2019-08-22 stsp usage_tag();
5552 80106605 2020-02-24 stsp } else if (argc != 1)
5553 8e7bd50a 2019-08-22 stsp usage_tag();
5555 a2887370 2019-08-23 stsp tag_name = argv[0];
5557 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
5558 8e7bd50a 2019-08-22 stsp if (do_list) {
5559 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5560 8e7bd50a 2019-08-22 stsp NULL) == -1)
5561 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5563 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5564 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
5565 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5568 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
5569 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
5570 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
5571 8e7bd50a 2019-08-22 stsp goto done;
5574 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5575 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
5576 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5577 8e7bd50a 2019-08-22 stsp goto done;
5579 8e7bd50a 2019-08-22 stsp error = NULL;
5580 8e7bd50a 2019-08-22 stsp if (worktree) {
5581 8e7bd50a 2019-08-22 stsp repo_path =
5582 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
5583 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5584 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5585 8e7bd50a 2019-08-22 stsp if (error)
5586 8e7bd50a 2019-08-22 stsp goto done;
5588 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
5589 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5590 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5591 8e7bd50a 2019-08-22 stsp goto done;
5596 8e7bd50a 2019-08-22 stsp if (do_list) {
5597 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5598 c9956ddf 2019-09-08 stsp if (error != NULL)
5599 c9956ddf 2019-09-08 stsp goto done;
5600 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5601 8e7bd50a 2019-08-22 stsp if (error)
5602 8e7bd50a 2019-08-22 stsp goto done;
5603 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
5605 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5606 c9956ddf 2019-09-08 stsp if (error)
5607 c9956ddf 2019-09-08 stsp goto done;
5608 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
5609 c9956ddf 2019-09-08 stsp if (error != NULL)
5610 c9956ddf 2019-09-08 stsp goto done;
5612 8e7bd50a 2019-08-22 stsp if (tagmsg) {
5613 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5614 8e7bd50a 2019-08-22 stsp if (error)
5615 8e7bd50a 2019-08-22 stsp goto done;
5618 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
5619 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
5620 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
5621 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
5622 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
5623 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
5624 8e7bd50a 2019-08-22 stsp if (error)
5625 8e7bd50a 2019-08-22 stsp goto done;
5626 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5627 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
5628 8e7bd50a 2019-08-22 stsp if (error)
5629 8e7bd50a 2019-08-22 stsp goto done;
5630 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
5631 8e7bd50a 2019-08-22 stsp free(commit_id);
5632 8e7bd50a 2019-08-22 stsp if (error)
5633 8e7bd50a 2019-08-22 stsp goto done;
5636 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
5637 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5641 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
5642 8e7bd50a 2019-08-22 stsp if (worktree)
5643 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
5644 8e7bd50a 2019-08-22 stsp free(cwd);
5645 8e7bd50a 2019-08-22 stsp free(repo_path);
5646 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5647 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5648 8e7bd50a 2019-08-22 stsp return error;
5651 8e7bd50a 2019-08-22 stsp __dead static void
5652 d00136be 2019-03-26 stsp usage_add(void)
5654 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5655 022fae89 2019-12-06 tracey getprogname());
5659 d00136be 2019-03-26 stsp static const struct got_error *
5660 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
5662 4e68cba3 2019-11-23 stsp while (path[0] == '/')
5664 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
5665 4e68cba3 2019-11-23 stsp return NULL;
5668 4e68cba3 2019-11-23 stsp static const struct got_error *
5669 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
5671 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
5672 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
5673 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
5674 1dd54920 2019-05-11 stsp char *cwd = NULL;
5675 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
5676 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
5677 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
5679 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
5681 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
5682 d00136be 2019-03-26 stsp switch (ch) {
5683 022fae89 2019-12-06 tracey case 'I':
5684 022fae89 2019-12-06 tracey no_ignores = 1;
5687 4e68cba3 2019-11-23 stsp can_recurse = 1;
5690 d00136be 2019-03-26 stsp usage_add();
5691 d00136be 2019-03-26 stsp /* NOTREACHED */
5695 d00136be 2019-03-26 stsp argc -= optind;
5696 d00136be 2019-03-26 stsp argv += optind;
5698 43012d58 2019-07-14 stsp #ifndef PROFILE
5699 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5700 43012d58 2019-07-14 stsp NULL) == -1)
5701 43012d58 2019-07-14 stsp err(1, "pledge");
5703 723c305c 2019-05-11 jcs if (argc < 1)
5704 d00136be 2019-03-26 stsp usage_add();
5706 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
5707 d00136be 2019-03-26 stsp if (cwd == NULL) {
5708 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5709 d00136be 2019-03-26 stsp goto done;
5712 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5713 fa51e947 2020-03-27 stsp if (error) {
5714 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5715 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
5716 d00136be 2019-03-26 stsp goto done;
5719 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5721 031a5338 2019-03-26 stsp if (error != NULL)
5722 031a5338 2019-03-26 stsp goto done;
5724 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5725 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5726 d00136be 2019-03-26 stsp if (error)
5727 d00136be 2019-03-26 stsp goto done;
5729 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5730 6d022e97 2019-08-04 stsp if (error)
5731 022fae89 2019-12-06 tracey goto done;
5733 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
5734 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5735 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
5736 6d022e97 2019-08-04 stsp goto done;
5740 4e68cba3 2019-11-23 stsp if (!can_recurse) {
5741 4e68cba3 2019-11-23 stsp char *ondisk_path;
5742 4e68cba3 2019-11-23 stsp struct stat sb;
5743 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
5744 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
5745 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
5746 4e68cba3 2019-11-23 stsp pe->path) == -1) {
5747 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
5748 4e68cba3 2019-11-23 stsp goto done;
5750 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
5751 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
5752 4e68cba3 2019-11-23 stsp free(ondisk_path);
5755 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
5756 4e68cba3 2019-11-23 stsp ondisk_path);
5757 4e68cba3 2019-11-23 stsp free(ondisk_path);
5758 4e68cba3 2019-11-23 stsp goto done;
5760 4e68cba3 2019-11-23 stsp free(ondisk_path);
5761 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
5762 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5763 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
5764 4e68cba3 2019-11-23 stsp goto done;
5769 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
5770 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
5773 031a5338 2019-03-26 stsp got_repo_close(repo);
5774 d00136be 2019-03-26 stsp if (worktree)
5775 d00136be 2019-03-26 stsp got_worktree_close(worktree);
5776 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
5777 1dd54920 2019-05-11 stsp free((char *)pe->path);
5778 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
5779 2ec1f75b 2019-03-26 stsp free(cwd);
5780 2ec1f75b 2019-03-26 stsp return error;
5783 2ec1f75b 2019-03-26 stsp __dead static void
5784 648e4ef7 2019-07-09 stsp usage_remove(void)
5786 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5787 f2a9dc41 2019-12-13 tracey getprogname());
5791 2a06fe5f 2019-08-24 stsp static const struct got_error *
5792 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
5793 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
5795 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
5797 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5798 2a06fe5f 2019-08-24 stsp return NULL;
5799 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5800 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
5801 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
5802 2a06fe5f 2019-08-24 stsp return NULL;
5805 2ec1f75b 2019-03-26 stsp static const struct got_error *
5806 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
5808 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
5809 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
5810 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
5811 17ed4618 2019-06-02 stsp char *cwd = NULL;
5812 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
5813 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
5814 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5816 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
5818 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
5819 2ec1f75b 2019-03-26 stsp switch (ch) {
5821 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
5823 70e3e7f5 2019-12-13 tracey case 'k':
5824 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
5826 f2a9dc41 2019-12-13 tracey case 'R':
5827 f2a9dc41 2019-12-13 tracey can_recurse = 1;
5830 f2a9dc41 2019-12-13 tracey usage_remove();
5831 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
5835 2ec1f75b 2019-03-26 stsp argc -= optind;
5836 2ec1f75b 2019-03-26 stsp argv += optind;
5838 43012d58 2019-07-14 stsp #ifndef PROFILE
5839 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5840 43012d58 2019-07-14 stsp NULL) == -1)
5841 43012d58 2019-07-14 stsp err(1, "pledge");
5843 17ed4618 2019-06-02 stsp if (argc < 1)
5844 648e4ef7 2019-07-09 stsp usage_remove();
5846 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
5847 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
5848 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5849 2ec1f75b 2019-03-26 stsp goto done;
5851 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5852 fa51e947 2020-03-27 stsp if (error) {
5853 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5854 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
5855 2ec1f75b 2019-03-26 stsp goto done;
5858 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5861 2ec1f75b 2019-03-26 stsp goto done;
5863 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5864 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5865 2ec1f75b 2019-03-26 stsp if (error)
5866 2ec1f75b 2019-03-26 stsp goto done;
5868 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5869 6d022e97 2019-08-04 stsp if (error)
5870 6d022e97 2019-08-04 stsp goto done;
5872 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
5873 f2a9dc41 2019-12-13 tracey char *ondisk_path;
5874 f2a9dc41 2019-12-13 tracey struct stat sb;
5875 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
5876 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
5877 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
5878 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
5879 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
5880 f2a9dc41 2019-12-13 tracey goto done;
5882 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
5883 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
5884 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5885 f2a9dc41 2019-12-13 tracey continue;
5887 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
5888 f2a9dc41 2019-12-13 tracey ondisk_path);
5889 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5890 f2a9dc41 2019-12-13 tracey goto done;
5892 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5893 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
5894 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5895 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
5896 f2a9dc41 2019-12-13 tracey goto done;
5901 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
5902 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
5905 a129376b 2019-03-28 stsp got_repo_close(repo);
5906 a129376b 2019-03-28 stsp if (worktree)
5907 a129376b 2019-03-28 stsp got_worktree_close(worktree);
5908 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
5909 17ed4618 2019-06-02 stsp free((char *)pe->path);
5910 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
5911 a129376b 2019-03-28 stsp free(cwd);
5912 a129376b 2019-03-28 stsp return error;
5915 a129376b 2019-03-28 stsp __dead static void
5916 a129376b 2019-03-28 stsp usage_revert(void)
5918 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
5919 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
5923 1ee397ad 2019-07-12 stsp static const struct got_error *
5924 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
5926 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
5927 fb9704af 2020-01-27 stsp return NULL;
5929 a129376b 2019-03-28 stsp while (path[0] == '/')
5931 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
5932 33aa809d 2019-08-08 stsp return NULL;
5935 33aa809d 2019-08-08 stsp struct choose_patch_arg {
5936 33aa809d 2019-08-08 stsp FILE *patch_script_file;
5937 33aa809d 2019-08-08 stsp const char *action;
5940 33aa809d 2019-08-08 stsp static const struct got_error *
5941 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5942 33aa809d 2019-08-08 stsp int nchanges, const char *action)
5944 33aa809d 2019-08-08 stsp char *line = NULL;
5945 33aa809d 2019-08-08 stsp size_t linesize = 0;
5946 33aa809d 2019-08-08 stsp ssize_t linelen;
5948 33aa809d 2019-08-08 stsp switch (status) {
5949 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
5950 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
5952 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
5953 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
5955 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
5956 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
5957 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
5958 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5959 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
5960 33aa809d 2019-08-08 stsp printf("%s", line);
5961 33aa809d 2019-08-08 stsp if (ferror(patch_file))
5962 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5963 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5964 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5965 33aa809d 2019-08-08 stsp path, n, nchanges, action);
5968 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
5971 33aa809d 2019-08-08 stsp return NULL;
5974 33aa809d 2019-08-08 stsp static const struct got_error *
5975 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5976 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
5978 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
5979 33aa809d 2019-08-08 stsp char *line = NULL;
5980 33aa809d 2019-08-08 stsp size_t linesize = 0;
5981 33aa809d 2019-08-08 stsp ssize_t linelen;
5982 33aa809d 2019-08-08 stsp int resp = ' ';
5983 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
5985 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
5987 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
5989 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5990 33aa809d 2019-08-08 stsp a->action);
5992 33aa809d 2019-08-08 stsp return err;
5993 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
5994 33aa809d 2019-08-08 stsp if (linelen == -1) {
5995 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
5996 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5997 33aa809d 2019-08-08 stsp return NULL;
5999 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6001 33aa809d 2019-08-08 stsp *nl = '\0';
6002 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6003 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6004 33aa809d 2019-08-08 stsp printf("y\n");
6005 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6006 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6007 33aa809d 2019-08-08 stsp printf("n\n");
6008 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6009 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6010 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6011 33aa809d 2019-08-08 stsp printf("q\n");
6013 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6014 33aa809d 2019-08-08 stsp free(line);
6015 33aa809d 2019-08-08 stsp return NULL;
6018 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6019 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6020 33aa809d 2019-08-08 stsp a->action);
6022 33aa809d 2019-08-08 stsp return err;
6023 33aa809d 2019-08-08 stsp resp = getchar();
6024 33aa809d 2019-08-08 stsp if (resp == '\n')
6025 33aa809d 2019-08-08 stsp resp = getchar();
6026 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6027 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6028 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6029 33aa809d 2019-08-08 stsp resp = ' ';
6031 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6032 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6033 33aa809d 2019-08-08 stsp resp = ' ';
6037 33aa809d 2019-08-08 stsp if (resp == 'y')
6038 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6039 33aa809d 2019-08-08 stsp else if (resp == 'n')
6040 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6041 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6042 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6044 1ee397ad 2019-07-12 stsp return NULL;
6048 a129376b 2019-03-28 stsp static const struct got_error *
6049 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6051 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6052 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6053 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6054 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6055 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6056 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6057 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6058 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6059 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6060 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6062 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6064 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6065 a129376b 2019-03-28 stsp switch (ch) {
6067 33aa809d 2019-08-08 stsp pflag = 1;
6070 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6073 0f6d7415 2019-08-08 stsp can_recurse = 1;
6076 a129376b 2019-03-28 stsp usage_revert();
6077 a129376b 2019-03-28 stsp /* NOTREACHED */
6081 a129376b 2019-03-28 stsp argc -= optind;
6082 a129376b 2019-03-28 stsp argv += optind;
6084 43012d58 2019-07-14 stsp #ifndef PROFILE
6085 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6086 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6087 43012d58 2019-07-14 stsp err(1, "pledge");
6089 e20a8b6f 2019-06-04 stsp if (argc < 1)
6090 a129376b 2019-03-28 stsp usage_revert();
6091 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6092 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6094 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6095 a129376b 2019-03-28 stsp if (cwd == NULL) {
6096 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6097 a129376b 2019-03-28 stsp goto done;
6099 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6100 fa51e947 2020-03-27 stsp if (error) {
6101 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6102 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6103 2ec1f75b 2019-03-26 stsp goto done;
6106 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6108 a129376b 2019-03-28 stsp if (error != NULL)
6109 a129376b 2019-03-28 stsp goto done;
6111 33aa809d 2019-08-08 stsp if (patch_script_path) {
6112 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6113 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6114 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6115 33aa809d 2019-08-08 stsp patch_script_path);
6116 33aa809d 2019-08-08 stsp goto done;
6119 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6120 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6121 a129376b 2019-03-28 stsp if (error)
6122 a129376b 2019-03-28 stsp goto done;
6124 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6125 6d022e97 2019-08-04 stsp if (error)
6126 6d022e97 2019-08-04 stsp goto done;
6128 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6129 0f6d7415 2019-08-08 stsp char *ondisk_path;
6130 0f6d7415 2019-08-08 stsp struct stat sb;
6131 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6132 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6133 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6134 0f6d7415 2019-08-08 stsp pe->path) == -1) {
6135 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6136 0f6d7415 2019-08-08 stsp goto done;
6138 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6139 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6140 0f6d7415 2019-08-08 stsp free(ondisk_path);
6143 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6144 0f6d7415 2019-08-08 stsp ondisk_path);
6145 0f6d7415 2019-08-08 stsp free(ondisk_path);
6146 0f6d7415 2019-08-08 stsp goto done;
6148 0f6d7415 2019-08-08 stsp free(ondisk_path);
6149 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6150 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6151 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6152 0f6d7415 2019-08-08 stsp goto done;
6157 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6158 33aa809d 2019-08-08 stsp cpa.action = "revert";
6159 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6160 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6162 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6163 33aa809d 2019-08-08 stsp error == NULL)
6164 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6166 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6167 2ec1f75b 2019-03-26 stsp if (worktree)
6168 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6169 2ec1f75b 2019-03-26 stsp free(path);
6170 d00136be 2019-03-26 stsp free(cwd);
6171 6bad629b 2019-02-04 stsp return error;
6174 c4296144 2019-05-09 stsp __dead static void
6175 c4296144 2019-05-09 stsp usage_commit(void)
6177 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6178 5c1e53bc 2019-07-28 stsp getprogname());
6182 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6183 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6184 e2ba3d07 2019-05-13 stsp const char *editor;
6185 e0870e44 2019-05-13 stsp const char *worktree_path;
6186 76d98825 2019-06-03 stsp const char *branch_name;
6187 314a6357 2019-05-13 stsp const char *repo_path;
6188 e0870e44 2019-05-13 stsp char *logmsg_path;
6192 33ad4cbe 2019-05-12 jcs static const struct got_error *
6193 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6196 76d98825 2019-06-03 stsp char *initial_content = NULL;
6197 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6198 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6199 e0870e44 2019-05-13 stsp char *template = NULL;
6200 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6202 33ad4cbe 2019-05-12 jcs size_t len;
6204 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6205 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6206 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6207 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6208 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6209 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6210 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6211 33ad4cbe 2019-05-12 jcs return NULL;
6214 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6215 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6217 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
6218 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6219 76d98825 2019-06-03 stsp a->branch_name) == -1)
6220 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6222 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6224 e0870e44 2019-05-13 stsp goto done;
6226 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
6228 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6229 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6230 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6231 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6232 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6236 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6238 76d98825 2019-06-03 stsp free(initial_content);
6239 e0870e44 2019-05-13 stsp free(template);
6241 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6242 3ce1b845 2019-07-15 stsp if (err == NULL) {
6243 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6244 3ce1b845 2019-07-15 stsp if (err) {
6245 3ce1b845 2019-07-15 stsp free(*logmsg);
6246 3ce1b845 2019-07-15 stsp *logmsg = NULL;
6249 33ad4cbe 2019-05-12 jcs return err;
6252 c4296144 2019-05-09 stsp static const struct got_error *
6253 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6255 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6256 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6257 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6258 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6259 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6260 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6261 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6262 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6263 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6264 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6266 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6267 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6269 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
6270 c4296144 2019-05-09 stsp switch (ch) {
6272 c4296144 2019-05-09 stsp logmsg = optarg;
6275 c4296144 2019-05-09 stsp usage_commit();
6276 c4296144 2019-05-09 stsp /* NOTREACHED */
6280 c4296144 2019-05-09 stsp argc -= optind;
6281 c4296144 2019-05-09 stsp argv += optind;
6283 43012d58 2019-07-14 stsp #ifndef PROFILE
6284 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6285 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6286 43012d58 2019-07-14 stsp err(1, "pledge");
6288 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6289 c4296144 2019-05-09 stsp if (cwd == NULL) {
6290 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6291 c4296144 2019-05-09 stsp goto done;
6293 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6294 fa51e947 2020-03-27 stsp if (error) {
6295 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6296 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6297 7d5807f4 2019-07-11 stsp goto done;
6300 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6301 c4296144 2019-05-09 stsp if (error)
6302 a698f62e 2019-07-25 stsp goto done;
6303 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6304 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6305 c4296144 2019-05-09 stsp goto done;
6308 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6309 916f288c 2019-07-30 stsp worktree);
6310 5c1e53bc 2019-07-28 stsp if (error)
6311 5c1e53bc 2019-07-28 stsp goto done;
6313 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6314 c9956ddf 2019-09-08 stsp if (error)
6315 c9956ddf 2019-09-08 stsp goto done;
6316 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6317 c9956ddf 2019-09-08 stsp gitconfig_path);
6318 c4296144 2019-05-09 stsp if (error != NULL)
6319 c4296144 2019-05-09 stsp goto done;
6321 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
6322 aba9c984 2019-09-08 stsp if (error)
6323 aba9c984 2019-09-08 stsp return error;
6326 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6327 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6329 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6330 314a6357 2019-05-13 stsp error = get_editor(&editor);
6332 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6333 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6334 c4296144 2019-05-09 stsp if (error)
6335 c4296144 2019-05-09 stsp goto done;
6337 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6338 087fb88c 2019-08-04 stsp if (error)
6339 087fb88c 2019-08-04 stsp goto done;
6341 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6342 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6343 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6344 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6345 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6346 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6347 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6348 916f288c 2019-07-30 stsp goto done;
6350 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6352 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6353 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6354 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6355 e0870e44 2019-05-13 stsp if (error) {
6356 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6357 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6358 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6359 c4296144 2019-05-09 stsp goto done;
6362 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6363 c4296144 2019-05-09 stsp if (error)
6364 c4296144 2019-05-09 stsp goto done;
6365 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6367 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6368 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6369 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6370 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6371 7266f21f 2019-10-21 stsp error == NULL)
6372 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6373 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6375 c4296144 2019-05-09 stsp got_repo_close(repo);
6376 c4296144 2019-05-09 stsp if (worktree)
6377 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6378 c4296144 2019-05-09 stsp free(cwd);
6379 c4296144 2019-05-09 stsp free(id_str);
6380 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6381 e2ba3d07 2019-05-13 stsp free(editor);
6382 aba9c984 2019-09-08 stsp free(author);
6383 234035bc 2019-06-01 stsp return error;
6386 234035bc 2019-06-01 stsp __dead static void
6387 234035bc 2019-06-01 stsp usage_cherrypick(void)
6389 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6393 234035bc 2019-06-01 stsp static const struct got_error *
6394 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6396 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6397 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6398 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6399 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6400 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6401 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6402 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6403 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6405 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6407 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6408 234035bc 2019-06-01 stsp switch (ch) {
6410 234035bc 2019-06-01 stsp usage_cherrypick();
6411 234035bc 2019-06-01 stsp /* NOTREACHED */
6415 234035bc 2019-06-01 stsp argc -= optind;
6416 234035bc 2019-06-01 stsp argv += optind;
6418 43012d58 2019-07-14 stsp #ifndef PROFILE
6419 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6420 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6421 43012d58 2019-07-14 stsp err(1, "pledge");
6423 234035bc 2019-06-01 stsp if (argc != 1)
6424 234035bc 2019-06-01 stsp usage_cherrypick();
6426 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6427 234035bc 2019-06-01 stsp if (cwd == NULL) {
6428 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6429 234035bc 2019-06-01 stsp goto done;
6431 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6432 fa51e947 2020-03-27 stsp if (error) {
6433 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6434 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6436 234035bc 2019-06-01 stsp goto done;
6439 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6441 234035bc 2019-06-01 stsp if (error != NULL)
6442 234035bc 2019-06-01 stsp goto done;
6444 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6445 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6446 234035bc 2019-06-01 stsp if (error)
6447 234035bc 2019-06-01 stsp goto done;
6449 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6450 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6451 234035bc 2019-06-01 stsp if (error != NULL) {
6452 234035bc 2019-06-01 stsp struct got_reference *ref;
6453 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6454 234035bc 2019-06-01 stsp goto done;
6455 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6456 234035bc 2019-06-01 stsp if (error != NULL)
6457 234035bc 2019-06-01 stsp goto done;
6458 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
6459 234035bc 2019-06-01 stsp got_ref_close(ref);
6460 234035bc 2019-06-01 stsp if (error != NULL)
6461 234035bc 2019-06-01 stsp goto done;
6463 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
6464 234035bc 2019-06-01 stsp if (error)
6465 234035bc 2019-06-01 stsp goto done;
6467 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
6468 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
6469 234035bc 2019-06-01 stsp if (error != NULL)
6470 234035bc 2019-06-01 stsp goto done;
6472 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6473 234035bc 2019-06-01 stsp if (error) {
6474 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
6475 234035bc 2019-06-01 stsp goto done;
6476 234035bc 2019-06-01 stsp error = NULL;
6478 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
6479 234035bc 2019-06-01 stsp goto done;
6482 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6483 234035bc 2019-06-01 stsp if (error)
6484 234035bc 2019-06-01 stsp goto done;
6485 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6486 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6487 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6488 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
6490 234035bc 2019-06-01 stsp if (error != NULL)
6491 234035bc 2019-06-01 stsp goto done;
6493 9627c110 2020-04-18 stsp if (upa.did_something)
6494 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
6495 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6497 234035bc 2019-06-01 stsp if (commit)
6498 234035bc 2019-06-01 stsp got_object_commit_close(commit);
6499 234035bc 2019-06-01 stsp free(commit_id_str);
6500 234035bc 2019-06-01 stsp if (head_ref)
6501 234035bc 2019-06-01 stsp got_ref_close(head_ref);
6502 234035bc 2019-06-01 stsp if (worktree)
6503 234035bc 2019-06-01 stsp got_worktree_close(worktree);
6505 234035bc 2019-06-01 stsp got_repo_close(repo);
6506 c4296144 2019-05-09 stsp return error;
6509 5ef14e63 2019-06-02 stsp __dead static void
6510 5ef14e63 2019-06-02 stsp usage_backout(void)
6512 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6516 5ef14e63 2019-06-02 stsp static const struct got_error *
6517 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
6519 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
6520 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
6521 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
6522 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
6523 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
6524 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
6525 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
6526 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
6528 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6530 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6531 5ef14e63 2019-06-02 stsp switch (ch) {
6533 5ef14e63 2019-06-02 stsp usage_backout();
6534 5ef14e63 2019-06-02 stsp /* NOTREACHED */
6538 5ef14e63 2019-06-02 stsp argc -= optind;
6539 5ef14e63 2019-06-02 stsp argv += optind;
6541 43012d58 2019-07-14 stsp #ifndef PROFILE
6542 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6543 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6544 43012d58 2019-07-14 stsp err(1, "pledge");
6546 5ef14e63 2019-06-02 stsp if (argc != 1)
6547 5ef14e63 2019-06-02 stsp usage_backout();
6549 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
6550 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
6551 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
6552 5ef14e63 2019-06-02 stsp goto done;
6554 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
6555 fa51e947 2020-03-27 stsp if (error) {
6556 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6557 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
6558 5ef14e63 2019-06-02 stsp goto done;
6561 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6563 5ef14e63 2019-06-02 stsp if (error != NULL)
6564 5ef14e63 2019-06-02 stsp goto done;
6566 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6567 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6568 5ef14e63 2019-06-02 stsp if (error)
6569 5ef14e63 2019-06-02 stsp goto done;
6571 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6572 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6573 5ef14e63 2019-06-02 stsp if (error != NULL) {
6574 5ef14e63 2019-06-02 stsp struct got_reference *ref;
6575 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6576 5ef14e63 2019-06-02 stsp goto done;
6577 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6578 5ef14e63 2019-06-02 stsp if (error != NULL)
6579 5ef14e63 2019-06-02 stsp goto done;
6580 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
6581 5ef14e63 2019-06-02 stsp got_ref_close(ref);
6582 5ef14e63 2019-06-02 stsp if (error != NULL)
6583 5ef14e63 2019-06-02 stsp goto done;
6585 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
6586 5ef14e63 2019-06-02 stsp if (error)
6587 5ef14e63 2019-06-02 stsp goto done;
6589 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
6590 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
6591 5ef14e63 2019-06-02 stsp if (error != NULL)
6592 5ef14e63 2019-06-02 stsp goto done;
6594 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6595 5ef14e63 2019-06-02 stsp if (error)
6596 5ef14e63 2019-06-02 stsp goto done;
6598 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6599 5ef14e63 2019-06-02 stsp if (error)
6600 5ef14e63 2019-06-02 stsp goto done;
6601 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6602 5ef14e63 2019-06-02 stsp if (pid == NULL) {
6603 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
6604 5ef14e63 2019-06-02 stsp goto done;
6607 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6608 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6609 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
6610 5ef14e63 2019-06-02 stsp if (error != NULL)
6611 5ef14e63 2019-06-02 stsp goto done;
6613 9627c110 2020-04-18 stsp if (upa.did_something)
6614 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
6615 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6617 5ef14e63 2019-06-02 stsp if (commit)
6618 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
6619 5ef14e63 2019-06-02 stsp free(commit_id_str);
6620 5ef14e63 2019-06-02 stsp if (head_ref)
6621 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
6622 818c7501 2019-07-11 stsp if (worktree)
6623 818c7501 2019-07-11 stsp got_worktree_close(worktree);
6625 818c7501 2019-07-11 stsp got_repo_close(repo);
6626 818c7501 2019-07-11 stsp return error;
6629 818c7501 2019-07-11 stsp __dead static void
6630 818c7501 2019-07-11 stsp usage_rebase(void)
6632 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6633 af54c8f8 2019-07-11 stsp getprogname());
6638 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
6641 0ebf8283 2019-07-24 stsp size_t len;
6643 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
6644 0ebf8283 2019-07-24 stsp if (len > limit)
6645 0ebf8283 2019-07-24 stsp len = limit;
6646 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
6647 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
6649 0ebf8283 2019-07-24 stsp *nl = '\0';
6652 0ebf8283 2019-07-24 stsp static const struct got_error *
6653 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6655 5943eee2 2019-08-13 stsp const struct got_error *err;
6656 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
6657 5943eee2 2019-08-13 stsp const char *s;
6659 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
6661 5943eee2 2019-08-13 stsp return err;
6663 5943eee2 2019-08-13 stsp s = logmsg0;
6664 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
6667 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
6668 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
6669 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6670 5943eee2 2019-08-13 stsp goto done;
6673 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
6675 5943eee2 2019-08-13 stsp free(logmsg0);
6676 a0ea4fc0 2020-02-28 stsp return err;
6679 a0ea4fc0 2020-02-28 stsp static const struct got_error *
6680 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6682 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
6683 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
6684 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
6686 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
6688 a0ea4fc0 2020-02-28 stsp return err;
6690 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
6692 a0ea4fc0 2020-02-28 stsp goto done;
6694 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
6696 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
6698 a0ea4fc0 2020-02-28 stsp goto done;
6700 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
6702 a0ea4fc0 2020-02-28 stsp free(id_str);
6703 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
6704 a0ea4fc0 2020-02-28 stsp free(logmsg);
6705 5943eee2 2019-08-13 stsp return err;
6708 818c7501 2019-07-11 stsp static const struct got_error *
6709 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
6710 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
6712 818c7501 2019-07-11 stsp const struct got_error *err;
6713 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6715 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
6717 818c7501 2019-07-11 stsp goto done;
6719 ff0d2220 2019-07-11 stsp if (new_id) {
6720 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
6722 ff0d2220 2019-07-11 stsp goto done;
6725 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
6726 ff0d2220 2019-07-11 stsp if (new_id_str)
6727 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
6729 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6731 0ebf8283 2019-07-24 stsp goto done;
6733 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
6734 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6736 818c7501 2019-07-11 stsp free(old_id_str);
6737 818c7501 2019-07-11 stsp free(new_id_str);
6738 272a1371 2020-02-28 stsp free(logmsg);
6739 818c7501 2019-07-11 stsp return err;
6742 1ee397ad 2019-07-12 stsp static const struct got_error *
6743 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6744 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
6745 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
6747 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
6748 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
6749 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
6752 818c7501 2019-07-11 stsp static const struct got_error *
6753 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
6754 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6755 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
6756 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6758 ff0d2220 2019-07-11 stsp const struct got_error *error;
6759 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
6760 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
6762 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6763 ff0d2220 2019-07-11 stsp if (error)
6764 ff0d2220 2019-07-11 stsp return error;
6766 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6767 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
6768 ff0d2220 2019-07-11 stsp if (error) {
6769 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6770 ff0d2220 2019-07-11 stsp goto done;
6771 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
6773 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
6774 ff0d2220 2019-07-11 stsp free(new_commit_id);
6777 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
6778 ff0d2220 2019-07-11 stsp return error;
6781 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
6782 64c6d990 2019-07-11 stsp const char *path_prefix;
6783 64c6d990 2019-07-11 stsp size_t len;
6784 8ca9bd68 2019-07-25 stsp int errcode;
6787 64c6d990 2019-07-11 stsp static const struct got_error *
6788 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6789 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
6790 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
6791 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
6793 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
6795 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6796 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6797 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
6799 64c6d990 2019-07-11 stsp return NULL;
6802 64c6d990 2019-07-11 stsp static const struct got_error *
6803 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
6804 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
6805 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
6807 64c6d990 2019-07-11 stsp const struct got_error *err;
6808 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6809 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
6810 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
6812 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
6813 64c6d990 2019-07-11 stsp return NULL;
6815 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6817 64c6d990 2019-07-11 stsp goto done;
6819 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6821 64c6d990 2019-07-11 stsp goto done;
6823 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
6824 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
6826 64c6d990 2019-07-11 stsp goto done;
6828 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
6829 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
6831 64c6d990 2019-07-11 stsp goto done;
6833 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
6834 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
6835 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
6836 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
6837 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
6838 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
6839 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
6841 64c6d990 2019-07-11 stsp if (tree1)
6842 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
6843 64c6d990 2019-07-11 stsp if (tree2)
6844 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
6845 64c6d990 2019-07-11 stsp if (commit)
6846 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
6847 64c6d990 2019-07-11 stsp if (parent_commit)
6848 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
6849 64c6d990 2019-07-11 stsp return err;
6852 ff0d2220 2019-07-11 stsp static const struct got_error *
6853 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
6854 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
6855 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6856 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
6857 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
6859 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
6860 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
6861 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
6862 af61c510 2019-07-19 stsp struct got_object_qid *qid;
6863 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
6865 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
6867 af61c510 2019-07-19 stsp return err;
6869 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6870 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6872 af61c510 2019-07-19 stsp goto done;
6873 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6874 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
6875 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
6876 af61c510 2019-07-19 stsp if (err) {
6877 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
6878 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
6879 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
6880 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
6881 af61c510 2019-07-19 stsp "been reached?!?");
6883 ee780d5c 2020-01-04 stsp goto done;
6885 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
6886 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
6888 af61c510 2019-07-19 stsp goto done;
6890 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
6892 af61c510 2019-07-19 stsp goto done;
6893 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6894 af61c510 2019-07-19 stsp commit_id = parent_id;
6898 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
6899 af61c510 2019-07-19 stsp return err;
6902 af61c510 2019-07-19 stsp static const struct got_error *
6903 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
6905 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
6906 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
6907 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
6908 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6909 818c7501 2019-07-11 stsp char *cwd = NULL;
6910 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
6911 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
6912 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
6913 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
6914 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
6915 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
6916 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
6917 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
6918 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6919 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
6920 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
6921 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
6922 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
6924 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
6925 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
6927 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
6928 818c7501 2019-07-11 stsp switch (ch) {
6930 818c7501 2019-07-11 stsp abort_rebase = 1;
6933 818c7501 2019-07-11 stsp continue_rebase = 1;
6936 818c7501 2019-07-11 stsp usage_rebase();
6937 818c7501 2019-07-11 stsp /* NOTREACHED */
6941 818c7501 2019-07-11 stsp argc -= optind;
6942 818c7501 2019-07-11 stsp argv += optind;
6944 43012d58 2019-07-14 stsp #ifndef PROFILE
6945 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6946 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6947 43012d58 2019-07-14 stsp err(1, "pledge");
6949 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
6950 818c7501 2019-07-11 stsp usage_rebase();
6951 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
6952 818c7501 2019-07-11 stsp if (argc != 0)
6953 818c7501 2019-07-11 stsp usage_rebase();
6954 818c7501 2019-07-11 stsp } else if (argc != 1)
6955 818c7501 2019-07-11 stsp usage_rebase();
6957 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
6958 818c7501 2019-07-11 stsp if (cwd == NULL) {
6959 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
6960 818c7501 2019-07-11 stsp goto done;
6962 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
6963 fa51e947 2020-03-27 stsp if (error) {
6964 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6965 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
6966 818c7501 2019-07-11 stsp goto done;
6969 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6971 818c7501 2019-07-11 stsp if (error != NULL)
6972 818c7501 2019-07-11 stsp goto done;
6974 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6975 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6976 7ef62c4e 2020-02-24 stsp if (error)
6977 7ef62c4e 2020-02-24 stsp goto done;
6979 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6980 7ef62c4e 2020-02-24 stsp worktree);
6981 818c7501 2019-07-11 stsp if (error)
6982 7ef62c4e 2020-02-24 stsp goto done;
6983 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
6984 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6985 818c7501 2019-07-11 stsp goto done;
6988 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6989 818c7501 2019-07-11 stsp if (error)
6990 818c7501 2019-07-11 stsp goto done;
6992 f6794adc 2019-07-23 stsp if (abort_rebase) {
6993 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6994 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
6995 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
6996 f6794adc 2019-07-23 stsp goto done;
6998 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
6999 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7000 3e3a69f1 2019-07-25 stsp worktree, repo);
7001 818c7501 2019-07-11 stsp if (error)
7002 818c7501 2019-07-11 stsp goto done;
7003 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7004 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7005 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7006 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7007 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7008 818c7501 2019-07-11 stsp if (error)
7009 818c7501 2019-07-11 stsp goto done;
7010 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7011 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7012 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7015 818c7501 2019-07-11 stsp if (continue_rebase) {
7016 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7017 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7018 f6794adc 2019-07-23 stsp goto done;
7020 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7021 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7022 3e3a69f1 2019-07-25 stsp worktree, repo);
7023 818c7501 2019-07-11 stsp if (error)
7024 818c7501 2019-07-11 stsp goto done;
7026 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7027 01757395 2019-07-12 stsp resume_commit_id, repo);
7028 818c7501 2019-07-11 stsp if (error)
7029 818c7501 2019-07-11 stsp goto done;
7031 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7032 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7033 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7034 818c7501 2019-07-11 stsp goto done;
7037 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7038 818c7501 2019-07-11 stsp if (error != NULL)
7039 818c7501 2019-07-11 stsp goto done;
7042 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7043 ff0d2220 2019-07-11 stsp if (error)
7044 ff0d2220 2019-07-11 stsp goto done;
7046 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7047 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7049 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7050 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7051 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7052 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7053 818c7501 2019-07-11 stsp if (error)
7054 818c7501 2019-07-11 stsp goto done;
7055 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7056 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7057 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7058 818c7501 2019-07-11 stsp "with work tree's branch");
7059 818c7501 2019-07-11 stsp goto done;
7062 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7063 a51a74b3 2019-07-27 stsp if (error) {
7064 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7065 a51a74b3 2019-07-27 stsp goto done;
7066 a51a74b3 2019-07-27 stsp error = NULL;
7068 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7069 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7070 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7071 a51a74b3 2019-07-27 stsp goto done;
7073 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7074 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7075 818c7501 2019-07-11 stsp if (error)
7076 818c7501 2019-07-11 stsp goto done;
7079 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7080 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7081 818c7501 2019-07-11 stsp if (error)
7082 818c7501 2019-07-11 stsp goto done;
7084 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7085 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7086 fc66b545 2019-08-12 stsp if (pid == NULL) {
7087 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7088 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7089 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7090 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7091 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7092 fc66b545 2019-08-12 stsp if (error)
7093 fc66b545 2019-08-12 stsp goto done;
7094 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7095 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7096 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7099 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7100 fc66b545 2019-08-12 stsp goto done;
7102 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7103 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7104 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7105 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7106 818c7501 2019-07-11 stsp commit = NULL;
7107 818c7501 2019-07-11 stsp if (error)
7108 818c7501 2019-07-11 stsp goto done;
7110 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7111 38b0338b 2019-11-29 stsp if (continue_rebase) {
7112 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7113 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7114 38b0338b 2019-11-29 stsp goto done;
7116 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7117 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7118 38b0338b 2019-11-29 stsp char *id_str;
7119 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7120 38b0338b 2019-11-29 stsp new_base_branch);
7121 38b0338b 2019-11-29 stsp if (error)
7122 38b0338b 2019-11-29 stsp goto done;
7123 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7124 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7125 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7126 38b0338b 2019-11-29 stsp free(id_str);
7127 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7128 38b0338b 2019-11-29 stsp new_head_commit_id);
7129 38b0338b 2019-11-29 stsp if (error)
7130 38b0338b 2019-11-29 stsp goto done;
7134 818c7501 2019-07-11 stsp pid = NULL;
7135 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7136 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7138 818c7501 2019-07-11 stsp commit_id = qid->id;
7139 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7140 818c7501 2019-07-11 stsp pid = qid;
7142 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7143 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7144 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7145 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7146 818c7501 2019-07-11 stsp if (error)
7147 818c7501 2019-07-11 stsp goto done;
7149 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7150 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7151 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7153 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7154 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7155 a0ea4fc0 2020-02-28 stsp if (error)
7156 a0ea4fc0 2020-02-28 stsp goto done;
7157 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7161 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7162 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7163 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7164 818c7501 2019-07-11 stsp if (error)
7165 818c7501 2019-07-11 stsp goto done;
7168 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7169 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7170 818c7501 2019-07-11 stsp if (error)
7171 818c7501 2019-07-11 stsp goto done;
7172 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7173 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7175 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7176 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7178 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7179 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7180 818c7501 2019-07-11 stsp free(resume_commit_id);
7181 818c7501 2019-07-11 stsp free(yca_id);
7182 818c7501 2019-07-11 stsp if (commit)
7183 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7184 818c7501 2019-07-11 stsp if (branch)
7185 818c7501 2019-07-11 stsp got_ref_close(branch);
7186 818c7501 2019-07-11 stsp if (new_base_branch)
7187 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7188 818c7501 2019-07-11 stsp if (tmp_branch)
7189 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7190 5ef14e63 2019-06-02 stsp if (worktree)
7191 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7193 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7194 5ef14e63 2019-06-02 stsp return error;
7197 0ebf8283 2019-07-24 stsp __dead static void
7198 0ebf8283 2019-07-24 stsp usage_histedit(void)
7200 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7201 0ebf8283 2019-07-24 stsp getprogname());
7205 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7206 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7207 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7208 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7209 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7211 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7212 0ebf8283 2019-07-24 stsp unsigned char code;
7213 0ebf8283 2019-07-24 stsp const char *name;
7214 0ebf8283 2019-07-24 stsp const char *desc;
7215 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7216 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7217 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7218 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7219 82997472 2020-01-29 stsp "be used" },
7220 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7221 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7222 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7225 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7226 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7227 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7228 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7229 0ebf8283 2019-07-24 stsp char *logmsg;
7231 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7233 0ebf8283 2019-07-24 stsp static const struct got_error *
7234 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7235 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7237 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7238 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7239 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7242 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7244 0ebf8283 2019-07-24 stsp goto done;
7246 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7248 0ebf8283 2019-07-24 stsp goto done;
7250 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7252 0ebf8283 2019-07-24 stsp goto done;
7254 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7255 0ebf8283 2019-07-24 stsp if (n < 0)
7256 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7258 0ebf8283 2019-07-24 stsp if (commit)
7259 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7260 0ebf8283 2019-07-24 stsp free(id_str);
7261 0ebf8283 2019-07-24 stsp free(logmsg);
7262 0ebf8283 2019-07-24 stsp return err;
7265 0ebf8283 2019-07-24 stsp static const struct got_error *
7266 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7267 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7269 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7270 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7272 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7273 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7275 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7276 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7280 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7281 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7282 083957f4 2020-02-24 stsp if (n < 0) {
7283 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7289 0ebf8283 2019-07-24 stsp return err;
7292 0ebf8283 2019-07-24 stsp static const struct got_error *
7293 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7294 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7296 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7298 514f2ffe 2020-01-29 stsp char *id_str;
7299 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7301 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7302 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7304 514f2ffe 2020-01-29 stsp return err;
7306 514f2ffe 2020-01-29 stsp n = fprintf(f,
7307 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7308 514f2ffe 2020-01-29 stsp "# commit %s\n"
7309 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7310 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7311 514f2ffe 2020-01-29 stsp if (n < 0) {
7312 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7313 514f2ffe 2020-01-29 stsp goto done;
7316 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7317 514f2ffe 2020-01-29 stsp if (n < 0) {
7318 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7319 514f2ffe 2020-01-29 stsp goto done;
7322 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7323 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7324 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7325 0ebf8283 2019-07-24 stsp cmd->desc);
7326 0ebf8283 2019-07-24 stsp if (n < 0) {
7327 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7332 514f2ffe 2020-01-29 stsp free(id_str);
7333 0ebf8283 2019-07-24 stsp return err;
7336 0ebf8283 2019-07-24 stsp static const struct got_error *
7337 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7339 0ebf8283 2019-07-24 stsp static char msg[42];
7342 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7344 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7345 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7347 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7350 0ebf8283 2019-07-24 stsp static const struct got_error *
7351 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7352 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7354 0ebf8283 2019-07-24 stsp const struct got_error *err;
7355 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7356 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7358 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7360 0ebf8283 2019-07-24 stsp return err;
7362 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7364 0ebf8283 2019-07-24 stsp goto done;
7366 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7368 5943eee2 2019-08-13 stsp goto done;
7369 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7370 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7371 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7372 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7375 0ebf8283 2019-07-24 stsp if (folded_commit)
7376 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7377 0ebf8283 2019-07-24 stsp free(id_str);
7378 5943eee2 2019-08-13 stsp free(folded_logmsg);
7379 0ebf8283 2019-07-24 stsp return err;
7382 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7383 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7385 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7387 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7388 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7389 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7390 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7391 3f9de99f 2019-07-24 stsp folded = prev;
7392 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7395 0ebf8283 2019-07-24 stsp return folded;
7398 0ebf8283 2019-07-24 stsp static const struct got_error *
7399 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7400 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7402 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7403 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7404 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7405 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7407 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7409 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7411 0ebf8283 2019-07-24 stsp return err;
7413 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7414 0ebf8283 2019-07-24 stsp if (folded) {
7415 0ebf8283 2019-07-24 stsp while (folded != hle) {
7416 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7417 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7420 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7421 0ebf8283 2019-07-24 stsp logmsg, repo);
7423 0ebf8283 2019-07-24 stsp goto done;
7424 0ebf8283 2019-07-24 stsp free(logmsg);
7425 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7426 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7430 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7432 0ebf8283 2019-07-24 stsp goto done;
7433 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7435 5943eee2 2019-08-13 stsp goto done;
7436 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
7437 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7438 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7439 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7440 0ebf8283 2019-07-24 stsp goto done;
7442 0ebf8283 2019-07-24 stsp free(logmsg);
7443 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7445 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7447 0ebf8283 2019-07-24 stsp goto done;
7449 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
7450 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
7452 0ebf8283 2019-07-24 stsp goto done;
7454 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
7455 0ebf8283 2019-07-24 stsp close(fd);
7457 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7459 0ebf8283 2019-07-24 stsp goto done;
7461 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7462 0ebf8283 2019-07-24 stsp if (err) {
7463 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7464 0ebf8283 2019-07-24 stsp goto done;
7465 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7468 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7469 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
7470 0ebf8283 2019-07-24 stsp free(logmsg_path);
7471 0ebf8283 2019-07-24 stsp free(logmsg);
7472 5943eee2 2019-08-13 stsp free(orig_logmsg);
7473 0ebf8283 2019-07-24 stsp free(editor);
7474 0ebf8283 2019-07-24 stsp if (commit)
7475 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7476 0ebf8283 2019-07-24 stsp return err;
7479 0ebf8283 2019-07-24 stsp static const struct got_error *
7480 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
7481 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7483 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7484 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
7485 0ebf8283 2019-07-24 stsp size_t size;
7486 0ebf8283 2019-07-24 stsp ssize_t len;
7487 0ebf8283 2019-07-24 stsp int lineno = 0, i;
7488 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7489 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
7490 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
7492 0ebf8283 2019-07-24 stsp for (;;) {
7493 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
7494 0ebf8283 2019-07-24 stsp if (len == -1) {
7495 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
7496 0ebf8283 2019-07-24 stsp if (feof(f))
7498 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
7499 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
7504 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7506 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
7507 0ebf8283 2019-07-24 stsp free(line);
7508 0ebf8283 2019-07-24 stsp line = NULL;
7511 0ebf8283 2019-07-24 stsp cmd = NULL;
7512 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7513 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
7514 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7515 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
7516 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
7519 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7524 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
7525 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7528 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7530 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
7531 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
7532 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
7535 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
7536 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7540 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
7541 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
7542 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7546 0ebf8283 2019-07-24 stsp free(line);
7547 0ebf8283 2019-07-24 stsp line = NULL;
7551 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
7553 0ebf8283 2019-07-24 stsp *end = '\0';
7555 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
7556 0ebf8283 2019-07-24 stsp if (err) {
7557 0ebf8283 2019-07-24 stsp /* override error code */
7558 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7562 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
7563 0ebf8283 2019-07-24 stsp if (hle == NULL) {
7564 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
7567 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
7568 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
7569 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
7570 0ebf8283 2019-07-24 stsp commit_id = NULL;
7571 0ebf8283 2019-07-24 stsp free(line);
7572 0ebf8283 2019-07-24 stsp line = NULL;
7573 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7576 0ebf8283 2019-07-24 stsp free(line);
7577 0ebf8283 2019-07-24 stsp free(commit_id);
7578 0ebf8283 2019-07-24 stsp return err;
7581 0ebf8283 2019-07-24 stsp static const struct got_error *
7582 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
7583 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
7585 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
7586 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
7587 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7588 5b87815e 2020-03-05 stsp static char msg[92];
7589 bfce7f83 2019-07-27 stsp char *id_str;
7591 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
7592 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7593 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
7594 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
7595 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7597 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7598 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
7599 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7600 5b87815e 2020-03-05 stsp if (hle == hle2)
7602 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
7603 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
7605 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
7607 5b87815e 2020-03-05 stsp return err;
7608 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
7609 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
7610 5b87815e 2020-03-05 stsp free(id_str);
7611 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7615 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7616 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7617 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7620 bfce7f83 2019-07-27 stsp if (hle == NULL) {
7621 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
7623 bfce7f83 2019-07-27 stsp return err;
7624 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
7625 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
7626 bfce7f83 2019-07-27 stsp free(id_str);
7627 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7631 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7632 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7633 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7634 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
7636 bfce7f83 2019-07-27 stsp return NULL;
7639 bfce7f83 2019-07-27 stsp static const struct got_error *
7640 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
7641 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
7642 bfce7f83 2019-07-27 stsp struct got_repository *repo)
7644 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7645 0ebf8283 2019-07-24 stsp char *editor;
7646 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7648 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7650 0ebf8283 2019-07-24 stsp return err;
7652 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
7653 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
7654 0ebf8283 2019-07-24 stsp goto done;
7657 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7658 0ebf8283 2019-07-24 stsp if (f == NULL) {
7659 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
7660 0ebf8283 2019-07-24 stsp goto done;
7662 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7664 bfce7f83 2019-07-27 stsp goto done;
7666 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
7668 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7669 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7670 0ebf8283 2019-07-24 stsp free(editor);
7671 0ebf8283 2019-07-24 stsp return err;
7674 0ebf8283 2019-07-24 stsp static const struct got_error *
7675 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7676 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
7677 514f2ffe 2020-01-29 stsp struct got_repository *);
7679 0ebf8283 2019-07-24 stsp static const struct got_error *
7680 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
7681 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
7682 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
7684 0ebf8283 2019-07-24 stsp const struct got_error *err;
7685 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7686 0ebf8283 2019-07-24 stsp char *path = NULL;
7688 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
7690 0ebf8283 2019-07-24 stsp return err;
7692 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
7694 0ebf8283 2019-07-24 stsp goto done;
7696 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7698 0ebf8283 2019-07-24 stsp goto done;
7700 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7701 083957f4 2020-02-24 stsp rewind(f);
7702 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7704 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
7705 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
7706 0ebf8283 2019-07-24 stsp goto done;
7709 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
7710 083957f4 2020-02-24 stsp if (err) {
7711 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7712 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7713 083957f4 2020-02-24 stsp goto done;
7714 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
7715 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
7719 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7720 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7721 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
7722 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
7723 0ebf8283 2019-07-24 stsp free(path);
7724 0ebf8283 2019-07-24 stsp return err;
7727 0ebf8283 2019-07-24 stsp static const struct got_error *
7728 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
7729 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7731 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7732 0ebf8283 2019-07-24 stsp char *path = NULL;
7733 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7734 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7735 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7737 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
7739 0ebf8283 2019-07-24 stsp return err;
7741 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
7742 0ebf8283 2019-07-24 stsp if (f == NULL) {
7743 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7744 0ebf8283 2019-07-24 stsp goto done;
7746 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7747 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7752 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7753 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
7754 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
7755 0ebf8283 2019-07-24 stsp if (n < 0) {
7756 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7762 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7763 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7764 0ebf8283 2019-07-24 stsp free(path);
7765 0ebf8283 2019-07-24 stsp if (commit)
7766 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7767 0ebf8283 2019-07-24 stsp return err;
7771 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
7773 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7775 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
7776 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
7777 bfce7f83 2019-07-27 stsp free(hle);
7781 0ebf8283 2019-07-24 stsp static const struct got_error *
7782 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
7783 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
7785 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7786 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7788 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7789 0ebf8283 2019-07-24 stsp if (f == NULL) {
7790 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7791 0ebf8283 2019-07-24 stsp goto done;
7794 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7796 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7797 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7798 0ebf8283 2019-07-24 stsp return err;
7801 0ebf8283 2019-07-24 stsp static const struct got_error *
7802 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7803 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
7804 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
7806 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
7807 0ebf8283 2019-07-24 stsp int resp = ' ';
7809 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
7810 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7811 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
7812 0ebf8283 2019-07-24 stsp resp = getchar();
7813 a61a4414 2019-08-07 stsp if (resp == '\n')
7814 a61a4414 2019-08-07 stsp resp = getchar();
7815 426ebf2e 2019-07-25 stsp if (resp == 'c') {
7816 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7817 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
7819 426ebf2e 2019-07-25 stsp if (err) {
7820 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7821 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7823 bfce7f83 2019-07-27 stsp prev_err = err;
7824 426ebf2e 2019-07-25 stsp resp = ' ';
7828 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
7829 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7830 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
7831 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
7832 426ebf2e 2019-07-25 stsp if (err) {
7833 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7834 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7836 bfce7f83 2019-07-27 stsp prev_err = err;
7837 426ebf2e 2019-07-25 stsp resp = ' ';
7841 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
7842 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7845 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
7848 0ebf8283 2019-07-24 stsp return err;
7851 0ebf8283 2019-07-24 stsp static const struct got_error *
7852 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
7853 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7854 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
7856 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7857 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7858 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7859 3e3a69f1 2019-07-25 stsp branch, repo);
7862 0ebf8283 2019-07-24 stsp static const struct got_error *
7863 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
7864 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7866 0ebf8283 2019-07-24 stsp const struct got_error *err;
7867 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7869 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
7871 0ebf8283 2019-07-24 stsp goto done;
7873 0ebf8283 2019-07-24 stsp if (new_id) {
7874 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
7876 0ebf8283 2019-07-24 stsp goto done;
7879 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
7880 0ebf8283 2019-07-24 stsp if (new_id_str)
7881 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
7883 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7884 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
7885 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
7886 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7887 0ebf8283 2019-07-24 stsp goto done;
7889 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
7891 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7893 0ebf8283 2019-07-24 stsp goto done;
7896 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
7897 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
7898 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
7899 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
7900 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7902 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
7903 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
7904 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
7911 0ebf8283 2019-07-24 stsp free(old_id_str);
7912 0ebf8283 2019-07-24 stsp free(new_id_str);
7913 0ebf8283 2019-07-24 stsp return err;
7916 0ebf8283 2019-07-24 stsp static const struct got_error *
7917 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
7918 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7919 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
7920 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7922 0ebf8283 2019-07-24 stsp const struct got_error *err;
7923 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7924 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
7926 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
7927 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
7928 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7930 0ebf8283 2019-07-24 stsp return err;
7933 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7935 0ebf8283 2019-07-24 stsp return err;
7937 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
7938 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
7939 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
7940 0ebf8283 2019-07-24 stsp if (err) {
7941 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
7942 0ebf8283 2019-07-24 stsp goto done;
7943 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
7945 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
7946 0ebf8283 2019-07-24 stsp free(new_commit_id);
7949 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7950 0ebf8283 2019-07-24 stsp return err;
7953 0ebf8283 2019-07-24 stsp static const struct got_error *
7954 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
7955 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7957 0ebf8283 2019-07-24 stsp const struct got_error *error;
7958 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7960 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
7962 0ebf8283 2019-07-24 stsp if (error)
7963 0ebf8283 2019-07-24 stsp return error;
7965 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
7966 0ebf8283 2019-07-24 stsp if (error)
7967 0ebf8283 2019-07-24 stsp return error;
7969 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
7970 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7971 0ebf8283 2019-07-24 stsp return error;
7974 ab20a43a 2020-01-29 stsp static const struct got_error *
7975 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
7976 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
7977 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7978 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7980 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
7982 ab20a43a 2020-01-29 stsp switch (status) {
7983 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7984 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7985 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7986 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
7987 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7988 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
7993 ab20a43a 2020-01-29 stsp switch (staged_status) {
7994 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7995 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7996 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7997 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7998 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8003 ab20a43a 2020-01-29 stsp return NULL;
8006 0ebf8283 2019-07-24 stsp static const struct got_error *
8007 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8009 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8010 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8011 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8012 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8013 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8014 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8015 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8016 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8017 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8018 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8019 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8020 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8021 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8022 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8023 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
8024 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8025 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8026 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8027 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8028 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8029 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8030 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8031 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8033 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8034 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8035 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8036 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8038 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8039 0ebf8283 2019-07-24 stsp switch (ch) {
8041 0ebf8283 2019-07-24 stsp abort_edit = 1;
8044 0ebf8283 2019-07-24 stsp continue_edit = 1;
8047 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8050 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8053 0ebf8283 2019-07-24 stsp usage_histedit();
8054 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8058 0ebf8283 2019-07-24 stsp argc -= optind;
8059 0ebf8283 2019-07-24 stsp argv += optind;
8061 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8062 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8063 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8064 0ebf8283 2019-07-24 stsp err(1, "pledge");
8066 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8067 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
8068 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8069 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
8070 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8071 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
8072 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8073 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
8074 0ebf8283 2019-07-24 stsp if (argc != 0)
8075 0ebf8283 2019-07-24 stsp usage_histedit();
8078 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8079 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8080 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8081 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8082 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8083 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8086 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8087 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8088 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8089 0ebf8283 2019-07-24 stsp goto done;
8091 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8092 fa51e947 2020-03-27 stsp if (error) {
8093 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8094 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8095 0ebf8283 2019-07-24 stsp goto done;
8098 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8100 0ebf8283 2019-07-24 stsp if (error != NULL)
8101 0ebf8283 2019-07-24 stsp goto done;
8103 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8104 0ebf8283 2019-07-24 stsp if (error)
8105 0ebf8283 2019-07-24 stsp goto done;
8106 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8107 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8108 0ebf8283 2019-07-24 stsp goto done;
8111 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8112 0ebf8283 2019-07-24 stsp if (error)
8113 0ebf8283 2019-07-24 stsp goto done;
8115 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8116 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8117 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8118 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8119 083957f4 2020-02-24 stsp "before the -m option can be used");
8120 083957f4 2020-02-24 stsp goto done;
8123 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8124 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8125 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8126 3e3a69f1 2019-07-25 stsp worktree, repo);
8127 0ebf8283 2019-07-24 stsp if (error)
8128 0ebf8283 2019-07-24 stsp goto done;
8129 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8130 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8131 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8132 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8133 0ebf8283 2019-07-24 stsp if (error)
8134 0ebf8283 2019-07-24 stsp goto done;
8135 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8136 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8137 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8138 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8139 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8140 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8141 0ebf8283 2019-07-24 stsp goto done;
8144 0ebf8283 2019-07-24 stsp if (continue_edit) {
8145 0ebf8283 2019-07-24 stsp char *path;
8147 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8148 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8149 0ebf8283 2019-07-24 stsp goto done;
8152 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8153 0ebf8283 2019-07-24 stsp if (error)
8154 0ebf8283 2019-07-24 stsp goto done;
8156 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8157 0ebf8283 2019-07-24 stsp free(path);
8158 0ebf8283 2019-07-24 stsp if (error)
8159 0ebf8283 2019-07-24 stsp goto done;
8161 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8162 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8163 3e3a69f1 2019-07-25 stsp worktree, repo);
8164 0ebf8283 2019-07-24 stsp if (error)
8165 0ebf8283 2019-07-24 stsp goto done;
8167 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8168 0ebf8283 2019-07-24 stsp if (error)
8169 0ebf8283 2019-07-24 stsp goto done;
8171 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8172 0ebf8283 2019-07-24 stsp head_commit_id);
8173 0ebf8283 2019-07-24 stsp if (error)
8174 0ebf8283 2019-07-24 stsp goto done;
8175 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8176 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8177 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8178 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8179 3aac7cf7 2019-07-25 stsp goto done;
8181 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8182 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8183 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8184 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8185 0ebf8283 2019-07-24 stsp commit = NULL;
8186 0ebf8283 2019-07-24 stsp if (error)
8187 0ebf8283 2019-07-24 stsp goto done;
8189 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8190 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8191 0ebf8283 2019-07-24 stsp goto done;
8194 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8195 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8196 0ebf8283 2019-07-24 stsp if (error != NULL)
8197 0ebf8283 2019-07-24 stsp goto done;
8199 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8200 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8201 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8202 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8203 c7d20a3f 2019-07-30 stsp goto done;
8206 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8207 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8208 bfce7f83 2019-07-27 stsp branch = NULL;
8209 0ebf8283 2019-07-24 stsp if (error)
8210 0ebf8283 2019-07-24 stsp goto done;
8212 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8213 0ebf8283 2019-07-24 stsp head_commit_id);
8214 0ebf8283 2019-07-24 stsp if (error)
8215 0ebf8283 2019-07-24 stsp goto done;
8216 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8217 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8218 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8219 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8220 3aac7cf7 2019-07-25 stsp goto done;
8222 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8223 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8224 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8225 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8226 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8227 0ebf8283 2019-07-24 stsp commit = NULL;
8228 0ebf8283 2019-07-24 stsp if (error)
8229 0ebf8283 2019-07-24 stsp goto done;
8231 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8232 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8233 c5996fff 2020-01-29 stsp goto done;
8236 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8237 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8238 bfce7f83 2019-07-27 stsp if (error)
8239 bfce7f83 2019-07-27 stsp goto done;
8241 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8242 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8243 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8244 6ba2bea2 2019-07-27 stsp if (error) {
8245 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8246 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8247 9627c110 2020-04-18 stsp update_progress, &upa);
8248 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8249 0ebf8283 2019-07-24 stsp goto done;
8252 514f2ffe 2020-01-29 stsp const char *branch_name;
8253 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8254 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8255 514f2ffe 2020-01-29 stsp branch_name += 11;
8256 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8257 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8258 6ba2bea2 2019-07-27 stsp if (error) {
8259 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8260 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8261 9627c110 2020-04-18 stsp update_progress, &upa);
8262 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8263 0ebf8283 2019-07-24 stsp goto done;
8268 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8270 6ba2bea2 2019-07-27 stsp if (error) {
8271 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8272 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8273 9627c110 2020-04-18 stsp update_progress, &upa);
8274 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8275 0ebf8283 2019-07-24 stsp goto done;
8280 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8281 4ec14e60 2019-08-28 hiltjo if (error)
8282 0ebf8283 2019-07-24 stsp goto done;
8284 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8285 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8286 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8287 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8290 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8291 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8292 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8293 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8295 ab20a43a 2020-01-29 stsp if (error)
8296 ab20a43a 2020-01-29 stsp goto done;
8298 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8299 ab20a43a 2020-01-29 stsp int have_changes = 0;
8301 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8302 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8303 ab20a43a 2020-01-29 stsp if (error)
8304 ab20a43a 2020-01-29 stsp goto done;
8305 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8306 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8307 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8308 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8309 ab20a43a 2020-01-29 stsp if (error) {
8310 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8311 ab20a43a 2020-01-29 stsp goto done;
8312 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8313 ab20a43a 2020-01-29 stsp goto done;
8315 ab20a43a 2020-01-29 stsp if (have_changes) {
8316 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8317 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8318 ab20a43a 2020-01-29 stsp if (error)
8319 ab20a43a 2020-01-29 stsp goto done;
8321 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8322 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8323 ab20a43a 2020-01-29 stsp if (error)
8324 ab20a43a 2020-01-29 stsp goto done;
8325 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8326 ab20a43a 2020-01-29 stsp hle, NULL);
8327 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8328 ab20a43a 2020-01-29 stsp commit = NULL;
8329 ab20a43a 2020-01-29 stsp if (error)
8330 ab20a43a 2020-01-29 stsp goto done;
8336 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8337 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8338 0ebf8283 2019-07-24 stsp if (error)
8339 0ebf8283 2019-07-24 stsp goto done;
8343 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8344 0ebf8283 2019-07-24 stsp hle->commit_id);
8345 0ebf8283 2019-07-24 stsp if (error)
8346 0ebf8283 2019-07-24 stsp goto done;
8347 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8348 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8350 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8351 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8352 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8353 0ebf8283 2019-07-24 stsp if (error)
8354 0ebf8283 2019-07-24 stsp goto done;
8355 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8356 0ebf8283 2019-07-24 stsp commit = NULL;
8358 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8359 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8360 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8362 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8363 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8365 a0ea4fc0 2020-02-28 stsp if (error)
8366 a0ea4fc0 2020-02-28 stsp goto done;
8367 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8371 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8372 0ebf8283 2019-07-24 stsp char *id_str;
8373 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8374 0ebf8283 2019-07-24 stsp if (error)
8375 0ebf8283 2019-07-24 stsp goto done;
8376 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8378 0ebf8283 2019-07-24 stsp free(id_str);
8379 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8380 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8381 3e3a69f1 2019-07-25 stsp fileindex);
8382 0ebf8283 2019-07-24 stsp goto done;
8385 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8386 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8387 0ebf8283 2019-07-24 stsp if (error)
8388 0ebf8283 2019-07-24 stsp goto done;
8392 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8393 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8394 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8395 0ebf8283 2019-07-24 stsp if (error)
8396 0ebf8283 2019-07-24 stsp goto done;
8399 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8400 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8401 0ebf8283 2019-07-24 stsp if (error)
8402 0ebf8283 2019-07-24 stsp goto done;
8403 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8404 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8406 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8407 3e3a69f1 2019-07-25 stsp branch, repo);
8409 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8410 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8411 0ebf8283 2019-07-24 stsp free(head_commit_id);
8412 0ebf8283 2019-07-24 stsp free(base_commit_id);
8413 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8414 0ebf8283 2019-07-24 stsp if (commit)
8415 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8416 0ebf8283 2019-07-24 stsp if (branch)
8417 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8418 0ebf8283 2019-07-24 stsp if (tmp_branch)
8419 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8420 0ebf8283 2019-07-24 stsp if (worktree)
8421 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8423 2822a352 2019-10-15 stsp got_repo_close(repo);
8424 2822a352 2019-10-15 stsp return error;
8427 2822a352 2019-10-15 stsp __dead static void
8428 2822a352 2019-10-15 stsp usage_integrate(void)
8430 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8434 2822a352 2019-10-15 stsp static const struct got_error *
8435 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8437 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8438 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8439 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8440 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8441 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8442 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8443 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8444 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8446 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8448 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8449 2822a352 2019-10-15 stsp switch (ch) {
8451 2822a352 2019-10-15 stsp usage_integrate();
8452 2822a352 2019-10-15 stsp /* NOTREACHED */
8456 2822a352 2019-10-15 stsp argc -= optind;
8457 2822a352 2019-10-15 stsp argv += optind;
8459 2822a352 2019-10-15 stsp if (argc != 1)
8460 2822a352 2019-10-15 stsp usage_integrate();
8461 2822a352 2019-10-15 stsp branch_arg = argv[0];
8463 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8464 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
8465 2822a352 2019-10-15 stsp err(1, "pledge");
8467 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
8468 2822a352 2019-10-15 stsp if (cwd == NULL) {
8469 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
8470 2822a352 2019-10-15 stsp goto done;
8473 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
8474 fa51e947 2020-03-27 stsp if (error) {
8475 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8476 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
8478 2822a352 2019-10-15 stsp goto done;
8481 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
8482 2822a352 2019-10-15 stsp if (error)
8483 2822a352 2019-10-15 stsp goto done;
8485 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8487 2822a352 2019-10-15 stsp if (error != NULL)
8488 2822a352 2019-10-15 stsp goto done;
8490 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8491 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
8492 2822a352 2019-10-15 stsp if (error)
8493 2822a352 2019-10-15 stsp goto done;
8495 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8496 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
8497 2822a352 2019-10-15 stsp goto done;
8500 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8501 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
8502 2822a352 2019-10-15 stsp if (error)
8503 2822a352 2019-10-15 stsp goto done;
8505 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
8506 2822a352 2019-10-15 stsp if (refname == NULL) {
8507 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8508 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8509 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8510 2822a352 2019-10-15 stsp goto done;
8512 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
8513 2822a352 2019-10-15 stsp if (base_refname == NULL) {
8514 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8515 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8516 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8517 2822a352 2019-10-15 stsp goto done;
8520 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
8521 2822a352 2019-10-15 stsp if (error)
8522 2822a352 2019-10-15 stsp goto done;
8524 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8525 2822a352 2019-10-15 stsp if (error)
8526 2822a352 2019-10-15 stsp goto done;
8528 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8529 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
8530 2822a352 2019-10-15 stsp "specified branch has already been integrated");
8531 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8532 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8533 2822a352 2019-10-15 stsp goto done;
8536 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8537 2822a352 2019-10-15 stsp if (error) {
8538 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
8539 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
8540 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8541 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8542 2822a352 2019-10-15 stsp goto done;
8545 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8546 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
8547 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
8548 2822a352 2019-10-15 stsp check_cancelled, NULL);
8549 2822a352 2019-10-15 stsp if (error)
8550 2822a352 2019-10-15 stsp goto done;
8552 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
8553 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8556 715dc77e 2019-08-03 stsp got_repo_close(repo);
8557 2822a352 2019-10-15 stsp if (worktree)
8558 2822a352 2019-10-15 stsp got_worktree_close(worktree);
8559 2822a352 2019-10-15 stsp free(cwd);
8560 2822a352 2019-10-15 stsp free(base_commit_id);
8561 2822a352 2019-10-15 stsp free(commit_id);
8562 2822a352 2019-10-15 stsp free(refname);
8563 2822a352 2019-10-15 stsp free(base_refname);
8564 715dc77e 2019-08-03 stsp return error;
8567 715dc77e 2019-08-03 stsp __dead static void
8568 715dc77e 2019-08-03 stsp usage_stage(void)
8570 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8571 f3055044 2019-08-07 stsp "[file-path ...]\n",
8572 715dc77e 2019-08-03 stsp getprogname());
8576 715dc77e 2019-08-03 stsp static const struct got_error *
8577 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
8578 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
8579 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8580 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
8582 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
8583 408b4ebc 2019-08-03 stsp char *id_str = NULL;
8585 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
8586 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
8587 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
8588 408b4ebc 2019-08-03 stsp return NULL;
8590 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
8591 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
8592 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
8594 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
8596 408b4ebc 2019-08-03 stsp return err;
8598 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
8599 408b4ebc 2019-08-03 stsp free(id_str);
8600 dc424a06 2019-08-07 stsp return NULL;
8603 dc424a06 2019-08-07 stsp static const struct got_error *
8604 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
8606 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
8607 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
8608 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
8609 715dc77e 2019-08-03 stsp char *cwd = NULL;
8610 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
8611 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
8612 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
8613 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
8614 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8615 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8617 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
8619 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8620 715dc77e 2019-08-03 stsp switch (ch) {
8622 408b4ebc 2019-08-03 stsp list_stage = 1;
8625 dc424a06 2019-08-07 stsp pflag = 1;
8628 dc424a06 2019-08-07 stsp patch_script_path = optarg;
8631 715dc77e 2019-08-03 stsp usage_stage();
8632 715dc77e 2019-08-03 stsp /* NOTREACHED */
8636 715dc77e 2019-08-03 stsp argc -= optind;
8637 715dc77e 2019-08-03 stsp argv += optind;
8639 715dc77e 2019-08-03 stsp #ifndef PROFILE
8640 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8641 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
8642 715dc77e 2019-08-03 stsp err(1, "pledge");
8644 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
8645 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
8646 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
8647 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
8649 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
8650 715dc77e 2019-08-03 stsp if (cwd == NULL) {
8651 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
8652 715dc77e 2019-08-03 stsp goto done;
8655 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8656 fa51e947 2020-03-27 stsp if (error) {
8657 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8658 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
8659 715dc77e 2019-08-03 stsp goto done;
8662 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8664 715dc77e 2019-08-03 stsp if (error != NULL)
8665 715dc77e 2019-08-03 stsp goto done;
8667 dc424a06 2019-08-07 stsp if (patch_script_path) {
8668 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
8669 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
8670 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
8671 dc424a06 2019-08-07 stsp patch_script_path);
8672 dc424a06 2019-08-07 stsp goto done;
8675 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8676 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
8677 715dc77e 2019-08-03 stsp if (error)
8678 715dc77e 2019-08-03 stsp goto done;
8680 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8681 6d022e97 2019-08-04 stsp if (error)
8682 6d022e97 2019-08-04 stsp goto done;
8684 6d022e97 2019-08-04 stsp if (list_stage)
8685 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
8686 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
8688 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8689 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
8690 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
8691 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
8692 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
8695 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8696 2e1f37b0 2019-08-08 stsp error == NULL)
8697 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8699 ad493afc 2019-08-03 stsp got_repo_close(repo);
8700 ad493afc 2019-08-03 stsp if (worktree)
8701 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
8702 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8703 ad493afc 2019-08-03 stsp free((char *)pe->path);
8704 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
8705 ad493afc 2019-08-03 stsp free(cwd);
8706 ad493afc 2019-08-03 stsp return error;
8709 ad493afc 2019-08-03 stsp __dead static void
8710 ad493afc 2019-08-03 stsp usage_unstage(void)
8712 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8713 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
8714 ad493afc 2019-08-03 stsp getprogname());
8719 ad493afc 2019-08-03 stsp static const struct got_error *
8720 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
8722 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
8723 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
8724 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
8725 ad493afc 2019-08-03 stsp char *cwd = NULL;
8726 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
8727 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8728 9627c110 2020-04-18 stsp int ch, pflag = 0;
8729 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8730 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
8731 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8732 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8734 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
8736 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
8737 ad493afc 2019-08-03 stsp switch (ch) {
8739 2e1f37b0 2019-08-08 stsp pflag = 1;
8742 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
8745 ad493afc 2019-08-03 stsp usage_unstage();
8746 ad493afc 2019-08-03 stsp /* NOTREACHED */
8750 ad493afc 2019-08-03 stsp argc -= optind;
8751 ad493afc 2019-08-03 stsp argv += optind;
8753 ad493afc 2019-08-03 stsp #ifndef PROFILE
8754 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8755 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
8756 ad493afc 2019-08-03 stsp err(1, "pledge");
8758 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
8759 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
8761 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
8762 ad493afc 2019-08-03 stsp if (cwd == NULL) {
8763 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
8764 ad493afc 2019-08-03 stsp goto done;
8767 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8768 fa51e947 2020-03-27 stsp if (error) {
8769 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8770 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
8771 ad493afc 2019-08-03 stsp goto done;
8774 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8776 ad493afc 2019-08-03 stsp if (error != NULL)
8777 ad493afc 2019-08-03 stsp goto done;
8779 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
8780 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
8781 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
8782 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
8783 2e1f37b0 2019-08-08 stsp patch_script_path);
8784 2e1f37b0 2019-08-08 stsp goto done;
8788 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8789 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
8790 ad493afc 2019-08-03 stsp if (error)
8791 ad493afc 2019-08-03 stsp goto done;
8793 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8794 ad493afc 2019-08-03 stsp if (error)
8795 ad493afc 2019-08-03 stsp goto done;
8797 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8798 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
8799 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8800 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
8801 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
8802 9627c110 2020-04-18 stsp if (!error)
8803 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8805 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8806 2e1f37b0 2019-08-08 stsp error == NULL)
8807 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8809 0ebf8283 2019-07-24 stsp got_repo_close(repo);
8810 715dc77e 2019-08-03 stsp if (worktree)
8811 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
8812 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8813 715dc77e 2019-08-03 stsp free((char *)pe->path);
8814 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
8815 715dc77e 2019-08-03 stsp free(cwd);
8816 01073a5d 2019-08-22 stsp return error;
8819 01073a5d 2019-08-22 stsp __dead static void
8820 01073a5d 2019-08-22 stsp usage_cat(void)
8822 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8823 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
8827 01073a5d 2019-08-22 stsp static const struct got_error *
8828 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8830 01073a5d 2019-08-22 stsp const struct got_error *err;
8831 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
8833 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
8835 01073a5d 2019-08-22 stsp return err;
8837 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8838 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
8839 01073a5d 2019-08-22 stsp return err;
8842 01073a5d 2019-08-22 stsp static const struct got_error *
8843 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8845 01073a5d 2019-08-22 stsp const struct got_error *err;
8846 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
8847 56e0773d 2019-11-28 stsp int nentries, i;
8849 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
8851 01073a5d 2019-08-22 stsp return err;
8853 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
8854 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
8855 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
8856 01073a5d 2019-08-22 stsp char *id_str;
8857 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
8859 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
8860 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8863 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
8864 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
8865 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
8866 01073a5d 2019-08-22 stsp free(id_str);
8869 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
8870 01073a5d 2019-08-22 stsp return err;
8873 01073a5d 2019-08-22 stsp static const struct got_error *
8874 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8876 01073a5d 2019-08-22 stsp const struct got_error *err;
8877 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
8878 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
8879 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
8880 01073a5d 2019-08-22 stsp char *id_str = NULL;
8881 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
8883 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
8885 01073a5d 2019-08-22 stsp return err;
8887 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8889 01073a5d 2019-08-22 stsp goto done;
8891 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8892 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8893 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
8894 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
8895 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
8896 01073a5d 2019-08-22 stsp char *pid_str;
8897 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
8899 01073a5d 2019-08-22 stsp goto done;
8900 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8901 01073a5d 2019-08-22 stsp free(pid_str);
8903 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
8904 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8905 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
8907 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
8908 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8909 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
8911 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
8912 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8913 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
8915 01073a5d 2019-08-22 stsp free(id_str);
8916 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
8917 01073a5d 2019-08-22 stsp return err;
8920 01073a5d 2019-08-22 stsp static const struct got_error *
8921 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8923 01073a5d 2019-08-22 stsp const struct got_error *err;
8924 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
8925 01073a5d 2019-08-22 stsp char *id_str = NULL;
8926 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
8928 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
8930 01073a5d 2019-08-22 stsp return err;
8932 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8934 01073a5d 2019-08-22 stsp goto done;
8936 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8938 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
8939 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
8940 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8941 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
8943 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
8944 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8945 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
8947 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
8948 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8949 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
8951 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
8952 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8953 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
8959 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8960 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
8962 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
8963 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
8964 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
8966 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
8967 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8968 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
8970 01073a5d 2019-08-22 stsp free(id_str);
8971 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
8972 01073a5d 2019-08-22 stsp return err;
8975 01073a5d 2019-08-22 stsp static const struct got_error *
8976 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
8978 01073a5d 2019-08-22 stsp const struct got_error *error;
8979 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
8980 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
8981 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
8982 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
8983 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
8984 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
8986 01073a5d 2019-08-22 stsp #ifndef PROFILE
8987 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8988 01073a5d 2019-08-22 stsp NULL) == -1)
8989 01073a5d 2019-08-22 stsp err(1, "pledge");
8992 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
8993 01073a5d 2019-08-22 stsp switch (ch) {
8995 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
8998 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
8999 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9000 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9002 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9005 896e9b6f 2019-08-26 stsp force_path = 1;
9008 01073a5d 2019-08-22 stsp usage_cat();
9009 01073a5d 2019-08-22 stsp /* NOTREACHED */
9013 01073a5d 2019-08-22 stsp argc -= optind;
9014 01073a5d 2019-08-22 stsp argv += optind;
9016 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9017 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9018 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9019 01073a5d 2019-08-22 stsp goto done;
9021 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9022 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9023 01073a5d 2019-08-22 stsp goto done;
9024 01073a5d 2019-08-22 stsp if (worktree) {
9025 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9026 01073a5d 2019-08-22 stsp repo_path = strdup(
9027 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9028 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9029 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9030 01073a5d 2019-08-22 stsp goto done;
9035 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9036 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9037 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9038 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9041 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9042 01073a5d 2019-08-22 stsp free(repo_path);
9043 01073a5d 2019-08-22 stsp if (error != NULL)
9044 01073a5d 2019-08-22 stsp goto done;
9046 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9047 896e9b6f 2019-08-26 stsp if (error)
9048 896e9b6f 2019-08-26 stsp goto done;
9050 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9051 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9052 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9053 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9054 01073a5d 2019-08-22 stsp if (error)
9055 01073a5d 2019-08-22 stsp goto done;
9057 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9058 896e9b6f 2019-08-26 stsp if (force_path) {
9059 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9061 896e9b6f 2019-08-26 stsp if (error)
9064 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9065 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9066 896e9b6f 2019-08-26 stsp if (error) {
9067 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9068 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9070 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9071 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9072 896e9b6f 2019-08-26 stsp if (error)
9077 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9078 01073a5d 2019-08-22 stsp if (error)
9081 01073a5d 2019-08-22 stsp switch (obj_type) {
9082 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9083 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9085 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9086 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9088 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9089 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9091 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9092 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9095 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9098 01073a5d 2019-08-22 stsp if (error)
9100 01073a5d 2019-08-22 stsp free(label);
9101 01073a5d 2019-08-22 stsp label = NULL;
9103 01073a5d 2019-08-22 stsp id = NULL;
9106 01073a5d 2019-08-22 stsp free(label);
9108 896e9b6f 2019-08-26 stsp free(commit_id);
9109 01073a5d 2019-08-22 stsp if (worktree)
9110 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9111 01073a5d 2019-08-22 stsp if (repo) {
9112 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9113 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9114 01073a5d 2019-08-22 stsp if (error == NULL)
9115 01073a5d 2019-08-22 stsp error = repo_error;
9117 0ebf8283 2019-07-24 stsp return error;
