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 64a96a6d 2018-04-01 stsp #include <sys/limits.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 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 f42b1b34 2018-03-12 stsp #include "got_error.h"
39 f42b1b34 2018-03-12 stsp #include "got_object.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 f42b1b34 2018-03-12 stsp #include "got_repository.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 c09a553d 2018-03-12 stsp #include "got_worktree.h"
44 79109fed 2018-03-27 stsp #include "got_diff.h"
45 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
46 404c43c4 2018-06-21 stsp #include "got_blame.h"
47 63219cd2 2019-01-04 stsp #include "got_privsep.h"
48 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
50 5c860e29 2018-03-12 stsp #ifndef nitems
51 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
54 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
55 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
58 99437157 2018-11-11 stsp catch_sigint(int signo)
60 99437157 2018-11-11 stsp sigint_received = 1;
64 99437157 2018-11-11 stsp catch_sigpipe(int signo)
66 99437157 2018-11-11 stsp sigpipe_received = 1;
70 8cfb4057 2019-07-09 stsp struct got_cmd {
71 5c860e29 2018-03-12 stsp const char *cmd_name;
72 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
73 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
74 97b3a7be 2019-07-09 stsp const char *cmd_alias;
77 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
78 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
79 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
81 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
83 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
84 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
85 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
86 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
87 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
88 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
89 d00136be 2019-03-26 stsp __dead static void usage_add(void);
90 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
91 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
92 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
93 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
94 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
95 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
96 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
98 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
99 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
100 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
101 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
102 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
103 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
104 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
105 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
106 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
107 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
108 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
109 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
110 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
111 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
112 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
113 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
114 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
115 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
116 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
118 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
119 97b3a7be 2019-07-09 stsp { "init", cmd_init, usage_init, "" },
120 3ce1b845 2019-07-15 stsp { "import", cmd_import, usage_import, "" },
121 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
122 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
123 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
124 97b3a7be 2019-07-09 stsp { "diff", cmd_diff, usage_diff, "" },
125 97b3a7be 2019-07-09 stsp { "blame", cmd_blame, usage_blame, "" },
126 97b3a7be 2019-07-09 stsp { "tree", cmd_tree, usage_tree, "" },
127 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
128 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
129 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
130 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
131 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
132 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
133 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
134 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
135 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
136 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
137 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
140 ce5b7c56 2019-07-09 stsp static void
141 ce5b7c56 2019-07-09 stsp list_commands(void)
145 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
146 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
147 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
148 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
150 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
154 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
156 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
157 5c860e29 2018-03-12 stsp unsigned int i;
159 1b6b95a8 2018-03-12 stsp int hflag = 0;
161 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
163 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
164 5c860e29 2018-03-12 stsp switch (ch) {
169 ce5b7c56 2019-07-09 stsp usage(hflag);
170 5c860e29 2018-03-12 stsp /* NOTREACHED */
174 5c860e29 2018-03-12 stsp argc -= optind;
175 5c860e29 2018-03-12 stsp argv += optind;
176 1e70621d 2018-03-27 stsp optind = 0;
178 5c860e29 2018-03-12 stsp if (argc <= 0)
179 ce5b7c56 2019-07-09 stsp usage(hflag);
181 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
182 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
184 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
185 d7d4f210 2018-03-12 stsp const struct got_error *error;
187 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
189 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
190 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
194 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
196 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
197 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
198 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
205 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
206 ce5b7c56 2019-07-09 stsp list_commands();
210 4ed7e80c 2018-05-20 stsp __dead static void
211 ce5b7c56 2019-07-09 stsp usage(int hflag)
213 5e070240 2019-06-22 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n", getprogname());
215 ce5b7c56 2019-07-09 stsp list_commands();
219 0266afb7 2019-01-04 stsp static const struct got_error *
220 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
222 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
223 e2ba3d07 2019-05-13 stsp const char *editor;
225 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
226 e2ba3d07 2019-05-13 stsp if (editor == NULL)
227 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
229 0ee7065d 2019-05-13 stsp if (editor) {
230 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
232 0ee7065d 2019-05-13 stsp return err;
235 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
236 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
237 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
238 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
241 e2ba3d07 2019-05-13 stsp return NULL;
244 e2ba3d07 2019-05-13 stsp static const struct got_error *
245 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
246 c530dc23 2019-07-23 stsp const char *worktree_path)
248 163ce85a 2019-05-13 stsp const struct got_error *err;
250 37c06ea4 2019-07-15 stsp #ifdef PROFILE
251 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
252 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
254 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
255 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
257 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
258 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
260 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
261 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
263 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
264 163ce85a 2019-05-13 stsp if (err != NULL)
265 163ce85a 2019-05-13 stsp return err;
267 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
268 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
270 0266afb7 2019-01-04 stsp return NULL;
273 2c7829a4 2019-06-17 stsp __dead static void
274 2c7829a4 2019-06-17 stsp usage_init(void)
276 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
280 2c7829a4 2019-06-17 stsp static const struct got_error *
281 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
283 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
284 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
287 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
288 2c7829a4 2019-06-17 stsp switch (ch) {
290 2c7829a4 2019-06-17 stsp usage_init();
291 2c7829a4 2019-06-17 stsp /* NOTREACHED */
295 2c7829a4 2019-06-17 stsp argc -= optind;
296 2c7829a4 2019-06-17 stsp argv += optind;
298 2c7829a4 2019-06-17 stsp #ifndef PROFILE
299 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
300 2c7829a4 2019-06-17 stsp err(1, "pledge");
302 2c7829a4 2019-06-17 stsp if (argc != 1)
303 bc20e173 2019-06-17 stsp usage_init();
305 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
306 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
307 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
309 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
311 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
312 2c7829a4 2019-06-17 stsp if (error &&
313 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
316 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
320 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
321 2c7829a4 2019-06-17 stsp if (error != NULL)
325 3ce1b845 2019-07-15 stsp free(repo_path);
326 3ce1b845 2019-07-15 stsp return error;
329 3ce1b845 2019-07-15 stsp __dead static void
330 3ce1b845 2019-07-15 stsp usage_import(void)
332 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
333 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
338 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
341 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
342 3ce1b845 2019-07-15 stsp int st = -1;
344 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
345 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
346 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
348 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
350 3ce1b845 2019-07-15 stsp goto doneediting;
352 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
353 3ce1b845 2019-07-15 stsp _exit(127);
356 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
357 3ce1b845 2019-07-15 stsp if (errno != EINTR)
360 3ce1b845 2019-07-15 stsp doneediting:
361 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
362 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
363 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
365 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
366 3ce1b845 2019-07-15 stsp errno = EINTR;
370 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
373 3ce1b845 2019-07-15 stsp static const struct got_error *
374 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
375 3ce1b845 2019-07-15 stsp const char *initial_content)
377 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
378 3ce1b845 2019-07-15 stsp char buf[1024];
379 3ce1b845 2019-07-15 stsp struct stat st, st2;
381 3ce1b845 2019-07-15 stsp int content_changed = 0;
382 3ce1b845 2019-07-15 stsp size_t len;
384 3ce1b845 2019-07-15 stsp *logmsg = NULL;
386 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
387 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
389 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
390 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
392 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
393 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
395 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
396 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
397 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
399 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
400 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
401 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
402 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
405 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
406 3ce1b845 2019-07-15 stsp if (fp == NULL) {
407 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
410 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
411 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
412 3ce1b845 2019-07-15 stsp content_changed = 1;
413 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
414 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
415 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
417 3ce1b845 2019-07-15 stsp fclose(fp);
419 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
420 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
424 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
425 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
426 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
429 3ce1b845 2019-07-15 stsp free(*logmsg);
430 3ce1b845 2019-07-15 stsp *logmsg = NULL;
432 3ce1b845 2019-07-15 stsp return err;
435 3ce1b845 2019-07-15 stsp static const struct got_error *
436 3ce1b845 2019-07-15 stsp collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
437 3ce1b845 2019-07-15 stsp const char *branch_name)
439 3ce1b845 2019-07-15 stsp char *initial_content = NULL, *logmsg_path = NULL;
440 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
443 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
444 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
445 3ce1b845 2019-07-15 stsp branch_name) == -1)
446 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
448 3ce1b845 2019-07-15 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
452 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
455 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
457 3ce1b845 2019-07-15 stsp free(initial_content);
458 3ce1b845 2019-07-15 stsp free(logmsg_path);
459 3ce1b845 2019-07-15 stsp return err;
462 3ce1b845 2019-07-15 stsp static const struct got_error *
463 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
465 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
466 3ce1b845 2019-07-15 stsp return NULL;
469 3ce1b845 2019-07-15 stsp static const struct got_error *
470 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
472 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
473 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
474 3ce1b845 2019-07-15 stsp char *editor = NULL;
475 3ce1b845 2019-07-15 stsp const char *got_author = getenv("GOT_AUTHOR");
476 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
477 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
478 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
479 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
480 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
482 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
483 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
485 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
487 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
488 3ce1b845 2019-07-15 stsp switch (ch) {
490 3ce1b845 2019-07-15 stsp branch_name = optarg;
493 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
494 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
495 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
500 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
501 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
502 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
507 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
509 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
515 3ce1b845 2019-07-15 stsp usage_init();
516 3ce1b845 2019-07-15 stsp /* NOTREACHED */
520 3ce1b845 2019-07-15 stsp argc -= optind;
521 3ce1b845 2019-07-15 stsp argv += optind;
523 3ce1b845 2019-07-15 stsp #ifndef PROFILE
524 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
525 3ce1b845 2019-07-15 stsp NULL) == -1)
526 3ce1b845 2019-07-15 stsp err(1, "pledge");
528 3ce1b845 2019-07-15 stsp if (argc != 1)
529 3ce1b845 2019-07-15 stsp usage_import();
531 3ce1b845 2019-07-15 stsp if (got_author == NULL) {
532 3ce1b845 2019-07-15 stsp /* TODO: Look current user up in password database */
533 3ce1b845 2019-07-15 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
537 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
538 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
539 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
540 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
542 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
543 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
547 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
548 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
552 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
553 3ce1b845 2019-07-15 stsp if (error) {
554 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
557 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
558 3ce1b845 2019-07-15 stsp "import target branch already exists");
562 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
563 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
564 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
567 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
570 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
571 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
573 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
574 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
577 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
582 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
583 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
585 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
589 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
590 3ce1b845 2019-07-15 stsp got_author, &ignores, repo, import_progress, NULL);
594 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
598 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
602 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
606 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
607 3ce1b845 2019-07-15 stsp if (error) {
608 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
611 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
612 3ce1b845 2019-07-15 stsp branch_ref);
616 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
621 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
622 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
624 2c7829a4 2019-06-17 stsp free(repo_path);
625 3ce1b845 2019-07-15 stsp free(editor);
626 3ce1b845 2019-07-15 stsp free(refname);
627 3ce1b845 2019-07-15 stsp free(new_commit_id);
628 3ce1b845 2019-07-15 stsp free(id_str);
629 3ce1b845 2019-07-15 stsp if (branch_ref)
630 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
631 3ce1b845 2019-07-15 stsp if (head_ref)
632 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
633 2c7829a4 2019-06-17 stsp return error;
636 4ed7e80c 2018-05-20 stsp __dead static void
637 c09a553d 2018-03-12 stsp usage_checkout(void)
639 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
640 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
644 1ee397ad 2019-07-12 stsp static const struct got_error *
645 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
647 92a684f4 2018-03-12 stsp char *worktree_path = arg;
649 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
650 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
651 1ee397ad 2019-07-12 stsp return NULL;
653 92a684f4 2018-03-12 stsp while (path[0] == '/')
656 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
657 1ee397ad 2019-07-12 stsp return NULL;
660 99437157 2018-11-11 stsp static const struct got_error *
661 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
663 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
664 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
665 99437157 2018-11-11 stsp return NULL;
668 8069f636 2019-01-12 stsp static const struct got_error *
669 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
670 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
672 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
673 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
675 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
676 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
678 36a38700 2019-05-10 stsp return err;
680 d5bea539 2019-05-13 stsp if (yca_id == NULL)
681 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
684 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
685 d5bea539 2019-05-13 stsp * and the work tree's base commit.
687 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
689 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
697 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
698 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
699 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
701 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
702 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
703 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
705 d5bea539 2019-05-13 stsp free(yca_id);
706 d5bea539 2019-05-13 stsp return NULL;
709 a367ff0f 2019-05-14 stsp static const struct got_error *
710 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
711 a367ff0f 2019-05-14 stsp struct got_reference *head_ref, struct got_repository *repo)
713 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
714 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
715 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
716 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
718 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
722 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
726 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
731 a367ff0f 2019-05-14 stsp struct got_object_id *id;
732 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
734 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
735 a367ff0f 2019-05-14 stsp err = NULL;
737 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
739 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
746 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
747 a367ff0f 2019-05-14 stsp is_same_branch = 1;
754 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
755 a367ff0f 2019-05-14 stsp free(head_commit_id);
756 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
757 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
758 04f57cb3 2019-07-25 stsp return err;
761 04f57cb3 2019-07-25 stsp static const struct got_error *
762 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
763 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
765 04f57cb3 2019-07-25 stsp const struct got_error *err;
766 04f57cb3 2019-07-25 stsp struct got_reference *ref;
768 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
769 04f57cb3 2019-07-25 stsp if (err == NULL) {
770 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
771 04f57cb3 2019-07-25 stsp got_ref_close(ref);
773 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
774 04f57cb3 2019-07-25 stsp return err;
775 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
776 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
778 a367ff0f 2019-05-14 stsp return err;
781 4ed7e80c 2018-05-20 stsp static const struct got_error *
782 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
784 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
785 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
786 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
787 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
788 c09a553d 2018-03-12 stsp char *repo_path = NULL;
789 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
790 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
791 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
792 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
793 72151b04 2019-05-11 stsp int ch, same_path_prefix;
794 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
796 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
798 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
799 0bb8a95e 2018-03-12 stsp switch (ch) {
801 08573d5b 2019-05-14 stsp branch_name = optarg;
804 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
805 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
806 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
809 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
812 2deda0b9 2019-03-07 stsp usage_checkout();
813 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
817 0bb8a95e 2018-03-12 stsp argc -= optind;
818 0bb8a95e 2018-03-12 stsp argv += optind;
820 6715a751 2018-03-16 stsp #ifndef PROFILE
821 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
822 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
823 c09a553d 2018-03-12 stsp err(1, "pledge");
825 0bb8a95e 2018-03-12 stsp if (argc == 1) {
826 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
827 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
828 76089277 2018-04-01 stsp if (repo_path == NULL)
829 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
830 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
831 76089277 2018-04-01 stsp if (cwd == NULL) {
832 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
835 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
836 230a42bd 2019-05-11 jcs base = basename(path_prefix);
837 230a42bd 2019-05-11 jcs if (base == NULL) {
838 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
839 230a42bd 2019-05-11 jcs path_prefix);
843 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
844 230a42bd 2019-05-11 jcs if (base == NULL) {
845 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
850 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
851 c09a553d 2018-03-12 stsp if (dotgit)
852 c09a553d 2018-03-12 stsp *dotgit = '\0';
853 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
854 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
859 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
860 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
861 76089277 2018-04-01 stsp if (repo_path == NULL) {
862 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
865 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
866 76089277 2018-04-01 stsp if (worktree_path == NULL) {
867 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
868 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
872 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
873 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
874 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
879 c09a553d 2018-03-12 stsp usage_checkout();
881 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
882 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
884 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
885 c09a553d 2018-03-12 stsp if (error != NULL)
888 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
889 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
890 c530dc23 2019-07-23 stsp if (error) {
891 c530dc23 2019-07-23 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR))
893 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
894 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
895 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
900 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
904 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
905 c09a553d 2018-03-12 stsp if (error != NULL)
908 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
909 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
912 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
913 c09a553d 2018-03-12 stsp if (error != NULL)
916 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
917 e5dc7198 2018-12-29 stsp path_prefix);
918 e5dc7198 2018-12-29 stsp if (error != NULL)
920 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
921 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
925 8069f636 2019-01-12 stsp if (commit_id_str) {
926 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
927 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
930 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
931 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
932 8069f636 2019-01-12 stsp if (error != NULL) {
933 8069f636 2019-01-12 stsp free(commit_id);
936 45d344f6 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
939 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
940 8069f636 2019-01-12 stsp commit_id);
941 8069f636 2019-01-12 stsp free(commit_id);
946 f2ea84fa 2019-07-27 stsp error = got_pathlist_append(NULL, &paths, "", NULL);
949 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
950 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
951 c09a553d 2018-03-12 stsp if (error != NULL)
954 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
957 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
958 8069f636 2019-01-12 stsp free(commit_id_str);
959 76089277 2018-04-01 stsp free(repo_path);
960 507dc3bb 2018-12-29 stsp free(worktree_path);
961 507dc3bb 2018-12-29 stsp return error;
964 507dc3bb 2018-12-29 stsp __dead static void
965 507dc3bb 2018-12-29 stsp usage_update(void)
967 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
968 507dc3bb 2018-12-29 stsp getprogname());
972 1ee397ad 2019-07-12 stsp static const struct got_error *
973 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
975 784955db 2019-01-12 stsp int *did_something = arg;
977 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
978 1ee397ad 2019-07-12 stsp return NULL;
980 1545c615 2019-02-10 stsp *did_something = 1;
982 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
983 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
984 1ee397ad 2019-07-12 stsp return NULL;
986 507dc3bb 2018-12-29 stsp while (path[0] == '/')
988 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
989 1ee397ad 2019-07-12 stsp return NULL;
992 be7061eb 2018-12-30 stsp static const struct got_error *
993 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
994 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
995 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
997 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
998 a1fb16d8 2019-05-24 stsp char *base_id_str;
999 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1001 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1002 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1003 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1004 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1005 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1006 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1007 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1010 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1011 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1012 a1fb16d8 2019-05-24 stsp if (err) {
1013 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1014 a1fb16d8 2019-05-24 stsp return err;
1015 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1017 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1018 a1fb16d8 2019-05-24 stsp return NULL;
1020 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1021 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1022 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1024 a1fb16d8 2019-05-24 stsp return err;
1025 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1026 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1027 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1028 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1029 0ebf8283 2019-07-24 stsp return NULL;
1032 0ebf8283 2019-07-24 stsp static const struct got_error *
1033 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1035 0ebf8283 2019-07-24 stsp const struct got_error *err;
1036 0ebf8283 2019-07-24 stsp int in_progress;
1038 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1040 0ebf8283 2019-07-24 stsp return err;
1041 0ebf8283 2019-07-24 stsp if (in_progress)
1042 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1044 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1046 0ebf8283 2019-07-24 stsp return err;
1047 0ebf8283 2019-07-24 stsp if (in_progress)
1048 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1050 a1fb16d8 2019-05-24 stsp return NULL;
1053 a5edda0a 2019-07-27 stsp static const struct got_error *
1054 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1055 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1057 a5edda0a 2019-07-27 stsp const struct got_error *err;
1058 a5edda0a 2019-07-27 stsp char *path;
1061 a5edda0a 2019-07-27 stsp if (argc == 0) {
1062 a5edda0a 2019-07-27 stsp path = strdup("");
1063 a5edda0a 2019-07-27 stsp if (path == NULL)
1064 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1065 a5edda0a 2019-07-27 stsp return got_pathlist_append(NULL, paths, path, NULL);
1068 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1069 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1072 a5edda0a 2019-07-27 stsp err = got_pathlist_append(NULL, paths, path, NULL);
1073 a5edda0a 2019-07-27 stsp if (err) {
1074 a5edda0a 2019-07-27 stsp free(path);
1079 a5edda0a 2019-07-27 stsp return err;
1082 a1fb16d8 2019-05-24 stsp static const struct got_error *
1083 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1085 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1086 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1087 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1088 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1089 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1090 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1091 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1092 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1093 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1094 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1095 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1097 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1099 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1100 507dc3bb 2018-12-29 stsp switch (ch) {
1102 024e9686 2019-05-14 stsp branch_name = optarg;
1105 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1106 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1107 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1110 2deda0b9 2019-03-07 stsp usage_update();
1111 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1115 507dc3bb 2018-12-29 stsp argc -= optind;
1116 507dc3bb 2018-12-29 stsp argv += optind;
1118 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1119 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1120 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1121 507dc3bb 2018-12-29 stsp err(1, "pledge");
1123 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1124 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1125 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1126 c4cdcb68 2019-04-03 stsp goto done;
1128 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1129 7d5807f4 2019-07-11 stsp if (error)
1130 7d5807f4 2019-07-11 stsp goto done;
1132 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1133 c4cdcb68 2019-04-03 stsp if (error)
1134 7d5807f4 2019-07-11 stsp goto done;
1136 f2ea84fa 2019-07-27 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1137 f2ea84fa 2019-07-27 stsp if (error)
1138 f2ea84fa 2019-07-27 stsp goto done;
1140 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1141 507dc3bb 2018-12-29 stsp if (error != NULL)
1142 507dc3bb 2018-12-29 stsp goto done;
1144 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1145 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1146 0266afb7 2019-01-04 stsp if (error)
1147 0266afb7 2019-01-04 stsp goto done;
1149 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1150 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1151 024e9686 2019-05-14 stsp if (error != NULL)
1152 024e9686 2019-05-14 stsp goto done;
1153 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1154 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1155 9c4b8182 2019-01-02 stsp if (error != NULL)
1156 9c4b8182 2019-01-02 stsp goto done;
1157 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1158 507dc3bb 2018-12-29 stsp if (error != NULL)
1159 507dc3bb 2018-12-29 stsp goto done;
1161 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1162 04f57cb3 2019-07-25 stsp free(commit_id_str);
1163 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1164 30837e32 2019-07-25 stsp if (error)
1165 a297e751 2019-07-11 stsp goto done;
1166 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1167 a297e751 2019-07-11 stsp if (error)
1168 507dc3bb 2018-12-29 stsp goto done;
1171 a1fb16d8 2019-05-24 stsp if (branch_name) {
1172 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1173 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1174 f2ea84fa 2019-07-27 stsp if (strlen(pe->path) == 0)
1176 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1177 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1178 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1179 024e9686 2019-05-14 stsp goto done;
1181 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1182 024e9686 2019-05-14 stsp if (error)
1183 024e9686 2019-05-14 stsp goto done;
1184 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1185 a367ff0f 2019-05-14 stsp free(head_commit_id);
1186 024e9686 2019-05-14 stsp if (error != NULL)
1187 024e9686 2019-05-14 stsp goto done;
1188 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
1189 a367ff0f 2019-05-14 stsp if (error)
1190 a367ff0f 2019-05-14 stsp goto done;
1191 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1192 024e9686 2019-05-14 stsp if (error)
1193 024e9686 2019-05-14 stsp goto done;
1195 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1196 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1197 a367ff0f 2019-05-14 stsp if (error != NULL) {
1198 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1199 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1200 024e9686 2019-05-14 stsp goto done;
1202 a367ff0f 2019-05-14 stsp error = check_same_branch(commit_id, head_ref, repo);
1203 a367ff0f 2019-05-14 stsp if (error)
1204 a367ff0f 2019-05-14 stsp goto done;
1207 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1208 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1209 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1210 507dc3bb 2018-12-29 stsp commit_id);
1211 507dc3bb 2018-12-29 stsp if (error)
1212 507dc3bb 2018-12-29 stsp goto done;
1215 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1216 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1217 507dc3bb 2018-12-29 stsp if (error != NULL)
1218 507dc3bb 2018-12-29 stsp goto done;
1220 784955db 2019-01-12 stsp if (did_something)
1221 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1223 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1225 c09a553d 2018-03-12 stsp free(worktree_path);
1226 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1227 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1228 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1229 507dc3bb 2018-12-29 stsp free(commit_id);
1230 9c4b8182 2019-01-02 stsp free(commit_id_str);
1231 c09a553d 2018-03-12 stsp return error;
1234 f42b1b34 2018-03-12 stsp static const struct got_error *
1235 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1236 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1238 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1239 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1240 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1241 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1242 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1244 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1245 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1247 79109fed 2018-03-27 stsp return err;
1249 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1250 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1251 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1253 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1255 79109fed 2018-03-27 stsp return err;
1257 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1258 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1259 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1261 0f2b3dca 2018-12-22 stsp return err;
1263 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1265 79109fed 2018-03-27 stsp return err;
1268 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1270 0f2b3dca 2018-12-22 stsp goto done;
1272 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1273 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1274 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1275 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1276 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff, &arg);
1278 79109fed 2018-03-27 stsp if (tree1)
1279 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1280 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1281 0f2b3dca 2018-12-22 stsp free(id_str1);
1282 0f2b3dca 2018-12-22 stsp free(id_str2);
1283 79109fed 2018-03-27 stsp return err;
1286 4bb494d5 2018-06-16 stsp static char *
1287 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1289 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
1290 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1292 6c281f94 2018-06-11 stsp *p = '\0';
1296 79109fed 2018-03-27 stsp static const struct got_error *
1297 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1298 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1299 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1301 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1302 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1303 6c281f94 2018-06-11 stsp char datebuf[26];
1304 45d799e2 2018-12-23 stsp time_t committer_time;
1305 45d799e2 2018-12-23 stsp const char *author, *committer;
1306 199a4027 2019-02-02 stsp char *refs_str = NULL;
1307 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1309 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1311 199a4027 2019-02-02 stsp const char *name;
1312 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
1314 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1315 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1317 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1318 199a4027 2019-02-02 stsp name += 5;
1319 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1321 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1322 e34f9ed6 2019-02-02 stsp name += 6;
1323 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1324 141c2bff 2019-02-04 stsp name += 8;
1325 199a4027 2019-02-02 stsp s = refs_str;
1326 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1327 199a4027 2019-02-02 stsp name) == -1) {
1328 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1334 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1336 8bf5b3c9 2018-03-17 stsp return err;
1338 33d869be 2018-12-22 stsp printf("-----------------------------------------------\n");
1339 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1340 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1341 832c249c 2018-06-10 stsp free(id_str);
1342 d3d493d7 2019-02-21 stsp id_str = NULL;
1343 d3d493d7 2019-02-21 stsp free(refs_str);
1344 d3d493d7 2019-02-21 stsp refs_str = NULL;
1345 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1346 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1347 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1348 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
1349 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1350 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1351 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1352 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1353 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1354 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1355 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1356 3fe1abad 2018-06-10 stsp int n = 1;
1357 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1358 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1359 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1361 a0603db2 2018-06-10 stsp return err;
1362 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1363 a0603db2 2018-06-10 stsp free(id_str);
1367 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1368 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
1369 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1371 621015ac 2018-07-23 stsp logmsg = logmsg0;
1373 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1375 832c249c 2018-06-10 stsp printf(" %s\n", line);
1376 832c249c 2018-06-10 stsp } while (line);
1377 621015ac 2018-07-23 stsp free(logmsg0);
1379 971751ac 2018-03-27 stsp if (show_patch) {
1380 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1381 971751ac 2018-03-27 stsp if (err == 0)
1382 971751ac 2018-03-27 stsp printf("\n");
1385 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1386 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1387 07862c20 2018-09-15 stsp return err;
1390 f42b1b34 2018-03-12 stsp static const struct got_error *
1391 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1392 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1393 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1395 f42b1b34 2018-03-12 stsp const struct got_error *err;
1396 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1398 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1399 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1401 f42b1b34 2018-03-12 stsp return err;
1402 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1404 fcc85cad 2018-07-22 stsp goto done;
1406 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1407 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1409 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1412 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1413 372ccdbb 2018-06-10 stsp if (err) {
1414 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1415 9ba79e04 2018-06-11 stsp err = NULL;
1418 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1420 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1426 b43fbaa0 2018-06-11 stsp if (id == NULL)
1429 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1432 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1434 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1435 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1439 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1440 f42b1b34 2018-03-12 stsp return err;
1443 4ed7e80c 2018-05-20 stsp __dead static void
1444 6f3d1eb0 2018-03-12 stsp usage_log(void)
1446 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1447 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1451 4ed7e80c 2018-05-20 stsp static const struct got_error *
1452 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1454 f42b1b34 2018-03-12 stsp const struct got_error *error;
1455 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1456 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1457 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1458 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1459 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1460 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1461 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1462 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1463 64a96a6d 2018-04-01 stsp const char *errstr;
1464 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1466 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1468 6715a751 2018-03-16 stsp #ifndef PROFILE
1469 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1472 f42b1b34 2018-03-12 stsp err(1, "pledge");
1475 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1476 79109fed 2018-03-27 stsp switch (ch) {
1478 79109fed 2018-03-27 stsp show_patch = 1;
1481 d142fc45 2018-04-01 stsp start_commit = optarg;
1484 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1486 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1487 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1490 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1491 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1492 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1495 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1498 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1499 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1500 04ca23f4 2018-07-16 stsp err(1, "-r option");
1501 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1504 2deda0b9 2019-03-07 stsp usage_log();
1505 79109fed 2018-03-27 stsp /* NOTREACHED */
1509 79109fed 2018-03-27 stsp argc -= optind;
1510 79109fed 2018-03-27 stsp argv += optind;
1512 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1513 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1514 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1515 04ca23f4 2018-07-16 stsp goto done;
1518 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1519 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1520 cffc0aa4 2019-02-05 stsp goto done;
1521 cffc0aa4 2019-02-05 stsp error = NULL;
1523 e7301579 2019-03-18 stsp if (argc == 0) {
1524 cbd1af7a 2019-03-18 stsp path = strdup("");
1525 e7301579 2019-03-18 stsp if (path == NULL) {
1526 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1527 cbd1af7a 2019-03-18 stsp goto done;
1529 e7301579 2019-03-18 stsp } else if (argc == 1) {
1530 e7301579 2019-03-18 stsp if (worktree) {
1531 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1533 e7301579 2019-03-18 stsp if (error)
1534 e7301579 2019-03-18 stsp goto done;
1536 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1537 e7301579 2019-03-18 stsp if (path == NULL) {
1538 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1539 e7301579 2019-03-18 stsp goto done;
1543 cbd1af7a 2019-03-18 stsp usage_log();
1545 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1546 5486daa2 2019-05-11 stsp repo_path = worktree ?
1547 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1549 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1550 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1551 cffc0aa4 2019-02-05 stsp goto done;
1554 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1555 d7d4f210 2018-03-12 stsp if (error != NULL)
1556 04ca23f4 2018-07-16 stsp goto done;
1558 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1559 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1560 c02c541e 2019-03-29 stsp if (error)
1561 c02c541e 2019-03-29 stsp goto done;
1563 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1564 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1565 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1566 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1567 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1568 3235492e 2018-04-01 stsp if (error != NULL)
1569 3235492e 2018-04-01 stsp return error;
1570 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1571 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1572 3235492e 2018-04-01 stsp if (error != NULL)
1573 3235492e 2018-04-01 stsp return error;
1574 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1576 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1577 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1578 3235492e 2018-04-01 stsp if (error == NULL) {
1579 1caad61b 2019-02-01 stsp int obj_type;
1580 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1581 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1582 d1f2edc9 2018-06-13 stsp if (error != NULL)
1583 1caad61b 2019-02-01 stsp goto done;
1584 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1585 1caad61b 2019-02-01 stsp if (error != NULL)
1586 1caad61b 2019-02-01 stsp goto done;
1587 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1588 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1589 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1590 1caad61b 2019-02-01 stsp if (error != NULL)
1591 1caad61b 2019-02-01 stsp goto done;
1592 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1593 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1594 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1595 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1596 1caad61b 2019-02-01 stsp goto done;
1599 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1600 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1601 1caad61b 2019-02-01 stsp if (id == NULL)
1602 638f9024 2019-05-13 stsp error = got_error_from_errno(
1603 230a42bd 2019-05-11 jcs "got_object_id_dup");
1604 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1605 1caad61b 2019-02-01 stsp if (error)
1606 1caad61b 2019-02-01 stsp goto done;
1607 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1608 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1609 1caad61b 2019-02-01 stsp goto done;
1611 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1612 d1f2edc9 2018-06-13 stsp if (error != NULL)
1613 1caad61b 2019-02-01 stsp goto done;
1615 15a94983 2018-12-23 stsp if (commit == NULL) {
1616 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1617 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1618 d1f2edc9 2018-06-13 stsp if (error != NULL)
1619 d1f2edc9 2018-06-13 stsp return error;
1622 d7d4f210 2018-03-12 stsp if (error != NULL)
1623 04ca23f4 2018-07-16 stsp goto done;
1625 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1626 04ca23f4 2018-07-16 stsp if (error != NULL)
1627 04ca23f4 2018-07-16 stsp goto done;
1628 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1629 04ca23f4 2018-07-16 stsp free(path);
1630 04ca23f4 2018-07-16 stsp path = in_repo_path;
1633 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1634 199a4027 2019-02-02 stsp if (error)
1635 199a4027 2019-02-02 stsp goto done;
1637 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1638 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1640 04ca23f4 2018-07-16 stsp free(path);
1641 04ca23f4 2018-07-16 stsp free(repo_path);
1642 04ca23f4 2018-07-16 stsp free(cwd);
1644 cffc0aa4 2019-02-05 stsp if (worktree)
1645 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1646 ad242220 2018-09-08 stsp if (repo) {
1647 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1648 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1649 ad242220 2018-09-08 stsp if (error == NULL)
1650 ad242220 2018-09-08 stsp error = repo_error;
1652 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1653 8bf5b3c9 2018-03-17 stsp return error;
1656 4ed7e80c 2018-05-20 stsp __dead static void
1657 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1659 b72f483a 2019-02-05 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1660 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1664 b72f483a 2019-02-05 stsp struct print_diff_arg {
1665 b72f483a 2019-02-05 stsp struct got_repository *repo;
1666 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1667 b72f483a 2019-02-05 stsp int diff_context;
1668 3fc0c068 2019-02-10 stsp const char *id_str;
1669 3fc0c068 2019-02-10 stsp int header_shown;
1672 4ed7e80c 2018-05-20 stsp static const struct got_error *
1673 b72f483a 2019-02-05 stsp print_diff(void *arg, unsigned char status, const char *path,
1674 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
1676 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1677 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1678 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1679 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1680 b72f483a 2019-02-05 stsp char *abspath = NULL;
1681 b72f483a 2019-02-05 stsp struct stat sb;
1683 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1684 7154f6ce 2019-03-27 stsp status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1685 b72f483a 2019-02-05 stsp return NULL;
1687 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1688 3fc0c068 2019-02-10 stsp printf("diff %s %s\n", a->id_str,
1689 3fc0c068 2019-02-10 stsp got_worktree_get_root_path(a->worktree));
1690 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1693 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_ADD) {
1694 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1696 d00136be 2019-03-26 stsp goto done;
1700 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1701 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1702 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1703 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1704 2ec1f75b 2019-03-26 stsp goto done;
1707 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1708 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1709 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1710 2ec1f75b 2019-03-26 stsp goto done;
1712 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1713 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1714 2ec1f75b 2019-03-26 stsp goto done;
1717 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1719 b72f483a 2019-02-05 stsp err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1722 b72f483a 2019-02-05 stsp if (blob1)
1723 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1724 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1725 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1726 b72f483a 2019-02-05 stsp free(abspath);
1727 927df6b7 2019-02-10 stsp return err;
1730 927df6b7 2019-02-10 stsp static const struct got_error *
1731 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1733 b00d56cd 2018-04-01 stsp const struct got_error *error;
1734 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1735 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1736 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1737 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1738 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1739 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1740 15a94983 2018-12-23 stsp int type1, type2;
1741 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1742 c0cc5c62 2018-10-18 stsp const char *errstr;
1743 927df6b7 2019-02-10 stsp char *path = NULL;
1745 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1746 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1747 25eccc22 2019-01-04 stsp NULL) == -1)
1748 b00d56cd 2018-04-01 stsp err(1, "pledge");
1751 b72f483a 2019-02-05 stsp while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1752 b00d56cd 2018-04-01 stsp switch (ch) {
1754 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1755 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1756 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1759 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1760 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1761 b72f483a 2019-02-05 stsp err(1, "-r option");
1762 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1765 2deda0b9 2019-03-07 stsp usage_diff();
1766 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1770 b00d56cd 2018-04-01 stsp argc -= optind;
1771 b00d56cd 2018-04-01 stsp argv += optind;
1773 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1774 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1775 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1776 b72f483a 2019-02-05 stsp goto done;
1778 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1779 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1780 927df6b7 2019-02-10 stsp goto done;
1781 927df6b7 2019-02-10 stsp if (argc <= 1) {
1782 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1783 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1784 927df6b7 2019-02-10 stsp goto done;
1786 b72f483a 2019-02-05 stsp if (repo_path)
1788 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1789 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1790 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1791 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1792 927df6b7 2019-02-10 stsp goto done;
1794 927df6b7 2019-02-10 stsp if (argc == 1) {
1795 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1797 927df6b7 2019-02-10 stsp if (error)
1798 927df6b7 2019-02-10 stsp goto done;
1800 927df6b7 2019-02-10 stsp path = strdup("");
1801 927df6b7 2019-02-10 stsp if (path == NULL) {
1802 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1803 927df6b7 2019-02-10 stsp goto done;
1806 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1807 15a94983 2018-12-23 stsp id_str1 = argv[0];
1808 15a94983 2018-12-23 stsp id_str2 = argv[1];
1809 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1810 30db809c 2019-06-05 stsp repo_path =
1811 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1812 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1813 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1814 30db809c 2019-06-05 stsp goto done;
1818 b00d56cd 2018-04-01 stsp usage_diff();
1820 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1821 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1822 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1823 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1826 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1827 76089277 2018-04-01 stsp free(repo_path);
1828 b00d56cd 2018-04-01 stsp if (error != NULL)
1829 b00d56cd 2018-04-01 stsp goto done;
1831 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1832 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1833 c02c541e 2019-03-29 stsp if (error)
1834 c02c541e 2019-03-29 stsp goto done;
1836 30db809c 2019-06-05 stsp if (argc <= 1) {
1837 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1838 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
1839 b72f483a 2019-02-05 stsp char *id_str;
1841 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
1843 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1844 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1845 b72f483a 2019-02-05 stsp if (error)
1846 b72f483a 2019-02-05 stsp goto done;
1847 b72f483a 2019-02-05 stsp arg.repo = repo;
1848 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1849 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1850 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1851 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1853 72ea6654 2019-07-27 stsp error = got_pathlist_append(NULL, &paths, path, NULL);
1854 72ea6654 2019-07-27 stsp if (error)
1855 72ea6654 2019-07-27 stsp goto done;
1857 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
1858 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1859 b72f483a 2019-02-05 stsp free(id_str);
1860 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
1861 b72f483a 2019-02-05 stsp goto done;
1864 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
1865 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1866 e02e74af 2019-05-28 stsp if (error) {
1867 e02e74af 2019-05-28 stsp struct got_reference *ref;
1868 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1869 e02e74af 2019-05-28 stsp goto done;
1870 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1871 e02e74af 2019-05-28 stsp if (error != NULL)
1872 e02e74af 2019-05-28 stsp goto done;
1873 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
1874 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1875 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1876 5e70831e 2019-05-28 stsp goto done;
1878 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1879 e02e74af 2019-05-28 stsp got_ref_close(ref);
1880 e02e74af 2019-05-28 stsp if (error != NULL)
1881 5e70831e 2019-05-28 stsp goto done;
1883 a297e751 2019-07-11 stsp error = got_object_id_str(&label1, id1);
1884 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1885 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1886 e02e74af 2019-05-28 stsp goto done;
1890 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
1891 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1892 e02e74af 2019-05-28 stsp if (error) {
1893 e02e74af 2019-05-28 stsp struct got_reference *ref;
1894 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1895 e02e74af 2019-05-28 stsp goto done;
1896 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1897 e02e74af 2019-05-28 stsp if (error != NULL)
1898 5e70831e 2019-05-28 stsp goto done;
1899 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
1900 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1901 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1902 e02e74af 2019-05-28 stsp goto done;
1904 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1905 e02e74af 2019-05-28 stsp got_ref_close(ref);
1906 e02e74af 2019-05-28 stsp if (error != NULL)
1907 e02e74af 2019-05-28 stsp goto done;
1909 a297e751 2019-07-11 stsp error = got_object_id_str(&label2, id2);
1910 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1911 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1912 5e70831e 2019-05-28 stsp goto done;
1916 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
1917 15a94983 2018-12-23 stsp if (error)
1918 15a94983 2018-12-23 stsp goto done;
1920 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
1921 15a94983 2018-12-23 stsp if (error)
1922 15a94983 2018-12-23 stsp goto done;
1924 15a94983 2018-12-23 stsp if (type1 != type2) {
1925 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1926 b00d56cd 2018-04-01 stsp goto done;
1929 15a94983 2018-12-23 stsp switch (type1) {
1930 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
1931 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1932 54156555 2018-12-24 stsp diff_context, repo, stdout);
1934 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
1935 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
1936 54156555 2018-12-24 stsp diff_context, repo, stdout);
1938 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
1939 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
1940 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
1941 c0cc5c62 2018-10-18 stsp repo, stdout);
1944 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1948 5e70831e 2019-05-28 stsp free(label1);
1949 5e70831e 2019-05-28 stsp free(label2);
1950 15a94983 2018-12-23 stsp free(id1);
1951 15a94983 2018-12-23 stsp free(id2);
1952 927df6b7 2019-02-10 stsp free(path);
1953 b72f483a 2019-02-05 stsp if (worktree)
1954 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
1955 ad242220 2018-09-08 stsp if (repo) {
1956 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1957 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1958 ad242220 2018-09-08 stsp if (error == NULL)
1959 ad242220 2018-09-08 stsp error = repo_error;
1961 b00d56cd 2018-04-01 stsp return error;
1964 404c43c4 2018-06-21 stsp __dead static void
1965 404c43c4 2018-06-21 stsp usage_blame(void)
1967 9270e621 2019-02-05 stsp fprintf(stderr,
1968 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
1969 404c43c4 2018-06-21 stsp getprogname());
1973 404c43c4 2018-06-21 stsp static const struct got_error *
1974 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
1976 404c43c4 2018-06-21 stsp const struct got_error *error;
1977 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
1978 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
1979 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1980 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
1981 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
1984 404c43c4 2018-06-21 stsp #ifndef PROFILE
1985 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1986 36e2fb66 2019-01-04 stsp NULL) == -1)
1987 404c43c4 2018-06-21 stsp err(1, "pledge");
1990 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1991 404c43c4 2018-06-21 stsp switch (ch) {
1993 404c43c4 2018-06-21 stsp commit_id_str = optarg;
1996 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
1997 66bea077 2018-08-02 stsp if (repo_path == NULL)
1998 66bea077 2018-08-02 stsp err(1, "-r option");
1999 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2002 2deda0b9 2019-03-07 stsp usage_blame();
2003 404c43c4 2018-06-21 stsp /* NOTREACHED */
2007 404c43c4 2018-06-21 stsp argc -= optind;
2008 404c43c4 2018-06-21 stsp argv += optind;
2010 a39318fd 2018-08-02 stsp if (argc == 1)
2011 404c43c4 2018-06-21 stsp path = argv[0];
2013 404c43c4 2018-06-21 stsp usage_blame();
2015 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2016 66bea077 2018-08-02 stsp if (cwd == NULL) {
2017 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2018 66bea077 2018-08-02 stsp goto done;
2020 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2021 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2022 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2023 66bea077 2018-08-02 stsp goto done;
2025 0c06baac 2019-02-05 stsp error = NULL;
2026 0c06baac 2019-02-05 stsp if (worktree) {
2027 0c06baac 2019-02-05 stsp repo_path =
2028 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2029 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2030 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2031 0c06baac 2019-02-05 stsp if (error)
2032 0c06baac 2019-02-05 stsp goto done;
2034 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2035 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2036 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2037 0c06baac 2019-02-05 stsp goto done;
2042 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2043 c02c541e 2019-03-29 stsp if (error != NULL)
2044 36e2fb66 2019-01-04 stsp goto done;
2046 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2047 c02c541e 2019-03-29 stsp if (error)
2048 404c43c4 2018-06-21 stsp goto done;
2050 0c06baac 2019-02-05 stsp if (worktree) {
2051 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2052 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2053 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2054 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2055 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2056 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2057 6efaaa2d 2019-02-05 stsp path) == -1) {
2058 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2059 0c06baac 2019-02-05 stsp goto done;
2061 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2064 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2066 0c06baac 2019-02-05 stsp if (error)
2067 66bea077 2018-08-02 stsp goto done;
2069 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2070 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2071 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2072 404c43c4 2018-06-21 stsp if (error != NULL)
2073 66bea077 2018-08-02 stsp goto done;
2074 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2075 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2076 404c43c4 2018-06-21 stsp if (error != NULL)
2077 66bea077 2018-08-02 stsp goto done;
2079 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2080 30837e32 2019-07-25 stsp if (error)
2081 66bea077 2018-08-02 stsp goto done;
2084 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
2086 66bea077 2018-08-02 stsp free(in_repo_path);
2087 66bea077 2018-08-02 stsp free(repo_path);
2088 66bea077 2018-08-02 stsp free(cwd);
2089 404c43c4 2018-06-21 stsp free(commit_id);
2090 0c06baac 2019-02-05 stsp if (worktree)
2091 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2092 ad242220 2018-09-08 stsp if (repo) {
2093 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2094 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2095 ad242220 2018-09-08 stsp if (error == NULL)
2096 ad242220 2018-09-08 stsp error = repo_error;
2098 404c43c4 2018-06-21 stsp return error;
2101 5de5890b 2018-10-18 stsp __dead static void
2102 5de5890b 2018-10-18 stsp usage_tree(void)
2104 c1669e2e 2019-01-09 stsp fprintf(stderr,
2105 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2106 5de5890b 2018-10-18 stsp getprogname());
2110 c1669e2e 2019-01-09 stsp static void
2111 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2112 c1669e2e 2019-01-09 stsp const char *root_path)
2114 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2116 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2117 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2120 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2121 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
2122 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
2125 5de5890b 2018-10-18 stsp static const struct got_error *
2126 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2127 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2128 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2130 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2131 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2132 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2133 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2134 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2136 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2138 5de5890b 2018-10-18 stsp goto done;
2140 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2142 5de5890b 2018-10-18 stsp goto done;
2143 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2144 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2145 5de5890b 2018-10-18 stsp while (te) {
2146 5de5890b 2018-10-18 stsp char *id = NULL;
2148 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2151 5de5890b 2018-10-18 stsp if (show_ids) {
2152 5de5890b 2018-10-18 stsp char *id_str;
2153 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2155 5de5890b 2018-10-18 stsp goto done;
2156 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2157 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2158 5de5890b 2018-10-18 stsp free(id_str);
2159 5de5890b 2018-10-18 stsp goto done;
2161 5de5890b 2018-10-18 stsp free(id_str);
2163 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2166 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2167 c1669e2e 2019-01-09 stsp char *child_path;
2168 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2169 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2170 c1669e2e 2019-01-09 stsp te->name) == -1) {
2171 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2172 c1669e2e 2019-01-09 stsp goto done;
2174 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2175 c1669e2e 2019-01-09 stsp root_path, repo);
2176 c1669e2e 2019-01-09 stsp free(child_path);
2178 c1669e2e 2019-01-09 stsp goto done;
2181 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2185 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2186 5de5890b 2018-10-18 stsp free(tree_id);
2187 5de5890b 2018-10-18 stsp return err;
2190 5de5890b 2018-10-18 stsp static const struct got_error *
2191 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2193 5de5890b 2018-10-18 stsp const struct got_error *error;
2194 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2195 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2196 7a2c19d6 2019-02-05 stsp const char *path;
2197 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2198 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2199 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2200 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2203 5de5890b 2018-10-18 stsp #ifndef PROFILE
2204 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2205 0f8d269b 2019-01-04 stsp NULL) == -1)
2206 5de5890b 2018-10-18 stsp err(1, "pledge");
2209 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2210 5de5890b 2018-10-18 stsp switch (ch) {
2212 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2215 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2216 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2217 5de5890b 2018-10-18 stsp err(1, "-r option");
2218 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2221 5de5890b 2018-10-18 stsp show_ids = 1;
2224 c1669e2e 2019-01-09 stsp recurse = 1;
2227 2deda0b9 2019-03-07 stsp usage_tree();
2228 5de5890b 2018-10-18 stsp /* NOTREACHED */
2232 5de5890b 2018-10-18 stsp argc -= optind;
2233 5de5890b 2018-10-18 stsp argv += optind;
2235 5de5890b 2018-10-18 stsp if (argc == 1)
2236 5de5890b 2018-10-18 stsp path = argv[0];
2237 5de5890b 2018-10-18 stsp else if (argc > 1)
2238 5de5890b 2018-10-18 stsp usage_tree();
2240 7a2c19d6 2019-02-05 stsp path = NULL;
2242 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2243 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2244 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2245 9bf7a39b 2019-02-05 stsp goto done;
2247 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2248 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2249 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2250 7a2c19d6 2019-02-05 stsp goto done;
2252 7a2c19d6 2019-02-05 stsp error = NULL;
2253 7a2c19d6 2019-02-05 stsp if (worktree) {
2254 7a2c19d6 2019-02-05 stsp repo_path =
2255 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2256 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2257 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2258 7a2c19d6 2019-02-05 stsp if (error)
2259 7a2c19d6 2019-02-05 stsp goto done;
2261 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2262 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2263 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2264 7a2c19d6 2019-02-05 stsp goto done;
2269 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2270 5de5890b 2018-10-18 stsp if (error != NULL)
2271 c02c541e 2019-03-29 stsp goto done;
2273 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2274 c02c541e 2019-03-29 stsp if (error)
2275 5de5890b 2018-10-18 stsp goto done;
2277 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2278 9bf7a39b 2019-02-05 stsp if (worktree) {
2279 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2280 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2281 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2282 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2283 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2284 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2285 9bf7a39b 2019-02-05 stsp goto done;
2287 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2289 9bf7a39b 2019-02-05 stsp if (error)
2290 9bf7a39b 2019-02-05 stsp goto done;
2292 9bf7a39b 2019-02-05 stsp path = "/";
2294 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2295 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2296 9bf7a39b 2019-02-05 stsp if (error != NULL)
2297 9bf7a39b 2019-02-05 stsp goto done;
2300 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2301 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2302 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2303 5de5890b 2018-10-18 stsp if (error != NULL)
2304 5de5890b 2018-10-18 stsp goto done;
2305 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2306 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2307 5de5890b 2018-10-18 stsp if (error != NULL)
2308 5de5890b 2018-10-18 stsp goto done;
2310 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2311 30837e32 2019-07-25 stsp if (error)
2312 5de5890b 2018-10-18 stsp goto done;
2315 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2316 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2318 5de5890b 2018-10-18 stsp free(in_repo_path);
2319 5de5890b 2018-10-18 stsp free(repo_path);
2320 5de5890b 2018-10-18 stsp free(cwd);
2321 5de5890b 2018-10-18 stsp free(commit_id);
2322 7a2c19d6 2019-02-05 stsp if (worktree)
2323 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2324 5de5890b 2018-10-18 stsp if (repo) {
2325 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2326 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2327 5de5890b 2018-10-18 stsp if (error == NULL)
2328 5de5890b 2018-10-18 stsp error = repo_error;
2330 5de5890b 2018-10-18 stsp return error;
2333 6bad629b 2019-02-04 stsp __dead static void
2334 6bad629b 2019-02-04 stsp usage_status(void)
2336 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2340 b72f483a 2019-02-05 stsp static const struct got_error *
2341 b72f483a 2019-02-05 stsp print_status(void *arg, unsigned char status, const char *path,
2342 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2344 6bad629b 2019-02-04 stsp printf("%c %s\n", status, path);
2345 b72f483a 2019-02-05 stsp return NULL;
2348 6bad629b 2019-02-04 stsp static const struct got_error *
2349 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2351 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2352 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2353 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2354 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2355 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2356 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2359 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2361 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2362 6bad629b 2019-02-04 stsp switch (ch) {
2364 2deda0b9 2019-03-07 stsp usage_status();
2365 6bad629b 2019-02-04 stsp /* NOTREACHED */
2369 6bad629b 2019-02-04 stsp argc -= optind;
2370 6bad629b 2019-02-04 stsp argv += optind;
2372 6bad629b 2019-02-04 stsp #ifndef PROFILE
2373 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2374 6bad629b 2019-02-04 stsp NULL) == -1)
2375 6bad629b 2019-02-04 stsp err(1, "pledge");
2377 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2378 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2379 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2380 927df6b7 2019-02-10 stsp goto done;
2383 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2384 927df6b7 2019-02-10 stsp if (error != NULL)
2385 927df6b7 2019-02-10 stsp goto done;
2387 a5edda0a 2019-07-27 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2388 a5edda0a 2019-07-27 stsp if (error)
2389 a5edda0a 2019-07-27 stsp goto done;
2391 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2392 6bad629b 2019-02-04 stsp if (error != NULL)
2393 6bad629b 2019-02-04 stsp goto done;
2395 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2396 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2397 6bad629b 2019-02-04 stsp if (error)
2398 6bad629b 2019-02-04 stsp goto done;
2400 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2401 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2403 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2404 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2405 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2406 927df6b7 2019-02-10 stsp free(cwd);
2407 d0eebce4 2019-03-11 stsp return error;
2410 d0eebce4 2019-03-11 stsp __dead static void
2411 d0eebce4 2019-03-11 stsp usage_ref(void)
2413 d0eebce4 2019-03-11 stsp fprintf(stderr,
2414 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
2415 d0eebce4 2019-03-11 stsp getprogname());
2419 d0eebce4 2019-03-11 stsp static const struct got_error *
2420 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2422 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2423 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2424 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2426 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2427 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2429 d0eebce4 2019-03-11 stsp return err;
2431 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2432 d0eebce4 2019-03-11 stsp char *refstr;
2433 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2434 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2435 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2436 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2437 d0eebce4 2019-03-11 stsp free(refstr);
2440 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2441 d0eebce4 2019-03-11 stsp return NULL;
2444 d0eebce4 2019-03-11 stsp static const struct got_error *
2445 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2447 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2448 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2450 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2452 d0eebce4 2019-03-11 stsp return err;
2454 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2455 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2456 d0eebce4 2019-03-11 stsp return err;
2459 d0eebce4 2019-03-11 stsp static const struct got_error *
2460 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2462 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2463 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2464 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2467 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2468 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2469 d1644381 2019-07-14 stsp * an unintended typo.
2471 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2472 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2474 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2476 d83d9d5c 2019-05-13 stsp if (err) {
2477 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2479 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2480 d83d9d5c 2019-05-13 stsp return err;
2481 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2483 d83d9d5c 2019-05-13 stsp return err;
2484 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2485 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2487 d83d9d5c 2019-05-13 stsp return err;
2490 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2492 d0eebce4 2019-03-11 stsp goto done;
2494 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2497 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2499 d0eebce4 2019-03-11 stsp return err;
2502 d0eebce4 2019-03-11 stsp static const struct got_error *
2503 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2505 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2506 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2507 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2508 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2509 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2510 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2512 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2513 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2514 d0eebce4 2019-03-11 stsp switch (ch) {
2516 d0eebce4 2019-03-11 stsp delref = optarg;
2519 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2520 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2521 d0eebce4 2019-03-11 stsp err(1, "-r option");
2522 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2525 d0eebce4 2019-03-11 stsp do_list = 1;
2528 d0eebce4 2019-03-11 stsp usage_ref();
2529 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2533 d0eebce4 2019-03-11 stsp if (do_list && delref)
2534 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2536 d0eebce4 2019-03-11 stsp argc -= optind;
2537 d0eebce4 2019-03-11 stsp argv += optind;
2539 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2540 d0eebce4 2019-03-11 stsp if (argc > 0)
2541 d0eebce4 2019-03-11 stsp usage_ref();
2542 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2543 d0eebce4 2019-03-11 stsp usage_ref();
2545 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2546 e0b57350 2019-03-12 stsp if (do_list) {
2547 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2548 e0b57350 2019-03-12 stsp NULL) == -1)
2549 e0b57350 2019-03-12 stsp err(1, "pledge");
2551 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2552 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2553 e0b57350 2019-03-12 stsp err(1, "pledge");
2556 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2557 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2558 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2559 d0eebce4 2019-03-11 stsp goto done;
2562 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2563 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2564 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2565 d0eebce4 2019-03-11 stsp goto done;
2567 d0eebce4 2019-03-11 stsp error = NULL;
2568 d0eebce4 2019-03-11 stsp if (worktree) {
2569 d0eebce4 2019-03-11 stsp repo_path =
2570 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2571 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2572 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2573 d0eebce4 2019-03-11 stsp if (error)
2574 d0eebce4 2019-03-11 stsp goto done;
2576 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2577 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2578 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2579 d0eebce4 2019-03-11 stsp goto done;
2584 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2585 d0eebce4 2019-03-11 stsp if (error != NULL)
2586 d0eebce4 2019-03-11 stsp goto done;
2588 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2589 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2590 c02c541e 2019-03-29 stsp if (error)
2591 c02c541e 2019-03-29 stsp goto done;
2593 d0eebce4 2019-03-11 stsp if (do_list)
2594 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2595 d0eebce4 2019-03-11 stsp else if (delref)
2596 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2598 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2601 4e759de4 2019-06-26 stsp got_repo_close(repo);
2602 4e759de4 2019-06-26 stsp if (worktree)
2603 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2604 4e759de4 2019-06-26 stsp free(cwd);
2605 4e759de4 2019-06-26 stsp free(repo_path);
2606 4e759de4 2019-06-26 stsp return error;
2609 4e759de4 2019-06-26 stsp __dead static void
2610 4e759de4 2019-06-26 stsp usage_branch(void)
2612 4e759de4 2019-06-26 stsp fprintf(stderr,
2613 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2614 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2618 4e759de4 2019-06-26 stsp static const struct got_error *
2619 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2621 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2622 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2623 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2625 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2627 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2629 4e759de4 2019-06-26 stsp return err;
2631 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2632 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2633 4e759de4 2019-06-26 stsp char *refstr;
2634 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2635 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2637 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2638 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2639 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2640 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2642 ba882ee3 2019-07-11 stsp return err;
2643 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2644 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2645 ba882ee3 2019-07-11 stsp marker = "* ";
2647 ba882ee3 2019-07-11 stsp marker = "~ ";
2650 4e759de4 2019-06-26 stsp refname += 11;
2651 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2652 4e759de4 2019-06-26 stsp if (refstr == NULL)
2653 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2654 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2655 4e759de4 2019-06-26 stsp free(refstr);
2658 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2659 4e759de4 2019-06-26 stsp return NULL;
2662 4e759de4 2019-06-26 stsp static const struct got_error *
2663 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2665 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2666 4e759de4 2019-06-26 stsp struct got_reference *ref;
2667 4e759de4 2019-06-26 stsp char *refname;
2669 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2670 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2672 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2674 4e759de4 2019-06-26 stsp goto done;
2676 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2677 4e759de4 2019-06-26 stsp got_ref_close(ref);
2679 4e759de4 2019-06-26 stsp free(refname);
2680 4e759de4 2019-06-26 stsp return err;
2683 4e759de4 2019-06-26 stsp static const struct got_error *
2684 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2685 4e759de4 2019-06-26 stsp const char *base_branch)
2687 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2688 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2689 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2690 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2691 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2694 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2695 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2696 d3f84d51 2019-07-11 stsp * an unintended typo.
2698 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2699 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2701 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2702 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2703 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2704 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2705 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2706 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2708 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2710 4e759de4 2019-06-26 stsp goto done;
2711 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2712 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2714 4e759de4 2019-06-26 stsp goto done;
2716 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2717 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2718 4e759de4 2019-06-26 stsp goto done;
2721 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2722 4e759de4 2019-06-26 stsp if (err == NULL) {
2723 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2724 4e759de4 2019-06-26 stsp goto done;
2725 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2726 4e759de4 2019-06-26 stsp goto done;
2728 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2730 4e759de4 2019-06-26 stsp goto done;
2732 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2735 4e759de4 2019-06-26 stsp got_ref_close(ref);
2737 4e759de4 2019-06-26 stsp free(base_refname);
2738 4e759de4 2019-06-26 stsp free(refname);
2739 4e759de4 2019-06-26 stsp return err;
2742 4e759de4 2019-06-26 stsp static const struct got_error *
2743 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2745 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2746 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2747 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2748 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2749 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2750 4e759de4 2019-06-26 stsp const char *delref = NULL;
2752 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2753 4e759de4 2019-06-26 stsp switch (ch) {
2755 4e759de4 2019-06-26 stsp delref = optarg;
2758 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2759 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2760 4e759de4 2019-06-26 stsp err(1, "-r option");
2761 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2764 4e759de4 2019-06-26 stsp do_list = 1;
2767 4e759de4 2019-06-26 stsp usage_branch();
2768 4e759de4 2019-06-26 stsp /* NOTREACHED */
2772 4e759de4 2019-06-26 stsp if (do_list && delref)
2773 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2775 4e759de4 2019-06-26 stsp argc -= optind;
2776 4e759de4 2019-06-26 stsp argv += optind;
2778 4e759de4 2019-06-26 stsp if (do_list || delref) {
2779 4e759de4 2019-06-26 stsp if (argc > 0)
2780 4e759de4 2019-06-26 stsp usage_branch();
2781 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2782 4e759de4 2019-06-26 stsp usage_branch();
2784 4e759de4 2019-06-26 stsp #ifndef PROFILE
2785 4e759de4 2019-06-26 stsp if (do_list) {
2786 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2787 4e759de4 2019-06-26 stsp NULL) == -1)
2788 4e759de4 2019-06-26 stsp err(1, "pledge");
2790 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2791 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2792 4e759de4 2019-06-26 stsp err(1, "pledge");
2795 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2796 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2797 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2798 4e759de4 2019-06-26 stsp goto done;
2801 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2802 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2803 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2804 4e759de4 2019-06-26 stsp goto done;
2806 4e759de4 2019-06-26 stsp error = NULL;
2807 4e759de4 2019-06-26 stsp if (worktree) {
2808 4e759de4 2019-06-26 stsp repo_path =
2809 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2810 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2811 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2812 4e759de4 2019-06-26 stsp if (error)
2813 4e759de4 2019-06-26 stsp goto done;
2815 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2816 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2817 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2818 4e759de4 2019-06-26 stsp goto done;
2823 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2824 4e759de4 2019-06-26 stsp if (error != NULL)
2825 4e759de4 2019-06-26 stsp goto done;
2827 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2828 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2829 4e759de4 2019-06-26 stsp if (error)
2830 4e759de4 2019-06-26 stsp goto done;
2832 4e759de4 2019-06-26 stsp if (do_list)
2833 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
2834 4e759de4 2019-06-26 stsp else if (delref)
2835 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2837 4e759de4 2019-06-26 stsp const char *base_branch;
2838 4e759de4 2019-06-26 stsp if (argc == 1) {
2839 4e759de4 2019-06-26 stsp base_branch = worktree ?
2840 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2841 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2843 4e759de4 2019-06-26 stsp base_branch = argv[1];
2844 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2848 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2849 d0eebce4 2019-03-11 stsp if (worktree)
2850 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2851 d0eebce4 2019-03-11 stsp free(cwd);
2852 d0eebce4 2019-03-11 stsp free(repo_path);
2853 d00136be 2019-03-26 stsp return error;
2856 d00136be 2019-03-26 stsp __dead static void
2857 d00136be 2019-03-26 stsp usage_add(void)
2859 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2863 d00136be 2019-03-26 stsp static const struct got_error *
2864 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2866 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2867 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2868 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2869 1dd54920 2019-05-11 stsp char *cwd = NULL;
2870 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2871 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2874 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2876 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2877 d00136be 2019-03-26 stsp switch (ch) {
2879 d00136be 2019-03-26 stsp usage_add();
2880 d00136be 2019-03-26 stsp /* NOTREACHED */
2884 d00136be 2019-03-26 stsp argc -= optind;
2885 d00136be 2019-03-26 stsp argv += optind;
2887 43012d58 2019-07-14 stsp #ifndef PROFILE
2888 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2889 43012d58 2019-07-14 stsp NULL) == -1)
2890 43012d58 2019-07-14 stsp err(1, "pledge");
2892 723c305c 2019-05-11 jcs if (argc < 1)
2893 d00136be 2019-03-26 stsp usage_add();
2895 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2896 d00136be 2019-03-26 stsp if (cwd == NULL) {
2897 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2898 d00136be 2019-03-26 stsp goto done;
2901 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2902 d00136be 2019-03-26 stsp if (error)
2903 d00136be 2019-03-26 stsp goto done;
2905 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2906 031a5338 2019-03-26 stsp if (error != NULL)
2907 031a5338 2019-03-26 stsp goto done;
2909 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2910 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2911 d00136be 2019-03-26 stsp if (error)
2912 d00136be 2019-03-26 stsp goto done;
2914 723c305c 2019-05-11 jcs for (x = 0; x < argc; x++) {
2915 1dd54920 2019-05-11 stsp char *path = realpath(argv[x], NULL);
2916 723c305c 2019-05-11 jcs if (path == NULL) {
2917 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[x]);
2921 723c305c 2019-05-11 jcs got_path_strip_trailing_slashes(path);
2922 1dd54920 2019-05-11 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
2923 1dd54920 2019-05-11 stsp if (error) {
2924 1dd54920 2019-05-11 stsp free(path);
2928 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
2929 1dd54920 2019-05-11 stsp NULL, repo);
2932 031a5338 2019-03-26 stsp got_repo_close(repo);
2933 d00136be 2019-03-26 stsp if (worktree)
2934 d00136be 2019-03-26 stsp got_worktree_close(worktree);
2935 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
2936 1dd54920 2019-05-11 stsp free((char *)pe->path);
2937 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
2938 2ec1f75b 2019-03-26 stsp free(cwd);
2939 2ec1f75b 2019-03-26 stsp return error;
2942 2ec1f75b 2019-03-26 stsp __dead static void
2943 648e4ef7 2019-07-09 stsp usage_remove(void)
2945 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
2949 2ec1f75b 2019-03-26 stsp static const struct got_error *
2950 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
2952 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
2953 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
2954 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
2955 17ed4618 2019-06-02 stsp char *cwd = NULL;
2956 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
2957 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2958 17ed4618 2019-06-02 stsp int ch, i, delete_local_mods = 0;
2960 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
2962 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
2963 2ec1f75b 2019-03-26 stsp switch (ch) {
2965 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
2968 2ec1f75b 2019-03-26 stsp usage_add();
2969 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
2973 2ec1f75b 2019-03-26 stsp argc -= optind;
2974 2ec1f75b 2019-03-26 stsp argv += optind;
2976 43012d58 2019-07-14 stsp #ifndef PROFILE
2977 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2978 43012d58 2019-07-14 stsp NULL) == -1)
2979 43012d58 2019-07-14 stsp err(1, "pledge");
2981 17ed4618 2019-06-02 stsp if (argc < 1)
2982 648e4ef7 2019-07-09 stsp usage_remove();
2984 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
2985 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
2986 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2987 2ec1f75b 2019-03-26 stsp goto done;
2989 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2990 2ec1f75b 2019-03-26 stsp if (error)
2991 2ec1f75b 2019-03-26 stsp goto done;
2993 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2995 2ec1f75b 2019-03-26 stsp goto done;
2997 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2998 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2999 2ec1f75b 2019-03-26 stsp if (error)
3000 2ec1f75b 2019-03-26 stsp goto done;
3002 17ed4618 2019-06-02 stsp for (i = 0; i < argc; i++) {
3003 17ed4618 2019-06-02 stsp char *path = realpath(argv[i], NULL);
3004 17ed4618 2019-06-02 stsp if (path == NULL) {
3005 17ed4618 2019-06-02 stsp error = got_error_from_errno2("realpath", argv[i]);
3006 17ed4618 2019-06-02 stsp goto done;
3009 17ed4618 2019-06-02 stsp got_path_strip_trailing_slashes(path);
3010 17ed4618 2019-06-02 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
3011 17ed4618 2019-06-02 stsp if (error) {
3012 17ed4618 2019-06-02 stsp free(path);
3013 17ed4618 2019-06-02 stsp goto done;
3016 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
3017 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
3018 a129376b 2019-03-28 stsp if (error)
3019 a129376b 2019-03-28 stsp goto done;
3022 a129376b 2019-03-28 stsp got_repo_close(repo);
3023 a129376b 2019-03-28 stsp if (worktree)
3024 a129376b 2019-03-28 stsp got_worktree_close(worktree);
3025 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
3026 17ed4618 2019-06-02 stsp free((char *)pe->path);
3027 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
3028 a129376b 2019-03-28 stsp free(cwd);
3029 a129376b 2019-03-28 stsp return error;
3032 a129376b 2019-03-28 stsp __dead static void
3033 a129376b 2019-03-28 stsp usage_revert(void)
3035 e20a8b6f 2019-06-04 stsp fprintf(stderr, "usage: %s revert file-path ...\n", getprogname());
3039 1ee397ad 2019-07-12 stsp static const struct got_error *
3040 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
3042 a129376b 2019-03-28 stsp while (path[0] == '/')
3044 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
3045 1ee397ad 2019-07-12 stsp return NULL;
3048 a129376b 2019-03-28 stsp static const struct got_error *
3049 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
3051 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
3052 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
3053 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
3054 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
3055 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
3056 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3057 e20a8b6f 2019-06-04 stsp int ch, i;
3059 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3061 a129376b 2019-03-28 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3062 a129376b 2019-03-28 stsp switch (ch) {
3064 a129376b 2019-03-28 stsp usage_revert();
3065 a129376b 2019-03-28 stsp /* NOTREACHED */
3069 a129376b 2019-03-28 stsp argc -= optind;
3070 a129376b 2019-03-28 stsp argv += optind;
3072 43012d58 2019-07-14 stsp #ifndef PROFILE
3073 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3074 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3075 43012d58 2019-07-14 stsp err(1, "pledge");
3077 e20a8b6f 2019-06-04 stsp if (argc < 1)
3078 a129376b 2019-03-28 stsp usage_revert();
3080 e20a8b6f 2019-06-04 stsp for (i = 0; i < argc; i++) {
3081 e20a8b6f 2019-06-04 stsp char *path = realpath(argv[i], NULL);
3082 e20a8b6f 2019-06-04 stsp if (path == NULL) {
3083 e20a8b6f 2019-06-04 stsp error = got_error_from_errno2("realpath", argv[i]);
3084 e20a8b6f 2019-06-04 stsp goto done;
3087 e20a8b6f 2019-06-04 stsp got_path_strip_trailing_slashes(path);
3088 e20a8b6f 2019-06-04 stsp error = got_pathlist_insert(&pe, &paths, path, NULL);
3089 e20a8b6f 2019-06-04 stsp if (error) {
3090 e20a8b6f 2019-06-04 stsp free(path);
3091 e20a8b6f 2019-06-04 stsp goto done;
3095 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3096 a129376b 2019-03-28 stsp if (cwd == NULL) {
3097 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3098 a129376b 2019-03-28 stsp goto done;
3100 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3101 2ec1f75b 2019-03-26 stsp if (error)
3102 2ec1f75b 2019-03-26 stsp goto done;
3104 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3105 a129376b 2019-03-28 stsp if (error != NULL)
3106 a129376b 2019-03-28 stsp goto done;
3108 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3109 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3110 a129376b 2019-03-28 stsp if (error)
3111 a129376b 2019-03-28 stsp goto done;
3113 e20a8b6f 2019-06-04 stsp error = got_worktree_revert(worktree, &paths,
3114 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
3115 a129376b 2019-03-28 stsp if (error)
3116 a129376b 2019-03-28 stsp goto done;
3119 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3120 2ec1f75b 2019-03-26 stsp if (worktree)
3121 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3122 2ec1f75b 2019-03-26 stsp free(path);
3123 d00136be 2019-03-26 stsp free(cwd);
3124 6bad629b 2019-02-04 stsp return error;
3127 c4296144 2019-05-09 stsp __dead static void
3128 c4296144 2019-05-09 stsp usage_commit(void)
3130 90e8619e 2019-07-25 stsp fprintf(stderr, "usage: %s commit [-m msg] [path]\n", getprogname());
3134 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3135 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3136 e2ba3d07 2019-05-13 stsp const char *editor;
3137 e0870e44 2019-05-13 stsp const char *worktree_path;
3138 76d98825 2019-06-03 stsp const char *branch_name;
3139 314a6357 2019-05-13 stsp const char *repo_path;
3140 e0870e44 2019-05-13 stsp char *logmsg_path;
3144 33ad4cbe 2019-05-12 jcs static const struct got_error *
3145 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3148 76d98825 2019-06-03 stsp char *initial_content = NULL;
3149 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3150 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3151 e0870e44 2019-05-13 stsp char *template = NULL;
3152 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3154 33ad4cbe 2019-05-12 jcs size_t len;
3156 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3157 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3158 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3159 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3160 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3161 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3162 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3163 33ad4cbe 2019-05-12 jcs return NULL;
3166 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3167 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3169 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3170 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3171 76d98825 2019-06-03 stsp a->branch_name) == -1)
3172 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3174 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3176 e0870e44 2019-05-13 stsp goto done;
3178 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3180 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3181 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3182 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3183 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3184 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3188 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3190 3ce1b845 2019-07-15 stsp unlink(a->logmsg_path);
3191 3ce1b845 2019-07-15 stsp free(a->logmsg_path);
3192 76d98825 2019-06-03 stsp free(initial_content);
3193 e0870e44 2019-05-13 stsp free(template);
3195 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3196 3ce1b845 2019-07-15 stsp if (err == NULL) {
3197 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
3198 3ce1b845 2019-07-15 stsp if (err) {
3199 3ce1b845 2019-07-15 stsp free(*logmsg);
3200 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3203 33ad4cbe 2019-05-12 jcs return err;
3206 c4296144 2019-05-09 stsp static const struct got_error *
3207 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3209 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3210 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3211 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3212 c4296144 2019-05-09 stsp char *cwd = NULL, *path = NULL, *id_str = NULL;
3213 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3214 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3215 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
3216 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3217 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3218 a698f62e 2019-07-25 stsp int ch, rebase_in_progress;
3220 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3221 c4296144 2019-05-09 stsp switch (ch) {
3223 c4296144 2019-05-09 stsp logmsg = optarg;
3226 c4296144 2019-05-09 stsp usage_commit();
3227 c4296144 2019-05-09 stsp /* NOTREACHED */
3231 c4296144 2019-05-09 stsp argc -= optind;
3232 c4296144 2019-05-09 stsp argv += optind;
3234 43012d58 2019-07-14 stsp #ifndef PROFILE
3235 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3236 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3237 43012d58 2019-07-14 stsp err(1, "pledge");
3239 c4296144 2019-05-09 stsp if (argc == 1) {
3240 c4296144 2019-05-09 stsp path = realpath(argv[0], NULL);
3241 c4296144 2019-05-09 stsp if (path == NULL) {
3242 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
3243 c4296144 2019-05-09 stsp goto done;
3245 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(path);
3246 c4296144 2019-05-09 stsp } else if (argc != 0)
3247 c4296144 2019-05-09 stsp usage_commit();
3249 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
3250 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
3251 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
3252 35bd8fed 2019-05-09 stsp goto done;
3255 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3256 c4296144 2019-05-09 stsp if (cwd == NULL) {
3257 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3258 c4296144 2019-05-09 stsp goto done;
3260 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3261 7d5807f4 2019-07-11 stsp if (error)
3262 7d5807f4 2019-07-11 stsp goto done;
3264 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3265 c4296144 2019-05-09 stsp if (error)
3266 a698f62e 2019-07-25 stsp goto done;
3267 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
3268 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
3269 c4296144 2019-05-09 stsp goto done;
3272 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3273 c4296144 2019-05-09 stsp if (error != NULL)
3274 c4296144 2019-05-09 stsp goto done;
3277 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3278 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3280 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3281 314a6357 2019-05-13 stsp error = get_editor(&editor);
3283 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3284 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3285 c4296144 2019-05-09 stsp if (error)
3286 c4296144 2019-05-09 stsp goto done;
3288 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3289 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3290 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3291 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3292 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "refs/", 5) == 0)
3293 76d98825 2019-06-03 stsp cl_arg.branch_name += 5;
3294 76d98825 2019-06-03 stsp if (strncmp(cl_arg.branch_name, "heads/", 6) == 0)
3295 76d98825 2019-06-03 stsp cl_arg.branch_name += 6;
3296 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3297 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
3298 35bd8fed 2019-05-09 stsp error = got_worktree_commit(&id, worktree, path, got_author, NULL,
3299 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3300 e0870e44 2019-05-13 stsp if (error) {
3301 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3302 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3303 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3304 c4296144 2019-05-09 stsp goto done;
3307 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3308 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3310 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3311 c4296144 2019-05-09 stsp if (error)
3312 c4296144 2019-05-09 stsp goto done;
3313 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3316 c4296144 2019-05-09 stsp got_repo_close(repo);
3317 c4296144 2019-05-09 stsp if (worktree)
3318 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3319 c4296144 2019-05-09 stsp free(path);
3320 c4296144 2019-05-09 stsp free(cwd);
3321 c4296144 2019-05-09 stsp free(id_str);
3322 e2ba3d07 2019-05-13 stsp free(editor);
3323 234035bc 2019-06-01 stsp return error;
3326 234035bc 2019-06-01 stsp __dead static void
3327 234035bc 2019-06-01 stsp usage_cherrypick(void)
3329 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3333 234035bc 2019-06-01 stsp static const struct got_error *
3334 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3336 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3337 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3338 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3339 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3340 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3341 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3342 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3343 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3344 234035bc 2019-06-01 stsp int ch, did_something = 0;
3346 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3347 234035bc 2019-06-01 stsp switch (ch) {
3349 234035bc 2019-06-01 stsp usage_cherrypick();
3350 234035bc 2019-06-01 stsp /* NOTREACHED */
3354 234035bc 2019-06-01 stsp argc -= optind;
3355 234035bc 2019-06-01 stsp argv += optind;
3357 43012d58 2019-07-14 stsp #ifndef PROFILE
3358 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3359 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3360 43012d58 2019-07-14 stsp err(1, "pledge");
3362 234035bc 2019-06-01 stsp if (argc != 1)
3363 234035bc 2019-06-01 stsp usage_cherrypick();
3365 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3366 234035bc 2019-06-01 stsp if (cwd == NULL) {
3367 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3368 234035bc 2019-06-01 stsp goto done;
3370 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3371 234035bc 2019-06-01 stsp if (error)
3372 234035bc 2019-06-01 stsp goto done;
3374 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3375 234035bc 2019-06-01 stsp if (error != NULL)
3376 234035bc 2019-06-01 stsp goto done;
3378 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3379 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3380 234035bc 2019-06-01 stsp if (error)
3381 234035bc 2019-06-01 stsp goto done;
3383 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3384 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3385 234035bc 2019-06-01 stsp if (error != NULL) {
3386 234035bc 2019-06-01 stsp struct got_reference *ref;
3387 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3388 234035bc 2019-06-01 stsp goto done;
3389 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3390 234035bc 2019-06-01 stsp if (error != NULL)
3391 234035bc 2019-06-01 stsp goto done;
3392 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3393 234035bc 2019-06-01 stsp got_ref_close(ref);
3394 234035bc 2019-06-01 stsp if (error != NULL)
3395 234035bc 2019-06-01 stsp goto done;
3397 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3398 234035bc 2019-06-01 stsp if (error)
3399 234035bc 2019-06-01 stsp goto done;
3401 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3402 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3403 234035bc 2019-06-01 stsp if (error != NULL)
3404 234035bc 2019-06-01 stsp goto done;
3406 234035bc 2019-06-01 stsp error = check_same_branch(commit_id, head_ref, repo);
3407 234035bc 2019-06-01 stsp if (error) {
3408 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3409 234035bc 2019-06-01 stsp goto done;
3410 234035bc 2019-06-01 stsp error = NULL;
3412 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3413 234035bc 2019-06-01 stsp goto done;
3416 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3417 234035bc 2019-06-01 stsp if (error)
3418 234035bc 2019-06-01 stsp goto done;
3419 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3420 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3421 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3423 234035bc 2019-06-01 stsp if (error != NULL)
3424 234035bc 2019-06-01 stsp goto done;
3426 234035bc 2019-06-01 stsp if (did_something)
3427 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3429 234035bc 2019-06-01 stsp if (commit)
3430 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3431 234035bc 2019-06-01 stsp free(commit_id_str);
3432 234035bc 2019-06-01 stsp if (head_ref)
3433 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3434 234035bc 2019-06-01 stsp if (worktree)
3435 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3437 234035bc 2019-06-01 stsp got_repo_close(repo);
3438 c4296144 2019-05-09 stsp return error;
3441 5ef14e63 2019-06-02 stsp __dead static void
3442 5ef14e63 2019-06-02 stsp usage_backout(void)
3444 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3448 5ef14e63 2019-06-02 stsp static const struct got_error *
3449 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3451 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3452 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3453 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3454 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3455 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3456 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3457 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3458 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3459 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3461 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3462 5ef14e63 2019-06-02 stsp switch (ch) {
3464 5ef14e63 2019-06-02 stsp usage_backout();
3465 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3469 5ef14e63 2019-06-02 stsp argc -= optind;
3470 5ef14e63 2019-06-02 stsp argv += optind;
3472 43012d58 2019-07-14 stsp #ifndef PROFILE
3473 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3474 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3475 43012d58 2019-07-14 stsp err(1, "pledge");
3477 5ef14e63 2019-06-02 stsp if (argc != 1)
3478 5ef14e63 2019-06-02 stsp usage_backout();
3480 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3481 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3482 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3483 5ef14e63 2019-06-02 stsp goto done;
3485 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3486 5ef14e63 2019-06-02 stsp if (error)
3487 5ef14e63 2019-06-02 stsp goto done;
3489 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3490 5ef14e63 2019-06-02 stsp if (error != NULL)
3491 5ef14e63 2019-06-02 stsp goto done;
3493 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3494 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3495 5ef14e63 2019-06-02 stsp if (error)
3496 5ef14e63 2019-06-02 stsp goto done;
3498 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3499 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3500 5ef14e63 2019-06-02 stsp if (error != NULL) {
3501 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3502 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3503 5ef14e63 2019-06-02 stsp goto done;
3504 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3505 5ef14e63 2019-06-02 stsp if (error != NULL)
3506 5ef14e63 2019-06-02 stsp goto done;
3507 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3508 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3509 5ef14e63 2019-06-02 stsp if (error != NULL)
3510 5ef14e63 2019-06-02 stsp goto done;
3512 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3513 5ef14e63 2019-06-02 stsp if (error)
3514 5ef14e63 2019-06-02 stsp goto done;
3516 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3517 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3518 5ef14e63 2019-06-02 stsp if (error != NULL)
3519 5ef14e63 2019-06-02 stsp goto done;
3521 5ef14e63 2019-06-02 stsp error = check_same_branch(commit_id, head_ref, repo);
3522 5ef14e63 2019-06-02 stsp if (error)
3523 5ef14e63 2019-06-02 stsp goto done;
3525 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3526 5ef14e63 2019-06-02 stsp if (error)
3527 5ef14e63 2019-06-02 stsp goto done;
3528 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3529 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3530 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3531 5ef14e63 2019-06-02 stsp goto done;
3534 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3535 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3536 5ef14e63 2019-06-02 stsp if (error != NULL)
3537 5ef14e63 2019-06-02 stsp goto done;
3539 5ef14e63 2019-06-02 stsp if (did_something)
3540 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3542 5ef14e63 2019-06-02 stsp if (commit)
3543 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3544 5ef14e63 2019-06-02 stsp free(commit_id_str);
3545 5ef14e63 2019-06-02 stsp if (head_ref)
3546 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3547 818c7501 2019-07-11 stsp if (worktree)
3548 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3550 818c7501 2019-07-11 stsp got_repo_close(repo);
3551 818c7501 2019-07-11 stsp return error;
3554 818c7501 2019-07-11 stsp __dead static void
3555 818c7501 2019-07-11 stsp usage_rebase(void)
3557 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3558 af54c8f8 2019-07-11 stsp getprogname());
3563 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
3566 0ebf8283 2019-07-24 stsp size_t len;
3568 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
3569 0ebf8283 2019-07-24 stsp if (len > limit)
3570 0ebf8283 2019-07-24 stsp len = limit;
3571 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
3572 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
3574 0ebf8283 2019-07-24 stsp *nl = '\0';
3577 0ebf8283 2019-07-24 stsp static const struct got_error *
3578 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
3580 0ebf8283 2019-07-24 stsp const char *logmsg0 = NULL;
3582 0ebf8283 2019-07-24 stsp logmsg0 = got_object_commit_get_logmsg(commit);
3584 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)logmsg0[0]))
3585 0ebf8283 2019-07-24 stsp logmsg0++;
3587 0ebf8283 2019-07-24 stsp *logmsg = strdup(logmsg0);
3588 0ebf8283 2019-07-24 stsp if (*logmsg == NULL)
3589 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
3591 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
3592 0ebf8283 2019-07-24 stsp return NULL;
3595 818c7501 2019-07-11 stsp static const struct got_error *
3596 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3597 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3599 818c7501 2019-07-11 stsp const struct got_error *err;
3600 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
3602 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3604 818c7501 2019-07-11 stsp goto done;
3606 ff0d2220 2019-07-11 stsp if (new_id) {
3607 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3609 ff0d2220 2019-07-11 stsp goto done;
3612 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3613 ff0d2220 2019-07-11 stsp if (new_id_str)
3614 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3616 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
3618 0ebf8283 2019-07-24 stsp goto done;
3620 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3621 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3623 818c7501 2019-07-11 stsp free(old_id_str);
3624 818c7501 2019-07-11 stsp free(new_id_str);
3625 818c7501 2019-07-11 stsp return err;
3628 1ee397ad 2019-07-12 stsp static const struct got_error *
3629 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3631 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3633 818c7501 2019-07-11 stsp while (path[0] == '/')
3635 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3637 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3638 1ee397ad 2019-07-12 stsp return NULL;
3639 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3640 818c7501 2019-07-11 stsp *rebase_status = status;
3641 1ee397ad 2019-07-12 stsp return NULL;
3644 818c7501 2019-07-11 stsp static const struct got_error *
3645 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
3646 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
3647 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
3649 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3650 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
3651 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3654 818c7501 2019-07-11 stsp static const struct got_error *
3655 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
3656 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
3657 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
3658 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
3660 ff0d2220 2019-07-11 stsp const struct got_error *error;
3661 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
3662 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
3664 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3665 ff0d2220 2019-07-11 stsp if (error)
3666 ff0d2220 2019-07-11 stsp return error;
3668 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
3669 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
3670 ff0d2220 2019-07-11 stsp if (error) {
3671 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3672 ff0d2220 2019-07-11 stsp goto done;
3673 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
3675 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
3676 ff0d2220 2019-07-11 stsp free(new_commit_id);
3679 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
3680 ff0d2220 2019-07-11 stsp return error;
3683 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
3684 64c6d990 2019-07-11 stsp const char *path_prefix;
3685 64c6d990 2019-07-11 stsp size_t len;
3686 8ca9bd68 2019-07-25 stsp int errcode;
3689 64c6d990 2019-07-11 stsp static const struct got_error *
3690 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
3691 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3692 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
3693 64c6d990 2019-07-11 stsp struct got_repository *repo)
3695 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
3697 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3698 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3699 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
3701 64c6d990 2019-07-11 stsp return NULL;
3704 64c6d990 2019-07-11 stsp static const struct got_error *
3705 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
3706 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
3707 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
3709 64c6d990 2019-07-11 stsp const struct got_error *err;
3710 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3711 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
3712 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
3714 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
3715 64c6d990 2019-07-11 stsp return NULL;
3717 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3719 64c6d990 2019-07-11 stsp goto done;
3721 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
3723 64c6d990 2019-07-11 stsp goto done;
3725 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
3726 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
3728 64c6d990 2019-07-11 stsp goto done;
3730 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
3731 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
3733 64c6d990 2019-07-11 stsp goto done;
3735 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
3736 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
3737 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
3738 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
3739 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
3740 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3741 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff, &cpp_arg);
3743 64c6d990 2019-07-11 stsp if (tree1)
3744 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
3745 64c6d990 2019-07-11 stsp if (tree2)
3746 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
3747 64c6d990 2019-07-11 stsp if (commit)
3748 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
3749 64c6d990 2019-07-11 stsp if (parent_commit)
3750 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
3751 64c6d990 2019-07-11 stsp return err;
3754 ff0d2220 2019-07-11 stsp static const struct got_error *
3755 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
3756 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
3757 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
3758 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
3759 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
3761 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
3762 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
3763 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
3764 af61c510 2019-07-19 stsp struct got_object_qid *qid;
3765 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
3767 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
3769 af61c510 2019-07-19 stsp return err;
3771 af61c510 2019-07-19 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo);
3773 af61c510 2019-07-19 stsp goto done;
3774 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
3775 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
3776 af61c510 2019-07-19 stsp if (err) {
3777 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
3778 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
3779 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
3780 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
3781 af61c510 2019-07-19 stsp "been reached?!?");
3782 af61c510 2019-07-19 stsp goto done;
3783 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
3784 af61c510 2019-07-19 stsp goto done;
3785 af61c510 2019-07-19 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
3787 af61c510 2019-07-19 stsp goto done;
3789 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
3790 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
3792 af61c510 2019-07-19 stsp goto done;
3794 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
3796 af61c510 2019-07-19 stsp goto done;
3797 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
3798 af61c510 2019-07-19 stsp commit_id = parent_id;
3802 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
3803 af61c510 2019-07-19 stsp return err;
3806 af61c510 2019-07-19 stsp static const struct got_error *
3807 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
3809 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
3810 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
3811 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
3812 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
3813 818c7501 2019-07-11 stsp char *cwd = NULL;
3814 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
3815 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
3816 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
3817 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
3818 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
3819 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
3820 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
3821 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
3822 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
3823 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
3824 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
3825 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
3827 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
3828 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
3830 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
3831 818c7501 2019-07-11 stsp switch (ch) {
3833 818c7501 2019-07-11 stsp abort_rebase = 1;
3836 818c7501 2019-07-11 stsp continue_rebase = 1;
3839 818c7501 2019-07-11 stsp usage_rebase();
3840 818c7501 2019-07-11 stsp /* NOTREACHED */
3844 818c7501 2019-07-11 stsp argc -= optind;
3845 818c7501 2019-07-11 stsp argv += optind;
3847 43012d58 2019-07-14 stsp #ifndef PROFILE
3848 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3849 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3850 43012d58 2019-07-14 stsp err(1, "pledge");
3852 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
3853 818c7501 2019-07-11 stsp usage_rebase();
3854 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
3855 818c7501 2019-07-11 stsp if (argc != 0)
3856 818c7501 2019-07-11 stsp usage_rebase();
3857 818c7501 2019-07-11 stsp } else if (argc != 1)
3858 818c7501 2019-07-11 stsp usage_rebase();
3860 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
3861 818c7501 2019-07-11 stsp if (cwd == NULL) {
3862 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
3863 818c7501 2019-07-11 stsp goto done;
3865 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
3866 818c7501 2019-07-11 stsp if (error)
3867 818c7501 2019-07-11 stsp goto done;
3869 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3870 818c7501 2019-07-11 stsp if (error != NULL)
3871 818c7501 2019-07-11 stsp goto done;
3873 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3874 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3875 818c7501 2019-07-11 stsp if (error)
3876 818c7501 2019-07-11 stsp goto done;
3878 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3879 818c7501 2019-07-11 stsp if (error)
3880 818c7501 2019-07-11 stsp goto done;
3882 f6794adc 2019-07-23 stsp if (abort_rebase) {
3883 818c7501 2019-07-11 stsp int did_something;
3884 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
3885 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
3886 f6794adc 2019-07-23 stsp goto done;
3888 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3889 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
3890 3e3a69f1 2019-07-25 stsp worktree, repo);
3891 818c7501 2019-07-11 stsp if (error)
3892 818c7501 2019-07-11 stsp goto done;
3893 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
3894 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
3895 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
3896 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
3897 818c7501 2019-07-11 stsp if (error)
3898 818c7501 2019-07-11 stsp goto done;
3899 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
3900 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
3903 818c7501 2019-07-11 stsp if (continue_rebase) {
3904 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
3905 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
3906 f6794adc 2019-07-23 stsp goto done;
3908 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3909 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
3910 3e3a69f1 2019-07-25 stsp worktree, repo);
3911 818c7501 2019-07-11 stsp if (error)
3912 818c7501 2019-07-11 stsp goto done;
3914 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
3915 01757395 2019-07-12 stsp resume_commit_id, repo);
3916 818c7501 2019-07-11 stsp if (error)
3917 818c7501 2019-07-11 stsp goto done;
3919 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
3920 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
3921 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
3922 818c7501 2019-07-11 stsp goto done;
3925 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
3926 818c7501 2019-07-11 stsp if (error != NULL)
3927 818c7501 2019-07-11 stsp goto done;
3929 818c7501 2019-07-11 stsp error = check_same_branch(
3930 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree), branch, repo);
3931 818c7501 2019-07-11 stsp if (error) {
3932 818c7501 2019-07-11 stsp if (error->code != GOT_ERR_ANCESTRY)
3933 818c7501 2019-07-11 stsp goto done;
3934 818c7501 2019-07-11 stsp error = NULL;
3936 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
3937 818c7501 2019-07-11 stsp "specified branch resolves to a commit which "
3938 818c7501 2019-07-11 stsp "is already contained in work tree's branch");
3939 818c7501 2019-07-11 stsp goto done;
3943 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
3944 ff0d2220 2019-07-11 stsp if (error)
3945 ff0d2220 2019-07-11 stsp goto done;
3947 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
3948 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
3949 818c7501 2019-07-11 stsp got_worktree_get_base_commit_id(worktree),
3950 818c7501 2019-07-11 stsp branch_head_commit_id, repo);
3951 818c7501 2019-07-11 stsp if (error)
3952 818c7501 2019-07-11 stsp goto done;
3953 818c7501 2019-07-11 stsp if (yca_id == NULL) {
3954 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
3955 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
3956 818c7501 2019-07-11 stsp "with work tree's branch");
3957 818c7501 2019-07-11 stsp goto done;
3960 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
3961 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
3962 818c7501 2019-07-11 stsp if (error)
3963 818c7501 2019-07-11 stsp goto done;
3966 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
3967 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3968 818c7501 2019-07-11 stsp if (error)
3969 818c7501 2019-07-11 stsp goto done;
3971 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3972 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
3973 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
3974 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
3975 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
3976 818c7501 2019-07-11 stsp got_object_commit_close(commit);
3977 818c7501 2019-07-11 stsp commit = NULL;
3978 818c7501 2019-07-11 stsp if (error)
3979 818c7501 2019-07-11 stsp goto done;
3981 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
3982 ff0d2220 2019-07-11 stsp if (continue_rebase)
3983 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
3984 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
3986 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
3987 818c7501 2019-07-11 stsp goto done;
3990 818c7501 2019-07-11 stsp pid = NULL;
3991 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
3992 818c7501 2019-07-11 stsp commit_id = qid->id;
3993 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
3994 818c7501 2019-07-11 stsp pid = qid;
3996 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
3997 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
3998 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
3999 818c7501 2019-07-11 stsp if (error)
4000 818c7501 2019-07-11 stsp goto done;
4002 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4003 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4007 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
4008 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
4009 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4010 818c7501 2019-07-11 stsp if (error)
4011 818c7501 2019-07-11 stsp goto done;
4014 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4015 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
4016 818c7501 2019-07-11 stsp if (error)
4017 818c7501 2019-07-11 stsp goto done;
4018 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
4019 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
4021 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
4022 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
4024 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
4025 818c7501 2019-07-11 stsp free(branch_head_commit_id);
4026 818c7501 2019-07-11 stsp free(resume_commit_id);
4027 818c7501 2019-07-11 stsp free(yca_id);
4028 818c7501 2019-07-11 stsp if (commit)
4029 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4030 818c7501 2019-07-11 stsp if (branch)
4031 818c7501 2019-07-11 stsp got_ref_close(branch);
4032 818c7501 2019-07-11 stsp if (new_base_branch)
4033 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
4034 818c7501 2019-07-11 stsp if (tmp_branch)
4035 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
4036 5ef14e63 2019-06-02 stsp if (worktree)
4037 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
4039 5ef14e63 2019-06-02 stsp got_repo_close(repo);
4040 5ef14e63 2019-06-02 stsp return error;
4043 0ebf8283 2019-07-24 stsp __dead static void
4044 0ebf8283 2019-07-24 stsp usage_histedit(void)
4046 0ebf8283 2019-07-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F path]\n",
4047 0ebf8283 2019-07-24 stsp getprogname());
4051 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
4052 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
4053 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
4054 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
4055 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
4057 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
4058 0ebf8283 2019-07-24 stsp unsigned char code;
4059 0ebf8283 2019-07-24 stsp const char *name;
4060 0ebf8283 2019-07-24 stsp const char *desc;
4061 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
4062 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
4063 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4064 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4065 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4066 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
4067 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
4070 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
4071 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
4072 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
4073 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4074 0ebf8283 2019-07-24 stsp char *logmsg;
4076 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4078 0ebf8283 2019-07-24 stsp static const struct got_error *
4079 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4080 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4082 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4083 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
4084 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4087 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4089 0ebf8283 2019-07-24 stsp goto done;
4091 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
4093 0ebf8283 2019-07-24 stsp goto done;
4095 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
4097 0ebf8283 2019-07-24 stsp goto done;
4099 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4100 0ebf8283 2019-07-24 stsp if (n < 0)
4101 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4103 0ebf8283 2019-07-24 stsp if (commit)
4104 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4105 0ebf8283 2019-07-24 stsp free(id_str);
4106 0ebf8283 2019-07-24 stsp free(logmsg);
4107 0ebf8283 2019-07-24 stsp return err;
4110 0ebf8283 2019-07-24 stsp static const struct got_error *
4111 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4112 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4114 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4115 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
4117 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
4118 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4120 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4121 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4127 0ebf8283 2019-07-24 stsp return err;
4130 0ebf8283 2019-07-24 stsp static const struct got_error *
4131 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
4133 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4136 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
4137 0ebf8283 2019-07-24 stsp if (n < 0)
4138 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4140 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4141 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4142 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
4143 0ebf8283 2019-07-24 stsp cmd->desc);
4144 0ebf8283 2019-07-24 stsp if (n < 0) {
4145 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4149 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
4150 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
4151 0ebf8283 2019-07-24 stsp if (n < 0)
4152 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4153 0ebf8283 2019-07-24 stsp return err;
4156 0ebf8283 2019-07-24 stsp static const struct got_error *
4157 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
4159 0ebf8283 2019-07-24 stsp static char msg[42];
4162 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4164 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
4165 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4167 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4170 0ebf8283 2019-07-24 stsp static const struct got_error *
4171 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4172 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
4174 0ebf8283 2019-07-24 stsp const struct got_error *err;
4175 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
4176 0ebf8283 2019-07-24 stsp char *id_str;
4178 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4180 0ebf8283 2019-07-24 stsp return err;
4182 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4184 0ebf8283 2019-07-24 stsp goto done;
4186 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4187 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4188 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(folded_commit)) == -1) {
4189 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4190 0ebf8283 2019-07-24 stsp goto done;
4193 0ebf8283 2019-07-24 stsp if (folded_commit)
4194 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
4195 0ebf8283 2019-07-24 stsp free(id_str);
4196 0ebf8283 2019-07-24 stsp return err;
4199 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
4200 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
4202 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
4204 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
4205 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4206 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
4207 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4208 3f9de99f 2019-07-24 stsp folded = prev;
4209 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
4212 0ebf8283 2019-07-24 stsp return folded;
4215 0ebf8283 2019-07-24 stsp static const struct got_error *
4216 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4217 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4219 0ebf8283 2019-07-24 stsp char *logmsg_path = NULL, *id_str = NULL;
4220 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4221 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4222 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4224 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
4226 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4228 0ebf8283 2019-07-24 stsp return err;
4230 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
4231 0ebf8283 2019-07-24 stsp if (folded) {
4232 0ebf8283 2019-07-24 stsp while (folded != hle) {
4233 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4234 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4237 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
4238 0ebf8283 2019-07-24 stsp logmsg, repo);
4240 0ebf8283 2019-07-24 stsp goto done;
4241 0ebf8283 2019-07-24 stsp free(logmsg);
4242 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4243 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4247 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4249 0ebf8283 2019-07-24 stsp goto done;
4250 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
4251 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
4252 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", id_str,
4253 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(commit)) == -1) {
4254 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4255 0ebf8283 2019-07-24 stsp goto done;
4257 0ebf8283 2019-07-24 stsp free(logmsg);
4258 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4260 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4262 0ebf8283 2019-07-24 stsp goto done;
4264 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4266 0ebf8283 2019-07-24 stsp goto done;
4268 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
4269 0ebf8283 2019-07-24 stsp close(fd);
4271 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4273 0ebf8283 2019-07-24 stsp goto done;
4275 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4276 0ebf8283 2019-07-24 stsp if (err) {
4277 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4278 0ebf8283 2019-07-24 stsp goto done;
4279 0ebf8283 2019-07-24 stsp err = NULL;
4280 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(got_object_commit_get_logmsg(commit));
4281 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL)
4282 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4285 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4286 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
4287 0ebf8283 2019-07-24 stsp free(logmsg_path);
4288 0ebf8283 2019-07-24 stsp free(logmsg);
4289 0ebf8283 2019-07-24 stsp free(editor);
4290 0ebf8283 2019-07-24 stsp if (commit)
4291 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4292 0ebf8283 2019-07-24 stsp return err;
4295 0ebf8283 2019-07-24 stsp static const struct got_error *
4296 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
4297 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4299 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4300 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
4301 0ebf8283 2019-07-24 stsp size_t size;
4302 0ebf8283 2019-07-24 stsp ssize_t len;
4303 0ebf8283 2019-07-24 stsp int lineno = 0, i;
4304 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4305 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4306 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
4308 0ebf8283 2019-07-24 stsp for (;;) {
4309 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
4310 0ebf8283 2019-07-24 stsp if (len == -1) {
4311 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
4312 0ebf8283 2019-07-24 stsp if (feof(f))
4314 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
4315 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
4320 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4322 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
4323 0ebf8283 2019-07-24 stsp free(line);
4324 0ebf8283 2019-07-24 stsp line = NULL;
4327 0ebf8283 2019-07-24 stsp cmd = NULL;
4328 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4329 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
4330 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4331 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
4332 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
4335 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4340 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
4341 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4344 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4346 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
4347 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
4348 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
4351 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
4352 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4356 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
4357 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
4358 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4362 0ebf8283 2019-07-24 stsp free(line);
4363 0ebf8283 2019-07-24 stsp line = NULL;
4367 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
4369 0ebf8283 2019-07-24 stsp *end = '\0';
4371 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
4372 0ebf8283 2019-07-24 stsp if (err) {
4373 0ebf8283 2019-07-24 stsp /* override error code */
4374 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4378 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
4379 0ebf8283 2019-07-24 stsp if (hle == NULL) {
4380 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
4383 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
4384 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
4385 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
4386 0ebf8283 2019-07-24 stsp commit_id = NULL;
4387 0ebf8283 2019-07-24 stsp free(line);
4388 0ebf8283 2019-07-24 stsp line = NULL;
4389 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4392 0ebf8283 2019-07-24 stsp free(line);
4393 0ebf8283 2019-07-24 stsp free(commit_id);
4394 0ebf8283 2019-07-24 stsp return err;
4397 0ebf8283 2019-07-24 stsp static const struct got_error *
4398 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
4399 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4401 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4402 0ebf8283 2019-07-24 stsp char *editor;
4403 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4405 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4407 0ebf8283 2019-07-24 stsp return err;
4409 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
4410 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
4411 0ebf8283 2019-07-24 stsp goto done;
4414 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4415 0ebf8283 2019-07-24 stsp if (f == NULL) {
4416 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
4417 0ebf8283 2019-07-24 stsp goto done;
4419 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4421 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4422 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4423 0ebf8283 2019-07-24 stsp free(editor);
4424 0ebf8283 2019-07-24 stsp return err;
4427 0ebf8283 2019-07-24 stsp static const struct got_error *
4428 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *, const char *,
4429 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
4431 0ebf8283 2019-07-24 stsp static const struct got_error *
4432 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
4433 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4435 0ebf8283 2019-07-24 stsp const struct got_error *err;
4436 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4437 0ebf8283 2019-07-24 stsp char *path = NULL;
4439 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
4441 0ebf8283 2019-07-24 stsp return err;
4443 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
4445 0ebf8283 2019-07-24 stsp goto done;
4447 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
4449 0ebf8283 2019-07-24 stsp goto done;
4451 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
4452 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4453 0ebf8283 2019-07-24 stsp goto done;
4457 0ebf8283 2019-07-24 stsp err = histedit_run_editor(histedit_cmds, path, repo);
4458 0ebf8283 2019-07-24 stsp if (err) {
4459 0ebf8283 2019-07-24 stsp const char *errmsg = err->msg;
4460 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX)
4461 0ebf8283 2019-07-24 stsp goto done;
4462 0ebf8283 2019-07-24 stsp err = histedit_edit_list_retry(histedit_cmds, errmsg,
4463 0ebf8283 2019-07-24 stsp commits, path, repo);
4466 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4467 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4468 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
4469 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
4470 0ebf8283 2019-07-24 stsp free(path);
4471 0ebf8283 2019-07-24 stsp return err;
4474 0ebf8283 2019-07-24 stsp static const struct got_error *
4475 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
4476 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4478 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4479 0ebf8283 2019-07-24 stsp char *path = NULL;
4480 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4481 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4482 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4484 0ebf8283 2019-07-24 stsp err = got_worktree_get_histedit_list_path(&path, worktree);
4486 0ebf8283 2019-07-24 stsp return err;
4488 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
4489 0ebf8283 2019-07-24 stsp if (f == NULL) {
4490 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4491 0ebf8283 2019-07-24 stsp goto done;
4493 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4494 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
4499 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4500 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
4501 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
4502 0ebf8283 2019-07-24 stsp if (n < 0) {
4503 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4509 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4510 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4511 0ebf8283 2019-07-24 stsp free(path);
4512 0ebf8283 2019-07-24 stsp if (commit)
4513 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4514 0ebf8283 2019-07-24 stsp return err;
4517 0ebf8283 2019-07-24 stsp static const struct got_error *
4518 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
4519 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4521 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4522 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4524 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4525 0ebf8283 2019-07-24 stsp if (f == NULL) {
4526 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4527 0ebf8283 2019-07-24 stsp goto done;
4530 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4532 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4533 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4534 0ebf8283 2019-07-24 stsp return err;
4537 0ebf8283 2019-07-24 stsp static const struct got_error *
4538 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
4539 0ebf8283 2019-07-24 stsp const char *errmsg, struct got_object_id_queue *commits,
4540 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4542 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4543 0ebf8283 2019-07-24 stsp int resp = ' ';
4545 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
4546 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
4547 0ebf8283 2019-07-24 stsp "or (a)bort: ", getprogname(), errmsg);
4548 0ebf8283 2019-07-24 stsp resp = getchar();
4549 426ebf2e 2019-07-25 stsp if (resp == 'c') {
4550 0ebf8283 2019-07-24 stsp err = histedit_run_editor(histedit_cmds, path, repo);
4551 426ebf2e 2019-07-25 stsp if (err) {
4552 426ebf2e 2019-07-25 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX)
4554 426ebf2e 2019-07-25 stsp resp = ' ';
4557 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
4558 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
4559 0ebf8283 2019-07-24 stsp commits, repo);
4560 426ebf2e 2019-07-25 stsp if (err) {
4561 426ebf2e 2019-07-25 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX)
4563 426ebf2e 2019-07-25 stsp resp = ' ';
4566 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
4567 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
4570 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
4573 0ebf8283 2019-07-24 stsp return err;
4576 0ebf8283 2019-07-24 stsp static const struct got_error *
4577 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
4578 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4579 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
4581 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
4582 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4583 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
4584 3e3a69f1 2019-07-25 stsp branch, repo);
4587 0ebf8283 2019-07-24 stsp static const struct got_error *
4588 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
4589 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
4591 0ebf8283 2019-07-24 stsp const struct got_error *err;
4592 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4594 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
4596 0ebf8283 2019-07-24 stsp goto done;
4598 0ebf8283 2019-07-24 stsp if (new_id) {
4599 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
4601 0ebf8283 2019-07-24 stsp goto done;
4604 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
4605 0ebf8283 2019-07-24 stsp if (new_id_str)
4606 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
4608 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4609 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
4610 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
4611 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4612 0ebf8283 2019-07-24 stsp goto done;
4614 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
4616 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4618 0ebf8283 2019-07-24 stsp goto done;
4621 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
4622 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
4623 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
4624 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
4625 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4627 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
4628 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
4629 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
4637 0ebf8283 2019-07-24 stsp free(old_id_str);
4638 0ebf8283 2019-07-24 stsp free(new_id_str);
4639 0ebf8283 2019-07-24 stsp return err;
4642 0ebf8283 2019-07-24 stsp static const struct got_error *
4643 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
4644 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4645 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
4646 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4648 0ebf8283 2019-07-24 stsp const struct got_error *err;
4649 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
4650 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
4652 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
4653 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
4654 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4656 0ebf8283 2019-07-24 stsp return err;
4659 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4661 0ebf8283 2019-07-24 stsp return err;
4663 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
4664 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
4665 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
4666 0ebf8283 2019-07-24 stsp if (err) {
4667 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
4668 0ebf8283 2019-07-24 stsp goto done;
4669 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
4671 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
4672 0ebf8283 2019-07-24 stsp free(new_commit_id);
4675 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4676 0ebf8283 2019-07-24 stsp return err;
4679 0ebf8283 2019-07-24 stsp static const struct got_error *
4680 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
4681 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4683 0ebf8283 2019-07-24 stsp const struct got_error *error;
4684 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
4686 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
4688 0ebf8283 2019-07-24 stsp if (error)
4689 0ebf8283 2019-07-24 stsp return error;
4691 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
4692 0ebf8283 2019-07-24 stsp if (error)
4693 0ebf8283 2019-07-24 stsp return error;
4695 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
4696 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4697 0ebf8283 2019-07-24 stsp return error;
4700 0ebf8283 2019-07-24 stsp static const struct got_error *
4701 0ebf8283 2019-07-24 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
4702 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4704 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4705 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
4706 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4707 0ebf8283 2019-07-24 stsp static char msg[80];
4708 0ebf8283 2019-07-24 stsp char *id_str;
4710 0ebf8283 2019-07-24 stsp if (TAILQ_EMPTY(histedit_cmds))
4711 ff6aa206 2019-07-25 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
4712 ff6aa206 2019-07-25 stsp "histedit script contains no commands");
4714 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4715 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4716 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
4719 0ebf8283 2019-07-24 stsp if (hle == NULL) {
4720 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, qid->id);
4722 0ebf8283 2019-07-24 stsp return err;
4723 0ebf8283 2019-07-24 stsp snprintf(msg, sizeof(msg),
4724 0ebf8283 2019-07-24 stsp "commit %s missing from histedit script", id_str);
4725 0ebf8283 2019-07-24 stsp free(id_str);
4726 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
4730 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD)
4731 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
4732 0ebf8283 2019-07-24 stsp "last commit in histedit script cannot be folded");
4734 0ebf8283 2019-07-24 stsp return NULL;
4737 0ebf8283 2019-07-24 stsp static const struct got_error *
4738 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
4740 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
4741 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
4742 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
4743 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
4744 0ebf8283 2019-07-24 stsp char *cwd = NULL;
4745 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
4746 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
4747 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
4748 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
4749 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
4750 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4751 0ebf8283 2019-07-24 stsp int ch, rebase_in_progress = 0;
4752 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
4753 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
4754 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4755 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
4756 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
4757 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
4758 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
4759 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
4760 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4762 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
4763 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
4764 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
4766 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
4767 0ebf8283 2019-07-24 stsp switch (ch) {
4769 0ebf8283 2019-07-24 stsp abort_edit = 1;
4772 0ebf8283 2019-07-24 stsp continue_edit = 1;
4775 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
4778 0ebf8283 2019-07-24 stsp usage_histedit();
4779 0ebf8283 2019-07-24 stsp /* NOTREACHED */
4783 0ebf8283 2019-07-24 stsp argc -= optind;
4784 0ebf8283 2019-07-24 stsp argv += optind;
4786 0ebf8283 2019-07-24 stsp #ifndef PROFILE
4787 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4788 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
4789 0ebf8283 2019-07-24 stsp err(1, "pledge");
4791 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
4792 0ebf8283 2019-07-24 stsp usage_histedit();
4793 0ebf8283 2019-07-24 stsp if (argc != 0)
4794 0ebf8283 2019-07-24 stsp usage_histedit();
4797 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
4798 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
4799 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
4800 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
4801 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
4802 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
4805 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
4806 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
4807 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
4808 0ebf8283 2019-07-24 stsp goto done;
4810 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
4811 0ebf8283 2019-07-24 stsp if (error)
4812 0ebf8283 2019-07-24 stsp goto done;
4814 0ebf8283 2019-07-24 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4815 0ebf8283 2019-07-24 stsp if (error != NULL)
4816 0ebf8283 2019-07-24 stsp goto done;
4818 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4819 0ebf8283 2019-07-24 stsp if (error)
4820 0ebf8283 2019-07-24 stsp goto done;
4821 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
4822 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
4823 0ebf8283 2019-07-24 stsp goto done;
4826 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
4827 0ebf8283 2019-07-24 stsp if (error)
4828 0ebf8283 2019-07-24 stsp goto done;
4830 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
4831 0ebf8283 2019-07-24 stsp int did_something;
4832 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
4833 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
4834 3e3a69f1 2019-07-25 stsp worktree, repo);
4835 0ebf8283 2019-07-24 stsp if (error)
4836 0ebf8283 2019-07-24 stsp goto done;
4837 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
4838 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4839 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
4840 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
4841 0ebf8283 2019-07-24 stsp if (error)
4842 0ebf8283 2019-07-24 stsp goto done;
4843 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
4844 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4845 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
4846 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
4847 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
4848 0ebf8283 2019-07-24 stsp goto done;
4851 0ebf8283 2019-07-24 stsp if (continue_edit) {
4852 0ebf8283 2019-07-24 stsp char *path;
4854 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
4855 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
4856 0ebf8283 2019-07-24 stsp goto done;
4859 0ebf8283 2019-07-24 stsp error = got_worktree_get_histedit_list_path(&path, worktree);
4860 0ebf8283 2019-07-24 stsp if (error)
4861 0ebf8283 2019-07-24 stsp goto done;
4863 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
4864 0ebf8283 2019-07-24 stsp free(path);
4865 0ebf8283 2019-07-24 stsp if (error)
4866 0ebf8283 2019-07-24 stsp goto done;
4868 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
4869 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
4870 3e3a69f1 2019-07-25 stsp worktree, repo);
4871 0ebf8283 2019-07-24 stsp if (error)
4872 0ebf8283 2019-07-24 stsp goto done;
4874 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
4875 0ebf8283 2019-07-24 stsp if (error)
4876 0ebf8283 2019-07-24 stsp goto done;
4878 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
4879 0ebf8283 2019-07-24 stsp head_commit_id);
4880 0ebf8283 2019-07-24 stsp if (error)
4881 0ebf8283 2019-07-24 stsp goto done;
4882 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4883 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
4884 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
4885 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
4886 3aac7cf7 2019-07-25 stsp goto done;
4888 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
4889 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
4890 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
4891 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4892 0ebf8283 2019-07-24 stsp commit = NULL;
4893 0ebf8283 2019-07-24 stsp if (error)
4894 0ebf8283 2019-07-24 stsp goto done;
4896 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
4897 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
4898 0ebf8283 2019-07-24 stsp goto done;
4901 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
4902 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
4903 0ebf8283 2019-07-24 stsp if (error != NULL)
4904 0ebf8283 2019-07-24 stsp goto done;
4906 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
4907 0ebf8283 2019-07-24 stsp if (error)
4908 0ebf8283 2019-07-24 stsp goto done;
4910 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
4911 0ebf8283 2019-07-24 stsp head_commit_id);
4912 0ebf8283 2019-07-24 stsp if (error)
4913 0ebf8283 2019-07-24 stsp goto done;
4914 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4915 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
4916 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
4917 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
4918 3aac7cf7 2019-07-25 stsp goto done;
4920 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
4921 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
4922 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
4923 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
4924 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4925 0ebf8283 2019-07-24 stsp commit = NULL;
4926 0ebf8283 2019-07-24 stsp if (error)
4927 0ebf8283 2019-07-24 stsp goto done;
4929 0ebf8283 2019-07-24 stsp if (edit_script_path) {
4930 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
4931 0ebf8283 2019-07-24 stsp edit_script_path, repo);
4932 0ebf8283 2019-07-24 stsp if (error)
4933 0ebf8283 2019-07-24 stsp goto done;
4935 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
4937 0ebf8283 2019-07-24 stsp if (error)
4938 0ebf8283 2019-07-24 stsp goto done;
4942 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
4944 0ebf8283 2019-07-24 stsp if (error)
4945 0ebf8283 2019-07-24 stsp goto done;
4947 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
4948 3e3a69f1 2019-07-25 stsp &base_commit_id, &fileindex, worktree, repo);
4949 0ebf8283 2019-07-24 stsp if (error)
4950 0ebf8283 2019-07-24 stsp goto done;
4954 0ebf8283 2019-07-24 stsp error = histedit_check_script(&histedit_cmds, &commits, repo);
4955 0ebf8283 2019-07-24 stsp if (error)
4956 0ebf8283 2019-07-24 stsp goto done;
4958 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
4959 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
4960 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
4961 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
4964 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
4965 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
4966 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
4967 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
4970 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
4971 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
4973 0ebf8283 2019-07-24 stsp if (error)
4974 0ebf8283 2019-07-24 stsp goto done;
4978 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
4979 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
4980 0ebf8283 2019-07-24 stsp if (error)
4981 0ebf8283 2019-07-24 stsp goto done;
4985 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
4986 0ebf8283 2019-07-24 stsp hle->commit_id);
4987 0ebf8283 2019-07-24 stsp if (error)
4988 0ebf8283 2019-07-24 stsp goto done;
4989 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4990 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
4992 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
4993 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
4994 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
4995 0ebf8283 2019-07-24 stsp if (error)
4996 0ebf8283 2019-07-24 stsp goto done;
4997 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4998 0ebf8283 2019-07-24 stsp commit = NULL;
5000 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5001 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5005 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5006 0ebf8283 2019-07-24 stsp char *id_str;
5007 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
5008 0ebf8283 2019-07-24 stsp if (error)
5009 0ebf8283 2019-07-24 stsp goto done;
5010 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
5012 0ebf8283 2019-07-24 stsp free(id_str);
5013 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5014 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
5015 3e3a69f1 2019-07-25 stsp fileindex);
5016 0ebf8283 2019-07-24 stsp goto done;
5019 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5020 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5021 0ebf8283 2019-07-24 stsp if (error)
5022 0ebf8283 2019-07-24 stsp goto done;
5026 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
5027 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
5028 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5029 0ebf8283 2019-07-24 stsp if (error)
5030 0ebf8283 2019-07-24 stsp goto done;
5033 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5034 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
5035 0ebf8283 2019-07-24 stsp if (error)
5036 0ebf8283 2019-07-24 stsp goto done;
5037 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5038 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
5040 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
5041 3e3a69f1 2019-07-25 stsp branch, repo);
5043 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
5044 0ebf8283 2019-07-24 stsp free(head_commit_id);
5045 0ebf8283 2019-07-24 stsp free(base_commit_id);
5046 0ebf8283 2019-07-24 stsp free(resume_commit_id);
5047 0ebf8283 2019-07-24 stsp if (commit)
5048 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5049 0ebf8283 2019-07-24 stsp if (branch)
5050 0ebf8283 2019-07-24 stsp got_ref_close(branch);
5051 0ebf8283 2019-07-24 stsp if (tmp_branch)
5052 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
5053 0ebf8283 2019-07-24 stsp if (worktree)
5054 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
5056 0ebf8283 2019-07-24 stsp got_repo_close(repo);
5057 0ebf8283 2019-07-24 stsp return error;
