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 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
488 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
489 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
490 3ce1b845 2019-07-15 stsp char *editor = NULL;
491 3ce1b845 2019-07-15 stsp const char *got_author = getenv("GOT_AUTHOR");
492 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
493 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
494 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
495 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
496 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
498 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
499 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
501 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
503 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
504 3ce1b845 2019-07-15 stsp switch (ch) {
506 3ce1b845 2019-07-15 stsp branch_name = optarg;
509 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
510 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
511 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
516 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
517 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
518 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
523 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
525 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
531 3ce1b845 2019-07-15 stsp usage_init();
532 3ce1b845 2019-07-15 stsp /* NOTREACHED */
536 3ce1b845 2019-07-15 stsp argc -= optind;
537 3ce1b845 2019-07-15 stsp argv += optind;
539 3ce1b845 2019-07-15 stsp #ifndef PROFILE
540 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
541 3ce1b845 2019-07-15 stsp NULL) == -1)
542 3ce1b845 2019-07-15 stsp err(1, "pledge");
544 3ce1b845 2019-07-15 stsp if (argc != 1)
545 3ce1b845 2019-07-15 stsp usage_import();
547 3ce1b845 2019-07-15 stsp if (got_author == NULL) {
548 3ce1b845 2019-07-15 stsp /* TODO: Look current user up in password database */
549 3ce1b845 2019-07-15 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
553 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
554 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
555 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
556 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
558 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
559 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
563 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
564 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
568 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
569 3ce1b845 2019-07-15 stsp if (error) {
570 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
573 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
574 3ce1b845 2019-07-15 stsp "import target branch already exists");
578 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
579 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
580 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
583 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
586 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
587 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
589 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
590 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
593 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
598 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
599 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
601 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
605 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
606 3ce1b845 2019-07-15 stsp got_author, &ignores, repo, import_progress, NULL);
610 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
614 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
618 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
622 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
623 3ce1b845 2019-07-15 stsp if (error) {
624 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
627 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
628 3ce1b845 2019-07-15 stsp branch_ref);
632 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
637 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
638 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
640 2c7829a4 2019-06-17 stsp free(repo_path);
641 3ce1b845 2019-07-15 stsp free(editor);
642 3ce1b845 2019-07-15 stsp free(refname);
643 3ce1b845 2019-07-15 stsp free(new_commit_id);
644 3ce1b845 2019-07-15 stsp free(id_str);
645 3ce1b845 2019-07-15 stsp if (branch_ref)
646 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
647 3ce1b845 2019-07-15 stsp if (head_ref)
648 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
649 2c7829a4 2019-06-17 stsp return error;
652 4ed7e80c 2018-05-20 stsp __dead static void
653 c09a553d 2018-03-12 stsp usage_checkout(void)
655 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
656 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
660 1ee397ad 2019-07-12 stsp static const struct got_error *
661 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
663 92a684f4 2018-03-12 stsp char *worktree_path = arg;
665 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
666 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
667 1ee397ad 2019-07-12 stsp return NULL;
669 92a684f4 2018-03-12 stsp while (path[0] == '/')
672 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
673 1ee397ad 2019-07-12 stsp return NULL;
676 99437157 2018-11-11 stsp static const struct got_error *
677 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
679 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
680 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
681 99437157 2018-11-11 stsp return NULL;
684 8069f636 2019-01-12 stsp static const struct got_error *
685 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
686 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
688 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
689 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
691 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
692 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
694 36a38700 2019-05-10 stsp return err;
696 d5bea539 2019-05-13 stsp if (yca_id == NULL)
697 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
700 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
701 d5bea539 2019-05-13 stsp * and the work tree's base commit.
703 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
705 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
713 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
714 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
715 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
717 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
718 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
719 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
721 d5bea539 2019-05-13 stsp free(yca_id);
722 d5bea539 2019-05-13 stsp return NULL;
725 a367ff0f 2019-05-14 stsp static const struct got_error *
726 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
727 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
728 a51a74b3 2019-07-27 stsp struct got_repository *repo)
730 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
731 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
732 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
733 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
735 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
739 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
740 a51a74b3 2019-07-27 stsp is_same_branch = 1;
743 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
744 a51a74b3 2019-07-27 stsp is_same_branch = 1;
748 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
752 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
757 a367ff0f 2019-05-14 stsp struct got_object_id *id;
758 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
760 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
761 a367ff0f 2019-05-14 stsp err = NULL;
763 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
765 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
772 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
774 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
775 a367ff0f 2019-05-14 stsp is_same_branch = 1;
782 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
783 a367ff0f 2019-05-14 stsp free(head_commit_id);
784 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
785 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
786 04f57cb3 2019-07-25 stsp return err;
789 04f57cb3 2019-07-25 stsp static const struct got_error *
790 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
791 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
793 04f57cb3 2019-07-25 stsp const struct got_error *err;
794 04f57cb3 2019-07-25 stsp struct got_reference *ref;
796 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
797 04f57cb3 2019-07-25 stsp if (err == NULL) {
798 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
799 04f57cb3 2019-07-25 stsp got_ref_close(ref);
801 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
802 04f57cb3 2019-07-25 stsp return err;
803 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
804 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
806 a367ff0f 2019-05-14 stsp return err;
809 4ed7e80c 2018-05-20 stsp static const struct got_error *
810 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
812 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
813 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
814 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
815 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
816 c09a553d 2018-03-12 stsp char *repo_path = NULL;
817 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
818 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
819 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
820 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
821 72151b04 2019-05-11 stsp int ch, same_path_prefix;
822 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
824 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
826 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
827 0bb8a95e 2018-03-12 stsp switch (ch) {
829 08573d5b 2019-05-14 stsp branch_name = optarg;
832 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
833 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
834 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
837 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
840 2deda0b9 2019-03-07 stsp usage_checkout();
841 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
845 0bb8a95e 2018-03-12 stsp argc -= optind;
846 0bb8a95e 2018-03-12 stsp argv += optind;
848 6715a751 2018-03-16 stsp #ifndef PROFILE
849 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
850 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
851 c09a553d 2018-03-12 stsp err(1, "pledge");
853 0bb8a95e 2018-03-12 stsp if (argc == 1) {
854 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
855 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
856 76089277 2018-04-01 stsp if (repo_path == NULL)
857 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
858 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
859 76089277 2018-04-01 stsp if (cwd == NULL) {
860 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
863 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
864 230a42bd 2019-05-11 jcs base = basename(path_prefix);
865 230a42bd 2019-05-11 jcs if (base == NULL) {
866 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
867 230a42bd 2019-05-11 jcs path_prefix);
871 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
872 230a42bd 2019-05-11 jcs if (base == NULL) {
873 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
878 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
879 c09a553d 2018-03-12 stsp if (dotgit)
880 c09a553d 2018-03-12 stsp *dotgit = '\0';
881 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
882 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
887 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
888 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
889 76089277 2018-04-01 stsp if (repo_path == NULL) {
890 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
893 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
894 76089277 2018-04-01 stsp if (worktree_path == NULL) {
895 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
896 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
900 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
901 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
902 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
907 c09a553d 2018-03-12 stsp usage_checkout();
909 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
910 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
912 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
913 c09a553d 2018-03-12 stsp if (error != NULL)
916 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
917 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
918 c530dc23 2019-07-23 stsp if (error) {
919 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
920 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
922 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
923 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
924 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
929 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
933 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
934 c09a553d 2018-03-12 stsp if (error != NULL)
937 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
938 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
941 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
942 c09a553d 2018-03-12 stsp if (error != NULL)
945 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
946 e5dc7198 2018-12-29 stsp path_prefix);
947 e5dc7198 2018-12-29 stsp if (error != NULL)
949 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
950 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
954 8069f636 2019-01-12 stsp if (commit_id_str) {
955 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
956 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
959 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
960 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
961 8069f636 2019-01-12 stsp if (error != NULL) {
962 8069f636 2019-01-12 stsp free(commit_id);
965 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
968 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
969 8069f636 2019-01-12 stsp commit_id);
970 8069f636 2019-01-12 stsp free(commit_id);
975 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
978 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
979 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
980 c09a553d 2018-03-12 stsp if (error != NULL)
983 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
986 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
987 8069f636 2019-01-12 stsp free(commit_id_str);
988 76089277 2018-04-01 stsp free(repo_path);
989 507dc3bb 2018-12-29 stsp free(worktree_path);
990 507dc3bb 2018-12-29 stsp return error;
993 507dc3bb 2018-12-29 stsp __dead static void
994 507dc3bb 2018-12-29 stsp usage_update(void)
996 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
997 507dc3bb 2018-12-29 stsp getprogname());
1001 1ee397ad 2019-07-12 stsp static const struct got_error *
1002 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1004 784955db 2019-01-12 stsp int *did_something = arg;
1006 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1007 1ee397ad 2019-07-12 stsp return NULL;
1009 1545c615 2019-02-10 stsp *did_something = 1;
1011 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1012 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1013 1ee397ad 2019-07-12 stsp return NULL;
1015 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1017 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1018 1ee397ad 2019-07-12 stsp return NULL;
1021 be7061eb 2018-12-30 stsp static const struct got_error *
1022 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1023 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1024 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1026 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1027 a1fb16d8 2019-05-24 stsp char *base_id_str;
1028 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1030 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1031 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1032 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1033 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1034 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1035 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1036 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1039 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1040 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1041 a1fb16d8 2019-05-24 stsp if (err) {
1042 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1043 a1fb16d8 2019-05-24 stsp return err;
1044 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1046 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1047 a1fb16d8 2019-05-24 stsp return NULL;
1049 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1050 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1051 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1053 a1fb16d8 2019-05-24 stsp return err;
1054 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1055 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1056 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1057 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1058 0ebf8283 2019-07-24 stsp return NULL;
1061 0ebf8283 2019-07-24 stsp static const struct got_error *
1062 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1064 0ebf8283 2019-07-24 stsp const struct got_error *err;
1065 0ebf8283 2019-07-24 stsp int in_progress;
1067 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1069 0ebf8283 2019-07-24 stsp return err;
1070 0ebf8283 2019-07-24 stsp if (in_progress)
1071 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1073 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1075 0ebf8283 2019-07-24 stsp return err;
1076 0ebf8283 2019-07-24 stsp if (in_progress)
1077 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1079 a1fb16d8 2019-05-24 stsp return NULL;
1082 a5edda0a 2019-07-27 stsp static const struct got_error *
1083 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1084 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1086 a5edda0a 2019-07-27 stsp const struct got_error *err;
1087 a5edda0a 2019-07-27 stsp char *path;
1090 a5edda0a 2019-07-27 stsp if (argc == 0) {
1091 a5edda0a 2019-07-27 stsp path = strdup("");
1092 a5edda0a 2019-07-27 stsp if (path == NULL)
1093 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1094 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1097 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1098 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1101 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1102 a5edda0a 2019-07-27 stsp if (err) {
1103 a5edda0a 2019-07-27 stsp free(path);
1108 a5edda0a 2019-07-27 stsp return err;
1111 a1fb16d8 2019-05-24 stsp static const struct got_error *
1112 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1114 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1115 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1116 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1117 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1118 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1119 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1120 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1121 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1122 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1123 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1124 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1126 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1128 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1129 507dc3bb 2018-12-29 stsp switch (ch) {
1131 024e9686 2019-05-14 stsp branch_name = optarg;
1134 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1135 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1136 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1139 2deda0b9 2019-03-07 stsp usage_update();
1140 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1144 507dc3bb 2018-12-29 stsp argc -= optind;
1145 507dc3bb 2018-12-29 stsp argv += optind;
1147 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1148 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1149 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1150 507dc3bb 2018-12-29 stsp err(1, "pledge");
1152 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1153 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1154 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1155 c4cdcb68 2019-04-03 stsp goto done;
1157 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1158 7d5807f4 2019-07-11 stsp if (error)
1159 7d5807f4 2019-07-11 stsp goto done;
1161 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1162 f2ea84fa 2019-07-27 stsp if (error)
1163 f2ea84fa 2019-07-27 stsp goto done;
1165 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1166 507dc3bb 2018-12-29 stsp if (error != NULL)
1167 507dc3bb 2018-12-29 stsp goto done;
1169 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1170 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1171 087fb88c 2019-08-04 stsp if (error)
1172 087fb88c 2019-08-04 stsp goto done;
1174 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1175 0266afb7 2019-01-04 stsp if (error)
1176 0266afb7 2019-01-04 stsp goto done;
1178 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1179 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1180 024e9686 2019-05-14 stsp if (error != NULL)
1181 024e9686 2019-05-14 stsp goto done;
1182 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1183 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1184 9c4b8182 2019-01-02 stsp if (error != NULL)
1185 9c4b8182 2019-01-02 stsp goto done;
1186 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1187 507dc3bb 2018-12-29 stsp if (error != NULL)
1188 507dc3bb 2018-12-29 stsp goto done;
1190 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1191 04f57cb3 2019-07-25 stsp free(commit_id_str);
1192 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1193 30837e32 2019-07-25 stsp if (error)
1194 a297e751 2019-07-11 stsp goto done;
1195 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1196 a297e751 2019-07-11 stsp if (error)
1197 507dc3bb 2018-12-29 stsp goto done;
1200 a1fb16d8 2019-05-24 stsp if (branch_name) {
1201 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1202 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1203 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1205 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1206 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1207 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1208 024e9686 2019-05-14 stsp goto done;
1210 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1211 024e9686 2019-05-14 stsp if (error)
1212 024e9686 2019-05-14 stsp goto done;
1213 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1214 a367ff0f 2019-05-14 stsp free(head_commit_id);
1215 024e9686 2019-05-14 stsp if (error != NULL)
1216 024e9686 2019-05-14 stsp goto done;
1217 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1218 a367ff0f 2019-05-14 stsp if (error)
1219 a367ff0f 2019-05-14 stsp goto done;
1220 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1221 024e9686 2019-05-14 stsp if (error)
1222 024e9686 2019-05-14 stsp goto done;
1224 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1225 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1226 a367ff0f 2019-05-14 stsp if (error != NULL) {
1227 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1228 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1229 024e9686 2019-05-14 stsp goto done;
1231 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1232 a367ff0f 2019-05-14 stsp if (error)
1233 a367ff0f 2019-05-14 stsp goto done;
1236 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1237 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1238 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1239 507dc3bb 2018-12-29 stsp commit_id);
1240 507dc3bb 2018-12-29 stsp if (error)
1241 507dc3bb 2018-12-29 stsp goto done;
1244 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1245 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1246 507dc3bb 2018-12-29 stsp if (error != NULL)
1247 507dc3bb 2018-12-29 stsp goto done;
1249 784955db 2019-01-12 stsp if (did_something)
1250 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1252 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1254 c09a553d 2018-03-12 stsp free(worktree_path);
1255 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1256 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1257 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1258 507dc3bb 2018-12-29 stsp free(commit_id);
1259 9c4b8182 2019-01-02 stsp free(commit_id_str);
1260 c09a553d 2018-03-12 stsp return error;
1263 f42b1b34 2018-03-12 stsp static const struct got_error *
1264 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1265 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1267 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1268 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1269 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1270 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1271 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1273 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1274 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1276 79109fed 2018-03-27 stsp return err;
1278 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1279 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1280 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1282 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1284 79109fed 2018-03-27 stsp return err;
1286 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1287 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1288 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1290 0f2b3dca 2018-12-22 stsp return err;
1292 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1294 79109fed 2018-03-27 stsp return err;
1297 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1299 0f2b3dca 2018-12-22 stsp goto done;
1301 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1302 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1303 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1304 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1305 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1307 79109fed 2018-03-27 stsp if (tree1)
1308 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1309 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1310 0f2b3dca 2018-12-22 stsp free(id_str1);
1311 0f2b3dca 2018-12-22 stsp free(id_str2);
1312 79109fed 2018-03-27 stsp return err;
1315 4bb494d5 2018-06-16 stsp static char *
1316 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1318 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
1319 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1321 6c281f94 2018-06-11 stsp *p = '\0';
1325 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1327 79109fed 2018-03-27 stsp static const struct got_error *
1328 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1329 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1330 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1332 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1333 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1334 6c281f94 2018-06-11 stsp char datebuf[26];
1335 45d799e2 2018-12-23 stsp time_t committer_time;
1336 45d799e2 2018-12-23 stsp const char *author, *committer;
1337 199a4027 2019-02-02 stsp char *refs_str = NULL;
1338 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1340 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1342 199a4027 2019-02-02 stsp const char *name;
1343 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
1345 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1346 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1348 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1349 199a4027 2019-02-02 stsp name += 5;
1350 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1352 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1353 e34f9ed6 2019-02-02 stsp name += 6;
1354 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1355 141c2bff 2019-02-04 stsp name += 8;
1356 199a4027 2019-02-02 stsp s = refs_str;
1357 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1358 199a4027 2019-02-02 stsp name) == -1) {
1359 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1365 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1367 8bf5b3c9 2018-03-17 stsp return err;
1369 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1370 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1371 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1372 832c249c 2018-06-10 stsp free(id_str);
1373 d3d493d7 2019-02-21 stsp id_str = NULL;
1374 d3d493d7 2019-02-21 stsp free(refs_str);
1375 d3d493d7 2019-02-21 stsp refs_str = NULL;
1376 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1377 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1378 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1379 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
1380 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1381 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1382 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1383 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1384 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1385 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1386 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1387 3fe1abad 2018-06-10 stsp int n = 1;
1388 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1389 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1390 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1392 a0603db2 2018-06-10 stsp return err;
1393 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1394 a0603db2 2018-06-10 stsp free(id_str);
1398 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1399 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
1400 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1402 621015ac 2018-07-23 stsp logmsg = logmsg0;
1404 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1406 832c249c 2018-06-10 stsp printf(" %s\n", line);
1407 832c249c 2018-06-10 stsp } while (line);
1408 621015ac 2018-07-23 stsp free(logmsg0);
1410 971751ac 2018-03-27 stsp if (show_patch) {
1411 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1412 971751ac 2018-03-27 stsp if (err == 0)
1413 971751ac 2018-03-27 stsp printf("\n");
1416 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1417 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1418 07862c20 2018-09-15 stsp return err;
1421 f42b1b34 2018-03-12 stsp static const struct got_error *
1422 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1423 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1424 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1426 f42b1b34 2018-03-12 stsp const struct got_error *err;
1427 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1429 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1430 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1432 f42b1b34 2018-03-12 stsp return err;
1433 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1435 fcc85cad 2018-07-22 stsp goto done;
1437 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1438 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1440 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1443 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1444 372ccdbb 2018-06-10 stsp if (err) {
1445 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1446 9ba79e04 2018-06-11 stsp err = NULL;
1449 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1451 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1457 b43fbaa0 2018-06-11 stsp if (id == NULL)
1460 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1463 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1465 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1466 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1470 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1471 f42b1b34 2018-03-12 stsp return err;
1474 4ed7e80c 2018-05-20 stsp __dead static void
1475 6f3d1eb0 2018-03-12 stsp usage_log(void)
1477 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1478 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1482 4ed7e80c 2018-05-20 stsp static const struct got_error *
1483 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1485 f42b1b34 2018-03-12 stsp const struct got_error *error;
1486 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1487 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1488 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1489 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1490 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1491 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1492 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1493 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1494 64a96a6d 2018-04-01 stsp const char *errstr;
1495 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1497 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1499 6715a751 2018-03-16 stsp #ifndef PROFILE
1500 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1503 f42b1b34 2018-03-12 stsp err(1, "pledge");
1506 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1507 79109fed 2018-03-27 stsp switch (ch) {
1509 79109fed 2018-03-27 stsp show_patch = 1;
1512 d142fc45 2018-04-01 stsp start_commit = optarg;
1515 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1517 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1518 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1521 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1522 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1523 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1526 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1529 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1530 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1531 04ca23f4 2018-07-16 stsp err(1, "-r option");
1532 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1535 2deda0b9 2019-03-07 stsp usage_log();
1536 79109fed 2018-03-27 stsp /* NOTREACHED */
1540 79109fed 2018-03-27 stsp argc -= optind;
1541 79109fed 2018-03-27 stsp argv += optind;
1543 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1544 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1545 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1546 04ca23f4 2018-07-16 stsp goto done;
1549 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1550 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1551 cffc0aa4 2019-02-05 stsp goto done;
1552 cffc0aa4 2019-02-05 stsp error = NULL;
1554 e7301579 2019-03-18 stsp if (argc == 0) {
1555 cbd1af7a 2019-03-18 stsp path = strdup("");
1556 e7301579 2019-03-18 stsp if (path == NULL) {
1557 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1558 cbd1af7a 2019-03-18 stsp goto done;
1560 e7301579 2019-03-18 stsp } else if (argc == 1) {
1561 e7301579 2019-03-18 stsp if (worktree) {
1562 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1564 e7301579 2019-03-18 stsp if (error)
1565 e7301579 2019-03-18 stsp goto done;
1567 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1568 e7301579 2019-03-18 stsp if (path == NULL) {
1569 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1570 e7301579 2019-03-18 stsp goto done;
1574 cbd1af7a 2019-03-18 stsp usage_log();
1576 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1577 5486daa2 2019-05-11 stsp repo_path = worktree ?
1578 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1580 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1581 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1582 cffc0aa4 2019-02-05 stsp goto done;
1585 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1586 d7d4f210 2018-03-12 stsp if (error != NULL)
1587 04ca23f4 2018-07-16 stsp goto done;
1589 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1590 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1591 c02c541e 2019-03-29 stsp if (error)
1592 c02c541e 2019-03-29 stsp goto done;
1594 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1595 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1596 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1597 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1598 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1599 3235492e 2018-04-01 stsp if (error != NULL)
1600 3235492e 2018-04-01 stsp return error;
1601 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1602 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1603 3235492e 2018-04-01 stsp if (error != NULL)
1604 3235492e 2018-04-01 stsp return error;
1605 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1607 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1608 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1609 3235492e 2018-04-01 stsp if (error == NULL) {
1610 1caad61b 2019-02-01 stsp int obj_type;
1611 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1612 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1613 d1f2edc9 2018-06-13 stsp if (error != NULL)
1614 1caad61b 2019-02-01 stsp goto done;
1615 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1616 1caad61b 2019-02-01 stsp if (error != NULL)
1617 1caad61b 2019-02-01 stsp goto done;
1618 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1619 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1620 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1621 1caad61b 2019-02-01 stsp if (error != NULL)
1622 1caad61b 2019-02-01 stsp goto done;
1623 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1624 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1625 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1626 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1627 1caad61b 2019-02-01 stsp goto done;
1630 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1631 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1632 1caad61b 2019-02-01 stsp if (id == NULL)
1633 638f9024 2019-05-13 stsp error = got_error_from_errno(
1634 230a42bd 2019-05-11 jcs "got_object_id_dup");
1635 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1636 1caad61b 2019-02-01 stsp if (error)
1637 1caad61b 2019-02-01 stsp goto done;
1638 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1639 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1640 1caad61b 2019-02-01 stsp goto done;
1642 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1643 d1f2edc9 2018-06-13 stsp if (error != NULL)
1644 1caad61b 2019-02-01 stsp goto done;
1646 15a94983 2018-12-23 stsp if (commit == NULL) {
1647 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1648 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1649 d1f2edc9 2018-06-13 stsp if (error != NULL)
1650 d1f2edc9 2018-06-13 stsp return error;
1653 d7d4f210 2018-03-12 stsp if (error != NULL)
1654 04ca23f4 2018-07-16 stsp goto done;
1656 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1657 04ca23f4 2018-07-16 stsp if (error != NULL)
1658 04ca23f4 2018-07-16 stsp goto done;
1659 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1660 04ca23f4 2018-07-16 stsp free(path);
1661 04ca23f4 2018-07-16 stsp path = in_repo_path;
1664 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1665 199a4027 2019-02-02 stsp if (error)
1666 199a4027 2019-02-02 stsp goto done;
1668 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1669 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1671 04ca23f4 2018-07-16 stsp free(path);
1672 04ca23f4 2018-07-16 stsp free(repo_path);
1673 04ca23f4 2018-07-16 stsp free(cwd);
1675 cffc0aa4 2019-02-05 stsp if (worktree)
1676 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1677 ad242220 2018-09-08 stsp if (repo) {
1678 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1679 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1680 ad242220 2018-09-08 stsp if (error == NULL)
1681 ad242220 2018-09-08 stsp error = repo_error;
1683 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1684 8bf5b3c9 2018-03-17 stsp return error;
1687 4ed7e80c 2018-05-20 stsp __dead static void
1688 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1690 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1691 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1695 b72f483a 2019-02-05 stsp struct print_diff_arg {
1696 b72f483a 2019-02-05 stsp struct got_repository *repo;
1697 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1698 b72f483a 2019-02-05 stsp int diff_context;
1699 3fc0c068 2019-02-10 stsp const char *id_str;
1700 3fc0c068 2019-02-10 stsp int header_shown;
1701 98eaaa12 2019-08-03 stsp int diff_staged;
1704 4ed7e80c 2018-05-20 stsp static const struct got_error *
1705 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1706 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1707 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1709 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1710 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1711 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1712 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1713 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1714 b72f483a 2019-02-05 stsp struct stat sb;
1716 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1717 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1718 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1719 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1720 98eaaa12 2019-08-03 stsp return NULL;
1722 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1723 98eaaa12 2019-08-03 stsp return NULL;
1724 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1725 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1726 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1727 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1728 98eaaa12 2019-08-03 stsp return NULL;
1731 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1732 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1733 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1734 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1735 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1738 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1739 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1740 98eaaa12 2019-08-03 stsp switch (staged_status) {
1741 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1742 98eaaa12 2019-08-03 stsp label1 = path;
1743 98eaaa12 2019-08-03 stsp label2 = path;
1745 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1746 98eaaa12 2019-08-03 stsp label2 = path;
1748 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
1749 98eaaa12 2019-08-03 stsp label1 = path;
1752 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
1754 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1755 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
1758 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
1759 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
1760 4ce46740 2019-08-08 stsp char *id_str;
1761 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1764 4ce46740 2019-08-08 stsp goto done;
1765 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
1767 4ce46740 2019-08-08 stsp goto done;
1768 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1769 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
1770 4ce46740 2019-08-08 stsp free(id_str);
1771 4ce46740 2019-08-08 stsp goto done;
1773 4ce46740 2019-08-08 stsp free(id_str);
1774 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
1775 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1777 4ce46740 2019-08-08 stsp goto done;
1780 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1781 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1782 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1783 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1784 2ec1f75b 2019-03-26 stsp goto done;
1787 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1788 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1789 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1790 2ec1f75b 2019-03-26 stsp goto done;
1792 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1793 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1794 2ec1f75b 2019-03-26 stsp goto done;
1797 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1799 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1800 4ce46740 2019-08-08 stsp a->diff_context, stdout);
1802 b72f483a 2019-02-05 stsp if (blob1)
1803 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1804 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1805 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1806 b72f483a 2019-02-05 stsp free(abspath);
1807 927df6b7 2019-02-10 stsp return err;
1810 927df6b7 2019-02-10 stsp static const struct got_error *
1811 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1813 b00d56cd 2018-04-01 stsp const struct got_error *error;
1814 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1815 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1816 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1817 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1818 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1819 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1820 15a94983 2018-12-23 stsp int type1, type2;
1821 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
1822 c0cc5c62 2018-10-18 stsp const char *errstr;
1823 927df6b7 2019-02-10 stsp char *path = NULL;
1825 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1826 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1827 25eccc22 2019-01-04 stsp NULL) == -1)
1828 b00d56cd 2018-04-01 stsp err(1, "pledge");
1831 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1832 b00d56cd 2018-04-01 stsp switch (ch) {
1834 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1835 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1836 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1839 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1840 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1841 b72f483a 2019-02-05 stsp err(1, "-r option");
1842 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1845 98eaaa12 2019-08-03 stsp diff_staged = 1;
1848 2deda0b9 2019-03-07 stsp usage_diff();
1849 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1853 b00d56cd 2018-04-01 stsp argc -= optind;
1854 b00d56cd 2018-04-01 stsp argv += optind;
1856 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1857 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1858 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1859 b72f483a 2019-02-05 stsp goto done;
1861 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1862 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1863 927df6b7 2019-02-10 stsp goto done;
1864 927df6b7 2019-02-10 stsp if (argc <= 1) {
1865 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1866 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1867 927df6b7 2019-02-10 stsp goto done;
1869 b72f483a 2019-02-05 stsp if (repo_path)
1871 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1872 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1873 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1874 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1875 927df6b7 2019-02-10 stsp goto done;
1877 927df6b7 2019-02-10 stsp if (argc == 1) {
1878 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1880 927df6b7 2019-02-10 stsp if (error)
1881 927df6b7 2019-02-10 stsp goto done;
1883 927df6b7 2019-02-10 stsp path = strdup("");
1884 927df6b7 2019-02-10 stsp if (path == NULL) {
1885 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1886 927df6b7 2019-02-10 stsp goto done;
1889 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1890 98eaaa12 2019-08-03 stsp if (diff_staged)
1891 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
1892 98eaaa12 2019-08-03 stsp "objects in repository");
1893 15a94983 2018-12-23 stsp id_str1 = argv[0];
1894 15a94983 2018-12-23 stsp id_str2 = argv[1];
1895 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1896 30db809c 2019-06-05 stsp repo_path =
1897 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1898 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1899 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1900 30db809c 2019-06-05 stsp goto done;
1904 b00d56cd 2018-04-01 stsp usage_diff();
1906 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
1907 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
1908 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1909 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
1912 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
1913 76089277 2018-04-01 stsp free(repo_path);
1914 b00d56cd 2018-04-01 stsp if (error != NULL)
1915 b00d56cd 2018-04-01 stsp goto done;
1917 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1918 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1919 c02c541e 2019-03-29 stsp if (error)
1920 c02c541e 2019-03-29 stsp goto done;
1922 30db809c 2019-06-05 stsp if (argc <= 1) {
1923 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
1924 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
1925 b72f483a 2019-02-05 stsp char *id_str;
1927 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
1929 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
1930 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
1931 b72f483a 2019-02-05 stsp if (error)
1932 b72f483a 2019-02-05 stsp goto done;
1933 b72f483a 2019-02-05 stsp arg.repo = repo;
1934 b72f483a 2019-02-05 stsp arg.worktree = worktree;
1935 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
1936 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
1937 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
1938 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
1940 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
1941 72ea6654 2019-07-27 stsp if (error)
1942 72ea6654 2019-07-27 stsp goto done;
1944 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
1945 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
1946 b72f483a 2019-02-05 stsp free(id_str);
1947 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
1948 b72f483a 2019-02-05 stsp goto done;
1951 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
1952 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1953 e02e74af 2019-05-28 stsp if (error) {
1954 e02e74af 2019-05-28 stsp struct got_reference *ref;
1955 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1956 e02e74af 2019-05-28 stsp goto done;
1957 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str1, 0);
1958 e02e74af 2019-05-28 stsp if (error != NULL)
1959 e02e74af 2019-05-28 stsp goto done;
1960 5e70831e 2019-05-28 stsp label1 = strdup(got_ref_get_name(ref));
1961 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1962 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1963 5e70831e 2019-05-28 stsp goto done;
1965 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id1, repo, ref);
1966 e02e74af 2019-05-28 stsp got_ref_close(ref);
1967 e02e74af 2019-05-28 stsp if (error != NULL)
1968 5e70831e 2019-05-28 stsp goto done;
1970 a297e751 2019-07-11 stsp error = got_object_id_str(&label1, id1);
1971 5e70831e 2019-05-28 stsp if (label1 == NULL) {
1972 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1973 e02e74af 2019-05-28 stsp goto done;
1977 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
1978 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
1979 e02e74af 2019-05-28 stsp if (error) {
1980 e02e74af 2019-05-28 stsp struct got_reference *ref;
1981 e02e74af 2019-05-28 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1982 e02e74af 2019-05-28 stsp goto done;
1983 e02e74af 2019-05-28 stsp error = got_ref_open(&ref, repo, id_str2, 0);
1984 e02e74af 2019-05-28 stsp if (error != NULL)
1985 5e70831e 2019-05-28 stsp goto done;
1986 5e70831e 2019-05-28 stsp label2 = strdup(got_ref_get_name(ref));
1987 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1988 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1989 e02e74af 2019-05-28 stsp goto done;
1991 e02e74af 2019-05-28 stsp error = got_ref_resolve(&id2, repo, ref);
1992 e02e74af 2019-05-28 stsp got_ref_close(ref);
1993 e02e74af 2019-05-28 stsp if (error != NULL)
1994 e02e74af 2019-05-28 stsp goto done;
1996 a297e751 2019-07-11 stsp error = got_object_id_str(&label2, id2);
1997 5e70831e 2019-05-28 stsp if (label2 == NULL) {
1998 5e70831e 2019-05-28 stsp error = got_error_from_errno("strdup");
1999 5e70831e 2019-05-28 stsp goto done;
2003 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2004 15a94983 2018-12-23 stsp if (error)
2005 15a94983 2018-12-23 stsp goto done;
2007 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2008 15a94983 2018-12-23 stsp if (error)
2009 15a94983 2018-12-23 stsp goto done;
2011 15a94983 2018-12-23 stsp if (type1 != type2) {
2012 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2013 b00d56cd 2018-04-01 stsp goto done;
2016 15a94983 2018-12-23 stsp switch (type1) {
2017 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2018 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2019 54156555 2018-12-24 stsp diff_context, repo, stdout);
2021 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2022 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2023 54156555 2018-12-24 stsp diff_context, repo, stdout);
2025 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2026 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2027 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2028 c0cc5c62 2018-10-18 stsp repo, stdout);
2031 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2035 5e70831e 2019-05-28 stsp free(label1);
2036 5e70831e 2019-05-28 stsp free(label2);
2037 15a94983 2018-12-23 stsp free(id1);
2038 15a94983 2018-12-23 stsp free(id2);
2039 927df6b7 2019-02-10 stsp free(path);
2040 b72f483a 2019-02-05 stsp if (worktree)
2041 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2042 ad242220 2018-09-08 stsp if (repo) {
2043 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2044 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2045 ad242220 2018-09-08 stsp if (error == NULL)
2046 ad242220 2018-09-08 stsp error = repo_error;
2048 b00d56cd 2018-04-01 stsp return error;
2051 404c43c4 2018-06-21 stsp __dead static void
2052 404c43c4 2018-06-21 stsp usage_blame(void)
2054 9270e621 2019-02-05 stsp fprintf(stderr,
2055 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2056 404c43c4 2018-06-21 stsp getprogname());
2060 404c43c4 2018-06-21 stsp static const struct got_error *
2061 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2063 404c43c4 2018-06-21 stsp const struct got_error *error;
2064 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2065 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2066 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2067 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2068 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2071 404c43c4 2018-06-21 stsp #ifndef PROFILE
2072 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2073 36e2fb66 2019-01-04 stsp NULL) == -1)
2074 404c43c4 2018-06-21 stsp err(1, "pledge");
2077 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2078 404c43c4 2018-06-21 stsp switch (ch) {
2080 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2083 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2084 66bea077 2018-08-02 stsp if (repo_path == NULL)
2085 66bea077 2018-08-02 stsp err(1, "-r option");
2086 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2089 2deda0b9 2019-03-07 stsp usage_blame();
2090 404c43c4 2018-06-21 stsp /* NOTREACHED */
2094 404c43c4 2018-06-21 stsp argc -= optind;
2095 404c43c4 2018-06-21 stsp argv += optind;
2097 a39318fd 2018-08-02 stsp if (argc == 1)
2098 404c43c4 2018-06-21 stsp path = argv[0];
2100 404c43c4 2018-06-21 stsp usage_blame();
2102 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2103 66bea077 2018-08-02 stsp if (cwd == NULL) {
2104 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2105 66bea077 2018-08-02 stsp goto done;
2107 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2108 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2109 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2110 66bea077 2018-08-02 stsp goto done;
2112 0c06baac 2019-02-05 stsp error = NULL;
2113 0c06baac 2019-02-05 stsp if (worktree) {
2114 0c06baac 2019-02-05 stsp repo_path =
2115 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2116 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2117 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2118 0c06baac 2019-02-05 stsp if (error)
2119 0c06baac 2019-02-05 stsp goto done;
2121 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2122 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2123 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2124 0c06baac 2019-02-05 stsp goto done;
2129 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2130 c02c541e 2019-03-29 stsp if (error != NULL)
2131 36e2fb66 2019-01-04 stsp goto done;
2133 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2134 c02c541e 2019-03-29 stsp if (error)
2135 404c43c4 2018-06-21 stsp goto done;
2137 0c06baac 2019-02-05 stsp if (worktree) {
2138 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2139 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2140 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2141 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2142 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2143 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2144 6efaaa2d 2019-02-05 stsp path) == -1) {
2145 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2146 0c06baac 2019-02-05 stsp goto done;
2148 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2151 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2153 0c06baac 2019-02-05 stsp if (error)
2154 66bea077 2018-08-02 stsp goto done;
2156 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2157 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2158 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2159 404c43c4 2018-06-21 stsp if (error != NULL)
2160 66bea077 2018-08-02 stsp goto done;
2161 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2162 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2163 404c43c4 2018-06-21 stsp if (error != NULL)
2164 66bea077 2018-08-02 stsp goto done;
2166 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2167 30837e32 2019-07-25 stsp if (error)
2168 66bea077 2018-08-02 stsp goto done;
2171 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
2173 66bea077 2018-08-02 stsp free(in_repo_path);
2174 66bea077 2018-08-02 stsp free(repo_path);
2175 66bea077 2018-08-02 stsp free(cwd);
2176 404c43c4 2018-06-21 stsp free(commit_id);
2177 0c06baac 2019-02-05 stsp if (worktree)
2178 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2179 ad242220 2018-09-08 stsp if (repo) {
2180 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2181 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2182 ad242220 2018-09-08 stsp if (error == NULL)
2183 ad242220 2018-09-08 stsp error = repo_error;
2185 404c43c4 2018-06-21 stsp return error;
2188 5de5890b 2018-10-18 stsp __dead static void
2189 5de5890b 2018-10-18 stsp usage_tree(void)
2191 c1669e2e 2019-01-09 stsp fprintf(stderr,
2192 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2193 5de5890b 2018-10-18 stsp getprogname());
2197 c1669e2e 2019-01-09 stsp static void
2198 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2199 c1669e2e 2019-01-09 stsp const char *root_path)
2201 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2203 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2204 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2207 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2208 d6e648b4 2019-02-10 stsp is_root_path ? "" : "/", te->name,
2209 d6e648b4 2019-02-10 stsp S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
2212 5de5890b 2018-10-18 stsp static const struct got_error *
2213 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2214 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2215 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2217 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2218 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2219 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2220 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2221 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2223 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2225 5de5890b 2018-10-18 stsp goto done;
2227 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2229 5de5890b 2018-10-18 stsp goto done;
2230 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2231 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2232 5de5890b 2018-10-18 stsp while (te) {
2233 5de5890b 2018-10-18 stsp char *id = NULL;
2235 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2238 5de5890b 2018-10-18 stsp if (show_ids) {
2239 5de5890b 2018-10-18 stsp char *id_str;
2240 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2242 5de5890b 2018-10-18 stsp goto done;
2243 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2244 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2245 5de5890b 2018-10-18 stsp free(id_str);
2246 5de5890b 2018-10-18 stsp goto done;
2248 5de5890b 2018-10-18 stsp free(id_str);
2250 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2253 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2254 c1669e2e 2019-01-09 stsp char *child_path;
2255 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2256 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2257 c1669e2e 2019-01-09 stsp te->name) == -1) {
2258 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2259 c1669e2e 2019-01-09 stsp goto done;
2261 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2262 c1669e2e 2019-01-09 stsp root_path, repo);
2263 c1669e2e 2019-01-09 stsp free(child_path);
2265 c1669e2e 2019-01-09 stsp goto done;
2268 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2272 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2273 5de5890b 2018-10-18 stsp free(tree_id);
2274 5de5890b 2018-10-18 stsp return err;
2277 5de5890b 2018-10-18 stsp static const struct got_error *
2278 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2280 5de5890b 2018-10-18 stsp const struct got_error *error;
2281 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2282 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2283 7a2c19d6 2019-02-05 stsp const char *path;
2284 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2285 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2286 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2287 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2290 5de5890b 2018-10-18 stsp #ifndef PROFILE
2291 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2292 0f8d269b 2019-01-04 stsp NULL) == -1)
2293 5de5890b 2018-10-18 stsp err(1, "pledge");
2296 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2297 5de5890b 2018-10-18 stsp switch (ch) {
2299 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2302 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2303 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2304 5de5890b 2018-10-18 stsp err(1, "-r option");
2305 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2308 5de5890b 2018-10-18 stsp show_ids = 1;
2311 c1669e2e 2019-01-09 stsp recurse = 1;
2314 2deda0b9 2019-03-07 stsp usage_tree();
2315 5de5890b 2018-10-18 stsp /* NOTREACHED */
2319 5de5890b 2018-10-18 stsp argc -= optind;
2320 5de5890b 2018-10-18 stsp argv += optind;
2322 5de5890b 2018-10-18 stsp if (argc == 1)
2323 5de5890b 2018-10-18 stsp path = argv[0];
2324 5de5890b 2018-10-18 stsp else if (argc > 1)
2325 5de5890b 2018-10-18 stsp usage_tree();
2327 7a2c19d6 2019-02-05 stsp path = NULL;
2329 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2330 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2331 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2332 9bf7a39b 2019-02-05 stsp goto done;
2334 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2335 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2336 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2337 7a2c19d6 2019-02-05 stsp goto done;
2339 7a2c19d6 2019-02-05 stsp error = NULL;
2340 7a2c19d6 2019-02-05 stsp if (worktree) {
2341 7a2c19d6 2019-02-05 stsp repo_path =
2342 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2343 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2344 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2345 7a2c19d6 2019-02-05 stsp if (error)
2346 7a2c19d6 2019-02-05 stsp goto done;
2348 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2349 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2350 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2351 7a2c19d6 2019-02-05 stsp goto done;
2356 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2357 5de5890b 2018-10-18 stsp if (error != NULL)
2358 c02c541e 2019-03-29 stsp goto done;
2360 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2361 c02c541e 2019-03-29 stsp if (error)
2362 5de5890b 2018-10-18 stsp goto done;
2364 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2365 9bf7a39b 2019-02-05 stsp if (worktree) {
2366 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2367 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2368 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2369 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2370 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2371 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2372 9bf7a39b 2019-02-05 stsp goto done;
2374 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2376 9bf7a39b 2019-02-05 stsp if (error)
2377 9bf7a39b 2019-02-05 stsp goto done;
2379 9bf7a39b 2019-02-05 stsp path = "/";
2381 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2382 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2383 9bf7a39b 2019-02-05 stsp if (error != NULL)
2384 9bf7a39b 2019-02-05 stsp goto done;
2387 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2388 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2389 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2390 5de5890b 2018-10-18 stsp if (error != NULL)
2391 5de5890b 2018-10-18 stsp goto done;
2392 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2393 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2394 5de5890b 2018-10-18 stsp if (error != NULL)
2395 5de5890b 2018-10-18 stsp goto done;
2397 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2398 30837e32 2019-07-25 stsp if (error)
2399 5de5890b 2018-10-18 stsp goto done;
2402 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2403 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2405 5de5890b 2018-10-18 stsp free(in_repo_path);
2406 5de5890b 2018-10-18 stsp free(repo_path);
2407 5de5890b 2018-10-18 stsp free(cwd);
2408 5de5890b 2018-10-18 stsp free(commit_id);
2409 7a2c19d6 2019-02-05 stsp if (worktree)
2410 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2411 5de5890b 2018-10-18 stsp if (repo) {
2412 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2413 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2414 5de5890b 2018-10-18 stsp if (error == NULL)
2415 5de5890b 2018-10-18 stsp error = repo_error;
2417 5de5890b 2018-10-18 stsp return error;
2420 6bad629b 2019-02-04 stsp __dead static void
2421 6bad629b 2019-02-04 stsp usage_status(void)
2423 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2427 b72f483a 2019-02-05 stsp static const struct got_error *
2428 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2429 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2430 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2432 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2433 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2434 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2435 b72f483a 2019-02-05 stsp return NULL;
2438 6bad629b 2019-02-04 stsp static const struct got_error *
2439 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2441 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2442 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2443 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2444 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2445 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2446 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2449 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2451 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2452 6bad629b 2019-02-04 stsp switch (ch) {
2454 2deda0b9 2019-03-07 stsp usage_status();
2455 6bad629b 2019-02-04 stsp /* NOTREACHED */
2459 6bad629b 2019-02-04 stsp argc -= optind;
2460 6bad629b 2019-02-04 stsp argv += optind;
2462 6bad629b 2019-02-04 stsp #ifndef PROFILE
2463 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2464 6bad629b 2019-02-04 stsp NULL) == -1)
2465 6bad629b 2019-02-04 stsp err(1, "pledge");
2467 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2468 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2469 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2470 927df6b7 2019-02-10 stsp goto done;
2473 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2474 927df6b7 2019-02-10 stsp if (error != NULL)
2475 a5edda0a 2019-07-27 stsp goto done;
2477 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2478 6bad629b 2019-02-04 stsp if (error != NULL)
2479 6bad629b 2019-02-04 stsp goto done;
2481 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2482 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2483 087fb88c 2019-08-04 stsp if (error)
2484 087fb88c 2019-08-04 stsp goto done;
2486 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2487 6bad629b 2019-02-04 stsp if (error)
2488 6bad629b 2019-02-04 stsp goto done;
2490 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2491 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2493 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2494 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2495 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2496 927df6b7 2019-02-10 stsp free(cwd);
2497 d0eebce4 2019-03-11 stsp return error;
2500 d0eebce4 2019-03-11 stsp __dead static void
2501 d0eebce4 2019-03-11 stsp usage_ref(void)
2503 d0eebce4 2019-03-11 stsp fprintf(stderr,
2504 d83d9d5c 2019-05-13 stsp "usage: %s ref [-r repository] -l | -d name | name target\n",
2505 d0eebce4 2019-03-11 stsp getprogname());
2509 d0eebce4 2019-03-11 stsp static const struct got_error *
2510 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2512 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2513 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2514 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2516 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2517 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2519 d0eebce4 2019-03-11 stsp return err;
2521 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2522 d0eebce4 2019-03-11 stsp char *refstr;
2523 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2524 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2525 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2526 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2527 d0eebce4 2019-03-11 stsp free(refstr);
2530 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2531 d0eebce4 2019-03-11 stsp return NULL;
2534 d0eebce4 2019-03-11 stsp static const struct got_error *
2535 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2537 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2538 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2540 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2542 d0eebce4 2019-03-11 stsp return err;
2544 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2545 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2546 d0eebce4 2019-03-11 stsp return err;
2549 d0eebce4 2019-03-11 stsp static const struct got_error *
2550 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2552 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2553 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2554 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2557 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2558 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2559 d1644381 2019-07-14 stsp * an unintended typo.
2561 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2562 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2564 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2566 d83d9d5c 2019-05-13 stsp if (err) {
2567 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2569 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2570 d83d9d5c 2019-05-13 stsp return err;
2571 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2573 d83d9d5c 2019-05-13 stsp return err;
2574 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2575 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2577 d83d9d5c 2019-05-13 stsp return err;
2580 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2582 d0eebce4 2019-03-11 stsp goto done;
2584 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2587 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2589 d0eebce4 2019-03-11 stsp return err;
2592 d0eebce4 2019-03-11 stsp static const struct got_error *
2593 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2595 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2596 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2597 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2598 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2599 d0eebce4 2019-03-11 stsp int ch, do_list = 0;
2600 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2602 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2603 d0eebce4 2019-03-11 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2604 d0eebce4 2019-03-11 stsp switch (ch) {
2606 d0eebce4 2019-03-11 stsp delref = optarg;
2609 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2610 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2611 d0eebce4 2019-03-11 stsp err(1, "-r option");
2612 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2615 d0eebce4 2019-03-11 stsp do_list = 1;
2618 d0eebce4 2019-03-11 stsp usage_ref();
2619 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2623 d0eebce4 2019-03-11 stsp if (do_list && delref)
2624 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2626 d0eebce4 2019-03-11 stsp argc -= optind;
2627 d0eebce4 2019-03-11 stsp argv += optind;
2629 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2630 d0eebce4 2019-03-11 stsp if (argc > 0)
2631 d0eebce4 2019-03-11 stsp usage_ref();
2632 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2633 d0eebce4 2019-03-11 stsp usage_ref();
2635 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2636 e0b57350 2019-03-12 stsp if (do_list) {
2637 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2638 e0b57350 2019-03-12 stsp NULL) == -1)
2639 e0b57350 2019-03-12 stsp err(1, "pledge");
2641 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2642 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2643 e0b57350 2019-03-12 stsp err(1, "pledge");
2646 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2647 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2648 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2649 d0eebce4 2019-03-11 stsp goto done;
2652 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2653 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2654 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2655 d0eebce4 2019-03-11 stsp goto done;
2657 d0eebce4 2019-03-11 stsp error = NULL;
2658 d0eebce4 2019-03-11 stsp if (worktree) {
2659 d0eebce4 2019-03-11 stsp repo_path =
2660 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2661 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2662 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2663 d0eebce4 2019-03-11 stsp if (error)
2664 d0eebce4 2019-03-11 stsp goto done;
2666 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2667 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2668 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2669 d0eebce4 2019-03-11 stsp goto done;
2674 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2675 d0eebce4 2019-03-11 stsp if (error != NULL)
2676 d0eebce4 2019-03-11 stsp goto done;
2678 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2679 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2680 c02c541e 2019-03-29 stsp if (error)
2681 c02c541e 2019-03-29 stsp goto done;
2683 d0eebce4 2019-03-11 stsp if (do_list)
2684 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2685 d0eebce4 2019-03-11 stsp else if (delref)
2686 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2688 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2691 4e759de4 2019-06-26 stsp got_repo_close(repo);
2692 4e759de4 2019-06-26 stsp if (worktree)
2693 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2694 4e759de4 2019-06-26 stsp free(cwd);
2695 4e759de4 2019-06-26 stsp free(repo_path);
2696 4e759de4 2019-06-26 stsp return error;
2699 4e759de4 2019-06-26 stsp __dead static void
2700 4e759de4 2019-06-26 stsp usage_branch(void)
2702 4e759de4 2019-06-26 stsp fprintf(stderr,
2703 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2704 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2708 4e759de4 2019-06-26 stsp static const struct got_error *
2709 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2711 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2712 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2713 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2715 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2717 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2719 4e759de4 2019-06-26 stsp return err;
2721 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2722 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2723 4e759de4 2019-06-26 stsp char *refstr;
2724 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2725 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2727 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2728 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2729 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2730 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2732 ba882ee3 2019-07-11 stsp return err;
2733 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2734 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2735 ba882ee3 2019-07-11 stsp marker = "* ";
2737 ba882ee3 2019-07-11 stsp marker = "~ ";
2740 4e759de4 2019-06-26 stsp refname += 11;
2741 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2742 4e759de4 2019-06-26 stsp if (refstr == NULL)
2743 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2744 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2745 4e759de4 2019-06-26 stsp free(refstr);
2748 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2749 4e759de4 2019-06-26 stsp return NULL;
2752 4e759de4 2019-06-26 stsp static const struct got_error *
2753 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2755 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2756 4e759de4 2019-06-26 stsp struct got_reference *ref;
2757 4e759de4 2019-06-26 stsp char *refname;
2759 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2760 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2762 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2764 4e759de4 2019-06-26 stsp goto done;
2766 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2767 4e759de4 2019-06-26 stsp got_ref_close(ref);
2769 4e759de4 2019-06-26 stsp free(refname);
2770 4e759de4 2019-06-26 stsp return err;
2773 4e759de4 2019-06-26 stsp static const struct got_error *
2774 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2775 4e759de4 2019-06-26 stsp const char *base_branch)
2777 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2778 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2779 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2780 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2781 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2784 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2785 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2786 d3f84d51 2019-07-11 stsp * an unintended typo.
2788 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2789 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2791 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2792 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2793 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2794 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2795 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2796 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2798 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2800 4e759de4 2019-06-26 stsp goto done;
2801 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2802 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2804 4e759de4 2019-06-26 stsp goto done;
2806 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2807 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2808 4e759de4 2019-06-26 stsp goto done;
2811 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2812 4e759de4 2019-06-26 stsp if (err == NULL) {
2813 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2814 4e759de4 2019-06-26 stsp goto done;
2815 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2816 4e759de4 2019-06-26 stsp goto done;
2818 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2820 4e759de4 2019-06-26 stsp goto done;
2822 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2825 4e759de4 2019-06-26 stsp got_ref_close(ref);
2827 4e759de4 2019-06-26 stsp free(base_refname);
2828 4e759de4 2019-06-26 stsp free(refname);
2829 4e759de4 2019-06-26 stsp return err;
2832 4e759de4 2019-06-26 stsp static const struct got_error *
2833 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2835 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2836 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2837 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2838 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2839 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2840 4e759de4 2019-06-26 stsp const char *delref = NULL;
2842 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2843 4e759de4 2019-06-26 stsp switch (ch) {
2845 4e759de4 2019-06-26 stsp delref = optarg;
2848 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2849 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2850 4e759de4 2019-06-26 stsp err(1, "-r option");
2851 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2854 4e759de4 2019-06-26 stsp do_list = 1;
2857 4e759de4 2019-06-26 stsp usage_branch();
2858 4e759de4 2019-06-26 stsp /* NOTREACHED */
2862 4e759de4 2019-06-26 stsp if (do_list && delref)
2863 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2865 4e759de4 2019-06-26 stsp argc -= optind;
2866 4e759de4 2019-06-26 stsp argv += optind;
2868 4e759de4 2019-06-26 stsp if (do_list || delref) {
2869 4e759de4 2019-06-26 stsp if (argc > 0)
2870 4e759de4 2019-06-26 stsp usage_branch();
2871 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2872 4e759de4 2019-06-26 stsp usage_branch();
2874 4e759de4 2019-06-26 stsp #ifndef PROFILE
2875 4e759de4 2019-06-26 stsp if (do_list) {
2876 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2877 4e759de4 2019-06-26 stsp NULL) == -1)
2878 4e759de4 2019-06-26 stsp err(1, "pledge");
2880 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2881 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2882 4e759de4 2019-06-26 stsp err(1, "pledge");
2885 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2886 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2887 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2888 4e759de4 2019-06-26 stsp goto done;
2891 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2892 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2893 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2894 4e759de4 2019-06-26 stsp goto done;
2896 4e759de4 2019-06-26 stsp error = NULL;
2897 4e759de4 2019-06-26 stsp if (worktree) {
2898 4e759de4 2019-06-26 stsp repo_path =
2899 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
2900 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2901 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2902 4e759de4 2019-06-26 stsp if (error)
2903 4e759de4 2019-06-26 stsp goto done;
2905 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
2906 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2907 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
2908 4e759de4 2019-06-26 stsp goto done;
2913 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
2914 4e759de4 2019-06-26 stsp if (error != NULL)
2915 4e759de4 2019-06-26 stsp goto done;
2917 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2918 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2919 4e759de4 2019-06-26 stsp if (error)
2920 4e759de4 2019-06-26 stsp goto done;
2922 4e759de4 2019-06-26 stsp if (do_list)
2923 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
2924 4e759de4 2019-06-26 stsp else if (delref)
2925 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
2927 4e759de4 2019-06-26 stsp const char *base_branch;
2928 4e759de4 2019-06-26 stsp if (argc == 1) {
2929 4e759de4 2019-06-26 stsp base_branch = worktree ?
2930 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
2931 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
2932 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
2933 dc5351b4 2019-07-30 stsp base_branch += 11;
2935 4e759de4 2019-06-26 stsp base_branch = argv[1];
2936 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
2940 d0eebce4 2019-03-11 stsp got_repo_close(repo);
2941 d0eebce4 2019-03-11 stsp if (worktree)
2942 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
2943 d0eebce4 2019-03-11 stsp free(cwd);
2944 d0eebce4 2019-03-11 stsp free(repo_path);
2945 d00136be 2019-03-26 stsp return error;
2948 d00136be 2019-03-26 stsp __dead static void
2949 d00136be 2019-03-26 stsp usage_add(void)
2951 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2955 d00136be 2019-03-26 stsp static const struct got_error *
2956 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
2958 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
2959 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
2960 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
2961 1dd54920 2019-05-11 stsp char *cwd = NULL;
2962 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
2963 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2966 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
2968 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2969 d00136be 2019-03-26 stsp switch (ch) {
2971 d00136be 2019-03-26 stsp usage_add();
2972 d00136be 2019-03-26 stsp /* NOTREACHED */
2976 d00136be 2019-03-26 stsp argc -= optind;
2977 d00136be 2019-03-26 stsp argv += optind;
2979 43012d58 2019-07-14 stsp #ifndef PROFILE
2980 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2981 43012d58 2019-07-14 stsp NULL) == -1)
2982 43012d58 2019-07-14 stsp err(1, "pledge");
2984 723c305c 2019-05-11 jcs if (argc < 1)
2985 d00136be 2019-03-26 stsp usage_add();
2987 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
2988 d00136be 2019-03-26 stsp if (cwd == NULL) {
2989 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2990 d00136be 2019-03-26 stsp goto done;
2993 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
2994 d00136be 2019-03-26 stsp if (error)
2995 d00136be 2019-03-26 stsp goto done;
2997 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2998 031a5338 2019-03-26 stsp if (error != NULL)
2999 031a5338 2019-03-26 stsp goto done;
3001 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3002 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3003 d00136be 2019-03-26 stsp if (error)
3004 d00136be 2019-03-26 stsp goto done;
3006 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3007 6d022e97 2019-08-04 stsp if (error)
3008 6d022e97 2019-08-04 stsp goto done;
3010 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
3011 1dd54920 2019-05-11 stsp NULL, repo);
3014 031a5338 2019-03-26 stsp got_repo_close(repo);
3015 d00136be 2019-03-26 stsp if (worktree)
3016 d00136be 2019-03-26 stsp got_worktree_close(worktree);
3017 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
3018 1dd54920 2019-05-11 stsp free((char *)pe->path);
3019 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
3020 2ec1f75b 2019-03-26 stsp free(cwd);
3021 2ec1f75b 2019-03-26 stsp return error;
3024 2ec1f75b 2019-03-26 stsp __dead static void
3025 648e4ef7 2019-07-09 stsp usage_remove(void)
3027 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3031 2ec1f75b 2019-03-26 stsp static const struct got_error *
3032 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
3034 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
3035 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
3036 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
3037 17ed4618 2019-06-02 stsp char *cwd = NULL;
3038 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
3039 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3040 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
3042 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
3044 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
3045 2ec1f75b 2019-03-26 stsp switch (ch) {
3047 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
3050 2ec1f75b 2019-03-26 stsp usage_add();
3051 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
3055 2ec1f75b 2019-03-26 stsp argc -= optind;
3056 2ec1f75b 2019-03-26 stsp argv += optind;
3058 43012d58 2019-07-14 stsp #ifndef PROFILE
3059 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3060 43012d58 2019-07-14 stsp NULL) == -1)
3061 43012d58 2019-07-14 stsp err(1, "pledge");
3063 17ed4618 2019-06-02 stsp if (argc < 1)
3064 648e4ef7 2019-07-09 stsp usage_remove();
3066 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
3067 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
3068 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3069 2ec1f75b 2019-03-26 stsp goto done;
3071 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3072 2ec1f75b 2019-03-26 stsp if (error)
3073 2ec1f75b 2019-03-26 stsp goto done;
3075 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3077 2ec1f75b 2019-03-26 stsp goto done;
3079 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3080 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3081 2ec1f75b 2019-03-26 stsp if (error)
3082 2ec1f75b 2019-03-26 stsp goto done;
3084 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3085 6d022e97 2019-08-04 stsp if (error)
3086 6d022e97 2019-08-04 stsp goto done;
3088 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
3089 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
3090 a129376b 2019-03-28 stsp if (error)
3091 a129376b 2019-03-28 stsp goto done;
3094 a129376b 2019-03-28 stsp got_repo_close(repo);
3095 a129376b 2019-03-28 stsp if (worktree)
3096 a129376b 2019-03-28 stsp got_worktree_close(worktree);
3097 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
3098 17ed4618 2019-06-02 stsp free((char *)pe->path);
3099 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
3100 a129376b 2019-03-28 stsp free(cwd);
3101 a129376b 2019-03-28 stsp return error;
3104 a129376b 2019-03-28 stsp __dead static void
3105 a129376b 2019-03-28 stsp usage_revert(void)
3107 0f6d7415 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-R] path ...\n", getprogname());
3111 1ee397ad 2019-07-12 stsp static const struct got_error *
3112 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
3114 a129376b 2019-03-28 stsp while (path[0] == '/')
3116 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
3117 1ee397ad 2019-07-12 stsp return NULL;
3120 a129376b 2019-03-28 stsp static const struct got_error *
3121 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
3123 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
3124 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
3125 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
3126 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
3127 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
3128 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
3129 0f6d7415 2019-08-08 stsp int ch, can_recurse = 0;
3131 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3133 0f6d7415 2019-08-08 stsp while ((ch = getopt(argc, argv, "R")) != -1) {
3134 a129376b 2019-03-28 stsp switch (ch) {
3136 0f6d7415 2019-08-08 stsp can_recurse = 1;
3139 a129376b 2019-03-28 stsp usage_revert();
3140 a129376b 2019-03-28 stsp /* NOTREACHED */
3144 a129376b 2019-03-28 stsp argc -= optind;
3145 a129376b 2019-03-28 stsp argv += optind;
3147 43012d58 2019-07-14 stsp #ifndef PROFILE
3148 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3149 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3150 43012d58 2019-07-14 stsp err(1, "pledge");
3152 e20a8b6f 2019-06-04 stsp if (argc < 1)
3153 a129376b 2019-03-28 stsp usage_revert();
3155 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3156 a129376b 2019-03-28 stsp if (cwd == NULL) {
3157 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3158 a129376b 2019-03-28 stsp goto done;
3160 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3161 2ec1f75b 2019-03-26 stsp if (error)
3162 2ec1f75b 2019-03-26 stsp goto done;
3164 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3165 a129376b 2019-03-28 stsp if (error != NULL)
3166 a129376b 2019-03-28 stsp goto done;
3168 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3169 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3170 a129376b 2019-03-28 stsp if (error)
3171 a129376b 2019-03-28 stsp goto done;
3173 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3174 6d022e97 2019-08-04 stsp if (error)
3175 6d022e97 2019-08-04 stsp goto done;
3177 0f6d7415 2019-08-08 stsp if (!can_recurse) {
3178 0f6d7415 2019-08-08 stsp char *ondisk_path;
3179 0f6d7415 2019-08-08 stsp struct stat sb;
3180 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
3181 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3182 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
3183 0f6d7415 2019-08-08 stsp pe->path) == -1) {
3184 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
3185 0f6d7415 2019-08-08 stsp goto done;
3187 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
3188 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
3189 0f6d7415 2019-08-08 stsp free(ondisk_path);
3192 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
3193 0f6d7415 2019-08-08 stsp ondisk_path);
3194 0f6d7415 2019-08-08 stsp free(ondisk_path);
3195 0f6d7415 2019-08-08 stsp goto done;
3197 0f6d7415 2019-08-08 stsp free(ondisk_path);
3198 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
3199 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3200 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
3201 0f6d7415 2019-08-08 stsp goto done;
3206 e20a8b6f 2019-06-04 stsp error = got_worktree_revert(worktree, &paths,
3207 a129376b 2019-03-28 stsp revert_progress, NULL, repo);
3208 a129376b 2019-03-28 stsp if (error)
3209 a129376b 2019-03-28 stsp goto done;
3212 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3213 2ec1f75b 2019-03-26 stsp if (worktree)
3214 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3215 2ec1f75b 2019-03-26 stsp free(path);
3216 d00136be 2019-03-26 stsp free(cwd);
3217 6bad629b 2019-02-04 stsp return error;
3220 c4296144 2019-05-09 stsp __dead static void
3221 c4296144 2019-05-09 stsp usage_commit(void)
3223 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
3224 5c1e53bc 2019-07-28 stsp getprogname());
3228 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3229 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3230 e2ba3d07 2019-05-13 stsp const char *editor;
3231 e0870e44 2019-05-13 stsp const char *worktree_path;
3232 76d98825 2019-06-03 stsp const char *branch_name;
3233 314a6357 2019-05-13 stsp const char *repo_path;
3234 e0870e44 2019-05-13 stsp char *logmsg_path;
3238 33ad4cbe 2019-05-12 jcs static const struct got_error *
3239 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3242 76d98825 2019-06-03 stsp char *initial_content = NULL;
3243 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3244 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3245 e0870e44 2019-05-13 stsp char *template = NULL;
3246 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3248 33ad4cbe 2019-05-12 jcs size_t len;
3250 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3251 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3252 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3253 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3254 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3255 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3256 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3257 33ad4cbe 2019-05-12 jcs return NULL;
3260 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3261 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3263 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3264 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3265 76d98825 2019-06-03 stsp a->branch_name) == -1)
3266 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3268 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3270 e0870e44 2019-05-13 stsp goto done;
3272 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3274 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3275 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3276 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3277 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3278 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3282 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3284 3ce1b845 2019-07-15 stsp unlink(a->logmsg_path);
3285 3ce1b845 2019-07-15 stsp free(a->logmsg_path);
3286 76d98825 2019-06-03 stsp free(initial_content);
3287 e0870e44 2019-05-13 stsp free(template);
3289 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3290 3ce1b845 2019-07-15 stsp if (err == NULL) {
3291 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
3292 3ce1b845 2019-07-15 stsp if (err) {
3293 3ce1b845 2019-07-15 stsp free(*logmsg);
3294 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3297 33ad4cbe 2019-05-12 jcs return err;
3300 c4296144 2019-05-09 stsp static const struct got_error *
3301 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3303 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3304 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3305 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3306 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
3307 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3308 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3309 35bd8fed 2019-05-09 stsp const char *got_author = getenv("GOT_AUTHOR");
3310 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3311 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3312 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
3313 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
3315 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
3317 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3318 c4296144 2019-05-09 stsp switch (ch) {
3320 c4296144 2019-05-09 stsp logmsg = optarg;
3323 c4296144 2019-05-09 stsp usage_commit();
3324 c4296144 2019-05-09 stsp /* NOTREACHED */
3328 c4296144 2019-05-09 stsp argc -= optind;
3329 c4296144 2019-05-09 stsp argv += optind;
3331 43012d58 2019-07-14 stsp #ifndef PROFILE
3332 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3333 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3334 43012d58 2019-07-14 stsp err(1, "pledge");
3336 35bd8fed 2019-05-09 stsp if (got_author == NULL) {
3337 35bd8fed 2019-05-09 stsp /* TODO: Look current user up in password database */
3338 35bd8fed 2019-05-09 stsp error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
3339 35bd8fed 2019-05-09 stsp goto done;
3342 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3343 c4296144 2019-05-09 stsp if (cwd == NULL) {
3344 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3345 c4296144 2019-05-09 stsp goto done;
3347 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3348 7d5807f4 2019-07-11 stsp if (error)
3349 7d5807f4 2019-07-11 stsp goto done;
3351 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3352 c4296144 2019-05-09 stsp if (error)
3353 a698f62e 2019-07-25 stsp goto done;
3354 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
3355 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
3356 c4296144 2019-05-09 stsp goto done;
3359 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
3360 916f288c 2019-07-30 stsp worktree);
3361 5c1e53bc 2019-07-28 stsp if (error)
3362 5c1e53bc 2019-07-28 stsp goto done;
3364 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3365 c4296144 2019-05-09 stsp if (error != NULL)
3366 c4296144 2019-05-09 stsp goto done;
3369 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3370 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3372 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3373 314a6357 2019-05-13 stsp error = get_editor(&editor);
3375 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3376 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3377 c4296144 2019-05-09 stsp if (error)
3378 c4296144 2019-05-09 stsp goto done;
3380 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3381 087fb88c 2019-08-04 stsp if (error)
3382 087fb88c 2019-08-04 stsp goto done;
3384 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3385 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3386 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3387 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3388 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
3389 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
3390 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
3391 916f288c 2019-07-30 stsp goto done;
3393 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
3395 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3396 e0870e44 2019-05-13 stsp cl_arg.logmsg_path = NULL;
3397 5c1e53bc 2019-07-28 stsp error = got_worktree_commit(&id, worktree, &paths, got_author, NULL,
3398 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3399 e0870e44 2019-05-13 stsp if (error) {
3400 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3401 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3402 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3403 c4296144 2019-05-09 stsp goto done;
3406 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3407 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3409 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3410 c4296144 2019-05-09 stsp if (error)
3411 c4296144 2019-05-09 stsp goto done;
3412 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3415 c4296144 2019-05-09 stsp got_repo_close(repo);
3416 c4296144 2019-05-09 stsp if (worktree)
3417 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3418 c4296144 2019-05-09 stsp free(cwd);
3419 c4296144 2019-05-09 stsp free(id_str);
3420 e2ba3d07 2019-05-13 stsp free(editor);
3421 234035bc 2019-06-01 stsp return error;
3424 234035bc 2019-06-01 stsp __dead static void
3425 234035bc 2019-06-01 stsp usage_cherrypick(void)
3427 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3431 234035bc 2019-06-01 stsp static const struct got_error *
3432 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3434 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3435 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3436 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3437 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3438 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3439 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3440 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3441 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3442 234035bc 2019-06-01 stsp int ch, did_something = 0;
3444 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3445 234035bc 2019-06-01 stsp switch (ch) {
3447 234035bc 2019-06-01 stsp usage_cherrypick();
3448 234035bc 2019-06-01 stsp /* NOTREACHED */
3452 234035bc 2019-06-01 stsp argc -= optind;
3453 234035bc 2019-06-01 stsp argv += optind;
3455 43012d58 2019-07-14 stsp #ifndef PROFILE
3456 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3457 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3458 43012d58 2019-07-14 stsp err(1, "pledge");
3460 234035bc 2019-06-01 stsp if (argc != 1)
3461 234035bc 2019-06-01 stsp usage_cherrypick();
3463 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3464 234035bc 2019-06-01 stsp if (cwd == NULL) {
3465 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3466 234035bc 2019-06-01 stsp goto done;
3468 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3469 234035bc 2019-06-01 stsp if (error)
3470 234035bc 2019-06-01 stsp goto done;
3472 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3473 234035bc 2019-06-01 stsp if (error != NULL)
3474 234035bc 2019-06-01 stsp goto done;
3476 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3477 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3478 234035bc 2019-06-01 stsp if (error)
3479 234035bc 2019-06-01 stsp goto done;
3481 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3482 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3483 234035bc 2019-06-01 stsp if (error != NULL) {
3484 234035bc 2019-06-01 stsp struct got_reference *ref;
3485 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3486 234035bc 2019-06-01 stsp goto done;
3487 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3488 234035bc 2019-06-01 stsp if (error != NULL)
3489 234035bc 2019-06-01 stsp goto done;
3490 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3491 234035bc 2019-06-01 stsp got_ref_close(ref);
3492 234035bc 2019-06-01 stsp if (error != NULL)
3493 234035bc 2019-06-01 stsp goto done;
3495 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3496 234035bc 2019-06-01 stsp if (error)
3497 234035bc 2019-06-01 stsp goto done;
3499 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3500 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3501 234035bc 2019-06-01 stsp if (error != NULL)
3502 234035bc 2019-06-01 stsp goto done;
3504 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3505 234035bc 2019-06-01 stsp if (error) {
3506 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3507 234035bc 2019-06-01 stsp goto done;
3508 234035bc 2019-06-01 stsp error = NULL;
3510 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3511 234035bc 2019-06-01 stsp goto done;
3514 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3515 234035bc 2019-06-01 stsp if (error)
3516 234035bc 2019-06-01 stsp goto done;
3517 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3518 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3519 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3521 234035bc 2019-06-01 stsp if (error != NULL)
3522 234035bc 2019-06-01 stsp goto done;
3524 234035bc 2019-06-01 stsp if (did_something)
3525 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3527 234035bc 2019-06-01 stsp if (commit)
3528 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3529 234035bc 2019-06-01 stsp free(commit_id_str);
3530 234035bc 2019-06-01 stsp if (head_ref)
3531 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3532 234035bc 2019-06-01 stsp if (worktree)
3533 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3535 234035bc 2019-06-01 stsp got_repo_close(repo);
3536 c4296144 2019-05-09 stsp return error;
3539 5ef14e63 2019-06-02 stsp __dead static void
3540 5ef14e63 2019-06-02 stsp usage_backout(void)
3542 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3546 5ef14e63 2019-06-02 stsp static const struct got_error *
3547 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3549 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3550 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3551 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3552 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3553 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3554 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3555 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3556 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3557 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3559 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3560 5ef14e63 2019-06-02 stsp switch (ch) {
3562 5ef14e63 2019-06-02 stsp usage_backout();
3563 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3567 5ef14e63 2019-06-02 stsp argc -= optind;
3568 5ef14e63 2019-06-02 stsp argv += optind;
3570 43012d58 2019-07-14 stsp #ifndef PROFILE
3571 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3572 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3573 43012d58 2019-07-14 stsp err(1, "pledge");
3575 5ef14e63 2019-06-02 stsp if (argc != 1)
3576 5ef14e63 2019-06-02 stsp usage_backout();
3578 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3579 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3580 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3581 5ef14e63 2019-06-02 stsp goto done;
3583 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3584 5ef14e63 2019-06-02 stsp if (error)
3585 5ef14e63 2019-06-02 stsp goto done;
3587 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3588 5ef14e63 2019-06-02 stsp if (error != NULL)
3589 5ef14e63 2019-06-02 stsp goto done;
3591 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3592 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3593 5ef14e63 2019-06-02 stsp if (error)
3594 5ef14e63 2019-06-02 stsp goto done;
3596 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3597 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3598 5ef14e63 2019-06-02 stsp if (error != NULL) {
3599 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3600 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3601 5ef14e63 2019-06-02 stsp goto done;
3602 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3603 5ef14e63 2019-06-02 stsp if (error != NULL)
3604 5ef14e63 2019-06-02 stsp goto done;
3605 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3606 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3607 5ef14e63 2019-06-02 stsp if (error != NULL)
3608 5ef14e63 2019-06-02 stsp goto done;
3610 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3611 5ef14e63 2019-06-02 stsp if (error)
3612 5ef14e63 2019-06-02 stsp goto done;
3614 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3615 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3616 5ef14e63 2019-06-02 stsp if (error != NULL)
3617 5ef14e63 2019-06-02 stsp goto done;
3619 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3620 5ef14e63 2019-06-02 stsp if (error)
3621 5ef14e63 2019-06-02 stsp goto done;
3623 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3624 5ef14e63 2019-06-02 stsp if (error)
3625 5ef14e63 2019-06-02 stsp goto done;
3626 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3627 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3628 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3629 5ef14e63 2019-06-02 stsp goto done;
3632 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3633 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3634 5ef14e63 2019-06-02 stsp if (error != NULL)
3635 5ef14e63 2019-06-02 stsp goto done;
3637 5ef14e63 2019-06-02 stsp if (did_something)
3638 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3640 5ef14e63 2019-06-02 stsp if (commit)
3641 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3642 5ef14e63 2019-06-02 stsp free(commit_id_str);
3643 5ef14e63 2019-06-02 stsp if (head_ref)
3644 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3645 818c7501 2019-07-11 stsp if (worktree)
3646 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3648 818c7501 2019-07-11 stsp got_repo_close(repo);
3649 818c7501 2019-07-11 stsp return error;
3652 818c7501 2019-07-11 stsp __dead static void
3653 818c7501 2019-07-11 stsp usage_rebase(void)
3655 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3656 af54c8f8 2019-07-11 stsp getprogname());
3661 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
3664 0ebf8283 2019-07-24 stsp size_t len;
3666 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
3667 0ebf8283 2019-07-24 stsp if (len > limit)
3668 0ebf8283 2019-07-24 stsp len = limit;
3669 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
3670 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
3672 0ebf8283 2019-07-24 stsp *nl = '\0';
3675 0ebf8283 2019-07-24 stsp static const struct got_error *
3676 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
3678 0ebf8283 2019-07-24 stsp const char *logmsg0 = NULL;
3680 0ebf8283 2019-07-24 stsp logmsg0 = got_object_commit_get_logmsg(commit);
3682 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)logmsg0[0]))
3683 0ebf8283 2019-07-24 stsp logmsg0++;
3685 0ebf8283 2019-07-24 stsp *logmsg = strdup(logmsg0);
3686 0ebf8283 2019-07-24 stsp if (*logmsg == NULL)
3687 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
3689 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
3690 0ebf8283 2019-07-24 stsp return NULL;
3693 818c7501 2019-07-11 stsp static const struct got_error *
3694 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3695 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3697 818c7501 2019-07-11 stsp const struct got_error *err;
3698 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
3700 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3702 818c7501 2019-07-11 stsp goto done;
3704 ff0d2220 2019-07-11 stsp if (new_id) {
3705 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3707 ff0d2220 2019-07-11 stsp goto done;
3710 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3711 ff0d2220 2019-07-11 stsp if (new_id_str)
3712 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3714 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
3716 0ebf8283 2019-07-24 stsp goto done;
3718 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3719 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3721 818c7501 2019-07-11 stsp free(old_id_str);
3722 818c7501 2019-07-11 stsp free(new_id_str);
3723 818c7501 2019-07-11 stsp return err;
3726 1ee397ad 2019-07-12 stsp static const struct got_error *
3727 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3729 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3731 818c7501 2019-07-11 stsp while (path[0] == '/')
3733 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3735 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3736 1ee397ad 2019-07-12 stsp return NULL;
3737 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3738 818c7501 2019-07-11 stsp *rebase_status = status;
3739 1ee397ad 2019-07-12 stsp return NULL;
3742 818c7501 2019-07-11 stsp static const struct got_error *
3743 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
3744 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
3745 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
3747 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3748 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
3749 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3752 818c7501 2019-07-11 stsp static const struct got_error *
3753 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
3754 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
3755 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
3756 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
3758 ff0d2220 2019-07-11 stsp const struct got_error *error;
3759 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
3760 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
3762 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3763 ff0d2220 2019-07-11 stsp if (error)
3764 ff0d2220 2019-07-11 stsp return error;
3766 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
3767 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
3768 ff0d2220 2019-07-11 stsp if (error) {
3769 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3770 ff0d2220 2019-07-11 stsp goto done;
3771 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
3773 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
3774 ff0d2220 2019-07-11 stsp free(new_commit_id);
3777 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
3778 ff0d2220 2019-07-11 stsp return error;
3781 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
3782 64c6d990 2019-07-11 stsp const char *path_prefix;
3783 64c6d990 2019-07-11 stsp size_t len;
3784 8ca9bd68 2019-07-25 stsp int errcode;
3787 64c6d990 2019-07-11 stsp static const struct got_error *
3788 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
3789 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3790 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
3791 64c6d990 2019-07-11 stsp struct got_repository *repo)
3793 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
3795 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3796 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3797 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
3799 64c6d990 2019-07-11 stsp return NULL;
3802 64c6d990 2019-07-11 stsp static const struct got_error *
3803 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
3804 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
3805 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
3807 64c6d990 2019-07-11 stsp const struct got_error *err;
3808 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3809 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
3810 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
3812 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
3813 64c6d990 2019-07-11 stsp return NULL;
3815 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3817 64c6d990 2019-07-11 stsp goto done;
3819 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
3821 64c6d990 2019-07-11 stsp goto done;
3823 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
3824 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
3826 64c6d990 2019-07-11 stsp goto done;
3828 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
3829 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
3831 64c6d990 2019-07-11 stsp goto done;
3833 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
3834 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
3835 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
3836 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
3837 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
3838 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3839 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
3841 64c6d990 2019-07-11 stsp if (tree1)
3842 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
3843 64c6d990 2019-07-11 stsp if (tree2)
3844 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
3845 64c6d990 2019-07-11 stsp if (commit)
3846 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
3847 64c6d990 2019-07-11 stsp if (parent_commit)
3848 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
3849 64c6d990 2019-07-11 stsp return err;
3852 ff0d2220 2019-07-11 stsp static const struct got_error *
3853 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
3854 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
3855 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
3856 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
3857 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
3859 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
3860 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
3861 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
3862 af61c510 2019-07-19 stsp struct got_object_qid *qid;
3863 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
3865 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
3867 af61c510 2019-07-19 stsp return err;
3869 af61c510 2019-07-19 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo);
3871 af61c510 2019-07-19 stsp goto done;
3872 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
3873 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
3874 af61c510 2019-07-19 stsp if (err) {
3875 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
3876 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
3877 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
3878 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
3879 af61c510 2019-07-19 stsp "been reached?!?");
3880 af61c510 2019-07-19 stsp goto done;
3881 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
3882 af61c510 2019-07-19 stsp goto done;
3883 af61c510 2019-07-19 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
3885 af61c510 2019-07-19 stsp goto done;
3887 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
3888 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
3890 af61c510 2019-07-19 stsp goto done;
3892 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
3894 af61c510 2019-07-19 stsp goto done;
3895 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
3896 af61c510 2019-07-19 stsp commit_id = parent_id;
3900 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
3901 af61c510 2019-07-19 stsp return err;
3904 af61c510 2019-07-19 stsp static const struct got_error *
3905 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
3907 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
3908 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
3909 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
3910 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
3911 818c7501 2019-07-11 stsp char *cwd = NULL;
3912 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
3913 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
3914 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
3915 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
3916 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
3917 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
3918 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
3919 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
3920 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
3921 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
3922 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
3923 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
3925 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
3926 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
3928 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
3929 818c7501 2019-07-11 stsp switch (ch) {
3931 818c7501 2019-07-11 stsp abort_rebase = 1;
3934 818c7501 2019-07-11 stsp continue_rebase = 1;
3937 818c7501 2019-07-11 stsp usage_rebase();
3938 818c7501 2019-07-11 stsp /* NOTREACHED */
3942 818c7501 2019-07-11 stsp argc -= optind;
3943 818c7501 2019-07-11 stsp argv += optind;
3945 43012d58 2019-07-14 stsp #ifndef PROFILE
3946 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3947 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3948 43012d58 2019-07-14 stsp err(1, "pledge");
3950 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
3951 818c7501 2019-07-11 stsp usage_rebase();
3952 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
3953 818c7501 2019-07-11 stsp if (argc != 0)
3954 818c7501 2019-07-11 stsp usage_rebase();
3955 818c7501 2019-07-11 stsp } else if (argc != 1)
3956 818c7501 2019-07-11 stsp usage_rebase();
3958 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
3959 818c7501 2019-07-11 stsp if (cwd == NULL) {
3960 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
3961 818c7501 2019-07-11 stsp goto done;
3963 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
3964 818c7501 2019-07-11 stsp if (error)
3965 818c7501 2019-07-11 stsp goto done;
3967 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3968 818c7501 2019-07-11 stsp if (error != NULL)
3969 818c7501 2019-07-11 stsp goto done;
3971 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3972 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3973 818c7501 2019-07-11 stsp if (error)
3974 818c7501 2019-07-11 stsp goto done;
3976 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3977 818c7501 2019-07-11 stsp if (error)
3978 818c7501 2019-07-11 stsp goto done;
3980 f6794adc 2019-07-23 stsp if (abort_rebase) {
3981 818c7501 2019-07-11 stsp int did_something;
3982 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
3983 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
3984 f6794adc 2019-07-23 stsp goto done;
3986 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
3987 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
3988 3e3a69f1 2019-07-25 stsp worktree, repo);
3989 818c7501 2019-07-11 stsp if (error)
3990 818c7501 2019-07-11 stsp goto done;
3991 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
3992 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
3993 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
3994 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
3995 818c7501 2019-07-11 stsp if (error)
3996 818c7501 2019-07-11 stsp goto done;
3997 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
3998 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
4001 818c7501 2019-07-11 stsp if (continue_rebase) {
4002 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4003 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4004 f6794adc 2019-07-23 stsp goto done;
4006 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4007 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4008 3e3a69f1 2019-07-25 stsp worktree, repo);
4009 818c7501 2019-07-11 stsp if (error)
4010 818c7501 2019-07-11 stsp goto done;
4012 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
4013 01757395 2019-07-12 stsp resume_commit_id, repo);
4014 818c7501 2019-07-11 stsp if (error)
4015 818c7501 2019-07-11 stsp goto done;
4017 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
4018 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
4019 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
4020 818c7501 2019-07-11 stsp goto done;
4023 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
4024 818c7501 2019-07-11 stsp if (error != NULL)
4025 818c7501 2019-07-11 stsp goto done;
4028 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
4029 ff0d2220 2019-07-11 stsp if (error)
4030 ff0d2220 2019-07-11 stsp goto done;
4032 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
4033 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
4035 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
4036 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
4037 a51a74b3 2019-07-27 stsp base_commit_id, branch_head_commit_id, repo);
4038 818c7501 2019-07-11 stsp if (error)
4039 818c7501 2019-07-11 stsp goto done;
4040 818c7501 2019-07-11 stsp if (yca_id == NULL) {
4041 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
4042 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
4043 818c7501 2019-07-11 stsp "with work tree's branch");
4044 818c7501 2019-07-11 stsp goto done;
4047 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
4048 a51a74b3 2019-07-27 stsp if (error) {
4049 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
4050 a51a74b3 2019-07-27 stsp goto done;
4051 a51a74b3 2019-07-27 stsp error = NULL;
4053 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
4054 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
4055 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
4056 a51a74b3 2019-07-27 stsp goto done;
4058 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
4059 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
4060 818c7501 2019-07-11 stsp if (error)
4061 818c7501 2019-07-11 stsp goto done;
4064 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
4065 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4066 818c7501 2019-07-11 stsp if (error)
4067 818c7501 2019-07-11 stsp goto done;
4069 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4070 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
4071 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
4072 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
4073 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
4074 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4075 818c7501 2019-07-11 stsp commit = NULL;
4076 818c7501 2019-07-11 stsp if (error)
4077 818c7501 2019-07-11 stsp goto done;
4079 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
4080 ff0d2220 2019-07-11 stsp if (continue_rebase)
4081 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
4082 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
4084 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
4085 818c7501 2019-07-11 stsp goto done;
4088 818c7501 2019-07-11 stsp pid = NULL;
4089 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
4090 818c7501 2019-07-11 stsp commit_id = qid->id;
4091 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
4092 818c7501 2019-07-11 stsp pid = qid;
4094 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
4095 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
4096 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
4097 818c7501 2019-07-11 stsp if (error)
4098 818c7501 2019-07-11 stsp goto done;
4100 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4101 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4105 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
4106 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
4107 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4108 818c7501 2019-07-11 stsp if (error)
4109 818c7501 2019-07-11 stsp goto done;
4112 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4113 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
4114 818c7501 2019-07-11 stsp if (error)
4115 818c7501 2019-07-11 stsp goto done;
4116 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
4117 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
4119 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
4120 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
4122 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
4123 818c7501 2019-07-11 stsp free(branch_head_commit_id);
4124 818c7501 2019-07-11 stsp free(resume_commit_id);
4125 818c7501 2019-07-11 stsp free(yca_id);
4126 818c7501 2019-07-11 stsp if (commit)
4127 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4128 818c7501 2019-07-11 stsp if (branch)
4129 818c7501 2019-07-11 stsp got_ref_close(branch);
4130 818c7501 2019-07-11 stsp if (new_base_branch)
4131 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
4132 818c7501 2019-07-11 stsp if (tmp_branch)
4133 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
4134 5ef14e63 2019-06-02 stsp if (worktree)
4135 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
4137 5ef14e63 2019-06-02 stsp got_repo_close(repo);
4138 5ef14e63 2019-06-02 stsp return error;
4141 0ebf8283 2019-07-24 stsp __dead static void
4142 0ebf8283 2019-07-24 stsp usage_histedit(void)
4144 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
4145 0ebf8283 2019-07-24 stsp getprogname());
4149 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
4150 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
4151 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
4152 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
4153 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
4155 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
4156 0ebf8283 2019-07-24 stsp unsigned char code;
4157 0ebf8283 2019-07-24 stsp const char *name;
4158 0ebf8283 2019-07-24 stsp const char *desc;
4159 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
4160 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
4161 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4162 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4163 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4164 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
4165 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
4168 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
4169 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
4170 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
4171 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4172 0ebf8283 2019-07-24 stsp char *logmsg;
4174 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4176 0ebf8283 2019-07-24 stsp static const struct got_error *
4177 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4178 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4180 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4181 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
4182 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4185 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4187 0ebf8283 2019-07-24 stsp goto done;
4189 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
4191 0ebf8283 2019-07-24 stsp goto done;
4193 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
4195 0ebf8283 2019-07-24 stsp goto done;
4197 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4198 0ebf8283 2019-07-24 stsp if (n < 0)
4199 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4201 0ebf8283 2019-07-24 stsp if (commit)
4202 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4203 0ebf8283 2019-07-24 stsp free(id_str);
4204 0ebf8283 2019-07-24 stsp free(logmsg);
4205 0ebf8283 2019-07-24 stsp return err;
4208 0ebf8283 2019-07-24 stsp static const struct got_error *
4209 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4210 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4212 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4213 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
4215 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
4216 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4218 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4219 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4225 0ebf8283 2019-07-24 stsp return err;
4228 0ebf8283 2019-07-24 stsp static const struct got_error *
4229 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
4231 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4234 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
4235 0ebf8283 2019-07-24 stsp if (n < 0)
4236 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4238 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4239 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4240 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
4241 0ebf8283 2019-07-24 stsp cmd->desc);
4242 0ebf8283 2019-07-24 stsp if (n < 0) {
4243 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4247 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
4248 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
4249 0ebf8283 2019-07-24 stsp if (n < 0)
4250 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4251 0ebf8283 2019-07-24 stsp return err;
4254 0ebf8283 2019-07-24 stsp static const struct got_error *
4255 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
4257 0ebf8283 2019-07-24 stsp static char msg[42];
4260 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4262 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
4263 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4265 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4268 0ebf8283 2019-07-24 stsp static const struct got_error *
4269 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4270 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
4272 0ebf8283 2019-07-24 stsp const struct got_error *err;
4273 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
4274 0ebf8283 2019-07-24 stsp char *id_str;
4276 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4278 0ebf8283 2019-07-24 stsp return err;
4280 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4282 0ebf8283 2019-07-24 stsp goto done;
4284 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4285 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4286 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(folded_commit)) == -1) {
4287 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4288 0ebf8283 2019-07-24 stsp goto done;
4291 0ebf8283 2019-07-24 stsp if (folded_commit)
4292 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
4293 0ebf8283 2019-07-24 stsp free(id_str);
4294 0ebf8283 2019-07-24 stsp return err;
4297 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
4298 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
4300 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
4302 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
4303 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4304 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
4305 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4306 3f9de99f 2019-07-24 stsp folded = prev;
4307 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
4310 0ebf8283 2019-07-24 stsp return folded;
4313 0ebf8283 2019-07-24 stsp static const struct got_error *
4314 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4315 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4317 0ebf8283 2019-07-24 stsp char *logmsg_path = NULL, *id_str = NULL;
4318 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4319 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4320 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4322 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
4324 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4326 0ebf8283 2019-07-24 stsp return err;
4328 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
4329 0ebf8283 2019-07-24 stsp if (folded) {
4330 0ebf8283 2019-07-24 stsp while (folded != hle) {
4331 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4332 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4335 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
4336 0ebf8283 2019-07-24 stsp logmsg, repo);
4338 0ebf8283 2019-07-24 stsp goto done;
4339 0ebf8283 2019-07-24 stsp free(logmsg);
4340 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4341 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4345 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4347 0ebf8283 2019-07-24 stsp goto done;
4348 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
4349 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
4350 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", id_str,
4351 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(commit)) == -1) {
4352 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4353 0ebf8283 2019-07-24 stsp goto done;
4355 0ebf8283 2019-07-24 stsp free(logmsg);
4356 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4358 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4360 0ebf8283 2019-07-24 stsp goto done;
4362 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4364 0ebf8283 2019-07-24 stsp goto done;
4366 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
4367 0ebf8283 2019-07-24 stsp close(fd);
4369 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4371 0ebf8283 2019-07-24 stsp goto done;
4373 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4374 0ebf8283 2019-07-24 stsp if (err) {
4375 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4376 0ebf8283 2019-07-24 stsp goto done;
4377 0ebf8283 2019-07-24 stsp err = NULL;
4378 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(got_object_commit_get_logmsg(commit));
4379 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL)
4380 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4383 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4384 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
4385 0ebf8283 2019-07-24 stsp free(logmsg_path);
4386 0ebf8283 2019-07-24 stsp free(logmsg);
4387 0ebf8283 2019-07-24 stsp free(editor);
4388 0ebf8283 2019-07-24 stsp if (commit)
4389 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4390 0ebf8283 2019-07-24 stsp return err;
4393 0ebf8283 2019-07-24 stsp static const struct got_error *
4394 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
4395 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4397 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4398 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
4399 0ebf8283 2019-07-24 stsp size_t size;
4400 0ebf8283 2019-07-24 stsp ssize_t len;
4401 0ebf8283 2019-07-24 stsp int lineno = 0, i;
4402 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4403 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4404 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
4406 0ebf8283 2019-07-24 stsp for (;;) {
4407 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
4408 0ebf8283 2019-07-24 stsp if (len == -1) {
4409 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
4410 0ebf8283 2019-07-24 stsp if (feof(f))
4412 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
4413 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
4418 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4420 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
4421 0ebf8283 2019-07-24 stsp free(line);
4422 0ebf8283 2019-07-24 stsp line = NULL;
4425 0ebf8283 2019-07-24 stsp cmd = NULL;
4426 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4427 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
4428 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4429 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
4430 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
4433 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4438 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
4439 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4442 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4444 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
4445 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
4446 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
4449 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
4450 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4454 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
4455 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
4456 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4460 0ebf8283 2019-07-24 stsp free(line);
4461 0ebf8283 2019-07-24 stsp line = NULL;
4465 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
4467 0ebf8283 2019-07-24 stsp *end = '\0';
4469 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
4470 0ebf8283 2019-07-24 stsp if (err) {
4471 0ebf8283 2019-07-24 stsp /* override error code */
4472 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4476 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
4477 0ebf8283 2019-07-24 stsp if (hle == NULL) {
4478 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
4481 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
4482 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
4483 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
4484 0ebf8283 2019-07-24 stsp commit_id = NULL;
4485 0ebf8283 2019-07-24 stsp free(line);
4486 0ebf8283 2019-07-24 stsp line = NULL;
4487 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4490 0ebf8283 2019-07-24 stsp free(line);
4491 0ebf8283 2019-07-24 stsp free(commit_id);
4492 0ebf8283 2019-07-24 stsp return err;
4495 0ebf8283 2019-07-24 stsp static const struct got_error *
4496 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
4497 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4499 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
4500 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
4501 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4502 bfce7f83 2019-07-27 stsp static char msg[80];
4503 bfce7f83 2019-07-27 stsp char *id_str;
4505 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
4506 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
4507 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
4509 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4510 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4511 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
4514 bfce7f83 2019-07-27 stsp if (hle == NULL) {
4515 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
4517 bfce7f83 2019-07-27 stsp return err;
4518 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
4519 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
4520 bfce7f83 2019-07-27 stsp free(id_str);
4521 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
4525 bfce7f83 2019-07-27 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD)
4526 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
4527 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
4529 bfce7f83 2019-07-27 stsp return NULL;
4532 bfce7f83 2019-07-27 stsp static const struct got_error *
4533 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
4534 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
4535 bfce7f83 2019-07-27 stsp struct got_repository *repo)
4537 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4538 0ebf8283 2019-07-24 stsp char *editor;
4539 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4541 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4543 0ebf8283 2019-07-24 stsp return err;
4545 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
4546 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
4547 0ebf8283 2019-07-24 stsp goto done;
4550 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4551 0ebf8283 2019-07-24 stsp if (f == NULL) {
4552 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
4553 0ebf8283 2019-07-24 stsp goto done;
4555 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4557 bfce7f83 2019-07-27 stsp goto done;
4559 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
4561 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4562 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4563 0ebf8283 2019-07-24 stsp free(editor);
4564 0ebf8283 2019-07-24 stsp return err;
4567 0ebf8283 2019-07-24 stsp static const struct got_error *
4568 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
4569 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
4571 0ebf8283 2019-07-24 stsp static const struct got_error *
4572 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
4573 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4575 0ebf8283 2019-07-24 stsp const struct got_error *err;
4576 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4577 0ebf8283 2019-07-24 stsp char *path = NULL;
4579 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
4581 0ebf8283 2019-07-24 stsp return err;
4583 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
4585 0ebf8283 2019-07-24 stsp goto done;
4587 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
4589 0ebf8283 2019-07-24 stsp goto done;
4591 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
4592 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4593 0ebf8283 2019-07-24 stsp goto done;
4597 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
4598 0ebf8283 2019-07-24 stsp if (err) {
4599 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4600 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4601 0ebf8283 2019-07-24 stsp goto done;
4602 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
4603 0ebf8283 2019-07-24 stsp commits, path, repo);
4606 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4607 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4608 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
4609 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
4610 0ebf8283 2019-07-24 stsp free(path);
4611 0ebf8283 2019-07-24 stsp return err;
4614 0ebf8283 2019-07-24 stsp static const struct got_error *
4615 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
4616 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4618 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4619 0ebf8283 2019-07-24 stsp char *path = NULL;
4620 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4621 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4622 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4624 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
4626 0ebf8283 2019-07-24 stsp return err;
4628 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
4629 0ebf8283 2019-07-24 stsp if (f == NULL) {
4630 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4631 0ebf8283 2019-07-24 stsp goto done;
4633 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4634 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
4639 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4640 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
4641 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
4642 0ebf8283 2019-07-24 stsp if (n < 0) {
4643 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4649 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4650 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4651 0ebf8283 2019-07-24 stsp free(path);
4652 0ebf8283 2019-07-24 stsp if (commit)
4653 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4654 0ebf8283 2019-07-24 stsp return err;
4658 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
4660 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4662 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
4663 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
4664 bfce7f83 2019-07-27 stsp free(hle);
4668 0ebf8283 2019-07-24 stsp static const struct got_error *
4669 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
4670 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4672 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4673 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4675 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4676 0ebf8283 2019-07-24 stsp if (f == NULL) {
4677 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4678 0ebf8283 2019-07-24 stsp goto done;
4681 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4683 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4684 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4685 0ebf8283 2019-07-24 stsp return err;
4688 0ebf8283 2019-07-24 stsp static const struct got_error *
4689 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
4690 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
4691 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4693 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
4694 0ebf8283 2019-07-24 stsp int resp = ' ';
4696 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
4697 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
4698 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
4699 0ebf8283 2019-07-24 stsp resp = getchar();
4700 a61a4414 2019-08-07 stsp if (resp == '\n')
4701 a61a4414 2019-08-07 stsp resp = getchar();
4702 426ebf2e 2019-07-25 stsp if (resp == 'c') {
4703 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
4704 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
4706 426ebf2e 2019-07-25 stsp if (err) {
4707 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4708 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4710 bfce7f83 2019-07-27 stsp prev_err = err;
4711 426ebf2e 2019-07-25 stsp resp = ' ';
4715 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
4716 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
4717 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
4718 0ebf8283 2019-07-24 stsp commits, repo);
4719 426ebf2e 2019-07-25 stsp if (err) {
4720 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4721 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4723 bfce7f83 2019-07-27 stsp prev_err = err;
4724 426ebf2e 2019-07-25 stsp resp = ' ';
4728 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
4729 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
4732 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
4735 0ebf8283 2019-07-24 stsp return err;
4738 0ebf8283 2019-07-24 stsp static const struct got_error *
4739 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
4740 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4741 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
4743 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
4744 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4745 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
4746 3e3a69f1 2019-07-25 stsp branch, repo);
4749 0ebf8283 2019-07-24 stsp static const struct got_error *
4750 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
4751 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
4753 0ebf8283 2019-07-24 stsp const struct got_error *err;
4754 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4756 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
4758 0ebf8283 2019-07-24 stsp goto done;
4760 0ebf8283 2019-07-24 stsp if (new_id) {
4761 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
4763 0ebf8283 2019-07-24 stsp goto done;
4766 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
4767 0ebf8283 2019-07-24 stsp if (new_id_str)
4768 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
4770 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4771 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
4772 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
4773 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4774 0ebf8283 2019-07-24 stsp goto done;
4776 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
4778 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4780 0ebf8283 2019-07-24 stsp goto done;
4783 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
4784 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
4785 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
4786 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
4787 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4789 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
4790 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
4791 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
4799 0ebf8283 2019-07-24 stsp free(old_id_str);
4800 0ebf8283 2019-07-24 stsp free(new_id_str);
4801 0ebf8283 2019-07-24 stsp return err;
4804 0ebf8283 2019-07-24 stsp static const struct got_error *
4805 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
4806 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4807 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
4808 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4810 0ebf8283 2019-07-24 stsp const struct got_error *err;
4811 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
4812 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
4814 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
4815 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
4816 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4818 0ebf8283 2019-07-24 stsp return err;
4821 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4823 0ebf8283 2019-07-24 stsp return err;
4825 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
4826 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
4827 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
4828 0ebf8283 2019-07-24 stsp if (err) {
4829 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
4830 0ebf8283 2019-07-24 stsp goto done;
4831 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
4833 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
4834 0ebf8283 2019-07-24 stsp free(new_commit_id);
4837 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4838 0ebf8283 2019-07-24 stsp return err;
4841 0ebf8283 2019-07-24 stsp static const struct got_error *
4842 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
4843 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4845 0ebf8283 2019-07-24 stsp const struct got_error *error;
4846 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
4848 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
4850 0ebf8283 2019-07-24 stsp if (error)
4851 0ebf8283 2019-07-24 stsp return error;
4853 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
4854 0ebf8283 2019-07-24 stsp if (error)
4855 0ebf8283 2019-07-24 stsp return error;
4857 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
4858 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4859 0ebf8283 2019-07-24 stsp return error;
4862 0ebf8283 2019-07-24 stsp static const struct got_error *
4863 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
4865 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
4866 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
4867 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
4868 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
4869 0ebf8283 2019-07-24 stsp char *cwd = NULL;
4870 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
4871 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
4872 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
4873 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
4874 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
4875 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4876 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
4877 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
4878 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
4879 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4880 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
4881 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
4882 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
4883 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
4884 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
4885 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4887 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
4888 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
4889 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
4891 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
4892 0ebf8283 2019-07-24 stsp switch (ch) {
4894 0ebf8283 2019-07-24 stsp abort_edit = 1;
4897 0ebf8283 2019-07-24 stsp continue_edit = 1;
4900 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
4903 0ebf8283 2019-07-24 stsp usage_histedit();
4904 0ebf8283 2019-07-24 stsp /* NOTREACHED */
4908 0ebf8283 2019-07-24 stsp argc -= optind;
4909 0ebf8283 2019-07-24 stsp argv += optind;
4911 0ebf8283 2019-07-24 stsp #ifndef PROFILE
4912 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4913 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
4914 0ebf8283 2019-07-24 stsp err(1, "pledge");
4916 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
4917 0ebf8283 2019-07-24 stsp usage_histedit();
4918 0ebf8283 2019-07-24 stsp if (argc != 0)
4919 0ebf8283 2019-07-24 stsp usage_histedit();
4922 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
4923 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
4924 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
4925 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
4926 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
4927 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
4930 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
4931 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
4932 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
4933 0ebf8283 2019-07-24 stsp goto done;
4935 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
4936 0ebf8283 2019-07-24 stsp if (error)
4937 0ebf8283 2019-07-24 stsp goto done;
4939 0ebf8283 2019-07-24 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4940 0ebf8283 2019-07-24 stsp if (error != NULL)
4941 0ebf8283 2019-07-24 stsp goto done;
4943 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4944 0ebf8283 2019-07-24 stsp if (error)
4945 0ebf8283 2019-07-24 stsp goto done;
4946 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
4947 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
4948 0ebf8283 2019-07-24 stsp goto done;
4951 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
4952 0ebf8283 2019-07-24 stsp if (error)
4953 0ebf8283 2019-07-24 stsp goto done;
4955 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
4956 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
4957 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
4958 3e3a69f1 2019-07-25 stsp worktree, repo);
4959 0ebf8283 2019-07-24 stsp if (error)
4960 0ebf8283 2019-07-24 stsp goto done;
4961 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
4962 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4963 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
4964 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
4965 0ebf8283 2019-07-24 stsp if (error)
4966 0ebf8283 2019-07-24 stsp goto done;
4967 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
4968 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
4969 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
4970 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
4971 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
4972 0ebf8283 2019-07-24 stsp goto done;
4975 0ebf8283 2019-07-24 stsp if (continue_edit) {
4976 0ebf8283 2019-07-24 stsp char *path;
4978 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
4979 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
4980 0ebf8283 2019-07-24 stsp goto done;
4983 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
4984 0ebf8283 2019-07-24 stsp if (error)
4985 0ebf8283 2019-07-24 stsp goto done;
4987 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
4988 0ebf8283 2019-07-24 stsp free(path);
4989 0ebf8283 2019-07-24 stsp if (error)
4990 0ebf8283 2019-07-24 stsp goto done;
4992 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
4993 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
4994 3e3a69f1 2019-07-25 stsp worktree, repo);
4995 0ebf8283 2019-07-24 stsp if (error)
4996 0ebf8283 2019-07-24 stsp goto done;
4998 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
4999 0ebf8283 2019-07-24 stsp if (error)
5000 0ebf8283 2019-07-24 stsp goto done;
5002 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5003 0ebf8283 2019-07-24 stsp head_commit_id);
5004 0ebf8283 2019-07-24 stsp if (error)
5005 0ebf8283 2019-07-24 stsp goto done;
5006 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5007 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5008 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5009 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5010 3aac7cf7 2019-07-25 stsp goto done;
5012 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5013 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
5014 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5015 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5016 0ebf8283 2019-07-24 stsp commit = NULL;
5017 0ebf8283 2019-07-24 stsp if (error)
5018 0ebf8283 2019-07-24 stsp goto done;
5020 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
5021 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5022 0ebf8283 2019-07-24 stsp goto done;
5025 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
5026 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
5027 0ebf8283 2019-07-24 stsp if (error != NULL)
5028 0ebf8283 2019-07-24 stsp goto done;
5030 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
5031 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
5032 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
5033 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
5034 c7d20a3f 2019-07-30 stsp goto done;
5037 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5038 bfce7f83 2019-07-27 stsp got_ref_close(branch);
5039 bfce7f83 2019-07-27 stsp branch = NULL;
5040 0ebf8283 2019-07-24 stsp if (error)
5041 0ebf8283 2019-07-24 stsp goto done;
5043 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5044 0ebf8283 2019-07-24 stsp head_commit_id);
5045 0ebf8283 2019-07-24 stsp if (error)
5046 0ebf8283 2019-07-24 stsp goto done;
5047 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5048 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5049 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5050 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5051 3aac7cf7 2019-07-25 stsp goto done;
5053 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5054 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
5055 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
5056 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5057 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5058 0ebf8283 2019-07-24 stsp commit = NULL;
5059 0ebf8283 2019-07-24 stsp if (error)
5060 0ebf8283 2019-07-24 stsp goto done;
5062 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5063 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
5064 bfce7f83 2019-07-27 stsp if (error)
5065 bfce7f83 2019-07-27 stsp goto done;
5067 0ebf8283 2019-07-24 stsp if (edit_script_path) {
5068 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
5069 0ebf8283 2019-07-24 stsp edit_script_path, repo);
5070 6ba2bea2 2019-07-27 stsp if (error) {
5071 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5072 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5073 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5074 0ebf8283 2019-07-24 stsp goto done;
5077 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
5079 6ba2bea2 2019-07-27 stsp if (error) {
5080 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5081 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5082 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5083 0ebf8283 2019-07-24 stsp goto done;
5088 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
5090 6ba2bea2 2019-07-27 stsp if (error) {
5091 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5092 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5093 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5094 0ebf8283 2019-07-24 stsp goto done;
5099 0ebf8283 2019-07-24 stsp error = histedit_check_script(&histedit_cmds, &commits, repo);
5100 0ebf8283 2019-07-24 stsp if (error)
5101 0ebf8283 2019-07-24 stsp goto done;
5103 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5104 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
5105 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
5106 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
5109 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
5110 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
5111 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
5112 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
5115 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
5116 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
5118 0ebf8283 2019-07-24 stsp if (error)
5119 0ebf8283 2019-07-24 stsp goto done;
5123 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
5124 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5125 0ebf8283 2019-07-24 stsp if (error)
5126 0ebf8283 2019-07-24 stsp goto done;
5130 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5131 0ebf8283 2019-07-24 stsp hle->commit_id);
5132 0ebf8283 2019-07-24 stsp if (error)
5133 0ebf8283 2019-07-24 stsp goto done;
5134 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5135 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5137 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
5138 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
5139 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5140 0ebf8283 2019-07-24 stsp if (error)
5141 0ebf8283 2019-07-24 stsp goto done;
5142 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5143 0ebf8283 2019-07-24 stsp commit = NULL;
5145 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5146 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5150 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5151 0ebf8283 2019-07-24 stsp char *id_str;
5152 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
5153 0ebf8283 2019-07-24 stsp if (error)
5154 0ebf8283 2019-07-24 stsp goto done;
5155 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
5157 0ebf8283 2019-07-24 stsp free(id_str);
5158 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5159 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
5160 3e3a69f1 2019-07-25 stsp fileindex);
5161 0ebf8283 2019-07-24 stsp goto done;
5164 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5165 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5166 0ebf8283 2019-07-24 stsp if (error)
5167 0ebf8283 2019-07-24 stsp goto done;
5171 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
5172 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
5173 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5174 0ebf8283 2019-07-24 stsp if (error)
5175 0ebf8283 2019-07-24 stsp goto done;
5178 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5179 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
5180 0ebf8283 2019-07-24 stsp if (error)
5181 0ebf8283 2019-07-24 stsp goto done;
5182 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5183 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
5185 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
5186 3e3a69f1 2019-07-25 stsp branch, repo);
5188 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
5189 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
5190 0ebf8283 2019-07-24 stsp free(head_commit_id);
5191 0ebf8283 2019-07-24 stsp free(base_commit_id);
5192 0ebf8283 2019-07-24 stsp free(resume_commit_id);
5193 0ebf8283 2019-07-24 stsp if (commit)
5194 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5195 0ebf8283 2019-07-24 stsp if (branch)
5196 0ebf8283 2019-07-24 stsp got_ref_close(branch);
5197 0ebf8283 2019-07-24 stsp if (tmp_branch)
5198 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
5199 0ebf8283 2019-07-24 stsp if (worktree)
5200 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
5202 715dc77e 2019-08-03 stsp got_repo_close(repo);
5203 715dc77e 2019-08-03 stsp return error;
5206 715dc77e 2019-08-03 stsp __dead static void
5207 715dc77e 2019-08-03 stsp usage_stage(void)
5209 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
5210 f3055044 2019-08-07 stsp "[file-path ...]\n",
5211 715dc77e 2019-08-03 stsp getprogname());
5215 715dc77e 2019-08-03 stsp static const struct got_error *
5216 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
5217 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5218 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
5220 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
5221 408b4ebc 2019-08-03 stsp char *id_str = NULL;
5223 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
5224 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
5225 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5226 408b4ebc 2019-08-03 stsp return NULL;
5228 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
5229 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
5230 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
5232 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
5234 408b4ebc 2019-08-03 stsp return err;
5236 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
5237 408b4ebc 2019-08-03 stsp free(id_str);
5238 408b4ebc 2019-08-03 stsp return NULL;
5241 408b4ebc 2019-08-03 stsp static const struct got_error *
5242 a7c9878d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5243 2e1f37b0 2019-08-08 stsp int nchanges, const char *action)
5245 dc424a06 2019-08-07 stsp char *line = NULL;
5246 dc424a06 2019-08-07 stsp size_t linesize = 0;
5247 dc424a06 2019-08-07 stsp ssize_t linelen;
5249 dc424a06 2019-08-07 stsp switch (status) {
5250 dc424a06 2019-08-07 stsp case GOT_STATUS_ADD:
5251 2e1f37b0 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
5253 dc424a06 2019-08-07 stsp case GOT_STATUS_DELETE:
5254 2e1f37b0 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
5256 dc424a06 2019-08-07 stsp case GOT_STATUS_MODIFY:
5257 dc424a06 2019-08-07 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
5258 dc424a06 2019-08-07 stsp return got_error_from_errno("fseek");
5259 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
5260 dc424a06 2019-08-07 stsp while ((linelen = getline(&line, &linesize, patch_file) != -1))
5261 dc424a06 2019-08-07 stsp printf("%s", line);
5262 dc424a06 2019-08-07 stsp if (ferror(patch_file))
5263 dc424a06 2019-08-07 stsp return got_error_from_errno("getline");
5264 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
5265 2e1f37b0 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5266 2e1f37b0 2019-08-08 stsp path, n, nchanges, action);
5269 dc424a06 2019-08-07 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
5272 dc424a06 2019-08-07 stsp return NULL;
5275 2e1f37b0 2019-08-08 stsp struct choose_patch_arg {
5276 2e1f37b0 2019-08-08 stsp FILE *patch_script_file;
5277 2e1f37b0 2019-08-08 stsp const char *action;
5280 dc424a06 2019-08-07 stsp static const struct got_error *
5281 dc424a06 2019-08-07 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5282 a7c9878d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
5284 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
5285 dc424a06 2019-08-07 stsp char *line = NULL;
5286 dc424a06 2019-08-07 stsp size_t linesize = 0;
5287 dc424a06 2019-08-07 stsp ssize_t linelen;
5288 dc424a06 2019-08-07 stsp int resp = ' ';
5289 2e1f37b0 2019-08-08 stsp struct choose_patch_arg *a = arg;
5291 dc424a06 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_NONE;
5293 2e1f37b0 2019-08-08 stsp if (a->patch_script_file) {
5295 2e1f37b0 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5296 2e1f37b0 2019-08-08 stsp a->action);
5298 eba70f38 2019-08-08 stsp return err;
5299 2e1f37b0 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
5300 dc424a06 2019-08-07 stsp if (linelen == -1) {
5301 2e1f37b0 2019-08-08 stsp if (ferror(a->patch_script_file))
5302 dc424a06 2019-08-07 stsp return got_error_from_errno("getline");
5303 dc424a06 2019-08-07 stsp return NULL;
5305 dc424a06 2019-08-07 stsp nl = strchr(line, '\n');
5307 dc424a06 2019-08-07 stsp *nl = '\0';
5308 dc424a06 2019-08-07 stsp if (strcmp(line, "y") == 0) {
5309 dc424a06 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_YES;
5310 dc424a06 2019-08-07 stsp printf("y\n");
5311 c8ede203 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
5312 dc424a06 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_NO;
5313 dc424a06 2019-08-07 stsp printf("n\n");
5314 c8ede203 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
5315 c8ede203 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
5316 b353a198 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_QUIT;
5317 b353a198 2019-08-07 stsp printf("q\n");
5319 c8ede203 2019-08-08 stsp printf("invalid response '%s'\n", line);
5320 dc424a06 2019-08-07 stsp free(line);
5321 dc424a06 2019-08-07 stsp return NULL;
5324 b353a198 2019-08-07 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
5325 2e1f37b0 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5326 2e1f37b0 2019-08-08 stsp a->action);
5328 dc424a06 2019-08-07 stsp return err;
5329 dc424a06 2019-08-07 stsp resp = getchar();
5330 dc424a06 2019-08-07 stsp if (resp == '\n')
5331 dc424a06 2019-08-07 stsp resp = getchar();
5332 c8ede203 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
5333 c8ede203 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
5334 c8ede203 2019-08-08 stsp printf("invalid response '%c'\n", resp);
5335 c8ede203 2019-08-08 stsp resp = ' ';
5337 c8ede203 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
5338 c8ede203 2019-08-08 stsp printf("invalid response '%c'\n", resp);
5339 c8ede203 2019-08-08 stsp resp = ' ';
5343 dc424a06 2019-08-07 stsp if (resp == 'y')
5344 dc424a06 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_YES;
5345 dc424a06 2019-08-07 stsp else if (resp == 'n')
5346 dc424a06 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_NO;
5347 c8ede203 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
5348 b353a198 2019-08-07 stsp *choice = GOT_PATCH_CHOICE_QUIT;
5350 dc424a06 2019-08-07 stsp return NULL;
5353 dc424a06 2019-08-07 stsp static const struct got_error *
5354 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
5356 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
5357 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
5358 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
5359 715dc77e 2019-08-03 stsp char *cwd = NULL;
5360 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
5361 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
5362 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
5363 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
5364 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5365 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5367 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
5369 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
5370 715dc77e 2019-08-03 stsp switch (ch) {
5372 408b4ebc 2019-08-03 stsp list_stage = 1;
5375 dc424a06 2019-08-07 stsp pflag = 1;
5378 dc424a06 2019-08-07 stsp patch_script_path = optarg;
5381 715dc77e 2019-08-03 stsp usage_stage();
5382 715dc77e 2019-08-03 stsp /* NOTREACHED */
5386 715dc77e 2019-08-03 stsp argc -= optind;
5387 715dc77e 2019-08-03 stsp argv += optind;
5389 715dc77e 2019-08-03 stsp #ifndef PROFILE
5390 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5391 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
5392 715dc77e 2019-08-03 stsp err(1, "pledge");
5394 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
5395 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
5396 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
5397 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
5399 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
5400 715dc77e 2019-08-03 stsp if (cwd == NULL) {
5401 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
5402 715dc77e 2019-08-03 stsp goto done;
5405 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5406 715dc77e 2019-08-03 stsp if (error)
5407 715dc77e 2019-08-03 stsp goto done;
5409 715dc77e 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5410 715dc77e 2019-08-03 stsp if (error != NULL)
5411 715dc77e 2019-08-03 stsp goto done;
5413 dc424a06 2019-08-07 stsp if (patch_script_path) {
5414 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
5415 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
5416 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
5417 dc424a06 2019-08-07 stsp patch_script_path);
5418 dc424a06 2019-08-07 stsp goto done;
5421 715dc77e 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5422 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
5423 715dc77e 2019-08-03 stsp if (error)
5424 715dc77e 2019-08-03 stsp goto done;
5426 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5427 6d022e97 2019-08-04 stsp if (error)
5428 6d022e97 2019-08-04 stsp goto done;
5430 6d022e97 2019-08-04 stsp if (list_stage)
5431 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
5432 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
5434 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5435 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
5436 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
5437 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
5438 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
5441 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5442 2e1f37b0 2019-08-08 stsp error == NULL)
5443 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5445 ad493afc 2019-08-03 stsp got_repo_close(repo);
5446 ad493afc 2019-08-03 stsp if (worktree)
5447 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
5448 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5449 ad493afc 2019-08-03 stsp free((char *)pe->path);
5450 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
5451 ad493afc 2019-08-03 stsp free(cwd);
5452 ad493afc 2019-08-03 stsp return error;
5455 ad493afc 2019-08-03 stsp __dead static void
5456 ad493afc 2019-08-03 stsp usage_unstage(void)
5458 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
5459 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
5460 ad493afc 2019-08-03 stsp getprogname());
5465 ad493afc 2019-08-03 stsp static const struct got_error *
5466 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
5468 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
5469 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
5470 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
5471 ad493afc 2019-08-03 stsp char *cwd = NULL;
5472 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
5473 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
5474 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
5475 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
5476 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5477 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5479 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
5481 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
5482 ad493afc 2019-08-03 stsp switch (ch) {
5484 2e1f37b0 2019-08-08 stsp pflag = 1;
5487 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
5490 ad493afc 2019-08-03 stsp usage_unstage();
5491 ad493afc 2019-08-03 stsp /* NOTREACHED */
5495 ad493afc 2019-08-03 stsp argc -= optind;
5496 ad493afc 2019-08-03 stsp argv += optind;
5498 ad493afc 2019-08-03 stsp #ifndef PROFILE
5499 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5500 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
5501 ad493afc 2019-08-03 stsp err(1, "pledge");
5503 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
5504 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
5506 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
5507 ad493afc 2019-08-03 stsp if (cwd == NULL) {
5508 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
5509 ad493afc 2019-08-03 stsp goto done;
5512 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5513 ad493afc 2019-08-03 stsp if (error)
5514 ad493afc 2019-08-03 stsp goto done;
5516 ad493afc 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5517 ad493afc 2019-08-03 stsp if (error != NULL)
5518 ad493afc 2019-08-03 stsp goto done;
5520 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
5521 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
5522 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
5523 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
5524 2e1f37b0 2019-08-08 stsp patch_script_path);
5525 2e1f37b0 2019-08-08 stsp goto done;
5529 ad493afc 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5530 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
5531 ad493afc 2019-08-03 stsp if (error)
5532 ad493afc 2019-08-03 stsp goto done;
5534 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5535 ad493afc 2019-08-03 stsp if (error)
5536 ad493afc 2019-08-03 stsp goto done;
5538 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5539 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
5540 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
5541 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
5543 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5544 2e1f37b0 2019-08-08 stsp error == NULL)
5545 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5547 0ebf8283 2019-07-24 stsp got_repo_close(repo);
5548 715dc77e 2019-08-03 stsp if (worktree)
5549 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
5550 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5551 715dc77e 2019-08-03 stsp free((char *)pe->path);
5552 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
5553 715dc77e 2019-08-03 stsp free(cwd);
5554 0ebf8283 2019-07-24 stsp return error;
