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>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 c0768b0f 2018-06-10 stsp #include <sys/types.h>
20 5de5890b 2018-10-18 stsp #include <sys/stat.h>
21 3c45a30a 2019-05-12 jcs #include <sys/param.h>
22 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
24 5c860e29 2018-03-12 stsp #include <err.h>
25 5c860e29 2018-03-12 stsp #include <errno.h>
26 12463d8b 2019-12-13 stsp #include <fcntl.h>
27 12ce7a6c 2019-08-12 stsp #include <limits.h>
28 5c860e29 2018-03-12 stsp #include <locale.h>
29 818c7501 2019-07-11 stsp #include <ctype.h>
30 99437157 2018-11-11 stsp #include <signal.h>
31 5c860e29 2018-03-12 stsp #include <stdio.h>
32 5c860e29 2018-03-12 stsp #include <stdlib.h>
33 5c860e29 2018-03-12 stsp #include <string.h>
34 5c860e29 2018-03-12 stsp #include <unistd.h>
35 c09a553d 2018-03-12 stsp #include <libgen.h>
36 c0768b0f 2018-06-10 stsp #include <time.h>
37 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 6841bf13 2019-11-29 kn #include <regex.h>
39 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 53ccebc2 2019-07-30 stsp #include "got_version.h"
42 f42b1b34 2018-03-12 stsp #include "got_error.h"
43 f42b1b34 2018-03-12 stsp #include "got_object.h"
44 5261c201 2018-04-01 stsp #include "got_reference.h"
45 f42b1b34 2018-03-12 stsp #include "got_repository.h"
46 1dd54920 2019-05-11 stsp #include "got_path.h"
47 e6209546 2019-08-22 stsp #include "got_cancel.h"
48 c09a553d 2018-03-12 stsp #include "got_worktree.h"
49 79109fed 2018-03-27 stsp #include "got_diff.h"
50 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
51 404c43c4 2018-06-21 stsp #include "got_blame.h"
52 63219cd2 2019-01-04 stsp #include "got_privsep.h"
53 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
55 5c860e29 2018-03-12 stsp #ifndef nitems
56 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
59 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
60 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
63 99437157 2018-11-11 stsp catch_sigint(int signo)
65 99437157 2018-11-11 stsp sigint_received = 1;
69 99437157 2018-11-11 stsp catch_sigpipe(int signo)
71 99437157 2018-11-11 stsp sigpipe_received = 1;
75 8cfb4057 2019-07-09 stsp struct got_cmd {
76 5c860e29 2018-03-12 stsp const char *cmd_name;
77 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
78 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
79 97b3a7be 2019-07-09 stsp const char *cmd_alias;
82 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
83 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
84 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
85 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
86 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
87 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
88 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
89 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
90 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
91 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
92 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
93 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
94 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
95 d00136be 2019-03-26 stsp __dead static void usage_add(void);
96 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
97 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
98 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
99 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
100 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
101 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
102 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
103 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
104 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
105 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
106 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
108 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
109 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
110 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
111 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
112 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
113 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
114 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
115 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
116 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
117 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
118 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
119 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
120 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
121 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
122 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
123 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
124 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
125 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
126 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
127 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
128 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
129 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
130 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
131 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
133 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
134 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
135 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
136 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
137 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
138 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
139 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
140 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
141 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
142 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
143 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
144 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
145 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
146 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
147 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
148 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
149 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
150 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
151 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
152 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
153 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
154 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
155 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
156 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
157 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
160 ce5b7c56 2019-07-09 stsp static void
161 ce5b7c56 2019-07-09 stsp list_commands(void)
165 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
166 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
167 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
168 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
170 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
174 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
176 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
177 5c860e29 2018-03-12 stsp unsigned int i;
179 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
180 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
181 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
182 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
185 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
187 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
188 5c860e29 2018-03-12 stsp switch (ch) {
196 ce5b7c56 2019-07-09 stsp usage(hflag);
197 5c860e29 2018-03-12 stsp /* NOTREACHED */
201 5c860e29 2018-03-12 stsp argc -= optind;
202 5c860e29 2018-03-12 stsp argv += optind;
203 1e70621d 2018-03-27 stsp optind = 0;
205 53ccebc2 2019-07-30 stsp if (Vflag) {
206 53ccebc2 2019-07-30 stsp got_version_print_str();
210 5c860e29 2018-03-12 stsp if (argc <= 0)
211 ce5b7c56 2019-07-09 stsp usage(hflag);
213 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
214 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
216 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
217 d7d4f210 2018-03-12 stsp const struct got_error *error;
219 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
221 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
222 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
226 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
228 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
229 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
230 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
231 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
232 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
233 70015d7a 2019-11-08 stsp !(sigint_received &&
234 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
235 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
242 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
243 ce5b7c56 2019-07-09 stsp list_commands();
247 4ed7e80c 2018-05-20 stsp __dead static void
248 ce5b7c56 2019-07-09 stsp usage(int hflag)
250 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
251 53ccebc2 2019-07-30 stsp getprogname());
253 ce5b7c56 2019-07-09 stsp list_commands();
257 0266afb7 2019-01-04 stsp static const struct got_error *
258 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
260 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
261 e2ba3d07 2019-05-13 stsp const char *editor;
263 8920fa04 2019-08-18 stsp *abspath = NULL;
265 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
266 e2ba3d07 2019-05-13 stsp if (editor == NULL)
267 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
269 0ee7065d 2019-05-13 stsp if (editor) {
270 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
272 0ee7065d 2019-05-13 stsp return err;
275 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
276 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
277 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
278 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
281 e2ba3d07 2019-05-13 stsp return NULL;
284 e2ba3d07 2019-05-13 stsp static const struct got_error *
285 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
286 c530dc23 2019-07-23 stsp const char *worktree_path)
288 163ce85a 2019-05-13 stsp const struct got_error *err;
290 37c06ea4 2019-07-15 stsp #ifdef PROFILE
291 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
292 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
294 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
295 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
297 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
298 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
300 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
301 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
303 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
304 163ce85a 2019-05-13 stsp if (err != NULL)
305 163ce85a 2019-05-13 stsp return err;
307 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
308 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
310 0266afb7 2019-01-04 stsp return NULL;
313 2c7829a4 2019-06-17 stsp __dead static void
314 2c7829a4 2019-06-17 stsp usage_init(void)
316 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
320 2c7829a4 2019-06-17 stsp static const struct got_error *
321 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
323 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
324 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
327 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
328 2c7829a4 2019-06-17 stsp switch (ch) {
330 2c7829a4 2019-06-17 stsp usage_init();
331 2c7829a4 2019-06-17 stsp /* NOTREACHED */
335 2c7829a4 2019-06-17 stsp argc -= optind;
336 2c7829a4 2019-06-17 stsp argv += optind;
338 2c7829a4 2019-06-17 stsp #ifndef PROFILE
339 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
340 2c7829a4 2019-06-17 stsp err(1, "pledge");
342 2c7829a4 2019-06-17 stsp if (argc != 1)
343 bc20e173 2019-06-17 stsp usage_init();
345 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
346 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
347 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
349 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
351 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
352 2c7829a4 2019-06-17 stsp if (error &&
353 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
356 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
360 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
362 3ce1b845 2019-07-15 stsp free(repo_path);
363 3ce1b845 2019-07-15 stsp return error;
366 3ce1b845 2019-07-15 stsp __dead static void
367 3ce1b845 2019-07-15 stsp usage_import(void)
369 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
370 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
375 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
378 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
379 3ce1b845 2019-07-15 stsp int st = -1;
381 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
382 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
383 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
385 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
387 3ce1b845 2019-07-15 stsp goto doneediting;
389 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
390 3ce1b845 2019-07-15 stsp _exit(127);
393 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
394 3ce1b845 2019-07-15 stsp if (errno != EINTR)
397 3ce1b845 2019-07-15 stsp doneediting:
398 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
399 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
400 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
402 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
403 3ce1b845 2019-07-15 stsp errno = EINTR;
407 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
410 3ce1b845 2019-07-15 stsp static const struct got_error *
411 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
412 3ce1b845 2019-07-15 stsp const char *initial_content)
414 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
415 3ce1b845 2019-07-15 stsp char buf[1024];
416 3ce1b845 2019-07-15 stsp struct stat st, st2;
418 3ce1b845 2019-07-15 stsp int content_changed = 0;
419 3ce1b845 2019-07-15 stsp size_t len;
421 3ce1b845 2019-07-15 stsp *logmsg = NULL;
423 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
424 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
426 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
427 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
429 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
430 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
432 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
433 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
434 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
436 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
437 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
438 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
439 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
442 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
443 3ce1b845 2019-07-15 stsp if (fp == NULL) {
444 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
447 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
448 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
449 3ce1b845 2019-07-15 stsp content_changed = 1;
450 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
451 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
452 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
454 3ce1b845 2019-07-15 stsp fclose(fp);
456 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
457 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
461 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
462 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
463 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
466 3ce1b845 2019-07-15 stsp free(*logmsg);
467 3ce1b845 2019-07-15 stsp *logmsg = NULL;
469 3ce1b845 2019-07-15 stsp return err;
472 3ce1b845 2019-07-15 stsp static const struct got_error *
473 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
474 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
476 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
477 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
480 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
481 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
482 3ce1b845 2019-07-15 stsp branch_name) == -1)
483 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
485 ef293bdd 2019-10-21 stsp err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
489 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
492 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
494 3ce1b845 2019-07-15 stsp free(initial_content);
495 3ce1b845 2019-07-15 stsp return err;
498 3ce1b845 2019-07-15 stsp static const struct got_error *
499 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
501 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
502 3ce1b845 2019-07-15 stsp return NULL;
505 3ce1b845 2019-07-15 stsp static const struct got_error *
506 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
508 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
509 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
511 84792843 2019-08-09 stsp *author = NULL;
513 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
514 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
515 c9956ddf 2019-09-08 stsp if (name && email) {
516 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
517 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
518 aba9c984 2019-09-08 stsp return NULL;
521 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
522 84792843 2019-08-09 stsp if (got_author == NULL) {
523 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
524 c9956ddf 2019-09-08 stsp email = got_repo_get_global_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 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
528 c9956ddf 2019-09-08 stsp return NULL;
530 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
531 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
534 aba9c984 2019-09-08 stsp *author = strdup(got_author);
535 aba9c984 2019-09-08 stsp if (*author == NULL)
536 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
539 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
540 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
542 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
543 84792843 2019-08-09 stsp got_author++;
544 aba9c984 2019-09-08 stsp if (*got_author != '<') {
545 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
548 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
549 84792843 2019-08-09 stsp got_author++;
550 aba9c984 2019-09-08 stsp if (*got_author != '@') {
551 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
554 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
555 84792843 2019-08-09 stsp got_author++;
556 84792843 2019-08-09 stsp if (*got_author != '>')
557 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
560 aba9c984 2019-09-08 stsp free(*author);
561 aba9c984 2019-09-08 stsp *author = NULL;
563 aba9c984 2019-09-08 stsp return err;
566 c9956ddf 2019-09-08 stsp static const struct got_error *
567 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
569 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
571 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
572 c9956ddf 2019-09-08 stsp if (homedir) {
573 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
574 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
577 c9956ddf 2019-09-08 stsp return NULL;
580 84792843 2019-08-09 stsp static const struct got_error *
581 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
583 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
584 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
585 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
586 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
587 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
588 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
589 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
590 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
592 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
593 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
594 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
596 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
598 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
599 3ce1b845 2019-07-15 stsp switch (ch) {
601 3ce1b845 2019-07-15 stsp branch_name = optarg;
604 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
605 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
606 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
611 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
612 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
613 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
619 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
621 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
627 b2b65d18 2019-08-22 stsp usage_import();
628 3ce1b845 2019-07-15 stsp /* NOTREACHED */
632 3ce1b845 2019-07-15 stsp argc -= optind;
633 3ce1b845 2019-07-15 stsp argv += optind;
635 3ce1b845 2019-07-15 stsp #ifndef PROFILE
636 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
638 3ce1b845 2019-07-15 stsp NULL) == -1)
639 3ce1b845 2019-07-15 stsp err(1, "pledge");
641 3ce1b845 2019-07-15 stsp if (argc != 1)
642 3ce1b845 2019-07-15 stsp usage_import();
644 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
645 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
646 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
647 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
649 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
650 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
653 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
657 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
659 aba9c984 2019-09-08 stsp return error;
662 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
663 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
664 e560b7e0 2019-11-28 stsp * an unintended typo.
666 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
667 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
669 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
670 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
674 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
675 3ce1b845 2019-07-15 stsp if (error) {
676 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
679 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
680 3ce1b845 2019-07-15 stsp "import target branch already exists");
684 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
685 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
686 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
689 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
692 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
693 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
695 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
696 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
699 8e158b01 2019-09-22 stsp free(logmsg);
700 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
701 ef293bdd 2019-10-21 stsp path_dir, refname);
702 ef293bdd 2019-10-21 stsp if (error) {
703 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
704 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
705 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
710 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
711 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
712 ef293bdd 2019-10-21 stsp if (logmsg_path)
713 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
717 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
718 ef293bdd 2019-10-21 stsp if (error) {
719 ef293bdd 2019-10-21 stsp if (logmsg_path)
720 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
724 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
725 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
726 ef293bdd 2019-10-21 stsp if (error) {
727 ef293bdd 2019-10-21 stsp if (logmsg_path)
728 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
732 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
733 ef293bdd 2019-10-21 stsp if (error) {
734 ef293bdd 2019-10-21 stsp if (logmsg_path)
735 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
739 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
740 ef293bdd 2019-10-21 stsp if (error) {
741 ef293bdd 2019-10-21 stsp if (logmsg_path)
742 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
746 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
747 ef293bdd 2019-10-21 stsp if (error) {
748 ef293bdd 2019-10-21 stsp if (logmsg_path)
749 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
753 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
754 3ce1b845 2019-07-15 stsp if (error) {
755 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
756 ef293bdd 2019-10-21 stsp if (logmsg_path)
757 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
761 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
762 3ce1b845 2019-07-15 stsp branch_ref);
763 ef293bdd 2019-10-21 stsp if (error) {
764 ef293bdd 2019-10-21 stsp if (logmsg_path)
765 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
769 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
770 ef293bdd 2019-10-21 stsp if (error) {
771 ef293bdd 2019-10-21 stsp if (logmsg_path)
772 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
777 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
778 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
780 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
781 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
782 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
783 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
784 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
785 8e158b01 2019-09-22 stsp free(logmsg);
786 ef293bdd 2019-10-21 stsp free(logmsg_path);
787 2c7829a4 2019-06-17 stsp free(repo_path);
788 3ce1b845 2019-07-15 stsp free(editor);
789 3ce1b845 2019-07-15 stsp free(refname);
790 3ce1b845 2019-07-15 stsp free(new_commit_id);
791 3ce1b845 2019-07-15 stsp free(id_str);
792 aba9c984 2019-09-08 stsp free(author);
793 c9956ddf 2019-09-08 stsp free(gitconfig_path);
794 3ce1b845 2019-07-15 stsp if (branch_ref)
795 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
796 3ce1b845 2019-07-15 stsp if (head_ref)
797 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
798 2c7829a4 2019-06-17 stsp return error;
801 4ed7e80c 2018-05-20 stsp __dead static void
802 c09a553d 2018-03-12 stsp usage_checkout(void)
804 bb51a5b4 2020-01-13 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
805 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
809 7f47418f 2019-12-20 stsp static void
810 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning(void)
812 7f47418f 2019-12-20 stsp fprintf(stderr, "%s: warning: could not create a reference "
813 7f47418f 2019-12-20 stsp "to the work tree's base commit; the commit could be "
814 7f47418f 2019-12-20 stsp "garbage-collected by Git; making the repository "
815 7f47418f 2019-12-20 stsp "writable and running 'got update' will prevent this\n",
816 7f47418f 2019-12-20 stsp getprogname());
819 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg {
820 7f47418f 2019-12-20 stsp const char *worktree_path;
821 7f47418f 2019-12-20 stsp int had_base_commit_ref_error;
824 1ee397ad 2019-07-12 stsp static const struct got_error *
825 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
827 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg *a = arg;
829 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
830 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
831 7f47418f 2019-12-20 stsp return NULL;
833 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
834 7f47418f 2019-12-20 stsp a->had_base_commit_ref_error = 1;
835 1ee397ad 2019-07-12 stsp return NULL;
838 92a684f4 2018-03-12 stsp while (path[0] == '/')
841 7f47418f 2019-12-20 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
842 1ee397ad 2019-07-12 stsp return NULL;
845 99437157 2018-11-11 stsp static const struct got_error *
846 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
848 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
849 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
850 99437157 2018-11-11 stsp return NULL;
853 8069f636 2019-01-12 stsp static const struct got_error *
854 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
855 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
856 3aef623b 2019-10-15 stsp struct got_repository *repo)
858 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
859 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
861 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
862 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
864 36a38700 2019-05-10 stsp return err;
866 d5bea539 2019-05-13 stsp if (yca_id == NULL)
867 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
870 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
871 d5bea539 2019-05-13 stsp * and the work tree's base commit.
873 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
875 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
883 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
884 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
885 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
887 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
888 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
889 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
890 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
891 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
892 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
894 d5bea539 2019-05-13 stsp free(yca_id);
895 d5bea539 2019-05-13 stsp return NULL;
898 a367ff0f 2019-05-14 stsp static const struct got_error *
899 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
900 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
901 a51a74b3 2019-07-27 stsp struct got_repository *repo)
903 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
904 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
905 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
906 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
908 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
912 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
913 a51a74b3 2019-07-27 stsp is_same_branch = 1;
916 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
917 a51a74b3 2019-07-27 stsp is_same_branch = 1;
921 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
925 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
926 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
931 a367ff0f 2019-05-14 stsp struct got_object_id *id;
932 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
933 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
935 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
936 a367ff0f 2019-05-14 stsp err = NULL;
941 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
943 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
944 a367ff0f 2019-05-14 stsp is_same_branch = 1;
951 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
952 a367ff0f 2019-05-14 stsp free(head_commit_id);
953 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
954 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
955 04f57cb3 2019-07-25 stsp return err;
958 04f57cb3 2019-07-25 stsp static const struct got_error *
959 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
960 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
962 04f57cb3 2019-07-25 stsp const struct got_error *err;
963 04f57cb3 2019-07-25 stsp struct got_reference *ref;
964 303e2782 2019-08-09 stsp struct got_tag_object *tag;
966 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
967 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
968 303e2782 2019-08-09 stsp if (err == NULL) {
969 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
970 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
971 303e2782 2019-08-09 stsp if (*commit_id == NULL)
972 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
973 303e2782 2019-08-09 stsp got_object_tag_close(tag);
974 303e2782 2019-08-09 stsp return err;
975 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
976 303e2782 2019-08-09 stsp return err;
978 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
979 04f57cb3 2019-07-25 stsp if (err == NULL) {
980 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
981 04f57cb3 2019-07-25 stsp got_ref_close(ref);
983 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
984 04f57cb3 2019-07-25 stsp return err;
985 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
986 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
988 a367ff0f 2019-05-14 stsp return err;
991 4ed7e80c 2018-05-20 stsp static const struct got_error *
992 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
994 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
995 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
996 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
997 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
998 c09a553d 2018-03-12 stsp char *repo_path = NULL;
999 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
1000 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
1001 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
1002 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
1003 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
1004 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1005 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
1007 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1009 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1010 0bb8a95e 2018-03-12 stsp switch (ch) {
1012 08573d5b 2019-05-14 stsp branch_name = optarg;
1015 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
1016 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
1017 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1020 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
1023 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1026 2deda0b9 2019-03-07 stsp usage_checkout();
1027 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1031 0bb8a95e 2018-03-12 stsp argc -= optind;
1032 0bb8a95e 2018-03-12 stsp argv += optind;
1034 6715a751 2018-03-16 stsp #ifndef PROFILE
1035 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1036 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1037 c09a553d 2018-03-12 stsp err(1, "pledge");
1039 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1040 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1041 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1042 76089277 2018-04-01 stsp if (repo_path == NULL)
1043 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1044 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1045 76089277 2018-04-01 stsp if (cwd == NULL) {
1046 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1047 76089277 2018-04-01 stsp goto done;
1049 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1050 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1051 230a42bd 2019-05-11 jcs if (base == NULL) {
1052 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1053 230a42bd 2019-05-11 jcs path_prefix);
1057 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1058 230a42bd 2019-05-11 jcs if (base == NULL) {
1059 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1060 230a42bd 2019-05-11 jcs repo_path);
1064 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1065 c09a553d 2018-03-12 stsp if (dotgit)
1066 c09a553d 2018-03-12 stsp *dotgit = '\0';
1067 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1068 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1069 c09a553d 2018-03-12 stsp free(cwd);
1070 76089277 2018-04-01 stsp goto done;
1072 c09a553d 2018-03-12 stsp free(cwd);
1073 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1074 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1075 76089277 2018-04-01 stsp if (repo_path == NULL) {
1076 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1077 76089277 2018-04-01 stsp goto done;
1079 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1080 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1081 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1082 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1084 b4b3a7dd 2019-07-22 stsp goto done;
1086 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1087 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1088 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1089 b4b3a7dd 2019-07-22 stsp goto done;
1093 c09a553d 2018-03-12 stsp usage_checkout();
1095 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1096 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1098 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1099 c09a553d 2018-03-12 stsp if (error != NULL)
1100 c02c541e 2019-03-29 stsp goto done;
1102 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1103 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1104 c530dc23 2019-07-23 stsp if (error) {
1105 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1106 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1107 c530dc23 2019-07-23 stsp goto done;
1108 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1109 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
1110 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1111 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1112 c530dc23 2019-07-23 stsp goto done;
1116 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1117 c02c541e 2019-03-29 stsp if (error)
1118 c09a553d 2018-03-12 stsp goto done;
1120 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1121 c09a553d 2018-03-12 stsp if (error != NULL)
1122 c09a553d 2018-03-12 stsp goto done;
1124 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1125 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1126 c09a553d 2018-03-12 stsp goto done;
1128 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1129 c09a553d 2018-03-12 stsp if (error != NULL)
1130 c09a553d 2018-03-12 stsp goto done;
1132 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1133 e5dc7198 2018-12-29 stsp path_prefix);
1134 e5dc7198 2018-12-29 stsp if (error != NULL)
1135 e5dc7198 2018-12-29 stsp goto done;
1136 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1137 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1138 49520a32 2018-12-29 stsp goto done;
1141 8069f636 2019-01-12 stsp if (commit_id_str) {
1142 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1143 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1144 30837e32 2019-07-25 stsp if (error)
1145 8069f636 2019-01-12 stsp goto done;
1146 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1147 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1148 8069f636 2019-01-12 stsp if (error != NULL) {
1149 8069f636 2019-01-12 stsp free(commit_id);
1150 8069f636 2019-01-12 stsp goto done;
1152 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1153 45d344f6 2019-05-14 stsp if (error)
1154 45d344f6 2019-05-14 stsp goto done;
1155 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1156 8069f636 2019-01-12 stsp commit_id);
1157 8069f636 2019-01-12 stsp free(commit_id);
1158 8069f636 2019-01-12 stsp if (error)
1159 8069f636 2019-01-12 stsp goto done;
1162 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1163 f2ea84fa 2019-07-27 stsp if (error)
1164 f2ea84fa 2019-07-27 stsp goto done;
1165 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1166 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1167 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1168 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1169 c09a553d 2018-03-12 stsp if (error != NULL)
1170 c09a553d 2018-03-12 stsp goto done;
1172 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1173 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1174 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1176 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1177 8069f636 2019-01-12 stsp free(commit_id_str);
1178 76089277 2018-04-01 stsp free(repo_path);
1179 507dc3bb 2018-12-29 stsp free(worktree_path);
1180 507dc3bb 2018-12-29 stsp return error;
1183 507dc3bb 2018-12-29 stsp __dead static void
1184 507dc3bb 2018-12-29 stsp usage_update(void)
1186 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1187 507dc3bb 2018-12-29 stsp getprogname());
1191 1ee397ad 2019-07-12 stsp static const struct got_error *
1192 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1194 784955db 2019-01-12 stsp int *did_something = arg;
1196 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1197 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1198 1ee397ad 2019-07-12 stsp return NULL;
1200 1545c615 2019-02-10 stsp *did_something = 1;
1202 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1203 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1204 1ee397ad 2019-07-12 stsp return NULL;
1206 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1208 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1209 1ee397ad 2019-07-12 stsp return NULL;
1212 be7061eb 2018-12-30 stsp static const struct got_error *
1213 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1214 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1215 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1217 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1218 a1fb16d8 2019-05-24 stsp char *base_id_str;
1219 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1221 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1222 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1223 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1224 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1225 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1226 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1227 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1230 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1231 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1232 a1fb16d8 2019-05-24 stsp if (err) {
1233 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1234 a1fb16d8 2019-05-24 stsp return err;
1235 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1237 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1238 a1fb16d8 2019-05-24 stsp return NULL;
1240 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1241 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1242 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1244 a1fb16d8 2019-05-24 stsp return err;
1245 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1246 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1247 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1248 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1249 0ebf8283 2019-07-24 stsp return NULL;
1252 0ebf8283 2019-07-24 stsp static const struct got_error *
1253 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1255 0ebf8283 2019-07-24 stsp const struct got_error *err;
1256 0ebf8283 2019-07-24 stsp int in_progress;
1258 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1260 0ebf8283 2019-07-24 stsp return err;
1261 0ebf8283 2019-07-24 stsp if (in_progress)
1262 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1264 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1266 0ebf8283 2019-07-24 stsp return err;
1267 0ebf8283 2019-07-24 stsp if (in_progress)
1268 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1270 a1fb16d8 2019-05-24 stsp return NULL;
1273 a5edda0a 2019-07-27 stsp static const struct got_error *
1274 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1275 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1277 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1278 a5edda0a 2019-07-27 stsp char *path;
1281 a5edda0a 2019-07-27 stsp if (argc == 0) {
1282 a5edda0a 2019-07-27 stsp path = strdup("");
1283 a5edda0a 2019-07-27 stsp if (path == NULL)
1284 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1285 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1288 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1289 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1292 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1293 a5edda0a 2019-07-27 stsp if (err) {
1294 a5edda0a 2019-07-27 stsp free(path);
1299 a5edda0a 2019-07-27 stsp return err;
1302 a1fb16d8 2019-05-24 stsp static const struct got_error *
1303 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1305 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1306 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1307 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1308 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1309 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1310 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1311 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1312 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1313 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1314 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1315 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1317 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1319 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1320 507dc3bb 2018-12-29 stsp switch (ch) {
1322 024e9686 2019-05-14 stsp branch_name = optarg;
1325 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1326 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1327 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1330 2deda0b9 2019-03-07 stsp usage_update();
1331 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1335 507dc3bb 2018-12-29 stsp argc -= optind;
1336 507dc3bb 2018-12-29 stsp argv += optind;
1338 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1339 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1340 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1341 507dc3bb 2018-12-29 stsp err(1, "pledge");
1343 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1344 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1345 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1346 c4cdcb68 2019-04-03 stsp goto done;
1348 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1349 7d5807f4 2019-07-11 stsp if (error)
1350 7d5807f4 2019-07-11 stsp goto done;
1352 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1353 f2ea84fa 2019-07-27 stsp if (error)
1354 f2ea84fa 2019-07-27 stsp goto done;
1356 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1358 507dc3bb 2018-12-29 stsp if (error != NULL)
1359 507dc3bb 2018-12-29 stsp goto done;
1361 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1362 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1363 087fb88c 2019-08-04 stsp if (error)
1364 087fb88c 2019-08-04 stsp goto done;
1366 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1367 0266afb7 2019-01-04 stsp if (error)
1368 0266afb7 2019-01-04 stsp goto done;
1370 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1371 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1372 024e9686 2019-05-14 stsp if (error != NULL)
1373 024e9686 2019-05-14 stsp goto done;
1374 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1375 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1376 9c4b8182 2019-01-02 stsp if (error != NULL)
1377 9c4b8182 2019-01-02 stsp goto done;
1378 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1379 507dc3bb 2018-12-29 stsp if (error != NULL)
1380 507dc3bb 2018-12-29 stsp goto done;
1382 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1383 04f57cb3 2019-07-25 stsp free(commit_id_str);
1384 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1385 30837e32 2019-07-25 stsp if (error)
1386 a297e751 2019-07-11 stsp goto done;
1387 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1388 a297e751 2019-07-11 stsp if (error)
1389 507dc3bb 2018-12-29 stsp goto done;
1392 a1fb16d8 2019-05-24 stsp if (branch_name) {
1393 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1394 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1395 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1397 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1398 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1399 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1400 024e9686 2019-05-14 stsp goto done;
1402 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1403 024e9686 2019-05-14 stsp if (error)
1404 024e9686 2019-05-14 stsp goto done;
1405 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1407 a367ff0f 2019-05-14 stsp free(head_commit_id);
1408 024e9686 2019-05-14 stsp if (error != NULL)
1409 024e9686 2019-05-14 stsp goto done;
1410 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1411 a367ff0f 2019-05-14 stsp if (error)
1412 a367ff0f 2019-05-14 stsp goto done;
1413 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1414 024e9686 2019-05-14 stsp if (error)
1415 024e9686 2019-05-14 stsp goto done;
1417 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1418 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1419 a367ff0f 2019-05-14 stsp if (error != NULL) {
1420 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1421 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1422 024e9686 2019-05-14 stsp goto done;
1424 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1425 a367ff0f 2019-05-14 stsp if (error)
1426 a367ff0f 2019-05-14 stsp goto done;
1429 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1430 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1431 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1432 507dc3bb 2018-12-29 stsp commit_id);
1433 507dc3bb 2018-12-29 stsp if (error)
1434 507dc3bb 2018-12-29 stsp goto done;
1437 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1438 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1439 507dc3bb 2018-12-29 stsp if (error != NULL)
1440 507dc3bb 2018-12-29 stsp goto done;
1442 784955db 2019-01-12 stsp if (did_something)
1443 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1445 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1447 c09a553d 2018-03-12 stsp free(worktree_path);
1448 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1449 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1450 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1451 507dc3bb 2018-12-29 stsp free(commit_id);
1452 9c4b8182 2019-01-02 stsp free(commit_id_str);
1453 c09a553d 2018-03-12 stsp return error;
1456 f42b1b34 2018-03-12 stsp static const struct got_error *
1457 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1458 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1459 63035f9f 2019-10-06 stsp struct got_repository *repo)
1461 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1462 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1464 44392932 2019-08-25 stsp if (blob_id1) {
1465 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1467 44392932 2019-08-25 stsp goto done;
1470 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1472 44392932 2019-08-25 stsp goto done;
1474 44392932 2019-08-25 stsp while (path[0] == '/')
1476 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1477 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1479 44392932 2019-08-25 stsp if (blob1)
1480 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1481 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1482 44392932 2019-08-25 stsp return err;
1485 44392932 2019-08-25 stsp static const struct got_error *
1486 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1487 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1488 63035f9f 2019-10-06 stsp struct got_repository *repo)
1490 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1491 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1492 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1494 44392932 2019-08-25 stsp if (tree_id1) {
1495 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1497 44392932 2019-08-25 stsp goto done;
1500 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1502 0f2b3dca 2018-12-22 stsp goto done;
1504 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1505 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1506 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1507 44392932 2019-08-25 stsp while (path[0] == '/')
1509 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1510 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1512 79109fed 2018-03-27 stsp if (tree1)
1513 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1514 366e0a5f 2019-10-10 stsp if (tree2)
1515 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1516 44392932 2019-08-25 stsp return err;
1519 44392932 2019-08-25 stsp static const struct got_error *
1520 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1521 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1523 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1524 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1525 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1526 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1527 44392932 2019-08-25 stsp struct got_object_qid *qid;
1529 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1530 44392932 2019-08-25 stsp if (qid != NULL) {
1531 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1534 44392932 2019-08-25 stsp return err;
1537 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1538 44392932 2019-08-25 stsp int obj_type;
1539 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1541 44392932 2019-08-25 stsp goto done;
1542 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1543 44392932 2019-08-25 stsp if (err) {
1544 44392932 2019-08-25 stsp free(obj_id2);
1545 44392932 2019-08-25 stsp goto done;
1547 44392932 2019-08-25 stsp if (pcommit) {
1548 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1549 44392932 2019-08-25 stsp qid->id, path);
1550 44392932 2019-08-25 stsp if (err) {
1551 44392932 2019-08-25 stsp free(obj_id2);
1552 44392932 2019-08-25 stsp goto done;
1554 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1555 44392932 2019-08-25 stsp if (err) {
1556 44392932 2019-08-25 stsp free(obj_id2);
1557 44392932 2019-08-25 stsp goto done;
1560 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1561 44392932 2019-08-25 stsp if (err) {
1562 44392932 2019-08-25 stsp free(obj_id2);
1563 44392932 2019-08-25 stsp goto done;
1565 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1566 44392932 2019-08-25 stsp switch (obj_type) {
1567 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1568 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1571 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1572 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1576 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1579 44392932 2019-08-25 stsp free(obj_id1);
1580 44392932 2019-08-25 stsp free(obj_id2);
1582 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1583 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1585 44392932 2019-08-25 stsp goto done;
1586 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1587 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1589 44392932 2019-08-25 stsp goto done;
1590 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1591 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1594 0f2b3dca 2018-12-22 stsp free(id_str1);
1595 0f2b3dca 2018-12-22 stsp free(id_str2);
1596 44392932 2019-08-25 stsp if (pcommit)
1597 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1598 79109fed 2018-03-27 stsp return err;
1601 4bb494d5 2018-06-16 stsp static char *
1602 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1604 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1605 09867e48 2019-08-13 stsp char *p, *s;
1607 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1608 09867e48 2019-08-13 stsp if (tm == NULL)
1609 09867e48 2019-08-13 stsp return NULL;
1610 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1611 09867e48 2019-08-13 stsp if (s == NULL)
1612 09867e48 2019-08-13 stsp return NULL;
1613 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1615 6c281f94 2018-06-11 stsp *p = '\0';
1619 6841bf13 2019-11-29 kn static const struct got_error *
1620 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1621 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1623 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1624 6841bf13 2019-11-29 kn regmatch_t regmatch;
1625 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1627 6841bf13 2019-11-29 kn *have_match = 0;
1629 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1633 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1637 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1638 6841bf13 2019-11-29 kn *have_match = 1;
1640 6841bf13 2019-11-29 kn free(id_str);
1641 6841bf13 2019-11-29 kn free(logmsg);
1645 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1647 79109fed 2018-03-27 stsp static const struct got_error *
1648 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1649 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1650 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1652 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1653 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1654 6c281f94 2018-06-11 stsp char datebuf[26];
1655 45d799e2 2018-12-23 stsp time_t committer_time;
1656 45d799e2 2018-12-23 stsp const char *author, *committer;
1657 199a4027 2019-02-02 stsp char *refs_str = NULL;
1658 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1660 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1662 199a4027 2019-02-02 stsp const char *name;
1663 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1666 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1667 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1669 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1670 199a4027 2019-02-02 stsp name += 5;
1671 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1673 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1674 e34f9ed6 2019-02-02 stsp name += 6;
1675 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1676 141c2bff 2019-02-04 stsp name += 8;
1677 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1678 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1679 5d844a1e 2019-08-13 stsp if (err) {
1680 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1681 5d844a1e 2019-08-13 stsp return err;
1682 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1683 5d844a1e 2019-08-13 stsp err = NULL;
1684 5d844a1e 2019-08-13 stsp tag = NULL;
1687 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1688 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1690 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1691 a436ad14 2019-08-13 stsp if (cmp != 0)
1693 199a4027 2019-02-02 stsp s = refs_str;
1694 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1695 199a4027 2019-02-02 stsp name) == -1) {
1696 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1698 34ca4898 2019-08-13 stsp return err;
1702 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1704 8bf5b3c9 2018-03-17 stsp return err;
1706 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1707 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1708 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1709 832c249c 2018-06-10 stsp free(id_str);
1710 d3d493d7 2019-02-21 stsp id_str = NULL;
1711 d3d493d7 2019-02-21 stsp free(refs_str);
1712 d3d493d7 2019-02-21 stsp refs_str = NULL;
1713 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1714 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1715 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1716 09867e48 2019-08-13 stsp if (datestr)
1717 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1718 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1719 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1720 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1721 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1722 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1723 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1724 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1725 3fe1abad 2018-06-10 stsp int n = 1;
1726 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1727 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1728 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1730 a0603db2 2018-06-10 stsp return err;
1731 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1732 a0603db2 2018-06-10 stsp free(id_str);
1736 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1738 5943eee2 2019-08-13 stsp return err;
1740 621015ac 2018-07-23 stsp logmsg = logmsg0;
1742 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1744 832c249c 2018-06-10 stsp printf(" %s\n", line);
1745 832c249c 2018-06-10 stsp } while (line);
1746 621015ac 2018-07-23 stsp free(logmsg0);
1748 971751ac 2018-03-27 stsp if (show_patch) {
1749 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1750 971751ac 2018-03-27 stsp if (err == 0)
1751 971751ac 2018-03-27 stsp printf("\n");
1754 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1755 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1756 07862c20 2018-09-15 stsp return err;
1759 f42b1b34 2018-03-12 stsp static const struct got_error *
1760 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1761 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1762 463a997a 2019-12-08 kn int diff_context, int limit, int first_parent_traversal,
1763 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1765 f42b1b34 2018-03-12 stsp const struct got_error *err;
1766 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1767 6841bf13 2019-11-29 kn regex_t regex;
1768 6841bf13 2019-11-29 kn int have_match;
1770 6841bf13 2019-11-29 kn if (search_pattern &&
1771 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1772 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1774 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, path, first_parent_traversal);
1776 f42b1b34 2018-03-12 stsp return err;
1777 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1778 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1780 fcc85cad 2018-07-22 stsp goto done;
1782 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1783 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1785 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1788 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
1789 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
1790 372ccdbb 2018-06-10 stsp if (err) {
1791 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
1792 9ba79e04 2018-06-11 stsp err = NULL;
1795 b43fbaa0 2018-06-11 stsp if (id == NULL)
1798 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1802 6841bf13 2019-11-29 kn if (search_pattern) {
1803 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
1805 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1808 6841bf13 2019-11-29 kn if (have_match == 0) {
1809 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1814 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1815 44392932 2019-08-25 stsp diff_context, refs);
1816 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1817 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1821 6841bf13 2019-11-29 kn if (search_pattern)
1822 6841bf13 2019-11-29 kn regfree(®ex);
1823 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1824 f42b1b34 2018-03-12 stsp return err;
1827 4ed7e80c 2018-05-20 stsp __dead static void
1828 6f3d1eb0 2018-03-12 stsp usage_log(void)
1830 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1831 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1835 b1ebc001 2019-08-13 stsp static int
1836 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1838 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1839 b1ebc001 2019-08-13 stsp long long n;
1840 b1ebc001 2019-08-13 stsp const char *errstr;
1842 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1843 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1845 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1846 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1851 4ed7e80c 2018-05-20 stsp static const struct got_error *
1852 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1854 f42b1b34 2018-03-12 stsp const struct got_error *error;
1855 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1856 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1857 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1858 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1859 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1860 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
1861 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
1862 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1863 64a96a6d 2018-04-01 stsp const char *errstr;
1864 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1866 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1868 6715a751 2018-03-16 stsp #ifndef PROFILE
1869 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1872 f42b1b34 2018-03-12 stsp err(1, "pledge");
1875 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1877 6841bf13 2019-11-29 kn while ((ch = getopt(argc, argv, "b:pc:C:l:fr:s:")) != -1) {
1878 79109fed 2018-03-27 stsp switch (ch) {
1880 79109fed 2018-03-27 stsp show_patch = 1;
1883 d142fc45 2018-04-01 stsp start_commit = optarg;
1886 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1888 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1889 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1892 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1893 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1894 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1897 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1900 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1901 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1902 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1904 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1907 6841bf13 2019-11-29 kn search_pattern = optarg;
1910 2deda0b9 2019-03-07 stsp usage_log();
1911 79109fed 2018-03-27 stsp /* NOTREACHED */
1915 79109fed 2018-03-27 stsp argc -= optind;
1916 79109fed 2018-03-27 stsp argv += optind;
1918 dc1edbfa 2019-11-29 kn if (diff_context == -1)
1919 dc1edbfa 2019-11-29 kn diff_context = 3;
1920 dc1edbfa 2019-11-29 kn else if (!show_patch)
1921 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
1923 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1924 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1925 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1926 04ca23f4 2018-07-16 stsp goto done;
1929 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1930 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1931 cffc0aa4 2019-02-05 stsp goto done;
1932 cffc0aa4 2019-02-05 stsp error = NULL;
1934 e7301579 2019-03-18 stsp if (argc == 0) {
1935 cbd1af7a 2019-03-18 stsp path = strdup("");
1936 e7301579 2019-03-18 stsp if (path == NULL) {
1937 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1938 cbd1af7a 2019-03-18 stsp goto done;
1940 e7301579 2019-03-18 stsp } else if (argc == 1) {
1941 e7301579 2019-03-18 stsp if (worktree) {
1942 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1944 e7301579 2019-03-18 stsp if (error)
1945 e7301579 2019-03-18 stsp goto done;
1947 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1948 e7301579 2019-03-18 stsp if (path == NULL) {
1949 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1950 e7301579 2019-03-18 stsp goto done;
1954 cbd1af7a 2019-03-18 stsp usage_log();
1956 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1957 5486daa2 2019-05-11 stsp repo_path = worktree ?
1958 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1960 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1961 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1962 cffc0aa4 2019-02-05 stsp goto done;
1965 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1966 d7d4f210 2018-03-12 stsp if (error != NULL)
1967 04ca23f4 2018-07-16 stsp goto done;
1969 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1970 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1971 c02c541e 2019-03-29 stsp if (error)
1972 c02c541e 2019-03-29 stsp goto done;
1974 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1975 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1976 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1977 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1978 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1979 3235492e 2018-04-01 stsp if (error != NULL)
1980 3235492e 2018-04-01 stsp return error;
1981 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1982 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1983 3235492e 2018-04-01 stsp if (error != NULL)
1984 3235492e 2018-04-01 stsp return error;
1985 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1987 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1988 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1989 3235492e 2018-04-01 stsp if (error == NULL) {
1990 1caad61b 2019-02-01 stsp int obj_type;
1991 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1992 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1993 d1f2edc9 2018-06-13 stsp if (error != NULL)
1994 1caad61b 2019-02-01 stsp goto done;
1995 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1996 1caad61b 2019-02-01 stsp if (error != NULL)
1997 1caad61b 2019-02-01 stsp goto done;
1998 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1999 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
2000 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
2001 1caad61b 2019-02-01 stsp if (error != NULL)
2002 1caad61b 2019-02-01 stsp goto done;
2003 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
2004 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
2005 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2006 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2007 1caad61b 2019-02-01 stsp goto done;
2010 1caad61b 2019-02-01 stsp id = got_object_id_dup(
2011 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
2012 1caad61b 2019-02-01 stsp if (id == NULL)
2013 638f9024 2019-05-13 stsp error = got_error_from_errno(
2014 230a42bd 2019-05-11 jcs "got_object_id_dup");
2015 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2016 1caad61b 2019-02-01 stsp if (error)
2017 1caad61b 2019-02-01 stsp goto done;
2018 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2019 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2020 1caad61b 2019-02-01 stsp goto done;
2022 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2023 d1f2edc9 2018-06-13 stsp if (error != NULL)
2024 1caad61b 2019-02-01 stsp goto done;
2026 15a94983 2018-12-23 stsp if (commit == NULL) {
2027 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2028 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2029 d1f2edc9 2018-06-13 stsp if (error != NULL)
2030 d1f2edc9 2018-06-13 stsp return error;
2033 d7d4f210 2018-03-12 stsp if (error != NULL)
2034 04ca23f4 2018-07-16 stsp goto done;
2036 deeabeae 2019-08-27 stsp if (worktree) {
2037 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2039 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2040 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2041 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2042 deeabeae 2019-08-27 stsp goto done;
2044 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2047 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2048 04ca23f4 2018-07-16 stsp if (error != NULL)
2049 04ca23f4 2018-07-16 stsp goto done;
2050 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2051 04ca23f4 2018-07-16 stsp free(path);
2052 04ca23f4 2018-07-16 stsp path = in_repo_path;
2055 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2056 199a4027 2019-02-02 stsp if (error)
2057 199a4027 2019-02-02 stsp goto done;
2059 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2060 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
2062 04ca23f4 2018-07-16 stsp free(path);
2063 04ca23f4 2018-07-16 stsp free(repo_path);
2064 04ca23f4 2018-07-16 stsp free(cwd);
2066 cffc0aa4 2019-02-05 stsp if (worktree)
2067 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2068 ad242220 2018-09-08 stsp if (repo) {
2069 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2070 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2071 ad242220 2018-09-08 stsp if (error == NULL)
2072 ad242220 2018-09-08 stsp error = repo_error;
2074 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2075 8bf5b3c9 2018-03-17 stsp return error;
2078 4ed7e80c 2018-05-20 stsp __dead static void
2079 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2081 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2082 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2086 b72f483a 2019-02-05 stsp struct print_diff_arg {
2087 b72f483a 2019-02-05 stsp struct got_repository *repo;
2088 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2089 b72f483a 2019-02-05 stsp int diff_context;
2090 3fc0c068 2019-02-10 stsp const char *id_str;
2091 3fc0c068 2019-02-10 stsp int header_shown;
2092 98eaaa12 2019-08-03 stsp int diff_staged;
2093 63035f9f 2019-10-06 stsp int ignore_whitespace;
2096 4ed7e80c 2018-05-20 stsp static const struct got_error *
2097 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2098 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2099 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2100 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2102 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2103 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2104 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2105 12463d8b 2019-12-13 stsp int fd = -1;
2106 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2107 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2108 b72f483a 2019-02-05 stsp struct stat sb;
2110 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2111 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2112 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2113 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2114 98eaaa12 2019-08-03 stsp return NULL;
2116 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2117 98eaaa12 2019-08-03 stsp return NULL;
2118 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2119 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2120 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2121 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2122 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2123 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2124 98eaaa12 2019-08-03 stsp return NULL;
2127 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2128 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2129 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2130 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2131 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2134 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2135 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2136 98eaaa12 2019-08-03 stsp switch (staged_status) {
2137 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2138 98eaaa12 2019-08-03 stsp label1 = path;
2139 98eaaa12 2019-08-03 stsp label2 = path;
2141 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2142 98eaaa12 2019-08-03 stsp label2 = path;
2144 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2145 98eaaa12 2019-08-03 stsp label1 = path;
2148 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2150 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2151 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2152 63035f9f 2019-10-06 stsp a->repo, stdout);
2155 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2156 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2157 4ce46740 2019-08-08 stsp char *id_str;
2158 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2161 4ce46740 2019-08-08 stsp goto done;
2162 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2164 4ce46740 2019-08-08 stsp goto done;
2165 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2166 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2167 4ce46740 2019-08-08 stsp free(id_str);
2168 4ce46740 2019-08-08 stsp goto done;
2170 4ce46740 2019-08-08 stsp free(id_str);
2171 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2172 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2174 4ce46740 2019-08-08 stsp goto done;
2177 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2178 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2179 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2180 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2181 2ec1f75b 2019-03-26 stsp goto done;
2184 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2185 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2186 12463d8b 2019-12-13 stsp if (fd == -1) {
2187 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2188 12463d8b 2019-12-13 stsp goto done;
2191 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2192 12463d8b 2019-12-13 stsp if (fd == -1) {
2193 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2194 12463d8b 2019-12-13 stsp goto done;
2197 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2198 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2199 2ec1f75b 2019-03-26 stsp goto done;
2201 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2202 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2203 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2204 2ec1f75b 2019-03-26 stsp goto done;
2208 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2210 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2211 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2213 b72f483a 2019-02-05 stsp if (blob1)
2214 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2215 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2216 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2217 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2218 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2219 b72f483a 2019-02-05 stsp free(abspath);
2220 927df6b7 2019-02-10 stsp return err;
2223 927df6b7 2019-02-10 stsp static const struct got_error *
2224 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2225 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2226 01073a5d 2019-08-22 stsp struct got_repository *repo)
2228 0adb7196 2019-08-11 stsp const struct got_error *err;
2229 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2230 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2232 0adb7196 2019-08-11 stsp *id = NULL;
2233 0adb7196 2019-08-11 stsp *label = NULL;
2235 01073a5d 2019-08-22 stsp if (resolve_tags) {
2236 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2238 01073a5d 2019-08-22 stsp if (err == NULL) {
2239 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2240 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2241 01073a5d 2019-08-22 stsp if (*id == NULL)
2242 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2243 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2244 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2245 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2246 32f0ab81 2019-08-28 hiltjo free(*id);
2247 01073a5d 2019-08-22 stsp *id = NULL;
2249 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2250 01073a5d 2019-08-22 stsp return err;
2251 562580bc 2020-01-14 stsp } else if (err->code != GOT_ERR_OBJ_TYPE &&
2252 562580bc 2020-01-14 stsp err->code != GOT_ERR_NO_OBJ)
2253 01073a5d 2019-08-22 stsp return err;
2256 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2257 0adb7196 2019-08-11 stsp if (err) {
2258 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2259 0adb7196 2019-08-11 stsp return err;
2260 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2261 0adb7196 2019-08-11 stsp if (err != NULL)
2262 0adb7196 2019-08-11 stsp goto done;
2263 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2264 0adb7196 2019-08-11 stsp if (*label == NULL) {
2265 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2266 0adb7196 2019-08-11 stsp goto done;
2268 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2270 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2271 0adb7196 2019-08-11 stsp if (*label == NULL) {
2272 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2273 0adb7196 2019-08-11 stsp goto done;
2278 0adb7196 2019-08-11 stsp got_ref_close(ref);
2279 0adb7196 2019-08-11 stsp return err;
2283 0adb7196 2019-08-11 stsp static const struct got_error *
2284 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2286 b00d56cd 2018-04-01 stsp const struct got_error *error;
2287 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2288 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2289 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2290 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2291 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2292 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2293 15a94983 2018-12-23 stsp int type1, type2;
2294 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2295 c0cc5c62 2018-10-18 stsp const char *errstr;
2296 927df6b7 2019-02-10 stsp char *path = NULL;
2298 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2299 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2300 25eccc22 2019-01-04 stsp NULL) == -1)
2301 b00d56cd 2018-04-01 stsp err(1, "pledge");
2304 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2305 b00d56cd 2018-04-01 stsp switch (ch) {
2307 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2309 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2310 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2313 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2314 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2315 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2317 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2320 98eaaa12 2019-08-03 stsp diff_staged = 1;
2323 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2326 2deda0b9 2019-03-07 stsp usage_diff();
2327 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2331 b00d56cd 2018-04-01 stsp argc -= optind;
2332 b00d56cd 2018-04-01 stsp argv += optind;
2334 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2335 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2336 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2337 b72f483a 2019-02-05 stsp goto done;
2339 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2340 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2341 927df6b7 2019-02-10 stsp goto done;
2342 927df6b7 2019-02-10 stsp if (argc <= 1) {
2343 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2344 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2345 927df6b7 2019-02-10 stsp goto done;
2347 b72f483a 2019-02-05 stsp if (repo_path)
2349 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2350 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2351 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2352 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2353 927df6b7 2019-02-10 stsp goto done;
2355 927df6b7 2019-02-10 stsp if (argc == 1) {
2356 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2358 927df6b7 2019-02-10 stsp if (error)
2359 927df6b7 2019-02-10 stsp goto done;
2361 927df6b7 2019-02-10 stsp path = strdup("");
2362 927df6b7 2019-02-10 stsp if (path == NULL) {
2363 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2364 927df6b7 2019-02-10 stsp goto done;
2367 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2368 98eaaa12 2019-08-03 stsp if (diff_staged)
2369 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2370 98eaaa12 2019-08-03 stsp "objects in repository");
2371 15a94983 2018-12-23 stsp id_str1 = argv[0];
2372 15a94983 2018-12-23 stsp id_str2 = argv[1];
2373 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2374 30db809c 2019-06-05 stsp repo_path =
2375 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2376 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2377 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2378 30db809c 2019-06-05 stsp goto done;
2382 b00d56cd 2018-04-01 stsp usage_diff();
2384 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2385 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2386 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2387 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2390 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2391 76089277 2018-04-01 stsp free(repo_path);
2392 b00d56cd 2018-04-01 stsp if (error != NULL)
2393 b00d56cd 2018-04-01 stsp goto done;
2395 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2396 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2397 c02c541e 2019-03-29 stsp if (error)
2398 c02c541e 2019-03-29 stsp goto done;
2400 30db809c 2019-06-05 stsp if (argc <= 1) {
2401 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2402 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2403 b72f483a 2019-02-05 stsp char *id_str;
2405 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2407 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2408 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2409 b72f483a 2019-02-05 stsp if (error)
2410 b72f483a 2019-02-05 stsp goto done;
2411 b72f483a 2019-02-05 stsp arg.repo = repo;
2412 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2413 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2414 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2415 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2416 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2417 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2419 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2420 72ea6654 2019-07-27 stsp if (error)
2421 72ea6654 2019-07-27 stsp goto done;
2423 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2424 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2425 b72f483a 2019-02-05 stsp free(id_str);
2426 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2427 b72f483a 2019-02-05 stsp goto done;
2430 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2432 0adb7196 2019-08-11 stsp if (error)
2433 0adb7196 2019-08-11 stsp goto done;
2435 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2437 0adb7196 2019-08-11 stsp if (error)
2438 0adb7196 2019-08-11 stsp goto done;
2440 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2441 15a94983 2018-12-23 stsp if (error)
2442 15a94983 2018-12-23 stsp goto done;
2444 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2445 15a94983 2018-12-23 stsp if (error)
2446 15a94983 2018-12-23 stsp goto done;
2448 15a94983 2018-12-23 stsp if (type1 != type2) {
2449 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2450 b00d56cd 2018-04-01 stsp goto done;
2453 15a94983 2018-12-23 stsp switch (type1) {
2454 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2455 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2456 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2458 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2459 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2460 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2462 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2463 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2464 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2465 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2468 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2471 5e70831e 2019-05-28 stsp free(label1);
2472 5e70831e 2019-05-28 stsp free(label2);
2473 15a94983 2018-12-23 stsp free(id1);
2474 15a94983 2018-12-23 stsp free(id2);
2475 927df6b7 2019-02-10 stsp free(path);
2476 b72f483a 2019-02-05 stsp if (worktree)
2477 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2478 ad242220 2018-09-08 stsp if (repo) {
2479 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2480 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2481 ad242220 2018-09-08 stsp if (error == NULL)
2482 ad242220 2018-09-08 stsp error = repo_error;
2484 b00d56cd 2018-04-01 stsp return error;
2487 404c43c4 2018-06-21 stsp __dead static void
2488 404c43c4 2018-06-21 stsp usage_blame(void)
2490 9270e621 2019-02-05 stsp fprintf(stderr,
2491 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2492 404c43c4 2018-06-21 stsp getprogname());
2496 28315671 2019-08-14 stsp struct blame_line {
2497 28315671 2019-08-14 stsp int annotated;
2498 28315671 2019-08-14 stsp char *id_str;
2499 82f6abb8 2019-08-14 stsp char *committer;
2500 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2503 28315671 2019-08-14 stsp struct blame_cb_args {
2504 28315671 2019-08-14 stsp struct blame_line *lines;
2505 28315671 2019-08-14 stsp int nlines;
2506 7ef28ff8 2019-08-14 stsp int nlines_prec;
2507 28315671 2019-08-14 stsp int lineno_cur;
2508 28315671 2019-08-14 stsp off_t *line_offsets;
2510 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2513 404c43c4 2018-06-21 stsp static const struct got_error *
2514 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2516 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2517 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2518 28315671 2019-08-14 stsp struct blame_line *bline;
2519 82f6abb8 2019-08-14 stsp char *line = NULL;
2520 28315671 2019-08-14 stsp size_t linesize = 0;
2521 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2522 28315671 2019-08-14 stsp off_t offset;
2523 bcb49d15 2019-08-14 stsp struct tm tm;
2524 bcb49d15 2019-08-14 stsp time_t committer_time;
2526 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2527 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2528 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2530 28315671 2019-08-14 stsp if (sigint_received)
2531 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2533 2839f8b9 2019-08-18 stsp if (lineno == -1)
2534 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2536 28315671 2019-08-14 stsp /* Annotate this line. */
2537 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2538 28315671 2019-08-14 stsp if (bline->annotated)
2539 28315671 2019-08-14 stsp return NULL;
2540 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2542 28315671 2019-08-14 stsp return err;
2544 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2546 82f6abb8 2019-08-14 stsp goto done;
2548 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2549 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2550 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2551 bcb49d15 2019-08-14 stsp goto done;
2554 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2555 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2556 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2557 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2558 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2559 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2560 82f6abb8 2019-08-14 stsp goto done;
2562 28315671 2019-08-14 stsp bline->annotated = 1;
2564 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2565 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2566 28315671 2019-08-14 stsp if (!bline->annotated)
2567 82f6abb8 2019-08-14 stsp goto done;
2569 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2570 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2571 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2572 82f6abb8 2019-08-14 stsp goto done;
2575 28315671 2019-08-14 stsp while (bline->annotated) {
2576 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2577 82f6abb8 2019-08-14 stsp size_t len;
2579 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2580 28315671 2019-08-14 stsp if (ferror(a->f))
2581 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2585 82f6abb8 2019-08-14 stsp committer = bline->committer;
2586 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2587 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2588 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2589 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2591 82f6abb8 2019-08-14 stsp *at = '\0';
2592 82f6abb8 2019-08-14 stsp len = strlen(committer);
2593 82f6abb8 2019-08-14 stsp if (len >= 9)
2594 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2596 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2598 28315671 2019-08-14 stsp *nl = '\0';
2599 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2600 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2602 28315671 2019-08-14 stsp a->lineno_cur++;
2603 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2606 82f6abb8 2019-08-14 stsp if (commit)
2607 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2608 28315671 2019-08-14 stsp free(line);
2609 28315671 2019-08-14 stsp return err;
2612 28315671 2019-08-14 stsp static const struct got_error *
2613 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2615 404c43c4 2018-06-21 stsp const struct got_error *error;
2616 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2617 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2618 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2619 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2620 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2621 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2622 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2623 28315671 2019-08-14 stsp struct blame_cb_args bca;
2624 28315671 2019-08-14 stsp int ch, obj_type, i;
2625 b02560ec 2019-08-19 stsp size_t filesize;
2627 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2629 404c43c4 2018-06-21 stsp #ifndef PROFILE
2630 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2631 36e2fb66 2019-01-04 stsp NULL) == -1)
2632 404c43c4 2018-06-21 stsp err(1, "pledge");
2635 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2636 404c43c4 2018-06-21 stsp switch (ch) {
2638 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2641 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2642 66bea077 2018-08-02 stsp if (repo_path == NULL)
2643 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2645 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2648 2deda0b9 2019-03-07 stsp usage_blame();
2649 404c43c4 2018-06-21 stsp /* NOTREACHED */
2653 404c43c4 2018-06-21 stsp argc -= optind;
2654 404c43c4 2018-06-21 stsp argv += optind;
2656 a39318fd 2018-08-02 stsp if (argc == 1)
2657 404c43c4 2018-06-21 stsp path = argv[0];
2659 404c43c4 2018-06-21 stsp usage_blame();
2661 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2662 66bea077 2018-08-02 stsp if (cwd == NULL) {
2663 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2664 66bea077 2018-08-02 stsp goto done;
2666 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2667 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2668 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2669 66bea077 2018-08-02 stsp goto done;
2671 0c06baac 2019-02-05 stsp error = NULL;
2672 0c06baac 2019-02-05 stsp if (worktree) {
2673 0c06baac 2019-02-05 stsp repo_path =
2674 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2675 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2676 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2677 0c06baac 2019-02-05 stsp if (error)
2678 0c06baac 2019-02-05 stsp goto done;
2680 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2681 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2682 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2683 0c06baac 2019-02-05 stsp goto done;
2688 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2689 c02c541e 2019-03-29 stsp if (error != NULL)
2690 36e2fb66 2019-01-04 stsp goto done;
2692 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2693 c02c541e 2019-03-29 stsp if (error)
2694 404c43c4 2018-06-21 stsp goto done;
2696 0c06baac 2019-02-05 stsp if (worktree) {
2697 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2698 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2699 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2700 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2701 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2702 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2703 6efaaa2d 2019-02-05 stsp path) == -1) {
2704 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2705 0c06baac 2019-02-05 stsp goto done;
2707 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2710 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2712 0c06baac 2019-02-05 stsp if (error)
2713 66bea077 2018-08-02 stsp goto done;
2715 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2716 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2717 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2718 404c43c4 2018-06-21 stsp if (error != NULL)
2719 66bea077 2018-08-02 stsp goto done;
2720 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2721 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2722 404c43c4 2018-06-21 stsp if (error != NULL)
2723 66bea077 2018-08-02 stsp goto done;
2725 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2726 30837e32 2019-07-25 stsp if (error)
2727 66bea077 2018-08-02 stsp goto done;
2730 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2731 28315671 2019-08-14 stsp if (error)
2732 28315671 2019-08-14 stsp goto done;
2733 28315671 2019-08-14 stsp if (obj_id == NULL) {
2734 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2735 28315671 2019-08-14 stsp goto done;
2738 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2739 28315671 2019-08-14 stsp if (error)
2740 28315671 2019-08-14 stsp goto done;
2742 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2743 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2744 28315671 2019-08-14 stsp goto done;
2747 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2748 28315671 2019-08-14 stsp if (error)
2749 28315671 2019-08-14 stsp goto done;
2750 28315671 2019-08-14 stsp bca.f = got_opentemp();
2751 28315671 2019-08-14 stsp if (bca.f == NULL) {
2752 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2753 28315671 2019-08-14 stsp goto done;
2755 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2756 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2757 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2758 28315671 2019-08-14 stsp goto done;
2760 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2761 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2762 b02560ec 2019-08-19 stsp bca.nlines--;
2764 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2765 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2766 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2767 28315671 2019-08-14 stsp goto done;
2769 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2770 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2771 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2772 7ef28ff8 2019-08-14 stsp while (i > 0) {
2774 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2776 82f6abb8 2019-08-14 stsp bca.repo = repo;
2778 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2779 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2781 66bea077 2018-08-02 stsp free(in_repo_path);
2782 66bea077 2018-08-02 stsp free(repo_path);
2783 66bea077 2018-08-02 stsp free(cwd);
2784 404c43c4 2018-06-21 stsp free(commit_id);
2785 28315671 2019-08-14 stsp free(obj_id);
2787 28315671 2019-08-14 stsp got_object_blob_close(blob);
2788 0c06baac 2019-02-05 stsp if (worktree)
2789 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2790 ad242220 2018-09-08 stsp if (repo) {
2791 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2792 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2793 ad242220 2018-09-08 stsp if (error == NULL)
2794 ad242220 2018-09-08 stsp error = repo_error;
2796 3affba96 2019-09-22 stsp if (bca.lines) {
2797 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2798 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2799 3affba96 2019-09-22 stsp free(bline->id_str);
2800 3affba96 2019-09-22 stsp free(bline->committer);
2802 3affba96 2019-09-22 stsp free(bca.lines);
2804 28315671 2019-08-14 stsp free(bca.line_offsets);
2805 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2806 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2807 404c43c4 2018-06-21 stsp return error;
2810 5de5890b 2018-10-18 stsp __dead static void
2811 5de5890b 2018-10-18 stsp usage_tree(void)
2813 c1669e2e 2019-01-09 stsp fprintf(stderr,
2814 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2815 5de5890b 2018-10-18 stsp getprogname());
2819 c1669e2e 2019-01-09 stsp static void
2820 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2821 c1669e2e 2019-01-09 stsp const char *root_path)
2823 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2824 848d6979 2019-08-12 stsp const char *modestr = "";
2825 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2827 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2828 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2831 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2832 63c5ca5d 2019-08-24 stsp modestr = "$";
2833 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2834 848d6979 2019-08-12 stsp modestr = "@";
2835 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2836 848d6979 2019-08-12 stsp modestr = "/";
2837 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2838 848d6979 2019-08-12 stsp modestr = "*";
2840 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2841 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2844 5de5890b 2018-10-18 stsp static const struct got_error *
2845 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2846 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2847 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2849 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2850 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2851 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2852 56e0773d 2019-11-28 stsp int nentries, i;
2854 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2856 5de5890b 2018-10-18 stsp goto done;
2858 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2860 5de5890b 2018-10-18 stsp goto done;
2861 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2862 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2863 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2864 5de5890b 2018-10-18 stsp char *id = NULL;
2866 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2869 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2870 5de5890b 2018-10-18 stsp if (show_ids) {
2871 5de5890b 2018-10-18 stsp char *id_str;
2872 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2873 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2875 5de5890b 2018-10-18 stsp goto done;
2876 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2877 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2878 5de5890b 2018-10-18 stsp free(id_str);
2879 5de5890b 2018-10-18 stsp goto done;
2881 5de5890b 2018-10-18 stsp free(id_str);
2883 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2886 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2887 c1669e2e 2019-01-09 stsp char *child_path;
2888 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2889 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2890 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2891 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2892 c1669e2e 2019-01-09 stsp goto done;
2894 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2895 c1669e2e 2019-01-09 stsp root_path, repo);
2896 c1669e2e 2019-01-09 stsp free(child_path);
2898 c1669e2e 2019-01-09 stsp goto done;
2903 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2904 5de5890b 2018-10-18 stsp free(tree_id);
2905 5de5890b 2018-10-18 stsp return err;
2908 5de5890b 2018-10-18 stsp static const struct got_error *
2909 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2911 5de5890b 2018-10-18 stsp const struct got_error *error;
2912 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2913 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2914 7a2c19d6 2019-02-05 stsp const char *path;
2915 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2916 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2917 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2918 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2921 5de5890b 2018-10-18 stsp #ifndef PROFILE
2922 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2923 0f8d269b 2019-01-04 stsp NULL) == -1)
2924 5de5890b 2018-10-18 stsp err(1, "pledge");
2927 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2928 5de5890b 2018-10-18 stsp switch (ch) {
2930 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2933 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2934 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2935 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2937 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2940 5de5890b 2018-10-18 stsp show_ids = 1;
2943 c1669e2e 2019-01-09 stsp recurse = 1;
2946 2deda0b9 2019-03-07 stsp usage_tree();
2947 5de5890b 2018-10-18 stsp /* NOTREACHED */
2951 5de5890b 2018-10-18 stsp argc -= optind;
2952 5de5890b 2018-10-18 stsp argv += optind;
2954 5de5890b 2018-10-18 stsp if (argc == 1)
2955 5de5890b 2018-10-18 stsp path = argv[0];
2956 5de5890b 2018-10-18 stsp else if (argc > 1)
2957 5de5890b 2018-10-18 stsp usage_tree();
2959 7a2c19d6 2019-02-05 stsp path = NULL;
2961 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2962 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2963 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2964 9bf7a39b 2019-02-05 stsp goto done;
2966 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2967 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2968 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2969 7a2c19d6 2019-02-05 stsp goto done;
2971 7a2c19d6 2019-02-05 stsp error = NULL;
2972 7a2c19d6 2019-02-05 stsp if (worktree) {
2973 7a2c19d6 2019-02-05 stsp repo_path =
2974 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2975 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2976 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2977 7a2c19d6 2019-02-05 stsp if (error)
2978 7a2c19d6 2019-02-05 stsp goto done;
2980 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2981 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2982 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2983 7a2c19d6 2019-02-05 stsp goto done;
2988 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2989 5de5890b 2018-10-18 stsp if (error != NULL)
2990 c02c541e 2019-03-29 stsp goto done;
2992 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2993 c02c541e 2019-03-29 stsp if (error)
2994 5de5890b 2018-10-18 stsp goto done;
2996 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2997 9bf7a39b 2019-02-05 stsp if (worktree) {
2998 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2999 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3000 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
3001 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
3002 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
3003 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3004 9bf7a39b 2019-02-05 stsp goto done;
3006 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
3008 9bf7a39b 2019-02-05 stsp if (error)
3009 9bf7a39b 2019-02-05 stsp goto done;
3011 9bf7a39b 2019-02-05 stsp path = "/";
3013 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3014 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3015 9bf7a39b 2019-02-05 stsp if (error != NULL)
3016 9bf7a39b 2019-02-05 stsp goto done;
3019 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3020 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3021 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3022 5de5890b 2018-10-18 stsp if (error != NULL)
3023 5de5890b 2018-10-18 stsp goto done;
3024 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3025 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3026 5de5890b 2018-10-18 stsp if (error != NULL)
3027 5de5890b 2018-10-18 stsp goto done;
3029 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
3030 30837e32 2019-07-25 stsp if (error)
3031 5de5890b 2018-10-18 stsp goto done;
3034 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3035 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3037 5de5890b 2018-10-18 stsp free(in_repo_path);
3038 5de5890b 2018-10-18 stsp free(repo_path);
3039 5de5890b 2018-10-18 stsp free(cwd);
3040 5de5890b 2018-10-18 stsp free(commit_id);
3041 7a2c19d6 2019-02-05 stsp if (worktree)
3042 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3043 5de5890b 2018-10-18 stsp if (repo) {
3044 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3045 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3046 5de5890b 2018-10-18 stsp if (error == NULL)
3047 5de5890b 2018-10-18 stsp error = repo_error;
3049 5de5890b 2018-10-18 stsp return error;
3052 6bad629b 2019-02-04 stsp __dead static void
3053 6bad629b 2019-02-04 stsp usage_status(void)
3055 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3059 b72f483a 2019-02-05 stsp static const struct got_error *
3060 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3061 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3062 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3063 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3065 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3066 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3067 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3068 b72f483a 2019-02-05 stsp return NULL;
3071 6bad629b 2019-02-04 stsp static const struct got_error *
3072 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3074 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3075 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3076 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3077 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3078 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3079 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3082 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3084 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3085 6bad629b 2019-02-04 stsp switch (ch) {
3087 2deda0b9 2019-03-07 stsp usage_status();
3088 6bad629b 2019-02-04 stsp /* NOTREACHED */
3092 6bad629b 2019-02-04 stsp argc -= optind;
3093 6bad629b 2019-02-04 stsp argv += optind;
3095 6bad629b 2019-02-04 stsp #ifndef PROFILE
3096 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3097 6bad629b 2019-02-04 stsp NULL) == -1)
3098 6bad629b 2019-02-04 stsp err(1, "pledge");
3100 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3101 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3102 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3103 927df6b7 2019-02-10 stsp goto done;
3106 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3107 927df6b7 2019-02-10 stsp if (error != NULL)
3108 a5edda0a 2019-07-27 stsp goto done;
3110 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3112 6bad629b 2019-02-04 stsp if (error != NULL)
3113 6bad629b 2019-02-04 stsp goto done;
3115 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3116 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3117 087fb88c 2019-08-04 stsp if (error)
3118 087fb88c 2019-08-04 stsp goto done;
3120 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3121 6bad629b 2019-02-04 stsp if (error)
3122 6bad629b 2019-02-04 stsp goto done;
3124 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3125 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3127 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3128 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3129 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3130 927df6b7 2019-02-10 stsp free(cwd);
3131 d0eebce4 2019-03-11 stsp return error;
3134 d0eebce4 2019-03-11 stsp __dead static void
3135 d0eebce4 2019-03-11 stsp usage_ref(void)
3137 d0eebce4 2019-03-11 stsp fprintf(stderr,
3138 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3139 d0eebce4 2019-03-11 stsp getprogname());
3143 d0eebce4 2019-03-11 stsp static const struct got_error *
3144 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3146 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3147 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3148 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3150 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3151 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3153 d0eebce4 2019-03-11 stsp return err;
3155 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3156 d0eebce4 2019-03-11 stsp char *refstr;
3157 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3158 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3159 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3160 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3161 d0eebce4 2019-03-11 stsp free(refstr);
3164 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3165 d0eebce4 2019-03-11 stsp return NULL;
3168 d0eebce4 2019-03-11 stsp static const struct got_error *
3169 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3171 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3172 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3174 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3176 d0eebce4 2019-03-11 stsp return err;
3178 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3179 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3180 d0eebce4 2019-03-11 stsp return err;
3183 d0eebce4 2019-03-11 stsp static const struct got_error *
3184 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3186 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3187 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3188 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3191 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3192 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3193 d1644381 2019-07-14 stsp * an unintended typo.
3195 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3196 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3198 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3200 d83d9d5c 2019-05-13 stsp if (err) {
3201 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3203 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3204 d83d9d5c 2019-05-13 stsp return err;
3205 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3207 d83d9d5c 2019-05-13 stsp return err;
3208 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3209 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3211 d83d9d5c 2019-05-13 stsp return err;
3214 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3216 d0eebce4 2019-03-11 stsp goto done;
3218 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3221 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3223 d1c1ae5f 2019-08-12 stsp return err;
3226 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3227 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3229 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3230 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3231 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3234 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3235 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3236 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3238 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3239 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3241 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3243 d1c1ae5f 2019-08-12 stsp return err;
3245 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3247 d1c1ae5f 2019-08-12 stsp goto done;
3249 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3251 d1c1ae5f 2019-08-12 stsp if (target_ref)
3252 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3254 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3255 d0eebce4 2019-03-11 stsp return err;
3258 d0eebce4 2019-03-11 stsp static const struct got_error *
3259 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3261 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3262 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3263 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3264 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3265 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3266 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3268 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3269 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3270 d0eebce4 2019-03-11 stsp switch (ch) {
3272 d0eebce4 2019-03-11 stsp delref = optarg;
3275 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3276 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3277 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3279 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3282 d0eebce4 2019-03-11 stsp do_list = 1;
3285 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3288 d0eebce4 2019-03-11 stsp usage_ref();
3289 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3293 d0eebce4 2019-03-11 stsp if (do_list && delref)
3294 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3296 d0eebce4 2019-03-11 stsp argc -= optind;
3297 d0eebce4 2019-03-11 stsp argv += optind;
3299 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3300 d1c1ae5f 2019-08-12 stsp if (create_symref)
3301 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3302 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3303 d0eebce4 2019-03-11 stsp if (argc > 0)
3304 d0eebce4 2019-03-11 stsp usage_ref();
3305 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3306 d0eebce4 2019-03-11 stsp usage_ref();
3308 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3309 e0b57350 2019-03-12 stsp if (do_list) {
3310 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3311 e0b57350 2019-03-12 stsp NULL) == -1)
3312 e0b57350 2019-03-12 stsp err(1, "pledge");
3314 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3315 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3316 e0b57350 2019-03-12 stsp err(1, "pledge");
3319 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3320 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3321 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3322 d0eebce4 2019-03-11 stsp goto done;
3325 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3326 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3327 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3328 d0eebce4 2019-03-11 stsp goto done;
3330 d0eebce4 2019-03-11 stsp error = NULL;
3331 d0eebce4 2019-03-11 stsp if (worktree) {
3332 d0eebce4 2019-03-11 stsp repo_path =
3333 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3334 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3335 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3336 d0eebce4 2019-03-11 stsp if (error)
3337 d0eebce4 2019-03-11 stsp goto done;
3339 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3340 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3341 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3342 d0eebce4 2019-03-11 stsp goto done;
3347 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3348 d0eebce4 2019-03-11 stsp if (error != NULL)
3349 d0eebce4 2019-03-11 stsp goto done;
3351 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3352 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3353 c02c541e 2019-03-29 stsp if (error)
3354 c02c541e 2019-03-29 stsp goto done;
3356 d0eebce4 2019-03-11 stsp if (do_list)
3357 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3358 d0eebce4 2019-03-11 stsp else if (delref)
3359 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3360 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3361 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3363 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3366 4e759de4 2019-06-26 stsp got_repo_close(repo);
3367 4e759de4 2019-06-26 stsp if (worktree)
3368 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3369 4e759de4 2019-06-26 stsp free(cwd);
3370 4e759de4 2019-06-26 stsp free(repo_path);
3371 4e759de4 2019-06-26 stsp return error;
3374 4e759de4 2019-06-26 stsp __dead static void
3375 4e759de4 2019-06-26 stsp usage_branch(void)
3377 4e759de4 2019-06-26 stsp fprintf(stderr,
3378 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3379 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3383 4e759de4 2019-06-26 stsp static const struct got_error *
3384 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3385 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3387 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3388 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3389 4e99b47e 2019-10-04 stsp char *refstr;
3391 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3392 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3393 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3394 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3396 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3398 4e99b47e 2019-10-04 stsp return err;
3399 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3400 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3401 4e99b47e 2019-10-04 stsp marker = "* ";
3403 4e99b47e 2019-10-04 stsp marker = "~ ";
3407 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3408 4e99b47e 2019-10-04 stsp refname += 11;
3409 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3410 4e99b47e 2019-10-04 stsp refname += 18;
3412 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3413 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3414 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3416 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3417 4e99b47e 2019-10-04 stsp free(refstr);
3418 4e99b47e 2019-10-04 stsp return NULL;
3421 4e99b47e 2019-10-04 stsp static const struct got_error *
3422 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3424 ad89fa31 2019-10-04 stsp const char *refname;
3426 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3427 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3429 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3431 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3432 ad89fa31 2019-10-04 stsp refname += 11;
3433 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3434 ad89fa31 2019-10-04 stsp refname += 18;
3436 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3438 ad89fa31 2019-10-04 stsp return NULL;
3441 ad89fa31 2019-10-04 stsp static const struct got_error *
3442 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3444 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3445 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3446 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3447 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3448 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3450 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3452 4e99b47e 2019-10-04 stsp if (worktree) {
3453 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3454 4e99b47e 2019-10-04 stsp worktree);
3456 4e99b47e 2019-10-04 stsp return err;
3458 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3459 4e99b47e 2019-10-04 stsp worktree);
3461 4e99b47e 2019-10-04 stsp return err;
3463 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3464 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3465 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3467 4e99b47e 2019-10-04 stsp return err;
3468 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3469 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3473 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3474 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3476 4e759de4 2019-06-26 stsp return err;
3478 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3479 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3481 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3482 4e759de4 2019-06-26 stsp return NULL;
3485 4e759de4 2019-06-26 stsp static const struct got_error *
3486 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3487 45cd4e47 2019-08-25 stsp const char *branch_name)
3489 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3490 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3491 4e759de4 2019-06-26 stsp char *refname;
3493 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3494 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3496 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3498 4e759de4 2019-06-26 stsp goto done;
3500 45cd4e47 2019-08-25 stsp if (worktree &&
3501 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3502 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3503 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3504 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3505 45cd4e47 2019-08-25 stsp goto done;
3508 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3511 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3512 4e759de4 2019-06-26 stsp free(refname);
3513 4e759de4 2019-06-26 stsp return err;
3516 4e759de4 2019-06-26 stsp static const struct got_error *
3517 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3518 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3520 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3521 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3522 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3525 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3526 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3527 d3f84d51 2019-07-11 stsp * an unintended typo.
3529 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3530 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3532 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3533 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3534 4e759de4 2019-06-26 stsp goto done;
3537 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3538 4e759de4 2019-06-26 stsp if (err == NULL) {
3539 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3540 4e759de4 2019-06-26 stsp goto done;
3541 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3542 4e759de4 2019-06-26 stsp goto done;
3544 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3546 4e759de4 2019-06-26 stsp goto done;
3548 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3551 4e759de4 2019-06-26 stsp got_ref_close(ref);
3552 4e759de4 2019-06-26 stsp free(base_refname);
3553 4e759de4 2019-06-26 stsp free(refname);
3554 4e759de4 2019-06-26 stsp return err;
3557 4e759de4 2019-06-26 stsp static const struct got_error *
3558 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3560 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3561 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3562 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3563 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3564 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3565 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3567 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3568 4e759de4 2019-06-26 stsp switch (ch) {
3570 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3573 4e759de4 2019-06-26 stsp delref = optarg;
3576 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3577 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3578 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3580 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3583 4e759de4 2019-06-26 stsp do_list = 1;
3586 4e759de4 2019-06-26 stsp usage_branch();
3587 4e759de4 2019-06-26 stsp /* NOTREACHED */
3591 4e759de4 2019-06-26 stsp if (do_list && delref)
3592 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3594 4e759de4 2019-06-26 stsp argc -= optind;
3595 4e759de4 2019-06-26 stsp argv += optind;
3597 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3598 ad89fa31 2019-10-04 stsp do_show = 1;
3600 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3601 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3603 4e759de4 2019-06-26 stsp if (do_list || delref) {
3604 4e759de4 2019-06-26 stsp if (argc > 0)
3605 4e759de4 2019-06-26 stsp usage_branch();
3606 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3607 4e759de4 2019-06-26 stsp usage_branch();
3609 4e759de4 2019-06-26 stsp #ifndef PROFILE
3610 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3611 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3612 4e759de4 2019-06-26 stsp NULL) == -1)
3613 4e759de4 2019-06-26 stsp err(1, "pledge");
3615 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3616 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3617 4e759de4 2019-06-26 stsp err(1, "pledge");
3620 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3621 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3622 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3623 4e759de4 2019-06-26 stsp goto done;
3626 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3627 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3628 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3629 4e759de4 2019-06-26 stsp goto done;
3631 4e759de4 2019-06-26 stsp error = NULL;
3632 4e759de4 2019-06-26 stsp if (worktree) {
3633 4e759de4 2019-06-26 stsp repo_path =
3634 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3635 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3636 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3637 4e759de4 2019-06-26 stsp if (error)
3638 4e759de4 2019-06-26 stsp goto done;
3640 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3641 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3642 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3643 4e759de4 2019-06-26 stsp goto done;
3648 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3649 4e759de4 2019-06-26 stsp if (error != NULL)
3650 4e759de4 2019-06-26 stsp goto done;
3652 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3653 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3654 4e759de4 2019-06-26 stsp if (error)
3655 4e759de4 2019-06-26 stsp goto done;
3657 ad89fa31 2019-10-04 stsp if (do_show)
3658 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3659 ad89fa31 2019-10-04 stsp else if (do_list)
3660 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3661 4e759de4 2019-06-26 stsp else if (delref)
3662 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3664 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3665 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3666 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3667 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3668 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3669 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3670 a74f7e83 2019-11-10 stsp if (error)
3671 a74f7e83 2019-11-10 stsp goto done;
3672 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3673 a74f7e83 2019-11-10 stsp free(commit_id);
3677 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3678 d0eebce4 2019-03-11 stsp if (worktree)
3679 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3680 d0eebce4 2019-03-11 stsp free(cwd);
3681 d0eebce4 2019-03-11 stsp free(repo_path);
3682 d00136be 2019-03-26 stsp return error;
3686 d00136be 2019-03-26 stsp __dead static void
3687 8e7bd50a 2019-08-22 stsp usage_tag(void)
3689 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3690 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3691 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3696 b8bad2ba 2019-08-23 stsp static const struct got_error *
3697 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3699 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3700 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3701 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3702 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3703 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3705 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3706 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3707 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3708 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3710 b8bad2ba 2019-08-23 stsp return err;
3711 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3714 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3717 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3718 b8bad2ba 2019-08-23 stsp free(re_id);
3721 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3722 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3725 b8bad2ba 2019-08-23 stsp while (se) {
3726 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3729 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3730 b8bad2ba 2019-08-23 stsp free(se_id);
3733 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3734 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3736 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3737 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3739 b8bad2ba 2019-08-23 stsp return err;
3740 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3743 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3748 b8bad2ba 2019-08-23 stsp return err;
3752 8e7bd50a 2019-08-22 stsp static const struct got_error *
3753 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3754 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3756 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3757 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3758 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3759 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3760 d4efa91b 2020-01-14 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3761 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3765 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3767 b8bad2ba 2019-08-23 stsp return err;
3768 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3769 d4efa91b 2020-01-14 stsp if (err) {
3770 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE)
3771 d4efa91b 2020-01-14 stsp goto done;
3772 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
3773 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit1, repo, id1);
3775 d4efa91b 2020-01-14 stsp goto done;
3776 d4efa91b 2020-01-14 stsp time1 = got_object_commit_get_committer_time(commit1);
3778 d4efa91b 2020-01-14 stsp time1 = got_object_tag_get_tagger_time(tag1);
3780 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3782 b8bad2ba 2019-08-23 stsp goto done;
3783 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3784 d4efa91b 2020-01-14 stsp if (err) {
3785 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE)
3786 d4efa91b 2020-01-14 stsp goto done;
3787 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
3788 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit2, repo, id2);
3790 d4efa91b 2020-01-14 stsp goto done;
3791 d4efa91b 2020-01-14 stsp time2 = got_object_commit_get_committer_time(commit2);
3793 d4efa91b 2020-01-14 stsp time2 = got_object_tag_get_tagger_time(tag2);
3795 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3796 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3798 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3799 b8bad2ba 2019-08-23 stsp *cmp = -1;
3801 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3803 b8bad2ba 2019-08-23 stsp free(id1);
3804 b8bad2ba 2019-08-23 stsp free(id2);
3806 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3808 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3809 d4efa91b 2020-01-14 stsp if (commit1)
3810 d4efa91b 2020-01-14 stsp got_object_commit_close(commit1);
3811 d4efa91b 2020-01-14 stsp if (commit2)
3812 d4efa91b 2020-01-14 stsp got_object_commit_close(commit2);
3813 b8bad2ba 2019-08-23 stsp return err;
3816 b8bad2ba 2019-08-23 stsp static const struct got_error *
3817 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3819 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3820 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3821 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3823 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3825 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3827 8e7bd50a 2019-08-22 stsp return err;
3829 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3830 8e7bd50a 2019-08-22 stsp const char *refname;
3831 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3832 8e7bd50a 2019-08-22 stsp char datebuf[26];
3833 d4efa91b 2020-01-14 stsp const char *tagger;
3834 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3835 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3836 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3837 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
3839 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3840 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3842 8e7bd50a 2019-08-22 stsp refname += 10;
3843 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3844 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3845 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3848 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3849 8e7bd50a 2019-08-22 stsp free(refstr);
3851 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3854 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3855 d4efa91b 2020-01-14 stsp if (err) {
3856 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3860 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
3861 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
3862 d4efa91b 2020-01-14 stsp if (err) {
3866 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
3867 d4efa91b 2020-01-14 stsp tagger_time =
3868 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
3869 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
3875 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
3876 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3877 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
3878 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
3882 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
3883 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3884 2417344c 2019-08-23 stsp if (datestr)
3885 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3886 d4efa91b 2020-01-14 stsp if (commit)
3887 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3889 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
3890 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
3891 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
3894 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
3895 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
3898 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
3899 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
3902 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
3903 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
3910 8e7bd50a 2019-08-22 stsp free(id_str);
3911 d4efa91b 2020-01-14 stsp if (commit) {
3912 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
3915 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
3917 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3918 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
3919 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
3920 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
3925 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3927 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3929 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3930 8e7bd50a 2019-08-22 stsp } while (line);
3931 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3934 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3935 8e7bd50a 2019-08-22 stsp return NULL;
3938 8e7bd50a 2019-08-22 stsp static const struct got_error *
3939 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3940 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3942 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3943 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3944 f372d5cd 2019-10-21 stsp char *editor = NULL;
3945 8e7bd50a 2019-08-22 stsp int fd = -1;
3947 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3948 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3949 8e7bd50a 2019-08-22 stsp goto done;
3952 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3953 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3954 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3955 8e7bd50a 2019-08-22 stsp goto done;
3958 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3960 8e7bd50a 2019-08-22 stsp goto done;
3962 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3963 8e7bd50a 2019-08-22 stsp close(fd);
3965 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3967 8e7bd50a 2019-08-22 stsp goto done;
3968 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3970 8e7bd50a 2019-08-22 stsp free(initial_content);
3971 8e7bd50a 2019-08-22 stsp free(template);
3972 8e7bd50a 2019-08-22 stsp free(editor);
3974 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3975 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3976 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3977 8e7bd50a 2019-08-22 stsp if (err) {
3978 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3979 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3982 8e7bd50a 2019-08-22 stsp return err;
3985 8e7bd50a 2019-08-22 stsp static const struct got_error *
3986 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3987 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3989 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3990 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3991 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3992 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3993 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3994 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3995 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3998 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3999 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
4000 8e7bd50a 2019-08-22 stsp * an unintended typo.
4002 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
4003 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
4005 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
4007 8e7bd50a 2019-08-22 stsp return err;
4009 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
4010 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
4012 8e7bd50a 2019-08-22 stsp goto done;
4014 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
4016 8e7bd50a 2019-08-22 stsp goto done;
4018 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
4019 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
4020 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
4021 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
4022 8e7bd50a 2019-08-22 stsp goto done;
4024 8e7bd50a 2019-08-22 stsp tag_name += 10;
4025 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
4026 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4027 8e7bd50a 2019-08-22 stsp goto done;
4030 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
4031 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4032 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
4033 8e7bd50a 2019-08-22 stsp goto done;
4034 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
4035 8e7bd50a 2019-08-22 stsp goto done;
4037 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
4038 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
4039 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
4040 f372d5cd 2019-10-21 stsp if (err) {
4041 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4042 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
4043 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4044 8e7bd50a 2019-08-22 stsp goto done;
4048 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
4049 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
4050 f372d5cd 2019-10-21 stsp if (err) {
4051 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4052 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4053 8e7bd50a 2019-08-22 stsp goto done;
4056 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
4057 f372d5cd 2019-10-21 stsp if (err) {
4058 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4059 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4060 8e7bd50a 2019-08-22 stsp goto done;
4063 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
4064 f372d5cd 2019-10-21 stsp if (err) {
4065 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4066 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4067 f372d5cd 2019-10-21 stsp goto done;
4070 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
4071 f372d5cd 2019-10-21 stsp if (err) {
4072 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4073 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4074 f372d5cd 2019-10-21 stsp goto done;
4076 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4078 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4079 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4080 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4081 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4082 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4083 f372d5cd 2019-10-21 stsp free(tag_id_str);
4085 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4086 8e7bd50a 2019-08-22 stsp free(commit_id);
4087 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4088 8e7bd50a 2019-08-22 stsp free(refname);
4089 8e7bd50a 2019-08-22 stsp free(tagmsg);
4090 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4091 aba9c984 2019-09-08 stsp free(tagger);
4092 8e7bd50a 2019-08-22 stsp return err;
4095 8e7bd50a 2019-08-22 stsp static const struct got_error *
4096 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4098 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4099 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4100 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4101 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4102 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4103 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4104 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4106 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4107 8e7bd50a 2019-08-22 stsp switch (ch) {
4109 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4112 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4113 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4114 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4116 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4119 8e7bd50a 2019-08-22 stsp do_list = 1;
4122 8e7bd50a 2019-08-22 stsp usage_tag();
4123 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4127 8e7bd50a 2019-08-22 stsp argc -= optind;
4128 8e7bd50a 2019-08-22 stsp argv += optind;
4130 8e7bd50a 2019-08-22 stsp if (do_list) {
4131 8e7bd50a 2019-08-22 stsp if (tagmsg)
4132 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
4133 8e7bd50a 2019-08-22 stsp if (argc > 0)
4134 8e7bd50a 2019-08-22 stsp usage_tag();
4135 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
4136 8e7bd50a 2019-08-22 stsp usage_tag();
4137 a2887370 2019-08-23 stsp else if (argc > 1)
4138 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
4139 a2887370 2019-08-23 stsp tag_name = argv[0];
4141 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4142 8e7bd50a 2019-08-22 stsp if (do_list) {
4143 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4144 8e7bd50a 2019-08-22 stsp NULL) == -1)
4145 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4147 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4148 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4149 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4152 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4153 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4154 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4155 8e7bd50a 2019-08-22 stsp goto done;
4158 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4159 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4160 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4161 8e7bd50a 2019-08-22 stsp goto done;
4163 8e7bd50a 2019-08-22 stsp error = NULL;
4164 8e7bd50a 2019-08-22 stsp if (worktree) {
4165 8e7bd50a 2019-08-22 stsp repo_path =
4166 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4167 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4168 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4169 8e7bd50a 2019-08-22 stsp if (error)
4170 8e7bd50a 2019-08-22 stsp goto done;
4172 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4173 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4174 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4175 8e7bd50a 2019-08-22 stsp goto done;
4180 8e7bd50a 2019-08-22 stsp if (do_list) {
4181 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4182 c9956ddf 2019-09-08 stsp if (error != NULL)
4183 c9956ddf 2019-09-08 stsp goto done;
4184 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4185 8e7bd50a 2019-08-22 stsp if (error)
4186 8e7bd50a 2019-08-22 stsp goto done;
4187 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4189 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4190 c9956ddf 2019-09-08 stsp if (error)
4191 c9956ddf 2019-09-08 stsp goto done;
4192 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4193 c9956ddf 2019-09-08 stsp if (error != NULL)
4194 c9956ddf 2019-09-08 stsp goto done;
4196 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4197 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4198 8e7bd50a 2019-08-22 stsp if (error)
4199 8e7bd50a 2019-08-22 stsp goto done;
4202 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4203 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4204 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4205 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4206 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4207 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4208 8e7bd50a 2019-08-22 stsp if (error)
4209 8e7bd50a 2019-08-22 stsp goto done;
4210 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4211 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4212 8e7bd50a 2019-08-22 stsp if (error)
4213 8e7bd50a 2019-08-22 stsp goto done;
4214 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4215 8e7bd50a 2019-08-22 stsp free(commit_id);
4216 8e7bd50a 2019-08-22 stsp if (error)
4217 8e7bd50a 2019-08-22 stsp goto done;
4220 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4221 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4225 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4226 8e7bd50a 2019-08-22 stsp if (worktree)
4227 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4228 8e7bd50a 2019-08-22 stsp free(cwd);
4229 8e7bd50a 2019-08-22 stsp free(repo_path);
4230 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4231 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4232 8e7bd50a 2019-08-22 stsp return error;
4235 8e7bd50a 2019-08-22 stsp __dead static void
4236 d00136be 2019-03-26 stsp usage_add(void)
4238 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4239 022fae89 2019-12-06 tracey getprogname());
4243 d00136be 2019-03-26 stsp static const struct got_error *
4244 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4246 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4248 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4249 4e68cba3 2019-11-23 stsp return NULL;
4252 4e68cba3 2019-11-23 stsp static const struct got_error *
4253 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4255 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4256 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4257 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4258 1dd54920 2019-05-11 stsp char *cwd = NULL;
4259 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4260 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4261 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4263 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4265 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4266 d00136be 2019-03-26 stsp switch (ch) {
4267 022fae89 2019-12-06 tracey case 'I':
4268 022fae89 2019-12-06 tracey no_ignores = 1;
4271 4e68cba3 2019-11-23 stsp can_recurse = 1;
4274 d00136be 2019-03-26 stsp usage_add();
4275 d00136be 2019-03-26 stsp /* NOTREACHED */
4279 d00136be 2019-03-26 stsp argc -= optind;
4280 d00136be 2019-03-26 stsp argv += optind;
4282 43012d58 2019-07-14 stsp #ifndef PROFILE
4283 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4284 43012d58 2019-07-14 stsp NULL) == -1)
4285 43012d58 2019-07-14 stsp err(1, "pledge");
4287 723c305c 2019-05-11 jcs if (argc < 1)
4288 d00136be 2019-03-26 stsp usage_add();
4290 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4291 d00136be 2019-03-26 stsp if (cwd == NULL) {
4292 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4293 d00136be 2019-03-26 stsp goto done;
4296 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4297 d00136be 2019-03-26 stsp if (error)
4298 d00136be 2019-03-26 stsp goto done;
4300 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4302 031a5338 2019-03-26 stsp if (error != NULL)
4303 031a5338 2019-03-26 stsp goto done;
4305 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4306 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4307 d00136be 2019-03-26 stsp if (error)
4308 d00136be 2019-03-26 stsp goto done;
4310 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4311 6d022e97 2019-08-04 stsp if (error)
4312 022fae89 2019-12-06 tracey goto done;
4314 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4315 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4316 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4317 6d022e97 2019-08-04 stsp goto done;
4321 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4322 4e68cba3 2019-11-23 stsp char *ondisk_path;
4323 4e68cba3 2019-11-23 stsp struct stat sb;
4324 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4325 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4326 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4327 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4328 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4329 4e68cba3 2019-11-23 stsp goto done;
4331 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4332 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4333 4e68cba3 2019-11-23 stsp free(ondisk_path);
4336 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4337 4e68cba3 2019-11-23 stsp ondisk_path);
4338 4e68cba3 2019-11-23 stsp free(ondisk_path);
4339 4e68cba3 2019-11-23 stsp goto done;
4341 4e68cba3 2019-11-23 stsp free(ondisk_path);
4342 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4343 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4344 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4345 4e68cba3 2019-11-23 stsp goto done;
4350 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4351 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4354 031a5338 2019-03-26 stsp got_repo_close(repo);
4355 d00136be 2019-03-26 stsp if (worktree)
4356 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4357 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4358 1dd54920 2019-05-11 stsp free((char *)pe->path);
4359 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4360 2ec1f75b 2019-03-26 stsp free(cwd);
4361 2ec1f75b 2019-03-26 stsp return error;
4364 2ec1f75b 2019-03-26 stsp __dead static void
4365 648e4ef7 2019-07-09 stsp usage_remove(void)
4367 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4368 f2a9dc41 2019-12-13 tracey getprogname());
4372 2a06fe5f 2019-08-24 stsp static const struct got_error *
4373 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4374 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4376 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4378 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4379 2a06fe5f 2019-08-24 stsp return NULL;
4380 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4381 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4382 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4383 2a06fe5f 2019-08-24 stsp return NULL;
4386 2ec1f75b 2019-03-26 stsp static const struct got_error *
4387 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4389 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4390 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4391 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4392 17ed4618 2019-06-02 stsp char *cwd = NULL;
4393 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4394 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4395 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4397 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4399 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4400 2ec1f75b 2019-03-26 stsp switch (ch) {
4402 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4404 70e3e7f5 2019-12-13 tracey case 'k':
4405 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4407 f2a9dc41 2019-12-13 tracey case 'R':
4408 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4411 f2a9dc41 2019-12-13 tracey usage_remove();
4412 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4416 2ec1f75b 2019-03-26 stsp argc -= optind;
4417 2ec1f75b 2019-03-26 stsp argv += optind;
4419 43012d58 2019-07-14 stsp #ifndef PROFILE
4420 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4421 43012d58 2019-07-14 stsp NULL) == -1)
4422 43012d58 2019-07-14 stsp err(1, "pledge");
4424 17ed4618 2019-06-02 stsp if (argc < 1)
4425 648e4ef7 2019-07-09 stsp usage_remove();
4427 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4428 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4429 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4430 2ec1f75b 2019-03-26 stsp goto done;
4432 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4433 2ec1f75b 2019-03-26 stsp if (error)
4434 2ec1f75b 2019-03-26 stsp goto done;
4436 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4439 2ec1f75b 2019-03-26 stsp goto done;
4441 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4442 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4443 2ec1f75b 2019-03-26 stsp if (error)
4444 2ec1f75b 2019-03-26 stsp goto done;
4446 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4447 6d022e97 2019-08-04 stsp if (error)
4448 6d022e97 2019-08-04 stsp goto done;
4450 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4451 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4452 f2a9dc41 2019-12-13 tracey struct stat sb;
4453 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4454 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4455 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4456 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4457 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4458 f2a9dc41 2019-12-13 tracey goto done;
4460 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4461 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4462 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4463 f2a9dc41 2019-12-13 tracey continue;
4465 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4466 f2a9dc41 2019-12-13 tracey ondisk_path);
4467 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4468 f2a9dc41 2019-12-13 tracey goto done;
4470 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4471 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4472 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4473 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4474 f2a9dc41 2019-12-13 tracey goto done;
4479 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4480 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4483 a129376b 2019-03-28 stsp got_repo_close(repo);
4484 a129376b 2019-03-28 stsp if (worktree)
4485 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4486 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4487 17ed4618 2019-06-02 stsp free((char *)pe->path);
4488 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4489 a129376b 2019-03-28 stsp free(cwd);
4490 a129376b 2019-03-28 stsp return error;
4493 a129376b 2019-03-28 stsp __dead static void
4494 a129376b 2019-03-28 stsp usage_revert(void)
4496 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4497 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4501 1ee397ad 2019-07-12 stsp static const struct got_error *
4502 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4504 a129376b 2019-03-28 stsp while (path[0] == '/')
4506 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4507 33aa809d 2019-08-08 stsp return NULL;
4510 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4511 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4512 33aa809d 2019-08-08 stsp const char *action;
4515 33aa809d 2019-08-08 stsp static const struct got_error *
4516 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4517 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4519 33aa809d 2019-08-08 stsp char *line = NULL;
4520 33aa809d 2019-08-08 stsp size_t linesize = 0;
4521 33aa809d 2019-08-08 stsp ssize_t linelen;
4523 33aa809d 2019-08-08 stsp switch (status) {
4524 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4525 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4527 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4528 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4530 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4531 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4532 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4533 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4534 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4535 33aa809d 2019-08-08 stsp printf("%s", line);
4536 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4537 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4538 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4539 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4540 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4543 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4546 33aa809d 2019-08-08 stsp return NULL;
4549 33aa809d 2019-08-08 stsp static const struct got_error *
4550 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4551 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4553 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4554 33aa809d 2019-08-08 stsp char *line = NULL;
4555 33aa809d 2019-08-08 stsp size_t linesize = 0;
4556 33aa809d 2019-08-08 stsp ssize_t linelen;
4557 33aa809d 2019-08-08 stsp int resp = ' ';
4558 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4560 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4562 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4564 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4565 33aa809d 2019-08-08 stsp a->action);
4567 33aa809d 2019-08-08 stsp return err;
4568 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4569 33aa809d 2019-08-08 stsp if (linelen == -1) {
4570 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4571 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4572 33aa809d 2019-08-08 stsp return NULL;
4574 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4576 33aa809d 2019-08-08 stsp *nl = '\0';
4577 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4578 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4579 33aa809d 2019-08-08 stsp printf("y\n");
4580 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4581 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4582 33aa809d 2019-08-08 stsp printf("n\n");
4583 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4584 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4585 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4586 33aa809d 2019-08-08 stsp printf("q\n");
4588 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4589 33aa809d 2019-08-08 stsp free(line);
4590 33aa809d 2019-08-08 stsp return NULL;
4593 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4594 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4595 33aa809d 2019-08-08 stsp a->action);
4597 33aa809d 2019-08-08 stsp return err;
4598 33aa809d 2019-08-08 stsp resp = getchar();
4599 33aa809d 2019-08-08 stsp if (resp == '\n')
4600 33aa809d 2019-08-08 stsp resp = getchar();
4601 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4602 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4603 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4604 33aa809d 2019-08-08 stsp resp = ' ';
4606 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4607 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4608 33aa809d 2019-08-08 stsp resp = ' ';
4612 33aa809d 2019-08-08 stsp if (resp == 'y')
4613 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4614 33aa809d 2019-08-08 stsp else if (resp == 'n')
4615 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4616 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4617 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4619 1ee397ad 2019-07-12 stsp return NULL;
4623 a129376b 2019-03-28 stsp static const struct got_error *
4624 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4626 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4627 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4628 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4629 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4630 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4631 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4632 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4633 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4634 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4635 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4637 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4639 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4640 a129376b 2019-03-28 stsp switch (ch) {
4642 33aa809d 2019-08-08 stsp pflag = 1;
4645 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4648 0f6d7415 2019-08-08 stsp can_recurse = 1;
4651 a129376b 2019-03-28 stsp usage_revert();
4652 a129376b 2019-03-28 stsp /* NOTREACHED */
4656 a129376b 2019-03-28 stsp argc -= optind;
4657 a129376b 2019-03-28 stsp argv += optind;
4659 43012d58 2019-07-14 stsp #ifndef PROFILE
4660 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4661 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4662 43012d58 2019-07-14 stsp err(1, "pledge");
4664 e20a8b6f 2019-06-04 stsp if (argc < 1)
4665 a129376b 2019-03-28 stsp usage_revert();
4666 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4667 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4669 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4670 a129376b 2019-03-28 stsp if (cwd == NULL) {
4671 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4672 a129376b 2019-03-28 stsp goto done;
4674 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4675 2ec1f75b 2019-03-26 stsp if (error)
4676 2ec1f75b 2019-03-26 stsp goto done;
4678 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4680 a129376b 2019-03-28 stsp if (error != NULL)
4681 a129376b 2019-03-28 stsp goto done;
4683 33aa809d 2019-08-08 stsp if (patch_script_path) {
4684 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4685 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4686 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4687 33aa809d 2019-08-08 stsp patch_script_path);
4688 33aa809d 2019-08-08 stsp goto done;
4691 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4692 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4693 a129376b 2019-03-28 stsp if (error)
4694 a129376b 2019-03-28 stsp goto done;
4696 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4697 6d022e97 2019-08-04 stsp if (error)
4698 6d022e97 2019-08-04 stsp goto done;
4700 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4701 0f6d7415 2019-08-08 stsp char *ondisk_path;
4702 0f6d7415 2019-08-08 stsp struct stat sb;
4703 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4704 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4705 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4706 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4707 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4708 0f6d7415 2019-08-08 stsp goto done;
4710 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4711 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4712 0f6d7415 2019-08-08 stsp free(ondisk_path);
4715 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4716 0f6d7415 2019-08-08 stsp ondisk_path);
4717 0f6d7415 2019-08-08 stsp free(ondisk_path);
4718 0f6d7415 2019-08-08 stsp goto done;
4720 0f6d7415 2019-08-08 stsp free(ondisk_path);
4721 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4722 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4723 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4724 0f6d7415 2019-08-08 stsp goto done;
4729 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4730 33aa809d 2019-08-08 stsp cpa.action = "revert";
4731 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4732 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4734 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4735 33aa809d 2019-08-08 stsp error == NULL)
4736 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4738 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4739 2ec1f75b 2019-03-26 stsp if (worktree)
4740 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4741 2ec1f75b 2019-03-26 stsp free(path);
4742 d00136be 2019-03-26 stsp free(cwd);
4743 6bad629b 2019-02-04 stsp return error;
4746 c4296144 2019-05-09 stsp __dead static void
4747 c4296144 2019-05-09 stsp usage_commit(void)
4749 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4750 5c1e53bc 2019-07-28 stsp getprogname());
4754 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4755 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4756 e2ba3d07 2019-05-13 stsp const char *editor;
4757 e0870e44 2019-05-13 stsp const char *worktree_path;
4758 76d98825 2019-06-03 stsp const char *branch_name;
4759 314a6357 2019-05-13 stsp const char *repo_path;
4760 e0870e44 2019-05-13 stsp char *logmsg_path;
4764 33ad4cbe 2019-05-12 jcs static const struct got_error *
4765 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4768 76d98825 2019-06-03 stsp char *initial_content = NULL;
4769 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4770 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4771 e0870e44 2019-05-13 stsp char *template = NULL;
4772 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4774 33ad4cbe 2019-05-12 jcs size_t len;
4776 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4777 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4778 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4779 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4780 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4781 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4782 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4783 33ad4cbe 2019-05-12 jcs return NULL;
4786 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4787 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4789 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4790 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4791 76d98825 2019-06-03 stsp a->branch_name) == -1)
4792 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4794 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4796 e0870e44 2019-05-13 stsp goto done;
4798 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4800 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4801 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4802 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4803 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4804 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4808 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4810 76d98825 2019-06-03 stsp free(initial_content);
4811 e0870e44 2019-05-13 stsp free(template);
4813 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4814 3ce1b845 2019-07-15 stsp if (err == NULL) {
4815 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4816 3ce1b845 2019-07-15 stsp if (err) {
4817 3ce1b845 2019-07-15 stsp free(*logmsg);
4818 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4821 33ad4cbe 2019-05-12 jcs return err;
4824 c4296144 2019-05-09 stsp static const struct got_error *
4825 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4827 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4828 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4829 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4830 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4831 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4832 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4833 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4834 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4835 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4836 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4838 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4839 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4841 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4842 c4296144 2019-05-09 stsp switch (ch) {
4844 c4296144 2019-05-09 stsp logmsg = optarg;
4847 c4296144 2019-05-09 stsp usage_commit();
4848 c4296144 2019-05-09 stsp /* NOTREACHED */
4852 c4296144 2019-05-09 stsp argc -= optind;
4853 c4296144 2019-05-09 stsp argv += optind;
4855 43012d58 2019-07-14 stsp #ifndef PROFILE
4856 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4857 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4858 43012d58 2019-07-14 stsp err(1, "pledge");
4860 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4861 c4296144 2019-05-09 stsp if (cwd == NULL) {
4862 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4863 c4296144 2019-05-09 stsp goto done;
4865 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4866 7d5807f4 2019-07-11 stsp if (error)
4867 7d5807f4 2019-07-11 stsp goto done;
4869 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4870 c4296144 2019-05-09 stsp if (error)
4871 a698f62e 2019-07-25 stsp goto done;
4872 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4873 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4874 c4296144 2019-05-09 stsp goto done;
4877 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4878 916f288c 2019-07-30 stsp worktree);
4879 5c1e53bc 2019-07-28 stsp if (error)
4880 5c1e53bc 2019-07-28 stsp goto done;
4882 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4883 c9956ddf 2019-09-08 stsp if (error)
4884 c9956ddf 2019-09-08 stsp goto done;
4885 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4886 c9956ddf 2019-09-08 stsp gitconfig_path);
4887 c4296144 2019-05-09 stsp if (error != NULL)
4888 c4296144 2019-05-09 stsp goto done;
4890 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4891 aba9c984 2019-09-08 stsp if (error)
4892 aba9c984 2019-09-08 stsp return error;
4895 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4896 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4898 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4899 314a6357 2019-05-13 stsp error = get_editor(&editor);
4901 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4902 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4903 c4296144 2019-05-09 stsp if (error)
4904 c4296144 2019-05-09 stsp goto done;
4906 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4907 087fb88c 2019-08-04 stsp if (error)
4908 087fb88c 2019-08-04 stsp goto done;
4910 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4911 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4912 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4913 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4914 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4915 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4916 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4917 916f288c 2019-07-30 stsp goto done;
4919 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4921 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4922 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4923 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4924 e0870e44 2019-05-13 stsp if (error) {
4925 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4926 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4927 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4928 c4296144 2019-05-09 stsp goto done;
4931 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4932 c4296144 2019-05-09 stsp if (error)
4933 c4296144 2019-05-09 stsp goto done;
4934 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4936 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4937 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4938 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4939 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4940 7266f21f 2019-10-21 stsp error == NULL)
4941 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4942 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4944 c4296144 2019-05-09 stsp got_repo_close(repo);
4945 c4296144 2019-05-09 stsp if (worktree)
4946 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4947 c4296144 2019-05-09 stsp free(cwd);
4948 c4296144 2019-05-09 stsp free(id_str);
4949 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4950 e2ba3d07 2019-05-13 stsp free(editor);
4951 aba9c984 2019-09-08 stsp free(author);
4952 234035bc 2019-06-01 stsp return error;
4955 234035bc 2019-06-01 stsp __dead static void
4956 234035bc 2019-06-01 stsp usage_cherrypick(void)
4958 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4962 234035bc 2019-06-01 stsp static const struct got_error *
4963 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4965 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4966 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4967 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4968 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4969 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4970 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4971 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4972 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4973 234035bc 2019-06-01 stsp int ch, did_something = 0;
4975 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4976 234035bc 2019-06-01 stsp switch (ch) {
4978 234035bc 2019-06-01 stsp usage_cherrypick();
4979 234035bc 2019-06-01 stsp /* NOTREACHED */
4983 234035bc 2019-06-01 stsp argc -= optind;
4984 234035bc 2019-06-01 stsp argv += optind;
4986 43012d58 2019-07-14 stsp #ifndef PROFILE
4987 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4988 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4989 43012d58 2019-07-14 stsp err(1, "pledge");
4991 234035bc 2019-06-01 stsp if (argc != 1)
4992 234035bc 2019-06-01 stsp usage_cherrypick();
4994 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4995 234035bc 2019-06-01 stsp if (cwd == NULL) {
4996 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4997 234035bc 2019-06-01 stsp goto done;
4999 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
5000 234035bc 2019-06-01 stsp if (error)
5001 234035bc 2019-06-01 stsp goto done;
5003 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5005 234035bc 2019-06-01 stsp if (error != NULL)
5006 234035bc 2019-06-01 stsp goto done;
5008 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5009 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5010 234035bc 2019-06-01 stsp if (error)
5011 234035bc 2019-06-01 stsp goto done;
5013 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5014 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5015 234035bc 2019-06-01 stsp if (error != NULL) {
5016 234035bc 2019-06-01 stsp struct got_reference *ref;
5017 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5018 234035bc 2019-06-01 stsp goto done;
5019 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5020 234035bc 2019-06-01 stsp if (error != NULL)
5021 234035bc 2019-06-01 stsp goto done;
5022 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
5023 234035bc 2019-06-01 stsp got_ref_close(ref);
5024 234035bc 2019-06-01 stsp if (error != NULL)
5025 234035bc 2019-06-01 stsp goto done;
5027 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
5028 234035bc 2019-06-01 stsp if (error)
5029 234035bc 2019-06-01 stsp goto done;
5031 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
5032 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
5033 234035bc 2019-06-01 stsp if (error != NULL)
5034 234035bc 2019-06-01 stsp goto done;
5036 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5037 234035bc 2019-06-01 stsp if (error) {
5038 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
5039 234035bc 2019-06-01 stsp goto done;
5040 234035bc 2019-06-01 stsp error = NULL;
5042 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
5043 234035bc 2019-06-01 stsp goto done;
5046 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5047 234035bc 2019-06-01 stsp if (error)
5048 234035bc 2019-06-01 stsp goto done;
5049 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5050 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
5051 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
5053 234035bc 2019-06-01 stsp if (error != NULL)
5054 234035bc 2019-06-01 stsp goto done;
5056 234035bc 2019-06-01 stsp if (did_something)
5057 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
5059 234035bc 2019-06-01 stsp if (commit)
5060 234035bc 2019-06-01 stsp got_object_commit_close(commit);
5061 234035bc 2019-06-01 stsp free(commit_id_str);
5062 234035bc 2019-06-01 stsp if (head_ref)
5063 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5064 234035bc 2019-06-01 stsp if (worktree)
5065 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5067 234035bc 2019-06-01 stsp got_repo_close(repo);
5068 c4296144 2019-05-09 stsp return error;
5071 5ef14e63 2019-06-02 stsp __dead static void
5072 5ef14e63 2019-06-02 stsp usage_backout(void)
5074 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5078 5ef14e63 2019-06-02 stsp static const struct got_error *
5079 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5081 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5082 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5083 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5084 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5085 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5086 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5087 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5088 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5089 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5091 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5092 5ef14e63 2019-06-02 stsp switch (ch) {
5094 5ef14e63 2019-06-02 stsp usage_backout();
5095 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5099 5ef14e63 2019-06-02 stsp argc -= optind;
5100 5ef14e63 2019-06-02 stsp argv += optind;
5102 43012d58 2019-07-14 stsp #ifndef PROFILE
5103 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5104 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5105 43012d58 2019-07-14 stsp err(1, "pledge");
5107 5ef14e63 2019-06-02 stsp if (argc != 1)
5108 5ef14e63 2019-06-02 stsp usage_backout();
5110 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5111 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5112 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5113 5ef14e63 2019-06-02 stsp goto done;
5115 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5116 5ef14e63 2019-06-02 stsp if (error)
5117 5ef14e63 2019-06-02 stsp goto done;
5119 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5121 5ef14e63 2019-06-02 stsp if (error != NULL)
5122 5ef14e63 2019-06-02 stsp goto done;
5124 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5125 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5126 5ef14e63 2019-06-02 stsp if (error)
5127 5ef14e63 2019-06-02 stsp goto done;
5129 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5130 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5131 5ef14e63 2019-06-02 stsp if (error != NULL) {
5132 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5133 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5134 5ef14e63 2019-06-02 stsp goto done;
5135 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5136 5ef14e63 2019-06-02 stsp if (error != NULL)
5137 5ef14e63 2019-06-02 stsp goto done;
5138 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5139 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5140 5ef14e63 2019-06-02 stsp if (error != NULL)
5141 5ef14e63 2019-06-02 stsp goto done;
5143 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5144 5ef14e63 2019-06-02 stsp if (error)
5145 5ef14e63 2019-06-02 stsp goto done;
5147 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5148 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5149 5ef14e63 2019-06-02 stsp if (error != NULL)
5150 5ef14e63 2019-06-02 stsp goto done;
5152 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5153 5ef14e63 2019-06-02 stsp if (error)
5154 5ef14e63 2019-06-02 stsp goto done;
5156 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5157 5ef14e63 2019-06-02 stsp if (error)
5158 5ef14e63 2019-06-02 stsp goto done;
5159 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5160 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5161 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5162 5ef14e63 2019-06-02 stsp goto done;
5165 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5166 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5167 5ef14e63 2019-06-02 stsp if (error != NULL)
5168 5ef14e63 2019-06-02 stsp goto done;
5170 5ef14e63 2019-06-02 stsp if (did_something)
5171 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5173 5ef14e63 2019-06-02 stsp if (commit)
5174 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5175 5ef14e63 2019-06-02 stsp free(commit_id_str);
5176 5ef14e63 2019-06-02 stsp if (head_ref)
5177 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5178 818c7501 2019-07-11 stsp if (worktree)
5179 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5181 818c7501 2019-07-11 stsp got_repo_close(repo);
5182 818c7501 2019-07-11 stsp return error;
5185 818c7501 2019-07-11 stsp __dead static void
5186 818c7501 2019-07-11 stsp usage_rebase(void)
5188 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5189 af54c8f8 2019-07-11 stsp getprogname());
5194 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5197 0ebf8283 2019-07-24 stsp size_t len;
5199 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5200 0ebf8283 2019-07-24 stsp if (len > limit)
5201 0ebf8283 2019-07-24 stsp len = limit;
5202 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5203 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5205 0ebf8283 2019-07-24 stsp *nl = '\0';
5208 0ebf8283 2019-07-24 stsp static const struct got_error *
5209 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5211 5943eee2 2019-08-13 stsp const struct got_error *err;
5212 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5213 5943eee2 2019-08-13 stsp const char *s;
5215 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5217 5943eee2 2019-08-13 stsp return err;
5219 5943eee2 2019-08-13 stsp s = logmsg0;
5220 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5223 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5224 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5225 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5226 5943eee2 2019-08-13 stsp goto done;
5229 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5231 5943eee2 2019-08-13 stsp free(logmsg0);
5232 5943eee2 2019-08-13 stsp return err;
5235 818c7501 2019-07-11 stsp static const struct got_error *
5236 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5237 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5239 818c7501 2019-07-11 stsp const struct got_error *err;
5240 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5242 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5244 818c7501 2019-07-11 stsp goto done;
5246 ff0d2220 2019-07-11 stsp if (new_id) {
5247 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5249 ff0d2220 2019-07-11 stsp goto done;
5252 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5253 ff0d2220 2019-07-11 stsp if (new_id_str)
5254 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5256 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5258 0ebf8283 2019-07-24 stsp goto done;
5260 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5261 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5263 818c7501 2019-07-11 stsp free(old_id_str);
5264 818c7501 2019-07-11 stsp free(new_id_str);
5265 818c7501 2019-07-11 stsp return err;
5268 1ee397ad 2019-07-12 stsp static const struct got_error *
5269 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5271 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5273 818c7501 2019-07-11 stsp while (path[0] == '/')
5275 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5277 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5278 1ee397ad 2019-07-12 stsp return NULL;
5279 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5280 818c7501 2019-07-11 stsp *rebase_status = status;
5281 1ee397ad 2019-07-12 stsp return NULL;
5284 818c7501 2019-07-11 stsp static const struct got_error *
5285 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5286 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5287 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5289 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5290 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5291 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5294 818c7501 2019-07-11 stsp static const struct got_error *
5295 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5296 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5297 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5298 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5300 ff0d2220 2019-07-11 stsp const struct got_error *error;
5301 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5302 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5304 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5305 ff0d2220 2019-07-11 stsp if (error)
5306 ff0d2220 2019-07-11 stsp return error;
5308 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5309 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5310 ff0d2220 2019-07-11 stsp if (error) {
5311 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5312 ff0d2220 2019-07-11 stsp goto done;
5313 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5315 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5316 ff0d2220 2019-07-11 stsp free(new_commit_id);
5319 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5320 ff0d2220 2019-07-11 stsp return error;
5323 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5324 64c6d990 2019-07-11 stsp const char *path_prefix;
5325 64c6d990 2019-07-11 stsp size_t len;
5326 8ca9bd68 2019-07-25 stsp int errcode;
5329 64c6d990 2019-07-11 stsp static const struct got_error *
5330 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5331 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5332 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5333 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5335 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5337 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5338 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5339 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5341 64c6d990 2019-07-11 stsp return NULL;
5344 64c6d990 2019-07-11 stsp static const struct got_error *
5345 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5346 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5347 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5349 64c6d990 2019-07-11 stsp const struct got_error *err;
5350 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5351 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5352 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5354 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5355 64c6d990 2019-07-11 stsp return NULL;
5357 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5359 64c6d990 2019-07-11 stsp goto done;
5361 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5363 64c6d990 2019-07-11 stsp goto done;
5365 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5366 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5368 64c6d990 2019-07-11 stsp goto done;
5370 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5371 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5373 64c6d990 2019-07-11 stsp goto done;
5375 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5376 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5377 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5378 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5379 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5380 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5381 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5383 64c6d990 2019-07-11 stsp if (tree1)
5384 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5385 64c6d990 2019-07-11 stsp if (tree2)
5386 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5387 64c6d990 2019-07-11 stsp if (commit)
5388 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5389 64c6d990 2019-07-11 stsp if (parent_commit)
5390 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5391 64c6d990 2019-07-11 stsp return err;
5394 ff0d2220 2019-07-11 stsp static const struct got_error *
5395 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5396 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5397 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5398 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5399 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5401 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5402 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5403 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5404 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5405 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5407 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5409 af61c510 2019-07-19 stsp return err;
5411 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5412 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5414 af61c510 2019-07-19 stsp goto done;
5415 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5416 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5417 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5418 af61c510 2019-07-19 stsp if (err) {
5419 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5420 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5421 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5422 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5423 af61c510 2019-07-19 stsp "been reached?!?");
5425 ee780d5c 2020-01-04 stsp goto done;
5427 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5428 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5430 af61c510 2019-07-19 stsp goto done;
5432 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5434 af61c510 2019-07-19 stsp goto done;
5435 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5436 af61c510 2019-07-19 stsp commit_id = parent_id;
5440 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5441 af61c510 2019-07-19 stsp return err;
5444 af61c510 2019-07-19 stsp static const struct got_error *
5445 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5447 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5448 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5449 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5450 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5451 818c7501 2019-07-11 stsp char *cwd = NULL;
5452 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5453 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5454 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5455 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5456 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5457 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5458 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5459 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5460 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5461 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5462 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5463 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5465 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5466 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5468 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5469 818c7501 2019-07-11 stsp switch (ch) {
5471 818c7501 2019-07-11 stsp abort_rebase = 1;
5474 818c7501 2019-07-11 stsp continue_rebase = 1;
5477 818c7501 2019-07-11 stsp usage_rebase();
5478 818c7501 2019-07-11 stsp /* NOTREACHED */
5482 818c7501 2019-07-11 stsp argc -= optind;
5483 818c7501 2019-07-11 stsp argv += optind;
5485 43012d58 2019-07-14 stsp #ifndef PROFILE
5486 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5487 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5488 43012d58 2019-07-14 stsp err(1, "pledge");
5490 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5491 818c7501 2019-07-11 stsp usage_rebase();
5492 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5493 818c7501 2019-07-11 stsp if (argc != 0)
5494 818c7501 2019-07-11 stsp usage_rebase();
5495 818c7501 2019-07-11 stsp } else if (argc != 1)
5496 818c7501 2019-07-11 stsp usage_rebase();
5498 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5499 818c7501 2019-07-11 stsp if (cwd == NULL) {
5500 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5501 818c7501 2019-07-11 stsp goto done;
5503 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5504 818c7501 2019-07-11 stsp if (error)
5505 818c7501 2019-07-11 stsp goto done;
5507 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5509 818c7501 2019-07-11 stsp if (error != NULL)
5510 818c7501 2019-07-11 stsp goto done;
5512 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5513 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5514 818c7501 2019-07-11 stsp if (error)
5515 818c7501 2019-07-11 stsp goto done;
5517 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5518 818c7501 2019-07-11 stsp if (error)
5519 818c7501 2019-07-11 stsp goto done;
5521 f6794adc 2019-07-23 stsp if (abort_rebase) {
5522 818c7501 2019-07-11 stsp int did_something;
5523 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5524 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5525 f6794adc 2019-07-23 stsp goto done;
5527 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5528 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5529 3e3a69f1 2019-07-25 stsp worktree, repo);
5530 818c7501 2019-07-11 stsp if (error)
5531 818c7501 2019-07-11 stsp goto done;
5532 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5533 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5534 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5535 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5536 818c7501 2019-07-11 stsp if (error)
5537 818c7501 2019-07-11 stsp goto done;
5538 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5539 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5542 818c7501 2019-07-11 stsp if (continue_rebase) {
5543 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5544 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5545 f6794adc 2019-07-23 stsp goto done;
5547 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5548 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5549 3e3a69f1 2019-07-25 stsp worktree, repo);
5550 818c7501 2019-07-11 stsp if (error)
5551 818c7501 2019-07-11 stsp goto done;
5553 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5554 01757395 2019-07-12 stsp resume_commit_id, repo);
5555 818c7501 2019-07-11 stsp if (error)
5556 818c7501 2019-07-11 stsp goto done;
5558 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5559 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5560 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5561 818c7501 2019-07-11 stsp goto done;
5564 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5565 818c7501 2019-07-11 stsp if (error != NULL)
5566 818c7501 2019-07-11 stsp goto done;
5569 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5570 ff0d2220 2019-07-11 stsp if (error)
5571 ff0d2220 2019-07-11 stsp goto done;
5573 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5574 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5576 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5577 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5578 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5579 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5580 818c7501 2019-07-11 stsp if (error)
5581 818c7501 2019-07-11 stsp goto done;
5582 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5583 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5584 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5585 818c7501 2019-07-11 stsp "with work tree's branch");
5586 818c7501 2019-07-11 stsp goto done;
5589 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5590 a51a74b3 2019-07-27 stsp if (error) {
5591 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5592 a51a74b3 2019-07-27 stsp goto done;
5593 a51a74b3 2019-07-27 stsp error = NULL;
5595 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5596 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5597 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5598 a51a74b3 2019-07-27 stsp goto done;
5600 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5601 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5602 818c7501 2019-07-11 stsp if (error)
5603 818c7501 2019-07-11 stsp goto done;
5606 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5607 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5608 818c7501 2019-07-11 stsp if (error)
5609 818c7501 2019-07-11 stsp goto done;
5611 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5612 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5613 fc66b545 2019-08-12 stsp if (pid == NULL) {
5614 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5615 fc66b545 2019-08-12 stsp int did_something;
5616 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5617 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5618 fc66b545 2019-08-12 stsp &did_something);
5619 fc66b545 2019-08-12 stsp if (error)
5620 fc66b545 2019-08-12 stsp goto done;
5621 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5622 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5624 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5625 fc66b545 2019-08-12 stsp goto done;
5627 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5628 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5629 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5630 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5631 818c7501 2019-07-11 stsp commit = NULL;
5632 818c7501 2019-07-11 stsp if (error)
5633 818c7501 2019-07-11 stsp goto done;
5635 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5636 38b0338b 2019-11-29 stsp if (continue_rebase) {
5637 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5638 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5639 38b0338b 2019-11-29 stsp goto done;
5641 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5642 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5643 38b0338b 2019-11-29 stsp char *id_str;
5644 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5645 38b0338b 2019-11-29 stsp new_base_branch);
5646 38b0338b 2019-11-29 stsp if (error)
5647 38b0338b 2019-11-29 stsp goto done;
5648 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5649 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5650 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5651 38b0338b 2019-11-29 stsp free(id_str);
5652 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5653 38b0338b 2019-11-29 stsp new_head_commit_id);
5654 38b0338b 2019-11-29 stsp if (error)
5655 38b0338b 2019-11-29 stsp goto done;
5659 818c7501 2019-07-11 stsp pid = NULL;
5660 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5661 818c7501 2019-07-11 stsp commit_id = qid->id;
5662 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5663 818c7501 2019-07-11 stsp pid = qid;
5665 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5666 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5667 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5668 818c7501 2019-07-11 stsp if (error)
5669 818c7501 2019-07-11 stsp goto done;
5671 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5672 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5676 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5677 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5678 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5679 818c7501 2019-07-11 stsp if (error)
5680 818c7501 2019-07-11 stsp goto done;
5683 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5684 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5685 818c7501 2019-07-11 stsp if (error)
5686 818c7501 2019-07-11 stsp goto done;
5687 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5688 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5690 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5691 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5693 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5694 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5695 818c7501 2019-07-11 stsp free(resume_commit_id);
5696 818c7501 2019-07-11 stsp free(yca_id);
5697 818c7501 2019-07-11 stsp if (commit)
5698 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5699 818c7501 2019-07-11 stsp if (branch)
5700 818c7501 2019-07-11 stsp got_ref_close(branch);
5701 818c7501 2019-07-11 stsp if (new_base_branch)
5702 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5703 818c7501 2019-07-11 stsp if (tmp_branch)
5704 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5705 5ef14e63 2019-06-02 stsp if (worktree)
5706 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5708 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5709 5ef14e63 2019-06-02 stsp return error;
5712 0ebf8283 2019-07-24 stsp __dead static void
5713 0ebf8283 2019-07-24 stsp usage_histedit(void)
5715 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5716 0ebf8283 2019-07-24 stsp getprogname());
5720 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5721 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5722 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5723 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5724 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5726 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5727 0ebf8283 2019-07-24 stsp unsigned char code;
5728 0ebf8283 2019-07-24 stsp const char *name;
5729 0ebf8283 2019-07-24 stsp const char *desc;
5730 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5731 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5732 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5733 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5734 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5735 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5736 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5739 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5740 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5741 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5742 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5743 0ebf8283 2019-07-24 stsp char *logmsg;
5745 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5747 0ebf8283 2019-07-24 stsp static const struct got_error *
5748 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5749 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5751 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5752 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5753 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5756 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5758 0ebf8283 2019-07-24 stsp goto done;
5760 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5762 0ebf8283 2019-07-24 stsp goto done;
5764 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5766 0ebf8283 2019-07-24 stsp goto done;
5768 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5769 0ebf8283 2019-07-24 stsp if (n < 0)
5770 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5772 0ebf8283 2019-07-24 stsp if (commit)
5773 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5774 0ebf8283 2019-07-24 stsp free(id_str);
5775 0ebf8283 2019-07-24 stsp free(logmsg);
5776 0ebf8283 2019-07-24 stsp return err;
5779 0ebf8283 2019-07-24 stsp static const struct got_error *
5780 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5781 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5783 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5784 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5786 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5787 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5789 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5790 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5796 0ebf8283 2019-07-24 stsp return err;
5799 0ebf8283 2019-07-24 stsp static const struct got_error *
5800 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5802 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5805 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5806 0ebf8283 2019-07-24 stsp if (n < 0)
5807 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5809 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5810 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5811 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5812 0ebf8283 2019-07-24 stsp cmd->desc);
5813 0ebf8283 2019-07-24 stsp if (n < 0) {
5814 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5818 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5819 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5820 0ebf8283 2019-07-24 stsp if (n < 0)
5821 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5822 0ebf8283 2019-07-24 stsp return err;
5825 0ebf8283 2019-07-24 stsp static const struct got_error *
5826 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5828 0ebf8283 2019-07-24 stsp static char msg[42];
5831 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5833 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5834 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5836 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5839 0ebf8283 2019-07-24 stsp static const struct got_error *
5840 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5841 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5843 0ebf8283 2019-07-24 stsp const struct got_error *err;
5844 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5845 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5847 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5849 0ebf8283 2019-07-24 stsp return err;
5851 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5853 0ebf8283 2019-07-24 stsp goto done;
5855 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5857 5943eee2 2019-08-13 stsp goto done;
5858 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5859 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5860 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5861 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5864 0ebf8283 2019-07-24 stsp if (folded_commit)
5865 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5866 0ebf8283 2019-07-24 stsp free(id_str);
5867 5943eee2 2019-08-13 stsp free(folded_logmsg);
5868 0ebf8283 2019-07-24 stsp return err;
5871 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5872 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5874 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5876 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5877 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5878 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5879 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5880 3f9de99f 2019-07-24 stsp folded = prev;
5881 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5884 0ebf8283 2019-07-24 stsp return folded;
5887 0ebf8283 2019-07-24 stsp static const struct got_error *
5888 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5889 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5891 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5892 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5893 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5894 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5896 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5898 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5900 0ebf8283 2019-07-24 stsp return err;
5902 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5903 0ebf8283 2019-07-24 stsp if (folded) {
5904 0ebf8283 2019-07-24 stsp while (folded != hle) {
5905 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5906 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5909 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5910 0ebf8283 2019-07-24 stsp logmsg, repo);
5912 0ebf8283 2019-07-24 stsp goto done;
5913 0ebf8283 2019-07-24 stsp free(logmsg);
5914 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5915 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5919 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5921 0ebf8283 2019-07-24 stsp goto done;
5922 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5924 5943eee2 2019-08-13 stsp goto done;
5925 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5926 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5927 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5928 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5929 0ebf8283 2019-07-24 stsp goto done;
5931 0ebf8283 2019-07-24 stsp free(logmsg);
5932 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5934 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5936 0ebf8283 2019-07-24 stsp goto done;
5938 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5940 0ebf8283 2019-07-24 stsp goto done;
5942 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5943 0ebf8283 2019-07-24 stsp close(fd);
5945 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5947 0ebf8283 2019-07-24 stsp goto done;
5949 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5950 0ebf8283 2019-07-24 stsp if (err) {
5951 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5952 0ebf8283 2019-07-24 stsp goto done;
5953 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5956 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5957 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5958 0ebf8283 2019-07-24 stsp free(logmsg_path);
5959 0ebf8283 2019-07-24 stsp free(logmsg);
5960 5943eee2 2019-08-13 stsp free(orig_logmsg);
5961 0ebf8283 2019-07-24 stsp free(editor);
5962 0ebf8283 2019-07-24 stsp if (commit)
5963 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5964 0ebf8283 2019-07-24 stsp return err;
5967 0ebf8283 2019-07-24 stsp static const struct got_error *
5968 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5969 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5971 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5972 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5973 0ebf8283 2019-07-24 stsp size_t size;
5974 0ebf8283 2019-07-24 stsp ssize_t len;
5975 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5976 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5977 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5978 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5980 0ebf8283 2019-07-24 stsp for (;;) {
5981 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5982 0ebf8283 2019-07-24 stsp if (len == -1) {
5983 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5984 0ebf8283 2019-07-24 stsp if (feof(f))
5986 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5987 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5992 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5994 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5995 0ebf8283 2019-07-24 stsp free(line);
5996 0ebf8283 2019-07-24 stsp line = NULL;
5999 0ebf8283 2019-07-24 stsp cmd = NULL;
6000 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6001 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
6002 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
6003 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
6004 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
6007 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
6012 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
6013 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6016 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6018 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
6019 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
6020 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
6023 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
6024 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6028 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
6029 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
6030 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6034 0ebf8283 2019-07-24 stsp free(line);
6035 0ebf8283 2019-07-24 stsp line = NULL;
6039 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
6041 0ebf8283 2019-07-24 stsp *end = '\0';
6043 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
6044 0ebf8283 2019-07-24 stsp if (err) {
6045 0ebf8283 2019-07-24 stsp /* override error code */
6046 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6050 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
6051 0ebf8283 2019-07-24 stsp if (hle == NULL) {
6052 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
6055 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
6056 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
6057 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
6058 0ebf8283 2019-07-24 stsp commit_id = NULL;
6059 0ebf8283 2019-07-24 stsp free(line);
6060 0ebf8283 2019-07-24 stsp line = NULL;
6061 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6064 0ebf8283 2019-07-24 stsp free(line);
6065 0ebf8283 2019-07-24 stsp free(commit_id);
6066 0ebf8283 2019-07-24 stsp return err;
6069 0ebf8283 2019-07-24 stsp static const struct got_error *
6070 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6071 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6073 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6074 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6075 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6076 bfce7f83 2019-07-27 stsp static char msg[80];
6077 bfce7f83 2019-07-27 stsp char *id_str;
6079 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6080 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6081 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6082 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6083 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6085 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6086 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6087 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6090 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6091 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6093 bfce7f83 2019-07-27 stsp return err;
6094 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6095 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6096 bfce7f83 2019-07-27 stsp free(id_str);
6097 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6101 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6102 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6103 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6104 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6106 bfce7f83 2019-07-27 stsp return NULL;
6109 bfce7f83 2019-07-27 stsp static const struct got_error *
6110 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6111 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6112 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6114 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6115 0ebf8283 2019-07-24 stsp char *editor;
6116 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6118 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6120 0ebf8283 2019-07-24 stsp return err;
6122 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6123 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6124 0ebf8283 2019-07-24 stsp goto done;
6127 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6128 0ebf8283 2019-07-24 stsp if (f == NULL) {
6129 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6130 0ebf8283 2019-07-24 stsp goto done;
6132 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6134 bfce7f83 2019-07-27 stsp goto done;
6136 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6138 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6139 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6140 0ebf8283 2019-07-24 stsp free(editor);
6141 0ebf8283 2019-07-24 stsp return err;
6144 0ebf8283 2019-07-24 stsp static const struct got_error *
6145 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6146 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
6148 0ebf8283 2019-07-24 stsp static const struct got_error *
6149 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6150 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6152 0ebf8283 2019-07-24 stsp const struct got_error *err;
6153 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6154 0ebf8283 2019-07-24 stsp char *path = NULL;
6156 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6158 0ebf8283 2019-07-24 stsp return err;
6160 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
6162 0ebf8283 2019-07-24 stsp goto done;
6164 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6166 0ebf8283 2019-07-24 stsp goto done;
6168 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6169 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6170 0ebf8283 2019-07-24 stsp goto done;
6174 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6175 0ebf8283 2019-07-24 stsp if (err) {
6176 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6177 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6178 0ebf8283 2019-07-24 stsp goto done;
6179 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6180 0ebf8283 2019-07-24 stsp commits, path, repo);
6183 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6184 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6185 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6186 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6187 0ebf8283 2019-07-24 stsp free(path);
6188 0ebf8283 2019-07-24 stsp return err;
6191 0ebf8283 2019-07-24 stsp static const struct got_error *
6192 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6193 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6195 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6196 0ebf8283 2019-07-24 stsp char *path = NULL;
6197 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6198 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6199 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6201 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6203 0ebf8283 2019-07-24 stsp return err;
6205 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6206 0ebf8283 2019-07-24 stsp if (f == NULL) {
6207 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6208 0ebf8283 2019-07-24 stsp goto done;
6210 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6211 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6216 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6217 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6218 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6219 0ebf8283 2019-07-24 stsp if (n < 0) {
6220 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6226 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6227 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6228 0ebf8283 2019-07-24 stsp free(path);
6229 0ebf8283 2019-07-24 stsp if (commit)
6230 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6231 0ebf8283 2019-07-24 stsp return err;
6235 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6237 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6239 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6240 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6241 bfce7f83 2019-07-27 stsp free(hle);
6245 0ebf8283 2019-07-24 stsp static const struct got_error *
6246 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6247 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6249 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6250 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6252 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6253 0ebf8283 2019-07-24 stsp if (f == NULL) {
6254 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6255 0ebf8283 2019-07-24 stsp goto done;
6258 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6260 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6261 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6262 0ebf8283 2019-07-24 stsp return err;
6265 0ebf8283 2019-07-24 stsp static const struct got_error *
6266 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6267 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6268 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6270 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6271 0ebf8283 2019-07-24 stsp int resp = ' ';
6273 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6274 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6275 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6276 0ebf8283 2019-07-24 stsp resp = getchar();
6277 a61a4414 2019-08-07 stsp if (resp == '\n')
6278 a61a4414 2019-08-07 stsp resp = getchar();
6279 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6280 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6281 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6283 426ebf2e 2019-07-25 stsp if (err) {
6284 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6285 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6287 bfce7f83 2019-07-27 stsp prev_err = err;
6288 426ebf2e 2019-07-25 stsp resp = ' ';
6292 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6293 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6294 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6295 0ebf8283 2019-07-24 stsp commits, repo);
6296 426ebf2e 2019-07-25 stsp if (err) {
6297 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6298 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6300 bfce7f83 2019-07-27 stsp prev_err = err;
6301 426ebf2e 2019-07-25 stsp resp = ' ';
6305 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6306 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6309 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6312 0ebf8283 2019-07-24 stsp return err;
6315 0ebf8283 2019-07-24 stsp static const struct got_error *
6316 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6317 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6318 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6320 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6321 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6322 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6323 3e3a69f1 2019-07-25 stsp branch, repo);
6326 0ebf8283 2019-07-24 stsp static const struct got_error *
6327 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6328 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6330 0ebf8283 2019-07-24 stsp const struct got_error *err;
6331 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6333 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6335 0ebf8283 2019-07-24 stsp goto done;
6337 0ebf8283 2019-07-24 stsp if (new_id) {
6338 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6340 0ebf8283 2019-07-24 stsp goto done;
6343 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6344 0ebf8283 2019-07-24 stsp if (new_id_str)
6345 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6347 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6348 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6349 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6350 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6351 0ebf8283 2019-07-24 stsp goto done;
6353 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6355 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6357 0ebf8283 2019-07-24 stsp goto done;
6360 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6361 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6362 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6363 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6364 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6366 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6367 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6368 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6375 0ebf8283 2019-07-24 stsp free(old_id_str);
6376 0ebf8283 2019-07-24 stsp free(new_id_str);
6377 0ebf8283 2019-07-24 stsp return err;
6380 0ebf8283 2019-07-24 stsp static const struct got_error *
6381 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6382 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6383 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6384 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6386 0ebf8283 2019-07-24 stsp const struct got_error *err;
6387 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6388 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6390 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6391 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6392 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6394 0ebf8283 2019-07-24 stsp return err;
6397 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6399 0ebf8283 2019-07-24 stsp return err;
6401 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6402 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6403 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6404 0ebf8283 2019-07-24 stsp if (err) {
6405 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6406 0ebf8283 2019-07-24 stsp goto done;
6407 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6409 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6410 0ebf8283 2019-07-24 stsp free(new_commit_id);
6413 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6414 0ebf8283 2019-07-24 stsp return err;
6417 0ebf8283 2019-07-24 stsp static const struct got_error *
6418 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6419 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6421 0ebf8283 2019-07-24 stsp const struct got_error *error;
6422 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6424 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6426 0ebf8283 2019-07-24 stsp if (error)
6427 0ebf8283 2019-07-24 stsp return error;
6429 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6430 0ebf8283 2019-07-24 stsp if (error)
6431 0ebf8283 2019-07-24 stsp return error;
6433 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6434 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6435 0ebf8283 2019-07-24 stsp return error;
6438 0ebf8283 2019-07-24 stsp static const struct got_error *
6439 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6441 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6442 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6443 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6444 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6445 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6446 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6447 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6448 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6449 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6450 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6451 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6452 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6453 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6454 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6455 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6456 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6457 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6458 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6459 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6460 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6461 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6463 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6464 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6465 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6467 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6468 0ebf8283 2019-07-24 stsp switch (ch) {
6470 0ebf8283 2019-07-24 stsp abort_edit = 1;
6473 0ebf8283 2019-07-24 stsp continue_edit = 1;
6476 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6479 0ebf8283 2019-07-24 stsp usage_histedit();
6480 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6484 0ebf8283 2019-07-24 stsp argc -= optind;
6485 0ebf8283 2019-07-24 stsp argv += optind;
6487 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6488 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6489 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6490 0ebf8283 2019-07-24 stsp err(1, "pledge");
6492 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6493 0ebf8283 2019-07-24 stsp usage_histedit();
6494 0ebf8283 2019-07-24 stsp if (argc != 0)
6495 0ebf8283 2019-07-24 stsp usage_histedit();
6498 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6499 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6500 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6501 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6502 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6503 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6506 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6507 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6508 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6509 0ebf8283 2019-07-24 stsp goto done;
6511 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6512 0ebf8283 2019-07-24 stsp if (error)
6513 0ebf8283 2019-07-24 stsp goto done;
6515 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6517 0ebf8283 2019-07-24 stsp if (error != NULL)
6518 0ebf8283 2019-07-24 stsp goto done;
6520 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6521 0ebf8283 2019-07-24 stsp if (error)
6522 0ebf8283 2019-07-24 stsp goto done;
6523 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6524 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6525 0ebf8283 2019-07-24 stsp goto done;
6528 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6529 0ebf8283 2019-07-24 stsp if (error)
6530 0ebf8283 2019-07-24 stsp goto done;
6532 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6533 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6534 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6535 3e3a69f1 2019-07-25 stsp worktree, repo);
6536 0ebf8283 2019-07-24 stsp if (error)
6537 0ebf8283 2019-07-24 stsp goto done;
6538 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6539 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6540 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6541 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6542 0ebf8283 2019-07-24 stsp if (error)
6543 0ebf8283 2019-07-24 stsp goto done;
6544 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6545 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6546 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6547 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6548 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6549 0ebf8283 2019-07-24 stsp goto done;
6552 0ebf8283 2019-07-24 stsp if (continue_edit) {
6553 0ebf8283 2019-07-24 stsp char *path;
6555 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6556 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6557 0ebf8283 2019-07-24 stsp goto done;
6560 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6561 0ebf8283 2019-07-24 stsp if (error)
6562 0ebf8283 2019-07-24 stsp goto done;
6564 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6565 0ebf8283 2019-07-24 stsp free(path);
6566 0ebf8283 2019-07-24 stsp if (error)
6567 0ebf8283 2019-07-24 stsp goto done;
6569 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6570 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6571 3e3a69f1 2019-07-25 stsp worktree, repo);
6572 0ebf8283 2019-07-24 stsp if (error)
6573 0ebf8283 2019-07-24 stsp goto done;
6575 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6576 0ebf8283 2019-07-24 stsp if (error)
6577 0ebf8283 2019-07-24 stsp goto done;
6579 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6580 0ebf8283 2019-07-24 stsp head_commit_id);
6581 0ebf8283 2019-07-24 stsp if (error)
6582 0ebf8283 2019-07-24 stsp goto done;
6583 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6584 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6585 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6586 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6587 3aac7cf7 2019-07-25 stsp goto done;
6589 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6590 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6591 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6592 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6593 0ebf8283 2019-07-24 stsp commit = NULL;
6594 0ebf8283 2019-07-24 stsp if (error)
6595 0ebf8283 2019-07-24 stsp goto done;
6597 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6598 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6599 0ebf8283 2019-07-24 stsp goto done;
6602 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6603 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6604 0ebf8283 2019-07-24 stsp if (error != NULL)
6605 0ebf8283 2019-07-24 stsp goto done;
6607 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6608 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6609 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6610 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6611 c7d20a3f 2019-07-30 stsp goto done;
6614 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6615 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6616 bfce7f83 2019-07-27 stsp branch = NULL;
6617 0ebf8283 2019-07-24 stsp if (error)
6618 0ebf8283 2019-07-24 stsp goto done;
6620 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6621 0ebf8283 2019-07-24 stsp head_commit_id);
6622 0ebf8283 2019-07-24 stsp if (error)
6623 0ebf8283 2019-07-24 stsp goto done;
6624 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6625 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6626 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6627 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6628 3aac7cf7 2019-07-25 stsp goto done;
6630 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6631 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6632 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6633 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6634 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6635 0ebf8283 2019-07-24 stsp commit = NULL;
6636 0ebf8283 2019-07-24 stsp if (error)
6637 0ebf8283 2019-07-24 stsp goto done;
6639 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6640 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6641 bfce7f83 2019-07-27 stsp if (error)
6642 bfce7f83 2019-07-27 stsp goto done;
6644 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6645 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6646 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6647 6ba2bea2 2019-07-27 stsp if (error) {
6648 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6649 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6650 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6651 0ebf8283 2019-07-24 stsp goto done;
6654 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6656 6ba2bea2 2019-07-27 stsp if (error) {
6657 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6658 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6659 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6660 0ebf8283 2019-07-24 stsp goto done;
6665 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6667 6ba2bea2 2019-07-27 stsp if (error) {
6668 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6669 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6670 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6671 0ebf8283 2019-07-24 stsp goto done;
6676 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6677 4ec14e60 2019-08-28 hiltjo if (error)
6678 0ebf8283 2019-07-24 stsp goto done;
6680 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6681 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6682 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6683 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6686 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6687 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6688 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6689 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6692 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6693 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6695 0ebf8283 2019-07-24 stsp if (error)
6696 0ebf8283 2019-07-24 stsp goto done;
6700 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6701 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6702 0ebf8283 2019-07-24 stsp if (error)
6703 0ebf8283 2019-07-24 stsp goto done;
6707 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6708 0ebf8283 2019-07-24 stsp hle->commit_id);
6709 0ebf8283 2019-07-24 stsp if (error)
6710 0ebf8283 2019-07-24 stsp goto done;
6711 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6712 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6714 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6715 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6716 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6717 0ebf8283 2019-07-24 stsp if (error)
6718 0ebf8283 2019-07-24 stsp goto done;
6719 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6720 0ebf8283 2019-07-24 stsp commit = NULL;
6722 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6723 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6727 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6728 0ebf8283 2019-07-24 stsp char *id_str;
6729 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6730 0ebf8283 2019-07-24 stsp if (error)
6731 0ebf8283 2019-07-24 stsp goto done;
6732 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6734 0ebf8283 2019-07-24 stsp free(id_str);
6735 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6736 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6737 3e3a69f1 2019-07-25 stsp fileindex);
6738 0ebf8283 2019-07-24 stsp goto done;
6741 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6742 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6743 0ebf8283 2019-07-24 stsp if (error)
6744 0ebf8283 2019-07-24 stsp goto done;
6748 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6749 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6750 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6751 0ebf8283 2019-07-24 stsp if (error)
6752 0ebf8283 2019-07-24 stsp goto done;
6755 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6756 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6757 0ebf8283 2019-07-24 stsp if (error)
6758 0ebf8283 2019-07-24 stsp goto done;
6759 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6760 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6762 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6763 3e3a69f1 2019-07-25 stsp branch, repo);
6765 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6766 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6767 0ebf8283 2019-07-24 stsp free(head_commit_id);
6768 0ebf8283 2019-07-24 stsp free(base_commit_id);
6769 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6770 0ebf8283 2019-07-24 stsp if (commit)
6771 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6772 0ebf8283 2019-07-24 stsp if (branch)
6773 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6774 0ebf8283 2019-07-24 stsp if (tmp_branch)
6775 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6776 0ebf8283 2019-07-24 stsp if (worktree)
6777 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6779 2822a352 2019-10-15 stsp got_repo_close(repo);
6780 2822a352 2019-10-15 stsp return error;
6783 2822a352 2019-10-15 stsp __dead static void
6784 2822a352 2019-10-15 stsp usage_integrate(void)
6786 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6790 2822a352 2019-10-15 stsp static const struct got_error *
6791 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6793 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6794 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6795 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6796 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6797 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6798 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6799 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6800 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6801 2822a352 2019-10-15 stsp int ch, did_something = 0;
6803 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6804 2822a352 2019-10-15 stsp switch (ch) {
6806 2822a352 2019-10-15 stsp usage_integrate();
6807 2822a352 2019-10-15 stsp /* NOTREACHED */
6811 2822a352 2019-10-15 stsp argc -= optind;
6812 2822a352 2019-10-15 stsp argv += optind;
6814 2822a352 2019-10-15 stsp if (argc != 1)
6815 2822a352 2019-10-15 stsp usage_integrate();
6816 2822a352 2019-10-15 stsp branch_arg = argv[0];
6818 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6819 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6820 2822a352 2019-10-15 stsp err(1, "pledge");
6822 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6823 2822a352 2019-10-15 stsp if (cwd == NULL) {
6824 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6825 2822a352 2019-10-15 stsp goto done;
6828 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6829 2822a352 2019-10-15 stsp if (error)
6830 2822a352 2019-10-15 stsp goto done;
6832 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6833 2822a352 2019-10-15 stsp if (error)
6834 2822a352 2019-10-15 stsp goto done;
6836 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6838 2822a352 2019-10-15 stsp if (error != NULL)
6839 2822a352 2019-10-15 stsp goto done;
6841 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6842 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6843 2822a352 2019-10-15 stsp if (error)
6844 2822a352 2019-10-15 stsp goto done;
6846 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6847 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6848 2822a352 2019-10-15 stsp goto done;
6851 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6852 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6853 2822a352 2019-10-15 stsp if (error)
6854 2822a352 2019-10-15 stsp goto done;
6856 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6857 2822a352 2019-10-15 stsp if (refname == NULL) {
6858 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6859 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6860 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6861 2822a352 2019-10-15 stsp goto done;
6863 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6864 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6865 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6866 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6867 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6868 2822a352 2019-10-15 stsp goto done;
6871 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6872 2822a352 2019-10-15 stsp if (error)
6873 2822a352 2019-10-15 stsp goto done;
6875 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6876 2822a352 2019-10-15 stsp if (error)
6877 2822a352 2019-10-15 stsp goto done;
6879 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6880 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6881 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6882 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6883 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6884 2822a352 2019-10-15 stsp goto done;
6887 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6888 2822a352 2019-10-15 stsp if (error) {
6889 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6890 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6891 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6892 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6893 2822a352 2019-10-15 stsp goto done;
6896 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6897 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6898 2822a352 2019-10-15 stsp check_cancelled, NULL);
6899 2822a352 2019-10-15 stsp if (error)
6900 2822a352 2019-10-15 stsp goto done;
6902 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6905 715dc77e 2019-08-03 stsp got_repo_close(repo);
6906 2822a352 2019-10-15 stsp if (worktree)
6907 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6908 2822a352 2019-10-15 stsp free(cwd);
6909 2822a352 2019-10-15 stsp free(base_commit_id);
6910 2822a352 2019-10-15 stsp free(commit_id);
6911 2822a352 2019-10-15 stsp free(refname);
6912 2822a352 2019-10-15 stsp free(base_refname);
6913 715dc77e 2019-08-03 stsp return error;
6916 715dc77e 2019-08-03 stsp __dead static void
6917 715dc77e 2019-08-03 stsp usage_stage(void)
6919 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6920 f3055044 2019-08-07 stsp "[file-path ...]\n",
6921 715dc77e 2019-08-03 stsp getprogname());
6925 715dc77e 2019-08-03 stsp static const struct got_error *
6926 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6927 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6928 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6929 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6931 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6932 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6934 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6935 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6936 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6937 408b4ebc 2019-08-03 stsp return NULL;
6939 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6940 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6941 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6943 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6945 408b4ebc 2019-08-03 stsp return err;
6947 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6948 408b4ebc 2019-08-03 stsp free(id_str);
6949 dc424a06 2019-08-07 stsp return NULL;
6952 dc424a06 2019-08-07 stsp static const struct got_error *
6953 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6955 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6956 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6957 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6958 715dc77e 2019-08-03 stsp char *cwd = NULL;
6959 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6960 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6961 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6962 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6963 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6964 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6966 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6968 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6969 715dc77e 2019-08-03 stsp switch (ch) {
6971 408b4ebc 2019-08-03 stsp list_stage = 1;
6974 dc424a06 2019-08-07 stsp pflag = 1;
6977 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6980 715dc77e 2019-08-03 stsp usage_stage();
6981 715dc77e 2019-08-03 stsp /* NOTREACHED */
6985 715dc77e 2019-08-03 stsp argc -= optind;
6986 715dc77e 2019-08-03 stsp argv += optind;
6988 715dc77e 2019-08-03 stsp #ifndef PROFILE
6989 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6990 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6991 715dc77e 2019-08-03 stsp err(1, "pledge");
6993 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6994 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6995 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6996 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6998 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6999 715dc77e 2019-08-03 stsp if (cwd == NULL) {
7000 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
7001 715dc77e 2019-08-03 stsp goto done;
7004 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7005 715dc77e 2019-08-03 stsp if (error)
7006 715dc77e 2019-08-03 stsp goto done;
7008 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7010 715dc77e 2019-08-03 stsp if (error != NULL)
7011 715dc77e 2019-08-03 stsp goto done;
7013 dc424a06 2019-08-07 stsp if (patch_script_path) {
7014 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
7015 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
7016 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
7017 dc424a06 2019-08-07 stsp patch_script_path);
7018 dc424a06 2019-08-07 stsp goto done;
7021 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7022 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
7023 715dc77e 2019-08-03 stsp if (error)
7024 715dc77e 2019-08-03 stsp goto done;
7026 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7027 6d022e97 2019-08-04 stsp if (error)
7028 6d022e97 2019-08-04 stsp goto done;
7030 6d022e97 2019-08-04 stsp if (list_stage)
7031 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
7032 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
7034 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7035 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
7036 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
7037 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
7038 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
7041 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7042 2e1f37b0 2019-08-08 stsp error == NULL)
7043 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7045 ad493afc 2019-08-03 stsp got_repo_close(repo);
7046 ad493afc 2019-08-03 stsp if (worktree)
7047 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
7048 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7049 ad493afc 2019-08-03 stsp free((char *)pe->path);
7050 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
7051 ad493afc 2019-08-03 stsp free(cwd);
7052 ad493afc 2019-08-03 stsp return error;
7055 ad493afc 2019-08-03 stsp __dead static void
7056 ad493afc 2019-08-03 stsp usage_unstage(void)
7058 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7059 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7060 ad493afc 2019-08-03 stsp getprogname());
7065 ad493afc 2019-08-03 stsp static const struct got_error *
7066 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7068 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7069 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7070 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7071 ad493afc 2019-08-03 stsp char *cwd = NULL;
7072 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7073 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7074 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7075 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7076 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7077 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7079 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7081 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7082 ad493afc 2019-08-03 stsp switch (ch) {
7084 2e1f37b0 2019-08-08 stsp pflag = 1;
7087 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7090 ad493afc 2019-08-03 stsp usage_unstage();
7091 ad493afc 2019-08-03 stsp /* NOTREACHED */
7095 ad493afc 2019-08-03 stsp argc -= optind;
7096 ad493afc 2019-08-03 stsp argv += optind;
7098 ad493afc 2019-08-03 stsp #ifndef PROFILE
7099 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7100 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7101 ad493afc 2019-08-03 stsp err(1, "pledge");
7103 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7104 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7106 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7107 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7108 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7109 ad493afc 2019-08-03 stsp goto done;
7112 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7113 ad493afc 2019-08-03 stsp if (error)
7114 ad493afc 2019-08-03 stsp goto done;
7116 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7118 ad493afc 2019-08-03 stsp if (error != NULL)
7119 ad493afc 2019-08-03 stsp goto done;
7121 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7122 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7123 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7124 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7125 2e1f37b0 2019-08-08 stsp patch_script_path);
7126 2e1f37b0 2019-08-08 stsp goto done;
7130 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7131 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7132 ad493afc 2019-08-03 stsp if (error)
7133 ad493afc 2019-08-03 stsp goto done;
7135 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7136 ad493afc 2019-08-03 stsp if (error)
7137 ad493afc 2019-08-03 stsp goto done;
7139 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7140 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7141 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7142 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7144 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7145 2e1f37b0 2019-08-08 stsp error == NULL)
7146 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7148 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7149 715dc77e 2019-08-03 stsp if (worktree)
7150 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7151 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7152 715dc77e 2019-08-03 stsp free((char *)pe->path);
7153 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7154 715dc77e 2019-08-03 stsp free(cwd);
7155 01073a5d 2019-08-22 stsp return error;
7158 01073a5d 2019-08-22 stsp __dead static void
7159 01073a5d 2019-08-22 stsp usage_cat(void)
7161 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7162 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7166 01073a5d 2019-08-22 stsp static const struct got_error *
7167 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7169 01073a5d 2019-08-22 stsp const struct got_error *err;
7170 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7172 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7174 01073a5d 2019-08-22 stsp return err;
7176 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7177 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7178 01073a5d 2019-08-22 stsp return err;
7181 01073a5d 2019-08-22 stsp static const struct got_error *
7182 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7184 01073a5d 2019-08-22 stsp const struct got_error *err;
7185 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7186 56e0773d 2019-11-28 stsp int nentries, i;
7188 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7190 01073a5d 2019-08-22 stsp return err;
7192 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7193 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7194 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7195 01073a5d 2019-08-22 stsp char *id_str;
7196 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7198 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7199 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7202 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7203 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7204 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7205 01073a5d 2019-08-22 stsp free(id_str);
7208 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7209 01073a5d 2019-08-22 stsp return err;
7212 01073a5d 2019-08-22 stsp static const struct got_error *
7213 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7215 01073a5d 2019-08-22 stsp const struct got_error *err;
7216 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7217 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7218 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7219 01073a5d 2019-08-22 stsp char *id_str = NULL;
7220 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7222 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7224 01073a5d 2019-08-22 stsp return err;
7226 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7228 01073a5d 2019-08-22 stsp goto done;
7230 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7231 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7232 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7233 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7234 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7235 01073a5d 2019-08-22 stsp char *pid_str;
7236 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7238 01073a5d 2019-08-22 stsp goto done;
7239 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7240 01073a5d 2019-08-22 stsp free(pid_str);
7242 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7243 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7244 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7246 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7247 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7248 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7250 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7251 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7252 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7254 01073a5d 2019-08-22 stsp free(id_str);
7255 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7256 01073a5d 2019-08-22 stsp return err;
7259 01073a5d 2019-08-22 stsp static const struct got_error *
7260 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7262 01073a5d 2019-08-22 stsp const struct got_error *err;
7263 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7264 01073a5d 2019-08-22 stsp char *id_str = NULL;
7265 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7267 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7269 01073a5d 2019-08-22 stsp return err;
7271 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7273 01073a5d 2019-08-22 stsp goto done;
7275 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7277 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7278 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7279 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7280 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7282 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7283 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7284 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7286 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7287 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7288 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7290 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7291 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7292 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7298 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7299 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7301 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7302 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7303 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7305 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7306 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7307 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7309 01073a5d 2019-08-22 stsp free(id_str);
7310 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7311 01073a5d 2019-08-22 stsp return err;
7314 01073a5d 2019-08-22 stsp static const struct got_error *
7315 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7317 01073a5d 2019-08-22 stsp const struct got_error *error;
7318 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7319 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7320 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7321 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7322 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7323 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7325 01073a5d 2019-08-22 stsp #ifndef PROFILE
7326 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7327 01073a5d 2019-08-22 stsp NULL) == -1)
7328 01073a5d 2019-08-22 stsp err(1, "pledge");
7331 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7332 01073a5d 2019-08-22 stsp switch (ch) {
7334 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7337 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7338 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7339 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7341 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7344 896e9b6f 2019-08-26 stsp force_path = 1;
7347 01073a5d 2019-08-22 stsp usage_cat();
7348 01073a5d 2019-08-22 stsp /* NOTREACHED */
7352 01073a5d 2019-08-22 stsp argc -= optind;
7353 01073a5d 2019-08-22 stsp argv += optind;
7355 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7356 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7357 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7358 01073a5d 2019-08-22 stsp goto done;
7360 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7361 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7362 01073a5d 2019-08-22 stsp goto done;
7363 01073a5d 2019-08-22 stsp if (worktree) {
7364 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7365 01073a5d 2019-08-22 stsp repo_path = strdup(
7366 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7367 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7368 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7369 01073a5d 2019-08-22 stsp goto done;
7374 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7375 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7376 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7377 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7380 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7381 01073a5d 2019-08-22 stsp free(repo_path);
7382 01073a5d 2019-08-22 stsp if (error != NULL)
7383 01073a5d 2019-08-22 stsp goto done;
7385 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7386 896e9b6f 2019-08-26 stsp if (error)
7387 896e9b6f 2019-08-26 stsp goto done;
7389 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7390 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7391 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7392 01073a5d 2019-08-22 stsp if (error)
7393 01073a5d 2019-08-22 stsp goto done;
7395 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7396 896e9b6f 2019-08-26 stsp if (force_path) {
7397 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7399 896e9b6f 2019-08-26 stsp if (error)
7402 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7403 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7404 896e9b6f 2019-08-26 stsp if (error) {
7405 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7406 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7408 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7409 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7410 896e9b6f 2019-08-26 stsp if (error)
7415 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7416 01073a5d 2019-08-22 stsp if (error)
7419 01073a5d 2019-08-22 stsp switch (obj_type) {
7420 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7421 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7423 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7424 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7426 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7427 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7429 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7430 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7433 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7436 01073a5d 2019-08-22 stsp if (error)
7438 01073a5d 2019-08-22 stsp free(label);
7439 01073a5d 2019-08-22 stsp label = NULL;
7441 01073a5d 2019-08-22 stsp id = NULL;
7444 01073a5d 2019-08-22 stsp free(label);
7446 896e9b6f 2019-08-26 stsp free(commit_id);
7447 01073a5d 2019-08-22 stsp if (worktree)
7448 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7449 01073a5d 2019-08-22 stsp if (repo) {
7450 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7451 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7452 01073a5d 2019-08-22 stsp if (error == NULL)
7453 01073a5d 2019-08-22 stsp error = repo_error;
7455 0ebf8283 2019-07-24 stsp return error;
