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 53ccebc2 2019-07-30 stsp #include "got_version.h"
39 f42b1b34 2018-03-12 stsp #include "got_error.h"
40 f42b1b34 2018-03-12 stsp #include "got_object.h"
41 5261c201 2018-04-01 stsp #include "got_reference.h"
42 f42b1b34 2018-03-12 stsp #include "got_repository.h"
43 1dd54920 2019-05-11 stsp #include "got_path.h"
44 c09a553d 2018-03-12 stsp #include "got_worktree.h"
45 79109fed 2018-03-27 stsp #include "got_diff.h"
46 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
47 404c43c4 2018-06-21 stsp #include "got_blame.h"
48 63219cd2 2019-01-04 stsp #include "got_privsep.h"
49 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
51 5c860e29 2018-03-12 stsp #ifndef nitems
52 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
55 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
56 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
59 99437157 2018-11-11 stsp catch_sigint(int signo)
61 99437157 2018-11-11 stsp sigint_received = 1;
65 99437157 2018-11-11 stsp catch_sigpipe(int signo)
67 99437157 2018-11-11 stsp sigpipe_received = 1;
71 8cfb4057 2019-07-09 stsp struct got_cmd {
72 5c860e29 2018-03-12 stsp const char *cmd_name;
73 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
74 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
75 97b3a7be 2019-07-09 stsp const char *cmd_alias;
78 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
79 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
80 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
82 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
83 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
84 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
85 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
86 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
87 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
88 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
89 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
90 d00136be 2019-03-26 stsp __dead static void usage_add(void);
91 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
92 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
93 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
94 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
95 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
96 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
97 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
98 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
99 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
101 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
102 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
103 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
104 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
105 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
106 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
107 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
108 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
110 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
111 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
112 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
113 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
114 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
115 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
116 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
117 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
118 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
119 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
120 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
121 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
123 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
124 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
125 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
126 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
127 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
128 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
129 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
130 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
131 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
132 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
133 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
134 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
135 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
136 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
137 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
138 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
139 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
140 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
141 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
142 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
143 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
144 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
147 ce5b7c56 2019-07-09 stsp static void
148 ce5b7c56 2019-07-09 stsp list_commands(void)
152 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
153 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
154 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
155 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
157 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
161 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
163 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
164 5c860e29 2018-03-12 stsp unsigned int i;
166 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
168 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
170 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
171 5c860e29 2018-03-12 stsp switch (ch) {
179 ce5b7c56 2019-07-09 stsp usage(hflag);
180 5c860e29 2018-03-12 stsp /* NOTREACHED */
184 5c860e29 2018-03-12 stsp argc -= optind;
185 5c860e29 2018-03-12 stsp argv += optind;
186 1e70621d 2018-03-27 stsp optind = 0;
188 53ccebc2 2019-07-30 stsp if (Vflag) {
189 53ccebc2 2019-07-30 stsp got_version_print_str();
193 5c860e29 2018-03-12 stsp if (argc <= 0)
194 ce5b7c56 2019-07-09 stsp usage(hflag);
196 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
197 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
199 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
200 d7d4f210 2018-03-12 stsp const struct got_error *error;
202 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
204 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
205 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
209 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
211 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
212 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
213 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
220 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
221 ce5b7c56 2019-07-09 stsp list_commands();
225 4ed7e80c 2018-05-20 stsp __dead static void
226 ce5b7c56 2019-07-09 stsp usage(int hflag)
228 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
229 53ccebc2 2019-07-30 stsp getprogname());
231 ce5b7c56 2019-07-09 stsp list_commands();
235 0266afb7 2019-01-04 stsp static const struct got_error *
236 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
238 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
239 e2ba3d07 2019-05-13 stsp const char *editor;
241 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
242 e2ba3d07 2019-05-13 stsp if (editor == NULL)
243 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
245 0ee7065d 2019-05-13 stsp if (editor) {
246 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
248 0ee7065d 2019-05-13 stsp return err;
251 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
252 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
253 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
254 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
257 e2ba3d07 2019-05-13 stsp return NULL;
260 e2ba3d07 2019-05-13 stsp static const struct got_error *
261 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
262 c530dc23 2019-07-23 stsp const char *worktree_path)
264 163ce85a 2019-05-13 stsp const struct got_error *err;
266 37c06ea4 2019-07-15 stsp #ifdef PROFILE
267 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
268 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
270 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
271 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
273 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
274 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
276 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
277 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
279 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
280 163ce85a 2019-05-13 stsp if (err != NULL)
281 163ce85a 2019-05-13 stsp return err;
283 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
284 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
286 0266afb7 2019-01-04 stsp return NULL;
289 2c7829a4 2019-06-17 stsp __dead static void
290 2c7829a4 2019-06-17 stsp usage_init(void)
292 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
296 2c7829a4 2019-06-17 stsp static const struct got_error *
297 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
299 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
300 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
303 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
304 2c7829a4 2019-06-17 stsp switch (ch) {
306 2c7829a4 2019-06-17 stsp usage_init();
307 2c7829a4 2019-06-17 stsp /* NOTREACHED */
311 2c7829a4 2019-06-17 stsp argc -= optind;
312 2c7829a4 2019-06-17 stsp argv += optind;
314 2c7829a4 2019-06-17 stsp #ifndef PROFILE
315 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
316 2c7829a4 2019-06-17 stsp err(1, "pledge");
318 2c7829a4 2019-06-17 stsp if (argc != 1)
319 bc20e173 2019-06-17 stsp usage_init();
321 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
322 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
323 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
325 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
327 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
328 2c7829a4 2019-06-17 stsp if (error &&
329 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
332 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
336 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
337 2c7829a4 2019-06-17 stsp if (error != NULL)
341 3ce1b845 2019-07-15 stsp free(repo_path);
342 3ce1b845 2019-07-15 stsp return error;
345 3ce1b845 2019-07-15 stsp __dead static void
346 3ce1b845 2019-07-15 stsp usage_import(void)
348 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
349 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
354 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
357 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
358 3ce1b845 2019-07-15 stsp int st = -1;
360 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
361 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
362 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
364 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
366 3ce1b845 2019-07-15 stsp goto doneediting;
368 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
369 3ce1b845 2019-07-15 stsp _exit(127);
372 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
373 3ce1b845 2019-07-15 stsp if (errno != EINTR)
376 3ce1b845 2019-07-15 stsp doneediting:
377 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
378 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
379 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
381 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
382 3ce1b845 2019-07-15 stsp errno = EINTR;
386 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
389 3ce1b845 2019-07-15 stsp static const struct got_error *
390 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
391 3ce1b845 2019-07-15 stsp const char *initial_content)
393 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
394 3ce1b845 2019-07-15 stsp char buf[1024];
395 3ce1b845 2019-07-15 stsp struct stat st, st2;
397 3ce1b845 2019-07-15 stsp int content_changed = 0;
398 3ce1b845 2019-07-15 stsp size_t len;
400 3ce1b845 2019-07-15 stsp *logmsg = NULL;
402 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
403 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
405 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
406 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
408 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
409 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
411 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
412 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
413 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
415 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
416 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
417 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
418 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
421 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
422 3ce1b845 2019-07-15 stsp if (fp == NULL) {
423 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
426 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
427 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
428 3ce1b845 2019-07-15 stsp content_changed = 1;
429 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
430 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
431 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
433 3ce1b845 2019-07-15 stsp fclose(fp);
435 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
436 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
440 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
441 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
442 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
445 3ce1b845 2019-07-15 stsp free(*logmsg);
446 3ce1b845 2019-07-15 stsp *logmsg = NULL;
448 3ce1b845 2019-07-15 stsp return err;
451 3ce1b845 2019-07-15 stsp static const struct got_error *
452 3ce1b845 2019-07-15 stsp collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
453 3ce1b845 2019-07-15 stsp const char *branch_name)
455 3ce1b845 2019-07-15 stsp char *initial_content = NULL, *logmsg_path = NULL;
456 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
459 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
460 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
461 3ce1b845 2019-07-15 stsp branch_name) == -1)
462 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
464 3ce1b845 2019-07-15 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
468 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
471 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
473 3ce1b845 2019-07-15 stsp free(initial_content);
474 3ce1b845 2019-07-15 stsp free(logmsg_path);
475 3ce1b845 2019-07-15 stsp return err;
478 3ce1b845 2019-07-15 stsp static const struct got_error *
479 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
481 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
482 3ce1b845 2019-07-15 stsp return NULL;
485 3ce1b845 2019-07-15 stsp static const struct got_error *
486 84792843 2019-08-09 stsp get_author(const char **author)
488 84792843 2019-08-09 stsp const char *got_author;
490 84792843 2019-08-09 stsp *author = NULL;
492 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
493 84792843 2019-08-09 stsp if (got_author == NULL) {
494 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
495 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
498 84792843 2019-08-09 stsp *author = got_author;
501 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
502 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
504 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
505 84792843 2019-08-09 stsp got_author++;
506 84792843 2019-08-09 stsp if (*got_author != '<')
507 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
508 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
509 84792843 2019-08-09 stsp got_author++;
510 84792843 2019-08-09 stsp if (*got_author != '@')
511 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
512 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
513 84792843 2019-08-09 stsp got_author++;
514 84792843 2019-08-09 stsp if (*got_author != '>')
515 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
517 84792843 2019-08-09 stsp return NULL;
520 84792843 2019-08-09 stsp static const struct got_error *
521 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
523 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
524 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
525 3ce1b845 2019-07-15 stsp char *editor = NULL;
526 84792843 2019-08-09 stsp const char *author;
527 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
528 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
529 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
530 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
531 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
533 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
534 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
536 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
538 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
539 3ce1b845 2019-07-15 stsp switch (ch) {
541 3ce1b845 2019-07-15 stsp branch_name = optarg;
544 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
545 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
546 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
551 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
552 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
553 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
558 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
560 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
566 3ce1b845 2019-07-15 stsp usage_init();
567 3ce1b845 2019-07-15 stsp /* NOTREACHED */
571 3ce1b845 2019-07-15 stsp argc -= optind;
572 3ce1b845 2019-07-15 stsp argv += optind;
574 3ce1b845 2019-07-15 stsp #ifndef PROFILE
575 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
576 3ce1b845 2019-07-15 stsp NULL) == -1)
577 3ce1b845 2019-07-15 stsp err(1, "pledge");
579 3ce1b845 2019-07-15 stsp if (argc != 1)
580 3ce1b845 2019-07-15 stsp usage_import();
582 84792843 2019-08-09 stsp error = get_author(&author);
584 84792843 2019-08-09 stsp return error;
586 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
587 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
588 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
589 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
591 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
592 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
596 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
597 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
601 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
602 3ce1b845 2019-07-15 stsp if (error) {
603 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
606 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
607 3ce1b845 2019-07-15 stsp "import target branch already exists");
611 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
612 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
613 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
616 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
619 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
620 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
622 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
623 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
626 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
631 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
632 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
634 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
638 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
639 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
643 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
647 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
651 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
655 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
656 3ce1b845 2019-07-15 stsp if (error) {
657 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
660 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
661 3ce1b845 2019-07-15 stsp branch_ref);
665 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
670 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
671 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
673 2c7829a4 2019-06-17 stsp free(repo_path);
674 3ce1b845 2019-07-15 stsp free(editor);
675 3ce1b845 2019-07-15 stsp free(refname);
676 3ce1b845 2019-07-15 stsp free(new_commit_id);
677 3ce1b845 2019-07-15 stsp free(id_str);
678 3ce1b845 2019-07-15 stsp if (branch_ref)
679 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
680 3ce1b845 2019-07-15 stsp if (head_ref)
681 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
682 2c7829a4 2019-06-17 stsp return error;
685 4ed7e80c 2018-05-20 stsp __dead static void
686 c09a553d 2018-03-12 stsp usage_checkout(void)
688 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
689 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
693 1ee397ad 2019-07-12 stsp static const struct got_error *
694 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
696 92a684f4 2018-03-12 stsp char *worktree_path = arg;
698 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
699 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
700 1ee397ad 2019-07-12 stsp return NULL;
702 92a684f4 2018-03-12 stsp while (path[0] == '/')
705 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
706 1ee397ad 2019-07-12 stsp return NULL;
709 99437157 2018-11-11 stsp static const struct got_error *
710 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
712 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
713 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
714 99437157 2018-11-11 stsp return NULL;
717 8069f636 2019-01-12 stsp static const struct got_error *
718 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
719 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
721 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
722 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
724 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
725 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
727 36a38700 2019-05-10 stsp return err;
729 d5bea539 2019-05-13 stsp if (yca_id == NULL)
730 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
733 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
734 d5bea539 2019-05-13 stsp * and the work tree's base commit.
736 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
738 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
746 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
747 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
748 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
750 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
751 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
752 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
754 d5bea539 2019-05-13 stsp free(yca_id);
755 d5bea539 2019-05-13 stsp return NULL;
758 a367ff0f 2019-05-14 stsp static const struct got_error *
759 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
760 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
761 a51a74b3 2019-07-27 stsp struct got_repository *repo)
763 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
764 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
765 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
766 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
768 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
772 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
773 a51a74b3 2019-07-27 stsp is_same_branch = 1;
776 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
777 a51a74b3 2019-07-27 stsp is_same_branch = 1;
781 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
785 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
790 a367ff0f 2019-05-14 stsp struct got_object_id *id;
791 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
793 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
794 a367ff0f 2019-05-14 stsp err = NULL;
796 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
798 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
805 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
807 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
808 a367ff0f 2019-05-14 stsp is_same_branch = 1;
815 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
816 a367ff0f 2019-05-14 stsp free(head_commit_id);
817 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
818 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
819 04f57cb3 2019-07-25 stsp return err;
822 04f57cb3 2019-07-25 stsp static const struct got_error *
823 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
824 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
826 04f57cb3 2019-07-25 stsp const struct got_error *err;
827 04f57cb3 2019-07-25 stsp struct got_reference *ref;
828 303e2782 2019-08-09 stsp struct got_tag_object *tag;
830 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
831 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
832 303e2782 2019-08-09 stsp if (err == NULL) {
833 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
834 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
835 303e2782 2019-08-09 stsp if (*commit_id == NULL)
836 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
837 303e2782 2019-08-09 stsp got_object_tag_close(tag);
838 303e2782 2019-08-09 stsp return err;
839 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
840 303e2782 2019-08-09 stsp return err;
842 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
843 04f57cb3 2019-07-25 stsp if (err == NULL) {
844 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
845 04f57cb3 2019-07-25 stsp got_ref_close(ref);
847 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
848 04f57cb3 2019-07-25 stsp return err;
849 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
850 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
852 a367ff0f 2019-05-14 stsp return err;
855 4ed7e80c 2018-05-20 stsp static const struct got_error *
856 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
858 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
859 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
860 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
861 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
862 c09a553d 2018-03-12 stsp char *repo_path = NULL;
863 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
864 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
865 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
866 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
867 72151b04 2019-05-11 stsp int ch, same_path_prefix;
868 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
870 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
872 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
873 0bb8a95e 2018-03-12 stsp switch (ch) {
875 08573d5b 2019-05-14 stsp branch_name = optarg;
878 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
879 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
880 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
883 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
886 2deda0b9 2019-03-07 stsp usage_checkout();
887 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
891 0bb8a95e 2018-03-12 stsp argc -= optind;
892 0bb8a95e 2018-03-12 stsp argv += optind;
894 6715a751 2018-03-16 stsp #ifndef PROFILE
895 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
896 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
897 c09a553d 2018-03-12 stsp err(1, "pledge");
899 0bb8a95e 2018-03-12 stsp if (argc == 1) {
900 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
901 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
902 76089277 2018-04-01 stsp if (repo_path == NULL)
903 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
904 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
905 76089277 2018-04-01 stsp if (cwd == NULL) {
906 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
909 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
910 230a42bd 2019-05-11 jcs base = basename(path_prefix);
911 230a42bd 2019-05-11 jcs if (base == NULL) {
912 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
913 230a42bd 2019-05-11 jcs path_prefix);
917 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
918 230a42bd 2019-05-11 jcs if (base == NULL) {
919 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
924 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
925 c09a553d 2018-03-12 stsp if (dotgit)
926 c09a553d 2018-03-12 stsp *dotgit = '\0';
927 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
928 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
933 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
934 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
935 76089277 2018-04-01 stsp if (repo_path == NULL) {
936 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
939 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
940 76089277 2018-04-01 stsp if (worktree_path == NULL) {
941 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
942 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
946 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
947 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
948 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
953 c09a553d 2018-03-12 stsp usage_checkout();
955 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
956 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
958 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
959 c09a553d 2018-03-12 stsp if (error != NULL)
962 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
963 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
964 c530dc23 2019-07-23 stsp if (error) {
965 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
966 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
968 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
969 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
970 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
975 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
979 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
980 c09a553d 2018-03-12 stsp if (error != NULL)
983 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
984 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
987 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
988 c09a553d 2018-03-12 stsp if (error != NULL)
991 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
992 e5dc7198 2018-12-29 stsp path_prefix);
993 e5dc7198 2018-12-29 stsp if (error != NULL)
995 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
996 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1000 8069f636 2019-01-12 stsp if (commit_id_str) {
1001 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1002 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1003 30837e32 2019-07-25 stsp if (error)
1004 8069f636 2019-01-12 stsp goto done;
1005 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1006 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1007 8069f636 2019-01-12 stsp if (error != NULL) {
1008 8069f636 2019-01-12 stsp free(commit_id);
1009 8069f636 2019-01-12 stsp goto done;
1011 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1012 45d344f6 2019-05-14 stsp if (error)
1013 45d344f6 2019-05-14 stsp goto done;
1014 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1015 8069f636 2019-01-12 stsp commit_id);
1016 8069f636 2019-01-12 stsp free(commit_id);
1017 8069f636 2019-01-12 stsp if (error)
1018 8069f636 2019-01-12 stsp goto done;
1021 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1022 f2ea84fa 2019-07-27 stsp if (error)
1023 f2ea84fa 2019-07-27 stsp goto done;
1024 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1025 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1026 c09a553d 2018-03-12 stsp if (error != NULL)
1027 c09a553d 2018-03-12 stsp goto done;
1029 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1032 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1033 8069f636 2019-01-12 stsp free(commit_id_str);
1034 76089277 2018-04-01 stsp free(repo_path);
1035 507dc3bb 2018-12-29 stsp free(worktree_path);
1036 507dc3bb 2018-12-29 stsp return error;
1039 507dc3bb 2018-12-29 stsp __dead static void
1040 507dc3bb 2018-12-29 stsp usage_update(void)
1042 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1043 507dc3bb 2018-12-29 stsp getprogname());
1047 1ee397ad 2019-07-12 stsp static const struct got_error *
1048 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1050 784955db 2019-01-12 stsp int *did_something = arg;
1052 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1053 1ee397ad 2019-07-12 stsp return NULL;
1055 1545c615 2019-02-10 stsp *did_something = 1;
1057 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1058 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1059 1ee397ad 2019-07-12 stsp return NULL;
1061 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1063 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1064 1ee397ad 2019-07-12 stsp return NULL;
1067 be7061eb 2018-12-30 stsp static const struct got_error *
1068 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1069 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1070 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1072 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1073 a1fb16d8 2019-05-24 stsp char *base_id_str;
1074 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1076 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1077 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1078 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1079 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1080 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1081 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1082 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1085 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1086 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1087 a1fb16d8 2019-05-24 stsp if (err) {
1088 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1089 a1fb16d8 2019-05-24 stsp return err;
1090 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1092 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1093 a1fb16d8 2019-05-24 stsp return NULL;
1095 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1096 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1097 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1099 a1fb16d8 2019-05-24 stsp return err;
1100 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1101 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1102 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1103 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1104 0ebf8283 2019-07-24 stsp return NULL;
1107 0ebf8283 2019-07-24 stsp static const struct got_error *
1108 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1110 0ebf8283 2019-07-24 stsp const struct got_error *err;
1111 0ebf8283 2019-07-24 stsp int in_progress;
1113 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1115 0ebf8283 2019-07-24 stsp return err;
1116 0ebf8283 2019-07-24 stsp if (in_progress)
1117 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1119 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1121 0ebf8283 2019-07-24 stsp return err;
1122 0ebf8283 2019-07-24 stsp if (in_progress)
1123 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1125 a1fb16d8 2019-05-24 stsp return NULL;
1128 a5edda0a 2019-07-27 stsp static const struct got_error *
1129 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1130 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1132 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1133 a5edda0a 2019-07-27 stsp char *path;
1136 a5edda0a 2019-07-27 stsp if (argc == 0) {
1137 a5edda0a 2019-07-27 stsp path = strdup("");
1138 a5edda0a 2019-07-27 stsp if (path == NULL)
1139 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1140 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1143 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1144 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1147 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1148 a5edda0a 2019-07-27 stsp if (err) {
1149 a5edda0a 2019-07-27 stsp free(path);
1154 a5edda0a 2019-07-27 stsp return err;
1157 a1fb16d8 2019-05-24 stsp static const struct got_error *
1158 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1160 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1161 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1162 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1163 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1164 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1165 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1166 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1167 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1168 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1169 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1170 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1172 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1174 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1175 507dc3bb 2018-12-29 stsp switch (ch) {
1177 024e9686 2019-05-14 stsp branch_name = optarg;
1180 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1181 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1182 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1185 2deda0b9 2019-03-07 stsp usage_update();
1186 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1190 507dc3bb 2018-12-29 stsp argc -= optind;
1191 507dc3bb 2018-12-29 stsp argv += optind;
1193 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1194 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1195 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1196 507dc3bb 2018-12-29 stsp err(1, "pledge");
1198 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1199 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1200 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1201 c4cdcb68 2019-04-03 stsp goto done;
1203 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1204 7d5807f4 2019-07-11 stsp if (error)
1205 7d5807f4 2019-07-11 stsp goto done;
1207 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1208 f2ea84fa 2019-07-27 stsp if (error)
1209 f2ea84fa 2019-07-27 stsp goto done;
1211 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1212 507dc3bb 2018-12-29 stsp if (error != NULL)
1213 507dc3bb 2018-12-29 stsp goto done;
1215 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1216 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1217 087fb88c 2019-08-04 stsp if (error)
1218 087fb88c 2019-08-04 stsp goto done;
1220 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1221 0266afb7 2019-01-04 stsp if (error)
1222 0266afb7 2019-01-04 stsp goto done;
1224 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1225 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1226 024e9686 2019-05-14 stsp if (error != NULL)
1227 024e9686 2019-05-14 stsp goto done;
1228 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1229 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1230 9c4b8182 2019-01-02 stsp if (error != NULL)
1231 9c4b8182 2019-01-02 stsp goto done;
1232 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1233 507dc3bb 2018-12-29 stsp if (error != NULL)
1234 507dc3bb 2018-12-29 stsp goto done;
1236 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1237 04f57cb3 2019-07-25 stsp free(commit_id_str);
1238 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1239 30837e32 2019-07-25 stsp if (error)
1240 a297e751 2019-07-11 stsp goto done;
1241 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1242 a297e751 2019-07-11 stsp if (error)
1243 507dc3bb 2018-12-29 stsp goto done;
1246 a1fb16d8 2019-05-24 stsp if (branch_name) {
1247 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1248 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1249 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1251 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1252 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1253 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1254 024e9686 2019-05-14 stsp goto done;
1256 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1257 024e9686 2019-05-14 stsp if (error)
1258 024e9686 2019-05-14 stsp goto done;
1259 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1260 a367ff0f 2019-05-14 stsp free(head_commit_id);
1261 024e9686 2019-05-14 stsp if (error != NULL)
1262 024e9686 2019-05-14 stsp goto done;
1263 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1264 a367ff0f 2019-05-14 stsp if (error)
1265 a367ff0f 2019-05-14 stsp goto done;
1266 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1267 024e9686 2019-05-14 stsp if (error)
1268 024e9686 2019-05-14 stsp goto done;
1270 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1271 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1272 a367ff0f 2019-05-14 stsp if (error != NULL) {
1273 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1274 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1275 024e9686 2019-05-14 stsp goto done;
1277 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1278 a367ff0f 2019-05-14 stsp if (error)
1279 a367ff0f 2019-05-14 stsp goto done;
1282 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1283 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1284 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1285 507dc3bb 2018-12-29 stsp commit_id);
1286 507dc3bb 2018-12-29 stsp if (error)
1287 507dc3bb 2018-12-29 stsp goto done;
1290 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1291 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1292 507dc3bb 2018-12-29 stsp if (error != NULL)
1293 507dc3bb 2018-12-29 stsp goto done;
1295 784955db 2019-01-12 stsp if (did_something)
1296 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1298 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1300 c09a553d 2018-03-12 stsp free(worktree_path);
1301 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1302 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1303 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1304 507dc3bb 2018-12-29 stsp free(commit_id);
1305 9c4b8182 2019-01-02 stsp free(commit_id_str);
1306 c09a553d 2018-03-12 stsp return error;
1309 f42b1b34 2018-03-12 stsp static const struct got_error *
1310 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1311 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1313 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1314 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1315 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1316 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1317 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1319 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1320 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1322 79109fed 2018-03-27 stsp return err;
1324 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1325 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1326 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1328 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1330 79109fed 2018-03-27 stsp return err;
1332 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1333 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1334 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1336 0f2b3dca 2018-12-22 stsp return err;
1338 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1340 79109fed 2018-03-27 stsp return err;
1343 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1345 0f2b3dca 2018-12-22 stsp goto done;
1347 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1348 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1349 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1350 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1351 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1353 79109fed 2018-03-27 stsp if (tree1)
1354 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1355 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1356 0f2b3dca 2018-12-22 stsp free(id_str1);
1357 0f2b3dca 2018-12-22 stsp free(id_str2);
1358 79109fed 2018-03-27 stsp return err;
1361 4bb494d5 2018-06-16 stsp static char *
1362 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1364 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
1365 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1367 6c281f94 2018-06-11 stsp *p = '\0';
1371 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1373 79109fed 2018-03-27 stsp static const struct got_error *
1374 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1375 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1376 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1378 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1379 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1380 6c281f94 2018-06-11 stsp char datebuf[26];
1381 45d799e2 2018-12-23 stsp time_t committer_time;
1382 45d799e2 2018-12-23 stsp const char *author, *committer;
1383 199a4027 2019-02-02 stsp char *refs_str = NULL;
1384 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1386 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1388 199a4027 2019-02-02 stsp const char *name;
1389 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
1391 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1392 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1394 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1395 199a4027 2019-02-02 stsp name += 5;
1396 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1398 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1399 e34f9ed6 2019-02-02 stsp name += 6;
1400 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1401 141c2bff 2019-02-04 stsp name += 8;
1402 199a4027 2019-02-02 stsp s = refs_str;
1403 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1404 199a4027 2019-02-02 stsp name) == -1) {
1405 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1411 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1413 8bf5b3c9 2018-03-17 stsp return err;
1415 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1416 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1417 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1418 832c249c 2018-06-10 stsp free(id_str);
1419 d3d493d7 2019-02-21 stsp id_str = NULL;
1420 d3d493d7 2019-02-21 stsp free(refs_str);
1421 d3d493d7 2019-02-21 stsp refs_str = NULL;
1422 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1423 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1424 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1425 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
1426 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1427 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1428 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1429 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1430 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1431 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1432 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1433 3fe1abad 2018-06-10 stsp int n = 1;
1434 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1435 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1436 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1438 a0603db2 2018-06-10 stsp return err;
1439 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1440 a0603db2 2018-06-10 stsp free(id_str);
1444 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1445 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
1446 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1448 621015ac 2018-07-23 stsp logmsg = logmsg0;
1450 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1452 832c249c 2018-06-10 stsp printf(" %s\n", line);
1453 832c249c 2018-06-10 stsp } while (line);
1454 621015ac 2018-07-23 stsp free(logmsg0);
1456 971751ac 2018-03-27 stsp if (show_patch) {
1457 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1458 971751ac 2018-03-27 stsp if (err == 0)
1459 971751ac 2018-03-27 stsp printf("\n");
1462 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1463 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1464 07862c20 2018-09-15 stsp return err;
1467 f42b1b34 2018-03-12 stsp static const struct got_error *
1468 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1469 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1470 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1472 f42b1b34 2018-03-12 stsp const struct got_error *err;
1473 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1475 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1476 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1478 f42b1b34 2018-03-12 stsp return err;
1479 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1481 fcc85cad 2018-07-22 stsp goto done;
1483 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1484 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1486 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1489 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1490 372ccdbb 2018-06-10 stsp if (err) {
1491 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1492 9ba79e04 2018-06-11 stsp err = NULL;
1495 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1497 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1503 b43fbaa0 2018-06-11 stsp if (id == NULL)
1506 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1509 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1511 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1512 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1516 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1517 f42b1b34 2018-03-12 stsp return err;
1520 4ed7e80c 2018-05-20 stsp __dead static void
1521 6f3d1eb0 2018-03-12 stsp usage_log(void)
1523 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1524 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1528 4ed7e80c 2018-05-20 stsp static const struct got_error *
1529 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1531 f42b1b34 2018-03-12 stsp const struct got_error *error;
1532 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1533 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1534 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1535 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1536 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1537 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1538 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1539 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1540 64a96a6d 2018-04-01 stsp const char *errstr;
1541 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1543 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1545 6715a751 2018-03-16 stsp #ifndef PROFILE
1546 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1549 f42b1b34 2018-03-12 stsp err(1, "pledge");
1552 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1553 79109fed 2018-03-27 stsp switch (ch) {
1555 79109fed 2018-03-27 stsp show_patch = 1;
1558 d142fc45 2018-04-01 stsp start_commit = optarg;
1561 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1563 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1564 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1567 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1568 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1569 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1572 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1575 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1576 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1577 04ca23f4 2018-07-16 stsp err(1, "-r option");
1578 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1581 2deda0b9 2019-03-07 stsp usage_log();
1582 79109fed 2018-03-27 stsp /* NOTREACHED */
1586 79109fed 2018-03-27 stsp argc -= optind;
1587 79109fed 2018-03-27 stsp argv += optind;
1589 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1590 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1591 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1592 04ca23f4 2018-07-16 stsp goto done;
1595 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1596 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1597 cffc0aa4 2019-02-05 stsp goto done;
1598 cffc0aa4 2019-02-05 stsp error = NULL;
1600 e7301579 2019-03-18 stsp if (argc == 0) {
1601 cbd1af7a 2019-03-18 stsp path = strdup("");
1602 e7301579 2019-03-18 stsp if (path == NULL) {
1603 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1604 cbd1af7a 2019-03-18 stsp goto done;
1606 e7301579 2019-03-18 stsp } else if (argc == 1) {
1607 e7301579 2019-03-18 stsp if (worktree) {
1608 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1610 e7301579 2019-03-18 stsp if (error)
1611 e7301579 2019-03-18 stsp goto done;
1613 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1614 e7301579 2019-03-18 stsp if (path == NULL) {
1615 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1616 e7301579 2019-03-18 stsp goto done;
1620 cbd1af7a 2019-03-18 stsp usage_log();
1622 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1623 5486daa2 2019-05-11 stsp repo_path = worktree ?
1624 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1626 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1627 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1628 cffc0aa4 2019-02-05 stsp goto done;
1631 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1632 d7d4f210 2018-03-12 stsp if (error != NULL)
1633 04ca23f4 2018-07-16 stsp goto done;
1635 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1636 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1637 c02c541e 2019-03-29 stsp if (error)
1638 c02c541e 2019-03-29 stsp goto done;
1640 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1641 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1642 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1643 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1644 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1645 3235492e 2018-04-01 stsp if (error != NULL)
1646 3235492e 2018-04-01 stsp return error;
1647 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1648 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1649 3235492e 2018-04-01 stsp if (error != NULL)
1650 3235492e 2018-04-01 stsp return error;
1651 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1653 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1654 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1655 3235492e 2018-04-01 stsp if (error == NULL) {
1656 1caad61b 2019-02-01 stsp int obj_type;
1657 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1658 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1659 d1f2edc9 2018-06-13 stsp if (error != NULL)
1660 1caad61b 2019-02-01 stsp goto done;
1661 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1662 1caad61b 2019-02-01 stsp if (error != NULL)
1663 1caad61b 2019-02-01 stsp goto done;
1664 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1665 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1666 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1667 1caad61b 2019-02-01 stsp if (error != NULL)
1668 1caad61b 2019-02-01 stsp goto done;
1669 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1670 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1671 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1672 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1673 1caad61b 2019-02-01 stsp goto done;
1676 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1677 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1678 1caad61b 2019-02-01 stsp if (id == NULL)
1679 638f9024 2019-05-13 stsp error = got_error_from_errno(
1680 230a42bd 2019-05-11 jcs "got_object_id_dup");
1681 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1682 1caad61b 2019-02-01 stsp if (error)
1683 1caad61b 2019-02-01 stsp goto done;
1684 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1685 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1686 1caad61b 2019-02-01 stsp goto done;
1688 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1689 d1f2edc9 2018-06-13 stsp if (error != NULL)
1690 1caad61b 2019-02-01 stsp goto done;
1692 15a94983 2018-12-23 stsp if (commit == NULL) {
1693 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1694 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1695 d1f2edc9 2018-06-13 stsp if (error != NULL)
1696 d1f2edc9 2018-06-13 stsp return error;
1699 d7d4f210 2018-03-12 stsp if (error != NULL)
1700 04ca23f4 2018-07-16 stsp goto done;
1702 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1703 04ca23f4 2018-07-16 stsp if (error != NULL)
1704 04ca23f4 2018-07-16 stsp goto done;
1705 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1706 04ca23f4 2018-07-16 stsp free(path);
1707 04ca23f4 2018-07-16 stsp path = in_repo_path;
1710 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1711 199a4027 2019-02-02 stsp if (error)
1712 199a4027 2019-02-02 stsp goto done;
1714 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1715 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1717 04ca23f4 2018-07-16 stsp free(path);
1718 04ca23f4 2018-07-16 stsp free(repo_path);
1719 04ca23f4 2018-07-16 stsp free(cwd);
1721 cffc0aa4 2019-02-05 stsp if (worktree)
1722 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1723 ad242220 2018-09-08 stsp if (repo) {
1724 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1725 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1726 ad242220 2018-09-08 stsp if (error == NULL)
1727 ad242220 2018-09-08 stsp error = repo_error;
1729 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1730 8bf5b3c9 2018-03-17 stsp return error;
1733 4ed7e80c 2018-05-20 stsp __dead static void
1734 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1736 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1737 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1741 b72f483a 2019-02-05 stsp struct print_diff_arg {
1742 b72f483a 2019-02-05 stsp struct got_repository *repo;
1743 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1744 b72f483a 2019-02-05 stsp int diff_context;
1745 3fc0c068 2019-02-10 stsp const char *id_str;
1746 3fc0c068 2019-02-10 stsp int header_shown;
1747 98eaaa12 2019-08-03 stsp int diff_staged;
1750 4ed7e80c 2018-05-20 stsp static const struct got_error *
1751 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1752 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1753 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1755 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1756 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1757 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1758 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1759 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1760 b72f483a 2019-02-05 stsp struct stat sb;
1762 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1763 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1764 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1765 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1766 98eaaa12 2019-08-03 stsp return NULL;
1768 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1769 98eaaa12 2019-08-03 stsp return NULL;
1770 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1771 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1772 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1773 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1774 98eaaa12 2019-08-03 stsp return NULL;
1777 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1778 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1779 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1780 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1781 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1784 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1785 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1786 98eaaa12 2019-08-03 stsp switch (staged_status) {
1787 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1788 98eaaa12 2019-08-03 stsp label1 = path;
1789 98eaaa12 2019-08-03 stsp label2 = path;
1791 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1792 98eaaa12 2019-08-03 stsp label2 = path;
1794 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
1795 98eaaa12 2019-08-03 stsp label1 = path;
1798 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
1800 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1801 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
1804 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
1805 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
1806 4ce46740 2019-08-08 stsp char *id_str;
1807 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1810 4ce46740 2019-08-08 stsp goto done;
1811 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
1813 4ce46740 2019-08-08 stsp goto done;
1814 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1815 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
1816 4ce46740 2019-08-08 stsp free(id_str);
1817 4ce46740 2019-08-08 stsp goto done;
1819 4ce46740 2019-08-08 stsp free(id_str);
1820 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
1821 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1823 4ce46740 2019-08-08 stsp goto done;
1826 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1827 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1828 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1829 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1830 2ec1f75b 2019-03-26 stsp goto done;
1833 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1834 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1835 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1836 2ec1f75b 2019-03-26 stsp goto done;
1838 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1839 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1840 2ec1f75b 2019-03-26 stsp goto done;
1843 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1845 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1846 4ce46740 2019-08-08 stsp a->diff_context, stdout);
1848 b72f483a 2019-02-05 stsp if (blob1)
1849 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1850 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1851 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1852 b72f483a 2019-02-05 stsp free(abspath);
1853 927df6b7 2019-02-10 stsp return err;
1856 927df6b7 2019-02-10 stsp static const struct got_error *
1857 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1859 b00d56cd 2018-04-01 stsp const struct got_error *error;
1860 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1861 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1862 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1863 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1864 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1865 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1866 15a94983 2018-12-23 stsp int type1, type2;
1867 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
1868 c0cc5c62 2018-10-18 stsp const char *errstr;
1869 927df6b7 2019-02-10 stsp char *path = NULL;
1871 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1872 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1873 25eccc22 2019-01-04 stsp NULL) == -1)
1874 b00d56cd 2018-04-01 stsp err(1, "pledge");
1877 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1878 b00d56cd 2018-04-01 stsp switch (ch) {
1880 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1881 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1882 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1885 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1886 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1887 b72f483a 2019-02-05 stsp err(1, "-r option");
1888 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1891 98eaaa12 2019-08-03 stsp diff_staged = 1;
1894 2deda0b9 2019-03-07 stsp usage_diff();
1895 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1899 b00d56cd 2018-04-01 stsp argc -= optind;
1900 b00d56cd 2018-04-01 stsp argv += optind;
1902 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1903 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1904 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1905 b72f483a 2019-02-05 stsp goto done;
1907 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1908 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1909 927df6b7 2019-02-10 stsp goto done;
1910 927df6b7 2019-02-10 stsp if (argc <= 1) {
1911 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1912 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1913 927df6b7 2019-02-10 stsp goto done;
1915 b72f483a 2019-02-05 stsp if (repo_path)
1917 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1918 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1919 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1920 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1921 927df6b7 2019-02-10 stsp goto done;
1923 927df6b7 2019-02-10 stsp if (argc == 1) {
1924 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1926 927df6b7 2019-02-10 stsp if (error)
1927 927df6b7 2019-02-10 stsp goto done;
1929 927df6b7 2019-02-10 stsp path = strdup("");
1930 927df6b7 2019-02-10 stsp if (path == NULL) {
1931 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1932 927df6b7 2019-02-10 stsp goto done;
1935 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1936 98eaaa12 2019-08-03 stsp if (diff_staged)
1937 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
1938 98eaaa12 2019-08-03 stsp "objects in repository");
1939 15a94983 2018-12-23 stsp id_str1 = argv[0];
1940 15a94983 2018-12-23 stsp id_str2 = argv[1];
1941 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1942 30db809c 2019-06-05 stsp repo_path =
1943 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1944 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1945 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1946 30db809c 2019-06-05 stsp goto done;
1950 b00d56cd 2018-04-01 stsp usage_diff();
1952 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1953 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1954 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1955 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1958 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1959 76089277 2018-04-01 stsp free(repo_path);
1960 b00d56cd 2018-04-01 stsp if (error != NULL)
1961 b00d56cd 2018-04-01 stsp goto done;
1963 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1964 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1965 c02c541e 2019-03-29 stsp if (error)
1966 c02c541e 2019-03-29 stsp goto done;
1968 30db809c 2019-06-05 stsp if (argc <= 1) {
1969 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1970 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
1971 b72f483a 2019-02-05 stsp char *id_str;
1973 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
1975 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1976 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1977 b72f483a 2019-02-05 stsp if (error)
1978 b72f483a 2019-02-05 stsp goto done;
1979 b72f483a 2019-02-05 stsp arg.repo = repo;
1980 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1981 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1982 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1983 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1984 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
1986 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
1987 72ea6654 2019-07-27 stsp if (error)
1988 72ea6654 2019-07-27 stsp goto done;
1990 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
1991 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1992 b72f483a 2019-02-05 stsp free(id_str);
1993 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
1994 b72f483a 2019-02-05 stsp goto done;
1997 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
1998 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1999 e02e74af 2019-05-28 stsp if (error) {
2000 e02e74af 2019-05-28 stsp struct got_reference *ref;
2001 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
2002 e02e74af 2019-05-28 stsp goto done;
2003 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
2004 e02e74af 2019-05-28 stsp if (error != NULL)
2005 e02e74af 2019-05-28 stsp goto done;
2006 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
2007 5e70831e 2019-05-28 stsp if (label1 == NULL) {
2008 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
2009 5e70831e 2019-05-28 stsp goto done;
2011 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
2012 e02e74af 2019-05-28 stsp got_ref_close(ref);
2013 e02e74af 2019-05-28 stsp if (error != NULL)
2014 5e70831e 2019-05-28 stsp goto done;
2016 a297e751 2019-07-11 stsp error = got_object_id_str(&label1, id1);
2017 5e70831e 2019-05-28 stsp if (label1 == NULL) {
2018 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
2019 e02e74af 2019-05-28 stsp goto done;
2023 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
2024 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2025 e02e74af 2019-05-28 stsp if (error) {
2026 e02e74af 2019-05-28 stsp struct got_reference *ref;
2027 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
2028 e02e74af 2019-05-28 stsp goto done;
2029 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
2030 e02e74af 2019-05-28 stsp if (error != NULL)
2031 5e70831e 2019-05-28 stsp goto done;
2032 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
2033 5e70831e 2019-05-28 stsp if (label2 == NULL) {
2034 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
2035 e02e74af 2019-05-28 stsp goto done;
2037 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
2038 e02e74af 2019-05-28 stsp got_ref_close(ref);
2039 e02e74af 2019-05-28 stsp if (error != NULL)
2040 e02e74af 2019-05-28 stsp goto done;
2042 a297e751 2019-07-11 stsp error = got_object_id_str(&label2, id2);
2043 5e70831e 2019-05-28 stsp if (label2 == NULL) {
2044 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
2045 5e70831e 2019-05-28 stsp goto done;
2049 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2050 15a94983 2018-12-23 stsp if (error)
2051 15a94983 2018-12-23 stsp goto done;
2053 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2054 15a94983 2018-12-23 stsp if (error)
2055 15a94983 2018-12-23 stsp goto done;
2057 15a94983 2018-12-23 stsp if (type1 != type2) {
2058 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2059 b00d56cd 2018-04-01 stsp goto done;
2062 15a94983 2018-12-23 stsp switch (type1) {
2063 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2064 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2065 54156555 2018-12-24 stsp diff_context, repo, stdout);
2067 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2068 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2069 54156555 2018-12-24 stsp diff_context, repo, stdout);
2071 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2072 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2073 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2074 c0cc5c62 2018-10-18 stsp repo, stdout);
2077 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2081 5e70831e 2019-05-28 stsp free(label1);
2082 5e70831e 2019-05-28 stsp free(label2);
2083 15a94983 2018-12-23 stsp free(id1);
2084 15a94983 2018-12-23 stsp free(id2);
2085 927df6b7 2019-02-10 stsp free(path);
2086 b72f483a 2019-02-05 stsp if (worktree)
2087 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2088 ad242220 2018-09-08 stsp if (repo) {
2089 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2090 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2091 ad242220 2018-09-08 stsp if (error == NULL)
2092 ad242220 2018-09-08 stsp error = repo_error;
2094 b00d56cd 2018-04-01 stsp return error;
2097 404c43c4 2018-06-21 stsp __dead static void
2098 404c43c4 2018-06-21 stsp usage_blame(void)
2100 9270e621 2019-02-05 stsp fprintf(stderr,
2101 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2102 404c43c4 2018-06-21 stsp getprogname());
2106 404c43c4 2018-06-21 stsp static const struct got_error *
2107 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2109 404c43c4 2018-06-21 stsp const struct got_error *error;
2110 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2111 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2112 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2113 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2114 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2117 404c43c4 2018-06-21 stsp #ifndef PROFILE
2118 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2119 36e2fb66 2019-01-04 stsp NULL) == -1)
2120 404c43c4 2018-06-21 stsp err(1, "pledge");
2123 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2124 404c43c4 2018-06-21 stsp switch (ch) {
2126 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2129 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2130 66bea077 2018-08-02 stsp if (repo_path == NULL)
2131 66bea077 2018-08-02 stsp err(1, "-r option");
2132 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2135 2deda0b9 2019-03-07 stsp usage_blame();
2136 404c43c4 2018-06-21 stsp /* NOTREACHED */
2140 404c43c4 2018-06-21 stsp argc -= optind;
2141 404c43c4 2018-06-21 stsp argv += optind;
2143 a39318fd 2018-08-02 stsp if (argc == 1)
2144 404c43c4 2018-06-21 stsp path = argv[0];
2146 404c43c4 2018-06-21 stsp usage_blame();
2148 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2149 66bea077 2018-08-02 stsp if (cwd == NULL) {
2150 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2151 66bea077 2018-08-02 stsp goto done;
2153 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2154 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2155 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2156 66bea077 2018-08-02 stsp goto done;
2158 0c06baac 2019-02-05 stsp error = NULL;
2159 0c06baac 2019-02-05 stsp if (worktree) {
2160 0c06baac 2019-02-05 stsp repo_path =
2161 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2162 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2163 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2164 0c06baac 2019-02-05 stsp if (error)
2165 0c06baac 2019-02-05 stsp goto done;
2167 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2168 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2169 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2170 0c06baac 2019-02-05 stsp goto done;
2175 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2176 c02c541e 2019-03-29 stsp if (error != NULL)
2177 36e2fb66 2019-01-04 stsp goto done;
2179 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2180 c02c541e 2019-03-29 stsp if (error)
2181 404c43c4 2018-06-21 stsp goto done;
2183 0c06baac 2019-02-05 stsp if (worktree) {
2184 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2185 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2186 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2187 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2188 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2189 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2190 6efaaa2d 2019-02-05 stsp path) == -1) {
2191 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2192 0c06baac 2019-02-05 stsp goto done;
2194 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2197 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2199 0c06baac 2019-02-05 stsp if (error)
2200 66bea077 2018-08-02 stsp goto done;
2202 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2203 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2204 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2205 404c43c4 2018-06-21 stsp if (error != NULL)
2206 66bea077 2018-08-02 stsp goto done;
2207 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2208 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2209 404c43c4 2018-06-21 stsp if (error != NULL)
2210 66bea077 2018-08-02 stsp goto done;
2212 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2213 30837e32 2019-07-25 stsp if (error)
2214 66bea077 2018-08-02 stsp goto done;
2217 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
2219 66bea077 2018-08-02 stsp free(in_repo_path);
2220 66bea077 2018-08-02 stsp free(repo_path);
2221 66bea077 2018-08-02 stsp free(cwd);
2222 404c43c4 2018-06-21 stsp free(commit_id);
2223 0c06baac 2019-02-05 stsp if (worktree)
2224 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2225 ad242220 2018-09-08 stsp if (repo) {
2226 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2227 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2228 ad242220 2018-09-08 stsp if (error == NULL)
2229 ad242220 2018-09-08 stsp error = repo_error;
2231 404c43c4 2018-06-21 stsp return error;
2234 5de5890b 2018-10-18 stsp __dead static void
2235 5de5890b 2018-10-18 stsp usage_tree(void)
2237 c1669e2e 2019-01-09 stsp fprintf(stderr,
2238 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2239 5de5890b 2018-10-18 stsp getprogname());
2243 c1669e2e 2019-01-09 stsp static void
2244 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2245 c1669e2e 2019-01-09 stsp const char *root_path)
2247 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2249 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2250 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2253 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2254 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
2255 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
2258 5de5890b 2018-10-18 stsp static const struct got_error *
2259 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2260 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2261 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2263 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2264 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2265 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2266 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2267 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2269 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2271 5de5890b 2018-10-18 stsp goto done;
2273 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2275 5de5890b 2018-10-18 stsp goto done;
2276 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2277 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2278 5de5890b 2018-10-18 stsp while (te) {
2279 5de5890b 2018-10-18 stsp char *id = NULL;
2281 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2284 5de5890b 2018-10-18 stsp if (show_ids) {
2285 5de5890b 2018-10-18 stsp char *id_str;
2286 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2288 5de5890b 2018-10-18 stsp goto done;
2289 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2290 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2291 5de5890b 2018-10-18 stsp free(id_str);
2292 5de5890b 2018-10-18 stsp goto done;
2294 5de5890b 2018-10-18 stsp free(id_str);
2296 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2299 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2300 c1669e2e 2019-01-09 stsp char *child_path;
2301 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2302 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2303 c1669e2e 2019-01-09 stsp te->name) == -1) {
2304 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2305 c1669e2e 2019-01-09 stsp goto done;
2307 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2308 c1669e2e 2019-01-09 stsp root_path, repo);
2309 c1669e2e 2019-01-09 stsp free(child_path);
2311 c1669e2e 2019-01-09 stsp goto done;
2314 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2318 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2319 5de5890b 2018-10-18 stsp free(tree_id);
2320 5de5890b 2018-10-18 stsp return err;
2323 5de5890b 2018-10-18 stsp static const struct got_error *
2324 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2326 5de5890b 2018-10-18 stsp const struct got_error *error;
2327 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2328 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2329 7a2c19d6 2019-02-05 stsp const char *path;
2330 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2331 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2332 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2333 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2336 5de5890b 2018-10-18 stsp #ifndef PROFILE
2337 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2338 0f8d269b 2019-01-04 stsp NULL) == -1)
2339 5de5890b 2018-10-18 stsp err(1, "pledge");
2342 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2343 5de5890b 2018-10-18 stsp switch (ch) {
2345 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2348 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2349 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2350 5de5890b 2018-10-18 stsp err(1, "-r option");
2351 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2354 5de5890b 2018-10-18 stsp show_ids = 1;
2357 c1669e2e 2019-01-09 stsp recurse = 1;
2360 2deda0b9 2019-03-07 stsp usage_tree();
2361 5de5890b 2018-10-18 stsp /* NOTREACHED */
2365 5de5890b 2018-10-18 stsp argc -= optind;
2366 5de5890b 2018-10-18 stsp argv += optind;
2368 5de5890b 2018-10-18 stsp if (argc == 1)
2369 5de5890b 2018-10-18 stsp path = argv[0];
2370 5de5890b 2018-10-18 stsp else if (argc > 1)
2371 5de5890b 2018-10-18 stsp usage_tree();
2373 7a2c19d6 2019-02-05 stsp path = NULL;
2375 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2376 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2377 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2378 9bf7a39b 2019-02-05 stsp goto done;
2380 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2381 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2382 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2383 7a2c19d6 2019-02-05 stsp goto done;
2385 7a2c19d6 2019-02-05 stsp error = NULL;
2386 7a2c19d6 2019-02-05 stsp if (worktree) {
2387 7a2c19d6 2019-02-05 stsp repo_path =
2388 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2389 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2390 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2391 7a2c19d6 2019-02-05 stsp if (error)
2392 7a2c19d6 2019-02-05 stsp goto done;
2394 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2395 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2396 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2397 7a2c19d6 2019-02-05 stsp goto done;
2402 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2403 5de5890b 2018-10-18 stsp if (error != NULL)
2404 c02c541e 2019-03-29 stsp goto done;
2406 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2407 c02c541e 2019-03-29 stsp if (error)
2408 5de5890b 2018-10-18 stsp goto done;
2410 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2411 9bf7a39b 2019-02-05 stsp if (worktree) {
2412 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2413 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2414 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2415 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2416 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2417 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2418 9bf7a39b 2019-02-05 stsp goto done;
2420 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2422 9bf7a39b 2019-02-05 stsp if (error)
2423 9bf7a39b 2019-02-05 stsp goto done;
2425 9bf7a39b 2019-02-05 stsp path = "/";
2427 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2428 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2429 9bf7a39b 2019-02-05 stsp if (error != NULL)
2430 9bf7a39b 2019-02-05 stsp goto done;
2433 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2434 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2435 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2436 5de5890b 2018-10-18 stsp if (error != NULL)
2437 5de5890b 2018-10-18 stsp goto done;
2438 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2439 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2440 5de5890b 2018-10-18 stsp if (error != NULL)
2441 5de5890b 2018-10-18 stsp goto done;
2443 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2444 30837e32 2019-07-25 stsp if (error)
2445 5de5890b 2018-10-18 stsp goto done;
2448 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2449 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2451 5de5890b 2018-10-18 stsp free(in_repo_path);
2452 5de5890b 2018-10-18 stsp free(repo_path);
2453 5de5890b 2018-10-18 stsp free(cwd);
2454 5de5890b 2018-10-18 stsp free(commit_id);
2455 7a2c19d6 2019-02-05 stsp if (worktree)
2456 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2457 5de5890b 2018-10-18 stsp if (repo) {
2458 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2459 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2460 5de5890b 2018-10-18 stsp if (error == NULL)
2461 5de5890b 2018-10-18 stsp error = repo_error;
2463 5de5890b 2018-10-18 stsp return error;
2466 6bad629b 2019-02-04 stsp __dead static void
2467 6bad629b 2019-02-04 stsp usage_status(void)
2469 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2473 b72f483a 2019-02-05 stsp static const struct got_error *
2474 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2475 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2476 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2478 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2479 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2480 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2481 b72f483a 2019-02-05 stsp return NULL;
2484 6bad629b 2019-02-04 stsp static const struct got_error *
2485 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2487 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2488 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2489 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2490 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2491 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2492 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2495 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2497 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2498 6bad629b 2019-02-04 stsp switch (ch) {
2500 2deda0b9 2019-03-07 stsp usage_status();
2501 6bad629b 2019-02-04 stsp /* NOTREACHED */
2505 6bad629b 2019-02-04 stsp argc -= optind;
2506 6bad629b 2019-02-04 stsp argv += optind;
2508 6bad629b 2019-02-04 stsp #ifndef PROFILE
2509 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2510 6bad629b 2019-02-04 stsp NULL) == -1)
2511 6bad629b 2019-02-04 stsp err(1, "pledge");
2513 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2514 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2515 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2516 927df6b7 2019-02-10 stsp goto done;
2519 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2520 927df6b7 2019-02-10 stsp if (error != NULL)
2521 a5edda0a 2019-07-27 stsp goto done;
2523 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2524 6bad629b 2019-02-04 stsp if (error != NULL)
2525 6bad629b 2019-02-04 stsp goto done;
2527 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2528 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2529 087fb88c 2019-08-04 stsp if (error)
2530 087fb88c 2019-08-04 stsp goto done;
2532 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2533 6bad629b 2019-02-04 stsp if (error)
2534 6bad629b 2019-02-04 stsp goto done;
2536 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2537 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2539 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2540 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2541 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2542 927df6b7 2019-02-10 stsp free(cwd);
2543 d0eebce4 2019-03-11 stsp return error;
2546 d0eebce4 2019-03-11 stsp __dead static void
2547 d0eebce4 2019-03-11 stsp usage_ref(void)
2549 d0eebce4 2019-03-11 stsp fprintf(stderr,
2550 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
2551 d0eebce4 2019-03-11 stsp getprogname());
2555 d0eebce4 2019-03-11 stsp static const struct got_error *
2556 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2558 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2559 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2560 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2562 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2563 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2565 d0eebce4 2019-03-11 stsp return err;
2567 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2568 d0eebce4 2019-03-11 stsp char *refstr;
2569 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2570 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2571 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2572 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2573 d0eebce4 2019-03-11 stsp free(refstr);
2576 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2577 d0eebce4 2019-03-11 stsp return NULL;
2580 d0eebce4 2019-03-11 stsp static const struct got_error *
2581 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2583 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2584 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2586 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2588 d0eebce4 2019-03-11 stsp return err;
2590 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2591 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2592 d0eebce4 2019-03-11 stsp return err;
2595 d0eebce4 2019-03-11 stsp static const struct got_error *
2596 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2598 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2599 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2600 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2603 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2604 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2605 d1644381 2019-07-14 stsp * an unintended typo.
2607 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2608 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2610 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2612 d83d9d5c 2019-05-13 stsp if (err) {
2613 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2615 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2616 d83d9d5c 2019-05-13 stsp return err;
2617 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2619 d83d9d5c 2019-05-13 stsp return err;
2620 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2621 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2623 d83d9d5c 2019-05-13 stsp return err;
2626 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2628 d0eebce4 2019-03-11 stsp goto done;
2630 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2633 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2635 d0eebce4 2019-03-11 stsp return err;
2638 d0eebce4 2019-03-11 stsp static const struct got_error *
2639 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2641 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2642 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2643 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2644 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2645 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2646 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2648 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2649 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2650 d0eebce4 2019-03-11 stsp switch (ch) {
2652 d0eebce4 2019-03-11 stsp delref = optarg;
2655 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2656 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2657 d0eebce4 2019-03-11 stsp err(1, "-r option");
2658 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2661 d0eebce4 2019-03-11 stsp do_list = 1;
2664 d0eebce4 2019-03-11 stsp usage_ref();
2665 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2669 d0eebce4 2019-03-11 stsp if (do_list && delref)
2670 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2672 d0eebce4 2019-03-11 stsp argc -= optind;
2673 d0eebce4 2019-03-11 stsp argv += optind;
2675 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2676 d0eebce4 2019-03-11 stsp if (argc > 0)
2677 d0eebce4 2019-03-11 stsp usage_ref();
2678 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2679 d0eebce4 2019-03-11 stsp usage_ref();
2681 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2682 e0b57350 2019-03-12 stsp if (do_list) {
2683 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2684 e0b57350 2019-03-12 stsp NULL) == -1)
2685 e0b57350 2019-03-12 stsp err(1, "pledge");
2687 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2688 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2689 e0b57350 2019-03-12 stsp err(1, "pledge");
2692 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2693 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2694 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2695 d0eebce4 2019-03-11 stsp goto done;
2698 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2699 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2700 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2701 d0eebce4 2019-03-11 stsp goto done;
2703 d0eebce4 2019-03-11 stsp error = NULL;
2704 d0eebce4 2019-03-11 stsp if (worktree) {
2705 d0eebce4 2019-03-11 stsp repo_path =
2706 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2707 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2708 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2709 d0eebce4 2019-03-11 stsp if (error)
2710 d0eebce4 2019-03-11 stsp goto done;
2712 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2713 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2714 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2715 d0eebce4 2019-03-11 stsp goto done;
2720 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2721 d0eebce4 2019-03-11 stsp if (error != NULL)
2722 d0eebce4 2019-03-11 stsp goto done;
2724 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2725 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2726 c02c541e 2019-03-29 stsp if (error)
2727 c02c541e 2019-03-29 stsp goto done;
2729 d0eebce4 2019-03-11 stsp if (do_list)
2730 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2731 d0eebce4 2019-03-11 stsp else if (delref)
2732 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2734 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2737 4e759de4 2019-06-26 stsp got_repo_close(repo);
2738 4e759de4 2019-06-26 stsp if (worktree)
2739 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2740 4e759de4 2019-06-26 stsp free(cwd);
2741 4e759de4 2019-06-26 stsp free(repo_path);
2742 4e759de4 2019-06-26 stsp return error;
2745 4e759de4 2019-06-26 stsp __dead static void
2746 4e759de4 2019-06-26 stsp usage_branch(void)
2748 4e759de4 2019-06-26 stsp fprintf(stderr,
2749 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2750 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2754 4e759de4 2019-06-26 stsp static const struct got_error *
2755 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2757 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2758 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2759 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2761 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2763 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2765 4e759de4 2019-06-26 stsp return err;
2767 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2768 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2769 4e759de4 2019-06-26 stsp char *refstr;
2770 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2771 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2773 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2774 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2775 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2776 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2778 ba882ee3 2019-07-11 stsp return err;
2779 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2780 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2781 ba882ee3 2019-07-11 stsp marker = "* ";
2783 ba882ee3 2019-07-11 stsp marker = "~ ";
2786 4e759de4 2019-06-26 stsp refname += 11;
2787 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2788 4e759de4 2019-06-26 stsp if (refstr == NULL)
2789 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2790 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2791 4e759de4 2019-06-26 stsp free(refstr);
2794 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2795 4e759de4 2019-06-26 stsp return NULL;
2798 4e759de4 2019-06-26 stsp static const struct got_error *
2799 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2801 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2802 4e759de4 2019-06-26 stsp struct got_reference *ref;
2803 4e759de4 2019-06-26 stsp char *refname;
2805 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2806 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2808 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2810 4e759de4 2019-06-26 stsp goto done;
2812 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2813 4e759de4 2019-06-26 stsp got_ref_close(ref);
2815 4e759de4 2019-06-26 stsp free(refname);
2816 4e759de4 2019-06-26 stsp return err;
2819 4e759de4 2019-06-26 stsp static const struct got_error *
2820 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2821 4e759de4 2019-06-26 stsp const char *base_branch)
2823 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2824 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2825 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2826 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2827 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2830 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2831 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2832 d3f84d51 2019-07-11 stsp * an unintended typo.
2834 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2835 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2837 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2838 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2839 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2840 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2841 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2842 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2844 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2846 4e759de4 2019-06-26 stsp goto done;
2847 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2848 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2850 4e759de4 2019-06-26 stsp goto done;
2852 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2853 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2854 4e759de4 2019-06-26 stsp goto done;
2857 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2858 4e759de4 2019-06-26 stsp if (err == NULL) {
2859 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2860 4e759de4 2019-06-26 stsp goto done;
2861 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2862 4e759de4 2019-06-26 stsp goto done;
2864 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2866 4e759de4 2019-06-26 stsp goto done;
2868 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2871 4e759de4 2019-06-26 stsp got_ref_close(ref);
2873 4e759de4 2019-06-26 stsp free(base_refname);
2874 4e759de4 2019-06-26 stsp free(refname);
2875 4e759de4 2019-06-26 stsp return err;
2878 4e759de4 2019-06-26 stsp static const struct got_error *
2879 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2881 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2882 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2883 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2884 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2885 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2886 4e759de4 2019-06-26 stsp const char *delref = NULL;
2888 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2889 4e759de4 2019-06-26 stsp switch (ch) {
2891 4e759de4 2019-06-26 stsp delref = optarg;
2894 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2895 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2896 4e759de4 2019-06-26 stsp err(1, "-r option");
2897 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2900 4e759de4 2019-06-26 stsp do_list = 1;
2903 4e759de4 2019-06-26 stsp usage_branch();
2904 4e759de4 2019-06-26 stsp /* NOTREACHED */
2908 4e759de4 2019-06-26 stsp if (do_list && delref)
2909 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2911 4e759de4 2019-06-26 stsp argc -= optind;
2912 4e759de4 2019-06-26 stsp argv += optind;
2914 4e759de4 2019-06-26 stsp if (do_list || delref) {
2915 4e759de4 2019-06-26 stsp if (argc > 0)
2916 4e759de4 2019-06-26 stsp usage_branch();
2917 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2918 4e759de4 2019-06-26 stsp usage_branch();
2920 4e759de4 2019-06-26 stsp #ifndef PROFILE
2921 4e759de4 2019-06-26 stsp if (do_list) {
2922 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2923 4e759de4 2019-06-26 stsp NULL) == -1)
2924 4e759de4 2019-06-26 stsp err(1, "pledge");
2926 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2927 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2928 4e759de4 2019-06-26 stsp err(1, "pledge");
2931 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2932 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2933 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2934 4e759de4 2019-06-26 stsp goto done;
2937 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2938 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2939 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2940 4e759de4 2019-06-26 stsp goto done;
2942 4e759de4 2019-06-26 stsp error = NULL;
2943 4e759de4 2019-06-26 stsp if (worktree) {
2944 4e759de4 2019-06-26 stsp repo_path =
2945 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2946 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2947 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2948 4e759de4 2019-06-26 stsp if (error)
2949 4e759de4 2019-06-26 stsp goto done;
2951 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2952 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2953 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2954 4e759de4 2019-06-26 stsp goto done;
2959 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2960 4e759de4 2019-06-26 stsp if (error != NULL)
2961 4e759de4 2019-06-26 stsp goto done;
2963 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2964 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2965 4e759de4 2019-06-26 stsp if (error)
2966 4e759de4 2019-06-26 stsp goto done;
2968 4e759de4 2019-06-26 stsp if (do_list)
2969 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
2970 4e759de4 2019-06-26 stsp else if (delref)
2971 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2973 4e759de4 2019-06-26 stsp const char *base_branch;
2974 4e759de4 2019-06-26 stsp if (argc == 1) {
2975 4e759de4 2019-06-26 stsp base_branch = worktree ?
2976 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2977 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2978 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
2979 dc5351b4 2019-07-30 stsp base_branch += 11;
2981 4e759de4 2019-06-26 stsp base_branch = argv[1];
2982 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2986 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2987 d0eebce4 2019-03-11 stsp if (worktree)
2988 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2989 d0eebce4 2019-03-11 stsp free(cwd);
2990 d0eebce4 2019-03-11 stsp free(repo_path);
2991 d00136be 2019-03-26 stsp return error;
2994 d00136be 2019-03-26 stsp __dead static void
2995 d00136be 2019-03-26 stsp usage_add(void)
2997 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3001 d00136be 2019-03-26 stsp static const struct got_error *
3002 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
3004 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
3005 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
3006 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
3007 1dd54920 2019-05-11 stsp char *cwd = NULL;
3008 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
3009 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3012 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
3014 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3015 d00136be 2019-03-26 stsp switch (ch) {
3017 d00136be 2019-03-26 stsp usage_add();
3018 d00136be 2019-03-26 stsp /* NOTREACHED */
3022 d00136be 2019-03-26 stsp argc -= optind;
3023 d00136be 2019-03-26 stsp argv += optind;
3025 43012d58 2019-07-14 stsp #ifndef PROFILE
3026 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3027 43012d58 2019-07-14 stsp NULL) == -1)
3028 43012d58 2019-07-14 stsp err(1, "pledge");
3030 723c305c 2019-05-11 jcs if (argc < 1)
3031 d00136be 2019-03-26 stsp usage_add();
3033 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
3034 d00136be 2019-03-26 stsp if (cwd == NULL) {
3035 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3036 d00136be 2019-03-26 stsp goto done;
3039 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3040 d00136be 2019-03-26 stsp if (error)
3041 d00136be 2019-03-26 stsp goto done;
3043 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3044 031a5338 2019-03-26 stsp if (error != NULL)
3045 031a5338 2019-03-26 stsp goto done;
3047 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3048 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3049 d00136be 2019-03-26 stsp if (error)
3050 d00136be 2019-03-26 stsp goto done;
3052 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3053 6d022e97 2019-08-04 stsp if (error)
3054 6d022e97 2019-08-04 stsp goto done;
3056 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
3057 1dd54920 2019-05-11 stsp NULL, repo);
3060 031a5338 2019-03-26 stsp got_repo_close(repo);
3061 d00136be 2019-03-26 stsp if (worktree)
3062 d00136be 2019-03-26 stsp got_worktree_close(worktree);
3063 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
3064 1dd54920 2019-05-11 stsp free((char *)pe->path);
3065 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
3066 2ec1f75b 2019-03-26 stsp free(cwd);
3067 2ec1f75b 2019-03-26 stsp return error;
3070 2ec1f75b 2019-03-26 stsp __dead static void
3071 648e4ef7 2019-07-09 stsp usage_remove(void)
3073 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3077 2ec1f75b 2019-03-26 stsp static const struct got_error *
3078 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
3080 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
3081 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
3082 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
3083 17ed4618 2019-06-02 stsp char *cwd = NULL;
3084 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
3085 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3086 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
3088 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
3090 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
3091 2ec1f75b 2019-03-26 stsp switch (ch) {
3093 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
3096 2ec1f75b 2019-03-26 stsp usage_add();
3097 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
3101 2ec1f75b 2019-03-26 stsp argc -= optind;
3102 2ec1f75b 2019-03-26 stsp argv += optind;
3104 43012d58 2019-07-14 stsp #ifndef PROFILE
3105 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3106 43012d58 2019-07-14 stsp NULL) == -1)
3107 43012d58 2019-07-14 stsp err(1, "pledge");
3109 17ed4618 2019-06-02 stsp if (argc < 1)
3110 648e4ef7 2019-07-09 stsp usage_remove();
3112 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
3113 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
3114 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3115 2ec1f75b 2019-03-26 stsp goto done;
3117 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3118 2ec1f75b 2019-03-26 stsp if (error)
3119 2ec1f75b 2019-03-26 stsp goto done;
3121 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3123 2ec1f75b 2019-03-26 stsp goto done;
3125 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3126 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3127 2ec1f75b 2019-03-26 stsp if (error)
3128 2ec1f75b 2019-03-26 stsp goto done;
3130 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3131 6d022e97 2019-08-04 stsp if (error)
3132 6d022e97 2019-08-04 stsp goto done;
3134 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
3135 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
3136 a129376b 2019-03-28 stsp if (error)
3137 a129376b 2019-03-28 stsp goto done;
3140 a129376b 2019-03-28 stsp got_repo_close(repo);
3141 a129376b 2019-03-28 stsp if (worktree)
3142 a129376b 2019-03-28 stsp got_worktree_close(worktree);
3143 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
3144 17ed4618 2019-06-02 stsp free((char *)pe->path);
3145 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
3146 a129376b 2019-03-28 stsp free(cwd);
3147 a129376b 2019-03-28 stsp return error;
3150 a129376b 2019-03-28 stsp __dead static void
3151 a129376b 2019-03-28 stsp usage_revert(void)
3153 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
3154 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
3158 1ee397ad 2019-07-12 stsp static const struct got_error *
3159 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
3161 a129376b 2019-03-28 stsp while (path[0] == '/')
3163 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
3164 33aa809d 2019-08-08 stsp return NULL;
3167 33aa809d 2019-08-08 stsp struct choose_patch_arg {
3168 33aa809d 2019-08-08 stsp FILE *patch_script_file;
3169 33aa809d 2019-08-08 stsp const char *action;
3172 33aa809d 2019-08-08 stsp static const struct got_error *
3173 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
3174 33aa809d 2019-08-08 stsp int nchanges, const char *action)
3176 33aa809d 2019-08-08 stsp char *line = NULL;
3177 33aa809d 2019-08-08 stsp size_t linesize = 0;
3178 33aa809d 2019-08-08 stsp ssize_t linelen;
3180 33aa809d 2019-08-08 stsp switch (status) {
3181 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
3182 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
3184 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
3185 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
3187 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
3188 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
3189 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
3190 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3191 33aa809d 2019-08-08 stsp while ((linelen = getline(&line, &linesize, patch_file) != -1))
3192 33aa809d 2019-08-08 stsp printf("%s", line);
3193 33aa809d 2019-08-08 stsp if (ferror(patch_file))
3194 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3195 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3196 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
3197 33aa809d 2019-08-08 stsp path, n, nchanges, action);
3200 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
3203 33aa809d 2019-08-08 stsp return NULL;
3206 33aa809d 2019-08-08 stsp static const struct got_error *
3207 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
3208 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
3210 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3211 33aa809d 2019-08-08 stsp char *line = NULL;
3212 33aa809d 2019-08-08 stsp size_t linesize = 0;
3213 33aa809d 2019-08-08 stsp ssize_t linelen;
3214 33aa809d 2019-08-08 stsp int resp = ' ';
3215 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
3217 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3219 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
3221 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
3222 33aa809d 2019-08-08 stsp a->action);
3224 33aa809d 2019-08-08 stsp return err;
3225 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
3226 33aa809d 2019-08-08 stsp if (linelen == -1) {
3227 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
3228 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3229 33aa809d 2019-08-08 stsp return NULL;
3231 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
3233 33aa809d 2019-08-08 stsp *nl = '\0';
3234 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
3235 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
3236 33aa809d 2019-08-08 stsp printf("y\n");
3237 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
3238 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
3239 33aa809d 2019-08-08 stsp printf("n\n");
3240 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
3241 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
3242 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
3243 33aa809d 2019-08-08 stsp printf("q\n");
3245 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
3246 33aa809d 2019-08-08 stsp free(line);
3247 33aa809d 2019-08-08 stsp return NULL;
3250 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
3251 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
3252 33aa809d 2019-08-08 stsp a->action);
3254 33aa809d 2019-08-08 stsp return err;
3255 33aa809d 2019-08-08 stsp resp = getchar();
3256 33aa809d 2019-08-08 stsp if (resp == '\n')
3257 33aa809d 2019-08-08 stsp resp = getchar();
3258 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
3259 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
3260 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
3261 33aa809d 2019-08-08 stsp resp = ' ';
3263 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
3264 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
3265 33aa809d 2019-08-08 stsp resp = ' ';
3269 33aa809d 2019-08-08 stsp if (resp == 'y')
3270 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
3271 33aa809d 2019-08-08 stsp else if (resp == 'n')
3272 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
3273 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
3274 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
3276 1ee397ad 2019-07-12 stsp return NULL;
3280 a129376b 2019-03-28 stsp static const struct got_error *
3281 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
3283 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
3284 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
3285 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
3286 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
3287 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
3288 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
3289 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
3290 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
3291 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
3292 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
3294 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3296 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
3297 a129376b 2019-03-28 stsp switch (ch) {
3299 33aa809d 2019-08-08 stsp pflag = 1;
3302 33aa809d 2019-08-08 stsp patch_script_path = optarg;
3305 0f6d7415 2019-08-08 stsp can_recurse = 1;
3308 a129376b 2019-03-28 stsp usage_revert();
3309 a129376b 2019-03-28 stsp /* NOTREACHED */
3313 a129376b 2019-03-28 stsp argc -= optind;
3314 a129376b 2019-03-28 stsp argv += optind;
3316 43012d58 2019-07-14 stsp #ifndef PROFILE
3317 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3318 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3319 43012d58 2019-07-14 stsp err(1, "pledge");
3321 e20a8b6f 2019-06-04 stsp if (argc < 1)
3322 a129376b 2019-03-28 stsp usage_revert();
3323 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
3324 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
3326 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3327 a129376b 2019-03-28 stsp if (cwd == NULL) {
3328 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3329 a129376b 2019-03-28 stsp goto done;
3331 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3332 2ec1f75b 2019-03-26 stsp if (error)
3333 2ec1f75b 2019-03-26 stsp goto done;
3335 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3336 a129376b 2019-03-28 stsp if (error != NULL)
3337 a129376b 2019-03-28 stsp goto done;
3339 33aa809d 2019-08-08 stsp if (patch_script_path) {
3340 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
3341 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
3342 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
3343 33aa809d 2019-08-08 stsp patch_script_path);
3344 33aa809d 2019-08-08 stsp goto done;
3347 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3348 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3349 a129376b 2019-03-28 stsp if (error)
3350 a129376b 2019-03-28 stsp goto done;
3352 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3353 6d022e97 2019-08-04 stsp if (error)
3354 6d022e97 2019-08-04 stsp goto done;
3356 0f6d7415 2019-08-08 stsp if (!can_recurse) {
3357 0f6d7415 2019-08-08 stsp char *ondisk_path;
3358 0f6d7415 2019-08-08 stsp struct stat sb;
3359 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
3360 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3361 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
3362 0f6d7415 2019-08-08 stsp pe->path) == -1) {
3363 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
3364 0f6d7415 2019-08-08 stsp goto done;
3366 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
3367 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
3368 0f6d7415 2019-08-08 stsp free(ondisk_path);
3371 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
3372 0f6d7415 2019-08-08 stsp ondisk_path);
3373 0f6d7415 2019-08-08 stsp free(ondisk_path);
3374 0f6d7415 2019-08-08 stsp goto done;
3376 0f6d7415 2019-08-08 stsp free(ondisk_path);
3377 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
3378 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3379 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
3380 0f6d7415 2019-08-08 stsp goto done;
3385 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
3386 33aa809d 2019-08-08 stsp cpa.action = "revert";
3387 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
3388 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
3389 a129376b 2019-03-28 stsp if (error)
3390 a129376b 2019-03-28 stsp goto done;
3392 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
3393 33aa809d 2019-08-08 stsp error == NULL)
3394 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
3396 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3397 2ec1f75b 2019-03-26 stsp if (worktree)
3398 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3399 2ec1f75b 2019-03-26 stsp free(path);
3400 d00136be 2019-03-26 stsp free(cwd);
3401 6bad629b 2019-02-04 stsp return error;
3404 c4296144 2019-05-09 stsp __dead static void
3405 c4296144 2019-05-09 stsp usage_commit(void)
3407 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
3408 5c1e53bc 2019-07-28 stsp getprogname());
3412 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3413 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3414 e2ba3d07 2019-05-13 stsp const char *editor;
3415 e0870e44 2019-05-13 stsp const char *worktree_path;
3416 76d98825 2019-06-03 stsp const char *branch_name;
3417 314a6357 2019-05-13 stsp const char *repo_path;
3418 e0870e44 2019-05-13 stsp char *logmsg_path;
3422 33ad4cbe 2019-05-12 jcs static const struct got_error *
3423 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3426 76d98825 2019-06-03 stsp char *initial_content = NULL;
3427 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3428 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3429 e0870e44 2019-05-13 stsp char *template = NULL;
3430 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3432 33ad4cbe 2019-05-12 jcs size_t len;
3434 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3435 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3436 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3437 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3438 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3439 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3440 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3441 33ad4cbe 2019-05-12 jcs return NULL;
3444 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3445 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3447 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3448 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3449 76d98825 2019-06-03 stsp a->branch_name) == -1)
3450 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3452 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3454 e0870e44 2019-05-13 stsp goto done;
3456 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3458 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3459 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3460 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3461 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3462 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3466 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3468 e2af0fd1 2019-08-08 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3469 e2af0fd1 2019-08-08 stsp unlink(a->logmsg_path);
3470 e2af0fd1 2019-08-08 stsp free(a->logmsg_path);
3471 e2af0fd1 2019-08-08 stsp a->logmsg_path = NULL;
3473 76d98825 2019-06-03 stsp free(initial_content);
3474 e0870e44 2019-05-13 stsp free(template);
3476 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3477 3ce1b845 2019-07-15 stsp if (err == NULL) {
3478 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
3479 3ce1b845 2019-07-15 stsp if (err) {
3480 3ce1b845 2019-07-15 stsp free(*logmsg);
3481 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3484 33ad4cbe 2019-05-12 jcs return err;
3487 c4296144 2019-05-09 stsp static const struct got_error *
3488 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3490 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3491 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3492 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3493 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
3494 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3495 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3496 84792843 2019-08-09 stsp const char *author;
3497 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3498 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3499 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
3500 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
3502 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
3503 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
3505 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3506 c4296144 2019-05-09 stsp switch (ch) {
3508 c4296144 2019-05-09 stsp logmsg = optarg;
3511 c4296144 2019-05-09 stsp usage_commit();
3512 c4296144 2019-05-09 stsp /* NOTREACHED */
3516 c4296144 2019-05-09 stsp argc -= optind;
3517 c4296144 2019-05-09 stsp argv += optind;
3519 43012d58 2019-07-14 stsp #ifndef PROFILE
3520 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3521 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3522 43012d58 2019-07-14 stsp err(1, "pledge");
3524 84792843 2019-08-09 stsp error = get_author(&author);
3525 84792843 2019-08-09 stsp if (error)
3526 84792843 2019-08-09 stsp return error;
3528 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3529 c4296144 2019-05-09 stsp if (cwd == NULL) {
3530 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3531 c4296144 2019-05-09 stsp goto done;
3533 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3534 7d5807f4 2019-07-11 stsp if (error)
3535 7d5807f4 2019-07-11 stsp goto done;
3537 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3538 c4296144 2019-05-09 stsp if (error)
3539 a698f62e 2019-07-25 stsp goto done;
3540 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
3541 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
3542 c4296144 2019-05-09 stsp goto done;
3545 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
3546 916f288c 2019-07-30 stsp worktree);
3547 5c1e53bc 2019-07-28 stsp if (error)
3548 5c1e53bc 2019-07-28 stsp goto done;
3550 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3551 c4296144 2019-05-09 stsp if (error != NULL)
3552 c4296144 2019-05-09 stsp goto done;
3555 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3556 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3558 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3559 314a6357 2019-05-13 stsp error = get_editor(&editor);
3561 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3562 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3563 c4296144 2019-05-09 stsp if (error)
3564 c4296144 2019-05-09 stsp goto done;
3566 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3567 087fb88c 2019-08-04 stsp if (error)
3568 087fb88c 2019-08-04 stsp goto done;
3570 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3571 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3572 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3573 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3574 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
3575 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
3576 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
3577 916f288c 2019-07-30 stsp goto done;
3579 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
3581 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3582 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
3583 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3584 e0870e44 2019-05-13 stsp if (error) {
3585 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3586 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3587 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3588 c4296144 2019-05-09 stsp goto done;
3591 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3592 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3594 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3595 c4296144 2019-05-09 stsp if (error)
3596 c4296144 2019-05-09 stsp goto done;
3597 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3599 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
3601 c4296144 2019-05-09 stsp got_repo_close(repo);
3602 c4296144 2019-05-09 stsp if (worktree)
3603 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3604 c4296144 2019-05-09 stsp free(cwd);
3605 c4296144 2019-05-09 stsp free(id_str);
3606 e2ba3d07 2019-05-13 stsp free(editor);
3607 234035bc 2019-06-01 stsp return error;
3610 234035bc 2019-06-01 stsp __dead static void
3611 234035bc 2019-06-01 stsp usage_cherrypick(void)
3613 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3617 234035bc 2019-06-01 stsp static const struct got_error *
3618 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3620 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3621 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3622 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3623 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3624 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3625 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3626 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3627 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3628 234035bc 2019-06-01 stsp int ch, did_something = 0;
3630 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3631 234035bc 2019-06-01 stsp switch (ch) {
3633 234035bc 2019-06-01 stsp usage_cherrypick();
3634 234035bc 2019-06-01 stsp /* NOTREACHED */
3638 234035bc 2019-06-01 stsp argc -= optind;
3639 234035bc 2019-06-01 stsp argv += optind;
3641 43012d58 2019-07-14 stsp #ifndef PROFILE
3642 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3643 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3644 43012d58 2019-07-14 stsp err(1, "pledge");
3646 234035bc 2019-06-01 stsp if (argc != 1)
3647 234035bc 2019-06-01 stsp usage_cherrypick();
3649 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3650 234035bc 2019-06-01 stsp if (cwd == NULL) {
3651 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3652 234035bc 2019-06-01 stsp goto done;
3654 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3655 234035bc 2019-06-01 stsp if (error)
3656 234035bc 2019-06-01 stsp goto done;
3658 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3659 234035bc 2019-06-01 stsp if (error != NULL)
3660 234035bc 2019-06-01 stsp goto done;
3662 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3663 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3664 234035bc 2019-06-01 stsp if (error)
3665 234035bc 2019-06-01 stsp goto done;
3667 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3668 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3669 234035bc 2019-06-01 stsp if (error != NULL) {
3670 234035bc 2019-06-01 stsp struct got_reference *ref;
3671 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3672 234035bc 2019-06-01 stsp goto done;
3673 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3674 234035bc 2019-06-01 stsp if (error != NULL)
3675 234035bc 2019-06-01 stsp goto done;
3676 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3677 234035bc 2019-06-01 stsp got_ref_close(ref);
3678 234035bc 2019-06-01 stsp if (error != NULL)
3679 234035bc 2019-06-01 stsp goto done;
3681 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3682 234035bc 2019-06-01 stsp if (error)
3683 234035bc 2019-06-01 stsp goto done;
3685 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3686 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3687 234035bc 2019-06-01 stsp if (error != NULL)
3688 234035bc 2019-06-01 stsp goto done;
3690 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3691 234035bc 2019-06-01 stsp if (error) {
3692 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3693 234035bc 2019-06-01 stsp goto done;
3694 234035bc 2019-06-01 stsp error = NULL;
3696 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3697 234035bc 2019-06-01 stsp goto done;
3700 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3701 234035bc 2019-06-01 stsp if (error)
3702 234035bc 2019-06-01 stsp goto done;
3703 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3704 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3705 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3707 234035bc 2019-06-01 stsp if (error != NULL)
3708 234035bc 2019-06-01 stsp goto done;
3710 234035bc 2019-06-01 stsp if (did_something)
3711 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3713 234035bc 2019-06-01 stsp if (commit)
3714 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3715 234035bc 2019-06-01 stsp free(commit_id_str);
3716 234035bc 2019-06-01 stsp if (head_ref)
3717 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3718 234035bc 2019-06-01 stsp if (worktree)
3719 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3721 234035bc 2019-06-01 stsp got_repo_close(repo);
3722 c4296144 2019-05-09 stsp return error;
3725 5ef14e63 2019-06-02 stsp __dead static void
3726 5ef14e63 2019-06-02 stsp usage_backout(void)
3728 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3732 5ef14e63 2019-06-02 stsp static const struct got_error *
3733 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3735 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3736 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3737 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3738 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3739 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3740 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3741 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3742 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3743 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3745 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3746 5ef14e63 2019-06-02 stsp switch (ch) {
3748 5ef14e63 2019-06-02 stsp usage_backout();
3749 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3753 5ef14e63 2019-06-02 stsp argc -= optind;
3754 5ef14e63 2019-06-02 stsp argv += optind;
3756 43012d58 2019-07-14 stsp #ifndef PROFILE
3757 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3758 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3759 43012d58 2019-07-14 stsp err(1, "pledge");
3761 5ef14e63 2019-06-02 stsp if (argc != 1)
3762 5ef14e63 2019-06-02 stsp usage_backout();
3764 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3765 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3766 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3767 5ef14e63 2019-06-02 stsp goto done;
3769 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3770 5ef14e63 2019-06-02 stsp if (error)
3771 5ef14e63 2019-06-02 stsp goto done;
3773 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3774 5ef14e63 2019-06-02 stsp if (error != NULL)
3775 5ef14e63 2019-06-02 stsp goto done;
3777 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3778 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3779 5ef14e63 2019-06-02 stsp if (error)
3780 5ef14e63 2019-06-02 stsp goto done;
3782 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3783 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3784 5ef14e63 2019-06-02 stsp if (error != NULL) {
3785 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3786 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3787 5ef14e63 2019-06-02 stsp goto done;
3788 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3789 5ef14e63 2019-06-02 stsp if (error != NULL)
3790 5ef14e63 2019-06-02 stsp goto done;
3791 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3792 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3793 5ef14e63 2019-06-02 stsp if (error != NULL)
3794 5ef14e63 2019-06-02 stsp goto done;
3796 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3797 5ef14e63 2019-06-02 stsp if (error)
3798 5ef14e63 2019-06-02 stsp goto done;
3800 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3801 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3802 5ef14e63 2019-06-02 stsp if (error != NULL)
3803 5ef14e63 2019-06-02 stsp goto done;
3805 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3806 5ef14e63 2019-06-02 stsp if (error)
3807 5ef14e63 2019-06-02 stsp goto done;
3809 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3810 5ef14e63 2019-06-02 stsp if (error)
3811 5ef14e63 2019-06-02 stsp goto done;
3812 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3813 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3814 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3815 5ef14e63 2019-06-02 stsp goto done;
3818 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3819 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3820 5ef14e63 2019-06-02 stsp if (error != NULL)
3821 5ef14e63 2019-06-02 stsp goto done;
3823 5ef14e63 2019-06-02 stsp if (did_something)
3824 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3826 5ef14e63 2019-06-02 stsp if (commit)
3827 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3828 5ef14e63 2019-06-02 stsp free(commit_id_str);
3829 5ef14e63 2019-06-02 stsp if (head_ref)
3830 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3831 818c7501 2019-07-11 stsp if (worktree)
3832 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3834 818c7501 2019-07-11 stsp got_repo_close(repo);
3835 818c7501 2019-07-11 stsp return error;
3838 818c7501 2019-07-11 stsp __dead static void
3839 818c7501 2019-07-11 stsp usage_rebase(void)
3841 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3842 af54c8f8 2019-07-11 stsp getprogname());
3847 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
3850 0ebf8283 2019-07-24 stsp size_t len;
3852 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
3853 0ebf8283 2019-07-24 stsp if (len > limit)
3854 0ebf8283 2019-07-24 stsp len = limit;
3855 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
3856 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
3858 0ebf8283 2019-07-24 stsp *nl = '\0';
3861 0ebf8283 2019-07-24 stsp static const struct got_error *
3862 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
3864 0ebf8283 2019-07-24 stsp const char *logmsg0 = NULL;
3866 0ebf8283 2019-07-24 stsp logmsg0 = got_object_commit_get_logmsg(commit);
3868 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)logmsg0[0]))
3869 0ebf8283 2019-07-24 stsp logmsg0++;
3871 0ebf8283 2019-07-24 stsp *logmsg = strdup(logmsg0);
3872 0ebf8283 2019-07-24 stsp if (*logmsg == NULL)
3873 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
3875 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
3876 0ebf8283 2019-07-24 stsp return NULL;
3879 818c7501 2019-07-11 stsp static const struct got_error *
3880 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3881 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3883 818c7501 2019-07-11 stsp const struct got_error *err;
3884 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
3886 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3888 818c7501 2019-07-11 stsp goto done;
3890 ff0d2220 2019-07-11 stsp if (new_id) {
3891 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3893 ff0d2220 2019-07-11 stsp goto done;
3896 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3897 ff0d2220 2019-07-11 stsp if (new_id_str)
3898 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3900 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
3902 0ebf8283 2019-07-24 stsp goto done;
3904 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3905 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3907 818c7501 2019-07-11 stsp free(old_id_str);
3908 818c7501 2019-07-11 stsp free(new_id_str);
3909 818c7501 2019-07-11 stsp return err;
3912 1ee397ad 2019-07-12 stsp static const struct got_error *
3913 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3915 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3917 818c7501 2019-07-11 stsp while (path[0] == '/')
3919 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3921 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3922 1ee397ad 2019-07-12 stsp return NULL;
3923 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3924 818c7501 2019-07-11 stsp *rebase_status = status;
3925 1ee397ad 2019-07-12 stsp return NULL;
3928 818c7501 2019-07-11 stsp static const struct got_error *
3929 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
3930 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
3931 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
3933 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3934 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
3935 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3938 818c7501 2019-07-11 stsp static const struct got_error *
3939 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
3940 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
3941 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
3942 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
3944 ff0d2220 2019-07-11 stsp const struct got_error *error;
3945 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
3946 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
3948 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3949 ff0d2220 2019-07-11 stsp if (error)
3950 ff0d2220 2019-07-11 stsp return error;
3952 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
3953 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
3954 ff0d2220 2019-07-11 stsp if (error) {
3955 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3956 ff0d2220 2019-07-11 stsp goto done;
3957 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
3959 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
3960 ff0d2220 2019-07-11 stsp free(new_commit_id);
3963 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
3964 ff0d2220 2019-07-11 stsp return error;
3967 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
3968 64c6d990 2019-07-11 stsp const char *path_prefix;
3969 64c6d990 2019-07-11 stsp size_t len;
3970 8ca9bd68 2019-07-25 stsp int errcode;
3973 64c6d990 2019-07-11 stsp static const struct got_error *
3974 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
3975 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3976 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
3977 64c6d990 2019-07-11 stsp struct got_repository *repo)
3979 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
3981 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3982 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3983 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
3985 64c6d990 2019-07-11 stsp return NULL;
3988 64c6d990 2019-07-11 stsp static const struct got_error *
3989 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
3990 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
3991 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
3993 64c6d990 2019-07-11 stsp const struct got_error *err;
3994 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3995 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
3996 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
3998 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
3999 64c6d990 2019-07-11 stsp return NULL;
4001 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4003 64c6d990 2019-07-11 stsp goto done;
4005 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4007 64c6d990 2019-07-11 stsp goto done;
4009 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
4010 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
4012 64c6d990 2019-07-11 stsp goto done;
4014 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
4015 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
4017 64c6d990 2019-07-11 stsp goto done;
4019 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
4020 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
4021 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
4022 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
4023 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
4024 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
4025 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
4027 64c6d990 2019-07-11 stsp if (tree1)
4028 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
4029 64c6d990 2019-07-11 stsp if (tree2)
4030 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
4031 64c6d990 2019-07-11 stsp if (commit)
4032 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
4033 64c6d990 2019-07-11 stsp if (parent_commit)
4034 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
4035 64c6d990 2019-07-11 stsp return err;
4038 ff0d2220 2019-07-11 stsp static const struct got_error *
4039 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
4040 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
4041 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4042 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
4043 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
4045 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
4046 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
4047 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
4048 af61c510 2019-07-19 stsp struct got_object_qid *qid;
4049 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
4051 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4053 af61c510 2019-07-19 stsp return err;
4055 af61c510 2019-07-19 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo);
4057 af61c510 2019-07-19 stsp goto done;
4058 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4059 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
4060 af61c510 2019-07-19 stsp if (err) {
4061 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
4062 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
4063 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
4064 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
4065 af61c510 2019-07-19 stsp "been reached?!?");
4066 af61c510 2019-07-19 stsp goto done;
4067 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4068 af61c510 2019-07-19 stsp goto done;
4069 af61c510 2019-07-19 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
4071 af61c510 2019-07-19 stsp goto done;
4073 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
4074 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
4076 af61c510 2019-07-19 stsp goto done;
4078 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
4080 af61c510 2019-07-19 stsp goto done;
4081 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4082 af61c510 2019-07-19 stsp commit_id = parent_id;
4086 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
4087 af61c510 2019-07-19 stsp return err;
4090 af61c510 2019-07-19 stsp static const struct got_error *
4091 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
4093 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
4094 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
4095 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
4096 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
4097 818c7501 2019-07-11 stsp char *cwd = NULL;
4098 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
4099 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4100 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
4101 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
4102 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4103 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
4104 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4105 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4106 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
4107 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
4108 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
4109 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
4111 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
4112 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
4114 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
4115 818c7501 2019-07-11 stsp switch (ch) {
4117 818c7501 2019-07-11 stsp abort_rebase = 1;
4120 818c7501 2019-07-11 stsp continue_rebase = 1;
4123 818c7501 2019-07-11 stsp usage_rebase();
4124 818c7501 2019-07-11 stsp /* NOTREACHED */
4128 818c7501 2019-07-11 stsp argc -= optind;
4129 818c7501 2019-07-11 stsp argv += optind;
4131 43012d58 2019-07-14 stsp #ifndef PROFILE
4132 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4133 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4134 43012d58 2019-07-14 stsp err(1, "pledge");
4136 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
4137 818c7501 2019-07-11 stsp usage_rebase();
4138 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
4139 818c7501 2019-07-11 stsp if (argc != 0)
4140 818c7501 2019-07-11 stsp usage_rebase();
4141 818c7501 2019-07-11 stsp } else if (argc != 1)
4142 818c7501 2019-07-11 stsp usage_rebase();
4144 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
4145 818c7501 2019-07-11 stsp if (cwd == NULL) {
4146 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
4147 818c7501 2019-07-11 stsp goto done;
4149 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
4150 818c7501 2019-07-11 stsp if (error)
4151 818c7501 2019-07-11 stsp goto done;
4153 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4154 818c7501 2019-07-11 stsp if (error != NULL)
4155 818c7501 2019-07-11 stsp goto done;
4157 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4158 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4159 818c7501 2019-07-11 stsp if (error)
4160 818c7501 2019-07-11 stsp goto done;
4162 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4163 818c7501 2019-07-11 stsp if (error)
4164 818c7501 2019-07-11 stsp goto done;
4166 f6794adc 2019-07-23 stsp if (abort_rebase) {
4167 818c7501 2019-07-11 stsp int did_something;
4168 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4169 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4170 f6794adc 2019-07-23 stsp goto done;
4172 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4173 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4174 3e3a69f1 2019-07-25 stsp worktree, repo);
4175 818c7501 2019-07-11 stsp if (error)
4176 818c7501 2019-07-11 stsp goto done;
4177 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
4178 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
4179 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
4180 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
4181 818c7501 2019-07-11 stsp if (error)
4182 818c7501 2019-07-11 stsp goto done;
4183 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
4184 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
4187 818c7501 2019-07-11 stsp if (continue_rebase) {
4188 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4189 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4190 f6794adc 2019-07-23 stsp goto done;
4192 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4193 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4194 3e3a69f1 2019-07-25 stsp worktree, repo);
4195 818c7501 2019-07-11 stsp if (error)
4196 818c7501 2019-07-11 stsp goto done;
4198 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
4199 01757395 2019-07-12 stsp resume_commit_id, repo);
4200 818c7501 2019-07-11 stsp if (error)
4201 818c7501 2019-07-11 stsp goto done;
4203 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
4204 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
4205 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
4206 818c7501 2019-07-11 stsp goto done;
4209 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
4210 818c7501 2019-07-11 stsp if (error != NULL)
4211 818c7501 2019-07-11 stsp goto done;
4214 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
4215 ff0d2220 2019-07-11 stsp if (error)
4216 ff0d2220 2019-07-11 stsp goto done;
4218 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
4219 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
4221 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
4222 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
4223 a51a74b3 2019-07-27 stsp base_commit_id, branch_head_commit_id, repo);
4224 818c7501 2019-07-11 stsp if (error)
4225 818c7501 2019-07-11 stsp goto done;
4226 818c7501 2019-07-11 stsp if (yca_id == NULL) {
4227 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
4228 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
4229 818c7501 2019-07-11 stsp "with work tree's branch");
4230 818c7501 2019-07-11 stsp goto done;
4233 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
4234 a51a74b3 2019-07-27 stsp if (error) {
4235 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
4236 a51a74b3 2019-07-27 stsp goto done;
4237 a51a74b3 2019-07-27 stsp error = NULL;
4239 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
4240 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
4241 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
4242 a51a74b3 2019-07-27 stsp goto done;
4244 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
4245 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
4246 818c7501 2019-07-11 stsp if (error)
4247 818c7501 2019-07-11 stsp goto done;
4250 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
4251 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4252 818c7501 2019-07-11 stsp if (error)
4253 818c7501 2019-07-11 stsp goto done;
4255 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4256 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
4257 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
4258 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
4259 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
4260 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4261 818c7501 2019-07-11 stsp commit = NULL;
4262 818c7501 2019-07-11 stsp if (error)
4263 818c7501 2019-07-11 stsp goto done;
4265 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
4266 ff0d2220 2019-07-11 stsp if (continue_rebase)
4267 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
4268 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
4270 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
4271 818c7501 2019-07-11 stsp goto done;
4274 818c7501 2019-07-11 stsp pid = NULL;
4275 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
4276 818c7501 2019-07-11 stsp commit_id = qid->id;
4277 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
4278 818c7501 2019-07-11 stsp pid = qid;
4280 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
4281 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
4282 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
4283 818c7501 2019-07-11 stsp if (error)
4284 818c7501 2019-07-11 stsp goto done;
4286 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4287 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4291 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
4292 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
4293 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4294 818c7501 2019-07-11 stsp if (error)
4295 818c7501 2019-07-11 stsp goto done;
4298 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4299 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
4300 818c7501 2019-07-11 stsp if (error)
4301 818c7501 2019-07-11 stsp goto done;
4302 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
4303 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
4305 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
4306 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
4308 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
4309 818c7501 2019-07-11 stsp free(branch_head_commit_id);
4310 818c7501 2019-07-11 stsp free(resume_commit_id);
4311 818c7501 2019-07-11 stsp free(yca_id);
4312 818c7501 2019-07-11 stsp if (commit)
4313 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4314 818c7501 2019-07-11 stsp if (branch)
4315 818c7501 2019-07-11 stsp got_ref_close(branch);
4316 818c7501 2019-07-11 stsp if (new_base_branch)
4317 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
4318 818c7501 2019-07-11 stsp if (tmp_branch)
4319 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
4320 5ef14e63 2019-06-02 stsp if (worktree)
4321 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
4323 5ef14e63 2019-06-02 stsp got_repo_close(repo);
4324 5ef14e63 2019-06-02 stsp return error;
4327 0ebf8283 2019-07-24 stsp __dead static void
4328 0ebf8283 2019-07-24 stsp usage_histedit(void)
4330 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
4331 0ebf8283 2019-07-24 stsp getprogname());
4335 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
4336 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
4337 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
4338 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
4339 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
4341 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
4342 0ebf8283 2019-07-24 stsp unsigned char code;
4343 0ebf8283 2019-07-24 stsp const char *name;
4344 0ebf8283 2019-07-24 stsp const char *desc;
4345 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
4346 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
4347 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4348 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4349 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4350 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
4351 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
4354 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
4355 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
4356 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
4357 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4358 0ebf8283 2019-07-24 stsp char *logmsg;
4360 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4362 0ebf8283 2019-07-24 stsp static const struct got_error *
4363 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4364 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4366 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4367 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
4368 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4371 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4373 0ebf8283 2019-07-24 stsp goto done;
4375 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
4377 0ebf8283 2019-07-24 stsp goto done;
4379 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
4381 0ebf8283 2019-07-24 stsp goto done;
4383 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4384 0ebf8283 2019-07-24 stsp if (n < 0)
4385 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4387 0ebf8283 2019-07-24 stsp if (commit)
4388 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4389 0ebf8283 2019-07-24 stsp free(id_str);
4390 0ebf8283 2019-07-24 stsp free(logmsg);
4391 0ebf8283 2019-07-24 stsp return err;
4394 0ebf8283 2019-07-24 stsp static const struct got_error *
4395 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4396 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4398 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4399 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
4401 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
4402 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4404 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4405 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4411 0ebf8283 2019-07-24 stsp return err;
4414 0ebf8283 2019-07-24 stsp static const struct got_error *
4415 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
4417 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4420 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
4421 0ebf8283 2019-07-24 stsp if (n < 0)
4422 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4424 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4425 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4426 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
4427 0ebf8283 2019-07-24 stsp cmd->desc);
4428 0ebf8283 2019-07-24 stsp if (n < 0) {
4429 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4433 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
4434 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
4435 0ebf8283 2019-07-24 stsp if (n < 0)
4436 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4437 0ebf8283 2019-07-24 stsp return err;
4440 0ebf8283 2019-07-24 stsp static const struct got_error *
4441 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
4443 0ebf8283 2019-07-24 stsp static char msg[42];
4446 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4448 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
4449 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4451 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4454 0ebf8283 2019-07-24 stsp static const struct got_error *
4455 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4456 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
4458 0ebf8283 2019-07-24 stsp const struct got_error *err;
4459 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
4460 0ebf8283 2019-07-24 stsp char *id_str;
4462 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4464 0ebf8283 2019-07-24 stsp return err;
4466 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4468 0ebf8283 2019-07-24 stsp goto done;
4470 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4471 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4472 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(folded_commit)) == -1) {
4473 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4474 0ebf8283 2019-07-24 stsp goto done;
4477 0ebf8283 2019-07-24 stsp if (folded_commit)
4478 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
4479 0ebf8283 2019-07-24 stsp free(id_str);
4480 0ebf8283 2019-07-24 stsp return err;
4483 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
4484 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
4486 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
4488 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
4489 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4490 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
4491 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4492 3f9de99f 2019-07-24 stsp folded = prev;
4493 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
4496 0ebf8283 2019-07-24 stsp return folded;
4499 0ebf8283 2019-07-24 stsp static const struct got_error *
4500 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4501 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4503 0ebf8283 2019-07-24 stsp char *logmsg_path = NULL, *id_str = NULL;
4504 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4505 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4506 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4508 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
4510 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4512 0ebf8283 2019-07-24 stsp return err;
4514 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
4515 0ebf8283 2019-07-24 stsp if (folded) {
4516 0ebf8283 2019-07-24 stsp while (folded != hle) {
4517 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4518 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4521 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
4522 0ebf8283 2019-07-24 stsp logmsg, repo);
4524 0ebf8283 2019-07-24 stsp goto done;
4525 0ebf8283 2019-07-24 stsp free(logmsg);
4526 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4527 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4531 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4533 0ebf8283 2019-07-24 stsp goto done;
4534 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
4535 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
4536 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", id_str,
4537 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(commit)) == -1) {
4538 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4539 0ebf8283 2019-07-24 stsp goto done;
4541 0ebf8283 2019-07-24 stsp free(logmsg);
4542 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4544 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4546 0ebf8283 2019-07-24 stsp goto done;
4548 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4550 0ebf8283 2019-07-24 stsp goto done;
4552 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
4553 0ebf8283 2019-07-24 stsp close(fd);
4555 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4557 0ebf8283 2019-07-24 stsp goto done;
4559 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4560 0ebf8283 2019-07-24 stsp if (err) {
4561 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4562 0ebf8283 2019-07-24 stsp goto done;
4563 0ebf8283 2019-07-24 stsp err = NULL;
4564 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(got_object_commit_get_logmsg(commit));
4565 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL)
4566 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4569 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4570 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
4571 0ebf8283 2019-07-24 stsp free(logmsg_path);
4572 0ebf8283 2019-07-24 stsp free(logmsg);
4573 0ebf8283 2019-07-24 stsp free(editor);
4574 0ebf8283 2019-07-24 stsp if (commit)
4575 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4576 0ebf8283 2019-07-24 stsp return err;
4579 0ebf8283 2019-07-24 stsp static const struct got_error *
4580 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
4581 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4583 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4584 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
4585 0ebf8283 2019-07-24 stsp size_t size;
4586 0ebf8283 2019-07-24 stsp ssize_t len;
4587 0ebf8283 2019-07-24 stsp int lineno = 0, i;
4588 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4589 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4590 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
4592 0ebf8283 2019-07-24 stsp for (;;) {
4593 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
4594 0ebf8283 2019-07-24 stsp if (len == -1) {
4595 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
4596 0ebf8283 2019-07-24 stsp if (feof(f))
4598 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
4599 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
4604 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4606 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
4607 0ebf8283 2019-07-24 stsp free(line);
4608 0ebf8283 2019-07-24 stsp line = NULL;
4611 0ebf8283 2019-07-24 stsp cmd = NULL;
4612 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4613 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
4614 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4615 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
4616 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
4619 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4624 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
4625 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4628 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4630 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
4631 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
4632 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
4635 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
4636 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4640 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
4641 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
4642 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4646 0ebf8283 2019-07-24 stsp free(line);
4647 0ebf8283 2019-07-24 stsp line = NULL;
4651 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
4653 0ebf8283 2019-07-24 stsp *end = '\0';
4655 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
4656 0ebf8283 2019-07-24 stsp if (err) {
4657 0ebf8283 2019-07-24 stsp /* override error code */
4658 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4662 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
4663 0ebf8283 2019-07-24 stsp if (hle == NULL) {
4664 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
4667 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
4668 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
4669 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
4670 0ebf8283 2019-07-24 stsp commit_id = NULL;
4671 0ebf8283 2019-07-24 stsp free(line);
4672 0ebf8283 2019-07-24 stsp line = NULL;
4673 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4676 0ebf8283 2019-07-24 stsp free(line);
4677 0ebf8283 2019-07-24 stsp free(commit_id);
4678 0ebf8283 2019-07-24 stsp return err;
4681 0ebf8283 2019-07-24 stsp static const struct got_error *
4682 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
4683 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4685 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
4686 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
4687 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4688 bfce7f83 2019-07-27 stsp static char msg[80];
4689 bfce7f83 2019-07-27 stsp char *id_str;
4691 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
4692 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
4693 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
4694 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
4695 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4697 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4698 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4699 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
4702 bfce7f83 2019-07-27 stsp if (hle == NULL) {
4703 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
4705 bfce7f83 2019-07-27 stsp return err;
4706 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
4707 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
4708 bfce7f83 2019-07-27 stsp free(id_str);
4709 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
4713 bfce7f83 2019-07-27 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD)
4714 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
4715 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
4717 bfce7f83 2019-07-27 stsp return NULL;
4720 bfce7f83 2019-07-27 stsp static const struct got_error *
4721 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
4722 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
4723 bfce7f83 2019-07-27 stsp struct got_repository *repo)
4725 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4726 0ebf8283 2019-07-24 stsp char *editor;
4727 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4729 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4731 0ebf8283 2019-07-24 stsp return err;
4733 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
4734 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
4735 0ebf8283 2019-07-24 stsp goto done;
4738 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4739 0ebf8283 2019-07-24 stsp if (f == NULL) {
4740 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
4741 0ebf8283 2019-07-24 stsp goto done;
4743 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4745 bfce7f83 2019-07-27 stsp goto done;
4747 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
4749 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4750 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4751 0ebf8283 2019-07-24 stsp free(editor);
4752 0ebf8283 2019-07-24 stsp return err;
4755 0ebf8283 2019-07-24 stsp static const struct got_error *
4756 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
4757 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
4759 0ebf8283 2019-07-24 stsp static const struct got_error *
4760 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
4761 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4763 0ebf8283 2019-07-24 stsp const struct got_error *err;
4764 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4765 0ebf8283 2019-07-24 stsp char *path = NULL;
4767 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
4769 0ebf8283 2019-07-24 stsp return err;
4771 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
4773 0ebf8283 2019-07-24 stsp goto done;
4775 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
4777 0ebf8283 2019-07-24 stsp goto done;
4779 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
4780 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4781 0ebf8283 2019-07-24 stsp goto done;
4785 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
4786 0ebf8283 2019-07-24 stsp if (err) {
4787 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4788 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4789 0ebf8283 2019-07-24 stsp goto done;
4790 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
4791 0ebf8283 2019-07-24 stsp commits, path, repo);
4794 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4795 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4796 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
4797 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
4798 0ebf8283 2019-07-24 stsp free(path);
4799 0ebf8283 2019-07-24 stsp return err;
4802 0ebf8283 2019-07-24 stsp static const struct got_error *
4803 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
4804 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4806 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4807 0ebf8283 2019-07-24 stsp char *path = NULL;
4808 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4809 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4810 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4812 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
4814 0ebf8283 2019-07-24 stsp return err;
4816 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
4817 0ebf8283 2019-07-24 stsp if (f == NULL) {
4818 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4819 0ebf8283 2019-07-24 stsp goto done;
4821 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4822 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
4827 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4828 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
4829 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
4830 0ebf8283 2019-07-24 stsp if (n < 0) {
4831 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4837 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4838 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4839 0ebf8283 2019-07-24 stsp free(path);
4840 0ebf8283 2019-07-24 stsp if (commit)
4841 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4842 0ebf8283 2019-07-24 stsp return err;
4846 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
4848 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4850 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
4851 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
4852 bfce7f83 2019-07-27 stsp free(hle);
4856 0ebf8283 2019-07-24 stsp static const struct got_error *
4857 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
4858 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4860 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4861 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4863 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4864 0ebf8283 2019-07-24 stsp if (f == NULL) {
4865 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4866 0ebf8283 2019-07-24 stsp goto done;
4869 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4871 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4872 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4873 0ebf8283 2019-07-24 stsp return err;
4876 0ebf8283 2019-07-24 stsp static const struct got_error *
4877 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
4878 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
4879 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4881 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
4882 0ebf8283 2019-07-24 stsp int resp = ' ';
4884 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
4885 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
4886 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
4887 0ebf8283 2019-07-24 stsp resp = getchar();
4888 a61a4414 2019-08-07 stsp if (resp == '\n')
4889 a61a4414 2019-08-07 stsp resp = getchar();
4890 426ebf2e 2019-07-25 stsp if (resp == 'c') {
4891 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
4892 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
4894 426ebf2e 2019-07-25 stsp if (err) {
4895 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4896 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4898 bfce7f83 2019-07-27 stsp prev_err = err;
4899 426ebf2e 2019-07-25 stsp resp = ' ';
4903 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
4904 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
4905 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
4906 0ebf8283 2019-07-24 stsp commits, repo);
4907 426ebf2e 2019-07-25 stsp if (err) {
4908 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4909 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4911 bfce7f83 2019-07-27 stsp prev_err = err;
4912 426ebf2e 2019-07-25 stsp resp = ' ';
4916 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
4917 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
4920 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
4923 0ebf8283 2019-07-24 stsp return err;
4926 0ebf8283 2019-07-24 stsp static const struct got_error *
4927 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
4928 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4929 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
4931 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
4932 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4933 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
4934 3e3a69f1 2019-07-25 stsp branch, repo);
4937 0ebf8283 2019-07-24 stsp static const struct got_error *
4938 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
4939 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
4941 0ebf8283 2019-07-24 stsp const struct got_error *err;
4942 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4944 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
4946 0ebf8283 2019-07-24 stsp goto done;
4948 0ebf8283 2019-07-24 stsp if (new_id) {
4949 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
4951 0ebf8283 2019-07-24 stsp goto done;
4954 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
4955 0ebf8283 2019-07-24 stsp if (new_id_str)
4956 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
4958 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4959 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
4960 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
4961 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4962 0ebf8283 2019-07-24 stsp goto done;
4964 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
4966 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4968 0ebf8283 2019-07-24 stsp goto done;
4971 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
4972 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
4973 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
4974 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
4975 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4977 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
4978 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
4979 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
4987 0ebf8283 2019-07-24 stsp free(old_id_str);
4988 0ebf8283 2019-07-24 stsp free(new_id_str);
4989 0ebf8283 2019-07-24 stsp return err;
4992 0ebf8283 2019-07-24 stsp static const struct got_error *
4993 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
4994 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4995 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
4996 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4998 0ebf8283 2019-07-24 stsp const struct got_error *err;
4999 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5000 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
5002 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5003 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
5004 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5006 0ebf8283 2019-07-24 stsp return err;
5009 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5011 0ebf8283 2019-07-24 stsp return err;
5013 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5014 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
5015 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
5016 0ebf8283 2019-07-24 stsp if (err) {
5017 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5018 0ebf8283 2019-07-24 stsp goto done;
5019 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
5021 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
5022 0ebf8283 2019-07-24 stsp free(new_commit_id);
5025 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5026 0ebf8283 2019-07-24 stsp return err;
5029 0ebf8283 2019-07-24 stsp static const struct got_error *
5030 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
5031 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5033 0ebf8283 2019-07-24 stsp const struct got_error *error;
5034 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5036 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5038 0ebf8283 2019-07-24 stsp if (error)
5039 0ebf8283 2019-07-24 stsp return error;
5041 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5042 0ebf8283 2019-07-24 stsp if (error)
5043 0ebf8283 2019-07-24 stsp return error;
5045 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
5046 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5047 0ebf8283 2019-07-24 stsp return error;
5050 0ebf8283 2019-07-24 stsp static const struct got_error *
5051 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
5053 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
5054 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
5055 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5056 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
5057 0ebf8283 2019-07-24 stsp char *cwd = NULL;
5058 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
5059 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
5060 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
5061 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
5062 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
5063 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5064 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
5065 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5066 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
5067 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5068 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
5069 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
5070 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
5071 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
5072 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
5073 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5075 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
5076 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
5077 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
5079 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
5080 0ebf8283 2019-07-24 stsp switch (ch) {
5082 0ebf8283 2019-07-24 stsp abort_edit = 1;
5085 0ebf8283 2019-07-24 stsp continue_edit = 1;
5088 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
5091 0ebf8283 2019-07-24 stsp usage_histedit();
5092 0ebf8283 2019-07-24 stsp /* NOTREACHED */
5096 0ebf8283 2019-07-24 stsp argc -= optind;
5097 0ebf8283 2019-07-24 stsp argv += optind;
5099 0ebf8283 2019-07-24 stsp #ifndef PROFILE
5100 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5101 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
5102 0ebf8283 2019-07-24 stsp err(1, "pledge");
5104 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
5105 0ebf8283 2019-07-24 stsp usage_histedit();
5106 0ebf8283 2019-07-24 stsp if (argc != 0)
5107 0ebf8283 2019-07-24 stsp usage_histedit();
5110 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
5111 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
5112 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
5113 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
5114 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
5115 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
5118 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
5119 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
5120 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
5121 0ebf8283 2019-07-24 stsp goto done;
5123 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
5124 0ebf8283 2019-07-24 stsp if (error)
5125 0ebf8283 2019-07-24 stsp goto done;
5127 0ebf8283 2019-07-24 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5128 0ebf8283 2019-07-24 stsp if (error != NULL)
5129 0ebf8283 2019-07-24 stsp goto done;
5131 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5132 0ebf8283 2019-07-24 stsp if (error)
5133 0ebf8283 2019-07-24 stsp goto done;
5134 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
5135 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
5136 0ebf8283 2019-07-24 stsp goto done;
5139 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
5140 0ebf8283 2019-07-24 stsp if (error)
5141 0ebf8283 2019-07-24 stsp goto done;
5143 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
5144 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5145 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5146 3e3a69f1 2019-07-25 stsp worktree, repo);
5147 0ebf8283 2019-07-24 stsp if (error)
5148 0ebf8283 2019-07-24 stsp goto done;
5149 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5150 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5151 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
5152 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
5153 0ebf8283 2019-07-24 stsp if (error)
5154 0ebf8283 2019-07-24 stsp goto done;
5155 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
5156 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5157 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
5158 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
5159 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5160 0ebf8283 2019-07-24 stsp goto done;
5163 0ebf8283 2019-07-24 stsp if (continue_edit) {
5164 0ebf8283 2019-07-24 stsp char *path;
5166 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
5167 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5168 0ebf8283 2019-07-24 stsp goto done;
5171 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
5172 0ebf8283 2019-07-24 stsp if (error)
5173 0ebf8283 2019-07-24 stsp goto done;
5175 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
5176 0ebf8283 2019-07-24 stsp free(path);
5177 0ebf8283 2019-07-24 stsp if (error)
5178 0ebf8283 2019-07-24 stsp goto done;
5180 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5181 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5182 3e3a69f1 2019-07-25 stsp worktree, repo);
5183 0ebf8283 2019-07-24 stsp if (error)
5184 0ebf8283 2019-07-24 stsp goto done;
5186 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5187 0ebf8283 2019-07-24 stsp if (error)
5188 0ebf8283 2019-07-24 stsp goto done;
5190 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5191 0ebf8283 2019-07-24 stsp head_commit_id);
5192 0ebf8283 2019-07-24 stsp if (error)
5193 0ebf8283 2019-07-24 stsp goto done;
5194 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5195 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5196 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5197 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5198 3aac7cf7 2019-07-25 stsp goto done;
5200 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5201 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
5202 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5203 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5204 0ebf8283 2019-07-24 stsp commit = NULL;
5205 0ebf8283 2019-07-24 stsp if (error)
5206 0ebf8283 2019-07-24 stsp goto done;
5208 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
5209 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5210 0ebf8283 2019-07-24 stsp goto done;
5213 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
5214 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
5215 0ebf8283 2019-07-24 stsp if (error != NULL)
5216 0ebf8283 2019-07-24 stsp goto done;
5218 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
5219 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
5220 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
5221 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
5222 c7d20a3f 2019-07-30 stsp goto done;
5225 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5226 bfce7f83 2019-07-27 stsp got_ref_close(branch);
5227 bfce7f83 2019-07-27 stsp branch = NULL;
5228 0ebf8283 2019-07-24 stsp if (error)
5229 0ebf8283 2019-07-24 stsp goto done;
5231 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5232 0ebf8283 2019-07-24 stsp head_commit_id);
5233 0ebf8283 2019-07-24 stsp if (error)
5234 0ebf8283 2019-07-24 stsp goto done;
5235 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5236 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5237 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5238 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5239 3aac7cf7 2019-07-25 stsp goto done;
5241 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5242 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
5243 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
5244 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5245 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5246 0ebf8283 2019-07-24 stsp commit = NULL;
5247 0ebf8283 2019-07-24 stsp if (error)
5248 0ebf8283 2019-07-24 stsp goto done;
5250 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5251 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
5252 bfce7f83 2019-07-27 stsp if (error)
5253 bfce7f83 2019-07-27 stsp goto done;
5255 0ebf8283 2019-07-24 stsp if (edit_script_path) {
5256 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
5257 0ebf8283 2019-07-24 stsp edit_script_path, repo);
5258 6ba2bea2 2019-07-27 stsp if (error) {
5259 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5260 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5261 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5262 0ebf8283 2019-07-24 stsp goto done;
5265 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
5267 6ba2bea2 2019-07-27 stsp if (error) {
5268 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5269 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5270 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5271 0ebf8283 2019-07-24 stsp goto done;
5276 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
5278 6ba2bea2 2019-07-27 stsp if (error) {
5279 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5280 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5281 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5282 0ebf8283 2019-07-24 stsp goto done;
5287 0ebf8283 2019-07-24 stsp error = histedit_check_script(&histedit_cmds, &commits, repo);
5288 0ebf8283 2019-07-24 stsp if (error)
5289 0ebf8283 2019-07-24 stsp goto done;
5291 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5292 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
5293 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
5294 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
5297 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
5298 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
5299 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
5300 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
5303 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
5304 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
5306 0ebf8283 2019-07-24 stsp if (error)
5307 0ebf8283 2019-07-24 stsp goto done;
5311 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
5312 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5313 0ebf8283 2019-07-24 stsp if (error)
5314 0ebf8283 2019-07-24 stsp goto done;
5318 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5319 0ebf8283 2019-07-24 stsp hle->commit_id);
5320 0ebf8283 2019-07-24 stsp if (error)
5321 0ebf8283 2019-07-24 stsp goto done;
5322 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5323 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5325 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
5326 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
5327 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5328 0ebf8283 2019-07-24 stsp if (error)
5329 0ebf8283 2019-07-24 stsp goto done;
5330 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5331 0ebf8283 2019-07-24 stsp commit = NULL;
5333 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5334 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5338 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5339 0ebf8283 2019-07-24 stsp char *id_str;
5340 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
5341 0ebf8283 2019-07-24 stsp if (error)
5342 0ebf8283 2019-07-24 stsp goto done;
5343 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
5345 0ebf8283 2019-07-24 stsp free(id_str);
5346 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5347 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
5348 3e3a69f1 2019-07-25 stsp fileindex);
5349 0ebf8283 2019-07-24 stsp goto done;
5352 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5353 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5354 0ebf8283 2019-07-24 stsp if (error)
5355 0ebf8283 2019-07-24 stsp goto done;
5359 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
5360 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
5361 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5362 0ebf8283 2019-07-24 stsp if (error)
5363 0ebf8283 2019-07-24 stsp goto done;
5366 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5367 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
5368 0ebf8283 2019-07-24 stsp if (error)
5369 0ebf8283 2019-07-24 stsp goto done;
5370 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5371 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
5373 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
5374 3e3a69f1 2019-07-25 stsp branch, repo);
5376 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
5377 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
5378 0ebf8283 2019-07-24 stsp free(head_commit_id);
5379 0ebf8283 2019-07-24 stsp free(base_commit_id);
5380 0ebf8283 2019-07-24 stsp free(resume_commit_id);
5381 0ebf8283 2019-07-24 stsp if (commit)
5382 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5383 0ebf8283 2019-07-24 stsp if (branch)
5384 0ebf8283 2019-07-24 stsp got_ref_close(branch);
5385 0ebf8283 2019-07-24 stsp if (tmp_branch)
5386 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
5387 0ebf8283 2019-07-24 stsp if (worktree)
5388 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
5390 715dc77e 2019-08-03 stsp got_repo_close(repo);
5391 715dc77e 2019-08-03 stsp return error;
5394 715dc77e 2019-08-03 stsp __dead static void
5395 715dc77e 2019-08-03 stsp usage_stage(void)
5397 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
5398 f3055044 2019-08-07 stsp "[file-path ...]\n",
5399 715dc77e 2019-08-03 stsp getprogname());
5403 715dc77e 2019-08-03 stsp static const struct got_error *
5404 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
5405 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5406 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
5408 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
5409 408b4ebc 2019-08-03 stsp char *id_str = NULL;
5411 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
5412 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
5413 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5414 408b4ebc 2019-08-03 stsp return NULL;
5416 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
5417 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
5418 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
5420 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
5422 408b4ebc 2019-08-03 stsp return err;
5424 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
5425 408b4ebc 2019-08-03 stsp free(id_str);
5426 dc424a06 2019-08-07 stsp return NULL;
5429 dc424a06 2019-08-07 stsp static const struct got_error *
5430 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
5432 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
5433 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
5434 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
5435 715dc77e 2019-08-03 stsp char *cwd = NULL;
5436 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
5437 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
5438 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
5439 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
5440 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5441 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5443 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
5445 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
5446 715dc77e 2019-08-03 stsp switch (ch) {
5448 408b4ebc 2019-08-03 stsp list_stage = 1;
5451 dc424a06 2019-08-07 stsp pflag = 1;
5454 dc424a06 2019-08-07 stsp patch_script_path = optarg;
5457 715dc77e 2019-08-03 stsp usage_stage();
5458 715dc77e 2019-08-03 stsp /* NOTREACHED */
5462 715dc77e 2019-08-03 stsp argc -= optind;
5463 715dc77e 2019-08-03 stsp argv += optind;
5465 715dc77e 2019-08-03 stsp #ifndef PROFILE
5466 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5467 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
5468 715dc77e 2019-08-03 stsp err(1, "pledge");
5470 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
5471 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
5472 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
5473 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
5475 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
5476 715dc77e 2019-08-03 stsp if (cwd == NULL) {
5477 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
5478 715dc77e 2019-08-03 stsp goto done;
5481 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5482 715dc77e 2019-08-03 stsp if (error)
5483 715dc77e 2019-08-03 stsp goto done;
5485 715dc77e 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5486 715dc77e 2019-08-03 stsp if (error != NULL)
5487 715dc77e 2019-08-03 stsp goto done;
5489 dc424a06 2019-08-07 stsp if (patch_script_path) {
5490 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
5491 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
5492 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
5493 dc424a06 2019-08-07 stsp patch_script_path);
5494 dc424a06 2019-08-07 stsp goto done;
5497 715dc77e 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5498 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
5499 715dc77e 2019-08-03 stsp if (error)
5500 715dc77e 2019-08-03 stsp goto done;
5502 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5503 6d022e97 2019-08-04 stsp if (error)
5504 6d022e97 2019-08-04 stsp goto done;
5506 6d022e97 2019-08-04 stsp if (list_stage)
5507 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
5508 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
5510 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5511 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
5512 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
5513 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
5514 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
5517 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5518 2e1f37b0 2019-08-08 stsp error == NULL)
5519 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5521 ad493afc 2019-08-03 stsp got_repo_close(repo);
5522 ad493afc 2019-08-03 stsp if (worktree)
5523 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
5524 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5525 ad493afc 2019-08-03 stsp free((char *)pe->path);
5526 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
5527 ad493afc 2019-08-03 stsp free(cwd);
5528 ad493afc 2019-08-03 stsp return error;
5531 ad493afc 2019-08-03 stsp __dead static void
5532 ad493afc 2019-08-03 stsp usage_unstage(void)
5534 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
5535 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
5536 ad493afc 2019-08-03 stsp getprogname());
5541 ad493afc 2019-08-03 stsp static const struct got_error *
5542 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
5544 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
5545 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
5546 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
5547 ad493afc 2019-08-03 stsp char *cwd = NULL;
5548 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
5549 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
5550 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
5551 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
5552 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5553 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5555 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
5557 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
5558 ad493afc 2019-08-03 stsp switch (ch) {
5560 2e1f37b0 2019-08-08 stsp pflag = 1;
5563 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
5566 ad493afc 2019-08-03 stsp usage_unstage();
5567 ad493afc 2019-08-03 stsp /* NOTREACHED */
5571 ad493afc 2019-08-03 stsp argc -= optind;
5572 ad493afc 2019-08-03 stsp argv += optind;
5574 ad493afc 2019-08-03 stsp #ifndef PROFILE
5575 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5576 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
5577 ad493afc 2019-08-03 stsp err(1, "pledge");
5579 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
5580 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
5582 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
5583 ad493afc 2019-08-03 stsp if (cwd == NULL) {
5584 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
5585 ad493afc 2019-08-03 stsp goto done;
5588 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5589 ad493afc 2019-08-03 stsp if (error)
5590 ad493afc 2019-08-03 stsp goto done;
5592 ad493afc 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5593 ad493afc 2019-08-03 stsp if (error != NULL)
5594 ad493afc 2019-08-03 stsp goto done;
5596 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
5597 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
5598 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
5599 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
5600 2e1f37b0 2019-08-08 stsp patch_script_path);
5601 2e1f37b0 2019-08-08 stsp goto done;
5605 ad493afc 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5606 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
5607 ad493afc 2019-08-03 stsp if (error)
5608 ad493afc 2019-08-03 stsp goto done;
5610 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5611 ad493afc 2019-08-03 stsp if (error)
5612 ad493afc 2019-08-03 stsp goto done;
5614 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5615 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
5616 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
5617 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
5619 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5620 2e1f37b0 2019-08-08 stsp error == NULL)
5621 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5623 0ebf8283 2019-07-24 stsp got_repo_close(repo);
5624 715dc77e 2019-08-03 stsp if (worktree)
5625 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
5626 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5627 715dc77e 2019-08-03 stsp free((char *)pe->path);
5628 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
5629 715dc77e 2019-08-03 stsp free(cwd);
5630 0ebf8283 2019-07-24 stsp return error;
