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 30718c93 2020-03-21 stsp create_head_ref(struct got_reference *target_ref, int verbosity,
889 30718c93 2020-03-21 stsp 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 4ba14133 2020-03-20 stsp err = got_ref_alloc_symref(&head_symref, GOT_REF_HEAD, target_ref);
896 4ba14133 2020-03-20 stsp return err;
898 4ba14133 2020-03-20 stsp err = got_ref_write(head_symref, repo);
899 4ba14133 2020-03-20 stsp got_ref_close(head_symref);
900 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
901 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
902 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
904 4ba14133 2020-03-20 stsp return err;
907 4ba14133 2020-03-20 stsp static const struct got_error *
908 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
909 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
911 41b0de12 2020-03-21 stsp const struct got_error *err;
912 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
914 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
915 41b0de12 2020-03-21 stsp const char *refname = pe->path;
916 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
918 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
921 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
922 41b0de12 2020-03-21 stsp const char *refname = pe->path;
923 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
924 41b0de12 2020-03-21 stsp char *id_str;
926 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
928 41b0de12 2020-03-21 stsp return err;
929 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
930 41b0de12 2020-03-21 stsp free(id_str);
933 41b0de12 2020-03-21 stsp return NULL;
936 6338a6a1 2020-03-21 stsp static const struct got_error *
937 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
938 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
940 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
941 6338a6a1 2020-03-21 stsp struct got_reference *ref;
942 6338a6a1 2020-03-21 stsp char *id_str;
944 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
946 6338a6a1 2020-03-21 stsp return err;
948 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
952 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
953 6338a6a1 2020-03-21 stsp got_ref_close(ref);
955 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
956 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
958 6338a6a1 2020-03-21 stsp free(id_str);
959 6338a6a1 2020-03-21 stsp return err;
963 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
965 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
967 0e4002ca 2020-03-21 stsp refname += 5;
970 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
971 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
973 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
975 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
978 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
979 0e4002ca 2020-03-21 stsp wanted_ref += 5;
981 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
982 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
985 0e4002ca 2020-03-21 stsp /* Allow exact match. */
986 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
990 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
992 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
994 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
995 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1002 41b0de12 2020-03-21 stsp static const struct got_error *
1003 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1004 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1006 0e4002ca 2020-03-21 stsp const struct got_error *err;
1007 0e4002ca 2020-03-21 stsp char *remote_refname;
1009 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1010 0e4002ca 2020-03-21 stsp refname += 5;
1012 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1013 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1014 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1016 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1017 0e4002ca 2020-03-21 stsp free(remote_refname);
1018 0e4002ca 2020-03-21 stsp return err;
1021 0e4002ca 2020-03-21 stsp static const struct got_error *
1022 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1024 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1025 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1026 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1027 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1028 bb64b798 2020-03-18 stsp const char *repo_path;
1029 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1030 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1031 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1032 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1033 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1034 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1035 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1036 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1037 b46f3e71 2020-03-18 stsp char *gitconfig_path = NULL;
1038 b46f3e71 2020-03-18 stsp char *gitconfig = NULL;
1039 b46f3e71 2020-03-18 stsp FILE *gitconfig_file = NULL;
1040 b46f3e71 2020-03-18 stsp ssize_t n;
1041 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1042 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1043 659e7fbd 2020-03-20 stsp struct got_reference *head_symref = NULL;
1045 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1046 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1047 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1048 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1050 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1051 93658fb9 2020-03-18 stsp switch (ch) {
1053 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1056 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1057 4ba14133 2020-03-20 stsp optarg, NULL);
1058 4ba14133 2020-03-20 stsp if (error)
1059 4ba14133 2020-03-20 stsp return error;
1062 41b0de12 2020-03-21 stsp list_refs_only = 1;
1065 469dd726 2020-03-20 stsp mirror_references = 1;
1068 68999b92 2020-03-18 stsp if (verbosity < 0)
1069 68999b92 2020-03-18 stsp verbosity = 0;
1070 68999b92 2020-03-18 stsp else if (verbosity < 3)
1071 68999b92 2020-03-18 stsp verbosity++;
1074 68999b92 2020-03-18 stsp verbosity = -1;
1077 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1078 0e4002ca 2020-03-21 stsp optarg, NULL);
1079 0e4002ca 2020-03-21 stsp if (error)
1080 0e4002ca 2020-03-21 stsp return error;
1083 93658fb9 2020-03-18 stsp usage_clone();
1087 93658fb9 2020-03-18 stsp argc -= optind;
1088 93658fb9 2020-03-18 stsp argv += optind;
1090 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1091 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1092 41b0de12 2020-03-21 stsp if (list_refs_only) {
1093 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1094 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1095 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1096 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1097 41b0de12 2020-03-21 stsp if (mirror_references)
1098 41b0de12 2020-03-21 stsp errx(1, "-l and -m options are mutually exclusive");
1099 41b0de12 2020-03-21 stsp if (verbosity == -1)
1100 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1101 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1102 0e4002ca 2020-03-21 stsp errx(1, "-l and -R options are mutually exclusive");
1105 93658fb9 2020-03-18 stsp uri = argv[0];
1107 9df6f38b 2020-03-18 stsp if (argc == 1)
1108 93658fb9 2020-03-18 stsp dirname = NULL;
1109 9df6f38b 2020-03-18 stsp else if (argc == 2)
1110 93658fb9 2020-03-18 stsp dirname = argv[1];
1112 93658fb9 2020-03-18 stsp usage_clone();
1114 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1115 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1116 39c64a6a 2020-03-18 stsp if (error)
1117 09f63084 2020-03-20 stsp goto done;
1119 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1120 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1121 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1122 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1123 09838ffc 2020-03-18 stsp goto done;
1126 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1127 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1128 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1129 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1130 39c64a6a 2020-03-18 stsp err(1, "pledge");
1132 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1133 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1134 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1135 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1136 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1137 39c64a6a 2020-03-18 stsp err(1, "pledge");
1139 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1140 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1141 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1142 39c64a6a 2020-03-18 stsp goto done;
1144 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1145 39c64a6a 2020-03-18 stsp goto done;
1147 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1148 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1149 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1150 bb64b798 2020-03-18 stsp goto done;
1152 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1154 bb64b798 2020-03-18 stsp repo_path = dirname;
1156 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1157 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1158 41b0de12 2020-03-21 stsp if (error)
1159 41b0de12 2020-03-21 stsp goto done;
1161 41b0de12 2020-03-21 stsp error = got_repo_init(repo_path);
1162 41b0de12 2020-03-21 stsp if (error)
1163 41b0de12 2020-03-21 stsp goto done;
1164 41b0de12 2020-03-21 stsp error = got_repo_open(&repo, repo_path, NULL);
1165 41b0de12 2020-03-21 stsp if (error)
1166 41b0de12 2020-03-21 stsp goto done;
1169 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1170 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1171 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1172 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1173 ee448f5f 2020-03-18 stsp goto done;
1176 41b0de12 2020-03-21 stsp error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1177 ee448f5f 2020-03-18 stsp if (error)
1178 ee448f5f 2020-03-18 stsp goto done;
1180 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1181 9c52365f 2020-03-21 stsp server_path, verbosity);
1182 39c64a6a 2020-03-18 stsp if (error)
1183 bb64b798 2020-03-18 stsp goto done;
1185 68999b92 2020-03-18 stsp if (verbosity >= 0)
1186 62a4c94c 2020-03-20 stsp printf("Connected to %s%s%s\n", host,
1187 62a4c94c 2020-03-20 stsp port ? ":" : "", port ? port : "");
1189 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1190 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1191 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1192 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1193 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1194 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1195 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1196 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1197 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1198 39c64a6a 2020-03-18 stsp if (error)
1199 d9b4d0c0 2020-03-18 stsp goto done;
1201 41b0de12 2020-03-21 stsp if (list_refs_only) {
1202 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1203 41b0de12 2020-03-21 stsp goto done;
1206 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1207 39c64a6a 2020-03-18 stsp if (error)
1208 d9b4d0c0 2020-03-18 stsp goto done;
1209 68999b92 2020-03-18 stsp if (verbosity >= 0)
1210 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1211 d9b4d0c0 2020-03-18 stsp free(id_str);
1213 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1214 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1215 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1216 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1217 7ebc0570 2020-03-18 stsp char *remote_refname;
1219 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1220 0e4002ca 2020-03-21 stsp !mirror_references) {
1221 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1222 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1223 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1224 0e4002ca 2020-03-21 stsp if (error)
1225 0e4002ca 2020-03-21 stsp goto done;
1229 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1230 39c64a6a 2020-03-18 stsp if (error)
1231 d9b4d0c0 2020-03-18 stsp goto done;
1233 469dd726 2020-03-20 stsp if (mirror_references)
1236 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1239 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1240 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1241 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1242 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1243 7ebc0570 2020-03-18 stsp goto done;
1245 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1246 39c64a6a 2020-03-18 stsp if (error)
1247 d9b4d0c0 2020-03-18 stsp goto done;
1250 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1251 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1252 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1253 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1254 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1256 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1259 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1260 39c64a6a 2020-03-18 stsp if (error) {
1261 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1262 55330abe 2020-03-20 stsp error = NULL;
1265 d9b4d0c0 2020-03-18 stsp goto done;
1268 30718c93 2020-03-21 stsp error = create_head_ref(target_ref, verbosity, repo);
1269 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1270 39c64a6a 2020-03-18 stsp if (error)
1271 d9b4d0c0 2020-03-18 stsp goto done;
1273 4ba14133 2020-03-20 stsp if (pe == NULL) {
1275 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1276 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1277 4ba14133 2020-03-20 stsp * which could be fetched instead.
1279 4ba14133 2020-03-20 stsp TAILQ_FOREACH(pe, &wanted_branches, entry) {
1280 4ba14133 2020-03-20 stsp const char *target = pe->path;
1281 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1283 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1284 4ba14133 2020-03-20 stsp if (error) {
1285 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1286 4ba14133 2020-03-20 stsp error = NULL;
1289 4ba14133 2020-03-20 stsp goto done;
1292 30718c93 2020-03-21 stsp error = create_head_ref(target_ref, verbosity, repo);
1293 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1294 4ba14133 2020-03-20 stsp if (error)
1295 4ba14133 2020-03-20 stsp goto done;
1300 659e7fbd 2020-03-20 stsp /* Create a config file git-fetch(1) can understand. */
1301 659e7fbd 2020-03-20 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1302 659e7fbd 2020-03-20 stsp if (gitconfig_path == NULL) {
1303 659e7fbd 2020-03-20 stsp error = got_error_from_errno("got_repo_get_path_gitconfig");
1304 659e7fbd 2020-03-20 stsp goto done;
1306 659e7fbd 2020-03-20 stsp gitconfig_file = fopen(gitconfig_path, "a");
1307 659e7fbd 2020-03-20 stsp if (gitconfig_file == NULL) {
1308 659e7fbd 2020-03-20 stsp error = got_error_from_errno2("fopen", gitconfig_path);
1309 659e7fbd 2020-03-20 stsp goto done;
1311 659e7fbd 2020-03-20 stsp if (mirror_references) {
1312 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1313 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1314 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1315 8ceee112 2020-03-20 stsp "\tfetch = +refs/*:refs/*\n"
1316 659e7fbd 2020-03-20 stsp "\tmirror = true\n",
1317 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1318 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1319 659e7fbd 2020-03-20 stsp goto done;
1321 659e7fbd 2020-03-20 stsp } else if (fetch_all_branches) {
1322 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1323 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1324 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1325 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1326 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1327 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1328 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1329 659e7fbd 2020-03-20 stsp goto done;
1332 659e7fbd 2020-03-20 stsp const char *branchname;
1335 659e7fbd 2020-03-20 stsp * If the server specified a default branch, use just that one.
1336 659e7fbd 2020-03-20 stsp * Otherwise fall back to fetching all branches on next fetch.
1338 659e7fbd 2020-03-20 stsp if (head_symref) {
1339 659e7fbd 2020-03-20 stsp branchname = got_ref_get_symref_target(head_symref);
1340 659e7fbd 2020-03-20 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1341 659e7fbd 2020-03-20 stsp branchname += 11;
1343 659e7fbd 2020-03-20 stsp branchname = "*"; /* fall back to all branches */
1344 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1345 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1346 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1347 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1348 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1349 659e7fbd 2020-03-20 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1350 659e7fbd 2020-03-20 stsp branchname) == -1) {
1351 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1352 659e7fbd 2020-03-20 stsp goto done;
1355 659e7fbd 2020-03-20 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1356 659e7fbd 2020-03-20 stsp if (n != strlen(gitconfig)) {
1357 659e7fbd 2020-03-20 stsp error = got_ferror(gitconfig_file, GOT_ERR_IO);
1358 659e7fbd 2020-03-20 stsp goto done;
1361 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1362 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1363 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1365 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1366 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1367 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1368 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1369 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1371 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1372 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1373 b46f3e71 2020-03-18 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1374 b46f3e71 2020-03-18 stsp error = got_error_from_errno("fclose");
1376 bb64b798 2020-03-18 stsp got_repo_close(repo);
1377 659e7fbd 2020-03-20 stsp if (head_symref)
1378 659e7fbd 2020-03-20 stsp got_ref_close(head_symref);
1379 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1380 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1381 d9b4d0c0 2020-03-18 stsp free(pe->data);
1383 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1384 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1385 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1386 d9b4d0c0 2020-03-18 stsp free(pe->data);
1388 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1389 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1390 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1391 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1392 09838ffc 2020-03-18 stsp free(proto);
1393 09838ffc 2020-03-18 stsp free(host);
1394 09838ffc 2020-03-18 stsp free(port);
1395 09838ffc 2020-03-18 stsp free(server_path);
1396 09838ffc 2020-03-18 stsp free(repo_name);
1397 bb64b798 2020-03-18 stsp free(default_destdir);
1398 b46f3e71 2020-03-18 stsp free(gitconfig_path);
1399 b46f3e71 2020-03-18 stsp free(git_url);
1400 39c64a6a 2020-03-18 stsp return error;
1403 7848a0e1 2020-03-19 stsp static const struct got_error *
1404 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1405 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1407 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1408 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1409 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1411 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1413 7848a0e1 2020-03-19 stsp goto done;
1415 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1416 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1417 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1419 88609724 2020-03-21 stsp goto done;
1420 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1421 88609724 2020-03-21 stsp goto done;
1422 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1423 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1424 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1426 db6d8ad8 2020-03-21 stsp goto done;
1429 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1430 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1431 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1432 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1433 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1435 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1437 7848a0e1 2020-03-19 stsp goto done;
1438 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1440 e8a967e0 2020-03-21 stsp goto done;
1442 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1444 7848a0e1 2020-03-19 stsp goto done;
1445 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1446 6338a6a1 2020-03-21 stsp goto done;
1448 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1450 6338a6a1 2020-03-21 stsp goto done;
1451 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1453 6338a6a1 2020-03-21 stsp goto done;
1456 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1457 6338a6a1 2020-03-21 stsp printf("Updated reference %s: %s\n", got_ref_get_name(ref),
1458 6338a6a1 2020-03-21 stsp new_id_str);
1460 7848a0e1 2020-03-19 stsp free(old_id);
1461 7848a0e1 2020-03-19 stsp free(new_id_str);
1462 7848a0e1 2020-03-19 stsp return err;
1465 2ab43947 2020-03-18 stsp __dead static void
1466 7848a0e1 2020-03-19 stsp usage_fetch(void)
1468 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1469 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1470 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1471 13f12b09 2020-03-21 stsp getprogname());
1475 7848a0e1 2020-03-19 stsp static const struct got_error *
1476 f21ec2f0 2020-03-21 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1477 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1479 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1480 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1481 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1482 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1483 f21ec2f0 2020-03-21 stsp struct got_object_id *id;
1484 f21ec2f0 2020-03-21 stsp char *id_str;
1486 f21ec2f0 2020-03-21 stsp SIMPLEQ_INIT(&my_refs);
1488 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1490 f21ec2f0 2020-03-21 stsp return err;
1492 f21ec2f0 2020-03-21 stsp SIMPLEQ_FOREACH(re, &my_refs, entry) {
1493 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1495 f21ec2f0 2020-03-21 stsp if (strncmp(refname, "refs/heads/", 11) != 0 &&
1496 f21ec2f0 2020-03-21 stsp strncmp(refname, "refs/tags/", 10) != 0)
1499 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1500 f21ec2f0 2020-03-21 stsp if (strcmp(refname, pe->path) == 0)
1503 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1506 f21ec2f0 2020-03-21 stsp err = got_ref_resolve(&id, repo, re->ref);
1509 f21ec2f0 2020-03-21 stsp err = got_object_id_str(&id_str, id);
1514 f21ec2f0 2020-03-21 stsp free(id_str);
1515 f21ec2f0 2020-03-21 stsp err = got_ref_delete(re->ref, repo);
1518 6338a6a1 2020-03-21 stsp if (verbosity >= 0) {
1519 6338a6a1 2020-03-21 stsp printf("Deleted reference %s: %s\n",
1520 6338a6a1 2020-03-21 stsp got_ref_get_name(re->ref), id_str);
1524 0e4002ca 2020-03-21 stsp return err;
1527 0e4002ca 2020-03-21 stsp static const struct got_error *
1528 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1529 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1531 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1532 0e4002ca 2020-03-21 stsp char *remote_refname;
1533 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1535 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1536 0e4002ca 2020-03-21 stsp refname += 5;
1538 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1539 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1540 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1542 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1543 0e4002ca 2020-03-21 stsp if (err) {
1544 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1545 0e4002ca 2020-03-21 stsp goto done;
1546 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1548 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1549 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1550 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1551 9f142382 2020-03-21 stsp err = unlock_err;
1552 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1555 0e4002ca 2020-03-21 stsp free(remote_refname);
1556 f21ec2f0 2020-03-21 stsp return err;
1559 f21ec2f0 2020-03-21 stsp static const struct got_error *
1560 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1562 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1563 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1564 7848a0e1 2020-03-19 stsp const char *remote_name;
1565 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1566 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
1567 7848a0e1 2020-03-19 stsp struct got_remote_repo *remotes, *remote = NULL;
1568 7848a0e1 2020-03-19 stsp int nremotes;
1569 7848a0e1 2020-03-19 stsp char *id_str = NULL;
1570 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
1571 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
1572 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1573 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
1574 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
1575 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
1576 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1577 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
1578 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1579 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
1581 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
1582 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
1583 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1584 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1586 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1587 7848a0e1 2020-03-19 stsp switch (ch) {
1589 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1592 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1593 4ba14133 2020-03-20 stsp optarg, NULL);
1594 4ba14133 2020-03-20 stsp if (error)
1595 4ba14133 2020-03-20 stsp return error;
1598 f21ec2f0 2020-03-21 stsp delete_refs = 1;
1601 41b0de12 2020-03-21 stsp list_refs_only = 1;
1604 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
1605 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1606 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
1608 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
1611 db6d8ad8 2020-03-21 stsp replace_tags = 1;
1614 7848a0e1 2020-03-19 stsp if (verbosity < 0)
1615 7848a0e1 2020-03-19 stsp verbosity = 0;
1616 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
1617 7848a0e1 2020-03-19 stsp verbosity++;
1620 7848a0e1 2020-03-19 stsp verbosity = -1;
1623 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1624 0e4002ca 2020-03-21 stsp optarg, NULL);
1625 0e4002ca 2020-03-21 stsp if (error)
1626 0e4002ca 2020-03-21 stsp return error;
1629 7848a0e1 2020-03-19 stsp usage_fetch();
1633 7848a0e1 2020-03-19 stsp argc -= optind;
1634 7848a0e1 2020-03-19 stsp argv += optind;
1636 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1637 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1638 41b0de12 2020-03-21 stsp if (list_refs_only) {
1639 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1640 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1641 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1642 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1643 f21ec2f0 2020-03-21 stsp if (delete_refs)
1644 f21ec2f0 2020-03-21 stsp errx(1, "-l and -d options are mutually exclusive");
1645 41b0de12 2020-03-21 stsp if (verbosity == -1)
1646 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1649 7848a0e1 2020-03-19 stsp if (argc == 0)
1650 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1651 7848a0e1 2020-03-19 stsp else if (argc == 1)
1652 7848a0e1 2020-03-19 stsp remote_name = argv[0];
1654 7848a0e1 2020-03-19 stsp usage_fetch();
1656 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
1657 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
1658 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
1659 7848a0e1 2020-03-19 stsp goto done;
1662 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1663 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
1664 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1665 7848a0e1 2020-03-19 stsp goto done;
1667 7848a0e1 2020-03-19 stsp error = NULL;
1668 7848a0e1 2020-03-19 stsp if (worktree) {
1669 7848a0e1 2020-03-19 stsp repo_path =
1670 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
1671 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1672 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1673 7848a0e1 2020-03-19 stsp if (error)
1674 7848a0e1 2020-03-19 stsp goto done;
1676 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
1677 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1678 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1679 7848a0e1 2020-03-19 stsp goto done;
1684 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
1685 7848a0e1 2020-03-19 stsp if (error)
1686 7848a0e1 2020-03-19 stsp goto done;
1688 7848a0e1 2020-03-19 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1689 7848a0e1 2020-03-19 stsp for (i = 0; i < nremotes; i++) {
1690 7848a0e1 2020-03-19 stsp remote = &remotes[i];
1691 7848a0e1 2020-03-19 stsp if (strcmp(remote->name, remote_name) == 0)
1694 7848a0e1 2020-03-19 stsp if (i == nremotes) {
1695 7848a0e1 2020-03-19 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1696 7848a0e1 2020-03-19 stsp goto done;
1699 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1700 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
1701 7848a0e1 2020-03-19 stsp if (error)
1702 7848a0e1 2020-03-19 stsp goto done;
1704 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
1705 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1706 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1707 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
1708 7848a0e1 2020-03-19 stsp err(1, "pledge");
1710 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1711 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
1712 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1713 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1714 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
1715 7848a0e1 2020-03-19 stsp err(1, "pledge");
1717 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
1718 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
1719 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1720 7848a0e1 2020-03-19 stsp goto done;
1722 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1723 7848a0e1 2020-03-19 stsp goto done;
1726 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1727 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1728 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
1729 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
1730 7848a0e1 2020-03-19 stsp goto done;
1733 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
1734 7848a0e1 2020-03-19 stsp if (error)
1735 7848a0e1 2020-03-19 stsp goto done;
1737 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1738 9c52365f 2020-03-21 stsp server_path, verbosity);
1739 7848a0e1 2020-03-19 stsp if (error)
1740 7848a0e1 2020-03-19 stsp goto done;
1742 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
1743 62a4c94c 2020-03-20 stsp printf("Connected to \"%s\" %s%s%s\n", remote->name, host,
1744 62a4c94c 2020-03-20 stsp port ? ":" : "", port ? port : "");
1746 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
1747 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
1748 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
1749 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
1750 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
1751 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
1752 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
1753 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1754 7848a0e1 2020-03-19 stsp if (error)
1755 7848a0e1 2020-03-19 stsp goto done;
1757 41b0de12 2020-03-21 stsp if (list_refs_only) {
1758 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1759 41b0de12 2020-03-21 stsp goto done;
1762 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
1763 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
1764 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
1765 f21ec2f0 2020-03-21 stsp if (delete_refs)
1766 688f11b3 2020-03-21 stsp error = delete_missing_refs(&refs, verbosity, repo);
1767 7848a0e1 2020-03-19 stsp goto done;
1770 984065c8 2020-03-19 stsp if (verbosity >= 0) {
1771 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
1772 984065c8 2020-03-19 stsp if (error)
1773 984065c8 2020-03-19 stsp goto done;
1774 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1775 984065c8 2020-03-19 stsp free(id_str);
1776 984065c8 2020-03-19 stsp id_str = NULL;
1779 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
1780 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
1781 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
1782 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
1783 7848a0e1 2020-03-19 stsp struct got_reference *ref;
1784 7848a0e1 2020-03-19 stsp char *remote_refname;
1786 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1787 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
1788 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
1789 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
1790 0e4002ca 2020-03-21 stsp if (error)
1791 0e4002ca 2020-03-21 stsp goto done;
1795 1510c839 2020-03-20 stsp if (remote->mirror_references ||
1796 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
1797 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
1798 7848a0e1 2020-03-19 stsp if (error) {
1799 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1800 7848a0e1 2020-03-19 stsp goto done;
1801 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
1803 7848a0e1 2020-03-19 stsp if (error)
1804 7848a0e1 2020-03-19 stsp goto done;
1806 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1807 db6d8ad8 2020-03-21 stsp verbosity, repo);
1808 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1809 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
1810 9f142382 2020-03-21 stsp error = unlock_err;
1811 7848a0e1 2020-03-19 stsp got_ref_close(ref);
1812 7848a0e1 2020-03-19 stsp if (error)
1813 7848a0e1 2020-03-19 stsp goto done;
1815 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
1816 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1817 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
1818 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
1819 7848a0e1 2020-03-19 stsp goto done;
1822 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
1823 7848a0e1 2020-03-19 stsp if (error) {
1824 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1825 7848a0e1 2020-03-19 stsp goto done;
1826 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
1827 688f11b3 2020-03-21 stsp verbosity, repo);
1828 7848a0e1 2020-03-19 stsp if (error)
1829 7848a0e1 2020-03-19 stsp goto done;
1831 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1832 db6d8ad8 2020-03-21 stsp verbosity, repo);
1833 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1834 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
1835 9f142382 2020-03-21 stsp error = unlock_err;
1836 7848a0e1 2020-03-19 stsp got_ref_close(ref);
1837 7848a0e1 2020-03-19 stsp if (error)
1838 7848a0e1 2020-03-19 stsp goto done;
1841 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
1842 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
1843 2ec30c80 2020-03-20 stsp if (error) {
1844 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
1845 2ec30c80 2020-03-20 stsp goto done;
1846 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
1848 2ec30c80 2020-03-20 stsp if (error)
1849 2ec30c80 2020-03-20 stsp goto done;
1851 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1852 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
1853 9f142382 2020-03-21 stsp error = unlock_err;
1854 2ec30c80 2020-03-20 stsp got_ref_close(ref);
1858 f21ec2f0 2020-03-21 stsp if (delete_refs)
1859 688f11b3 2020-03-21 stsp error = delete_missing_refs(&refs, verbosity, repo);
1861 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1862 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1863 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1864 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1865 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1867 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1868 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
1870 7848a0e1 2020-03-19 stsp got_repo_close(repo);
1871 7848a0e1 2020-03-19 stsp if (worktree)
1872 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
1873 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
1874 7848a0e1 2020-03-19 stsp free((void *)pe->path);
1875 7848a0e1 2020-03-19 stsp free(pe->data);
1877 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
1878 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1879 7848a0e1 2020-03-19 stsp free((void *)pe->path);
1880 7848a0e1 2020-03-19 stsp free(pe->data);
1882 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
1883 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1884 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1885 7848a0e1 2020-03-19 stsp free(id_str);
1886 7848a0e1 2020-03-19 stsp free(cwd);
1887 7848a0e1 2020-03-19 stsp free(repo_path);
1888 7848a0e1 2020-03-19 stsp free(pack_hash);
1889 7848a0e1 2020-03-19 stsp free(proto);
1890 7848a0e1 2020-03-19 stsp free(host);
1891 7848a0e1 2020-03-19 stsp free(port);
1892 7848a0e1 2020-03-19 stsp free(server_path);
1893 7848a0e1 2020-03-19 stsp free(repo_name);
1894 7848a0e1 2020-03-19 stsp return error;
1898 7848a0e1 2020-03-19 stsp __dead static void
1899 2ab43947 2020-03-18 stsp usage_checkout(void)
1901 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
1902 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
1906 2ab43947 2020-03-18 stsp static void
1907 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
1909 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
1910 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
1911 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
1912 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
1913 2ab43947 2020-03-18 stsp getprogname());
1916 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
1917 2ab43947 2020-03-18 stsp const char *worktree_path;
1918 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
1921 2ab43947 2020-03-18 stsp static const struct got_error *
1922 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
1924 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
1926 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
1927 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
1928 2ab43947 2020-03-18 stsp return NULL;
1930 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
1931 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
1932 2ab43947 2020-03-18 stsp return NULL;
1935 2ab43947 2020-03-18 stsp while (path[0] == '/')
1938 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
1939 2ab43947 2020-03-18 stsp return NULL;
1942 2ab43947 2020-03-18 stsp static const struct got_error *
1943 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
1945 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
1946 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
1947 2ab43947 2020-03-18 stsp return NULL;
1950 2ab43947 2020-03-18 stsp static const struct got_error *
1951 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
1952 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
1953 2ab43947 2020-03-18 stsp struct got_repository *repo)
1955 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
1956 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
1958 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
1959 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
1961 2ab43947 2020-03-18 stsp return err;
1963 2ab43947 2020-03-18 stsp if (yca_id == NULL)
1964 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
1967 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
1968 2ab43947 2020-03-18 stsp * and the work tree's base commit.
1970 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
1972 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
1980 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
1981 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
1982 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
1984 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
1985 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
1986 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
1987 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
1988 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
1989 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
1991 2ab43947 2020-03-18 stsp free(yca_id);
1992 2ab43947 2020-03-18 stsp return NULL;
1995 2ab43947 2020-03-18 stsp static const struct got_error *
1996 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
1997 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
1998 2ab43947 2020-03-18 stsp struct got_repository *repo)
2000 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2001 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2002 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2003 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2005 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2007 2ab43947 2020-03-18 stsp goto done;
2009 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2010 2ab43947 2020-03-18 stsp is_same_branch = 1;
2011 2ab43947 2020-03-18 stsp goto done;
2013 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2014 2ab43947 2020-03-18 stsp is_same_branch = 1;
2015 2ab43947 2020-03-18 stsp goto done;
2018 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2020 2ab43947 2020-03-18 stsp goto done;
2022 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2023 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2025 2ab43947 2020-03-18 stsp goto done;
2027 2ab43947 2020-03-18 stsp for (;;) {
2028 2ab43947 2020-03-18 stsp struct got_object_id *id;
2029 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2030 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2031 2ab43947 2020-03-18 stsp if (err) {
2032 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2033 2ab43947 2020-03-18 stsp err = NULL;
2038 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2040 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2041 2ab43947 2020-03-18 stsp is_same_branch = 1;
2047 2ab43947 2020-03-18 stsp if (graph)
2048 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2049 2ab43947 2020-03-18 stsp free(head_commit_id);
2050 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2051 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2052 2ab43947 2020-03-18 stsp return err;
2055 4ed7e80c 2018-05-20 stsp static const struct got_error *
2056 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2058 4b6c9460 2020-03-05 stsp static char msg[512];
2059 4b6c9460 2020-03-05 stsp const char *branch_name;
2061 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2062 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2064 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2066 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2067 4b6c9460 2020-03-05 stsp branch_name += 11;
2069 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2070 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2071 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2072 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2073 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2074 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2076 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2079 4b6c9460 2020-03-05 stsp static const struct got_error *
2080 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2082 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2083 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2084 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2085 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2086 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2087 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2088 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2089 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2090 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2091 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2092 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2093 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2095 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2097 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2098 0bb8a95e 2018-03-12 stsp switch (ch) {
2100 08573d5b 2019-05-14 stsp branch_name = optarg;
2103 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2104 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2105 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2108 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2111 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2114 2deda0b9 2019-03-07 stsp usage_checkout();
2115 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2119 0bb8a95e 2018-03-12 stsp argc -= optind;
2120 0bb8a95e 2018-03-12 stsp argv += optind;
2122 6715a751 2018-03-16 stsp #ifndef PROFILE
2123 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2124 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2125 c09a553d 2018-03-12 stsp err(1, "pledge");
2127 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2128 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
2129 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2130 76089277 2018-04-01 stsp if (repo_path == NULL)
2131 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2132 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2133 76089277 2018-04-01 stsp if (cwd == NULL) {
2134 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2135 76089277 2018-04-01 stsp goto done;
2137 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
2138 230a42bd 2019-05-11 jcs base = basename(path_prefix);
2139 230a42bd 2019-05-11 jcs if (base == NULL) {
2140 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2141 230a42bd 2019-05-11 jcs path_prefix);
2145 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
2146 230a42bd 2019-05-11 jcs if (base == NULL) {
2147 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2148 230a42bd 2019-05-11 jcs repo_path);
2152 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2153 c09a553d 2018-03-12 stsp if (dotgit)
2154 c09a553d 2018-03-12 stsp *dotgit = '\0';
2155 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2156 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2157 c09a553d 2018-03-12 stsp free(cwd);
2158 76089277 2018-04-01 stsp goto done;
2160 c09a553d 2018-03-12 stsp free(cwd);
2161 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2162 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2163 76089277 2018-04-01 stsp if (repo_path == NULL) {
2164 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2165 76089277 2018-04-01 stsp goto done;
2167 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2168 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2169 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2170 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2172 b4b3a7dd 2019-07-22 stsp goto done;
2174 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2175 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2176 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2177 b4b3a7dd 2019-07-22 stsp goto done;
2181 c09a553d 2018-03-12 stsp usage_checkout();
2183 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2184 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2186 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2187 c09a553d 2018-03-12 stsp if (error != NULL)
2188 c02c541e 2019-03-29 stsp goto done;
2190 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2191 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2192 c530dc23 2019-07-23 stsp if (error) {
2193 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2194 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2195 c530dc23 2019-07-23 stsp goto done;
2196 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2197 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2198 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2199 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2200 c530dc23 2019-07-23 stsp goto done;
2204 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2205 c02c541e 2019-03-29 stsp if (error)
2206 c09a553d 2018-03-12 stsp goto done;
2208 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2209 c09a553d 2018-03-12 stsp if (error != NULL)
2210 c09a553d 2018-03-12 stsp goto done;
2212 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2213 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2214 c09a553d 2018-03-12 stsp goto done;
2216 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2217 c09a553d 2018-03-12 stsp if (error != NULL)
2218 c09a553d 2018-03-12 stsp goto done;
2220 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2221 e5dc7198 2018-12-29 stsp path_prefix);
2222 e5dc7198 2018-12-29 stsp if (error != NULL)
2223 e5dc7198 2018-12-29 stsp goto done;
2224 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2225 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2226 49520a32 2018-12-29 stsp goto done;
2229 8069f636 2019-01-12 stsp if (commit_id_str) {
2230 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2231 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2232 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2233 30837e32 2019-07-25 stsp if (error)
2234 8069f636 2019-01-12 stsp goto done;
2235 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2236 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2237 8069f636 2019-01-12 stsp if (error != NULL) {
2238 8069f636 2019-01-12 stsp free(commit_id);
2239 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2240 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2241 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2243 8069f636 2019-01-12 stsp goto done;
2245 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2246 4b6c9460 2020-03-05 stsp if (error) {
2247 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2248 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2249 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2251 45d344f6 2019-05-14 stsp goto done;
2253 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2254 8069f636 2019-01-12 stsp commit_id);
2255 8069f636 2019-01-12 stsp free(commit_id);
2256 8069f636 2019-01-12 stsp if (error)
2257 8069f636 2019-01-12 stsp goto done;
2260 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2261 f2ea84fa 2019-07-27 stsp if (error)
2262 f2ea84fa 2019-07-27 stsp goto done;
2263 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2264 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2265 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2266 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2267 c09a553d 2018-03-12 stsp if (error != NULL)
2268 c09a553d 2018-03-12 stsp goto done;
2270 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2271 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2272 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2274 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2275 8069f636 2019-01-12 stsp free(commit_id_str);
2276 76089277 2018-04-01 stsp free(repo_path);
2277 507dc3bb 2018-12-29 stsp free(worktree_path);
2278 507dc3bb 2018-12-29 stsp return error;
2281 507dc3bb 2018-12-29 stsp __dead static void
2282 507dc3bb 2018-12-29 stsp usage_update(void)
2284 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2285 507dc3bb 2018-12-29 stsp getprogname());
2289 1ee397ad 2019-07-12 stsp static const struct got_error *
2290 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2292 784955db 2019-01-12 stsp int *did_something = arg;
2294 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2295 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2296 1ee397ad 2019-07-12 stsp return NULL;
2298 1545c615 2019-02-10 stsp *did_something = 1;
2300 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2301 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2302 1ee397ad 2019-07-12 stsp return NULL;
2304 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2306 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2307 1ee397ad 2019-07-12 stsp return NULL;
2310 be7061eb 2018-12-30 stsp static const struct got_error *
2311 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2312 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2313 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2315 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2316 a1fb16d8 2019-05-24 stsp char *base_id_str;
2317 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2319 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2320 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2321 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2322 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2323 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2324 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2325 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2328 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2329 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2330 a1fb16d8 2019-05-24 stsp if (err) {
2331 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2332 a1fb16d8 2019-05-24 stsp return err;
2333 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2335 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2336 a1fb16d8 2019-05-24 stsp return NULL;
2338 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2339 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2340 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2342 a1fb16d8 2019-05-24 stsp return err;
2343 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2344 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2345 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2346 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2347 0ebf8283 2019-07-24 stsp return NULL;
2350 0ebf8283 2019-07-24 stsp static const struct got_error *
2351 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2353 0ebf8283 2019-07-24 stsp const struct got_error *err;
2354 0ebf8283 2019-07-24 stsp int in_progress;
2356 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2358 0ebf8283 2019-07-24 stsp return err;
2359 0ebf8283 2019-07-24 stsp if (in_progress)
2360 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2362 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2364 0ebf8283 2019-07-24 stsp return err;
2365 0ebf8283 2019-07-24 stsp if (in_progress)
2366 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2368 a1fb16d8 2019-05-24 stsp return NULL;
2371 a5edda0a 2019-07-27 stsp static const struct got_error *
2372 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2373 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2375 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2376 a5edda0a 2019-07-27 stsp char *path;
2379 a5edda0a 2019-07-27 stsp if (argc == 0) {
2380 a5edda0a 2019-07-27 stsp path = strdup("");
2381 a5edda0a 2019-07-27 stsp if (path == NULL)
2382 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2383 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2386 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2387 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2390 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2391 a5edda0a 2019-07-27 stsp if (err) {
2392 a5edda0a 2019-07-27 stsp free(path);
2397 a5edda0a 2019-07-27 stsp return err;
2400 a1fb16d8 2019-05-24 stsp static const struct got_error *
2401 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2403 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2404 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2405 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2406 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2407 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2408 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2409 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2410 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2411 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2412 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2413 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
2415 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2417 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2418 507dc3bb 2018-12-29 stsp switch (ch) {
2420 024e9686 2019-05-14 stsp branch_name = optarg;
2423 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2424 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2425 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2428 2deda0b9 2019-03-07 stsp usage_update();
2429 507dc3bb 2018-12-29 stsp /* NOTREACHED */
2433 507dc3bb 2018-12-29 stsp argc -= optind;
2434 507dc3bb 2018-12-29 stsp argv += optind;
2436 507dc3bb 2018-12-29 stsp #ifndef PROFILE
2437 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2438 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2439 507dc3bb 2018-12-29 stsp err(1, "pledge");
2441 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
2442 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
2443 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2444 c4cdcb68 2019-04-03 stsp goto done;
2446 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
2447 7d5807f4 2019-07-11 stsp if (error)
2448 7d5807f4 2019-07-11 stsp goto done;
2450 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
2451 f2ea84fa 2019-07-27 stsp if (error)
2452 f2ea84fa 2019-07-27 stsp goto done;
2454 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2456 507dc3bb 2018-12-29 stsp if (error != NULL)
2457 507dc3bb 2018-12-29 stsp goto done;
2459 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2460 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2461 087fb88c 2019-08-04 stsp if (error)
2462 087fb88c 2019-08-04 stsp goto done;
2464 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2465 0266afb7 2019-01-04 stsp if (error)
2466 0266afb7 2019-01-04 stsp goto done;
2468 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2469 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
2470 024e9686 2019-05-14 stsp if (error != NULL)
2471 024e9686 2019-05-14 stsp goto done;
2472 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
2473 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2474 9c4b8182 2019-01-02 stsp if (error != NULL)
2475 9c4b8182 2019-01-02 stsp goto done;
2476 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
2477 507dc3bb 2018-12-29 stsp if (error != NULL)
2478 507dc3bb 2018-12-29 stsp goto done;
2480 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2481 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2482 04f57cb3 2019-07-25 stsp free(commit_id_str);
2483 bb787f09 2019-07-25 stsp commit_id_str = NULL;
2484 30837e32 2019-07-25 stsp if (error)
2485 a297e751 2019-07-11 stsp goto done;
2486 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
2487 a297e751 2019-07-11 stsp if (error)
2488 507dc3bb 2018-12-29 stsp goto done;
2491 a1fb16d8 2019-05-24 stsp if (branch_name) {
2492 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
2493 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
2494 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
2496 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
2497 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
2498 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
2499 024e9686 2019-05-14 stsp goto done;
2501 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
2502 024e9686 2019-05-14 stsp if (error)
2503 024e9686 2019-05-14 stsp goto done;
2504 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
2506 a367ff0f 2019-05-14 stsp free(head_commit_id);
2507 024e9686 2019-05-14 stsp if (error != NULL)
2508 024e9686 2019-05-14 stsp goto done;
2509 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2510 a367ff0f 2019-05-14 stsp if (error)
2511 a367ff0f 2019-05-14 stsp goto done;
2512 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
2513 024e9686 2019-05-14 stsp if (error)
2514 024e9686 2019-05-14 stsp goto done;
2516 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2517 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2518 a367ff0f 2019-05-14 stsp if (error != NULL) {
2519 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
2520 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
2521 024e9686 2019-05-14 stsp goto done;
2523 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2524 a367ff0f 2019-05-14 stsp if (error)
2525 a367ff0f 2019-05-14 stsp goto done;
2528 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2529 507dc3bb 2018-12-29 stsp commit_id) != 0) {
2530 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2531 507dc3bb 2018-12-29 stsp commit_id);
2532 507dc3bb 2018-12-29 stsp if (error)
2533 507dc3bb 2018-12-29 stsp goto done;
2536 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2537 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
2538 507dc3bb 2018-12-29 stsp if (error != NULL)
2539 507dc3bb 2018-12-29 stsp goto done;
2541 784955db 2019-01-12 stsp if (did_something)
2542 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
2544 784955db 2019-01-12 stsp printf("Already up-to-date\n");
2546 c09a553d 2018-03-12 stsp free(worktree_path);
2547 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2548 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
2549 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2550 507dc3bb 2018-12-29 stsp free(commit_id);
2551 9c4b8182 2019-01-02 stsp free(commit_id_str);
2552 c09a553d 2018-03-12 stsp return error;
2555 f42b1b34 2018-03-12 stsp static const struct got_error *
2556 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2557 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2558 63035f9f 2019-10-06 stsp struct got_repository *repo)
2560 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
2561 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2563 44392932 2019-08-25 stsp if (blob_id1) {
2564 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2566 44392932 2019-08-25 stsp goto done;
2569 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2571 44392932 2019-08-25 stsp goto done;
2573 44392932 2019-08-25 stsp while (path[0] == '/')
2575 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
2576 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
2578 44392932 2019-08-25 stsp if (blob1)
2579 44392932 2019-08-25 stsp got_object_blob_close(blob1);
2580 44392932 2019-08-25 stsp got_object_blob_close(blob2);
2581 44392932 2019-08-25 stsp return err;
2584 44392932 2019-08-25 stsp static const struct got_error *
2585 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2586 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2587 63035f9f 2019-10-06 stsp struct got_repository *repo)
2589 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2590 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2591 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
2593 44392932 2019-08-25 stsp if (tree_id1) {
2594 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2596 44392932 2019-08-25 stsp goto done;
2599 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2601 0f2b3dca 2018-12-22 stsp goto done;
2603 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
2604 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2605 aaa13589 2019-06-01 stsp arg.outfile = stdout;
2606 44392932 2019-08-25 stsp while (path[0] == '/')
2608 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
2609 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
2611 79109fed 2018-03-27 stsp if (tree1)
2612 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
2613 366e0a5f 2019-10-10 stsp if (tree2)
2614 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
2615 44392932 2019-08-25 stsp return err;
2618 44392932 2019-08-25 stsp static const struct got_error *
2619 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
2620 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
2622 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2623 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
2624 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
2625 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2626 44392932 2019-08-25 stsp struct got_object_qid *qid;
2628 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2629 44392932 2019-08-25 stsp if (qid != NULL) {
2630 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
2633 44392932 2019-08-25 stsp return err;
2636 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
2637 44392932 2019-08-25 stsp int obj_type;
2638 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
2640 44392932 2019-08-25 stsp goto done;
2641 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2642 44392932 2019-08-25 stsp if (err) {
2643 44392932 2019-08-25 stsp free(obj_id2);
2644 44392932 2019-08-25 stsp goto done;
2646 44392932 2019-08-25 stsp if (pcommit) {
2647 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
2648 44392932 2019-08-25 stsp qid->id, path);
2649 44392932 2019-08-25 stsp if (err) {
2650 44392932 2019-08-25 stsp free(obj_id2);
2651 44392932 2019-08-25 stsp goto done;
2653 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2654 44392932 2019-08-25 stsp if (err) {
2655 44392932 2019-08-25 stsp free(obj_id2);
2656 44392932 2019-08-25 stsp goto done;
2659 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
2660 44392932 2019-08-25 stsp if (err) {
2661 44392932 2019-08-25 stsp free(obj_id2);
2662 44392932 2019-08-25 stsp goto done;
2664 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2665 44392932 2019-08-25 stsp switch (obj_type) {
2666 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
2667 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2670 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
2671 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
2675 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2678 44392932 2019-08-25 stsp free(obj_id1);
2679 44392932 2019-08-25 stsp free(obj_id2);
2681 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
2682 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2684 44392932 2019-08-25 stsp goto done;
2685 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
2686 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2688 44392932 2019-08-25 stsp goto done;
2689 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2690 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
2693 0f2b3dca 2018-12-22 stsp free(id_str1);
2694 0f2b3dca 2018-12-22 stsp free(id_str2);
2695 44392932 2019-08-25 stsp if (pcommit)
2696 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
2697 79109fed 2018-03-27 stsp return err;
2700 4bb494d5 2018-06-16 stsp static char *
2701 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
2703 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2704 09867e48 2019-08-13 stsp char *p, *s;
2706 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2707 09867e48 2019-08-13 stsp if (tm == NULL)
2708 09867e48 2019-08-13 stsp return NULL;
2709 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2710 09867e48 2019-08-13 stsp if (s == NULL)
2711 09867e48 2019-08-13 stsp return NULL;
2712 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
2714 6c281f94 2018-06-11 stsp *p = '\0';
2718 6841bf13 2019-11-29 kn static const struct got_error *
2719 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
2720 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
2722 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
2723 6841bf13 2019-11-29 kn regmatch_t regmatch;
2724 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
2726 6841bf13 2019-11-29 kn *have_match = 0;
2728 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
2732 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
2736 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
2737 6841bf13 2019-11-29 kn *have_match = 1;
2739 6841bf13 2019-11-29 kn free(id_str);
2740 6841bf13 2019-11-29 kn free(logmsg);
2744 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
2746 79109fed 2018-03-27 stsp static const struct got_error *
2747 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
2748 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
2749 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
2751 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
2752 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
2753 6c281f94 2018-06-11 stsp char datebuf[26];
2754 45d799e2 2018-12-23 stsp time_t committer_time;
2755 45d799e2 2018-12-23 stsp const char *author, *committer;
2756 199a4027 2019-02-02 stsp char *refs_str = NULL;
2757 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
2759 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
2761 199a4027 2019-02-02 stsp const char *name;
2762 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
2765 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
2766 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
2768 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
2769 199a4027 2019-02-02 stsp name += 5;
2770 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
2772 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
2773 e34f9ed6 2019-02-02 stsp name += 6;
2774 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
2775 141c2bff 2019-02-04 stsp name += 8;
2776 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
2777 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
2778 5d844a1e 2019-08-13 stsp if (err) {
2779 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
2780 5d844a1e 2019-08-13 stsp return err;
2781 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
2782 5d844a1e 2019-08-13 stsp err = NULL;
2783 5d844a1e 2019-08-13 stsp tag = NULL;
2786 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
2787 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
2789 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
2790 a436ad14 2019-08-13 stsp if (cmp != 0)
2792 199a4027 2019-02-02 stsp s = refs_str;
2793 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
2794 199a4027 2019-02-02 stsp name) == -1) {
2795 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2797 34ca4898 2019-08-13 stsp return err;
2801 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
2803 8bf5b3c9 2018-03-17 stsp return err;
2805 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
2806 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2807 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
2808 832c249c 2018-06-10 stsp free(id_str);
2809 d3d493d7 2019-02-21 stsp id_str = NULL;
2810 d3d493d7 2019-02-21 stsp free(refs_str);
2811 d3d493d7 2019-02-21 stsp refs_str = NULL;
2812 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
2813 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2814 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
2815 09867e48 2019-08-13 stsp if (datestr)
2816 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
2817 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2818 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2819 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
2820 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
2821 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
2822 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
2823 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
2824 3fe1abad 2018-06-10 stsp int n = 1;
2825 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
2826 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
2827 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
2829 a0603db2 2018-06-10 stsp return err;
2830 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
2831 a0603db2 2018-06-10 stsp free(id_str);
2835 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
2837 5943eee2 2019-08-13 stsp return err;
2839 621015ac 2018-07-23 stsp logmsg = logmsg0;
2841 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
2843 832c249c 2018-06-10 stsp printf(" %s\n", line);
2844 832c249c 2018-06-10 stsp } while (line);
2845 621015ac 2018-07-23 stsp free(logmsg0);
2847 971751ac 2018-03-27 stsp if (show_patch) {
2848 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
2849 971751ac 2018-03-27 stsp if (err == 0)
2850 971751ac 2018-03-27 stsp printf("\n");
2853 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
2854 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
2855 07862c20 2018-09-15 stsp return err;
2858 f42b1b34 2018-03-12 stsp static const struct got_error *
2859 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
2860 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
2861 48c8c60d 2020-01-27 stsp int diff_context, int limit, int log_branches,
2862 463a997a 2019-12-08 kn struct got_reflist_head *refs)
2864 f42b1b34 2018-03-12 stsp const struct got_error *err;
2865 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
2866 6841bf13 2019-11-29 kn regex_t regex;
2867 6841bf13 2019-11-29 kn int have_match;
2869 6841bf13 2019-11-29 kn if (search_pattern &&
2870 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
2871 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
2873 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
2875 f42b1b34 2018-03-12 stsp return err;
2876 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
2877 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2879 fcc85cad 2018-07-22 stsp goto done;
2881 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
2882 372ccdbb 2018-06-10 stsp struct got_object_id *id;
2884 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2887 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2888 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
2889 372ccdbb 2018-06-10 stsp if (err) {
2890 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2891 9ba79e04 2018-06-11 stsp err = NULL;
2894 b43fbaa0 2018-06-11 stsp if (id == NULL)
2897 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
2901 6841bf13 2019-11-29 kn if (search_pattern) {
2902 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
2904 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2907 6841bf13 2019-11-29 kn if (have_match == 0) {
2908 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2913 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
2914 44392932 2019-08-25 stsp diff_context, refs);
2915 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
2916 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
2920 6841bf13 2019-11-29 kn if (search_pattern)
2921 6841bf13 2019-11-29 kn regfree(®ex);
2922 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
2923 f42b1b34 2018-03-12 stsp return err;
2926 4ed7e80c 2018-05-20 stsp __dead static void
2927 6f3d1eb0 2018-03-12 stsp usage_log(void)
2929 48c8c60d 2020-01-27 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
2930 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
2934 b1ebc001 2019-08-13 stsp static int
2935 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
2937 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
2938 b1ebc001 2019-08-13 stsp long long n;
2939 b1ebc001 2019-08-13 stsp const char *errstr;
2941 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
2942 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
2944 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
2945 b1ebc001 2019-08-13 stsp if (errstr != NULL)
2950 4ed7e80c 2018-05-20 stsp static const struct got_error *
2951 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
2953 f42b1b34 2018-03-12 stsp const struct got_error *error;
2954 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
2955 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
2956 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
2957 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
2958 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
2959 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
2960 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
2961 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
2962 64a96a6d 2018-04-01 stsp const char *errstr;
2963 199a4027 2019-02-02 stsp struct got_reflist_head refs;
2965 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
2967 6715a751 2018-03-16 stsp #ifndef PROFILE
2968 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2971 f42b1b34 2018-03-12 stsp err(1, "pledge");
2974 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
2976 48c8c60d 2020-01-27 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
2977 79109fed 2018-03-27 stsp switch (ch) {
2979 79109fed 2018-03-27 stsp show_patch = 1;
2982 d142fc45 2018-04-01 stsp start_commit = optarg;
2985 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2987 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2988 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2991 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
2992 64a96a6d 2018-04-01 stsp if (errstr != NULL)
2993 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
2996 48c8c60d 2020-01-27 stsp log_branches = 1;
2999 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3000 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3001 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3003 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3006 6841bf13 2019-11-29 kn search_pattern = optarg;
3009 2deda0b9 2019-03-07 stsp usage_log();
3010 79109fed 2018-03-27 stsp /* NOTREACHED */
3014 79109fed 2018-03-27 stsp argc -= optind;
3015 79109fed 2018-03-27 stsp argv += optind;
3017 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3018 dc1edbfa 2019-11-29 kn diff_context = 3;
3019 dc1edbfa 2019-11-29 kn else if (!show_patch)
3020 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
3022 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3023 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3024 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3025 04ca23f4 2018-07-16 stsp goto done;
3028 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3029 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3030 cffc0aa4 2019-02-05 stsp goto done;
3031 cffc0aa4 2019-02-05 stsp error = NULL;
3033 e7301579 2019-03-18 stsp if (argc == 0) {
3034 cbd1af7a 2019-03-18 stsp path = strdup("");
3035 e7301579 2019-03-18 stsp if (path == NULL) {
3036 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3037 cbd1af7a 2019-03-18 stsp goto done;
3039 e7301579 2019-03-18 stsp } else if (argc == 1) {
3040 e7301579 2019-03-18 stsp if (worktree) {
3041 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3043 e7301579 2019-03-18 stsp if (error)
3044 e7301579 2019-03-18 stsp goto done;
3046 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3047 e7301579 2019-03-18 stsp if (path == NULL) {
3048 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3049 e7301579 2019-03-18 stsp goto done;
3053 cbd1af7a 2019-03-18 stsp usage_log();
3055 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3056 5486daa2 2019-05-11 stsp repo_path = worktree ?
3057 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3059 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3060 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3061 cffc0aa4 2019-02-05 stsp goto done;
3064 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3065 d7d4f210 2018-03-12 stsp if (error != NULL)
3066 04ca23f4 2018-07-16 stsp goto done;
3068 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3069 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3070 c02c541e 2019-03-29 stsp if (error)
3071 c02c541e 2019-03-29 stsp goto done;
3073 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3074 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3075 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3076 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3077 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3078 3235492e 2018-04-01 stsp if (error != NULL)
3079 3235492e 2018-04-01 stsp return error;
3080 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
3081 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3082 3235492e 2018-04-01 stsp if (error != NULL)
3083 3235492e 2018-04-01 stsp return error;
3084 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
3086 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
3087 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
3088 3235492e 2018-04-01 stsp if (error == NULL) {
3089 1caad61b 2019-02-01 stsp int obj_type;
3090 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
3091 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
3092 d1f2edc9 2018-06-13 stsp if (error != NULL)
3093 1caad61b 2019-02-01 stsp goto done;
3094 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
3095 1caad61b 2019-02-01 stsp if (error != NULL)
3096 1caad61b 2019-02-01 stsp goto done;
3097 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
3098 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
3099 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
3100 1caad61b 2019-02-01 stsp if (error != NULL)
3101 1caad61b 2019-02-01 stsp goto done;
3102 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
3103 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
3104 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
3105 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3106 1caad61b 2019-02-01 stsp goto done;
3109 1caad61b 2019-02-01 stsp id = got_object_id_dup(
3110 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
3111 1caad61b 2019-02-01 stsp if (id == NULL)
3112 638f9024 2019-05-13 stsp error = got_error_from_errno(
3113 230a42bd 2019-05-11 jcs "got_object_id_dup");
3114 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
3115 1caad61b 2019-02-01 stsp if (error)
3116 1caad61b 2019-02-01 stsp goto done;
3117 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
3118 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3119 1caad61b 2019-02-01 stsp goto done;
3121 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
3122 d1f2edc9 2018-06-13 stsp if (error != NULL)
3123 1caad61b 2019-02-01 stsp goto done;
3125 15a94983 2018-12-23 stsp if (commit == NULL) {
3126 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
3127 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
3128 d1f2edc9 2018-06-13 stsp if (error != NULL)
3129 d1f2edc9 2018-06-13 stsp return error;
3132 d7d4f210 2018-03-12 stsp if (error != NULL)
3133 04ca23f4 2018-07-16 stsp goto done;
3135 deeabeae 2019-08-27 stsp if (worktree) {
3136 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3138 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
3139 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3140 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
3141 deeabeae 2019-08-27 stsp goto done;
3143 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3146 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3147 04ca23f4 2018-07-16 stsp if (error != NULL)
3148 04ca23f4 2018-07-16 stsp goto done;
3149 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3150 04ca23f4 2018-07-16 stsp free(path);
3151 04ca23f4 2018-07-16 stsp path = in_repo_path;
3154 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3155 199a4027 2019-02-02 stsp if (error)
3156 199a4027 2019-02-02 stsp goto done;
3158 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
3159 48c8c60d 2020-01-27 stsp diff_context, limit, log_branches, &refs);
3161 04ca23f4 2018-07-16 stsp free(path);
3162 04ca23f4 2018-07-16 stsp free(repo_path);
3163 04ca23f4 2018-07-16 stsp free(cwd);
3165 cffc0aa4 2019-02-05 stsp if (worktree)
3166 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3167 ad242220 2018-09-08 stsp if (repo) {
3168 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3169 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3170 ad242220 2018-09-08 stsp if (error == NULL)
3171 ad242220 2018-09-08 stsp error = repo_error;
3173 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3174 8bf5b3c9 2018-03-17 stsp return error;
3177 4ed7e80c 2018-05-20 stsp __dead static void
3178 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3180 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3181 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
3185 b72f483a 2019-02-05 stsp struct print_diff_arg {
3186 b72f483a 2019-02-05 stsp struct got_repository *repo;
3187 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3188 b72f483a 2019-02-05 stsp int diff_context;
3189 3fc0c068 2019-02-10 stsp const char *id_str;
3190 3fc0c068 2019-02-10 stsp int header_shown;
3191 98eaaa12 2019-08-03 stsp int diff_staged;
3192 63035f9f 2019-10-06 stsp int ignore_whitespace;
3195 4ed7e80c 2018-05-20 stsp static const struct got_error *
3196 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3197 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3198 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3199 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3201 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3202 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3203 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3204 12463d8b 2019-12-13 stsp int fd = -1;
3205 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3206 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3207 b72f483a 2019-02-05 stsp struct stat sb;
3209 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3210 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3211 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3212 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3213 98eaaa12 2019-08-03 stsp return NULL;
3215 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3216 98eaaa12 2019-08-03 stsp return NULL;
3217 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3218 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3219 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3220 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3221 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3222 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3223 98eaaa12 2019-08-03 stsp return NULL;
3226 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3227 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3228 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3229 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3230 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3233 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3234 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
3235 98eaaa12 2019-08-03 stsp switch (staged_status) {
3236 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
3237 98eaaa12 2019-08-03 stsp label1 = path;
3238 98eaaa12 2019-08-03 stsp label2 = path;
3240 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
3241 98eaaa12 2019-08-03 stsp label2 = path;
3243 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
3244 98eaaa12 2019-08-03 stsp label1 = path;
3247 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
3249 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3250 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
3251 63035f9f 2019-10-06 stsp a->repo, stdout);
3254 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3255 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
3256 4ce46740 2019-08-08 stsp char *id_str;
3257 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3260 4ce46740 2019-08-08 stsp goto done;
3261 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
3263 4ce46740 2019-08-08 stsp goto done;
3264 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3265 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
3266 4ce46740 2019-08-08 stsp free(id_str);
3267 4ce46740 2019-08-08 stsp goto done;
3269 4ce46740 2019-08-08 stsp free(id_str);
3270 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
3271 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3273 4ce46740 2019-08-08 stsp goto done;
3276 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
3277 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
3278 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
3279 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3280 2ec1f75b 2019-03-26 stsp goto done;
3283 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3284 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3285 12463d8b 2019-12-13 stsp if (fd == -1) {
3286 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
3287 12463d8b 2019-12-13 stsp goto done;
3290 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3291 12463d8b 2019-12-13 stsp if (fd == -1) {
3292 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
3293 12463d8b 2019-12-13 stsp goto done;
3296 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
3297 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
3298 2ec1f75b 2019-03-26 stsp goto done;
3300 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
3301 12463d8b 2019-12-13 stsp if (f2 == NULL) {
3302 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
3303 2ec1f75b 2019-03-26 stsp goto done;
3307 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
3309 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3310 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
3312 b72f483a 2019-02-05 stsp if (blob1)
3313 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
3314 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3315 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3316 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3317 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
3318 b72f483a 2019-02-05 stsp free(abspath);
3319 927df6b7 2019-02-10 stsp return err;
3322 927df6b7 2019-02-10 stsp static const struct got_error *
3323 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
3325 b00d56cd 2018-04-01 stsp const struct got_error *error;
3326 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
3327 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
3328 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
3329 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3330 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
3331 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
3332 15a94983 2018-12-23 stsp int type1, type2;
3333 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3334 c0cc5c62 2018-10-18 stsp const char *errstr;
3335 927df6b7 2019-02-10 stsp char *path = NULL;
3337 b00d56cd 2018-04-01 stsp #ifndef PROFILE
3338 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3339 25eccc22 2019-01-04 stsp NULL) == -1)
3340 b00d56cd 2018-04-01 stsp err(1, "pledge");
3343 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3344 b00d56cd 2018-04-01 stsp switch (ch) {
3346 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3348 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3349 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3352 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
3353 b72f483a 2019-02-05 stsp if (repo_path == NULL)
3354 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3356 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3359 98eaaa12 2019-08-03 stsp diff_staged = 1;
3362 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
3365 2deda0b9 2019-03-07 stsp usage_diff();
3366 b00d56cd 2018-04-01 stsp /* NOTREACHED */
3370 b00d56cd 2018-04-01 stsp argc -= optind;
3371 b00d56cd 2018-04-01 stsp argv += optind;
3373 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
3374 b72f483a 2019-02-05 stsp if (cwd == NULL) {
3375 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3376 b72f483a 2019-02-05 stsp goto done;
3378 927df6b7 2019-02-10 stsp if (argc <= 1) {
3379 b72f483a 2019-02-05 stsp if (repo_path)
3381 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
3382 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3383 1f03b8da 2020-03-20 stsp if (error)
3384 1f03b8da 2020-03-20 stsp goto done;
3385 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
3386 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
3387 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3388 927df6b7 2019-02-10 stsp goto done;
3390 927df6b7 2019-02-10 stsp if (argc == 1) {
3391 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3393 927df6b7 2019-02-10 stsp if (error)
3394 927df6b7 2019-02-10 stsp goto done;
3396 927df6b7 2019-02-10 stsp path = strdup("");
3397 927df6b7 2019-02-10 stsp if (path == NULL) {
3398 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3399 927df6b7 2019-02-10 stsp goto done;
3402 b72f483a 2019-02-05 stsp } else if (argc == 2) {
3403 98eaaa12 2019-08-03 stsp if (diff_staged)
3404 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
3405 98eaaa12 2019-08-03 stsp "objects in repository");
3406 15a94983 2018-12-23 stsp id_str1 = argv[0];
3407 15a94983 2018-12-23 stsp id_str2 = argv[1];
3408 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3409 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3410 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3411 30db809c 2019-06-05 stsp goto done;
3412 1f03b8da 2020-03-20 stsp if (worktree) {
3413 1f03b8da 2020-03-20 stsp repo_path = strdup(
3414 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
3415 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3416 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3417 1f03b8da 2020-03-20 stsp goto done;
3420 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
3421 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3422 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3423 1f03b8da 2020-03-20 stsp goto done;
3428 b00d56cd 2018-04-01 stsp usage_diff();
3430 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3431 76089277 2018-04-01 stsp free(repo_path);
3432 b00d56cd 2018-04-01 stsp if (error != NULL)
3433 b00d56cd 2018-04-01 stsp goto done;
3435 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3436 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3437 c02c541e 2019-03-29 stsp if (error)
3438 c02c541e 2019-03-29 stsp goto done;
3440 30db809c 2019-06-05 stsp if (argc <= 1) {
3441 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
3442 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3443 b72f483a 2019-02-05 stsp char *id_str;
3445 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3447 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
3448 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
3449 b72f483a 2019-02-05 stsp if (error)
3450 b72f483a 2019-02-05 stsp goto done;
3451 b72f483a 2019-02-05 stsp arg.repo = repo;
3452 b72f483a 2019-02-05 stsp arg.worktree = worktree;
3453 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
3454 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
3455 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
3456 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
3457 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3459 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
3460 72ea6654 2019-07-27 stsp if (error)
3461 72ea6654 2019-07-27 stsp goto done;
3463 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
3464 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
3465 b72f483a 2019-02-05 stsp free(id_str);
3466 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3467 b72f483a 2019-02-05 stsp goto done;
3470 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3471 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3472 0adb7196 2019-08-11 stsp if (error)
3473 0adb7196 2019-08-11 stsp goto done;
3475 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3476 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3477 0adb7196 2019-08-11 stsp if (error)
3478 0adb7196 2019-08-11 stsp goto done;
3480 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
3481 15a94983 2018-12-23 stsp if (error)
3482 15a94983 2018-12-23 stsp goto done;
3484 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
3485 15a94983 2018-12-23 stsp if (error)
3486 15a94983 2018-12-23 stsp goto done;
3488 15a94983 2018-12-23 stsp if (type1 != type2) {
3489 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3490 b00d56cd 2018-04-01 stsp goto done;
3493 15a94983 2018-12-23 stsp switch (type1) {
3494 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
3495 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3496 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3498 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
3499 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
3500 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3502 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
3503 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
3504 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
3505 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
3508 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3511 5e70831e 2019-05-28 stsp free(label1);
3512 5e70831e 2019-05-28 stsp free(label2);
3513 15a94983 2018-12-23 stsp free(id1);
3514 15a94983 2018-12-23 stsp free(id2);
3515 927df6b7 2019-02-10 stsp free(path);
3516 b72f483a 2019-02-05 stsp if (worktree)
3517 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
3518 ad242220 2018-09-08 stsp if (repo) {
3519 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3520 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3521 ad242220 2018-09-08 stsp if (error == NULL)
3522 ad242220 2018-09-08 stsp error = repo_error;
3524 b00d56cd 2018-04-01 stsp return error;
3527 404c43c4 2018-06-21 stsp __dead static void
3528 404c43c4 2018-06-21 stsp usage_blame(void)
3530 9270e621 2019-02-05 stsp fprintf(stderr,
3531 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
3532 404c43c4 2018-06-21 stsp getprogname());
3536 28315671 2019-08-14 stsp struct blame_line {
3537 28315671 2019-08-14 stsp int annotated;
3538 28315671 2019-08-14 stsp char *id_str;
3539 82f6abb8 2019-08-14 stsp char *committer;
3540 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
3543 28315671 2019-08-14 stsp struct blame_cb_args {
3544 28315671 2019-08-14 stsp struct blame_line *lines;
3545 28315671 2019-08-14 stsp int nlines;
3546 7ef28ff8 2019-08-14 stsp int nlines_prec;
3547 28315671 2019-08-14 stsp int lineno_cur;
3548 28315671 2019-08-14 stsp off_t *line_offsets;
3550 82f6abb8 2019-08-14 stsp struct got_repository *repo;
3553 404c43c4 2018-06-21 stsp static const struct got_error *
3554 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3556 28315671 2019-08-14 stsp const struct got_error *err = NULL;
3557 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
3558 28315671 2019-08-14 stsp struct blame_line *bline;
3559 82f6abb8 2019-08-14 stsp char *line = NULL;
3560 28315671 2019-08-14 stsp size_t linesize = 0;
3561 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
3562 28315671 2019-08-14 stsp off_t offset;
3563 bcb49d15 2019-08-14 stsp struct tm tm;
3564 bcb49d15 2019-08-14 stsp time_t committer_time;
3566 28315671 2019-08-14 stsp if (nlines != a->nlines ||
3567 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3568 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
3570 28315671 2019-08-14 stsp if (sigint_received)
3571 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
3573 2839f8b9 2019-08-18 stsp if (lineno == -1)
3574 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
3576 28315671 2019-08-14 stsp /* Annotate this line. */
3577 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
3578 28315671 2019-08-14 stsp if (bline->annotated)
3579 28315671 2019-08-14 stsp return NULL;
3580 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
3582 28315671 2019-08-14 stsp return err;
3584 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
3586 82f6abb8 2019-08-14 stsp goto done;
3588 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
3589 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
3590 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
3591 bcb49d15 2019-08-14 stsp goto done;
3594 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
3595 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
3596 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
3597 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
3598 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
3599 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
3600 82f6abb8 2019-08-14 stsp goto done;
3602 28315671 2019-08-14 stsp bline->annotated = 1;
3604 28315671 2019-08-14 stsp /* Print lines annotated so far. */
3605 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3606 28315671 2019-08-14 stsp if (!bline->annotated)
3607 82f6abb8 2019-08-14 stsp goto done;
3609 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
3610 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
3611 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
3612 82f6abb8 2019-08-14 stsp goto done;
3615 28315671 2019-08-14 stsp while (bline->annotated) {
3616 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
3617 82f6abb8 2019-08-14 stsp size_t len;
3619 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
3620 28315671 2019-08-14 stsp if (ferror(a->f))
3621 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
3625 82f6abb8 2019-08-14 stsp committer = bline->committer;
3626 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
3627 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
3628 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
3629 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
3631 82f6abb8 2019-08-14 stsp *at = '\0';
3632 82f6abb8 2019-08-14 stsp len = strlen(committer);
3633 82f6abb8 2019-08-14 stsp if (len >= 9)
3634 82f6abb8 2019-08-14 stsp committer[8] = '\0';
3636 28315671 2019-08-14 stsp nl = strchr(line, '\n');
3638 28315671 2019-08-14 stsp *nl = '\0';
3639 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
3640 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
3642 28315671 2019-08-14 stsp a->lineno_cur++;
3643 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3646 82f6abb8 2019-08-14 stsp if (commit)
3647 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
3648 28315671 2019-08-14 stsp free(line);
3649 28315671 2019-08-14 stsp return err;
3652 28315671 2019-08-14 stsp static const struct got_error *
3653 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
3655 404c43c4 2018-06-21 stsp const struct got_error *error;
3656 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
3657 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
3658 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3659 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
3660 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
3661 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
3662 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
3663 28315671 2019-08-14 stsp struct blame_cb_args bca;
3664 28315671 2019-08-14 stsp int ch, obj_type, i;
3665 b02560ec 2019-08-19 stsp size_t filesize;
3667 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
3669 404c43c4 2018-06-21 stsp #ifndef PROFILE
3670 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3671 36e2fb66 2019-01-04 stsp NULL) == -1)
3672 404c43c4 2018-06-21 stsp err(1, "pledge");
3675 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3676 404c43c4 2018-06-21 stsp switch (ch) {
3678 404c43c4 2018-06-21 stsp commit_id_str = optarg;
3681 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3682 66bea077 2018-08-02 stsp if (repo_path == NULL)
3683 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3685 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3688 2deda0b9 2019-03-07 stsp usage_blame();
3689 404c43c4 2018-06-21 stsp /* NOTREACHED */
3693 404c43c4 2018-06-21 stsp argc -= optind;
3694 404c43c4 2018-06-21 stsp argv += optind;
3696 a39318fd 2018-08-02 stsp if (argc == 1)
3697 404c43c4 2018-06-21 stsp path = argv[0];
3699 404c43c4 2018-06-21 stsp usage_blame();
3701 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
3702 66bea077 2018-08-02 stsp if (cwd == NULL) {
3703 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3704 66bea077 2018-08-02 stsp goto done;
3706 66bea077 2018-08-02 stsp if (repo_path == NULL) {
3707 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3708 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3709 66bea077 2018-08-02 stsp goto done;
3711 0c06baac 2019-02-05 stsp error = NULL;
3712 0c06baac 2019-02-05 stsp if (worktree) {
3713 0c06baac 2019-02-05 stsp repo_path =
3714 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3715 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3716 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3717 1f03b8da 2020-03-20 stsp if (error)
3718 1f03b8da 2020-03-20 stsp goto done;
3721 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
3722 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
3723 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3724 0c06baac 2019-02-05 stsp goto done;
3729 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3730 c02c541e 2019-03-29 stsp if (error != NULL)
3731 36e2fb66 2019-01-04 stsp goto done;
3733 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3734 c02c541e 2019-03-29 stsp if (error)
3735 404c43c4 2018-06-21 stsp goto done;
3737 0c06baac 2019-02-05 stsp if (worktree) {
3738 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3739 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3740 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3741 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3742 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3743 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3744 6efaaa2d 2019-02-05 stsp path) == -1) {
3745 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3746 0c06baac 2019-02-05 stsp goto done;
3748 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3751 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3753 0c06baac 2019-02-05 stsp if (error)
3754 66bea077 2018-08-02 stsp goto done;
3756 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
3757 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
3758 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
3759 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
3760 404c43c4 2018-06-21 stsp if (error != NULL)
3761 66bea077 2018-08-02 stsp goto done;
3762 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3763 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
3764 404c43c4 2018-06-21 stsp if (error != NULL)
3765 66bea077 2018-08-02 stsp goto done;
3767 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3768 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3769 30837e32 2019-07-25 stsp if (error)
3770 66bea077 2018-08-02 stsp goto done;
3773 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
3774 28315671 2019-08-14 stsp if (error)
3775 28315671 2019-08-14 stsp goto done;
3777 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
3778 28315671 2019-08-14 stsp if (error)
3779 28315671 2019-08-14 stsp goto done;
3781 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
3782 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3783 28315671 2019-08-14 stsp goto done;
3786 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3787 28315671 2019-08-14 stsp if (error)
3788 28315671 2019-08-14 stsp goto done;
3789 28315671 2019-08-14 stsp bca.f = got_opentemp();
3790 28315671 2019-08-14 stsp if (bca.f == NULL) {
3791 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
3792 28315671 2019-08-14 stsp goto done;
3794 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
3795 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
3796 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
3797 28315671 2019-08-14 stsp goto done;
3799 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
3800 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
3801 b02560ec 2019-08-19 stsp bca.nlines--;
3803 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
3804 28315671 2019-08-14 stsp if (bca.lines == NULL) {
3805 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
3806 28315671 2019-08-14 stsp goto done;
3808 28315671 2019-08-14 stsp bca.lineno_cur = 1;
3809 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
3810 7ef28ff8 2019-08-14 stsp i = bca.nlines;
3811 7ef28ff8 2019-08-14 stsp while (i > 0) {
3813 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
3815 82f6abb8 2019-08-14 stsp bca.repo = repo;
3817 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
3818 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3820 66bea077 2018-08-02 stsp free(in_repo_path);
3821 66bea077 2018-08-02 stsp free(repo_path);
3822 66bea077 2018-08-02 stsp free(cwd);
3823 404c43c4 2018-06-21 stsp free(commit_id);
3824 28315671 2019-08-14 stsp free(obj_id);
3826 28315671 2019-08-14 stsp got_object_blob_close(blob);
3827 0c06baac 2019-02-05 stsp if (worktree)
3828 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
3829 ad242220 2018-09-08 stsp if (repo) {
3830 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3831 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3832 ad242220 2018-09-08 stsp if (error == NULL)
3833 ad242220 2018-09-08 stsp error = repo_error;
3835 3affba96 2019-09-22 stsp if (bca.lines) {
3836 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
3837 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
3838 3affba96 2019-09-22 stsp free(bline->id_str);
3839 3affba96 2019-09-22 stsp free(bline->committer);
3841 3affba96 2019-09-22 stsp free(bca.lines);
3843 28315671 2019-08-14 stsp free(bca.line_offsets);
3844 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
3845 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
3846 404c43c4 2018-06-21 stsp return error;
3849 5de5890b 2018-10-18 stsp __dead static void
3850 5de5890b 2018-10-18 stsp usage_tree(void)
3852 c1669e2e 2019-01-09 stsp fprintf(stderr,
3853 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
3854 5de5890b 2018-10-18 stsp getprogname());
3858 c1669e2e 2019-01-09 stsp static void
3859 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
3860 c1669e2e 2019-01-09 stsp const char *root_path)
3862 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
3863 848d6979 2019-08-12 stsp const char *modestr = "";
3864 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
3866 c1669e2e 2019-01-09 stsp path += strlen(root_path);
3867 c1669e2e 2019-01-09 stsp while (path[0] == '/')
3870 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
3871 63c5ca5d 2019-08-24 stsp modestr = "$";
3872 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
3873 848d6979 2019-08-12 stsp modestr = "@";
3874 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
3875 848d6979 2019-08-12 stsp modestr = "/";
3876 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
3877 848d6979 2019-08-12 stsp modestr = "*";
3879 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
3880 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
3883 5de5890b 2018-10-18 stsp static const struct got_error *
3884 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
3885 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
3886 c1669e2e 2019-01-09 stsp struct got_repository *repo)
3888 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
3889 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
3890 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
3891 56e0773d 2019-11-28 stsp int nentries, i;
3893 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
3895 5de5890b 2018-10-18 stsp goto done;
3897 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
3899 5de5890b 2018-10-18 stsp goto done;
3900 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
3901 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
3902 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
3903 5de5890b 2018-10-18 stsp char *id = NULL;
3905 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3908 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
3909 5de5890b 2018-10-18 stsp if (show_ids) {
3910 5de5890b 2018-10-18 stsp char *id_str;
3911 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
3912 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
3914 5de5890b 2018-10-18 stsp goto done;
3915 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
3916 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3917 5de5890b 2018-10-18 stsp free(id_str);
3918 5de5890b 2018-10-18 stsp goto done;
3920 5de5890b 2018-10-18 stsp free(id_str);
3922 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
3925 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
3926 c1669e2e 2019-01-09 stsp char *child_path;
3927 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
3928 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
3929 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
3930 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3931 c1669e2e 2019-01-09 stsp goto done;
3933 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
3934 c1669e2e 2019-01-09 stsp root_path, repo);
3935 c1669e2e 2019-01-09 stsp free(child_path);
3937 c1669e2e 2019-01-09 stsp goto done;
3942 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
3943 5de5890b 2018-10-18 stsp free(tree_id);
3944 5de5890b 2018-10-18 stsp return err;
3947 5de5890b 2018-10-18 stsp static const struct got_error *
3948 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
3950 5de5890b 2018-10-18 stsp const struct got_error *error;
3951 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
3952 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
3953 7a2c19d6 2019-02-05 stsp const char *path;
3954 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3955 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
3956 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
3957 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
3960 5de5890b 2018-10-18 stsp #ifndef PROFILE
3961 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3962 0f8d269b 2019-01-04 stsp NULL) == -1)
3963 5de5890b 2018-10-18 stsp err(1, "pledge");
3966 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
3967 5de5890b 2018-10-18 stsp switch (ch) {
3969 5de5890b 2018-10-18 stsp commit_id_str = optarg;
3972 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
3973 5de5890b 2018-10-18 stsp if (repo_path == NULL)
3974 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3976 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3979 5de5890b 2018-10-18 stsp show_ids = 1;
3982 c1669e2e 2019-01-09 stsp recurse = 1;
3985 2deda0b9 2019-03-07 stsp usage_tree();
3986 5de5890b 2018-10-18 stsp /* NOTREACHED */
3990 5de5890b 2018-10-18 stsp argc -= optind;
3991 5de5890b 2018-10-18 stsp argv += optind;
3993 5de5890b 2018-10-18 stsp if (argc == 1)
3994 5de5890b 2018-10-18 stsp path = argv[0];
3995 5de5890b 2018-10-18 stsp else if (argc > 1)
3996 5de5890b 2018-10-18 stsp usage_tree();
3998 7a2c19d6 2019-02-05 stsp path = NULL;
4000 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4001 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4002 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4003 9bf7a39b 2019-02-05 stsp goto done;
4005 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4006 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4007 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4008 7a2c19d6 2019-02-05 stsp goto done;
4010 7a2c19d6 2019-02-05 stsp error = NULL;
4011 7a2c19d6 2019-02-05 stsp if (worktree) {
4012 7a2c19d6 2019-02-05 stsp repo_path =
4013 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4014 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4015 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4016 7a2c19d6 2019-02-05 stsp if (error)
4017 7a2c19d6 2019-02-05 stsp goto done;
4019 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4020 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4021 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4022 7a2c19d6 2019-02-05 stsp goto done;
4027 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4028 5de5890b 2018-10-18 stsp if (error != NULL)
4029 c02c541e 2019-03-29 stsp goto done;
4031 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4032 c02c541e 2019-03-29 stsp if (error)
4033 5de5890b 2018-10-18 stsp goto done;
4035 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4036 9bf7a39b 2019-02-05 stsp if (worktree) {
4037 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4038 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4039 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4040 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4041 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4042 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4043 9bf7a39b 2019-02-05 stsp goto done;
4045 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4047 9bf7a39b 2019-02-05 stsp if (error)
4048 9bf7a39b 2019-02-05 stsp goto done;
4050 9bf7a39b 2019-02-05 stsp path = "/";
4052 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4053 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4054 9bf7a39b 2019-02-05 stsp if (error != NULL)
4055 9bf7a39b 2019-02-05 stsp goto done;
4058 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4059 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4060 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
4061 5de5890b 2018-10-18 stsp if (error != NULL)
4062 5de5890b 2018-10-18 stsp goto done;
4063 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4064 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4065 5de5890b 2018-10-18 stsp if (error != NULL)
4066 5de5890b 2018-10-18 stsp goto done;
4068 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4069 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4070 30837e32 2019-07-25 stsp if (error)
4071 5de5890b 2018-10-18 stsp goto done;
4074 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4075 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4077 5de5890b 2018-10-18 stsp free(in_repo_path);
4078 5de5890b 2018-10-18 stsp free(repo_path);
4079 5de5890b 2018-10-18 stsp free(cwd);
4080 5de5890b 2018-10-18 stsp free(commit_id);
4081 7a2c19d6 2019-02-05 stsp if (worktree)
4082 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4083 5de5890b 2018-10-18 stsp if (repo) {
4084 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4085 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4086 5de5890b 2018-10-18 stsp if (error == NULL)
4087 5de5890b 2018-10-18 stsp error = repo_error;
4089 5de5890b 2018-10-18 stsp return error;
4092 6bad629b 2019-02-04 stsp __dead static void
4093 6bad629b 2019-02-04 stsp usage_status(void)
4095 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4099 b72f483a 2019-02-05 stsp static const struct got_error *
4100 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4101 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4102 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4103 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4105 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4106 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4107 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4108 b72f483a 2019-02-05 stsp return NULL;
4111 6bad629b 2019-02-04 stsp static const struct got_error *
4112 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4114 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4115 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4116 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4117 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
4118 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4119 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4122 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4124 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4125 6bad629b 2019-02-04 stsp switch (ch) {
4127 2deda0b9 2019-03-07 stsp usage_status();
4128 6bad629b 2019-02-04 stsp /* NOTREACHED */
4132 6bad629b 2019-02-04 stsp argc -= optind;
4133 6bad629b 2019-02-04 stsp argv += optind;
4135 6bad629b 2019-02-04 stsp #ifndef PROFILE
4136 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4137 6bad629b 2019-02-04 stsp NULL) == -1)
4138 6bad629b 2019-02-04 stsp err(1, "pledge");
4140 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4141 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4142 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4143 927df6b7 2019-02-10 stsp goto done;
4146 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
4147 927df6b7 2019-02-10 stsp if (error != NULL)
4148 a5edda0a 2019-07-27 stsp goto done;
4150 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4152 6bad629b 2019-02-04 stsp if (error != NULL)
4153 6bad629b 2019-02-04 stsp goto done;
4155 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4156 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4157 087fb88c 2019-08-04 stsp if (error)
4158 087fb88c 2019-08-04 stsp goto done;
4160 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4161 6bad629b 2019-02-04 stsp if (error)
4162 6bad629b 2019-02-04 stsp goto done;
4164 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4165 6bad629b 2019-02-04 stsp check_cancelled, NULL);
4167 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
4168 a5edda0a 2019-07-27 stsp free((char *)pe->path);
4169 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4170 927df6b7 2019-02-10 stsp free(cwd);
4171 d0eebce4 2019-03-11 stsp return error;
4174 d0eebce4 2019-03-11 stsp __dead static void
4175 d0eebce4 2019-03-11 stsp usage_ref(void)
4177 d0eebce4 2019-03-11 stsp fprintf(stderr,
4178 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4179 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
4180 d0eebce4 2019-03-11 stsp getprogname());
4184 d0eebce4 2019-03-11 stsp static const struct got_error *
4185 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
4187 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
4188 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
4189 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
4191 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
4192 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4194 d0eebce4 2019-03-11 stsp return err;
4196 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4197 d0eebce4 2019-03-11 stsp char *refstr;
4198 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
4199 d0eebce4 2019-03-11 stsp if (refstr == NULL)
4200 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
4201 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4202 d0eebce4 2019-03-11 stsp free(refstr);
4205 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4206 d0eebce4 2019-03-11 stsp return NULL;
4209 d0eebce4 2019-03-11 stsp static const struct got_error *
4210 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
4212 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4213 d0eebce4 2019-03-11 stsp struct got_reference *ref;
4215 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
4217 d0eebce4 2019-03-11 stsp return err;
4219 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
4220 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4221 d0eebce4 2019-03-11 stsp return err;
4224 d0eebce4 2019-03-11 stsp static const struct got_error *
4225 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
4227 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4228 d0eebce4 2019-03-11 stsp struct got_object_id *id;
4229 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
4232 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4233 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
4234 d1644381 2019-07-14 stsp * an unintended typo.
4236 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4237 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4239 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4241 d83d9d5c 2019-05-13 stsp if (err) {
4242 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
4244 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4245 d83d9d5c 2019-05-13 stsp return err;
4246 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
4248 d83d9d5c 2019-05-13 stsp return err;
4249 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
4250 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
4252 d83d9d5c 2019-05-13 stsp return err;
4255 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
4257 d0eebce4 2019-03-11 stsp goto done;
4259 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
4262 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4264 d1c1ae5f 2019-08-12 stsp return err;
4267 d1c1ae5f 2019-08-12 stsp static const struct got_error *
4268 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
4270 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
4271 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
4272 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
4275 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4276 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
4277 d1c1ae5f 2019-08-12 stsp * an unintended typo.
4279 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4280 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4282 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
4284 d1c1ae5f 2019-08-12 stsp return err;
4286 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
4288 d1c1ae5f 2019-08-12 stsp goto done;
4290 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
4292 d1c1ae5f 2019-08-12 stsp if (target_ref)
4293 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
4295 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
4296 d0eebce4 2019-03-11 stsp return err;
4299 d0eebce4 2019-03-11 stsp static const struct got_error *
4300 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
4302 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
4303 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
4304 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
4305 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
4306 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
4307 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
4308 b2070a3f 2020-03-22 stsp char *refname = NULL;
4310 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4311 d0eebce4 2019-03-11 stsp switch (ch) {
4313 e31abbf2 2020-03-22 stsp obj_arg = optarg;
4316 e31abbf2 2020-03-22 stsp do_delete = 1;
4319 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
4320 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4321 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4323 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4326 d0eebce4 2019-03-11 stsp do_list = 1;
4329 e31abbf2 2020-03-22 stsp symref_target = optarg;
4332 d0eebce4 2019-03-11 stsp usage_ref();
4333 d0eebce4 2019-03-11 stsp /* NOTREACHED */
4337 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
4338 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
4339 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
4340 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
4341 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
4342 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
4343 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
4344 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
4345 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
4346 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
4347 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
4348 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
4350 d0eebce4 2019-03-11 stsp argc -= optind;
4351 d0eebce4 2019-03-11 stsp argv += optind;
4353 e31abbf2 2020-03-22 stsp if (do_list) {
4354 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
4355 d0eebce4 2019-03-11 stsp usage_ref();
4356 b2070a3f 2020-03-22 stsp if (argc == 1) {
4357 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4358 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4359 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4360 b2070a3f 2020-03-22 stsp goto done;
4364 e31abbf2 2020-03-22 stsp if (argc != 1)
4365 e31abbf2 2020-03-22 stsp usage_ref();
4366 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4367 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4368 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4369 b2070a3f 2020-03-22 stsp goto done;
4373 b2070a3f 2020-03-22 stsp if (refname)
4374 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
4376 d0eebce4 2019-03-11 stsp #ifndef PROFILE
4377 e0b57350 2019-03-12 stsp if (do_list) {
4378 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4379 e0b57350 2019-03-12 stsp NULL) == -1)
4380 e0b57350 2019-03-12 stsp err(1, "pledge");
4382 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4383 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
4384 e0b57350 2019-03-12 stsp err(1, "pledge");
4387 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
4388 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
4389 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4390 d0eebce4 2019-03-11 stsp goto done;
4393 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4394 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
4395 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4396 d0eebce4 2019-03-11 stsp goto done;
4398 d0eebce4 2019-03-11 stsp error = NULL;
4399 d0eebce4 2019-03-11 stsp if (worktree) {
4400 d0eebce4 2019-03-11 stsp repo_path =
4401 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
4402 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4403 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4404 d0eebce4 2019-03-11 stsp if (error)
4405 d0eebce4 2019-03-11 stsp goto done;
4407 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
4408 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4409 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4410 d0eebce4 2019-03-11 stsp goto done;
4415 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4416 d0eebce4 2019-03-11 stsp if (error != NULL)
4417 d0eebce4 2019-03-11 stsp goto done;
4419 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4420 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4421 c02c541e 2019-03-29 stsp if (error)
4422 c02c541e 2019-03-29 stsp goto done;
4424 d0eebce4 2019-03-11 stsp if (do_list)
4425 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
4426 e31abbf2 2020-03-22 stsp else if (do_delete)
4427 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
4428 e31abbf2 2020-03-22 stsp else if (symref_target)
4429 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
4431 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
4432 e31abbf2 2020-03-22 stsp usage_ref();
4433 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
4436 b2070a3f 2020-03-22 stsp free(refname);
4438 4e759de4 2019-06-26 stsp got_repo_close(repo);
4439 4e759de4 2019-06-26 stsp if (worktree)
4440 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
4441 4e759de4 2019-06-26 stsp free(cwd);
4442 4e759de4 2019-06-26 stsp free(repo_path);
4443 4e759de4 2019-06-26 stsp return error;
4446 4e759de4 2019-06-26 stsp __dead static void
4447 4e759de4 2019-06-26 stsp usage_branch(void)
4449 4e759de4 2019-06-26 stsp fprintf(stderr,
4450 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4451 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
4455 4e759de4 2019-06-26 stsp static const struct got_error *
4456 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
4457 4e99b47e 2019-10-04 stsp struct got_reference *ref)
4459 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
4460 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
4461 4e99b47e 2019-10-04 stsp char *refstr;
4463 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
4464 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
4465 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
4466 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
4468 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
4470 4e99b47e 2019-10-04 stsp return err;
4471 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
4472 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
4473 4e99b47e 2019-10-04 stsp marker = "* ";
4475 4e99b47e 2019-10-04 stsp marker = "~ ";
4479 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4480 4e99b47e 2019-10-04 stsp refname += 11;
4481 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4482 4e99b47e 2019-10-04 stsp refname += 18;
4484 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
4485 4e99b47e 2019-10-04 stsp if (refstr == NULL)
4486 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
4488 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
4489 4e99b47e 2019-10-04 stsp free(refstr);
4490 4e99b47e 2019-10-04 stsp return NULL;
4493 4e99b47e 2019-10-04 stsp static const struct got_error *
4494 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4496 ad89fa31 2019-10-04 stsp const char *refname;
4498 ad89fa31 2019-10-04 stsp if (worktree == NULL)
4499 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
4501 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
4503 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4504 ad89fa31 2019-10-04 stsp refname += 11;
4505 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4506 ad89fa31 2019-10-04 stsp refname += 18;
4508 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
4510 ad89fa31 2019-10-04 stsp return NULL;
4513 ad89fa31 2019-10-04 stsp static const struct got_error *
4514 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
4516 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
4517 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
4518 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
4519 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
4520 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
4522 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
4524 4e99b47e 2019-10-04 stsp if (worktree) {
4525 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
4526 4e99b47e 2019-10-04 stsp worktree);
4528 4e99b47e 2019-10-04 stsp return err;
4530 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
4531 4e99b47e 2019-10-04 stsp worktree);
4533 4e99b47e 2019-10-04 stsp return err;
4535 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
4536 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
4537 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
4539 4e99b47e 2019-10-04 stsp return err;
4540 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
4541 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
4545 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
4546 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
4548 4e759de4 2019-06-26 stsp return err;
4550 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
4551 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
4553 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
4554 4e759de4 2019-06-26 stsp return NULL;
4557 4e759de4 2019-06-26 stsp static const struct got_error *
4558 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
4559 45cd4e47 2019-08-25 stsp const char *branch_name)
4561 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4562 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
4563 4e759de4 2019-06-26 stsp char *refname;
4565 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
4566 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
4568 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4570 4e759de4 2019-06-26 stsp goto done;
4572 45cd4e47 2019-08-25 stsp if (worktree &&
4573 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
4574 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
4575 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
4576 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
4577 45cd4e47 2019-08-25 stsp goto done;
4580 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
4583 45cd4e47 2019-08-25 stsp got_ref_close(ref);
4584 4e759de4 2019-06-26 stsp free(refname);
4585 4e759de4 2019-06-26 stsp return err;
4588 4e759de4 2019-06-26 stsp static const struct got_error *
4589 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
4590 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
4592 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4593 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
4594 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
4597 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
4598 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
4599 d3f84d51 2019-07-11 stsp * an unintended typo.
4601 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
4602 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
4604 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
4605 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
4606 4e759de4 2019-06-26 stsp goto done;
4609 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4610 4e759de4 2019-06-26 stsp if (err == NULL) {
4611 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
4612 4e759de4 2019-06-26 stsp goto done;
4613 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
4614 4e759de4 2019-06-26 stsp goto done;
4616 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
4618 4e759de4 2019-06-26 stsp goto done;
4620 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
4623 4e759de4 2019-06-26 stsp got_ref_close(ref);
4624 4e759de4 2019-06-26 stsp free(base_refname);
4625 4e759de4 2019-06-26 stsp free(refname);
4626 4e759de4 2019-06-26 stsp return err;
4629 4e759de4 2019-06-26 stsp static const struct got_error *
4630 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
4632 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
4633 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
4634 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
4635 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
4636 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
4637 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
4638 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
4639 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
4640 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
4641 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
4642 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
4644 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
4646 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
4647 4e759de4 2019-06-26 stsp switch (ch) {
4649 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
4652 4e759de4 2019-06-26 stsp delref = optarg;
4655 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
4656 4e759de4 2019-06-26 stsp if (repo_path == NULL)
4657 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4659 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
4662 4e759de4 2019-06-26 stsp do_list = 1;
4665 da76fce2 2020-02-24 stsp do_update = 0;
4668 4e759de4 2019-06-26 stsp usage_branch();
4669 4e759de4 2019-06-26 stsp /* NOTREACHED */
4673 4e759de4 2019-06-26 stsp if (do_list && delref)
4674 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
4676 4e759de4 2019-06-26 stsp argc -= optind;
4677 4e759de4 2019-06-26 stsp argv += optind;
4679 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
4680 ad89fa31 2019-10-04 stsp do_show = 1;
4682 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
4683 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
4685 4e759de4 2019-06-26 stsp if (do_list || delref) {
4686 4e759de4 2019-06-26 stsp if (argc > 0)
4687 4e759de4 2019-06-26 stsp usage_branch();
4688 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
4689 4e759de4 2019-06-26 stsp usage_branch();
4691 4e759de4 2019-06-26 stsp #ifndef PROFILE
4692 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
4693 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4694 4e759de4 2019-06-26 stsp NULL) == -1)
4695 4e759de4 2019-06-26 stsp err(1, "pledge");
4697 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4698 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
4699 4e759de4 2019-06-26 stsp err(1, "pledge");
4702 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
4703 4e759de4 2019-06-26 stsp if (cwd == NULL) {
4704 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
4705 4e759de4 2019-06-26 stsp goto done;
4708 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
4709 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
4710 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4711 4e759de4 2019-06-26 stsp goto done;
4713 4e759de4 2019-06-26 stsp error = NULL;
4714 4e759de4 2019-06-26 stsp if (worktree) {
4715 4e759de4 2019-06-26 stsp repo_path =
4716 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
4717 4e759de4 2019-06-26 stsp if (repo_path == NULL)
4718 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
4719 4e759de4 2019-06-26 stsp if (error)
4720 4e759de4 2019-06-26 stsp goto done;
4722 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
4723 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
4724 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
4725 4e759de4 2019-06-26 stsp goto done;
4730 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4731 4e759de4 2019-06-26 stsp if (error != NULL)
4732 4e759de4 2019-06-26 stsp goto done;
4734 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4735 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4736 4e759de4 2019-06-26 stsp if (error)
4737 4e759de4 2019-06-26 stsp goto done;
4739 ad89fa31 2019-10-04 stsp if (do_show)
4740 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
4741 ad89fa31 2019-10-04 stsp else if (do_list)
4742 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
4743 4e759de4 2019-06-26 stsp else if (delref)
4744 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
4746 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
4747 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
4748 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
4749 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
4750 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4751 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
4752 a74f7e83 2019-11-10 stsp if (error)
4753 a74f7e83 2019-11-10 stsp goto done;
4754 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
4755 da76fce2 2020-02-24 stsp if (error)
4756 da76fce2 2020-02-24 stsp goto done;
4757 da76fce2 2020-02-24 stsp if (worktree && do_update) {
4758 da76fce2 2020-02-24 stsp int did_something = 0;
4759 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
4761 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
4762 da76fce2 2020-02-24 stsp if (error)
4763 da76fce2 2020-02-24 stsp goto done;
4764 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
4765 da76fce2 2020-02-24 stsp worktree);
4766 da76fce2 2020-02-24 stsp if (error)
4767 da76fce2 2020-02-24 stsp goto done;
4768 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
4770 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
4771 da76fce2 2020-02-24 stsp goto done;
4773 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
4774 da76fce2 2020-02-24 stsp free(branch_refname);
4775 da76fce2 2020-02-24 stsp if (error)
4776 da76fce2 2020-02-24 stsp goto done;
4777 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
4779 da76fce2 2020-02-24 stsp if (error)
4780 da76fce2 2020-02-24 stsp goto done;
4781 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
4782 da76fce2 2020-02-24 stsp commit_id);
4783 da76fce2 2020-02-24 stsp if (error)
4784 da76fce2 2020-02-24 stsp goto done;
4785 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
4786 da76fce2 2020-02-24 stsp repo, update_progress, &did_something,
4787 da76fce2 2020-02-24 stsp check_cancelled, NULL);
4788 da76fce2 2020-02-24 stsp if (error)
4789 da76fce2 2020-02-24 stsp goto done;
4790 da76fce2 2020-02-24 stsp if (did_something)
4791 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
4796 da76fce2 2020-02-24 stsp got_ref_close(ref);
4798 d0eebce4 2019-03-11 stsp got_repo_close(repo);
4799 d0eebce4 2019-03-11 stsp if (worktree)
4800 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
4801 d0eebce4 2019-03-11 stsp free(cwd);
4802 d0eebce4 2019-03-11 stsp free(repo_path);
4803 da76fce2 2020-02-24 stsp free(commit_id);
4804 da76fce2 2020-02-24 stsp free(commit_id_str);
4805 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
4806 da76fce2 2020-02-24 stsp free((char *)pe->path);
4807 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
4808 d00136be 2019-03-26 stsp return error;
4812 d00136be 2019-03-26 stsp __dead static void
4813 8e7bd50a 2019-08-22 stsp usage_tag(void)
4815 8e7bd50a 2019-08-22 stsp fprintf(stderr,
4816 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
4817 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
4822 b8bad2ba 2019-08-23 stsp static const struct got_error *
4823 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
4825 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
4826 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
4827 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
4828 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
4829 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
4831 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
4832 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
4833 b8bad2ba 2019-08-23 stsp if (se == NULL) {
4834 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
4836 b8bad2ba 2019-08-23 stsp return err;
4837 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
4840 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
4843 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
4844 b8bad2ba 2019-08-23 stsp free(re_id);
4847 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
4848 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
4851 b8bad2ba 2019-08-23 stsp while (se) {
4852 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
4855 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
4856 b8bad2ba 2019-08-23 stsp free(se_id);
4859 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
4860 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
4862 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
4863 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
4865 b8bad2ba 2019-08-23 stsp return err;
4866 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
4869 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
4874 b8bad2ba 2019-08-23 stsp return err;
4878 b8bad2ba 2019-08-23 stsp static const struct got_error *
4879 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
4881 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
4882 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
4883 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
4885 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
4887 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
4889 8e7bd50a 2019-08-22 stsp return err;
4891 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4892 8e7bd50a 2019-08-22 stsp const char *refname;
4893 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
4894 8e7bd50a 2019-08-22 stsp char datebuf[26];
4895 d4efa91b 2020-01-14 stsp const char *tagger;
4896 8e7bd50a 2019-08-22 stsp time_t tagger_time;
4897 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
4898 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
4899 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
4901 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
4902 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
4904 8e7bd50a 2019-08-22 stsp refname += 10;
4905 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
4906 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
4907 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
4910 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
4911 8e7bd50a 2019-08-22 stsp free(refstr);
4913 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
4916 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
4917 d4efa91b 2020-01-14 stsp if (err) {
4918 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
4922 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
4923 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
4924 d4efa91b 2020-01-14 stsp if (err) {
4928 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
4929 d4efa91b 2020-01-14 stsp tagger_time =
4930 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
4931 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
4937 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
4938 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
4939 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
4940 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
4944 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
4945 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
4946 2417344c 2019-08-23 stsp if (datestr)
4947 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
4948 d4efa91b 2020-01-14 stsp if (commit)
4949 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
4951 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
4952 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
4953 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
4956 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
4957 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
4960 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
4961 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
4964 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
4965 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
4972 8e7bd50a 2019-08-22 stsp free(id_str);
4973 d4efa91b 2020-01-14 stsp if (commit) {
4974 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
4977 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
4979 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
4980 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
4981 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
4982 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
4987 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
4989 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
4991 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
4992 8e7bd50a 2019-08-22 stsp } while (line);
4993 8e7bd50a 2019-08-22 stsp free(tagmsg0);
4996 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
4997 8e7bd50a 2019-08-22 stsp return NULL;
5000 8e7bd50a 2019-08-22 stsp static const struct got_error *
5001 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5002 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5004 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5005 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5006 f372d5cd 2019-10-21 stsp char *editor = NULL;
5007 8e7bd50a 2019-08-22 stsp int fd = -1;
5009 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5010 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5011 8e7bd50a 2019-08-22 stsp goto done;
5014 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5015 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
5016 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5017 8e7bd50a 2019-08-22 stsp goto done;
5020 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5022 8e7bd50a 2019-08-22 stsp goto done;
5024 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
5025 8e7bd50a 2019-08-22 stsp close(fd);
5027 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5029 8e7bd50a 2019-08-22 stsp goto done;
5030 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5032 8e7bd50a 2019-08-22 stsp free(initial_content);
5033 8e7bd50a 2019-08-22 stsp free(template);
5034 8e7bd50a 2019-08-22 stsp free(editor);
5036 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5037 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5038 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5039 8e7bd50a 2019-08-22 stsp if (err) {
5040 8e7bd50a 2019-08-22 stsp free(*tagmsg);
5041 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
5044 8e7bd50a 2019-08-22 stsp return err;
5047 8e7bd50a 2019-08-22 stsp static const struct got_error *
5048 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
5049 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
5051 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5052 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5053 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5054 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5055 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5056 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5057 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5060 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5061 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5062 8e7bd50a 2019-08-22 stsp * an unintended typo.
5064 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5065 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5067 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
5069 8e7bd50a 2019-08-22 stsp return err;
5071 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5072 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5074 8e7bd50a 2019-08-22 stsp goto done;
5076 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5078 8e7bd50a 2019-08-22 stsp goto done;
5080 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5081 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5082 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5083 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
5084 8e7bd50a 2019-08-22 stsp goto done;
5086 8e7bd50a 2019-08-22 stsp tag_name += 10;
5087 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5088 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5089 8e7bd50a 2019-08-22 stsp goto done;
5092 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5093 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5094 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5095 8e7bd50a 2019-08-22 stsp goto done;
5096 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5097 8e7bd50a 2019-08-22 stsp goto done;
5099 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5100 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5101 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5102 f372d5cd 2019-10-21 stsp if (err) {
5103 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5104 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5105 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5106 8e7bd50a 2019-08-22 stsp goto done;
5110 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5111 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5112 f372d5cd 2019-10-21 stsp if (err) {
5113 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5114 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5115 8e7bd50a 2019-08-22 stsp goto done;
5118 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5119 f372d5cd 2019-10-21 stsp if (err) {
5120 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5121 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5122 8e7bd50a 2019-08-22 stsp goto done;
5125 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5126 f372d5cd 2019-10-21 stsp if (err) {
5127 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5128 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5129 f372d5cd 2019-10-21 stsp goto done;
5132 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
5133 f372d5cd 2019-10-21 stsp if (err) {
5134 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5135 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5136 f372d5cd 2019-10-21 stsp goto done;
5138 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
5140 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
5141 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
5142 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
5143 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5144 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
5145 f372d5cd 2019-10-21 stsp free(tag_id_str);
5147 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
5148 8e7bd50a 2019-08-22 stsp free(commit_id);
5149 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5150 8e7bd50a 2019-08-22 stsp free(refname);
5151 8e7bd50a 2019-08-22 stsp free(tagmsg);
5152 f372d5cd 2019-10-21 stsp free(tagmsg_path);
5153 aba9c984 2019-09-08 stsp free(tagger);
5154 8e7bd50a 2019-08-22 stsp return err;
5157 8e7bd50a 2019-08-22 stsp static const struct got_error *
5158 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
5160 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
5161 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
5162 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
5163 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5164 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
5165 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5166 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
5168 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5169 8e7bd50a 2019-08-22 stsp switch (ch) {
5171 80106605 2020-02-24 stsp commit_id_arg = optarg;
5174 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
5177 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
5178 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5179 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5181 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
5184 8e7bd50a 2019-08-22 stsp do_list = 1;
5187 8e7bd50a 2019-08-22 stsp usage_tag();
5188 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
5192 8e7bd50a 2019-08-22 stsp argc -= optind;
5193 8e7bd50a 2019-08-22 stsp argv += optind;
5195 8e7bd50a 2019-08-22 stsp if (do_list) {
5196 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
5198 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
5199 8e7bd50a 2019-08-22 stsp if (tagmsg)
5200 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
5201 8e7bd50a 2019-08-22 stsp if (argc > 0)
5202 8e7bd50a 2019-08-22 stsp usage_tag();
5203 80106605 2020-02-24 stsp } else if (argc != 1)
5204 8e7bd50a 2019-08-22 stsp usage_tag();
5206 a2887370 2019-08-23 stsp tag_name = argv[0];
5208 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
5209 8e7bd50a 2019-08-22 stsp if (do_list) {
5210 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5211 8e7bd50a 2019-08-22 stsp NULL) == -1)
5212 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5214 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5215 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
5216 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5219 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
5220 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
5221 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
5222 8e7bd50a 2019-08-22 stsp goto done;
5225 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5226 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
5227 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5228 8e7bd50a 2019-08-22 stsp goto done;
5230 8e7bd50a 2019-08-22 stsp error = NULL;
5231 8e7bd50a 2019-08-22 stsp if (worktree) {
5232 8e7bd50a 2019-08-22 stsp repo_path =
5233 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
5234 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5235 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5236 8e7bd50a 2019-08-22 stsp if (error)
5237 8e7bd50a 2019-08-22 stsp goto done;
5239 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
5240 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5241 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5242 8e7bd50a 2019-08-22 stsp goto done;
5247 8e7bd50a 2019-08-22 stsp if (do_list) {
5248 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5249 c9956ddf 2019-09-08 stsp if (error != NULL)
5250 c9956ddf 2019-09-08 stsp goto done;
5251 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5252 8e7bd50a 2019-08-22 stsp if (error)
5253 8e7bd50a 2019-08-22 stsp goto done;
5254 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
5256 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5257 c9956ddf 2019-09-08 stsp if (error)
5258 c9956ddf 2019-09-08 stsp goto done;
5259 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
5260 c9956ddf 2019-09-08 stsp if (error != NULL)
5261 c9956ddf 2019-09-08 stsp goto done;
5263 8e7bd50a 2019-08-22 stsp if (tagmsg) {
5264 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5265 8e7bd50a 2019-08-22 stsp if (error)
5266 8e7bd50a 2019-08-22 stsp goto done;
5269 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
5270 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
5271 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
5272 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
5273 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
5274 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
5275 8e7bd50a 2019-08-22 stsp if (error)
5276 8e7bd50a 2019-08-22 stsp goto done;
5277 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5278 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
5279 8e7bd50a 2019-08-22 stsp if (error)
5280 8e7bd50a 2019-08-22 stsp goto done;
5281 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
5282 8e7bd50a 2019-08-22 stsp free(commit_id);
5283 8e7bd50a 2019-08-22 stsp if (error)
5284 8e7bd50a 2019-08-22 stsp goto done;
5287 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
5288 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5292 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
5293 8e7bd50a 2019-08-22 stsp if (worktree)
5294 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
5295 8e7bd50a 2019-08-22 stsp free(cwd);
5296 8e7bd50a 2019-08-22 stsp free(repo_path);
5297 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5298 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5299 8e7bd50a 2019-08-22 stsp return error;
5302 8e7bd50a 2019-08-22 stsp __dead static void
5303 d00136be 2019-03-26 stsp usage_add(void)
5305 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5306 022fae89 2019-12-06 tracey getprogname());
5310 d00136be 2019-03-26 stsp static const struct got_error *
5311 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
5313 4e68cba3 2019-11-23 stsp while (path[0] == '/')
5315 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
5316 4e68cba3 2019-11-23 stsp return NULL;
5319 4e68cba3 2019-11-23 stsp static const struct got_error *
5320 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
5322 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
5323 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
5324 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
5325 1dd54920 2019-05-11 stsp char *cwd = NULL;
5326 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
5327 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
5328 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
5330 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
5332 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
5333 d00136be 2019-03-26 stsp switch (ch) {
5334 022fae89 2019-12-06 tracey case 'I':
5335 022fae89 2019-12-06 tracey no_ignores = 1;
5338 4e68cba3 2019-11-23 stsp can_recurse = 1;
5341 d00136be 2019-03-26 stsp usage_add();
5342 d00136be 2019-03-26 stsp /* NOTREACHED */
5346 d00136be 2019-03-26 stsp argc -= optind;
5347 d00136be 2019-03-26 stsp argv += optind;
5349 43012d58 2019-07-14 stsp #ifndef PROFILE
5350 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5351 43012d58 2019-07-14 stsp NULL) == -1)
5352 43012d58 2019-07-14 stsp err(1, "pledge");
5354 723c305c 2019-05-11 jcs if (argc < 1)
5355 d00136be 2019-03-26 stsp usage_add();
5357 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
5358 d00136be 2019-03-26 stsp if (cwd == NULL) {
5359 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5360 d00136be 2019-03-26 stsp goto done;
5363 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5364 d00136be 2019-03-26 stsp if (error)
5365 d00136be 2019-03-26 stsp goto done;
5367 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5369 031a5338 2019-03-26 stsp if (error != NULL)
5370 031a5338 2019-03-26 stsp goto done;
5372 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5373 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5374 d00136be 2019-03-26 stsp if (error)
5375 d00136be 2019-03-26 stsp goto done;
5377 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5378 6d022e97 2019-08-04 stsp if (error)
5379 022fae89 2019-12-06 tracey goto done;
5381 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
5382 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5383 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
5384 6d022e97 2019-08-04 stsp goto done;
5388 4e68cba3 2019-11-23 stsp if (!can_recurse) {
5389 4e68cba3 2019-11-23 stsp char *ondisk_path;
5390 4e68cba3 2019-11-23 stsp struct stat sb;
5391 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
5392 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
5393 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
5394 4e68cba3 2019-11-23 stsp pe->path) == -1) {
5395 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
5396 4e68cba3 2019-11-23 stsp goto done;
5398 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
5399 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
5400 4e68cba3 2019-11-23 stsp free(ondisk_path);
5403 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
5404 4e68cba3 2019-11-23 stsp ondisk_path);
5405 4e68cba3 2019-11-23 stsp free(ondisk_path);
5406 4e68cba3 2019-11-23 stsp goto done;
5408 4e68cba3 2019-11-23 stsp free(ondisk_path);
5409 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
5410 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5411 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
5412 4e68cba3 2019-11-23 stsp goto done;
5417 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
5418 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
5421 031a5338 2019-03-26 stsp got_repo_close(repo);
5422 d00136be 2019-03-26 stsp if (worktree)
5423 d00136be 2019-03-26 stsp got_worktree_close(worktree);
5424 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
5425 1dd54920 2019-05-11 stsp free((char *)pe->path);
5426 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
5427 2ec1f75b 2019-03-26 stsp free(cwd);
5428 2ec1f75b 2019-03-26 stsp return error;
5431 2ec1f75b 2019-03-26 stsp __dead static void
5432 648e4ef7 2019-07-09 stsp usage_remove(void)
5434 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5435 f2a9dc41 2019-12-13 tracey getprogname());
5439 2a06fe5f 2019-08-24 stsp static const struct got_error *
5440 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
5441 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
5443 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
5445 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5446 2a06fe5f 2019-08-24 stsp return NULL;
5447 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5448 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
5449 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
5450 2a06fe5f 2019-08-24 stsp return NULL;
5453 2ec1f75b 2019-03-26 stsp static const struct got_error *
5454 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
5456 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
5457 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
5458 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
5459 17ed4618 2019-06-02 stsp char *cwd = NULL;
5460 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
5461 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
5462 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5464 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
5466 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
5467 2ec1f75b 2019-03-26 stsp switch (ch) {
5469 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
5471 70e3e7f5 2019-12-13 tracey case 'k':
5472 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
5474 f2a9dc41 2019-12-13 tracey case 'R':
5475 f2a9dc41 2019-12-13 tracey can_recurse = 1;
5478 f2a9dc41 2019-12-13 tracey usage_remove();
5479 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
5483 2ec1f75b 2019-03-26 stsp argc -= optind;
5484 2ec1f75b 2019-03-26 stsp argv += optind;
5486 43012d58 2019-07-14 stsp #ifndef PROFILE
5487 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5488 43012d58 2019-07-14 stsp NULL) == -1)
5489 43012d58 2019-07-14 stsp err(1, "pledge");
5491 17ed4618 2019-06-02 stsp if (argc < 1)
5492 648e4ef7 2019-07-09 stsp usage_remove();
5494 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
5495 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
5496 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5497 2ec1f75b 2019-03-26 stsp goto done;
5499 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5500 2ec1f75b 2019-03-26 stsp if (error)
5501 2ec1f75b 2019-03-26 stsp goto done;
5503 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5506 2ec1f75b 2019-03-26 stsp goto done;
5508 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5509 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5510 2ec1f75b 2019-03-26 stsp if (error)
5511 2ec1f75b 2019-03-26 stsp goto done;
5513 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5514 6d022e97 2019-08-04 stsp if (error)
5515 6d022e97 2019-08-04 stsp goto done;
5517 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
5518 f2a9dc41 2019-12-13 tracey char *ondisk_path;
5519 f2a9dc41 2019-12-13 tracey struct stat sb;
5520 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
5521 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
5522 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
5523 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
5524 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
5525 f2a9dc41 2019-12-13 tracey goto done;
5527 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
5528 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
5529 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5530 f2a9dc41 2019-12-13 tracey continue;
5532 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
5533 f2a9dc41 2019-12-13 tracey ondisk_path);
5534 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5535 f2a9dc41 2019-12-13 tracey goto done;
5537 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5538 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
5539 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5540 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
5541 f2a9dc41 2019-12-13 tracey goto done;
5546 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
5547 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
5550 a129376b 2019-03-28 stsp got_repo_close(repo);
5551 a129376b 2019-03-28 stsp if (worktree)
5552 a129376b 2019-03-28 stsp got_worktree_close(worktree);
5553 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
5554 17ed4618 2019-06-02 stsp free((char *)pe->path);
5555 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
5556 a129376b 2019-03-28 stsp free(cwd);
5557 a129376b 2019-03-28 stsp return error;
5560 a129376b 2019-03-28 stsp __dead static void
5561 a129376b 2019-03-28 stsp usage_revert(void)
5563 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
5564 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
5568 1ee397ad 2019-07-12 stsp static const struct got_error *
5569 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
5571 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
5572 fb9704af 2020-01-27 stsp return NULL;
5574 a129376b 2019-03-28 stsp while (path[0] == '/')
5576 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
5577 33aa809d 2019-08-08 stsp return NULL;
5580 33aa809d 2019-08-08 stsp struct choose_patch_arg {
5581 33aa809d 2019-08-08 stsp FILE *patch_script_file;
5582 33aa809d 2019-08-08 stsp const char *action;
5585 33aa809d 2019-08-08 stsp static const struct got_error *
5586 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5587 33aa809d 2019-08-08 stsp int nchanges, const char *action)
5589 33aa809d 2019-08-08 stsp char *line = NULL;
5590 33aa809d 2019-08-08 stsp size_t linesize = 0;
5591 33aa809d 2019-08-08 stsp ssize_t linelen;
5593 33aa809d 2019-08-08 stsp switch (status) {
5594 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
5595 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
5597 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
5598 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
5600 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
5601 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
5602 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
5603 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5604 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
5605 33aa809d 2019-08-08 stsp printf("%s", line);
5606 33aa809d 2019-08-08 stsp if (ferror(patch_file))
5607 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5608 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5609 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5610 33aa809d 2019-08-08 stsp path, n, nchanges, action);
5613 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
5616 33aa809d 2019-08-08 stsp return NULL;
5619 33aa809d 2019-08-08 stsp static const struct got_error *
5620 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5621 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
5623 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
5624 33aa809d 2019-08-08 stsp char *line = NULL;
5625 33aa809d 2019-08-08 stsp size_t linesize = 0;
5626 33aa809d 2019-08-08 stsp ssize_t linelen;
5627 33aa809d 2019-08-08 stsp int resp = ' ';
5628 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
5630 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
5632 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
5634 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5635 33aa809d 2019-08-08 stsp a->action);
5637 33aa809d 2019-08-08 stsp return err;
5638 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
5639 33aa809d 2019-08-08 stsp if (linelen == -1) {
5640 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
5641 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5642 33aa809d 2019-08-08 stsp return NULL;
5644 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
5646 33aa809d 2019-08-08 stsp *nl = '\0';
5647 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
5648 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
5649 33aa809d 2019-08-08 stsp printf("y\n");
5650 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
5651 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
5652 33aa809d 2019-08-08 stsp printf("n\n");
5653 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
5654 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
5655 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
5656 33aa809d 2019-08-08 stsp printf("q\n");
5658 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
5659 33aa809d 2019-08-08 stsp free(line);
5660 33aa809d 2019-08-08 stsp return NULL;
5663 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
5664 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5665 33aa809d 2019-08-08 stsp a->action);
5667 33aa809d 2019-08-08 stsp return err;
5668 33aa809d 2019-08-08 stsp resp = getchar();
5669 33aa809d 2019-08-08 stsp if (resp == '\n')
5670 33aa809d 2019-08-08 stsp resp = getchar();
5671 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
5672 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
5673 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
5674 33aa809d 2019-08-08 stsp resp = ' ';
5676 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
5677 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
5678 33aa809d 2019-08-08 stsp resp = ' ';
5682 33aa809d 2019-08-08 stsp if (resp == 'y')
5683 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
5684 33aa809d 2019-08-08 stsp else if (resp == 'n')
5685 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
5686 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
5687 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
5689 1ee397ad 2019-07-12 stsp return NULL;
5693 a129376b 2019-03-28 stsp static const struct got_error *
5694 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
5696 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
5697 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
5698 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
5699 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
5700 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
5701 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
5702 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
5703 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
5704 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
5705 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
5707 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
5709 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
5710 a129376b 2019-03-28 stsp switch (ch) {
5712 33aa809d 2019-08-08 stsp pflag = 1;
5715 33aa809d 2019-08-08 stsp patch_script_path = optarg;
5718 0f6d7415 2019-08-08 stsp can_recurse = 1;
5721 a129376b 2019-03-28 stsp usage_revert();
5722 a129376b 2019-03-28 stsp /* NOTREACHED */
5726 a129376b 2019-03-28 stsp argc -= optind;
5727 a129376b 2019-03-28 stsp argv += optind;
5729 43012d58 2019-07-14 stsp #ifndef PROFILE
5730 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5731 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5732 43012d58 2019-07-14 stsp err(1, "pledge");
5734 e20a8b6f 2019-06-04 stsp if (argc < 1)
5735 a129376b 2019-03-28 stsp usage_revert();
5736 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
5737 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
5739 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
5740 a129376b 2019-03-28 stsp if (cwd == NULL) {
5741 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5742 a129376b 2019-03-28 stsp goto done;
5744 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
5745 2ec1f75b 2019-03-26 stsp if (error)
5746 2ec1f75b 2019-03-26 stsp goto done;
5748 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5750 a129376b 2019-03-28 stsp if (error != NULL)
5751 a129376b 2019-03-28 stsp goto done;
5753 33aa809d 2019-08-08 stsp if (patch_script_path) {
5754 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
5755 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
5756 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
5757 33aa809d 2019-08-08 stsp patch_script_path);
5758 33aa809d 2019-08-08 stsp goto done;
5761 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5762 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5763 a129376b 2019-03-28 stsp if (error)
5764 a129376b 2019-03-28 stsp goto done;
5766 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5767 6d022e97 2019-08-04 stsp if (error)
5768 6d022e97 2019-08-04 stsp goto done;
5770 0f6d7415 2019-08-08 stsp if (!can_recurse) {
5771 0f6d7415 2019-08-08 stsp char *ondisk_path;
5772 0f6d7415 2019-08-08 stsp struct stat sb;
5773 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
5774 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
5775 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
5776 0f6d7415 2019-08-08 stsp pe->path) == -1) {
5777 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
5778 0f6d7415 2019-08-08 stsp goto done;
5780 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
5781 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
5782 0f6d7415 2019-08-08 stsp free(ondisk_path);
5785 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
5786 0f6d7415 2019-08-08 stsp ondisk_path);
5787 0f6d7415 2019-08-08 stsp free(ondisk_path);
5788 0f6d7415 2019-08-08 stsp goto done;
5790 0f6d7415 2019-08-08 stsp free(ondisk_path);
5791 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
5792 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5793 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
5794 0f6d7415 2019-08-08 stsp goto done;
5799 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5800 33aa809d 2019-08-08 stsp cpa.action = "revert";
5801 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
5802 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
5804 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5805 33aa809d 2019-08-08 stsp error == NULL)
5806 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5808 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
5809 2ec1f75b 2019-03-26 stsp if (worktree)
5810 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
5811 2ec1f75b 2019-03-26 stsp free(path);
5812 d00136be 2019-03-26 stsp free(cwd);
5813 6bad629b 2019-02-04 stsp return error;
5816 c4296144 2019-05-09 stsp __dead static void
5817 c4296144 2019-05-09 stsp usage_commit(void)
5819 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
5820 5c1e53bc 2019-07-28 stsp getprogname());
5824 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
5825 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
5826 e2ba3d07 2019-05-13 stsp const char *editor;
5827 e0870e44 2019-05-13 stsp const char *worktree_path;
5828 76d98825 2019-06-03 stsp const char *branch_name;
5829 314a6357 2019-05-13 stsp const char *repo_path;
5830 e0870e44 2019-05-13 stsp char *logmsg_path;
5834 33ad4cbe 2019-05-12 jcs static const struct got_error *
5835 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
5838 76d98825 2019-06-03 stsp char *initial_content = NULL;
5839 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
5840 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
5841 e0870e44 2019-05-13 stsp char *template = NULL;
5842 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
5844 33ad4cbe 2019-05-12 jcs size_t len;
5846 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
5847 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
5848 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
5849 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
5850 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
5851 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
5852 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
5853 33ad4cbe 2019-05-12 jcs return NULL;
5856 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
5857 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
5859 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
5860 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
5861 76d98825 2019-06-03 stsp a->branch_name) == -1)
5862 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5864 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
5866 e0870e44 2019-05-13 stsp goto done;
5868 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
5870 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
5871 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5872 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
5873 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
5874 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
5878 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
5880 76d98825 2019-06-03 stsp free(initial_content);
5881 e0870e44 2019-05-13 stsp free(template);
5883 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
5884 3ce1b845 2019-07-15 stsp if (err == NULL) {
5885 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
5886 3ce1b845 2019-07-15 stsp if (err) {
5887 3ce1b845 2019-07-15 stsp free(*logmsg);
5888 3ce1b845 2019-07-15 stsp *logmsg = NULL;
5891 33ad4cbe 2019-05-12 jcs return err;
5894 c4296144 2019-05-09 stsp static const struct got_error *
5895 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
5897 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
5898 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
5899 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
5900 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
5901 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
5902 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
5903 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
5904 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
5905 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
5906 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
5908 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
5909 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
5911 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
5912 c4296144 2019-05-09 stsp switch (ch) {
5914 c4296144 2019-05-09 stsp logmsg = optarg;
5917 c4296144 2019-05-09 stsp usage_commit();
5918 c4296144 2019-05-09 stsp /* NOTREACHED */
5922 c4296144 2019-05-09 stsp argc -= optind;
5923 c4296144 2019-05-09 stsp argv += optind;
5925 43012d58 2019-07-14 stsp #ifndef PROFILE
5926 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5927 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5928 43012d58 2019-07-14 stsp err(1, "pledge");
5930 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
5931 c4296144 2019-05-09 stsp if (cwd == NULL) {
5932 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5933 c4296144 2019-05-09 stsp goto done;
5935 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
5936 7d5807f4 2019-07-11 stsp if (error)
5937 7d5807f4 2019-07-11 stsp goto done;
5939 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5940 c4296144 2019-05-09 stsp if (error)
5941 a698f62e 2019-07-25 stsp goto done;
5942 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
5943 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
5944 c4296144 2019-05-09 stsp goto done;
5947 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5948 916f288c 2019-07-30 stsp worktree);
5949 5c1e53bc 2019-07-28 stsp if (error)
5950 5c1e53bc 2019-07-28 stsp goto done;
5952 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5953 c9956ddf 2019-09-08 stsp if (error)
5954 c9956ddf 2019-09-08 stsp goto done;
5955 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5956 c9956ddf 2019-09-08 stsp gitconfig_path);
5957 c4296144 2019-05-09 stsp if (error != NULL)
5958 c4296144 2019-05-09 stsp goto done;
5960 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
5961 aba9c984 2019-09-08 stsp if (error)
5962 aba9c984 2019-09-08 stsp return error;
5965 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
5966 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
5968 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
5969 314a6357 2019-05-13 stsp error = get_editor(&editor);
5971 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5972 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5973 c4296144 2019-05-09 stsp if (error)
5974 c4296144 2019-05-09 stsp goto done;
5976 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5977 087fb88c 2019-08-04 stsp if (error)
5978 087fb88c 2019-08-04 stsp goto done;
5980 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
5981 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
5982 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
5983 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
5984 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
5985 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
5986 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
5987 916f288c 2019-07-30 stsp goto done;
5989 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
5991 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
5992 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
5993 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
5994 e0870e44 2019-05-13 stsp if (error) {
5995 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5996 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
5997 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
5998 c4296144 2019-05-09 stsp goto done;
6001 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6002 c4296144 2019-05-09 stsp if (error)
6003 c4296144 2019-05-09 stsp goto done;
6004 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6006 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6007 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6008 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6009 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6010 7266f21f 2019-10-21 stsp error == NULL)
6011 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6012 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6014 c4296144 2019-05-09 stsp got_repo_close(repo);
6015 c4296144 2019-05-09 stsp if (worktree)
6016 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6017 c4296144 2019-05-09 stsp free(cwd);
6018 c4296144 2019-05-09 stsp free(id_str);
6019 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6020 e2ba3d07 2019-05-13 stsp free(editor);
6021 aba9c984 2019-09-08 stsp free(author);
6022 234035bc 2019-06-01 stsp return error;
6025 234035bc 2019-06-01 stsp __dead static void
6026 234035bc 2019-06-01 stsp usage_cherrypick(void)
6028 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6032 234035bc 2019-06-01 stsp static const struct got_error *
6033 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6035 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6036 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6037 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6038 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6039 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6040 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6041 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6042 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6043 234035bc 2019-06-01 stsp int ch, did_something = 0;
6045 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6046 234035bc 2019-06-01 stsp switch (ch) {
6048 234035bc 2019-06-01 stsp usage_cherrypick();
6049 234035bc 2019-06-01 stsp /* NOTREACHED */
6053 234035bc 2019-06-01 stsp argc -= optind;
6054 234035bc 2019-06-01 stsp argv += optind;
6056 43012d58 2019-07-14 stsp #ifndef PROFILE
6057 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6058 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6059 43012d58 2019-07-14 stsp err(1, "pledge");
6061 234035bc 2019-06-01 stsp if (argc != 1)
6062 234035bc 2019-06-01 stsp usage_cherrypick();
6064 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6065 234035bc 2019-06-01 stsp if (cwd == NULL) {
6066 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6067 234035bc 2019-06-01 stsp goto done;
6069 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6070 234035bc 2019-06-01 stsp if (error)
6071 234035bc 2019-06-01 stsp goto done;
6073 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6075 234035bc 2019-06-01 stsp if (error != NULL)
6076 234035bc 2019-06-01 stsp goto done;
6078 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6079 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6080 234035bc 2019-06-01 stsp if (error)
6081 234035bc 2019-06-01 stsp goto done;
6083 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6084 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6085 234035bc 2019-06-01 stsp if (error != NULL) {
6086 234035bc 2019-06-01 stsp struct got_reference *ref;
6087 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6088 234035bc 2019-06-01 stsp goto done;
6089 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6090 234035bc 2019-06-01 stsp if (error != NULL)
6091 234035bc 2019-06-01 stsp goto done;
6092 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
6093 234035bc 2019-06-01 stsp got_ref_close(ref);
6094 234035bc 2019-06-01 stsp if (error != NULL)
6095 234035bc 2019-06-01 stsp goto done;
6097 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
6098 234035bc 2019-06-01 stsp if (error)
6099 234035bc 2019-06-01 stsp goto done;
6101 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
6102 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
6103 234035bc 2019-06-01 stsp if (error != NULL)
6104 234035bc 2019-06-01 stsp goto done;
6106 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6107 234035bc 2019-06-01 stsp if (error) {
6108 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
6109 234035bc 2019-06-01 stsp goto done;
6110 234035bc 2019-06-01 stsp error = NULL;
6112 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
6113 234035bc 2019-06-01 stsp goto done;
6116 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6117 234035bc 2019-06-01 stsp if (error)
6118 234035bc 2019-06-01 stsp goto done;
6119 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6120 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6121 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
6123 234035bc 2019-06-01 stsp if (error != NULL)
6124 234035bc 2019-06-01 stsp goto done;
6126 234035bc 2019-06-01 stsp if (did_something)
6127 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
6129 234035bc 2019-06-01 stsp if (commit)
6130 234035bc 2019-06-01 stsp got_object_commit_close(commit);
6131 234035bc 2019-06-01 stsp free(commit_id_str);
6132 234035bc 2019-06-01 stsp if (head_ref)
6133 234035bc 2019-06-01 stsp got_ref_close(head_ref);
6134 234035bc 2019-06-01 stsp if (worktree)
6135 234035bc 2019-06-01 stsp got_worktree_close(worktree);
6137 234035bc 2019-06-01 stsp got_repo_close(repo);
6138 c4296144 2019-05-09 stsp return error;
6141 5ef14e63 2019-06-02 stsp __dead static void
6142 5ef14e63 2019-06-02 stsp usage_backout(void)
6144 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6148 5ef14e63 2019-06-02 stsp static const struct got_error *
6149 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
6151 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
6152 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
6153 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
6154 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
6155 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
6156 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
6157 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
6158 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
6159 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
6161 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6162 5ef14e63 2019-06-02 stsp switch (ch) {
6164 5ef14e63 2019-06-02 stsp usage_backout();
6165 5ef14e63 2019-06-02 stsp /* NOTREACHED */
6169 5ef14e63 2019-06-02 stsp argc -= optind;
6170 5ef14e63 2019-06-02 stsp argv += optind;
6172 43012d58 2019-07-14 stsp #ifndef PROFILE
6173 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6174 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6175 43012d58 2019-07-14 stsp err(1, "pledge");
6177 5ef14e63 2019-06-02 stsp if (argc != 1)
6178 5ef14e63 2019-06-02 stsp usage_backout();
6180 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
6181 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
6182 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
6183 5ef14e63 2019-06-02 stsp goto done;
6185 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
6186 5ef14e63 2019-06-02 stsp if (error)
6187 5ef14e63 2019-06-02 stsp goto done;
6189 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6191 5ef14e63 2019-06-02 stsp if (error != NULL)
6192 5ef14e63 2019-06-02 stsp goto done;
6194 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6195 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6196 5ef14e63 2019-06-02 stsp if (error)
6197 5ef14e63 2019-06-02 stsp goto done;
6199 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6200 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6201 5ef14e63 2019-06-02 stsp if (error != NULL) {
6202 5ef14e63 2019-06-02 stsp struct got_reference *ref;
6203 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6204 5ef14e63 2019-06-02 stsp goto done;
6205 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6206 5ef14e63 2019-06-02 stsp if (error != NULL)
6207 5ef14e63 2019-06-02 stsp goto done;
6208 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
6209 5ef14e63 2019-06-02 stsp got_ref_close(ref);
6210 5ef14e63 2019-06-02 stsp if (error != NULL)
6211 5ef14e63 2019-06-02 stsp goto done;
6213 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
6214 5ef14e63 2019-06-02 stsp if (error)
6215 5ef14e63 2019-06-02 stsp goto done;
6217 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
6218 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
6219 5ef14e63 2019-06-02 stsp if (error != NULL)
6220 5ef14e63 2019-06-02 stsp goto done;
6222 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6223 5ef14e63 2019-06-02 stsp if (error)
6224 5ef14e63 2019-06-02 stsp goto done;
6226 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6227 5ef14e63 2019-06-02 stsp if (error)
6228 5ef14e63 2019-06-02 stsp goto done;
6229 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6230 5ef14e63 2019-06-02 stsp if (pid == NULL) {
6231 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
6232 5ef14e63 2019-06-02 stsp goto done;
6235 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6236 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
6237 5ef14e63 2019-06-02 stsp if (error != NULL)
6238 5ef14e63 2019-06-02 stsp goto done;
6240 5ef14e63 2019-06-02 stsp if (did_something)
6241 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
6243 5ef14e63 2019-06-02 stsp if (commit)
6244 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
6245 5ef14e63 2019-06-02 stsp free(commit_id_str);
6246 5ef14e63 2019-06-02 stsp if (head_ref)
6247 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
6248 818c7501 2019-07-11 stsp if (worktree)
6249 818c7501 2019-07-11 stsp got_worktree_close(worktree);
6251 818c7501 2019-07-11 stsp got_repo_close(repo);
6252 818c7501 2019-07-11 stsp return error;
6255 818c7501 2019-07-11 stsp __dead static void
6256 818c7501 2019-07-11 stsp usage_rebase(void)
6258 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6259 af54c8f8 2019-07-11 stsp getprogname());
6264 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
6267 0ebf8283 2019-07-24 stsp size_t len;
6269 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
6270 0ebf8283 2019-07-24 stsp if (len > limit)
6271 0ebf8283 2019-07-24 stsp len = limit;
6272 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
6273 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
6275 0ebf8283 2019-07-24 stsp *nl = '\0';
6278 0ebf8283 2019-07-24 stsp static const struct got_error *
6279 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6281 5943eee2 2019-08-13 stsp const struct got_error *err;
6282 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
6283 5943eee2 2019-08-13 stsp const char *s;
6285 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
6287 5943eee2 2019-08-13 stsp return err;
6289 5943eee2 2019-08-13 stsp s = logmsg0;
6290 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
6293 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
6294 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
6295 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6296 5943eee2 2019-08-13 stsp goto done;
6299 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
6301 5943eee2 2019-08-13 stsp free(logmsg0);
6302 a0ea4fc0 2020-02-28 stsp return err;
6305 a0ea4fc0 2020-02-28 stsp static const struct got_error *
6306 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6308 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
6309 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
6310 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
6312 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
6314 a0ea4fc0 2020-02-28 stsp return err;
6316 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
6318 a0ea4fc0 2020-02-28 stsp goto done;
6320 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
6322 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
6324 a0ea4fc0 2020-02-28 stsp goto done;
6326 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
6328 a0ea4fc0 2020-02-28 stsp free(id_str);
6329 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
6330 a0ea4fc0 2020-02-28 stsp free(logmsg);
6331 5943eee2 2019-08-13 stsp return err;
6334 818c7501 2019-07-11 stsp static const struct got_error *
6335 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
6336 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
6338 818c7501 2019-07-11 stsp const struct got_error *err;
6339 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6341 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
6343 818c7501 2019-07-11 stsp goto done;
6345 ff0d2220 2019-07-11 stsp if (new_id) {
6346 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
6348 ff0d2220 2019-07-11 stsp goto done;
6351 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
6352 ff0d2220 2019-07-11 stsp if (new_id_str)
6353 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
6355 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6357 0ebf8283 2019-07-24 stsp goto done;
6359 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
6360 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6362 818c7501 2019-07-11 stsp free(old_id_str);
6363 818c7501 2019-07-11 stsp free(new_id_str);
6364 272a1371 2020-02-28 stsp free(logmsg);
6365 818c7501 2019-07-11 stsp return err;
6368 1ee397ad 2019-07-12 stsp static const struct got_error *
6369 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
6371 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
6373 818c7501 2019-07-11 stsp while (path[0] == '/')
6375 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
6377 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
6378 1ee397ad 2019-07-12 stsp return NULL;
6379 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
6380 818c7501 2019-07-11 stsp *rebase_status = status;
6381 1ee397ad 2019-07-12 stsp return NULL;
6384 818c7501 2019-07-11 stsp static const struct got_error *
6385 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6386 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
6387 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
6389 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
6390 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
6391 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
6394 818c7501 2019-07-11 stsp static const struct got_error *
6395 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
6396 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6397 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
6398 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6400 ff0d2220 2019-07-11 stsp const struct got_error *error;
6401 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
6402 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
6404 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6405 ff0d2220 2019-07-11 stsp if (error)
6406 ff0d2220 2019-07-11 stsp return error;
6408 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6409 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
6410 ff0d2220 2019-07-11 stsp if (error) {
6411 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6412 ff0d2220 2019-07-11 stsp goto done;
6413 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
6415 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
6416 ff0d2220 2019-07-11 stsp free(new_commit_id);
6419 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
6420 ff0d2220 2019-07-11 stsp return error;
6423 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
6424 64c6d990 2019-07-11 stsp const char *path_prefix;
6425 64c6d990 2019-07-11 stsp size_t len;
6426 8ca9bd68 2019-07-25 stsp int errcode;
6429 64c6d990 2019-07-11 stsp static const struct got_error *
6430 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6431 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
6432 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
6433 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
6435 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
6437 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6438 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6439 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
6441 64c6d990 2019-07-11 stsp return NULL;
6444 64c6d990 2019-07-11 stsp static const struct got_error *
6445 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
6446 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
6447 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
6449 64c6d990 2019-07-11 stsp const struct got_error *err;
6450 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6451 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
6452 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
6454 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
6455 64c6d990 2019-07-11 stsp return NULL;
6457 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6459 64c6d990 2019-07-11 stsp goto done;
6461 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6463 64c6d990 2019-07-11 stsp goto done;
6465 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
6466 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
6468 64c6d990 2019-07-11 stsp goto done;
6470 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
6471 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
6473 64c6d990 2019-07-11 stsp goto done;
6475 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
6476 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
6477 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
6478 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
6479 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
6480 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
6481 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
6483 64c6d990 2019-07-11 stsp if (tree1)
6484 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
6485 64c6d990 2019-07-11 stsp if (tree2)
6486 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
6487 64c6d990 2019-07-11 stsp if (commit)
6488 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
6489 64c6d990 2019-07-11 stsp if (parent_commit)
6490 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
6491 64c6d990 2019-07-11 stsp return err;
6494 ff0d2220 2019-07-11 stsp static const struct got_error *
6495 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
6496 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
6497 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6498 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
6499 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
6501 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
6502 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
6503 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
6504 af61c510 2019-07-19 stsp struct got_object_qid *qid;
6505 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
6507 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
6509 af61c510 2019-07-19 stsp return err;
6511 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6512 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6514 af61c510 2019-07-19 stsp goto done;
6515 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6516 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
6517 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
6518 af61c510 2019-07-19 stsp if (err) {
6519 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
6520 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
6521 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
6522 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
6523 af61c510 2019-07-19 stsp "been reached?!?");
6525 ee780d5c 2020-01-04 stsp goto done;
6527 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
6528 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
6530 af61c510 2019-07-19 stsp goto done;
6532 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
6534 af61c510 2019-07-19 stsp goto done;
6535 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6536 af61c510 2019-07-19 stsp commit_id = parent_id;
6540 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
6541 af61c510 2019-07-19 stsp return err;
6544 af61c510 2019-07-19 stsp static const struct got_error *
6545 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
6547 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
6548 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
6549 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
6550 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6551 818c7501 2019-07-11 stsp char *cwd = NULL;
6552 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
6553 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
6554 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
6555 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
6556 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
6557 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
6558 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
6559 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
6560 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6561 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
6562 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
6563 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
6564 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
6566 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
6567 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
6569 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
6570 818c7501 2019-07-11 stsp switch (ch) {
6572 818c7501 2019-07-11 stsp abort_rebase = 1;
6575 818c7501 2019-07-11 stsp continue_rebase = 1;
6578 818c7501 2019-07-11 stsp usage_rebase();
6579 818c7501 2019-07-11 stsp /* NOTREACHED */
6583 818c7501 2019-07-11 stsp argc -= optind;
6584 818c7501 2019-07-11 stsp argv += optind;
6586 43012d58 2019-07-14 stsp #ifndef PROFILE
6587 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6588 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6589 43012d58 2019-07-14 stsp err(1, "pledge");
6591 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
6592 818c7501 2019-07-11 stsp usage_rebase();
6593 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
6594 818c7501 2019-07-11 stsp if (argc != 0)
6595 818c7501 2019-07-11 stsp usage_rebase();
6596 818c7501 2019-07-11 stsp } else if (argc != 1)
6597 818c7501 2019-07-11 stsp usage_rebase();
6599 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
6600 818c7501 2019-07-11 stsp if (cwd == NULL) {
6601 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
6602 818c7501 2019-07-11 stsp goto done;
6604 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
6605 818c7501 2019-07-11 stsp if (error)
6606 818c7501 2019-07-11 stsp goto done;
6608 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6610 818c7501 2019-07-11 stsp if (error != NULL)
6611 818c7501 2019-07-11 stsp goto done;
6613 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6614 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6615 7ef62c4e 2020-02-24 stsp if (error)
6616 7ef62c4e 2020-02-24 stsp goto done;
6618 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6619 7ef62c4e 2020-02-24 stsp worktree);
6620 818c7501 2019-07-11 stsp if (error)
6621 7ef62c4e 2020-02-24 stsp goto done;
6622 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
6623 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6624 818c7501 2019-07-11 stsp goto done;
6627 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6628 818c7501 2019-07-11 stsp if (error)
6629 818c7501 2019-07-11 stsp goto done;
6631 f6794adc 2019-07-23 stsp if (abort_rebase) {
6632 818c7501 2019-07-11 stsp int did_something;
6633 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
6634 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
6635 f6794adc 2019-07-23 stsp goto done;
6637 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
6638 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
6639 3e3a69f1 2019-07-25 stsp worktree, repo);
6640 818c7501 2019-07-11 stsp if (error)
6641 818c7501 2019-07-11 stsp goto done;
6642 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
6643 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
6644 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
6645 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
6646 818c7501 2019-07-11 stsp if (error)
6647 818c7501 2019-07-11 stsp goto done;
6648 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
6649 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
6652 818c7501 2019-07-11 stsp if (continue_rebase) {
6653 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
6654 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
6655 f6794adc 2019-07-23 stsp goto done;
6657 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
6658 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
6659 3e3a69f1 2019-07-25 stsp worktree, repo);
6660 818c7501 2019-07-11 stsp if (error)
6661 818c7501 2019-07-11 stsp goto done;
6663 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
6664 01757395 2019-07-12 stsp resume_commit_id, repo);
6665 818c7501 2019-07-11 stsp if (error)
6666 818c7501 2019-07-11 stsp goto done;
6668 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
6669 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
6670 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
6671 818c7501 2019-07-11 stsp goto done;
6674 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
6675 818c7501 2019-07-11 stsp if (error != NULL)
6676 818c7501 2019-07-11 stsp goto done;
6679 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
6680 ff0d2220 2019-07-11 stsp if (error)
6681 ff0d2220 2019-07-11 stsp goto done;
6683 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
6684 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
6686 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
6687 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
6688 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
6689 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6690 818c7501 2019-07-11 stsp if (error)
6691 818c7501 2019-07-11 stsp goto done;
6692 818c7501 2019-07-11 stsp if (yca_id == NULL) {
6693 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
6694 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
6695 818c7501 2019-07-11 stsp "with work tree's branch");
6696 818c7501 2019-07-11 stsp goto done;
6699 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
6700 a51a74b3 2019-07-27 stsp if (error) {
6701 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
6702 a51a74b3 2019-07-27 stsp goto done;
6703 a51a74b3 2019-07-27 stsp error = NULL;
6705 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6706 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
6707 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
6708 a51a74b3 2019-07-27 stsp goto done;
6710 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
6711 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
6712 818c7501 2019-07-11 stsp if (error)
6713 818c7501 2019-07-11 stsp goto done;
6716 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
6717 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6718 818c7501 2019-07-11 stsp if (error)
6719 818c7501 2019-07-11 stsp goto done;
6721 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6722 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
6723 fc66b545 2019-08-12 stsp if (pid == NULL) {
6724 fc66b545 2019-08-12 stsp if (!continue_rebase) {
6725 fc66b545 2019-08-12 stsp int did_something;
6726 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
6727 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
6728 fc66b545 2019-08-12 stsp &did_something);
6729 fc66b545 2019-08-12 stsp if (error)
6730 fc66b545 2019-08-12 stsp goto done;
6731 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
6732 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
6734 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
6735 fc66b545 2019-08-12 stsp goto done;
6737 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
6738 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
6739 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
6740 818c7501 2019-07-11 stsp got_object_commit_close(commit);
6741 818c7501 2019-07-11 stsp commit = NULL;
6742 818c7501 2019-07-11 stsp if (error)
6743 818c7501 2019-07-11 stsp goto done;
6745 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
6746 38b0338b 2019-11-29 stsp if (continue_rebase) {
6747 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
6748 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
6749 38b0338b 2019-11-29 stsp goto done;
6751 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
6752 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
6753 38b0338b 2019-11-29 stsp char *id_str;
6754 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
6755 38b0338b 2019-11-29 stsp new_base_branch);
6756 38b0338b 2019-11-29 stsp if (error)
6757 38b0338b 2019-11-29 stsp goto done;
6758 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
6759 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
6760 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
6761 38b0338b 2019-11-29 stsp free(id_str);
6762 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
6763 38b0338b 2019-11-29 stsp new_head_commit_id);
6764 38b0338b 2019-11-29 stsp if (error)
6765 38b0338b 2019-11-29 stsp goto done;
6769 818c7501 2019-07-11 stsp pid = NULL;
6770 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
6771 818c7501 2019-07-11 stsp commit_id = qid->id;
6772 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
6773 818c7501 2019-07-11 stsp pid = qid;
6775 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
6776 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
6777 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6778 818c7501 2019-07-11 stsp if (error)
6779 818c7501 2019-07-11 stsp goto done;
6781 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6782 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
6783 a0ea4fc0 2020-02-28 stsp if (error)
6784 a0ea4fc0 2020-02-28 stsp goto done;
6785 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6789 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
6790 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
6791 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6792 818c7501 2019-07-11 stsp if (error)
6793 818c7501 2019-07-11 stsp goto done;
6796 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6797 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
6798 818c7501 2019-07-11 stsp if (error)
6799 818c7501 2019-07-11 stsp goto done;
6800 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6801 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
6803 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
6804 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
6806 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
6807 818c7501 2019-07-11 stsp free(branch_head_commit_id);
6808 818c7501 2019-07-11 stsp free(resume_commit_id);
6809 818c7501 2019-07-11 stsp free(yca_id);
6810 818c7501 2019-07-11 stsp if (commit)
6811 818c7501 2019-07-11 stsp got_object_commit_close(commit);
6812 818c7501 2019-07-11 stsp if (branch)
6813 818c7501 2019-07-11 stsp got_ref_close(branch);
6814 818c7501 2019-07-11 stsp if (new_base_branch)
6815 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
6816 818c7501 2019-07-11 stsp if (tmp_branch)
6817 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
6818 5ef14e63 2019-06-02 stsp if (worktree)
6819 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
6821 5ef14e63 2019-06-02 stsp got_repo_close(repo);
6822 5ef14e63 2019-06-02 stsp return error;
6825 0ebf8283 2019-07-24 stsp __dead static void
6826 0ebf8283 2019-07-24 stsp usage_histedit(void)
6828 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
6829 0ebf8283 2019-07-24 stsp getprogname());
6833 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
6834 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
6835 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
6836 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
6837 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
6839 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
6840 0ebf8283 2019-07-24 stsp unsigned char code;
6841 0ebf8283 2019-07-24 stsp const char *name;
6842 0ebf8283 2019-07-24 stsp const char *desc;
6843 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
6844 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
6845 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
6846 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
6847 82997472 2020-01-29 stsp "be used" },
6848 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
6849 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
6850 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
6853 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
6854 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
6855 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
6856 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
6857 0ebf8283 2019-07-24 stsp char *logmsg;
6859 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
6861 0ebf8283 2019-07-24 stsp static const struct got_error *
6862 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
6863 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
6865 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6866 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
6867 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6870 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6872 0ebf8283 2019-07-24 stsp goto done;
6874 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
6876 0ebf8283 2019-07-24 stsp goto done;
6878 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
6880 0ebf8283 2019-07-24 stsp goto done;
6882 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
6883 0ebf8283 2019-07-24 stsp if (n < 0)
6884 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6886 0ebf8283 2019-07-24 stsp if (commit)
6887 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6888 0ebf8283 2019-07-24 stsp free(id_str);
6889 0ebf8283 2019-07-24 stsp free(logmsg);
6890 0ebf8283 2019-07-24 stsp return err;
6893 0ebf8283 2019-07-24 stsp static const struct got_error *
6894 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
6895 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
6897 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6898 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
6900 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
6901 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6903 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6904 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
6908 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
6909 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
6910 083957f4 2020-02-24 stsp if (n < 0) {
6911 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
6917 0ebf8283 2019-07-24 stsp return err;
6920 0ebf8283 2019-07-24 stsp static const struct got_error *
6921 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
6922 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
6924 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6926 514f2ffe 2020-01-29 stsp char *id_str;
6927 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
6929 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
6930 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
6932 514f2ffe 2020-01-29 stsp return err;
6934 514f2ffe 2020-01-29 stsp n = fprintf(f,
6935 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
6936 514f2ffe 2020-01-29 stsp "# commit %s\n"
6937 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
6938 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
6939 514f2ffe 2020-01-29 stsp if (n < 0) {
6940 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6941 514f2ffe 2020-01-29 stsp goto done;
6944 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
6945 514f2ffe 2020-01-29 stsp if (n < 0) {
6946 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6947 514f2ffe 2020-01-29 stsp goto done;
6950 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6951 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
6952 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
6953 0ebf8283 2019-07-24 stsp cmd->desc);
6954 0ebf8283 2019-07-24 stsp if (n < 0) {
6955 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6960 514f2ffe 2020-01-29 stsp free(id_str);
6961 0ebf8283 2019-07-24 stsp return err;
6964 0ebf8283 2019-07-24 stsp static const struct got_error *
6965 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
6967 0ebf8283 2019-07-24 stsp static char msg[42];
6970 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
6972 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
6973 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
6975 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
6978 0ebf8283 2019-07-24 stsp static const struct got_error *
6979 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
6980 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
6982 0ebf8283 2019-07-24 stsp const struct got_error *err;
6983 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
6984 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
6986 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6988 0ebf8283 2019-07-24 stsp return err;
6990 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
6992 0ebf8283 2019-07-24 stsp goto done;
6994 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
6996 5943eee2 2019-08-13 stsp goto done;
6997 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
6998 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
6999 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7000 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7003 0ebf8283 2019-07-24 stsp if (folded_commit)
7004 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7005 0ebf8283 2019-07-24 stsp free(id_str);
7006 5943eee2 2019-08-13 stsp free(folded_logmsg);
7007 0ebf8283 2019-07-24 stsp return err;
7010 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7011 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7013 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7015 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7016 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7017 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7018 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7019 3f9de99f 2019-07-24 stsp folded = prev;
7020 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7023 0ebf8283 2019-07-24 stsp return folded;
7026 0ebf8283 2019-07-24 stsp static const struct got_error *
7027 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7028 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7030 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7031 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7032 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7033 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7035 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7037 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7039 0ebf8283 2019-07-24 stsp return err;
7041 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7042 0ebf8283 2019-07-24 stsp if (folded) {
7043 0ebf8283 2019-07-24 stsp while (folded != hle) {
7044 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7045 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7048 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7049 0ebf8283 2019-07-24 stsp logmsg, repo);
7051 0ebf8283 2019-07-24 stsp goto done;
7052 0ebf8283 2019-07-24 stsp free(logmsg);
7053 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7054 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7058 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7060 0ebf8283 2019-07-24 stsp goto done;
7061 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7063 5943eee2 2019-08-13 stsp goto done;
7064 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
7065 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7066 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7067 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7068 0ebf8283 2019-07-24 stsp goto done;
7070 0ebf8283 2019-07-24 stsp free(logmsg);
7071 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7073 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7075 0ebf8283 2019-07-24 stsp goto done;
7077 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
7078 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
7080 0ebf8283 2019-07-24 stsp goto done;
7082 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
7083 0ebf8283 2019-07-24 stsp close(fd);
7085 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7087 0ebf8283 2019-07-24 stsp goto done;
7089 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7090 0ebf8283 2019-07-24 stsp if (err) {
7091 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7092 0ebf8283 2019-07-24 stsp goto done;
7093 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7096 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7097 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
7098 0ebf8283 2019-07-24 stsp free(logmsg_path);
7099 0ebf8283 2019-07-24 stsp free(logmsg);
7100 5943eee2 2019-08-13 stsp free(orig_logmsg);
7101 0ebf8283 2019-07-24 stsp free(editor);
7102 0ebf8283 2019-07-24 stsp if (commit)
7103 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7104 0ebf8283 2019-07-24 stsp return err;
7107 0ebf8283 2019-07-24 stsp static const struct got_error *
7108 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
7109 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7111 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7112 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
7113 0ebf8283 2019-07-24 stsp size_t size;
7114 0ebf8283 2019-07-24 stsp ssize_t len;
7115 0ebf8283 2019-07-24 stsp int lineno = 0, i;
7116 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7117 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
7118 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
7120 0ebf8283 2019-07-24 stsp for (;;) {
7121 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
7122 0ebf8283 2019-07-24 stsp if (len == -1) {
7123 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
7124 0ebf8283 2019-07-24 stsp if (feof(f))
7126 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
7127 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
7132 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7134 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
7135 0ebf8283 2019-07-24 stsp free(line);
7136 0ebf8283 2019-07-24 stsp line = NULL;
7139 0ebf8283 2019-07-24 stsp cmd = NULL;
7140 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7141 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
7142 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7143 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
7144 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
7147 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7152 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
7153 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7156 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7158 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
7159 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
7160 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
7163 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
7164 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7168 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
7169 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
7170 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7174 0ebf8283 2019-07-24 stsp free(line);
7175 0ebf8283 2019-07-24 stsp line = NULL;
7179 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
7181 0ebf8283 2019-07-24 stsp *end = '\0';
7183 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
7184 0ebf8283 2019-07-24 stsp if (err) {
7185 0ebf8283 2019-07-24 stsp /* override error code */
7186 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7190 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
7191 0ebf8283 2019-07-24 stsp if (hle == NULL) {
7192 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
7195 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
7196 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
7197 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
7198 0ebf8283 2019-07-24 stsp commit_id = NULL;
7199 0ebf8283 2019-07-24 stsp free(line);
7200 0ebf8283 2019-07-24 stsp line = NULL;
7201 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7204 0ebf8283 2019-07-24 stsp free(line);
7205 0ebf8283 2019-07-24 stsp free(commit_id);
7206 0ebf8283 2019-07-24 stsp return err;
7209 0ebf8283 2019-07-24 stsp static const struct got_error *
7210 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
7211 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
7213 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
7214 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
7215 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7216 5b87815e 2020-03-05 stsp static char msg[92];
7217 bfce7f83 2019-07-27 stsp char *id_str;
7219 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
7220 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7221 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
7222 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
7223 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7225 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7226 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
7227 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7228 5b87815e 2020-03-05 stsp if (hle == hle2)
7230 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
7231 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
7233 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
7235 5b87815e 2020-03-05 stsp return err;
7236 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
7237 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
7238 5b87815e 2020-03-05 stsp free(id_str);
7239 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7243 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7244 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7245 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7248 bfce7f83 2019-07-27 stsp if (hle == NULL) {
7249 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
7251 bfce7f83 2019-07-27 stsp return err;
7252 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
7253 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
7254 bfce7f83 2019-07-27 stsp free(id_str);
7255 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7259 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7260 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7261 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7262 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
7264 bfce7f83 2019-07-27 stsp return NULL;
7267 bfce7f83 2019-07-27 stsp static const struct got_error *
7268 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
7269 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
7270 bfce7f83 2019-07-27 stsp struct got_repository *repo)
7272 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7273 0ebf8283 2019-07-24 stsp char *editor;
7274 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7276 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7278 0ebf8283 2019-07-24 stsp return err;
7280 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
7281 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
7282 0ebf8283 2019-07-24 stsp goto done;
7285 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7286 0ebf8283 2019-07-24 stsp if (f == NULL) {
7287 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
7288 0ebf8283 2019-07-24 stsp goto done;
7290 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7292 bfce7f83 2019-07-27 stsp goto done;
7294 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
7296 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7297 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7298 0ebf8283 2019-07-24 stsp free(editor);
7299 0ebf8283 2019-07-24 stsp return err;
7302 0ebf8283 2019-07-24 stsp static const struct got_error *
7303 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7304 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
7305 514f2ffe 2020-01-29 stsp struct got_repository *);
7307 0ebf8283 2019-07-24 stsp static const struct got_error *
7308 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
7309 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
7310 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
7312 0ebf8283 2019-07-24 stsp const struct got_error *err;
7313 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7314 0ebf8283 2019-07-24 stsp char *path = NULL;
7316 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
7318 0ebf8283 2019-07-24 stsp return err;
7320 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
7322 0ebf8283 2019-07-24 stsp goto done;
7324 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7326 0ebf8283 2019-07-24 stsp goto done;
7328 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7329 083957f4 2020-02-24 stsp rewind(f);
7330 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7332 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
7333 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
7334 0ebf8283 2019-07-24 stsp goto done;
7337 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
7338 083957f4 2020-02-24 stsp if (err) {
7339 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7340 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7341 083957f4 2020-02-24 stsp goto done;
7342 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
7343 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
7347 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7348 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7349 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
7350 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
7351 0ebf8283 2019-07-24 stsp free(path);
7352 0ebf8283 2019-07-24 stsp return err;
7355 0ebf8283 2019-07-24 stsp static const struct got_error *
7356 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
7357 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7359 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7360 0ebf8283 2019-07-24 stsp char *path = NULL;
7361 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7362 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7363 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7365 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
7367 0ebf8283 2019-07-24 stsp return err;
7369 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
7370 0ebf8283 2019-07-24 stsp if (f == NULL) {
7371 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7372 0ebf8283 2019-07-24 stsp goto done;
7374 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7375 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7380 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7381 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
7382 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
7383 0ebf8283 2019-07-24 stsp if (n < 0) {
7384 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7390 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7391 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7392 0ebf8283 2019-07-24 stsp free(path);
7393 0ebf8283 2019-07-24 stsp if (commit)
7394 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7395 0ebf8283 2019-07-24 stsp return err;
7399 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
7401 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7403 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
7404 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
7405 bfce7f83 2019-07-27 stsp free(hle);
7409 0ebf8283 2019-07-24 stsp static const struct got_error *
7410 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
7411 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
7413 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7414 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7416 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7417 0ebf8283 2019-07-24 stsp if (f == NULL) {
7418 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7419 0ebf8283 2019-07-24 stsp goto done;
7422 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7424 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7425 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7426 0ebf8283 2019-07-24 stsp return err;
7429 0ebf8283 2019-07-24 stsp static const struct got_error *
7430 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7431 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
7432 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
7434 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
7435 0ebf8283 2019-07-24 stsp int resp = ' ';
7437 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
7438 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7439 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
7440 0ebf8283 2019-07-24 stsp resp = getchar();
7441 a61a4414 2019-08-07 stsp if (resp == '\n')
7442 a61a4414 2019-08-07 stsp resp = getchar();
7443 426ebf2e 2019-07-25 stsp if (resp == 'c') {
7444 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7445 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
7447 426ebf2e 2019-07-25 stsp if (err) {
7448 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7449 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7451 bfce7f83 2019-07-27 stsp prev_err = err;
7452 426ebf2e 2019-07-25 stsp resp = ' ';
7456 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
7457 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7458 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
7459 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
7460 426ebf2e 2019-07-25 stsp if (err) {
7461 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7462 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7464 bfce7f83 2019-07-27 stsp prev_err = err;
7465 426ebf2e 2019-07-25 stsp resp = ' ';
7469 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
7470 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7473 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
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_complete(struct got_worktree *worktree,
7481 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7482 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
7484 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7485 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7486 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7487 3e3a69f1 2019-07-25 stsp branch, repo);
7490 0ebf8283 2019-07-24 stsp static const struct got_error *
7491 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
7492 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7494 0ebf8283 2019-07-24 stsp const struct got_error *err;
7495 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7497 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
7499 0ebf8283 2019-07-24 stsp goto done;
7501 0ebf8283 2019-07-24 stsp if (new_id) {
7502 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
7504 0ebf8283 2019-07-24 stsp goto done;
7507 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
7508 0ebf8283 2019-07-24 stsp if (new_id_str)
7509 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
7511 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7512 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
7513 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
7514 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7515 0ebf8283 2019-07-24 stsp goto done;
7517 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
7519 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7521 0ebf8283 2019-07-24 stsp goto done;
7524 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
7525 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
7526 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
7527 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
7528 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7530 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
7531 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
7532 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
7539 0ebf8283 2019-07-24 stsp free(old_id_str);
7540 0ebf8283 2019-07-24 stsp free(new_id_str);
7541 0ebf8283 2019-07-24 stsp return err;
7544 0ebf8283 2019-07-24 stsp static const struct got_error *
7545 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
7546 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7547 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
7548 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7550 0ebf8283 2019-07-24 stsp const struct got_error *err;
7551 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7552 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
7554 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
7555 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
7556 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7558 0ebf8283 2019-07-24 stsp return err;
7561 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7563 0ebf8283 2019-07-24 stsp return err;
7565 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
7566 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
7567 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
7568 0ebf8283 2019-07-24 stsp if (err) {
7569 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
7570 0ebf8283 2019-07-24 stsp goto done;
7571 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
7573 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
7574 0ebf8283 2019-07-24 stsp free(new_commit_id);
7577 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7578 0ebf8283 2019-07-24 stsp return err;
7581 0ebf8283 2019-07-24 stsp static const struct got_error *
7582 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
7583 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7585 0ebf8283 2019-07-24 stsp const struct got_error *error;
7586 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7588 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
7590 0ebf8283 2019-07-24 stsp if (error)
7591 0ebf8283 2019-07-24 stsp return error;
7593 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
7594 0ebf8283 2019-07-24 stsp if (error)
7595 0ebf8283 2019-07-24 stsp return error;
7597 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
7598 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7599 0ebf8283 2019-07-24 stsp return error;
7602 ab20a43a 2020-01-29 stsp static const struct got_error *
7603 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
7604 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
7605 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7606 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7608 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
7610 ab20a43a 2020-01-29 stsp switch (status) {
7611 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7612 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7613 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7614 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
7615 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7616 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
7621 ab20a43a 2020-01-29 stsp switch (staged_status) {
7622 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7623 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7624 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7625 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7626 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
7631 ab20a43a 2020-01-29 stsp return NULL;
7634 0ebf8283 2019-07-24 stsp static const struct got_error *
7635 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
7637 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
7638 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
7639 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
7640 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
7641 0ebf8283 2019-07-24 stsp char *cwd = NULL;
7642 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
7643 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
7644 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
7645 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
7646 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
7647 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7648 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
7649 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
7650 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
7651 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
7652 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7653 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
7654 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
7655 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
7656 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
7657 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
7658 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7660 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
7661 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
7662 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
7664 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
7665 0ebf8283 2019-07-24 stsp switch (ch) {
7667 0ebf8283 2019-07-24 stsp abort_edit = 1;
7670 0ebf8283 2019-07-24 stsp continue_edit = 1;
7673 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
7676 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
7679 0ebf8283 2019-07-24 stsp usage_histedit();
7680 0ebf8283 2019-07-24 stsp /* NOTREACHED */
7684 0ebf8283 2019-07-24 stsp argc -= optind;
7685 0ebf8283 2019-07-24 stsp argv += optind;
7687 0ebf8283 2019-07-24 stsp #ifndef PROFILE
7688 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7689 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
7690 0ebf8283 2019-07-24 stsp err(1, "pledge");
7692 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
7693 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
7694 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
7695 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
7696 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
7697 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
7698 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
7699 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
7700 0ebf8283 2019-07-24 stsp if (argc != 0)
7701 0ebf8283 2019-07-24 stsp usage_histedit();
7704 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
7705 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
7706 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
7707 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
7708 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
7709 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
7712 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
7713 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
7714 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
7715 0ebf8283 2019-07-24 stsp goto done;
7717 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
7718 0ebf8283 2019-07-24 stsp if (error)
7719 0ebf8283 2019-07-24 stsp goto done;
7721 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7723 0ebf8283 2019-07-24 stsp if (error != NULL)
7724 0ebf8283 2019-07-24 stsp goto done;
7726 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7727 0ebf8283 2019-07-24 stsp if (error)
7728 0ebf8283 2019-07-24 stsp goto done;
7729 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
7730 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
7731 0ebf8283 2019-07-24 stsp goto done;
7734 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
7735 0ebf8283 2019-07-24 stsp if (error)
7736 0ebf8283 2019-07-24 stsp goto done;
7738 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
7739 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
7740 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
7741 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
7742 083957f4 2020-02-24 stsp "before the -m option can be used");
7743 083957f4 2020-02-24 stsp goto done;
7746 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
7747 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
7748 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
7749 3e3a69f1 2019-07-25 stsp worktree, repo);
7750 0ebf8283 2019-07-24 stsp if (error)
7751 0ebf8283 2019-07-24 stsp goto done;
7752 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7753 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7754 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
7755 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
7756 0ebf8283 2019-07-24 stsp if (error)
7757 0ebf8283 2019-07-24 stsp goto done;
7758 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
7759 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7760 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
7761 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
7762 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
7763 0ebf8283 2019-07-24 stsp goto done;
7766 0ebf8283 2019-07-24 stsp if (continue_edit) {
7767 0ebf8283 2019-07-24 stsp char *path;
7769 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
7770 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
7771 0ebf8283 2019-07-24 stsp goto done;
7774 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
7775 0ebf8283 2019-07-24 stsp if (error)
7776 0ebf8283 2019-07-24 stsp goto done;
7778 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
7779 0ebf8283 2019-07-24 stsp free(path);
7780 0ebf8283 2019-07-24 stsp if (error)
7781 0ebf8283 2019-07-24 stsp goto done;
7783 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
7784 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
7785 3e3a69f1 2019-07-25 stsp worktree, repo);
7786 0ebf8283 2019-07-24 stsp if (error)
7787 0ebf8283 2019-07-24 stsp goto done;
7789 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
7790 0ebf8283 2019-07-24 stsp if (error)
7791 0ebf8283 2019-07-24 stsp goto done;
7793 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
7794 0ebf8283 2019-07-24 stsp head_commit_id);
7795 0ebf8283 2019-07-24 stsp if (error)
7796 0ebf8283 2019-07-24 stsp goto done;
7797 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7798 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
7799 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
7800 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
7801 3aac7cf7 2019-07-25 stsp goto done;
7803 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
7804 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
7805 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
7806 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7807 0ebf8283 2019-07-24 stsp commit = NULL;
7808 0ebf8283 2019-07-24 stsp if (error)
7809 0ebf8283 2019-07-24 stsp goto done;
7811 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
7812 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
7813 0ebf8283 2019-07-24 stsp goto done;
7816 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
7817 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
7818 0ebf8283 2019-07-24 stsp if (error != NULL)
7819 0ebf8283 2019-07-24 stsp goto done;
7821 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
7822 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
7823 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
7824 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
7825 c7d20a3f 2019-07-30 stsp goto done;
7828 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
7829 bfce7f83 2019-07-27 stsp got_ref_close(branch);
7830 bfce7f83 2019-07-27 stsp branch = NULL;
7831 0ebf8283 2019-07-24 stsp if (error)
7832 0ebf8283 2019-07-24 stsp goto done;
7834 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
7835 0ebf8283 2019-07-24 stsp head_commit_id);
7836 0ebf8283 2019-07-24 stsp if (error)
7837 0ebf8283 2019-07-24 stsp goto done;
7838 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7839 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
7840 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
7841 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
7842 3aac7cf7 2019-07-25 stsp goto done;
7844 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
7845 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
7846 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
7847 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
7848 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7849 0ebf8283 2019-07-24 stsp commit = NULL;
7850 0ebf8283 2019-07-24 stsp if (error)
7851 0ebf8283 2019-07-24 stsp goto done;
7853 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
7854 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
7855 c5996fff 2020-01-29 stsp goto done;
7858 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
7859 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
7860 bfce7f83 2019-07-27 stsp if (error)
7861 bfce7f83 2019-07-27 stsp goto done;
7863 0ebf8283 2019-07-24 stsp if (edit_script_path) {
7864 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
7865 0ebf8283 2019-07-24 stsp edit_script_path, repo);
7866 6ba2bea2 2019-07-27 stsp if (error) {
7867 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
7868 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
7869 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
7870 0ebf8283 2019-07-24 stsp goto done;
7873 514f2ffe 2020-01-29 stsp const char *branch_name;
7874 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
7875 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
7876 514f2ffe 2020-01-29 stsp branch_name += 11;
7877 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
7878 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
7879 6ba2bea2 2019-07-27 stsp if (error) {
7880 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
7881 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
7882 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
7883 0ebf8283 2019-07-24 stsp goto done;
7888 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
7890 6ba2bea2 2019-07-27 stsp if (error) {
7891 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
7892 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
7893 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
7894 0ebf8283 2019-07-24 stsp goto done;
7899 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
7900 4ec14e60 2019-08-28 hiltjo if (error)
7901 0ebf8283 2019-07-24 stsp goto done;
7903 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
7904 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
7905 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
7906 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
7909 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
7910 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
7911 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
7912 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
7914 ab20a43a 2020-01-29 stsp if (error)
7915 ab20a43a 2020-01-29 stsp goto done;
7917 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
7918 ab20a43a 2020-01-29 stsp int have_changes = 0;
7920 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
7921 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
7922 ab20a43a 2020-01-29 stsp if (error)
7923 ab20a43a 2020-01-29 stsp goto done;
7924 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
7925 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
7926 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
7927 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
7928 ab20a43a 2020-01-29 stsp if (error) {
7929 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
7930 ab20a43a 2020-01-29 stsp goto done;
7931 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
7932 ab20a43a 2020-01-29 stsp goto done;
7934 ab20a43a 2020-01-29 stsp if (have_changes) {
7935 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
7936 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
7937 ab20a43a 2020-01-29 stsp if (error)
7938 ab20a43a 2020-01-29 stsp goto done;
7940 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
7941 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
7942 ab20a43a 2020-01-29 stsp if (error)
7943 ab20a43a 2020-01-29 stsp goto done;
7944 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
7945 ab20a43a 2020-01-29 stsp hle, NULL);
7946 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
7947 ab20a43a 2020-01-29 stsp commit = NULL;
7948 ab20a43a 2020-01-29 stsp if (error)
7949 ab20a43a 2020-01-29 stsp goto done;
7955 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
7956 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7957 0ebf8283 2019-07-24 stsp if (error)
7958 0ebf8283 2019-07-24 stsp goto done;
7962 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
7963 0ebf8283 2019-07-24 stsp hle->commit_id);
7964 0ebf8283 2019-07-24 stsp if (error)
7965 0ebf8283 2019-07-24 stsp goto done;
7966 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7967 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
7969 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
7970 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
7971 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
7972 0ebf8283 2019-07-24 stsp if (error)
7973 0ebf8283 2019-07-24 stsp goto done;
7974 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7975 0ebf8283 2019-07-24 stsp commit = NULL;
7977 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7978 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
7980 a0ea4fc0 2020-02-28 stsp if (error)
7981 a0ea4fc0 2020-02-28 stsp goto done;
7982 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7986 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
7987 0ebf8283 2019-07-24 stsp char *id_str;
7988 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
7989 0ebf8283 2019-07-24 stsp if (error)
7990 0ebf8283 2019-07-24 stsp goto done;
7991 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
7993 0ebf8283 2019-07-24 stsp free(id_str);
7994 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7995 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
7996 3e3a69f1 2019-07-25 stsp fileindex);
7997 0ebf8283 2019-07-24 stsp goto done;
8000 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8001 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8002 0ebf8283 2019-07-24 stsp if (error)
8003 0ebf8283 2019-07-24 stsp goto done;
8007 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8008 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8009 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8010 0ebf8283 2019-07-24 stsp if (error)
8011 0ebf8283 2019-07-24 stsp goto done;
8014 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8015 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8016 0ebf8283 2019-07-24 stsp if (error)
8017 0ebf8283 2019-07-24 stsp goto done;
8018 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8019 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8021 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8022 3e3a69f1 2019-07-25 stsp branch, repo);
8024 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8025 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8026 0ebf8283 2019-07-24 stsp free(head_commit_id);
8027 0ebf8283 2019-07-24 stsp free(base_commit_id);
8028 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8029 0ebf8283 2019-07-24 stsp if (commit)
8030 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8031 0ebf8283 2019-07-24 stsp if (branch)
8032 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8033 0ebf8283 2019-07-24 stsp if (tmp_branch)
8034 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8035 0ebf8283 2019-07-24 stsp if (worktree)
8036 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8038 2822a352 2019-10-15 stsp got_repo_close(repo);
8039 2822a352 2019-10-15 stsp return error;
8042 2822a352 2019-10-15 stsp __dead static void
8043 2822a352 2019-10-15 stsp usage_integrate(void)
8045 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8049 2822a352 2019-10-15 stsp static const struct got_error *
8050 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8052 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8053 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8054 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8055 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8056 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8057 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8058 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8059 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8060 2822a352 2019-10-15 stsp int ch, did_something = 0;
8062 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8063 2822a352 2019-10-15 stsp switch (ch) {
8065 2822a352 2019-10-15 stsp usage_integrate();
8066 2822a352 2019-10-15 stsp /* NOTREACHED */
8070 2822a352 2019-10-15 stsp argc -= optind;
8071 2822a352 2019-10-15 stsp argv += optind;
8073 2822a352 2019-10-15 stsp if (argc != 1)
8074 2822a352 2019-10-15 stsp usage_integrate();
8075 2822a352 2019-10-15 stsp branch_arg = argv[0];
8077 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8078 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
8079 2822a352 2019-10-15 stsp err(1, "pledge");
8081 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
8082 2822a352 2019-10-15 stsp if (cwd == NULL) {
8083 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
8084 2822a352 2019-10-15 stsp goto done;
8087 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
8088 2822a352 2019-10-15 stsp if (error)
8089 2822a352 2019-10-15 stsp goto done;
8091 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
8092 2822a352 2019-10-15 stsp if (error)
8093 2822a352 2019-10-15 stsp goto done;
8095 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8097 2822a352 2019-10-15 stsp if (error != NULL)
8098 2822a352 2019-10-15 stsp goto done;
8100 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8101 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
8102 2822a352 2019-10-15 stsp if (error)
8103 2822a352 2019-10-15 stsp goto done;
8105 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8106 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
8107 2822a352 2019-10-15 stsp goto done;
8110 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8111 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
8112 2822a352 2019-10-15 stsp if (error)
8113 2822a352 2019-10-15 stsp goto done;
8115 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
8116 2822a352 2019-10-15 stsp if (refname == NULL) {
8117 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8118 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8119 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8120 2822a352 2019-10-15 stsp goto done;
8122 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
8123 2822a352 2019-10-15 stsp if (base_refname == NULL) {
8124 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8125 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8126 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8127 2822a352 2019-10-15 stsp goto done;
8130 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
8131 2822a352 2019-10-15 stsp if (error)
8132 2822a352 2019-10-15 stsp goto done;
8134 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8135 2822a352 2019-10-15 stsp if (error)
8136 2822a352 2019-10-15 stsp goto done;
8138 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8139 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
8140 2822a352 2019-10-15 stsp "specified branch has already been integrated");
8141 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8142 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8143 2822a352 2019-10-15 stsp goto done;
8146 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8147 2822a352 2019-10-15 stsp if (error) {
8148 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
8149 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
8150 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8151 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8152 2822a352 2019-10-15 stsp goto done;
8155 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
8156 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
8157 2822a352 2019-10-15 stsp check_cancelled, NULL);
8158 2822a352 2019-10-15 stsp if (error)
8159 2822a352 2019-10-15 stsp goto done;
8161 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
8164 715dc77e 2019-08-03 stsp got_repo_close(repo);
8165 2822a352 2019-10-15 stsp if (worktree)
8166 2822a352 2019-10-15 stsp got_worktree_close(worktree);
8167 2822a352 2019-10-15 stsp free(cwd);
8168 2822a352 2019-10-15 stsp free(base_commit_id);
8169 2822a352 2019-10-15 stsp free(commit_id);
8170 2822a352 2019-10-15 stsp free(refname);
8171 2822a352 2019-10-15 stsp free(base_refname);
8172 715dc77e 2019-08-03 stsp return error;
8175 715dc77e 2019-08-03 stsp __dead static void
8176 715dc77e 2019-08-03 stsp usage_stage(void)
8178 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8179 f3055044 2019-08-07 stsp "[file-path ...]\n",
8180 715dc77e 2019-08-03 stsp getprogname());
8184 715dc77e 2019-08-03 stsp static const struct got_error *
8185 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
8186 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
8187 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8188 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
8190 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
8191 408b4ebc 2019-08-03 stsp char *id_str = NULL;
8193 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
8194 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
8195 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
8196 408b4ebc 2019-08-03 stsp return NULL;
8198 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
8199 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
8200 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
8202 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
8204 408b4ebc 2019-08-03 stsp return err;
8206 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
8207 408b4ebc 2019-08-03 stsp free(id_str);
8208 dc424a06 2019-08-07 stsp return NULL;
8211 dc424a06 2019-08-07 stsp static const struct got_error *
8212 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
8214 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
8215 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
8216 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
8217 715dc77e 2019-08-03 stsp char *cwd = NULL;
8218 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
8219 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
8220 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
8221 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
8222 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8223 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8225 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
8227 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8228 715dc77e 2019-08-03 stsp switch (ch) {
8230 408b4ebc 2019-08-03 stsp list_stage = 1;
8233 dc424a06 2019-08-07 stsp pflag = 1;
8236 dc424a06 2019-08-07 stsp patch_script_path = optarg;
8239 715dc77e 2019-08-03 stsp usage_stage();
8240 715dc77e 2019-08-03 stsp /* NOTREACHED */
8244 715dc77e 2019-08-03 stsp argc -= optind;
8245 715dc77e 2019-08-03 stsp argv += optind;
8247 715dc77e 2019-08-03 stsp #ifndef PROFILE
8248 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8249 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
8250 715dc77e 2019-08-03 stsp err(1, "pledge");
8252 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
8253 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
8254 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
8255 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
8257 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
8258 715dc77e 2019-08-03 stsp if (cwd == NULL) {
8259 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
8260 715dc77e 2019-08-03 stsp goto done;
8263 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8264 715dc77e 2019-08-03 stsp if (error)
8265 715dc77e 2019-08-03 stsp goto done;
8267 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8269 715dc77e 2019-08-03 stsp if (error != NULL)
8270 715dc77e 2019-08-03 stsp goto done;
8272 dc424a06 2019-08-07 stsp if (patch_script_path) {
8273 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
8274 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
8275 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
8276 dc424a06 2019-08-07 stsp patch_script_path);
8277 dc424a06 2019-08-07 stsp goto done;
8280 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8281 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
8282 715dc77e 2019-08-03 stsp if (error)
8283 715dc77e 2019-08-03 stsp goto done;
8285 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8286 6d022e97 2019-08-04 stsp if (error)
8287 6d022e97 2019-08-04 stsp goto done;
8289 6d022e97 2019-08-04 stsp if (list_stage)
8290 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
8291 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
8293 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8294 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
8295 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
8296 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
8297 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
8300 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8301 2e1f37b0 2019-08-08 stsp error == NULL)
8302 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8304 ad493afc 2019-08-03 stsp got_repo_close(repo);
8305 ad493afc 2019-08-03 stsp if (worktree)
8306 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
8307 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8308 ad493afc 2019-08-03 stsp free((char *)pe->path);
8309 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
8310 ad493afc 2019-08-03 stsp free(cwd);
8311 ad493afc 2019-08-03 stsp return error;
8314 ad493afc 2019-08-03 stsp __dead static void
8315 ad493afc 2019-08-03 stsp usage_unstage(void)
8317 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8318 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
8319 ad493afc 2019-08-03 stsp getprogname());
8324 ad493afc 2019-08-03 stsp static const struct got_error *
8325 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
8327 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
8328 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
8329 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
8330 ad493afc 2019-08-03 stsp char *cwd = NULL;
8331 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
8332 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8333 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
8334 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
8335 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8336 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8338 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
8340 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
8341 ad493afc 2019-08-03 stsp switch (ch) {
8343 2e1f37b0 2019-08-08 stsp pflag = 1;
8346 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
8349 ad493afc 2019-08-03 stsp usage_unstage();
8350 ad493afc 2019-08-03 stsp /* NOTREACHED */
8354 ad493afc 2019-08-03 stsp argc -= optind;
8355 ad493afc 2019-08-03 stsp argv += optind;
8357 ad493afc 2019-08-03 stsp #ifndef PROFILE
8358 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8359 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
8360 ad493afc 2019-08-03 stsp err(1, "pledge");
8362 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
8363 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
8365 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
8366 ad493afc 2019-08-03 stsp if (cwd == NULL) {
8367 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
8368 ad493afc 2019-08-03 stsp goto done;
8371 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8372 ad493afc 2019-08-03 stsp if (error)
8373 ad493afc 2019-08-03 stsp goto done;
8375 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8377 ad493afc 2019-08-03 stsp if (error != NULL)
8378 ad493afc 2019-08-03 stsp goto done;
8380 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
8381 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
8382 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
8383 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
8384 2e1f37b0 2019-08-08 stsp patch_script_path);
8385 2e1f37b0 2019-08-08 stsp goto done;
8389 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8390 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
8391 ad493afc 2019-08-03 stsp if (error)
8392 ad493afc 2019-08-03 stsp goto done;
8394 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8395 ad493afc 2019-08-03 stsp if (error)
8396 ad493afc 2019-08-03 stsp goto done;
8398 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8399 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
8400 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
8401 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
8403 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8404 2e1f37b0 2019-08-08 stsp error == NULL)
8405 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8407 0ebf8283 2019-07-24 stsp got_repo_close(repo);
8408 715dc77e 2019-08-03 stsp if (worktree)
8409 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
8410 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8411 715dc77e 2019-08-03 stsp free((char *)pe->path);
8412 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
8413 715dc77e 2019-08-03 stsp free(cwd);
8414 01073a5d 2019-08-22 stsp return error;
8417 01073a5d 2019-08-22 stsp __dead static void
8418 01073a5d 2019-08-22 stsp usage_cat(void)
8420 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8421 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
8425 01073a5d 2019-08-22 stsp static const struct got_error *
8426 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8428 01073a5d 2019-08-22 stsp const struct got_error *err;
8429 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
8431 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
8433 01073a5d 2019-08-22 stsp return err;
8435 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8436 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
8437 01073a5d 2019-08-22 stsp return err;
8440 01073a5d 2019-08-22 stsp static const struct got_error *
8441 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8443 01073a5d 2019-08-22 stsp const struct got_error *err;
8444 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
8445 56e0773d 2019-11-28 stsp int nentries, i;
8447 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
8449 01073a5d 2019-08-22 stsp return err;
8451 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
8452 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
8453 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
8454 01073a5d 2019-08-22 stsp char *id_str;
8455 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
8457 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
8458 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8461 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
8462 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
8463 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
8464 01073a5d 2019-08-22 stsp free(id_str);
8467 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
8468 01073a5d 2019-08-22 stsp return err;
8471 01073a5d 2019-08-22 stsp static const struct got_error *
8472 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8474 01073a5d 2019-08-22 stsp const struct got_error *err;
8475 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
8476 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
8477 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
8478 01073a5d 2019-08-22 stsp char *id_str = NULL;
8479 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
8481 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
8483 01073a5d 2019-08-22 stsp return err;
8485 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8487 01073a5d 2019-08-22 stsp goto done;
8489 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8490 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8491 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
8492 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
8493 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
8494 01073a5d 2019-08-22 stsp char *pid_str;
8495 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
8497 01073a5d 2019-08-22 stsp goto done;
8498 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8499 01073a5d 2019-08-22 stsp free(pid_str);
8501 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
8502 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8503 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
8505 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
8506 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8507 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
8509 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
8510 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8511 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
8513 01073a5d 2019-08-22 stsp free(id_str);
8514 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
8515 01073a5d 2019-08-22 stsp return err;
8518 01073a5d 2019-08-22 stsp static const struct got_error *
8519 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8521 01073a5d 2019-08-22 stsp const struct got_error *err;
8522 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
8523 01073a5d 2019-08-22 stsp char *id_str = NULL;
8524 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
8526 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
8528 01073a5d 2019-08-22 stsp return err;
8530 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8532 01073a5d 2019-08-22 stsp goto done;
8534 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8536 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
8537 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
8538 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8539 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
8541 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
8542 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8543 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
8545 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
8546 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8547 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
8549 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
8550 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8551 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
8557 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8558 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
8560 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
8561 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
8562 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
8564 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
8565 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8566 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
8568 01073a5d 2019-08-22 stsp free(id_str);
8569 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
8570 01073a5d 2019-08-22 stsp return err;
8573 01073a5d 2019-08-22 stsp static const struct got_error *
8574 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
8576 01073a5d 2019-08-22 stsp const struct got_error *error;
8577 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
8578 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
8579 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
8580 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
8581 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
8582 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
8584 01073a5d 2019-08-22 stsp #ifndef PROFILE
8585 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8586 01073a5d 2019-08-22 stsp NULL) == -1)
8587 01073a5d 2019-08-22 stsp err(1, "pledge");
8590 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
8591 01073a5d 2019-08-22 stsp switch (ch) {
8593 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
8596 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
8597 01073a5d 2019-08-22 stsp if (repo_path == NULL)
8598 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
8600 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
8603 896e9b6f 2019-08-26 stsp force_path = 1;
8606 01073a5d 2019-08-22 stsp usage_cat();
8607 01073a5d 2019-08-22 stsp /* NOTREACHED */
8611 01073a5d 2019-08-22 stsp argc -= optind;
8612 01073a5d 2019-08-22 stsp argv += optind;
8614 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
8615 01073a5d 2019-08-22 stsp if (cwd == NULL) {
8616 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
8617 01073a5d 2019-08-22 stsp goto done;
8619 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
8620 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
8621 01073a5d 2019-08-22 stsp goto done;
8622 01073a5d 2019-08-22 stsp if (worktree) {
8623 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
8624 01073a5d 2019-08-22 stsp repo_path = strdup(
8625 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
8626 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
8627 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
8628 01073a5d 2019-08-22 stsp goto done;
8633 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
8634 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
8635 01073a5d 2019-08-22 stsp if (repo_path == NULL)
8636 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
8639 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
8640 01073a5d 2019-08-22 stsp free(repo_path);
8641 01073a5d 2019-08-22 stsp if (error != NULL)
8642 01073a5d 2019-08-22 stsp goto done;
8644 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8645 896e9b6f 2019-08-26 stsp if (error)
8646 896e9b6f 2019-08-26 stsp goto done;
8648 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
8649 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
8650 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
8651 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
8652 01073a5d 2019-08-22 stsp if (error)
8653 01073a5d 2019-08-22 stsp goto done;
8655 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
8656 896e9b6f 2019-08-26 stsp if (force_path) {
8657 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
8659 896e9b6f 2019-08-26 stsp if (error)
8662 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
8663 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
8664 896e9b6f 2019-08-26 stsp if (error) {
8665 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8666 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
8668 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
8669 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
8670 896e9b6f 2019-08-26 stsp if (error)
8675 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
8676 01073a5d 2019-08-22 stsp if (error)
8679 01073a5d 2019-08-22 stsp switch (obj_type) {
8680 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
8681 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
8683 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
8684 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
8686 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
8687 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
8689 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
8690 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
8693 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
8696 01073a5d 2019-08-22 stsp if (error)
8698 01073a5d 2019-08-22 stsp free(label);
8699 01073a5d 2019-08-22 stsp label = NULL;
8701 01073a5d 2019-08-22 stsp id = NULL;
8704 01073a5d 2019-08-22 stsp free(label);
8706 896e9b6f 2019-08-26 stsp free(commit_id);
8707 01073a5d 2019-08-22 stsp if (worktree)
8708 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
8709 01073a5d 2019-08-22 stsp if (repo) {
8710 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
8711 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
8712 01073a5d 2019-08-22 stsp if (error == NULL)
8713 01073a5d 2019-08-22 stsp error = repo_error;
8715 0ebf8283 2019-07-24 stsp return error;
