2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 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 12ce7a6c 2019-08-12 stsp #include <limits.h>
27 5c860e29 2018-03-12 stsp #include <locale.h>
28 818c7501 2019-07-11 stsp #include <ctype.h>
29 99437157 2018-11-11 stsp #include <signal.h>
30 5c860e29 2018-03-12 stsp #include <stdio.h>
31 5c860e29 2018-03-12 stsp #include <stdlib.h>
32 5c860e29 2018-03-12 stsp #include <string.h>
33 5c860e29 2018-03-12 stsp #include <unistd.h>
34 c09a553d 2018-03-12 stsp #include <libgen.h>
35 c0768b0f 2018-06-10 stsp #include <time.h>
36 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 53ccebc2 2019-07-30 stsp #include "got_version.h"
39 f42b1b34 2018-03-12 stsp #include "got_error.h"
40 f42b1b34 2018-03-12 stsp #include "got_object.h"
41 5261c201 2018-04-01 stsp #include "got_reference.h"
42 f42b1b34 2018-03-12 stsp #include "got_repository.h"
43 1dd54920 2019-05-11 stsp #include "got_path.h"
44 c09a553d 2018-03-12 stsp #include "got_worktree.h"
45 79109fed 2018-03-27 stsp #include "got_diff.h"
46 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
47 404c43c4 2018-06-21 stsp #include "got_blame.h"
48 63219cd2 2019-01-04 stsp #include "got_privsep.h"
49 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
51 5c860e29 2018-03-12 stsp #ifndef nitems
52 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
55 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
56 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
59 99437157 2018-11-11 stsp catch_sigint(int signo)
61 99437157 2018-11-11 stsp sigint_received = 1;
65 99437157 2018-11-11 stsp catch_sigpipe(int signo)
67 99437157 2018-11-11 stsp sigpipe_received = 1;
71 8cfb4057 2019-07-09 stsp struct got_cmd {
72 5c860e29 2018-03-12 stsp const char *cmd_name;
73 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
74 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
75 97b3a7be 2019-07-09 stsp const char *cmd_alias;
78 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
79 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
80 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
82 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
83 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
84 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
85 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
86 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
87 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
88 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
89 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
90 d00136be 2019-03-26 stsp __dead static void usage_add(void);
91 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
92 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
93 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
94 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
95 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
96 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
97 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
98 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
99 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
101 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
102 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
103 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
104 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
105 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
106 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
107 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
108 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
110 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
111 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
112 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
113 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
114 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
115 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
116 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
117 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
118 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
119 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
120 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
121 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
123 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
124 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
125 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
126 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
127 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
128 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
129 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
130 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
131 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
132 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
133 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
134 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
135 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
136 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
137 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
138 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
139 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
140 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
141 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
142 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
143 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
144 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
147 ce5b7c56 2019-07-09 stsp static void
148 ce5b7c56 2019-07-09 stsp list_commands(void)
152 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
153 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
154 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
155 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
157 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
161 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
163 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
164 5c860e29 2018-03-12 stsp unsigned int i;
166 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
168 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
170 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
171 5c860e29 2018-03-12 stsp switch (ch) {
179 ce5b7c56 2019-07-09 stsp usage(hflag);
180 5c860e29 2018-03-12 stsp /* NOTREACHED */
184 5c860e29 2018-03-12 stsp argc -= optind;
185 5c860e29 2018-03-12 stsp argv += optind;
186 1e70621d 2018-03-27 stsp optind = 0;
188 53ccebc2 2019-07-30 stsp if (Vflag) {
189 53ccebc2 2019-07-30 stsp got_version_print_str();
193 5c860e29 2018-03-12 stsp if (argc <= 0)
194 ce5b7c56 2019-07-09 stsp usage(hflag);
196 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
197 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
199 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
200 d7d4f210 2018-03-12 stsp const struct got_error *error;
202 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
204 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
205 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
209 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
211 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
212 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
213 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
220 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
221 ce5b7c56 2019-07-09 stsp list_commands();
225 4ed7e80c 2018-05-20 stsp __dead static void
226 ce5b7c56 2019-07-09 stsp usage(int hflag)
228 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
229 53ccebc2 2019-07-30 stsp getprogname());
231 ce5b7c56 2019-07-09 stsp list_commands();
235 0266afb7 2019-01-04 stsp static const struct got_error *
236 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
238 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
239 e2ba3d07 2019-05-13 stsp const char *editor;
241 8920fa04 2019-08-18 stsp *abspath = NULL;
243 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
244 e2ba3d07 2019-05-13 stsp if (editor == NULL)
245 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
247 0ee7065d 2019-05-13 stsp if (editor) {
248 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
250 0ee7065d 2019-05-13 stsp return err;
253 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
254 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
255 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
256 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
259 e2ba3d07 2019-05-13 stsp return NULL;
262 e2ba3d07 2019-05-13 stsp static const struct got_error *
263 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
264 c530dc23 2019-07-23 stsp const char *worktree_path)
266 163ce85a 2019-05-13 stsp const struct got_error *err;
268 37c06ea4 2019-07-15 stsp #ifdef PROFILE
269 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
270 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
272 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
273 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
275 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
276 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
278 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
279 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
281 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
282 163ce85a 2019-05-13 stsp if (err != NULL)
283 163ce85a 2019-05-13 stsp return err;
285 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
286 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
288 0266afb7 2019-01-04 stsp return NULL;
291 2c7829a4 2019-06-17 stsp __dead static void
292 2c7829a4 2019-06-17 stsp usage_init(void)
294 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
298 2c7829a4 2019-06-17 stsp static const struct got_error *
299 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
301 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
302 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
305 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
306 2c7829a4 2019-06-17 stsp switch (ch) {
308 2c7829a4 2019-06-17 stsp usage_init();
309 2c7829a4 2019-06-17 stsp /* NOTREACHED */
313 2c7829a4 2019-06-17 stsp argc -= optind;
314 2c7829a4 2019-06-17 stsp argv += optind;
316 2c7829a4 2019-06-17 stsp #ifndef PROFILE
317 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
318 2c7829a4 2019-06-17 stsp err(1, "pledge");
320 2c7829a4 2019-06-17 stsp if (argc != 1)
321 bc20e173 2019-06-17 stsp usage_init();
323 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
324 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
325 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
327 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
329 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
330 2c7829a4 2019-06-17 stsp if (error &&
331 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
334 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
338 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
339 2c7829a4 2019-06-17 stsp if (error != NULL)
343 3ce1b845 2019-07-15 stsp free(repo_path);
344 3ce1b845 2019-07-15 stsp return error;
347 3ce1b845 2019-07-15 stsp __dead static void
348 3ce1b845 2019-07-15 stsp usage_import(void)
350 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
351 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
356 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
359 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
360 3ce1b845 2019-07-15 stsp int st = -1;
362 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
363 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
364 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
366 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
368 3ce1b845 2019-07-15 stsp goto doneediting;
370 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
371 3ce1b845 2019-07-15 stsp _exit(127);
374 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
375 3ce1b845 2019-07-15 stsp if (errno != EINTR)
378 3ce1b845 2019-07-15 stsp doneediting:
379 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
380 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
381 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
383 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
384 3ce1b845 2019-07-15 stsp errno = EINTR;
388 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
391 3ce1b845 2019-07-15 stsp static const struct got_error *
392 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
393 3ce1b845 2019-07-15 stsp const char *initial_content)
395 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
396 3ce1b845 2019-07-15 stsp char buf[1024];
397 3ce1b845 2019-07-15 stsp struct stat st, st2;
399 3ce1b845 2019-07-15 stsp int content_changed = 0;
400 3ce1b845 2019-07-15 stsp size_t len;
402 3ce1b845 2019-07-15 stsp *logmsg = NULL;
404 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
405 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
407 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
408 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
410 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
411 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
413 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
414 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
415 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
417 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
418 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
419 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
420 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
423 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
424 3ce1b845 2019-07-15 stsp if (fp == NULL) {
425 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
428 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
429 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
430 3ce1b845 2019-07-15 stsp content_changed = 1;
431 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
432 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
433 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
435 3ce1b845 2019-07-15 stsp fclose(fp);
437 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
438 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
442 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
443 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
444 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
447 3ce1b845 2019-07-15 stsp free(*logmsg);
448 3ce1b845 2019-07-15 stsp *logmsg = NULL;
450 3ce1b845 2019-07-15 stsp return err;
453 3ce1b845 2019-07-15 stsp static const struct got_error *
454 3ce1b845 2019-07-15 stsp collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
455 3ce1b845 2019-07-15 stsp const char *branch_name)
457 3ce1b845 2019-07-15 stsp char *initial_content = NULL, *logmsg_path = NULL;
458 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
461 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
462 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
463 3ce1b845 2019-07-15 stsp branch_name) == -1)
464 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
466 3ce1b845 2019-07-15 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
470 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
473 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
475 3ce1b845 2019-07-15 stsp free(initial_content);
476 3ce1b845 2019-07-15 stsp free(logmsg_path);
477 3ce1b845 2019-07-15 stsp return err;
480 3ce1b845 2019-07-15 stsp static const struct got_error *
481 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
483 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
484 3ce1b845 2019-07-15 stsp return NULL;
487 3ce1b845 2019-07-15 stsp static const struct got_error *
488 84792843 2019-08-09 stsp get_author(const char **author)
490 84792843 2019-08-09 stsp const char *got_author;
492 84792843 2019-08-09 stsp *author = NULL;
494 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
495 84792843 2019-08-09 stsp if (got_author == NULL) {
496 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
497 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
500 84792843 2019-08-09 stsp *author = got_author;
503 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
504 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
506 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
507 84792843 2019-08-09 stsp got_author++;
508 84792843 2019-08-09 stsp if (*got_author != '<')
509 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
510 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
511 84792843 2019-08-09 stsp got_author++;
512 84792843 2019-08-09 stsp if (*got_author != '@')
513 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
514 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
515 84792843 2019-08-09 stsp got_author++;
516 84792843 2019-08-09 stsp if (*got_author != '>')
517 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
519 84792843 2019-08-09 stsp return NULL;
522 84792843 2019-08-09 stsp static const struct got_error *
523 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
525 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
526 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
527 3ce1b845 2019-07-15 stsp char *editor = NULL;
528 84792843 2019-08-09 stsp const char *author;
529 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
530 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
531 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
532 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
533 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
535 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
536 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
538 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
540 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
541 3ce1b845 2019-07-15 stsp switch (ch) {
543 3ce1b845 2019-07-15 stsp branch_name = optarg;
546 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
547 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
548 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
553 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
554 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
555 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
560 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
562 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
568 3ce1b845 2019-07-15 stsp usage_init();
569 3ce1b845 2019-07-15 stsp /* NOTREACHED */
573 3ce1b845 2019-07-15 stsp argc -= optind;
574 3ce1b845 2019-07-15 stsp argv += optind;
576 3ce1b845 2019-07-15 stsp #ifndef PROFILE
577 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
578 3ce1b845 2019-07-15 stsp NULL) == -1)
579 3ce1b845 2019-07-15 stsp err(1, "pledge");
581 3ce1b845 2019-07-15 stsp if (argc != 1)
582 3ce1b845 2019-07-15 stsp usage_import();
584 84792843 2019-08-09 stsp error = get_author(&author);
586 84792843 2019-08-09 stsp return error;
588 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
589 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
590 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
591 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
593 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
594 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
598 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
599 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
603 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
604 3ce1b845 2019-07-15 stsp if (error) {
605 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
608 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
609 3ce1b845 2019-07-15 stsp "import target branch already exists");
613 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
614 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
615 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
618 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
621 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
622 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
624 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
625 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
628 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
633 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
634 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
636 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
640 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
641 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
645 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
649 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
653 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
657 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
658 3ce1b845 2019-07-15 stsp if (error) {
659 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
662 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
663 3ce1b845 2019-07-15 stsp branch_ref);
667 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
672 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
673 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
675 2c7829a4 2019-06-17 stsp free(repo_path);
676 3ce1b845 2019-07-15 stsp free(editor);
677 3ce1b845 2019-07-15 stsp free(refname);
678 3ce1b845 2019-07-15 stsp free(new_commit_id);
679 3ce1b845 2019-07-15 stsp free(id_str);
680 3ce1b845 2019-07-15 stsp if (branch_ref)
681 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
682 3ce1b845 2019-07-15 stsp if (head_ref)
683 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
684 2c7829a4 2019-06-17 stsp return error;
687 4ed7e80c 2018-05-20 stsp __dead static void
688 c09a553d 2018-03-12 stsp usage_checkout(void)
690 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
691 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
695 1ee397ad 2019-07-12 stsp static const struct got_error *
696 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
698 92a684f4 2018-03-12 stsp char *worktree_path = arg;
700 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
701 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
702 1ee397ad 2019-07-12 stsp return NULL;
704 92a684f4 2018-03-12 stsp while (path[0] == '/')
707 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
708 1ee397ad 2019-07-12 stsp return NULL;
711 99437157 2018-11-11 stsp static const struct got_error *
712 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
714 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
715 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
716 99437157 2018-11-11 stsp return NULL;
719 8069f636 2019-01-12 stsp static const struct got_error *
720 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
721 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
723 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
724 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
726 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
727 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
729 36a38700 2019-05-10 stsp return err;
731 d5bea539 2019-05-13 stsp if (yca_id == NULL)
732 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
735 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
736 d5bea539 2019-05-13 stsp * and the work tree's base commit.
738 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
740 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
748 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
749 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
750 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
752 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
753 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
754 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
756 d5bea539 2019-05-13 stsp free(yca_id);
757 d5bea539 2019-05-13 stsp return NULL;
760 a367ff0f 2019-05-14 stsp static const struct got_error *
761 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
762 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
763 a51a74b3 2019-07-27 stsp struct got_repository *repo)
765 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
766 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
767 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
768 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
770 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
774 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
775 a51a74b3 2019-07-27 stsp is_same_branch = 1;
778 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
779 a51a74b3 2019-07-27 stsp is_same_branch = 1;
783 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
787 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
792 a367ff0f 2019-05-14 stsp struct got_object_id *id;
793 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
795 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
796 a367ff0f 2019-05-14 stsp err = NULL;
798 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
800 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
807 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
809 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
810 a367ff0f 2019-05-14 stsp is_same_branch = 1;
817 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
818 a367ff0f 2019-05-14 stsp free(head_commit_id);
819 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
820 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
821 04f57cb3 2019-07-25 stsp return err;
824 04f57cb3 2019-07-25 stsp static const struct got_error *
825 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
826 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
828 04f57cb3 2019-07-25 stsp const struct got_error *err;
829 04f57cb3 2019-07-25 stsp struct got_reference *ref;
830 303e2782 2019-08-09 stsp struct got_tag_object *tag;
832 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
833 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
834 303e2782 2019-08-09 stsp if (err == NULL) {
835 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
836 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
837 303e2782 2019-08-09 stsp if (*commit_id == NULL)
838 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
839 303e2782 2019-08-09 stsp got_object_tag_close(tag);
840 303e2782 2019-08-09 stsp return err;
841 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
842 303e2782 2019-08-09 stsp return err;
844 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
845 04f57cb3 2019-07-25 stsp if (err == NULL) {
846 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
847 04f57cb3 2019-07-25 stsp got_ref_close(ref);
849 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
850 04f57cb3 2019-07-25 stsp return err;
851 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
852 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
854 a367ff0f 2019-05-14 stsp return err;
857 4ed7e80c 2018-05-20 stsp static const struct got_error *
858 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
860 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
861 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
862 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
863 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
864 c09a553d 2018-03-12 stsp char *repo_path = NULL;
865 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
866 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
867 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
868 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
869 72151b04 2019-05-11 stsp int ch, same_path_prefix;
870 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
872 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
874 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
875 0bb8a95e 2018-03-12 stsp switch (ch) {
877 08573d5b 2019-05-14 stsp branch_name = optarg;
880 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
881 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
882 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
885 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
888 2deda0b9 2019-03-07 stsp usage_checkout();
889 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
893 0bb8a95e 2018-03-12 stsp argc -= optind;
894 0bb8a95e 2018-03-12 stsp argv += optind;
896 6715a751 2018-03-16 stsp #ifndef PROFILE
897 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
898 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
899 c09a553d 2018-03-12 stsp err(1, "pledge");
901 0bb8a95e 2018-03-12 stsp if (argc == 1) {
902 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
903 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
904 76089277 2018-04-01 stsp if (repo_path == NULL)
905 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
906 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
907 76089277 2018-04-01 stsp if (cwd == NULL) {
908 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
911 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
912 230a42bd 2019-05-11 jcs base = basename(path_prefix);
913 230a42bd 2019-05-11 jcs if (base == NULL) {
914 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
915 230a42bd 2019-05-11 jcs path_prefix);
919 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
920 230a42bd 2019-05-11 jcs if (base == NULL) {
921 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
926 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
927 c09a553d 2018-03-12 stsp if (dotgit)
928 c09a553d 2018-03-12 stsp *dotgit = '\0';
929 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
930 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
935 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
936 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
937 76089277 2018-04-01 stsp if (repo_path == NULL) {
938 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
941 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
942 76089277 2018-04-01 stsp if (worktree_path == NULL) {
943 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
944 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
948 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
949 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
950 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
955 c09a553d 2018-03-12 stsp usage_checkout();
957 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
958 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
960 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
961 c09a553d 2018-03-12 stsp if (error != NULL)
964 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
965 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
966 c530dc23 2019-07-23 stsp if (error) {
967 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
968 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
970 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
971 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
972 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
977 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
981 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
982 c09a553d 2018-03-12 stsp if (error != NULL)
985 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
986 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
989 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
990 c09a553d 2018-03-12 stsp if (error != NULL)
993 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
994 e5dc7198 2018-12-29 stsp path_prefix);
995 e5dc7198 2018-12-29 stsp if (error != NULL)
997 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
998 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1002 8069f636 2019-01-12 stsp if (commit_id_str) {
1003 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1004 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1005 30837e32 2019-07-25 stsp if (error)
1006 8069f636 2019-01-12 stsp goto done;
1007 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1008 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1009 8069f636 2019-01-12 stsp if (error != NULL) {
1010 8069f636 2019-01-12 stsp free(commit_id);
1011 8069f636 2019-01-12 stsp goto done;
1013 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1014 45d344f6 2019-05-14 stsp if (error)
1015 45d344f6 2019-05-14 stsp goto done;
1016 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1017 8069f636 2019-01-12 stsp commit_id);
1018 8069f636 2019-01-12 stsp free(commit_id);
1019 8069f636 2019-01-12 stsp if (error)
1020 8069f636 2019-01-12 stsp goto done;
1023 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1024 f2ea84fa 2019-07-27 stsp if (error)
1025 f2ea84fa 2019-07-27 stsp goto done;
1026 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1027 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1028 c09a553d 2018-03-12 stsp if (error != NULL)
1029 c09a553d 2018-03-12 stsp goto done;
1031 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1034 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1035 8069f636 2019-01-12 stsp free(commit_id_str);
1036 76089277 2018-04-01 stsp free(repo_path);
1037 507dc3bb 2018-12-29 stsp free(worktree_path);
1038 507dc3bb 2018-12-29 stsp return error;
1041 507dc3bb 2018-12-29 stsp __dead static void
1042 507dc3bb 2018-12-29 stsp usage_update(void)
1044 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1045 507dc3bb 2018-12-29 stsp getprogname());
1049 1ee397ad 2019-07-12 stsp static const struct got_error *
1050 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1052 784955db 2019-01-12 stsp int *did_something = arg;
1054 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1055 1ee397ad 2019-07-12 stsp return NULL;
1057 1545c615 2019-02-10 stsp *did_something = 1;
1059 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1060 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1061 1ee397ad 2019-07-12 stsp return NULL;
1063 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1065 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1066 1ee397ad 2019-07-12 stsp return NULL;
1069 be7061eb 2018-12-30 stsp static const struct got_error *
1070 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1071 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1072 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1074 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1075 a1fb16d8 2019-05-24 stsp char *base_id_str;
1076 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1078 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1079 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1080 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1081 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1082 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1083 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1084 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1087 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1088 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1089 a1fb16d8 2019-05-24 stsp if (err) {
1090 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1091 a1fb16d8 2019-05-24 stsp return err;
1092 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1094 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1095 a1fb16d8 2019-05-24 stsp return NULL;
1097 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1098 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1099 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1101 a1fb16d8 2019-05-24 stsp return err;
1102 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1103 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1104 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1105 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1106 0ebf8283 2019-07-24 stsp return NULL;
1109 0ebf8283 2019-07-24 stsp static const struct got_error *
1110 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1112 0ebf8283 2019-07-24 stsp const struct got_error *err;
1113 0ebf8283 2019-07-24 stsp int in_progress;
1115 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1117 0ebf8283 2019-07-24 stsp return err;
1118 0ebf8283 2019-07-24 stsp if (in_progress)
1119 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1121 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1123 0ebf8283 2019-07-24 stsp return err;
1124 0ebf8283 2019-07-24 stsp if (in_progress)
1125 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1127 a1fb16d8 2019-05-24 stsp return NULL;
1130 a5edda0a 2019-07-27 stsp static const struct got_error *
1131 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1132 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1134 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1135 a5edda0a 2019-07-27 stsp char *path;
1138 a5edda0a 2019-07-27 stsp if (argc == 0) {
1139 a5edda0a 2019-07-27 stsp path = strdup("");
1140 a5edda0a 2019-07-27 stsp if (path == NULL)
1141 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1142 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1145 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1146 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1149 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1150 a5edda0a 2019-07-27 stsp if (err) {
1151 a5edda0a 2019-07-27 stsp free(path);
1156 a5edda0a 2019-07-27 stsp return err;
1159 a1fb16d8 2019-05-24 stsp static const struct got_error *
1160 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1162 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1163 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1164 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1165 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1166 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1167 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1168 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1169 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1170 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1171 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1172 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1174 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1176 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1177 507dc3bb 2018-12-29 stsp switch (ch) {
1179 024e9686 2019-05-14 stsp branch_name = optarg;
1182 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1183 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1184 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1187 2deda0b9 2019-03-07 stsp usage_update();
1188 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1192 507dc3bb 2018-12-29 stsp argc -= optind;
1193 507dc3bb 2018-12-29 stsp argv += optind;
1195 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1196 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1197 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1198 507dc3bb 2018-12-29 stsp err(1, "pledge");
1200 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1201 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1202 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1203 c4cdcb68 2019-04-03 stsp goto done;
1205 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1206 7d5807f4 2019-07-11 stsp if (error)
1207 7d5807f4 2019-07-11 stsp goto done;
1209 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1210 f2ea84fa 2019-07-27 stsp if (error)
1211 f2ea84fa 2019-07-27 stsp goto done;
1213 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1214 507dc3bb 2018-12-29 stsp if (error != NULL)
1215 507dc3bb 2018-12-29 stsp goto done;
1217 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1218 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1219 087fb88c 2019-08-04 stsp if (error)
1220 087fb88c 2019-08-04 stsp goto done;
1222 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1223 0266afb7 2019-01-04 stsp if (error)
1224 0266afb7 2019-01-04 stsp goto done;
1226 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1227 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1228 024e9686 2019-05-14 stsp if (error != NULL)
1229 024e9686 2019-05-14 stsp goto done;
1230 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1231 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1232 9c4b8182 2019-01-02 stsp if (error != NULL)
1233 9c4b8182 2019-01-02 stsp goto done;
1234 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1235 507dc3bb 2018-12-29 stsp if (error != NULL)
1236 507dc3bb 2018-12-29 stsp goto done;
1238 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1239 04f57cb3 2019-07-25 stsp free(commit_id_str);
1240 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1241 30837e32 2019-07-25 stsp if (error)
1242 a297e751 2019-07-11 stsp goto done;
1243 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1244 a297e751 2019-07-11 stsp if (error)
1245 507dc3bb 2018-12-29 stsp goto done;
1248 a1fb16d8 2019-05-24 stsp if (branch_name) {
1249 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1250 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1251 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1253 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1254 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1255 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1256 024e9686 2019-05-14 stsp goto done;
1258 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1259 024e9686 2019-05-14 stsp if (error)
1260 024e9686 2019-05-14 stsp goto done;
1261 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1262 a367ff0f 2019-05-14 stsp free(head_commit_id);
1263 024e9686 2019-05-14 stsp if (error != NULL)
1264 024e9686 2019-05-14 stsp goto done;
1265 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1266 a367ff0f 2019-05-14 stsp if (error)
1267 a367ff0f 2019-05-14 stsp goto done;
1268 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1269 024e9686 2019-05-14 stsp if (error)
1270 024e9686 2019-05-14 stsp goto done;
1272 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1273 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1274 a367ff0f 2019-05-14 stsp if (error != NULL) {
1275 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1276 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1277 024e9686 2019-05-14 stsp goto done;
1279 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1280 a367ff0f 2019-05-14 stsp if (error)
1281 a367ff0f 2019-05-14 stsp goto done;
1284 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1285 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1286 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1287 507dc3bb 2018-12-29 stsp commit_id);
1288 507dc3bb 2018-12-29 stsp if (error)
1289 507dc3bb 2018-12-29 stsp goto done;
1292 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1293 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1294 507dc3bb 2018-12-29 stsp if (error != NULL)
1295 507dc3bb 2018-12-29 stsp goto done;
1297 784955db 2019-01-12 stsp if (did_something)
1298 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1300 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1302 c09a553d 2018-03-12 stsp free(worktree_path);
1303 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1304 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1305 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1306 507dc3bb 2018-12-29 stsp free(commit_id);
1307 9c4b8182 2019-01-02 stsp free(commit_id_str);
1308 c09a553d 2018-03-12 stsp return error;
1311 f42b1b34 2018-03-12 stsp static const struct got_error *
1312 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1313 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1315 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1316 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1317 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1318 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1319 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1321 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1322 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1324 79109fed 2018-03-27 stsp return err;
1326 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1327 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1328 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1330 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1332 79109fed 2018-03-27 stsp return err;
1334 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1335 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1336 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1338 0f2b3dca 2018-12-22 stsp return err;
1340 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1342 79109fed 2018-03-27 stsp return err;
1345 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1347 0f2b3dca 2018-12-22 stsp goto done;
1349 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1350 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1351 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1352 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1353 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1355 79109fed 2018-03-27 stsp if (tree1)
1356 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1357 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1358 0f2b3dca 2018-12-22 stsp free(id_str1);
1359 0f2b3dca 2018-12-22 stsp free(id_str2);
1360 79109fed 2018-03-27 stsp return err;
1363 4bb494d5 2018-06-16 stsp static char *
1364 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1366 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1367 09867e48 2019-08-13 stsp char *p, *s;
1369 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1370 09867e48 2019-08-13 stsp if (tm == NULL)
1371 09867e48 2019-08-13 stsp return NULL;
1372 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1373 09867e48 2019-08-13 stsp if (s == NULL)
1374 09867e48 2019-08-13 stsp return NULL;
1375 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1377 6c281f94 2018-06-11 stsp *p = '\0';
1381 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1383 79109fed 2018-03-27 stsp static const struct got_error *
1384 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1385 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1386 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1388 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1389 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1390 6c281f94 2018-06-11 stsp char datebuf[26];
1391 45d799e2 2018-12-23 stsp time_t committer_time;
1392 45d799e2 2018-12-23 stsp const char *author, *committer;
1393 199a4027 2019-02-02 stsp char *refs_str = NULL;
1394 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1396 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1398 199a4027 2019-02-02 stsp const char *name;
1399 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1402 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1403 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1405 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1406 199a4027 2019-02-02 stsp name += 5;
1407 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1409 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1410 e34f9ed6 2019-02-02 stsp name += 6;
1411 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1412 141c2bff 2019-02-04 stsp name += 8;
1413 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1414 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1415 5d844a1e 2019-08-13 stsp if (err) {
1416 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1417 5d844a1e 2019-08-13 stsp return err;
1418 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1419 5d844a1e 2019-08-13 stsp err = NULL;
1420 5d844a1e 2019-08-13 stsp tag = NULL;
1423 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1424 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1426 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1427 a436ad14 2019-08-13 stsp if (cmp != 0)
1429 199a4027 2019-02-02 stsp s = refs_str;
1430 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1431 199a4027 2019-02-02 stsp name) == -1) {
1432 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1434 34ca4898 2019-08-13 stsp return err;
1438 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1440 8bf5b3c9 2018-03-17 stsp return err;
1442 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1443 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1444 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1445 832c249c 2018-06-10 stsp free(id_str);
1446 d3d493d7 2019-02-21 stsp id_str = NULL;
1447 d3d493d7 2019-02-21 stsp free(refs_str);
1448 d3d493d7 2019-02-21 stsp refs_str = NULL;
1449 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1450 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1451 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1452 09867e48 2019-08-13 stsp if (datestr)
1453 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1454 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1455 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1456 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1457 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1458 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1459 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1460 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1461 3fe1abad 2018-06-10 stsp int n = 1;
1462 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1463 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1464 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1466 a0603db2 2018-06-10 stsp return err;
1467 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1468 a0603db2 2018-06-10 stsp free(id_str);
1472 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1474 5943eee2 2019-08-13 stsp return err;
1476 621015ac 2018-07-23 stsp logmsg = logmsg0;
1478 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1480 832c249c 2018-06-10 stsp printf(" %s\n", line);
1481 832c249c 2018-06-10 stsp } while (line);
1482 621015ac 2018-07-23 stsp free(logmsg0);
1484 971751ac 2018-03-27 stsp if (show_patch) {
1485 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1486 971751ac 2018-03-27 stsp if (err == 0)
1487 971751ac 2018-03-27 stsp printf("\n");
1490 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1491 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1492 07862c20 2018-09-15 stsp return err;
1495 f42b1b34 2018-03-12 stsp static const struct got_error *
1496 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1497 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1498 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1500 f42b1b34 2018-03-12 stsp const struct got_error *err;
1501 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1503 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1504 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1506 f42b1b34 2018-03-12 stsp return err;
1507 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1509 fcc85cad 2018-07-22 stsp goto done;
1511 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1512 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1514 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1517 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1518 372ccdbb 2018-06-10 stsp if (err) {
1519 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1520 9ba79e04 2018-06-11 stsp err = NULL;
1523 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1525 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1531 b43fbaa0 2018-06-11 stsp if (id == NULL)
1534 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1537 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1539 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1540 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1544 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1545 f42b1b34 2018-03-12 stsp return err;
1548 4ed7e80c 2018-05-20 stsp __dead static void
1549 6f3d1eb0 2018-03-12 stsp usage_log(void)
1551 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1552 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1556 b1ebc001 2019-08-13 stsp static int
1557 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1559 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1560 b1ebc001 2019-08-13 stsp long long n;
1561 b1ebc001 2019-08-13 stsp const char *errstr;
1563 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1564 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1566 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1567 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1572 4ed7e80c 2018-05-20 stsp static const struct got_error *
1573 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1575 f42b1b34 2018-03-12 stsp const struct got_error *error;
1576 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1577 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1578 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1579 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1580 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1581 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1582 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1583 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1584 64a96a6d 2018-04-01 stsp const char *errstr;
1585 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1587 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1589 6715a751 2018-03-16 stsp #ifndef PROFILE
1590 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1593 f42b1b34 2018-03-12 stsp err(1, "pledge");
1596 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1598 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1599 79109fed 2018-03-27 stsp switch (ch) {
1601 79109fed 2018-03-27 stsp show_patch = 1;
1604 d142fc45 2018-04-01 stsp start_commit = optarg;
1607 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1609 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1610 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1613 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1614 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1615 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1618 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1621 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1622 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1623 04ca23f4 2018-07-16 stsp err(1, "-r option");
1624 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1627 2deda0b9 2019-03-07 stsp usage_log();
1628 79109fed 2018-03-27 stsp /* NOTREACHED */
1632 79109fed 2018-03-27 stsp argc -= optind;
1633 79109fed 2018-03-27 stsp argv += optind;
1635 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1636 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1637 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1638 04ca23f4 2018-07-16 stsp goto done;
1641 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1642 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1643 cffc0aa4 2019-02-05 stsp goto done;
1644 cffc0aa4 2019-02-05 stsp error = NULL;
1646 e7301579 2019-03-18 stsp if (argc == 0) {
1647 cbd1af7a 2019-03-18 stsp path = strdup("");
1648 e7301579 2019-03-18 stsp if (path == NULL) {
1649 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1650 cbd1af7a 2019-03-18 stsp goto done;
1652 e7301579 2019-03-18 stsp } else if (argc == 1) {
1653 e7301579 2019-03-18 stsp if (worktree) {
1654 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1656 e7301579 2019-03-18 stsp if (error)
1657 e7301579 2019-03-18 stsp goto done;
1659 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1660 e7301579 2019-03-18 stsp if (path == NULL) {
1661 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1662 e7301579 2019-03-18 stsp goto done;
1666 cbd1af7a 2019-03-18 stsp usage_log();
1668 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1669 5486daa2 2019-05-11 stsp repo_path = worktree ?
1670 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1672 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1673 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1674 cffc0aa4 2019-02-05 stsp goto done;
1677 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1678 d7d4f210 2018-03-12 stsp if (error != NULL)
1679 04ca23f4 2018-07-16 stsp goto done;
1681 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1682 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1683 c02c541e 2019-03-29 stsp if (error)
1684 c02c541e 2019-03-29 stsp goto done;
1686 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1687 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1688 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1689 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1690 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1691 3235492e 2018-04-01 stsp if (error != NULL)
1692 3235492e 2018-04-01 stsp return error;
1693 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1694 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1695 3235492e 2018-04-01 stsp if (error != NULL)
1696 3235492e 2018-04-01 stsp return error;
1697 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1699 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1700 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1701 3235492e 2018-04-01 stsp if (error == NULL) {
1702 1caad61b 2019-02-01 stsp int obj_type;
1703 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1704 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1705 d1f2edc9 2018-06-13 stsp if (error != NULL)
1706 1caad61b 2019-02-01 stsp goto done;
1707 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1708 1caad61b 2019-02-01 stsp if (error != NULL)
1709 1caad61b 2019-02-01 stsp goto done;
1710 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1711 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1712 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1713 1caad61b 2019-02-01 stsp if (error != NULL)
1714 1caad61b 2019-02-01 stsp goto done;
1715 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1716 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1717 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1718 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1719 1caad61b 2019-02-01 stsp goto done;
1722 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1723 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1724 1caad61b 2019-02-01 stsp if (id == NULL)
1725 638f9024 2019-05-13 stsp error = got_error_from_errno(
1726 230a42bd 2019-05-11 jcs "got_object_id_dup");
1727 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1728 1caad61b 2019-02-01 stsp if (error)
1729 1caad61b 2019-02-01 stsp goto done;
1730 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1731 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1732 1caad61b 2019-02-01 stsp goto done;
1734 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1735 d1f2edc9 2018-06-13 stsp if (error != NULL)
1736 1caad61b 2019-02-01 stsp goto done;
1738 15a94983 2018-12-23 stsp if (commit == NULL) {
1739 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1740 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1741 d1f2edc9 2018-06-13 stsp if (error != NULL)
1742 d1f2edc9 2018-06-13 stsp return error;
1745 d7d4f210 2018-03-12 stsp if (error != NULL)
1746 04ca23f4 2018-07-16 stsp goto done;
1748 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1749 04ca23f4 2018-07-16 stsp if (error != NULL)
1750 04ca23f4 2018-07-16 stsp goto done;
1751 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1752 04ca23f4 2018-07-16 stsp free(path);
1753 04ca23f4 2018-07-16 stsp path = in_repo_path;
1756 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1757 199a4027 2019-02-02 stsp if (error)
1758 199a4027 2019-02-02 stsp goto done;
1760 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1761 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1763 04ca23f4 2018-07-16 stsp free(path);
1764 04ca23f4 2018-07-16 stsp free(repo_path);
1765 04ca23f4 2018-07-16 stsp free(cwd);
1767 cffc0aa4 2019-02-05 stsp if (worktree)
1768 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1769 ad242220 2018-09-08 stsp if (repo) {
1770 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1771 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1772 ad242220 2018-09-08 stsp if (error == NULL)
1773 ad242220 2018-09-08 stsp error = repo_error;
1775 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1776 8bf5b3c9 2018-03-17 stsp return error;
1779 4ed7e80c 2018-05-20 stsp __dead static void
1780 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1782 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1783 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1787 b72f483a 2019-02-05 stsp struct print_diff_arg {
1788 b72f483a 2019-02-05 stsp struct got_repository *repo;
1789 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1790 b72f483a 2019-02-05 stsp int diff_context;
1791 3fc0c068 2019-02-10 stsp const char *id_str;
1792 3fc0c068 2019-02-10 stsp int header_shown;
1793 98eaaa12 2019-08-03 stsp int diff_staged;
1796 4ed7e80c 2018-05-20 stsp static const struct got_error *
1797 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1798 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1799 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1801 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1802 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1803 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1804 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1805 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1806 b72f483a 2019-02-05 stsp struct stat sb;
1808 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1809 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1810 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1811 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1812 98eaaa12 2019-08-03 stsp return NULL;
1814 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1815 98eaaa12 2019-08-03 stsp return NULL;
1816 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1817 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1818 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1819 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1820 98eaaa12 2019-08-03 stsp return NULL;
1823 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1824 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1825 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1826 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1827 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1830 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1831 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1832 98eaaa12 2019-08-03 stsp switch (staged_status) {
1833 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1834 98eaaa12 2019-08-03 stsp label1 = path;
1835 98eaaa12 2019-08-03 stsp label2 = path;
1837 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1838 98eaaa12 2019-08-03 stsp label2 = path;
1840 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
1841 98eaaa12 2019-08-03 stsp label1 = path;
1844 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
1846 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1847 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
1850 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
1851 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
1852 4ce46740 2019-08-08 stsp char *id_str;
1853 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1856 4ce46740 2019-08-08 stsp goto done;
1857 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
1859 4ce46740 2019-08-08 stsp goto done;
1860 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1861 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
1862 4ce46740 2019-08-08 stsp free(id_str);
1863 4ce46740 2019-08-08 stsp goto done;
1865 4ce46740 2019-08-08 stsp free(id_str);
1866 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
1867 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1869 4ce46740 2019-08-08 stsp goto done;
1872 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1873 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1874 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1875 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1876 2ec1f75b 2019-03-26 stsp goto done;
1879 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1880 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1881 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1882 2ec1f75b 2019-03-26 stsp goto done;
1884 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1885 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1886 2ec1f75b 2019-03-26 stsp goto done;
1889 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1891 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1892 4ce46740 2019-08-08 stsp a->diff_context, stdout);
1894 b72f483a 2019-02-05 stsp if (blob1)
1895 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1896 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1897 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1898 b72f483a 2019-02-05 stsp free(abspath);
1899 927df6b7 2019-02-10 stsp return err;
1902 927df6b7 2019-02-10 stsp static const struct got_error *
1903 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
1904 0adb7196 2019-08-11 stsp const char *id_str, int obj_type, struct got_repository *repo)
1906 0adb7196 2019-08-11 stsp const struct got_error *err;
1907 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
1908 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
1910 0adb7196 2019-08-11 stsp *id = NULL;
1911 0adb7196 2019-08-11 stsp *label = NULL;
1913 d24820bf 2019-08-11 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY, repo);
1914 d24820bf 2019-08-11 stsp if (err == NULL) {
1915 d24820bf 2019-08-11 stsp *id = got_object_id_dup(got_object_tag_get_object_id(tag));
1916 d24820bf 2019-08-11 stsp if (*id == NULL)
1917 d24820bf 2019-08-11 stsp err = got_error_from_errno("got_object_id_dup");
1918 d24820bf 2019-08-11 stsp if (asprintf(label, "refs/tags/%s",
1919 1b7a69d3 2019-08-11 stsp got_object_tag_get_name(tag)) == -1)
1920 d24820bf 2019-08-11 stsp err = got_error_from_errno("asprintf");
1921 d24820bf 2019-08-11 stsp got_object_tag_close(tag);
1922 d24820bf 2019-08-11 stsp return err;
1923 d24820bf 2019-08-11 stsp } else if (err->code != GOT_ERR_NO_OBJ)
1924 d24820bf 2019-08-11 stsp return err;
1926 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
1927 0adb7196 2019-08-11 stsp if (err) {
1928 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1929 0adb7196 2019-08-11 stsp return err;
1930 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
1931 0adb7196 2019-08-11 stsp if (err != NULL)
1932 0adb7196 2019-08-11 stsp goto done;
1933 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
1934 0adb7196 2019-08-11 stsp if (*label == NULL) {
1935 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
1936 0adb7196 2019-08-11 stsp goto done;
1938 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
1940 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
1941 0adb7196 2019-08-11 stsp if (*label == NULL) {
1942 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
1943 0adb7196 2019-08-11 stsp goto done;
1948 0adb7196 2019-08-11 stsp got_ref_close(ref);
1949 0adb7196 2019-08-11 stsp return err;
1953 0adb7196 2019-08-11 stsp static const struct got_error *
1954 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1956 b00d56cd 2018-04-01 stsp const struct got_error *error;
1957 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1958 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1959 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1960 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1961 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1962 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1963 15a94983 2018-12-23 stsp int type1, type2;
1964 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
1965 c0cc5c62 2018-10-18 stsp const char *errstr;
1966 927df6b7 2019-02-10 stsp char *path = NULL;
1968 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1969 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1970 25eccc22 2019-01-04 stsp NULL) == -1)
1971 b00d56cd 2018-04-01 stsp err(1, "pledge");
1974 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1975 b00d56cd 2018-04-01 stsp switch (ch) {
1977 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1978 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1979 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1982 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1983 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1984 b72f483a 2019-02-05 stsp err(1, "-r option");
1985 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1988 98eaaa12 2019-08-03 stsp diff_staged = 1;
1991 2deda0b9 2019-03-07 stsp usage_diff();
1992 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1996 b00d56cd 2018-04-01 stsp argc -= optind;
1997 b00d56cd 2018-04-01 stsp argv += optind;
1999 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2000 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2001 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2002 b72f483a 2019-02-05 stsp goto done;
2004 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2005 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2006 927df6b7 2019-02-10 stsp goto done;
2007 927df6b7 2019-02-10 stsp if (argc <= 1) {
2008 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2009 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2010 927df6b7 2019-02-10 stsp goto done;
2012 b72f483a 2019-02-05 stsp if (repo_path)
2014 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2015 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2016 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2017 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2018 927df6b7 2019-02-10 stsp goto done;
2020 927df6b7 2019-02-10 stsp if (argc == 1) {
2021 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2023 927df6b7 2019-02-10 stsp if (error)
2024 927df6b7 2019-02-10 stsp goto done;
2026 927df6b7 2019-02-10 stsp path = strdup("");
2027 927df6b7 2019-02-10 stsp if (path == NULL) {
2028 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2029 927df6b7 2019-02-10 stsp goto done;
2032 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2033 98eaaa12 2019-08-03 stsp if (diff_staged)
2034 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2035 98eaaa12 2019-08-03 stsp "objects in repository");
2036 15a94983 2018-12-23 stsp id_str1 = argv[0];
2037 15a94983 2018-12-23 stsp id_str2 = argv[1];
2038 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2039 30db809c 2019-06-05 stsp repo_path =
2040 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2041 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2042 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2043 30db809c 2019-06-05 stsp goto done;
2047 b00d56cd 2018-04-01 stsp usage_diff();
2049 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2050 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2051 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2052 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2055 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
2056 76089277 2018-04-01 stsp free(repo_path);
2057 b00d56cd 2018-04-01 stsp if (error != NULL)
2058 b00d56cd 2018-04-01 stsp goto done;
2060 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2061 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2062 c02c541e 2019-03-29 stsp if (error)
2063 c02c541e 2019-03-29 stsp goto done;
2065 30db809c 2019-06-05 stsp if (argc <= 1) {
2066 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2067 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2068 b72f483a 2019-02-05 stsp char *id_str;
2070 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2072 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2073 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2074 b72f483a 2019-02-05 stsp if (error)
2075 b72f483a 2019-02-05 stsp goto done;
2076 b72f483a 2019-02-05 stsp arg.repo = repo;
2077 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2078 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2079 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2080 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2081 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2083 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2084 72ea6654 2019-07-27 stsp if (error)
2085 72ea6654 2019-07-27 stsp goto done;
2087 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2088 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2089 b72f483a 2019-02-05 stsp free(id_str);
2090 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2091 b72f483a 2019-02-05 stsp goto done;
2094 0adb7196 2019-08-11 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, repo);
2095 0adb7196 2019-08-11 stsp if (error)
2096 0adb7196 2019-08-11 stsp goto done;
2098 0adb7196 2019-08-11 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, repo);
2099 0adb7196 2019-08-11 stsp if (error)
2100 0adb7196 2019-08-11 stsp goto done;
2102 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2103 15a94983 2018-12-23 stsp if (error)
2104 15a94983 2018-12-23 stsp goto done;
2106 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2107 15a94983 2018-12-23 stsp if (error)
2108 15a94983 2018-12-23 stsp goto done;
2110 15a94983 2018-12-23 stsp if (type1 != type2) {
2111 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2112 b00d56cd 2018-04-01 stsp goto done;
2115 15a94983 2018-12-23 stsp switch (type1) {
2116 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2117 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2118 54156555 2018-12-24 stsp diff_context, repo, stdout);
2120 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2121 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2122 54156555 2018-12-24 stsp diff_context, repo, stdout);
2124 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2125 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2126 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2127 c0cc5c62 2018-10-18 stsp repo, stdout);
2130 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2134 5e70831e 2019-05-28 stsp free(label1);
2135 5e70831e 2019-05-28 stsp free(label2);
2136 15a94983 2018-12-23 stsp free(id1);
2137 15a94983 2018-12-23 stsp free(id2);
2138 927df6b7 2019-02-10 stsp free(path);
2139 b72f483a 2019-02-05 stsp if (worktree)
2140 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2141 ad242220 2018-09-08 stsp if (repo) {
2142 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2143 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2144 ad242220 2018-09-08 stsp if (error == NULL)
2145 ad242220 2018-09-08 stsp error = repo_error;
2147 b00d56cd 2018-04-01 stsp return error;
2150 404c43c4 2018-06-21 stsp __dead static void
2151 404c43c4 2018-06-21 stsp usage_blame(void)
2153 9270e621 2019-02-05 stsp fprintf(stderr,
2154 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2155 404c43c4 2018-06-21 stsp getprogname());
2159 28315671 2019-08-14 stsp struct blame_line {
2160 28315671 2019-08-14 stsp int annotated;
2161 28315671 2019-08-14 stsp char *id_str;
2162 82f6abb8 2019-08-14 stsp char *committer;
2163 bcb49d15 2019-08-14 stsp char datebuf[9]; /* YY-MM-DD + NUL */
2166 28315671 2019-08-14 stsp struct blame_cb_args {
2167 28315671 2019-08-14 stsp struct blame_line *lines;
2168 28315671 2019-08-14 stsp int nlines;
2169 7ef28ff8 2019-08-14 stsp int nlines_prec;
2170 28315671 2019-08-14 stsp int lineno_cur;
2171 28315671 2019-08-14 stsp off_t *line_offsets;
2173 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2176 404c43c4 2018-06-21 stsp static const struct got_error *
2177 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2179 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2180 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2181 28315671 2019-08-14 stsp struct blame_line *bline;
2182 82f6abb8 2019-08-14 stsp char *line = NULL;
2183 28315671 2019-08-14 stsp size_t linesize = 0;
2184 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2185 28315671 2019-08-14 stsp off_t offset;
2186 bcb49d15 2019-08-14 stsp struct tm tm;
2187 bcb49d15 2019-08-14 stsp time_t committer_time;
2189 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2190 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2191 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2193 28315671 2019-08-14 stsp if (sigint_received)
2194 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2196 2839f8b9 2019-08-18 stsp if (lineno == -1)
2197 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2199 28315671 2019-08-14 stsp /* Annotate this line. */
2200 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2201 28315671 2019-08-14 stsp if (bline->annotated)
2202 28315671 2019-08-14 stsp return NULL;
2203 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2205 28315671 2019-08-14 stsp return err;
2207 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2209 82f6abb8 2019-08-14 stsp goto done;
2211 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2212 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2213 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2214 bcb49d15 2019-08-14 stsp goto done;
2217 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2218 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2219 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2220 bcb49d15 2019-08-14 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2221 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2222 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2223 82f6abb8 2019-08-14 stsp goto done;
2225 28315671 2019-08-14 stsp bline->annotated = 1;
2227 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2228 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2229 28315671 2019-08-14 stsp if (!bline->annotated)
2230 82f6abb8 2019-08-14 stsp goto done;
2232 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2233 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2234 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2235 82f6abb8 2019-08-14 stsp goto done;
2238 28315671 2019-08-14 stsp while (bline->annotated) {
2239 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2240 82f6abb8 2019-08-14 stsp size_t len;
2242 28315671 2019-08-14 stsp if (getline(&line, &linesize, a->f) == (ssize_t)-1) {
2243 28315671 2019-08-14 stsp if (ferror(a->f))
2244 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2248 82f6abb8 2019-08-14 stsp committer = bline->committer;
2249 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2250 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2251 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2252 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2254 82f6abb8 2019-08-14 stsp *at = '\0';
2255 82f6abb8 2019-08-14 stsp len = strlen(committer);
2256 82f6abb8 2019-08-14 stsp if (len >= 9)
2257 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2259 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2261 28315671 2019-08-14 stsp *nl = '\0';
2262 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2263 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2265 28315671 2019-08-14 stsp a->lineno_cur++;
2266 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2269 82f6abb8 2019-08-14 stsp if (commit)
2270 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2271 28315671 2019-08-14 stsp free(line);
2272 28315671 2019-08-14 stsp return err;
2275 28315671 2019-08-14 stsp static const struct got_error *
2276 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2278 404c43c4 2018-06-21 stsp const struct got_error *error;
2279 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2280 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2281 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2282 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2283 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2284 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2285 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2286 28315671 2019-08-14 stsp struct blame_cb_args bca;
2287 28315671 2019-08-14 stsp int ch, obj_type, i;
2288 b02560ec 2019-08-19 stsp size_t filesize;
2290 404c43c4 2018-06-21 stsp #ifndef PROFILE
2291 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2292 36e2fb66 2019-01-04 stsp NULL) == -1)
2293 404c43c4 2018-06-21 stsp err(1, "pledge");
2296 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2297 404c43c4 2018-06-21 stsp switch (ch) {
2299 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2302 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2303 66bea077 2018-08-02 stsp if (repo_path == NULL)
2304 66bea077 2018-08-02 stsp err(1, "-r option");
2305 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2308 2deda0b9 2019-03-07 stsp usage_blame();
2309 404c43c4 2018-06-21 stsp /* NOTREACHED */
2313 404c43c4 2018-06-21 stsp argc -= optind;
2314 404c43c4 2018-06-21 stsp argv += optind;
2316 a39318fd 2018-08-02 stsp if (argc == 1)
2317 404c43c4 2018-06-21 stsp path = argv[0];
2319 404c43c4 2018-06-21 stsp usage_blame();
2321 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2322 66bea077 2018-08-02 stsp if (cwd == NULL) {
2323 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2324 66bea077 2018-08-02 stsp goto done;
2326 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2327 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2328 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2329 66bea077 2018-08-02 stsp goto done;
2331 0c06baac 2019-02-05 stsp error = NULL;
2332 0c06baac 2019-02-05 stsp if (worktree) {
2333 0c06baac 2019-02-05 stsp repo_path =
2334 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2335 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2336 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2337 0c06baac 2019-02-05 stsp if (error)
2338 0c06baac 2019-02-05 stsp goto done;
2340 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2341 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2342 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2343 0c06baac 2019-02-05 stsp goto done;
2348 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2349 c02c541e 2019-03-29 stsp if (error != NULL)
2350 36e2fb66 2019-01-04 stsp goto done;
2352 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2353 c02c541e 2019-03-29 stsp if (error)
2354 404c43c4 2018-06-21 stsp goto done;
2356 0c06baac 2019-02-05 stsp if (worktree) {
2357 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2358 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2359 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2360 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2361 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2362 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2363 6efaaa2d 2019-02-05 stsp path) == -1) {
2364 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2365 0c06baac 2019-02-05 stsp goto done;
2367 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2370 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2372 0c06baac 2019-02-05 stsp if (error)
2373 66bea077 2018-08-02 stsp goto done;
2375 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2376 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2377 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2378 404c43c4 2018-06-21 stsp if (error != NULL)
2379 66bea077 2018-08-02 stsp goto done;
2380 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2381 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2382 404c43c4 2018-06-21 stsp if (error != NULL)
2383 66bea077 2018-08-02 stsp goto done;
2385 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2386 30837e32 2019-07-25 stsp if (error)
2387 66bea077 2018-08-02 stsp goto done;
2390 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2391 28315671 2019-08-14 stsp if (error)
2392 28315671 2019-08-14 stsp goto done;
2393 28315671 2019-08-14 stsp if (obj_id == NULL) {
2394 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2395 28315671 2019-08-14 stsp goto done;
2398 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2399 28315671 2019-08-14 stsp if (error)
2400 28315671 2019-08-14 stsp goto done;
2402 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2403 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2404 28315671 2019-08-14 stsp goto done;
2407 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2408 28315671 2019-08-14 stsp if (error)
2409 28315671 2019-08-14 stsp goto done;
2410 28315671 2019-08-14 stsp bca.f = got_opentemp();
2411 28315671 2019-08-14 stsp if (bca.f == NULL) {
2412 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2413 28315671 2019-08-14 stsp goto done;
2415 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2416 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2417 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2418 28315671 2019-08-14 stsp goto done;
2420 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2421 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2422 b02560ec 2019-08-19 stsp bca.nlines--;
2424 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2425 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2426 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2427 28315671 2019-08-14 stsp goto done;
2429 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2430 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2431 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2432 7ef28ff8 2019-08-14 stsp while (i > 0) {
2434 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2436 82f6abb8 2019-08-14 stsp bca.repo = repo;
2438 0d8ff7d5 2019-08-14 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca);
2439 28315671 2019-08-14 stsp if (error)
2440 28315671 2019-08-14 stsp goto done;
2442 66bea077 2018-08-02 stsp free(in_repo_path);
2443 66bea077 2018-08-02 stsp free(repo_path);
2444 66bea077 2018-08-02 stsp free(cwd);
2445 404c43c4 2018-06-21 stsp free(commit_id);
2446 28315671 2019-08-14 stsp free(obj_id);
2448 28315671 2019-08-14 stsp got_object_blob_close(blob);
2449 0c06baac 2019-02-05 stsp if (worktree)
2450 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2451 ad242220 2018-09-08 stsp if (repo) {
2452 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2453 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2454 ad242220 2018-09-08 stsp if (error == NULL)
2455 ad242220 2018-09-08 stsp error = repo_error;
2457 28315671 2019-08-14 stsp for (i = 0; i < bca.nlines; i++) {
2458 28315671 2019-08-14 stsp struct blame_line *bline = &bca.lines[i];
2459 28315671 2019-08-14 stsp free(bline->id_str);
2460 82f6abb8 2019-08-14 stsp free(bline->committer);
2462 28315671 2019-08-14 stsp free(bca.lines);
2463 28315671 2019-08-14 stsp free(bca.line_offsets);
2464 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2465 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2466 404c43c4 2018-06-21 stsp return error;
2469 5de5890b 2018-10-18 stsp __dead static void
2470 5de5890b 2018-10-18 stsp usage_tree(void)
2472 c1669e2e 2019-01-09 stsp fprintf(stderr,
2473 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2474 5de5890b 2018-10-18 stsp getprogname());
2478 c1669e2e 2019-01-09 stsp static void
2479 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2480 c1669e2e 2019-01-09 stsp const char *root_path)
2482 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2483 848d6979 2019-08-12 stsp const char *modestr = "";
2485 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2486 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2489 848d6979 2019-08-12 stsp if (S_ISLNK(te->mode))
2490 848d6979 2019-08-12 stsp modestr = "@";
2491 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
2492 848d6979 2019-08-12 stsp modestr = "/";
2493 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
2494 848d6979 2019-08-12 stsp modestr = "*";
2496 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2497 848d6979 2019-08-12 stsp is_root_path ? "" : "/", te->name, modestr);
2500 5de5890b 2018-10-18 stsp static const struct got_error *
2501 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2502 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2503 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2505 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2506 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2507 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2508 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2509 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2511 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2513 5de5890b 2018-10-18 stsp goto done;
2515 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2517 5de5890b 2018-10-18 stsp goto done;
2518 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2519 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2520 5de5890b 2018-10-18 stsp while (te) {
2521 5de5890b 2018-10-18 stsp char *id = NULL;
2523 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2526 5de5890b 2018-10-18 stsp if (show_ids) {
2527 5de5890b 2018-10-18 stsp char *id_str;
2528 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2530 5de5890b 2018-10-18 stsp goto done;
2531 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2532 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2533 5de5890b 2018-10-18 stsp free(id_str);
2534 5de5890b 2018-10-18 stsp goto done;
2536 5de5890b 2018-10-18 stsp free(id_str);
2538 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2541 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2542 c1669e2e 2019-01-09 stsp char *child_path;
2543 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2544 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2545 c1669e2e 2019-01-09 stsp te->name) == -1) {
2546 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2547 c1669e2e 2019-01-09 stsp goto done;
2549 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2550 c1669e2e 2019-01-09 stsp root_path, repo);
2551 c1669e2e 2019-01-09 stsp free(child_path);
2553 c1669e2e 2019-01-09 stsp goto done;
2556 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2560 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2561 5de5890b 2018-10-18 stsp free(tree_id);
2562 5de5890b 2018-10-18 stsp return err;
2565 5de5890b 2018-10-18 stsp static const struct got_error *
2566 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2568 5de5890b 2018-10-18 stsp const struct got_error *error;
2569 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2570 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2571 7a2c19d6 2019-02-05 stsp const char *path;
2572 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2573 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2574 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2575 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2578 5de5890b 2018-10-18 stsp #ifndef PROFILE
2579 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2580 0f8d269b 2019-01-04 stsp NULL) == -1)
2581 5de5890b 2018-10-18 stsp err(1, "pledge");
2584 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2585 5de5890b 2018-10-18 stsp switch (ch) {
2587 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2590 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2591 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2592 5de5890b 2018-10-18 stsp err(1, "-r option");
2593 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2596 5de5890b 2018-10-18 stsp show_ids = 1;
2599 c1669e2e 2019-01-09 stsp recurse = 1;
2602 2deda0b9 2019-03-07 stsp usage_tree();
2603 5de5890b 2018-10-18 stsp /* NOTREACHED */
2607 5de5890b 2018-10-18 stsp argc -= optind;
2608 5de5890b 2018-10-18 stsp argv += optind;
2610 5de5890b 2018-10-18 stsp if (argc == 1)
2611 5de5890b 2018-10-18 stsp path = argv[0];
2612 5de5890b 2018-10-18 stsp else if (argc > 1)
2613 5de5890b 2018-10-18 stsp usage_tree();
2615 7a2c19d6 2019-02-05 stsp path = NULL;
2617 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2618 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2619 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2620 9bf7a39b 2019-02-05 stsp goto done;
2622 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2623 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2624 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2625 7a2c19d6 2019-02-05 stsp goto done;
2627 7a2c19d6 2019-02-05 stsp error = NULL;
2628 7a2c19d6 2019-02-05 stsp if (worktree) {
2629 7a2c19d6 2019-02-05 stsp repo_path =
2630 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2631 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2632 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2633 7a2c19d6 2019-02-05 stsp if (error)
2634 7a2c19d6 2019-02-05 stsp goto done;
2636 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2637 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2638 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2639 7a2c19d6 2019-02-05 stsp goto done;
2644 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2645 5de5890b 2018-10-18 stsp if (error != NULL)
2646 c02c541e 2019-03-29 stsp goto done;
2648 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2649 c02c541e 2019-03-29 stsp if (error)
2650 5de5890b 2018-10-18 stsp goto done;
2652 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2653 9bf7a39b 2019-02-05 stsp if (worktree) {
2654 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2655 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2656 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2657 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2658 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2659 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2660 9bf7a39b 2019-02-05 stsp goto done;
2662 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2664 9bf7a39b 2019-02-05 stsp if (error)
2665 9bf7a39b 2019-02-05 stsp goto done;
2667 9bf7a39b 2019-02-05 stsp path = "/";
2669 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2670 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2671 9bf7a39b 2019-02-05 stsp if (error != NULL)
2672 9bf7a39b 2019-02-05 stsp goto done;
2675 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2676 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2677 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2678 5de5890b 2018-10-18 stsp if (error != NULL)
2679 5de5890b 2018-10-18 stsp goto done;
2680 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2681 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2682 5de5890b 2018-10-18 stsp if (error != NULL)
2683 5de5890b 2018-10-18 stsp goto done;
2685 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2686 30837e32 2019-07-25 stsp if (error)
2687 5de5890b 2018-10-18 stsp goto done;
2690 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2691 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2693 5de5890b 2018-10-18 stsp free(in_repo_path);
2694 5de5890b 2018-10-18 stsp free(repo_path);
2695 5de5890b 2018-10-18 stsp free(cwd);
2696 5de5890b 2018-10-18 stsp free(commit_id);
2697 7a2c19d6 2019-02-05 stsp if (worktree)
2698 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2699 5de5890b 2018-10-18 stsp if (repo) {
2700 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2701 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2702 5de5890b 2018-10-18 stsp if (error == NULL)
2703 5de5890b 2018-10-18 stsp error = repo_error;
2705 5de5890b 2018-10-18 stsp return error;
2708 6bad629b 2019-02-04 stsp __dead static void
2709 6bad629b 2019-02-04 stsp usage_status(void)
2711 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2715 b72f483a 2019-02-05 stsp static const struct got_error *
2716 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2717 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2718 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2720 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2721 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2722 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2723 b72f483a 2019-02-05 stsp return NULL;
2726 6bad629b 2019-02-04 stsp static const struct got_error *
2727 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2729 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2730 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2731 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2732 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2733 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2734 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2737 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2739 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2740 6bad629b 2019-02-04 stsp switch (ch) {
2742 2deda0b9 2019-03-07 stsp usage_status();
2743 6bad629b 2019-02-04 stsp /* NOTREACHED */
2747 6bad629b 2019-02-04 stsp argc -= optind;
2748 6bad629b 2019-02-04 stsp argv += optind;
2750 6bad629b 2019-02-04 stsp #ifndef PROFILE
2751 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2752 6bad629b 2019-02-04 stsp NULL) == -1)
2753 6bad629b 2019-02-04 stsp err(1, "pledge");
2755 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2756 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2757 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2758 927df6b7 2019-02-10 stsp goto done;
2761 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2762 927df6b7 2019-02-10 stsp if (error != NULL)
2763 a5edda0a 2019-07-27 stsp goto done;
2765 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2766 6bad629b 2019-02-04 stsp if (error != NULL)
2767 6bad629b 2019-02-04 stsp goto done;
2769 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2770 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2771 087fb88c 2019-08-04 stsp if (error)
2772 087fb88c 2019-08-04 stsp goto done;
2774 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2775 6bad629b 2019-02-04 stsp if (error)
2776 6bad629b 2019-02-04 stsp goto done;
2778 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2779 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2781 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2782 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2783 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2784 927df6b7 2019-02-10 stsp free(cwd);
2785 d0eebce4 2019-03-11 stsp return error;
2788 d0eebce4 2019-03-11 stsp __dead static void
2789 d0eebce4 2019-03-11 stsp usage_ref(void)
2791 d0eebce4 2019-03-11 stsp fprintf(stderr,
2792 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2793 d0eebce4 2019-03-11 stsp getprogname());
2797 d0eebce4 2019-03-11 stsp static const struct got_error *
2798 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2800 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2801 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2802 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2804 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2805 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2807 d0eebce4 2019-03-11 stsp return err;
2809 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2810 d0eebce4 2019-03-11 stsp char *refstr;
2811 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2812 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2813 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2814 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2815 d0eebce4 2019-03-11 stsp free(refstr);
2818 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2819 d0eebce4 2019-03-11 stsp return NULL;
2822 d0eebce4 2019-03-11 stsp static const struct got_error *
2823 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2825 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2826 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2828 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2830 d0eebce4 2019-03-11 stsp return err;
2832 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2833 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2834 d0eebce4 2019-03-11 stsp return err;
2837 d0eebce4 2019-03-11 stsp static const struct got_error *
2838 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2840 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2841 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2842 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2845 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2846 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2847 d1644381 2019-07-14 stsp * an unintended typo.
2849 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2850 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2852 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2854 d83d9d5c 2019-05-13 stsp if (err) {
2855 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2857 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2858 d83d9d5c 2019-05-13 stsp return err;
2859 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2861 d83d9d5c 2019-05-13 stsp return err;
2862 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2863 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2865 d83d9d5c 2019-05-13 stsp return err;
2868 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2870 d0eebce4 2019-03-11 stsp goto done;
2872 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2875 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2877 d1c1ae5f 2019-08-12 stsp return err;
2880 d1c1ae5f 2019-08-12 stsp static const struct got_error *
2881 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
2883 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
2884 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
2885 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
2888 d1c1ae5f 2019-08-12 stsp * Don't let the user create a reference named '-'.
2889 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
2890 d1c1ae5f 2019-08-12 stsp * an unintended typo.
2892 d1c1ae5f 2019-08-12 stsp if (refname[0] == '-' && refname[1] == '\0')
2893 d1c1ae5f 2019-08-12 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2895 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
2897 d1c1ae5f 2019-08-12 stsp return err;
2899 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
2901 d1c1ae5f 2019-08-12 stsp goto done;
2903 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
2905 d1c1ae5f 2019-08-12 stsp if (target_ref)
2906 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
2908 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
2909 d0eebce4 2019-03-11 stsp return err;
2912 d0eebce4 2019-03-11 stsp static const struct got_error *
2913 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2915 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2916 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2917 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2918 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2919 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
2920 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2922 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2923 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
2924 d0eebce4 2019-03-11 stsp switch (ch) {
2926 d0eebce4 2019-03-11 stsp delref = optarg;
2929 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2930 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2931 d0eebce4 2019-03-11 stsp err(1, "-r option");
2932 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2935 d0eebce4 2019-03-11 stsp do_list = 1;
2938 d1c1ae5f 2019-08-12 stsp create_symref = 1;
2941 d0eebce4 2019-03-11 stsp usage_ref();
2942 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2946 d0eebce4 2019-03-11 stsp if (do_list && delref)
2947 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2949 d0eebce4 2019-03-11 stsp argc -= optind;
2950 d0eebce4 2019-03-11 stsp argv += optind;
2952 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2953 d1c1ae5f 2019-08-12 stsp if (create_symref)
2954 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
2955 d1c1ae5f 2019-08-12 stsp "-l or -d options");
2956 d0eebce4 2019-03-11 stsp if (argc > 0)
2957 d0eebce4 2019-03-11 stsp usage_ref();
2958 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2959 d0eebce4 2019-03-11 stsp usage_ref();
2961 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2962 e0b57350 2019-03-12 stsp if (do_list) {
2963 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2964 e0b57350 2019-03-12 stsp NULL) == -1)
2965 e0b57350 2019-03-12 stsp err(1, "pledge");
2967 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2968 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2969 e0b57350 2019-03-12 stsp err(1, "pledge");
2972 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2973 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2974 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2975 d0eebce4 2019-03-11 stsp goto done;
2978 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2979 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2980 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2981 d0eebce4 2019-03-11 stsp goto done;
2983 d0eebce4 2019-03-11 stsp error = NULL;
2984 d0eebce4 2019-03-11 stsp if (worktree) {
2985 d0eebce4 2019-03-11 stsp repo_path =
2986 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2987 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2988 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2989 d0eebce4 2019-03-11 stsp if (error)
2990 d0eebce4 2019-03-11 stsp goto done;
2992 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2993 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2994 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2995 d0eebce4 2019-03-11 stsp goto done;
3000 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
3001 d0eebce4 2019-03-11 stsp if (error != NULL)
3002 d0eebce4 2019-03-11 stsp goto done;
3004 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3005 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3006 c02c541e 2019-03-29 stsp if (error)
3007 c02c541e 2019-03-29 stsp goto done;
3009 d0eebce4 2019-03-11 stsp if (do_list)
3010 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3011 d0eebce4 2019-03-11 stsp else if (delref)
3012 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3013 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3014 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3016 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3019 4e759de4 2019-06-26 stsp got_repo_close(repo);
3020 4e759de4 2019-06-26 stsp if (worktree)
3021 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3022 4e759de4 2019-06-26 stsp free(cwd);
3023 4e759de4 2019-06-26 stsp free(repo_path);
3024 4e759de4 2019-06-26 stsp return error;
3027 4e759de4 2019-06-26 stsp __dead static void
3028 4e759de4 2019-06-26 stsp usage_branch(void)
3030 4e759de4 2019-06-26 stsp fprintf(stderr,
3031 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
3032 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
3036 4e759de4 2019-06-26 stsp static const struct got_error *
3037 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3039 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3040 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3041 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3043 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3045 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
3047 4e759de4 2019-06-26 stsp return err;
3049 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3050 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
3051 4e759de4 2019-06-26 stsp char *refstr;
3052 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
3053 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
3055 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
3056 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3057 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
3058 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
3060 ba882ee3 2019-07-11 stsp return err;
3061 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
3062 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3063 ba882ee3 2019-07-11 stsp marker = "* ";
3065 ba882ee3 2019-07-11 stsp marker = "~ ";
3068 4e759de4 2019-06-26 stsp refname += 11;
3069 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
3070 4e759de4 2019-06-26 stsp if (refstr == NULL)
3071 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
3072 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
3073 4e759de4 2019-06-26 stsp free(refstr);
3076 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3077 4e759de4 2019-06-26 stsp return NULL;
3080 4e759de4 2019-06-26 stsp static const struct got_error *
3081 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
3083 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3084 4e759de4 2019-06-26 stsp struct got_reference *ref;
3085 4e759de4 2019-06-26 stsp char *refname;
3087 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3088 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3090 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3092 4e759de4 2019-06-26 stsp goto done;
3094 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
3095 4e759de4 2019-06-26 stsp got_ref_close(ref);
3097 4e759de4 2019-06-26 stsp free(refname);
3098 4e759de4 2019-06-26 stsp return err;
3101 4e759de4 2019-06-26 stsp static const struct got_error *
3102 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3103 4e759de4 2019-06-26 stsp const char *base_branch)
3105 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3106 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
3107 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3108 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3109 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
3112 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
3113 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3114 d3f84d51 2019-07-11 stsp * an unintended typo.
3116 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
3117 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3119 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
3120 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
3121 4e759de4 2019-06-26 stsp if (base_refname == NULL)
3122 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
3123 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
3124 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3126 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
3128 4e759de4 2019-06-26 stsp goto done;
3129 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
3130 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
3132 4e759de4 2019-06-26 stsp goto done;
3134 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3135 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3136 4e759de4 2019-06-26 stsp goto done;
3139 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3140 4e759de4 2019-06-26 stsp if (err == NULL) {
3141 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3142 4e759de4 2019-06-26 stsp goto done;
3143 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3144 4e759de4 2019-06-26 stsp goto done;
3146 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
3148 4e759de4 2019-06-26 stsp goto done;
3150 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3153 4e759de4 2019-06-26 stsp got_ref_close(ref);
3155 4e759de4 2019-06-26 stsp free(base_refname);
3156 4e759de4 2019-06-26 stsp free(refname);
3157 4e759de4 2019-06-26 stsp return err;
3160 4e759de4 2019-06-26 stsp static const struct got_error *
3161 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3163 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3164 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3165 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3166 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3167 4e759de4 2019-06-26 stsp int ch, do_list = 0;
3168 4e759de4 2019-06-26 stsp const char *delref = NULL;
3170 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3171 4e759de4 2019-06-26 stsp switch (ch) {
3173 4e759de4 2019-06-26 stsp delref = optarg;
3176 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3177 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3178 4e759de4 2019-06-26 stsp err(1, "-r option");
3179 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3182 4e759de4 2019-06-26 stsp do_list = 1;
3185 4e759de4 2019-06-26 stsp usage_branch();
3186 4e759de4 2019-06-26 stsp /* NOTREACHED */
3190 4e759de4 2019-06-26 stsp if (do_list && delref)
3191 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3193 4e759de4 2019-06-26 stsp argc -= optind;
3194 4e759de4 2019-06-26 stsp argv += optind;
3196 4e759de4 2019-06-26 stsp if (do_list || delref) {
3197 4e759de4 2019-06-26 stsp if (argc > 0)
3198 4e759de4 2019-06-26 stsp usage_branch();
3199 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
3200 4e759de4 2019-06-26 stsp usage_branch();
3202 4e759de4 2019-06-26 stsp #ifndef PROFILE
3203 4e759de4 2019-06-26 stsp if (do_list) {
3204 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3205 4e759de4 2019-06-26 stsp NULL) == -1)
3206 4e759de4 2019-06-26 stsp err(1, "pledge");
3208 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3209 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3210 4e759de4 2019-06-26 stsp err(1, "pledge");
3213 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3214 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3215 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3216 4e759de4 2019-06-26 stsp goto done;
3219 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3220 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3221 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3222 4e759de4 2019-06-26 stsp goto done;
3224 4e759de4 2019-06-26 stsp error = NULL;
3225 4e759de4 2019-06-26 stsp if (worktree) {
3226 4e759de4 2019-06-26 stsp repo_path =
3227 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3228 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3229 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3230 4e759de4 2019-06-26 stsp if (error)
3231 4e759de4 2019-06-26 stsp goto done;
3233 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3234 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3235 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3236 4e759de4 2019-06-26 stsp goto done;
3241 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
3242 4e759de4 2019-06-26 stsp if (error != NULL)
3243 4e759de4 2019-06-26 stsp goto done;
3245 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3246 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3247 4e759de4 2019-06-26 stsp if (error)
3248 4e759de4 2019-06-26 stsp goto done;
3250 4e759de4 2019-06-26 stsp if (do_list)
3251 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3252 4e759de4 2019-06-26 stsp else if (delref)
3253 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
3255 4e759de4 2019-06-26 stsp const char *base_branch;
3256 4e759de4 2019-06-26 stsp if (argc == 1) {
3257 4e759de4 2019-06-26 stsp base_branch = worktree ?
3258 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3259 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3260 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
3261 dc5351b4 2019-07-30 stsp base_branch += 11;
3263 4e759de4 2019-06-26 stsp base_branch = argv[1];
3264 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
3268 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3269 d0eebce4 2019-03-11 stsp if (worktree)
3270 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3271 d0eebce4 2019-03-11 stsp free(cwd);
3272 d0eebce4 2019-03-11 stsp free(repo_path);
3273 d00136be 2019-03-26 stsp return error;
3276 d00136be 2019-03-26 stsp __dead static void
3277 d00136be 2019-03-26 stsp usage_add(void)
3279 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3283 d00136be 2019-03-26 stsp static const struct got_error *
3284 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
3286 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
3287 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
3288 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
3289 1dd54920 2019-05-11 stsp char *cwd = NULL;
3290 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
3291 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3294 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
3296 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3297 d00136be 2019-03-26 stsp switch (ch) {
3299 d00136be 2019-03-26 stsp usage_add();
3300 d00136be 2019-03-26 stsp /* NOTREACHED */
3304 d00136be 2019-03-26 stsp argc -= optind;
3305 d00136be 2019-03-26 stsp argv += optind;
3307 43012d58 2019-07-14 stsp #ifndef PROFILE
3308 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3309 43012d58 2019-07-14 stsp NULL) == -1)
3310 43012d58 2019-07-14 stsp err(1, "pledge");
3312 723c305c 2019-05-11 jcs if (argc < 1)
3313 d00136be 2019-03-26 stsp usage_add();
3315 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
3316 d00136be 2019-03-26 stsp if (cwd == NULL) {
3317 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3318 d00136be 2019-03-26 stsp goto done;
3321 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3322 d00136be 2019-03-26 stsp if (error)
3323 d00136be 2019-03-26 stsp goto done;
3325 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3326 031a5338 2019-03-26 stsp if (error != NULL)
3327 031a5338 2019-03-26 stsp goto done;
3329 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3330 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3331 d00136be 2019-03-26 stsp if (error)
3332 d00136be 2019-03-26 stsp goto done;
3334 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3335 6d022e97 2019-08-04 stsp if (error)
3336 6d022e97 2019-08-04 stsp goto done;
3338 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
3339 1dd54920 2019-05-11 stsp NULL, repo);
3342 031a5338 2019-03-26 stsp got_repo_close(repo);
3343 d00136be 2019-03-26 stsp if (worktree)
3344 d00136be 2019-03-26 stsp got_worktree_close(worktree);
3345 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
3346 1dd54920 2019-05-11 stsp free((char *)pe->path);
3347 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
3348 2ec1f75b 2019-03-26 stsp free(cwd);
3349 2ec1f75b 2019-03-26 stsp return error;
3352 2ec1f75b 2019-03-26 stsp __dead static void
3353 648e4ef7 2019-07-09 stsp usage_remove(void)
3355 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3359 2ec1f75b 2019-03-26 stsp static const struct got_error *
3360 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
3362 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
3363 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
3364 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
3365 17ed4618 2019-06-02 stsp char *cwd = NULL;
3366 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
3367 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3368 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
3370 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
3372 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
3373 2ec1f75b 2019-03-26 stsp switch (ch) {
3375 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
3378 2ec1f75b 2019-03-26 stsp usage_add();
3379 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
3383 2ec1f75b 2019-03-26 stsp argc -= optind;
3384 2ec1f75b 2019-03-26 stsp argv += optind;
3386 43012d58 2019-07-14 stsp #ifndef PROFILE
3387 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3388 43012d58 2019-07-14 stsp NULL) == -1)
3389 43012d58 2019-07-14 stsp err(1, "pledge");
3391 17ed4618 2019-06-02 stsp if (argc < 1)
3392 648e4ef7 2019-07-09 stsp usage_remove();
3394 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
3395 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
3396 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3397 2ec1f75b 2019-03-26 stsp goto done;
3399 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3400 2ec1f75b 2019-03-26 stsp if (error)
3401 2ec1f75b 2019-03-26 stsp goto done;
3403 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3405 2ec1f75b 2019-03-26 stsp goto done;
3407 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3408 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3409 2ec1f75b 2019-03-26 stsp if (error)
3410 2ec1f75b 2019-03-26 stsp goto done;
3412 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3413 6d022e97 2019-08-04 stsp if (error)
3414 6d022e97 2019-08-04 stsp goto done;
3416 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
3417 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
3418 a129376b 2019-03-28 stsp if (error)
3419 a129376b 2019-03-28 stsp goto done;
3422 a129376b 2019-03-28 stsp got_repo_close(repo);
3423 a129376b 2019-03-28 stsp if (worktree)
3424 a129376b 2019-03-28 stsp got_worktree_close(worktree);
3425 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
3426 17ed4618 2019-06-02 stsp free((char *)pe->path);
3427 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
3428 a129376b 2019-03-28 stsp free(cwd);
3429 a129376b 2019-03-28 stsp return error;
3432 a129376b 2019-03-28 stsp __dead static void
3433 a129376b 2019-03-28 stsp usage_revert(void)
3435 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
3436 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
3440 1ee397ad 2019-07-12 stsp static const struct got_error *
3441 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
3443 a129376b 2019-03-28 stsp while (path[0] == '/')
3445 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
3446 33aa809d 2019-08-08 stsp return NULL;
3449 33aa809d 2019-08-08 stsp struct choose_patch_arg {
3450 33aa809d 2019-08-08 stsp FILE *patch_script_file;
3451 33aa809d 2019-08-08 stsp const char *action;
3454 33aa809d 2019-08-08 stsp static const struct got_error *
3455 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
3456 33aa809d 2019-08-08 stsp int nchanges, const char *action)
3458 33aa809d 2019-08-08 stsp char *line = NULL;
3459 33aa809d 2019-08-08 stsp size_t linesize = 0;
3460 33aa809d 2019-08-08 stsp ssize_t linelen;
3462 33aa809d 2019-08-08 stsp switch (status) {
3463 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
3464 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
3466 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
3467 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
3469 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
3470 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
3471 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
3472 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3473 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
3474 33aa809d 2019-08-08 stsp printf("%s", line);
3475 33aa809d 2019-08-08 stsp if (ferror(patch_file))
3476 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3477 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3478 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
3479 33aa809d 2019-08-08 stsp path, n, nchanges, action);
3482 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
3485 33aa809d 2019-08-08 stsp return NULL;
3488 33aa809d 2019-08-08 stsp static const struct got_error *
3489 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
3490 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
3492 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3493 33aa809d 2019-08-08 stsp char *line = NULL;
3494 33aa809d 2019-08-08 stsp size_t linesize = 0;
3495 33aa809d 2019-08-08 stsp ssize_t linelen;
3496 33aa809d 2019-08-08 stsp int resp = ' ';
3497 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
3499 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3501 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
3503 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
3504 33aa809d 2019-08-08 stsp a->action);
3506 33aa809d 2019-08-08 stsp return err;
3507 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
3508 33aa809d 2019-08-08 stsp if (linelen == -1) {
3509 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
3510 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3511 33aa809d 2019-08-08 stsp return NULL;
3513 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
3515 33aa809d 2019-08-08 stsp *nl = '\0';
3516 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
3517 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
3518 33aa809d 2019-08-08 stsp printf("y\n");
3519 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
3520 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
3521 33aa809d 2019-08-08 stsp printf("n\n");
3522 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
3523 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
3524 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
3525 33aa809d 2019-08-08 stsp printf("q\n");
3527 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
3528 33aa809d 2019-08-08 stsp free(line);
3529 33aa809d 2019-08-08 stsp return NULL;
3532 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
3533 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
3534 33aa809d 2019-08-08 stsp a->action);
3536 33aa809d 2019-08-08 stsp return err;
3537 33aa809d 2019-08-08 stsp resp = getchar();
3538 33aa809d 2019-08-08 stsp if (resp == '\n')
3539 33aa809d 2019-08-08 stsp resp = getchar();
3540 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
3541 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
3542 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
3543 33aa809d 2019-08-08 stsp resp = ' ';
3545 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
3546 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
3547 33aa809d 2019-08-08 stsp resp = ' ';
3551 33aa809d 2019-08-08 stsp if (resp == 'y')
3552 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
3553 33aa809d 2019-08-08 stsp else if (resp == 'n')
3554 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
3555 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
3556 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
3558 1ee397ad 2019-07-12 stsp return NULL;
3562 a129376b 2019-03-28 stsp static const struct got_error *
3563 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
3565 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
3566 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
3567 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
3568 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
3569 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
3570 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
3571 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
3572 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
3573 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
3574 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
3576 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3578 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
3579 a129376b 2019-03-28 stsp switch (ch) {
3581 33aa809d 2019-08-08 stsp pflag = 1;
3584 33aa809d 2019-08-08 stsp patch_script_path = optarg;
3587 0f6d7415 2019-08-08 stsp can_recurse = 1;
3590 a129376b 2019-03-28 stsp usage_revert();
3591 a129376b 2019-03-28 stsp /* NOTREACHED */
3595 a129376b 2019-03-28 stsp argc -= optind;
3596 a129376b 2019-03-28 stsp argv += optind;
3598 43012d58 2019-07-14 stsp #ifndef PROFILE
3599 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3600 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3601 43012d58 2019-07-14 stsp err(1, "pledge");
3603 e20a8b6f 2019-06-04 stsp if (argc < 1)
3604 a129376b 2019-03-28 stsp usage_revert();
3605 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
3606 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
3608 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3609 a129376b 2019-03-28 stsp if (cwd == NULL) {
3610 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3611 a129376b 2019-03-28 stsp goto done;
3613 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3614 2ec1f75b 2019-03-26 stsp if (error)
3615 2ec1f75b 2019-03-26 stsp goto done;
3617 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3618 a129376b 2019-03-28 stsp if (error != NULL)
3619 a129376b 2019-03-28 stsp goto done;
3621 33aa809d 2019-08-08 stsp if (patch_script_path) {
3622 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
3623 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
3624 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
3625 33aa809d 2019-08-08 stsp patch_script_path);
3626 33aa809d 2019-08-08 stsp goto done;
3629 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3630 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3631 a129376b 2019-03-28 stsp if (error)
3632 a129376b 2019-03-28 stsp goto done;
3634 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3635 6d022e97 2019-08-04 stsp if (error)
3636 6d022e97 2019-08-04 stsp goto done;
3638 0f6d7415 2019-08-08 stsp if (!can_recurse) {
3639 0f6d7415 2019-08-08 stsp char *ondisk_path;
3640 0f6d7415 2019-08-08 stsp struct stat sb;
3641 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
3642 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3643 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
3644 0f6d7415 2019-08-08 stsp pe->path) == -1) {
3645 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
3646 0f6d7415 2019-08-08 stsp goto done;
3648 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
3649 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
3650 0f6d7415 2019-08-08 stsp free(ondisk_path);
3653 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
3654 0f6d7415 2019-08-08 stsp ondisk_path);
3655 0f6d7415 2019-08-08 stsp free(ondisk_path);
3656 0f6d7415 2019-08-08 stsp goto done;
3658 0f6d7415 2019-08-08 stsp free(ondisk_path);
3659 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
3660 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3661 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
3662 0f6d7415 2019-08-08 stsp goto done;
3667 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
3668 33aa809d 2019-08-08 stsp cpa.action = "revert";
3669 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
3670 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
3671 a129376b 2019-03-28 stsp if (error)
3672 a129376b 2019-03-28 stsp goto done;
3674 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
3675 33aa809d 2019-08-08 stsp error == NULL)
3676 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
3678 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3679 2ec1f75b 2019-03-26 stsp if (worktree)
3680 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3681 2ec1f75b 2019-03-26 stsp free(path);
3682 d00136be 2019-03-26 stsp free(cwd);
3683 6bad629b 2019-02-04 stsp return error;
3686 c4296144 2019-05-09 stsp __dead static void
3687 c4296144 2019-05-09 stsp usage_commit(void)
3689 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
3690 5c1e53bc 2019-07-28 stsp getprogname());
3694 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3695 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3696 e2ba3d07 2019-05-13 stsp const char *editor;
3697 e0870e44 2019-05-13 stsp const char *worktree_path;
3698 76d98825 2019-06-03 stsp const char *branch_name;
3699 314a6357 2019-05-13 stsp const char *repo_path;
3700 e0870e44 2019-05-13 stsp char *logmsg_path;
3704 33ad4cbe 2019-05-12 jcs static const struct got_error *
3705 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3708 76d98825 2019-06-03 stsp char *initial_content = NULL;
3709 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3710 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3711 e0870e44 2019-05-13 stsp char *template = NULL;
3712 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3714 33ad4cbe 2019-05-12 jcs size_t len;
3716 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3717 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3718 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3719 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3720 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3721 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3722 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3723 33ad4cbe 2019-05-12 jcs return NULL;
3726 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3727 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3729 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3730 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3731 76d98825 2019-06-03 stsp a->branch_name) == -1)
3732 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3734 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3736 e0870e44 2019-05-13 stsp goto done;
3738 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3740 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3741 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3742 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3743 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3744 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3748 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3750 e2af0fd1 2019-08-08 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3751 e2af0fd1 2019-08-08 stsp unlink(a->logmsg_path);
3752 e2af0fd1 2019-08-08 stsp free(a->logmsg_path);
3753 e2af0fd1 2019-08-08 stsp a->logmsg_path = NULL;
3755 76d98825 2019-06-03 stsp free(initial_content);
3756 e0870e44 2019-05-13 stsp free(template);
3758 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3759 3ce1b845 2019-07-15 stsp if (err == NULL) {
3760 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
3761 3ce1b845 2019-07-15 stsp if (err) {
3762 3ce1b845 2019-07-15 stsp free(*logmsg);
3763 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3766 33ad4cbe 2019-05-12 jcs return err;
3769 c4296144 2019-05-09 stsp static const struct got_error *
3770 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3772 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3773 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3774 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3775 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
3776 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3777 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3778 84792843 2019-08-09 stsp const char *author;
3779 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3780 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3781 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
3782 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
3784 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
3785 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
3787 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3788 c4296144 2019-05-09 stsp switch (ch) {
3790 c4296144 2019-05-09 stsp logmsg = optarg;
3793 c4296144 2019-05-09 stsp usage_commit();
3794 c4296144 2019-05-09 stsp /* NOTREACHED */
3798 c4296144 2019-05-09 stsp argc -= optind;
3799 c4296144 2019-05-09 stsp argv += optind;
3801 43012d58 2019-07-14 stsp #ifndef PROFILE
3802 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3803 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3804 43012d58 2019-07-14 stsp err(1, "pledge");
3806 84792843 2019-08-09 stsp error = get_author(&author);
3807 84792843 2019-08-09 stsp if (error)
3808 84792843 2019-08-09 stsp return error;
3810 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3811 c4296144 2019-05-09 stsp if (cwd == NULL) {
3812 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3813 c4296144 2019-05-09 stsp goto done;
3815 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3816 7d5807f4 2019-07-11 stsp if (error)
3817 7d5807f4 2019-07-11 stsp goto done;
3819 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3820 c4296144 2019-05-09 stsp if (error)
3821 a698f62e 2019-07-25 stsp goto done;
3822 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
3823 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
3824 c4296144 2019-05-09 stsp goto done;
3827 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
3828 916f288c 2019-07-30 stsp worktree);
3829 5c1e53bc 2019-07-28 stsp if (error)
3830 5c1e53bc 2019-07-28 stsp goto done;
3832 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3833 c4296144 2019-05-09 stsp if (error != NULL)
3834 c4296144 2019-05-09 stsp goto done;
3837 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3838 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3840 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3841 314a6357 2019-05-13 stsp error = get_editor(&editor);
3843 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3844 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3845 c4296144 2019-05-09 stsp if (error)
3846 c4296144 2019-05-09 stsp goto done;
3848 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3849 087fb88c 2019-08-04 stsp if (error)
3850 087fb88c 2019-08-04 stsp goto done;
3852 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3853 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3854 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3855 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3856 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
3857 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
3858 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
3859 916f288c 2019-07-30 stsp goto done;
3861 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
3863 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3864 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
3865 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3866 e0870e44 2019-05-13 stsp if (error) {
3867 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3868 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3869 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3870 c4296144 2019-05-09 stsp goto done;
3873 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3874 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3876 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3877 c4296144 2019-05-09 stsp if (error)
3878 c4296144 2019-05-09 stsp goto done;
3879 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3881 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
3883 c4296144 2019-05-09 stsp got_repo_close(repo);
3884 c4296144 2019-05-09 stsp if (worktree)
3885 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3886 c4296144 2019-05-09 stsp free(cwd);
3887 c4296144 2019-05-09 stsp free(id_str);
3888 e2ba3d07 2019-05-13 stsp free(editor);
3889 234035bc 2019-06-01 stsp return error;
3892 234035bc 2019-06-01 stsp __dead static void
3893 234035bc 2019-06-01 stsp usage_cherrypick(void)
3895 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3899 234035bc 2019-06-01 stsp static const struct got_error *
3900 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3902 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3903 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3904 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3905 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3906 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3907 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3908 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3909 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3910 234035bc 2019-06-01 stsp int ch, did_something = 0;
3912 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3913 234035bc 2019-06-01 stsp switch (ch) {
3915 234035bc 2019-06-01 stsp usage_cherrypick();
3916 234035bc 2019-06-01 stsp /* NOTREACHED */
3920 234035bc 2019-06-01 stsp argc -= optind;
3921 234035bc 2019-06-01 stsp argv += optind;
3923 43012d58 2019-07-14 stsp #ifndef PROFILE
3924 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3925 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3926 43012d58 2019-07-14 stsp err(1, "pledge");
3928 234035bc 2019-06-01 stsp if (argc != 1)
3929 234035bc 2019-06-01 stsp usage_cherrypick();
3931 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3932 234035bc 2019-06-01 stsp if (cwd == NULL) {
3933 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3934 234035bc 2019-06-01 stsp goto done;
3936 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3937 234035bc 2019-06-01 stsp if (error)
3938 234035bc 2019-06-01 stsp goto done;
3940 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3941 234035bc 2019-06-01 stsp if (error != NULL)
3942 234035bc 2019-06-01 stsp goto done;
3944 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3945 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3946 234035bc 2019-06-01 stsp if (error)
3947 234035bc 2019-06-01 stsp goto done;
3949 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3950 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3951 234035bc 2019-06-01 stsp if (error != NULL) {
3952 234035bc 2019-06-01 stsp struct got_reference *ref;
3953 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3954 234035bc 2019-06-01 stsp goto done;
3955 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3956 234035bc 2019-06-01 stsp if (error != NULL)
3957 234035bc 2019-06-01 stsp goto done;
3958 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3959 234035bc 2019-06-01 stsp got_ref_close(ref);
3960 234035bc 2019-06-01 stsp if (error != NULL)
3961 234035bc 2019-06-01 stsp goto done;
3963 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3964 234035bc 2019-06-01 stsp if (error)
3965 234035bc 2019-06-01 stsp goto done;
3967 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3968 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3969 234035bc 2019-06-01 stsp if (error != NULL)
3970 234035bc 2019-06-01 stsp goto done;
3972 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3973 234035bc 2019-06-01 stsp if (error) {
3974 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3975 234035bc 2019-06-01 stsp goto done;
3976 234035bc 2019-06-01 stsp error = NULL;
3978 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3979 234035bc 2019-06-01 stsp goto done;
3982 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3983 234035bc 2019-06-01 stsp if (error)
3984 234035bc 2019-06-01 stsp goto done;
3985 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3986 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3987 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3989 234035bc 2019-06-01 stsp if (error != NULL)
3990 234035bc 2019-06-01 stsp goto done;
3992 234035bc 2019-06-01 stsp if (did_something)
3993 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3995 234035bc 2019-06-01 stsp if (commit)
3996 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3997 234035bc 2019-06-01 stsp free(commit_id_str);
3998 234035bc 2019-06-01 stsp if (head_ref)
3999 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4000 234035bc 2019-06-01 stsp if (worktree)
4001 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4003 234035bc 2019-06-01 stsp got_repo_close(repo);
4004 c4296144 2019-05-09 stsp return error;
4007 5ef14e63 2019-06-02 stsp __dead static void
4008 5ef14e63 2019-06-02 stsp usage_backout(void)
4010 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4014 5ef14e63 2019-06-02 stsp static const struct got_error *
4015 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4017 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4018 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4019 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4020 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4021 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4022 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4023 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4024 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4025 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4027 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4028 5ef14e63 2019-06-02 stsp switch (ch) {
4030 5ef14e63 2019-06-02 stsp usage_backout();
4031 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4035 5ef14e63 2019-06-02 stsp argc -= optind;
4036 5ef14e63 2019-06-02 stsp argv += optind;
4038 43012d58 2019-07-14 stsp #ifndef PROFILE
4039 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4040 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4041 43012d58 2019-07-14 stsp err(1, "pledge");
4043 5ef14e63 2019-06-02 stsp if (argc != 1)
4044 5ef14e63 2019-06-02 stsp usage_backout();
4046 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4047 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4048 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4049 5ef14e63 2019-06-02 stsp goto done;
4051 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4052 5ef14e63 2019-06-02 stsp if (error)
4053 5ef14e63 2019-06-02 stsp goto done;
4055 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4056 5ef14e63 2019-06-02 stsp if (error != NULL)
4057 5ef14e63 2019-06-02 stsp goto done;
4059 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4060 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4061 5ef14e63 2019-06-02 stsp if (error)
4062 5ef14e63 2019-06-02 stsp goto done;
4064 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4065 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4066 5ef14e63 2019-06-02 stsp if (error != NULL) {
4067 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4068 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4069 5ef14e63 2019-06-02 stsp goto done;
4070 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4071 5ef14e63 2019-06-02 stsp if (error != NULL)
4072 5ef14e63 2019-06-02 stsp goto done;
4073 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4074 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4075 5ef14e63 2019-06-02 stsp if (error != NULL)
4076 5ef14e63 2019-06-02 stsp goto done;
4078 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4079 5ef14e63 2019-06-02 stsp if (error)
4080 5ef14e63 2019-06-02 stsp goto done;
4082 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4083 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4084 5ef14e63 2019-06-02 stsp if (error != NULL)
4085 5ef14e63 2019-06-02 stsp goto done;
4087 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4088 5ef14e63 2019-06-02 stsp if (error)
4089 5ef14e63 2019-06-02 stsp goto done;
4091 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4092 5ef14e63 2019-06-02 stsp if (error)
4093 5ef14e63 2019-06-02 stsp goto done;
4094 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4095 5ef14e63 2019-06-02 stsp if (pid == NULL) {
4096 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
4097 5ef14e63 2019-06-02 stsp goto done;
4100 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4101 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
4102 5ef14e63 2019-06-02 stsp if (error != NULL)
4103 5ef14e63 2019-06-02 stsp goto done;
4105 5ef14e63 2019-06-02 stsp if (did_something)
4106 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
4108 5ef14e63 2019-06-02 stsp if (commit)
4109 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
4110 5ef14e63 2019-06-02 stsp free(commit_id_str);
4111 5ef14e63 2019-06-02 stsp if (head_ref)
4112 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
4113 818c7501 2019-07-11 stsp if (worktree)
4114 818c7501 2019-07-11 stsp got_worktree_close(worktree);
4116 818c7501 2019-07-11 stsp got_repo_close(repo);
4117 818c7501 2019-07-11 stsp return error;
4120 818c7501 2019-07-11 stsp __dead static void
4121 818c7501 2019-07-11 stsp usage_rebase(void)
4123 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4124 af54c8f8 2019-07-11 stsp getprogname());
4129 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
4132 0ebf8283 2019-07-24 stsp size_t len;
4134 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
4135 0ebf8283 2019-07-24 stsp if (len > limit)
4136 0ebf8283 2019-07-24 stsp len = limit;
4137 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
4138 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
4140 0ebf8283 2019-07-24 stsp *nl = '\0';
4143 0ebf8283 2019-07-24 stsp static const struct got_error *
4144 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4146 5943eee2 2019-08-13 stsp const struct got_error *err;
4147 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
4148 5943eee2 2019-08-13 stsp const char *s;
4150 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
4152 5943eee2 2019-08-13 stsp return err;
4154 5943eee2 2019-08-13 stsp s = logmsg0;
4155 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
4158 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
4159 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
4160 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4161 5943eee2 2019-08-13 stsp goto done;
4164 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
4166 5943eee2 2019-08-13 stsp free(logmsg0);
4167 5943eee2 2019-08-13 stsp return err;
4170 818c7501 2019-07-11 stsp static const struct got_error *
4171 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
4172 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
4174 818c7501 2019-07-11 stsp const struct got_error *err;
4175 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4177 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
4179 818c7501 2019-07-11 stsp goto done;
4181 ff0d2220 2019-07-11 stsp if (new_id) {
4182 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
4184 ff0d2220 2019-07-11 stsp goto done;
4187 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
4188 ff0d2220 2019-07-11 stsp if (new_id_str)
4189 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
4191 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4193 0ebf8283 2019-07-24 stsp goto done;
4195 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
4196 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4198 818c7501 2019-07-11 stsp free(old_id_str);
4199 818c7501 2019-07-11 stsp free(new_id_str);
4200 818c7501 2019-07-11 stsp return err;
4203 1ee397ad 2019-07-12 stsp static const struct got_error *
4204 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
4206 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
4208 818c7501 2019-07-11 stsp while (path[0] == '/')
4210 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
4212 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
4213 1ee397ad 2019-07-12 stsp return NULL;
4214 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4215 818c7501 2019-07-11 stsp *rebase_status = status;
4216 1ee397ad 2019-07-12 stsp return NULL;
4219 818c7501 2019-07-11 stsp static const struct got_error *
4220 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4221 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
4222 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
4224 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
4225 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
4226 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
4229 818c7501 2019-07-11 stsp static const struct got_error *
4230 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
4231 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4232 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
4233 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4235 ff0d2220 2019-07-11 stsp const struct got_error *error;
4236 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
4237 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
4239 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4240 ff0d2220 2019-07-11 stsp if (error)
4241 ff0d2220 2019-07-11 stsp return error;
4243 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4244 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
4245 ff0d2220 2019-07-11 stsp if (error) {
4246 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4247 ff0d2220 2019-07-11 stsp goto done;
4248 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
4250 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
4251 ff0d2220 2019-07-11 stsp free(new_commit_id);
4254 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
4255 ff0d2220 2019-07-11 stsp return error;
4258 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
4259 64c6d990 2019-07-11 stsp const char *path_prefix;
4260 64c6d990 2019-07-11 stsp size_t len;
4261 8ca9bd68 2019-07-25 stsp int errcode;
4264 64c6d990 2019-07-11 stsp static const struct got_error *
4265 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4266 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
4267 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
4268 64c6d990 2019-07-11 stsp struct got_repository *repo)
4270 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
4272 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4273 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4274 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
4276 64c6d990 2019-07-11 stsp return NULL;
4279 64c6d990 2019-07-11 stsp static const struct got_error *
4280 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
4281 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
4282 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
4284 64c6d990 2019-07-11 stsp const struct got_error *err;
4285 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4286 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
4287 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
4289 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
4290 64c6d990 2019-07-11 stsp return NULL;
4292 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4294 64c6d990 2019-07-11 stsp goto done;
4296 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4298 64c6d990 2019-07-11 stsp goto done;
4300 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
4301 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
4303 64c6d990 2019-07-11 stsp goto done;
4305 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
4306 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
4308 64c6d990 2019-07-11 stsp goto done;
4310 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
4311 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
4312 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
4313 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
4314 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
4315 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
4316 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
4318 64c6d990 2019-07-11 stsp if (tree1)
4319 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
4320 64c6d990 2019-07-11 stsp if (tree2)
4321 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
4322 64c6d990 2019-07-11 stsp if (commit)
4323 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
4324 64c6d990 2019-07-11 stsp if (parent_commit)
4325 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
4326 64c6d990 2019-07-11 stsp return err;
4329 ff0d2220 2019-07-11 stsp static const struct got_error *
4330 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
4331 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
4332 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4333 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
4334 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
4336 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
4337 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
4338 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
4339 af61c510 2019-07-19 stsp struct got_object_qid *qid;
4340 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
4342 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4344 af61c510 2019-07-19 stsp return err;
4346 af61c510 2019-07-19 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo);
4348 af61c510 2019-07-19 stsp goto done;
4349 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4350 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
4351 af61c510 2019-07-19 stsp if (err) {
4352 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
4353 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
4354 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
4355 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
4356 af61c510 2019-07-19 stsp "been reached?!?");
4357 af61c510 2019-07-19 stsp goto done;
4358 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4359 af61c510 2019-07-19 stsp goto done;
4360 af61c510 2019-07-19 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
4362 af61c510 2019-07-19 stsp goto done;
4364 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
4365 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
4367 af61c510 2019-07-19 stsp goto done;
4369 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
4371 af61c510 2019-07-19 stsp goto done;
4372 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4373 af61c510 2019-07-19 stsp commit_id = parent_id;
4377 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
4378 af61c510 2019-07-19 stsp return err;
4381 af61c510 2019-07-19 stsp static const struct got_error *
4382 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
4384 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
4385 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
4386 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
4387 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
4388 818c7501 2019-07-11 stsp char *cwd = NULL;
4389 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
4390 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4391 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
4392 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
4393 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4394 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
4395 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4396 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4397 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
4398 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
4399 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
4400 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
4402 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
4403 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
4405 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
4406 818c7501 2019-07-11 stsp switch (ch) {
4408 818c7501 2019-07-11 stsp abort_rebase = 1;
4411 818c7501 2019-07-11 stsp continue_rebase = 1;
4414 818c7501 2019-07-11 stsp usage_rebase();
4415 818c7501 2019-07-11 stsp /* NOTREACHED */
4419 818c7501 2019-07-11 stsp argc -= optind;
4420 818c7501 2019-07-11 stsp argv += optind;
4422 43012d58 2019-07-14 stsp #ifndef PROFILE
4423 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4424 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4425 43012d58 2019-07-14 stsp err(1, "pledge");
4427 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
4428 818c7501 2019-07-11 stsp usage_rebase();
4429 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
4430 818c7501 2019-07-11 stsp if (argc != 0)
4431 818c7501 2019-07-11 stsp usage_rebase();
4432 818c7501 2019-07-11 stsp } else if (argc != 1)
4433 818c7501 2019-07-11 stsp usage_rebase();
4435 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
4436 818c7501 2019-07-11 stsp if (cwd == NULL) {
4437 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
4438 818c7501 2019-07-11 stsp goto done;
4440 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
4441 818c7501 2019-07-11 stsp if (error)
4442 818c7501 2019-07-11 stsp goto done;
4444 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4445 818c7501 2019-07-11 stsp if (error != NULL)
4446 818c7501 2019-07-11 stsp goto done;
4448 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4449 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4450 818c7501 2019-07-11 stsp if (error)
4451 818c7501 2019-07-11 stsp goto done;
4453 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4454 818c7501 2019-07-11 stsp if (error)
4455 818c7501 2019-07-11 stsp goto done;
4457 f6794adc 2019-07-23 stsp if (abort_rebase) {
4458 818c7501 2019-07-11 stsp int did_something;
4459 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4460 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4461 f6794adc 2019-07-23 stsp goto done;
4463 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4464 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4465 3e3a69f1 2019-07-25 stsp worktree, repo);
4466 818c7501 2019-07-11 stsp if (error)
4467 818c7501 2019-07-11 stsp goto done;
4468 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
4469 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
4470 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
4471 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
4472 818c7501 2019-07-11 stsp if (error)
4473 818c7501 2019-07-11 stsp goto done;
4474 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
4475 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
4478 818c7501 2019-07-11 stsp if (continue_rebase) {
4479 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4480 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4481 f6794adc 2019-07-23 stsp goto done;
4483 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4484 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4485 3e3a69f1 2019-07-25 stsp worktree, repo);
4486 818c7501 2019-07-11 stsp if (error)
4487 818c7501 2019-07-11 stsp goto done;
4489 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
4490 01757395 2019-07-12 stsp resume_commit_id, repo);
4491 818c7501 2019-07-11 stsp if (error)
4492 818c7501 2019-07-11 stsp goto done;
4494 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
4495 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
4496 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
4497 818c7501 2019-07-11 stsp goto done;
4500 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
4501 818c7501 2019-07-11 stsp if (error != NULL)
4502 818c7501 2019-07-11 stsp goto done;
4505 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
4506 ff0d2220 2019-07-11 stsp if (error)
4507 ff0d2220 2019-07-11 stsp goto done;
4509 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
4510 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
4512 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
4513 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
4514 a51a74b3 2019-07-27 stsp base_commit_id, branch_head_commit_id, repo);
4515 818c7501 2019-07-11 stsp if (error)
4516 818c7501 2019-07-11 stsp goto done;
4517 818c7501 2019-07-11 stsp if (yca_id == NULL) {
4518 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
4519 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
4520 818c7501 2019-07-11 stsp "with work tree's branch");
4521 818c7501 2019-07-11 stsp goto done;
4524 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
4525 a51a74b3 2019-07-27 stsp if (error) {
4526 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
4527 a51a74b3 2019-07-27 stsp goto done;
4528 a51a74b3 2019-07-27 stsp error = NULL;
4530 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
4531 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
4532 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
4533 a51a74b3 2019-07-27 stsp goto done;
4535 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
4536 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
4537 818c7501 2019-07-11 stsp if (error)
4538 818c7501 2019-07-11 stsp goto done;
4541 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
4542 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4543 818c7501 2019-07-11 stsp if (error)
4544 818c7501 2019-07-11 stsp goto done;
4546 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4547 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
4548 fc66b545 2019-08-12 stsp if (pid == NULL) {
4549 fc66b545 2019-08-12 stsp if (!continue_rebase) {
4550 fc66b545 2019-08-12 stsp int did_something;
4551 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
4552 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
4553 fc66b545 2019-08-12 stsp &did_something);
4554 fc66b545 2019-08-12 stsp if (error)
4555 fc66b545 2019-08-12 stsp goto done;
4556 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
4557 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
4559 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
4560 fc66b545 2019-08-12 stsp goto done;
4562 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
4563 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
4564 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
4565 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4566 818c7501 2019-07-11 stsp commit = NULL;
4567 818c7501 2019-07-11 stsp if (error)
4568 818c7501 2019-07-11 stsp goto done;
4570 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
4571 ff0d2220 2019-07-11 stsp if (continue_rebase)
4572 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
4573 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
4575 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
4576 818c7501 2019-07-11 stsp goto done;
4579 818c7501 2019-07-11 stsp pid = NULL;
4580 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
4581 818c7501 2019-07-11 stsp commit_id = qid->id;
4582 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
4583 818c7501 2019-07-11 stsp pid = qid;
4585 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
4586 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
4587 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
4588 818c7501 2019-07-11 stsp if (error)
4589 818c7501 2019-07-11 stsp goto done;
4591 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4592 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4596 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
4597 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
4598 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4599 818c7501 2019-07-11 stsp if (error)
4600 818c7501 2019-07-11 stsp goto done;
4603 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4604 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
4605 818c7501 2019-07-11 stsp if (error)
4606 818c7501 2019-07-11 stsp goto done;
4607 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
4608 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
4610 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
4611 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
4613 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
4614 818c7501 2019-07-11 stsp free(branch_head_commit_id);
4615 818c7501 2019-07-11 stsp free(resume_commit_id);
4616 818c7501 2019-07-11 stsp free(yca_id);
4617 818c7501 2019-07-11 stsp if (commit)
4618 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4619 818c7501 2019-07-11 stsp if (branch)
4620 818c7501 2019-07-11 stsp got_ref_close(branch);
4621 818c7501 2019-07-11 stsp if (new_base_branch)
4622 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
4623 818c7501 2019-07-11 stsp if (tmp_branch)
4624 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
4625 5ef14e63 2019-06-02 stsp if (worktree)
4626 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
4628 5ef14e63 2019-06-02 stsp got_repo_close(repo);
4629 5ef14e63 2019-06-02 stsp return error;
4632 0ebf8283 2019-07-24 stsp __dead static void
4633 0ebf8283 2019-07-24 stsp usage_histedit(void)
4635 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
4636 0ebf8283 2019-07-24 stsp getprogname());
4640 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
4641 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
4642 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
4643 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
4644 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
4646 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
4647 0ebf8283 2019-07-24 stsp unsigned char code;
4648 0ebf8283 2019-07-24 stsp const char *name;
4649 0ebf8283 2019-07-24 stsp const char *desc;
4650 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
4651 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
4652 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4653 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4654 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4655 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
4656 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
4659 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
4660 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
4661 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
4662 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4663 0ebf8283 2019-07-24 stsp char *logmsg;
4665 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4667 0ebf8283 2019-07-24 stsp static const struct got_error *
4668 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4669 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4671 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4672 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
4673 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4676 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4678 0ebf8283 2019-07-24 stsp goto done;
4680 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
4682 0ebf8283 2019-07-24 stsp goto done;
4684 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
4686 0ebf8283 2019-07-24 stsp goto done;
4688 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4689 0ebf8283 2019-07-24 stsp if (n < 0)
4690 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4692 0ebf8283 2019-07-24 stsp if (commit)
4693 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4694 0ebf8283 2019-07-24 stsp free(id_str);
4695 0ebf8283 2019-07-24 stsp free(logmsg);
4696 0ebf8283 2019-07-24 stsp return err;
4699 0ebf8283 2019-07-24 stsp static const struct got_error *
4700 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4701 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4703 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4704 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
4706 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
4707 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4709 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4710 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4716 0ebf8283 2019-07-24 stsp return err;
4719 0ebf8283 2019-07-24 stsp static const struct got_error *
4720 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
4722 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4725 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
4726 0ebf8283 2019-07-24 stsp if (n < 0)
4727 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4729 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4730 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4731 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
4732 0ebf8283 2019-07-24 stsp cmd->desc);
4733 0ebf8283 2019-07-24 stsp if (n < 0) {
4734 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4738 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
4739 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
4740 0ebf8283 2019-07-24 stsp if (n < 0)
4741 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4742 0ebf8283 2019-07-24 stsp return err;
4745 0ebf8283 2019-07-24 stsp static const struct got_error *
4746 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
4748 0ebf8283 2019-07-24 stsp static char msg[42];
4751 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4753 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
4754 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4756 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4759 0ebf8283 2019-07-24 stsp static const struct got_error *
4760 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4761 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
4763 0ebf8283 2019-07-24 stsp const struct got_error *err;
4764 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
4765 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
4767 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4769 0ebf8283 2019-07-24 stsp return err;
4771 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4773 0ebf8283 2019-07-24 stsp goto done;
4775 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
4777 5943eee2 2019-08-13 stsp goto done;
4778 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4779 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4780 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
4781 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4782 0ebf8283 2019-07-24 stsp goto done;
4785 0ebf8283 2019-07-24 stsp if (folded_commit)
4786 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
4787 0ebf8283 2019-07-24 stsp free(id_str);
4788 5943eee2 2019-08-13 stsp free(folded_logmsg);
4789 0ebf8283 2019-07-24 stsp return err;
4792 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
4793 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
4795 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
4797 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
4798 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4799 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
4800 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4801 3f9de99f 2019-07-24 stsp folded = prev;
4802 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
4805 0ebf8283 2019-07-24 stsp return folded;
4808 0ebf8283 2019-07-24 stsp static const struct got_error *
4809 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4810 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4812 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
4813 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4814 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4815 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4817 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
4819 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4821 0ebf8283 2019-07-24 stsp return err;
4823 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
4824 0ebf8283 2019-07-24 stsp if (folded) {
4825 0ebf8283 2019-07-24 stsp while (folded != hle) {
4826 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4827 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4830 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
4831 0ebf8283 2019-07-24 stsp logmsg, repo);
4833 0ebf8283 2019-07-24 stsp goto done;
4834 0ebf8283 2019-07-24 stsp free(logmsg);
4835 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4836 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4840 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4842 0ebf8283 2019-07-24 stsp goto done;
4843 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
4845 5943eee2 2019-08-13 stsp goto done;
4846 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
4847 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
4848 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
4849 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4850 0ebf8283 2019-07-24 stsp goto done;
4852 0ebf8283 2019-07-24 stsp free(logmsg);
4853 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4855 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4857 0ebf8283 2019-07-24 stsp goto done;
4859 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4861 0ebf8283 2019-07-24 stsp goto done;
4863 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
4864 0ebf8283 2019-07-24 stsp close(fd);
4866 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4868 0ebf8283 2019-07-24 stsp goto done;
4870 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4871 0ebf8283 2019-07-24 stsp if (err) {
4872 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4873 0ebf8283 2019-07-24 stsp goto done;
4874 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
4877 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4878 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
4879 0ebf8283 2019-07-24 stsp free(logmsg_path);
4880 0ebf8283 2019-07-24 stsp free(logmsg);
4881 5943eee2 2019-08-13 stsp free(orig_logmsg);
4882 0ebf8283 2019-07-24 stsp free(editor);
4883 0ebf8283 2019-07-24 stsp if (commit)
4884 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4885 0ebf8283 2019-07-24 stsp return err;
4888 0ebf8283 2019-07-24 stsp static const struct got_error *
4889 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
4890 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4892 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4893 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
4894 0ebf8283 2019-07-24 stsp size_t size;
4895 0ebf8283 2019-07-24 stsp ssize_t len;
4896 0ebf8283 2019-07-24 stsp int lineno = 0, i;
4897 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4898 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4899 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
4901 0ebf8283 2019-07-24 stsp for (;;) {
4902 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
4903 0ebf8283 2019-07-24 stsp if (len == -1) {
4904 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
4905 0ebf8283 2019-07-24 stsp if (feof(f))
4907 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
4908 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
4913 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4915 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
4916 0ebf8283 2019-07-24 stsp free(line);
4917 0ebf8283 2019-07-24 stsp line = NULL;
4920 0ebf8283 2019-07-24 stsp cmd = NULL;
4921 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4922 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
4923 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4924 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
4925 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
4928 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4933 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
4934 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4937 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4939 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
4940 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
4941 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
4944 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
4945 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4949 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
4950 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
4951 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4955 0ebf8283 2019-07-24 stsp free(line);
4956 0ebf8283 2019-07-24 stsp line = NULL;
4960 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
4962 0ebf8283 2019-07-24 stsp *end = '\0';
4964 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
4965 0ebf8283 2019-07-24 stsp if (err) {
4966 0ebf8283 2019-07-24 stsp /* override error code */
4967 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4971 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
4972 0ebf8283 2019-07-24 stsp if (hle == NULL) {
4973 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
4976 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
4977 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
4978 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
4979 0ebf8283 2019-07-24 stsp commit_id = NULL;
4980 0ebf8283 2019-07-24 stsp free(line);
4981 0ebf8283 2019-07-24 stsp line = NULL;
4982 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4985 0ebf8283 2019-07-24 stsp free(line);
4986 0ebf8283 2019-07-24 stsp free(commit_id);
4987 0ebf8283 2019-07-24 stsp return err;
4990 0ebf8283 2019-07-24 stsp static const struct got_error *
4991 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
4992 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4994 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
4995 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
4996 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4997 bfce7f83 2019-07-27 stsp static char msg[80];
4998 bfce7f83 2019-07-27 stsp char *id_str;
5000 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5001 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5002 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5003 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5004 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5006 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5007 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5008 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5011 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5012 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5014 bfce7f83 2019-07-27 stsp return err;
5015 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5016 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5017 bfce7f83 2019-07-27 stsp free(id_str);
5018 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5022 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5023 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5024 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5025 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5027 bfce7f83 2019-07-27 stsp return NULL;
5030 bfce7f83 2019-07-27 stsp static const struct got_error *
5031 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5032 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5033 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5035 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5036 0ebf8283 2019-07-24 stsp char *editor;
5037 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5039 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5041 0ebf8283 2019-07-24 stsp return err;
5043 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5044 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5045 0ebf8283 2019-07-24 stsp goto done;
5048 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5049 0ebf8283 2019-07-24 stsp if (f == NULL) {
5050 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5051 0ebf8283 2019-07-24 stsp goto done;
5053 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5055 bfce7f83 2019-07-27 stsp goto done;
5057 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
5059 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5060 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5061 0ebf8283 2019-07-24 stsp free(editor);
5062 0ebf8283 2019-07-24 stsp return err;
5065 0ebf8283 2019-07-24 stsp static const struct got_error *
5066 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5067 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
5069 0ebf8283 2019-07-24 stsp static const struct got_error *
5070 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
5071 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5073 0ebf8283 2019-07-24 stsp const struct got_error *err;
5074 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5075 0ebf8283 2019-07-24 stsp char *path = NULL;
5077 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
5079 0ebf8283 2019-07-24 stsp return err;
5081 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
5083 0ebf8283 2019-07-24 stsp goto done;
5085 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
5087 0ebf8283 2019-07-24 stsp goto done;
5089 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
5090 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5091 0ebf8283 2019-07-24 stsp goto done;
5095 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
5096 0ebf8283 2019-07-24 stsp if (err) {
5097 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5098 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5099 0ebf8283 2019-07-24 stsp goto done;
5100 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
5101 0ebf8283 2019-07-24 stsp commits, path, repo);
5104 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5105 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5106 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
5107 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
5108 0ebf8283 2019-07-24 stsp free(path);
5109 0ebf8283 2019-07-24 stsp return err;
5112 0ebf8283 2019-07-24 stsp static const struct got_error *
5113 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
5114 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5116 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5117 0ebf8283 2019-07-24 stsp char *path = NULL;
5118 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5119 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5120 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5122 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
5124 0ebf8283 2019-07-24 stsp return err;
5126 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
5127 0ebf8283 2019-07-24 stsp if (f == NULL) {
5128 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5129 0ebf8283 2019-07-24 stsp goto done;
5131 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5132 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5137 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5138 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
5139 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
5140 0ebf8283 2019-07-24 stsp if (n < 0) {
5141 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5147 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5148 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5149 0ebf8283 2019-07-24 stsp free(path);
5150 0ebf8283 2019-07-24 stsp if (commit)
5151 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5152 0ebf8283 2019-07-24 stsp return err;
5156 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
5158 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5160 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
5161 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
5162 bfce7f83 2019-07-27 stsp free(hle);
5166 0ebf8283 2019-07-24 stsp static const struct got_error *
5167 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
5168 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5170 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5171 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5173 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5174 0ebf8283 2019-07-24 stsp if (f == NULL) {
5175 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5176 0ebf8283 2019-07-24 stsp goto done;
5179 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5181 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5182 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5183 0ebf8283 2019-07-24 stsp return err;
5186 0ebf8283 2019-07-24 stsp static const struct got_error *
5187 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5188 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
5189 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5191 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
5192 0ebf8283 2019-07-24 stsp int resp = ' ';
5194 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
5195 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5196 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
5197 0ebf8283 2019-07-24 stsp resp = getchar();
5198 a61a4414 2019-08-07 stsp if (resp == '\n')
5199 a61a4414 2019-08-07 stsp resp = getchar();
5200 426ebf2e 2019-07-25 stsp if (resp == 'c') {
5201 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5202 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
5204 426ebf2e 2019-07-25 stsp if (err) {
5205 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5206 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5208 bfce7f83 2019-07-27 stsp prev_err = err;
5209 426ebf2e 2019-07-25 stsp resp = ' ';
5213 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
5214 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5215 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
5216 0ebf8283 2019-07-24 stsp commits, repo);
5217 426ebf2e 2019-07-25 stsp if (err) {
5218 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5219 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5221 bfce7f83 2019-07-27 stsp prev_err = err;
5222 426ebf2e 2019-07-25 stsp resp = ' ';
5226 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
5227 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5230 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
5233 0ebf8283 2019-07-24 stsp return err;
5236 0ebf8283 2019-07-24 stsp static const struct got_error *
5237 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
5238 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5239 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
5241 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5242 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5243 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5244 3e3a69f1 2019-07-25 stsp branch, repo);
5247 0ebf8283 2019-07-24 stsp static const struct got_error *
5248 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
5249 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5251 0ebf8283 2019-07-24 stsp const struct got_error *err;
5252 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5254 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
5256 0ebf8283 2019-07-24 stsp goto done;
5258 0ebf8283 2019-07-24 stsp if (new_id) {
5259 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
5261 0ebf8283 2019-07-24 stsp goto done;
5264 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
5265 0ebf8283 2019-07-24 stsp if (new_id_str)
5266 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
5268 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5269 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
5270 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
5271 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5272 0ebf8283 2019-07-24 stsp goto done;
5274 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
5276 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5278 0ebf8283 2019-07-24 stsp goto done;
5281 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
5282 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
5283 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
5284 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
5285 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5287 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
5288 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
5289 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5297 0ebf8283 2019-07-24 stsp free(old_id_str);
5298 0ebf8283 2019-07-24 stsp free(new_id_str);
5299 0ebf8283 2019-07-24 stsp return err;
5302 0ebf8283 2019-07-24 stsp static const struct got_error *
5303 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
5304 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5305 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5306 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5308 0ebf8283 2019-07-24 stsp const struct got_error *err;
5309 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5310 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
5312 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5313 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
5314 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5316 0ebf8283 2019-07-24 stsp return err;
5319 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5321 0ebf8283 2019-07-24 stsp return err;
5323 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5324 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
5325 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
5326 0ebf8283 2019-07-24 stsp if (err) {
5327 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5328 0ebf8283 2019-07-24 stsp goto done;
5329 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
5331 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
5332 0ebf8283 2019-07-24 stsp free(new_commit_id);
5335 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5336 0ebf8283 2019-07-24 stsp return err;
5339 0ebf8283 2019-07-24 stsp static const struct got_error *
5340 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
5341 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5343 0ebf8283 2019-07-24 stsp const struct got_error *error;
5344 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5346 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5348 0ebf8283 2019-07-24 stsp if (error)
5349 0ebf8283 2019-07-24 stsp return error;
5351 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5352 0ebf8283 2019-07-24 stsp if (error)
5353 0ebf8283 2019-07-24 stsp return error;
5355 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
5356 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5357 0ebf8283 2019-07-24 stsp return error;
5360 0ebf8283 2019-07-24 stsp static const struct got_error *
5361 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
5363 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
5364 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
5365 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5366 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
5367 0ebf8283 2019-07-24 stsp char *cwd = NULL;
5368 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
5369 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
5370 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
5371 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
5372 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
5373 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5374 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
5375 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5376 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
5377 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5378 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
5379 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
5380 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
5381 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
5382 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
5383 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5385 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
5386 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
5387 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
5389 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
5390 0ebf8283 2019-07-24 stsp switch (ch) {
5392 0ebf8283 2019-07-24 stsp abort_edit = 1;
5395 0ebf8283 2019-07-24 stsp continue_edit = 1;
5398 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
5401 0ebf8283 2019-07-24 stsp usage_histedit();
5402 0ebf8283 2019-07-24 stsp /* NOTREACHED */
5406 0ebf8283 2019-07-24 stsp argc -= optind;
5407 0ebf8283 2019-07-24 stsp argv += optind;
5409 0ebf8283 2019-07-24 stsp #ifndef PROFILE
5410 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5411 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
5412 0ebf8283 2019-07-24 stsp err(1, "pledge");
5414 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
5415 0ebf8283 2019-07-24 stsp usage_histedit();
5416 0ebf8283 2019-07-24 stsp if (argc != 0)
5417 0ebf8283 2019-07-24 stsp usage_histedit();
5420 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
5421 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
5422 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
5423 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
5424 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
5425 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
5428 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
5429 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
5430 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
5431 0ebf8283 2019-07-24 stsp goto done;
5433 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
5434 0ebf8283 2019-07-24 stsp if (error)
5435 0ebf8283 2019-07-24 stsp goto done;
5437 0ebf8283 2019-07-24 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5438 0ebf8283 2019-07-24 stsp if (error != NULL)
5439 0ebf8283 2019-07-24 stsp goto done;
5441 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5442 0ebf8283 2019-07-24 stsp if (error)
5443 0ebf8283 2019-07-24 stsp goto done;
5444 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
5445 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
5446 0ebf8283 2019-07-24 stsp goto done;
5449 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
5450 0ebf8283 2019-07-24 stsp if (error)
5451 0ebf8283 2019-07-24 stsp goto done;
5453 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
5454 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5455 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5456 3e3a69f1 2019-07-25 stsp worktree, repo);
5457 0ebf8283 2019-07-24 stsp if (error)
5458 0ebf8283 2019-07-24 stsp goto done;
5459 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5460 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5461 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
5462 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
5463 0ebf8283 2019-07-24 stsp if (error)
5464 0ebf8283 2019-07-24 stsp goto done;
5465 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
5466 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5467 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
5468 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
5469 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5470 0ebf8283 2019-07-24 stsp goto done;
5473 0ebf8283 2019-07-24 stsp if (continue_edit) {
5474 0ebf8283 2019-07-24 stsp char *path;
5476 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
5477 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5478 0ebf8283 2019-07-24 stsp goto done;
5481 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
5482 0ebf8283 2019-07-24 stsp if (error)
5483 0ebf8283 2019-07-24 stsp goto done;
5485 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
5486 0ebf8283 2019-07-24 stsp free(path);
5487 0ebf8283 2019-07-24 stsp if (error)
5488 0ebf8283 2019-07-24 stsp goto done;
5490 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5491 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5492 3e3a69f1 2019-07-25 stsp worktree, repo);
5493 0ebf8283 2019-07-24 stsp if (error)
5494 0ebf8283 2019-07-24 stsp goto done;
5496 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5497 0ebf8283 2019-07-24 stsp if (error)
5498 0ebf8283 2019-07-24 stsp goto done;
5500 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5501 0ebf8283 2019-07-24 stsp head_commit_id);
5502 0ebf8283 2019-07-24 stsp if (error)
5503 0ebf8283 2019-07-24 stsp goto done;
5504 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5505 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5506 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5507 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5508 3aac7cf7 2019-07-25 stsp goto done;
5510 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5511 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
5512 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5513 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5514 0ebf8283 2019-07-24 stsp commit = NULL;
5515 0ebf8283 2019-07-24 stsp if (error)
5516 0ebf8283 2019-07-24 stsp goto done;
5518 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
5519 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5520 0ebf8283 2019-07-24 stsp goto done;
5523 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
5524 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
5525 0ebf8283 2019-07-24 stsp if (error != NULL)
5526 0ebf8283 2019-07-24 stsp goto done;
5528 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
5529 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
5530 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
5531 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
5532 c7d20a3f 2019-07-30 stsp goto done;
5535 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5536 bfce7f83 2019-07-27 stsp got_ref_close(branch);
5537 bfce7f83 2019-07-27 stsp branch = NULL;
5538 0ebf8283 2019-07-24 stsp if (error)
5539 0ebf8283 2019-07-24 stsp goto done;
5541 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5542 0ebf8283 2019-07-24 stsp head_commit_id);
5543 0ebf8283 2019-07-24 stsp if (error)
5544 0ebf8283 2019-07-24 stsp goto done;
5545 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5546 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5547 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5548 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5549 3aac7cf7 2019-07-25 stsp goto done;
5551 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5552 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
5553 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
5554 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5555 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5556 0ebf8283 2019-07-24 stsp commit = NULL;
5557 0ebf8283 2019-07-24 stsp if (error)
5558 0ebf8283 2019-07-24 stsp goto done;
5560 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5561 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
5562 bfce7f83 2019-07-27 stsp if (error)
5563 bfce7f83 2019-07-27 stsp goto done;
5565 0ebf8283 2019-07-24 stsp if (edit_script_path) {
5566 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
5567 0ebf8283 2019-07-24 stsp edit_script_path, repo);
5568 6ba2bea2 2019-07-27 stsp if (error) {
5569 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5570 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5571 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5572 0ebf8283 2019-07-24 stsp goto done;
5575 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
5577 6ba2bea2 2019-07-27 stsp if (error) {
5578 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5579 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5580 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5581 0ebf8283 2019-07-24 stsp goto done;
5586 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
5588 6ba2bea2 2019-07-27 stsp if (error) {
5589 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5590 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5591 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5592 0ebf8283 2019-07-24 stsp goto done;
5597 0ebf8283 2019-07-24 stsp error = histedit_check_script(&histedit_cmds, &commits, repo);
5598 0ebf8283 2019-07-24 stsp if (error)
5599 0ebf8283 2019-07-24 stsp goto done;
5601 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5602 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
5603 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
5604 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
5607 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
5608 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
5609 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
5610 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
5613 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
5614 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
5616 0ebf8283 2019-07-24 stsp if (error)
5617 0ebf8283 2019-07-24 stsp goto done;
5621 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
5622 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5623 0ebf8283 2019-07-24 stsp if (error)
5624 0ebf8283 2019-07-24 stsp goto done;
5628 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5629 0ebf8283 2019-07-24 stsp hle->commit_id);
5630 0ebf8283 2019-07-24 stsp if (error)
5631 0ebf8283 2019-07-24 stsp goto done;
5632 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5633 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5635 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
5636 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
5637 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5638 0ebf8283 2019-07-24 stsp if (error)
5639 0ebf8283 2019-07-24 stsp goto done;
5640 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5641 0ebf8283 2019-07-24 stsp commit = NULL;
5643 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5644 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5648 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5649 0ebf8283 2019-07-24 stsp char *id_str;
5650 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
5651 0ebf8283 2019-07-24 stsp if (error)
5652 0ebf8283 2019-07-24 stsp goto done;
5653 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
5655 0ebf8283 2019-07-24 stsp free(id_str);
5656 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5657 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
5658 3e3a69f1 2019-07-25 stsp fileindex);
5659 0ebf8283 2019-07-24 stsp goto done;
5662 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5663 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5664 0ebf8283 2019-07-24 stsp if (error)
5665 0ebf8283 2019-07-24 stsp goto done;
5669 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
5670 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
5671 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5672 0ebf8283 2019-07-24 stsp if (error)
5673 0ebf8283 2019-07-24 stsp goto done;
5676 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5677 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
5678 0ebf8283 2019-07-24 stsp if (error)
5679 0ebf8283 2019-07-24 stsp goto done;
5680 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5681 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
5683 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
5684 3e3a69f1 2019-07-25 stsp branch, repo);
5686 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
5687 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
5688 0ebf8283 2019-07-24 stsp free(head_commit_id);
5689 0ebf8283 2019-07-24 stsp free(base_commit_id);
5690 0ebf8283 2019-07-24 stsp free(resume_commit_id);
5691 0ebf8283 2019-07-24 stsp if (commit)
5692 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5693 0ebf8283 2019-07-24 stsp if (branch)
5694 0ebf8283 2019-07-24 stsp got_ref_close(branch);
5695 0ebf8283 2019-07-24 stsp if (tmp_branch)
5696 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
5697 0ebf8283 2019-07-24 stsp if (worktree)
5698 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
5700 715dc77e 2019-08-03 stsp got_repo_close(repo);
5701 715dc77e 2019-08-03 stsp return error;
5704 715dc77e 2019-08-03 stsp __dead static void
5705 715dc77e 2019-08-03 stsp usage_stage(void)
5707 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
5708 f3055044 2019-08-07 stsp "[file-path ...]\n",
5709 715dc77e 2019-08-03 stsp getprogname());
5713 715dc77e 2019-08-03 stsp static const struct got_error *
5714 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
5715 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5716 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
5718 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
5719 408b4ebc 2019-08-03 stsp char *id_str = NULL;
5721 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
5722 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
5723 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5724 408b4ebc 2019-08-03 stsp return NULL;
5726 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
5727 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
5728 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
5730 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
5732 408b4ebc 2019-08-03 stsp return err;
5734 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
5735 408b4ebc 2019-08-03 stsp free(id_str);
5736 dc424a06 2019-08-07 stsp return NULL;
5739 dc424a06 2019-08-07 stsp static const struct got_error *
5740 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
5742 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
5743 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
5744 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
5745 715dc77e 2019-08-03 stsp char *cwd = NULL;
5746 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
5747 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
5748 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
5749 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
5750 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5751 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5753 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
5755 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
5756 715dc77e 2019-08-03 stsp switch (ch) {
5758 408b4ebc 2019-08-03 stsp list_stage = 1;
5761 dc424a06 2019-08-07 stsp pflag = 1;
5764 dc424a06 2019-08-07 stsp patch_script_path = optarg;
5767 715dc77e 2019-08-03 stsp usage_stage();
5768 715dc77e 2019-08-03 stsp /* NOTREACHED */
5772 715dc77e 2019-08-03 stsp argc -= optind;
5773 715dc77e 2019-08-03 stsp argv += optind;
5775 715dc77e 2019-08-03 stsp #ifndef PROFILE
5776 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5777 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
5778 715dc77e 2019-08-03 stsp err(1, "pledge");
5780 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
5781 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
5782 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
5783 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
5785 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
5786 715dc77e 2019-08-03 stsp if (cwd == NULL) {
5787 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
5788 715dc77e 2019-08-03 stsp goto done;
5791 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5792 715dc77e 2019-08-03 stsp if (error)
5793 715dc77e 2019-08-03 stsp goto done;
5795 715dc77e 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5796 715dc77e 2019-08-03 stsp if (error != NULL)
5797 715dc77e 2019-08-03 stsp goto done;
5799 dc424a06 2019-08-07 stsp if (patch_script_path) {
5800 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
5801 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
5802 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
5803 dc424a06 2019-08-07 stsp patch_script_path);
5804 dc424a06 2019-08-07 stsp goto done;
5807 715dc77e 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5808 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
5809 715dc77e 2019-08-03 stsp if (error)
5810 715dc77e 2019-08-03 stsp goto done;
5812 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5813 6d022e97 2019-08-04 stsp if (error)
5814 6d022e97 2019-08-04 stsp goto done;
5816 6d022e97 2019-08-04 stsp if (list_stage)
5817 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
5818 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
5820 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5821 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
5822 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
5823 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
5824 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
5827 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5828 2e1f37b0 2019-08-08 stsp error == NULL)
5829 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5831 ad493afc 2019-08-03 stsp got_repo_close(repo);
5832 ad493afc 2019-08-03 stsp if (worktree)
5833 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
5834 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5835 ad493afc 2019-08-03 stsp free((char *)pe->path);
5836 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
5837 ad493afc 2019-08-03 stsp free(cwd);
5838 ad493afc 2019-08-03 stsp return error;
5841 ad493afc 2019-08-03 stsp __dead static void
5842 ad493afc 2019-08-03 stsp usage_unstage(void)
5844 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
5845 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
5846 ad493afc 2019-08-03 stsp getprogname());
5851 ad493afc 2019-08-03 stsp static const struct got_error *
5852 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
5854 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
5855 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
5856 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
5857 ad493afc 2019-08-03 stsp char *cwd = NULL;
5858 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
5859 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
5860 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
5861 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
5862 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5863 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5865 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
5867 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
5868 ad493afc 2019-08-03 stsp switch (ch) {
5870 2e1f37b0 2019-08-08 stsp pflag = 1;
5873 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
5876 ad493afc 2019-08-03 stsp usage_unstage();
5877 ad493afc 2019-08-03 stsp /* NOTREACHED */
5881 ad493afc 2019-08-03 stsp argc -= optind;
5882 ad493afc 2019-08-03 stsp argv += optind;
5884 ad493afc 2019-08-03 stsp #ifndef PROFILE
5885 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5886 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
5887 ad493afc 2019-08-03 stsp err(1, "pledge");
5889 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
5890 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
5892 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
5893 ad493afc 2019-08-03 stsp if (cwd == NULL) {
5894 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
5895 ad493afc 2019-08-03 stsp goto done;
5898 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5899 ad493afc 2019-08-03 stsp if (error)
5900 ad493afc 2019-08-03 stsp goto done;
5902 ad493afc 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5903 ad493afc 2019-08-03 stsp if (error != NULL)
5904 ad493afc 2019-08-03 stsp goto done;
5906 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
5907 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
5908 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
5909 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
5910 2e1f37b0 2019-08-08 stsp patch_script_path);
5911 2e1f37b0 2019-08-08 stsp goto done;
5915 ad493afc 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5916 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
5917 ad493afc 2019-08-03 stsp if (error)
5918 ad493afc 2019-08-03 stsp goto done;
5920 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5921 ad493afc 2019-08-03 stsp if (error)
5922 ad493afc 2019-08-03 stsp goto done;
5924 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5925 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
5926 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
5927 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
5929 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5930 2e1f37b0 2019-08-08 stsp error == NULL)
5931 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5933 0ebf8283 2019-07-24 stsp got_repo_close(repo);
5934 715dc77e 2019-08-03 stsp if (worktree)
5935 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
5936 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5937 715dc77e 2019-08-03 stsp free((char *)pe->path);
5938 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
5939 715dc77e 2019-08-03 stsp free(cwd);
5940 0ebf8283 2019-07-24 stsp return error;
