2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 c0768b0f 2018-06-10 stsp #include <sys/types.h>
20 5de5890b 2018-10-18 stsp #include <sys/stat.h>
21 3c45a30a 2019-05-12 jcs #include <sys/param.h>
22 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
24 5c860e29 2018-03-12 stsp #include <err.h>
25 5c860e29 2018-03-12 stsp #include <errno.h>
26 12ce7a6c 2019-08-12 stsp #include <limits.h>
27 5c860e29 2018-03-12 stsp #include <locale.h>
28 818c7501 2019-07-11 stsp #include <ctype.h>
29 99437157 2018-11-11 stsp #include <signal.h>
30 5c860e29 2018-03-12 stsp #include <stdio.h>
31 5c860e29 2018-03-12 stsp #include <stdlib.h>
32 5c860e29 2018-03-12 stsp #include <string.h>
33 5c860e29 2018-03-12 stsp #include <unistd.h>
34 c09a553d 2018-03-12 stsp #include <libgen.h>
35 c0768b0f 2018-06-10 stsp #include <time.h>
36 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 53ccebc2 2019-07-30 stsp #include "got_version.h"
39 f42b1b34 2018-03-12 stsp #include "got_error.h"
40 f42b1b34 2018-03-12 stsp #include "got_object.h"
41 5261c201 2018-04-01 stsp #include "got_reference.h"
42 f42b1b34 2018-03-12 stsp #include "got_repository.h"
43 1dd54920 2019-05-11 stsp #include "got_path.h"
44 c09a553d 2018-03-12 stsp #include "got_worktree.h"
45 79109fed 2018-03-27 stsp #include "got_diff.h"
46 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
47 404c43c4 2018-06-21 stsp #include "got_blame.h"
48 63219cd2 2019-01-04 stsp #include "got_privsep.h"
49 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
51 5c860e29 2018-03-12 stsp #ifndef nitems
52 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
55 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
56 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
59 99437157 2018-11-11 stsp catch_sigint(int signo)
61 99437157 2018-11-11 stsp sigint_received = 1;
65 99437157 2018-11-11 stsp catch_sigpipe(int signo)
67 99437157 2018-11-11 stsp sigpipe_received = 1;
71 8cfb4057 2019-07-09 stsp struct got_cmd {
72 5c860e29 2018-03-12 stsp const char *cmd_name;
73 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
74 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
75 97b3a7be 2019-07-09 stsp const char *cmd_alias;
78 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
79 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
80 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
82 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
83 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
84 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
85 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
86 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
87 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
88 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
89 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
90 d00136be 2019-03-26 stsp __dead static void usage_add(void);
91 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
92 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
93 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
94 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
95 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
96 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
97 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
98 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
99 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
101 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
102 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
103 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
104 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
105 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
106 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
107 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
108 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
110 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
111 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
112 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
113 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
114 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
115 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
116 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
117 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
118 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
119 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
120 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
121 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
123 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
124 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
125 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
126 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
127 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
128 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
129 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
130 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
131 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
132 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
133 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
134 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
135 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
136 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
137 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
138 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
139 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
140 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
141 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
142 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
143 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
144 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
147 ce5b7c56 2019-07-09 stsp static void
148 ce5b7c56 2019-07-09 stsp list_commands(void)
152 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
153 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
154 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
155 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
157 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
161 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
163 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
164 5c860e29 2018-03-12 stsp unsigned int i;
166 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
168 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
170 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
171 5c860e29 2018-03-12 stsp switch (ch) {
179 ce5b7c56 2019-07-09 stsp usage(hflag);
180 5c860e29 2018-03-12 stsp /* NOTREACHED */
184 5c860e29 2018-03-12 stsp argc -= optind;
185 5c860e29 2018-03-12 stsp argv += optind;
186 1e70621d 2018-03-27 stsp optind = 0;
188 53ccebc2 2019-07-30 stsp if (Vflag) {
189 53ccebc2 2019-07-30 stsp got_version_print_str();
193 5c860e29 2018-03-12 stsp if (argc <= 0)
194 ce5b7c56 2019-07-09 stsp usage(hflag);
196 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
197 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
199 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
200 d7d4f210 2018-03-12 stsp const struct got_error *error;
202 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
204 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
205 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
209 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
211 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
212 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
213 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
220 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
221 ce5b7c56 2019-07-09 stsp list_commands();
225 4ed7e80c 2018-05-20 stsp __dead static void
226 ce5b7c56 2019-07-09 stsp usage(int hflag)
228 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
229 53ccebc2 2019-07-30 stsp getprogname());
231 ce5b7c56 2019-07-09 stsp list_commands();
235 0266afb7 2019-01-04 stsp static const struct got_error *
236 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
238 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
239 e2ba3d07 2019-05-13 stsp const char *editor;
241 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
242 e2ba3d07 2019-05-13 stsp if (editor == NULL)
243 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
245 0ee7065d 2019-05-13 stsp if (editor) {
246 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
248 0ee7065d 2019-05-13 stsp return err;
251 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
252 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
253 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
254 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
257 e2ba3d07 2019-05-13 stsp return NULL;
260 e2ba3d07 2019-05-13 stsp static const struct got_error *
261 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
262 c530dc23 2019-07-23 stsp const char *worktree_path)
264 163ce85a 2019-05-13 stsp const struct got_error *err;
266 37c06ea4 2019-07-15 stsp #ifdef PROFILE
267 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
268 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
270 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
271 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
273 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
274 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
276 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
277 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
279 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
280 163ce85a 2019-05-13 stsp if (err != NULL)
281 163ce85a 2019-05-13 stsp return err;
283 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
284 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
286 0266afb7 2019-01-04 stsp return NULL;
289 2c7829a4 2019-06-17 stsp __dead static void
290 2c7829a4 2019-06-17 stsp usage_init(void)
292 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
296 2c7829a4 2019-06-17 stsp static const struct got_error *
297 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
299 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
300 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
303 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
304 2c7829a4 2019-06-17 stsp switch (ch) {
306 2c7829a4 2019-06-17 stsp usage_init();
307 2c7829a4 2019-06-17 stsp /* NOTREACHED */
311 2c7829a4 2019-06-17 stsp argc -= optind;
312 2c7829a4 2019-06-17 stsp argv += optind;
314 2c7829a4 2019-06-17 stsp #ifndef PROFILE
315 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
316 2c7829a4 2019-06-17 stsp err(1, "pledge");
318 2c7829a4 2019-06-17 stsp if (argc != 1)
319 bc20e173 2019-06-17 stsp usage_init();
321 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
322 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
323 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
325 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
327 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
328 2c7829a4 2019-06-17 stsp if (error &&
329 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
332 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
336 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
337 2c7829a4 2019-06-17 stsp if (error != NULL)
341 3ce1b845 2019-07-15 stsp free(repo_path);
342 3ce1b845 2019-07-15 stsp return error;
345 3ce1b845 2019-07-15 stsp __dead static void
346 3ce1b845 2019-07-15 stsp usage_import(void)
348 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
349 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
354 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
357 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
358 3ce1b845 2019-07-15 stsp int st = -1;
360 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
361 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
362 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
364 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
366 3ce1b845 2019-07-15 stsp goto doneediting;
368 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
369 3ce1b845 2019-07-15 stsp _exit(127);
372 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
373 3ce1b845 2019-07-15 stsp if (errno != EINTR)
376 3ce1b845 2019-07-15 stsp doneediting:
377 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
378 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
379 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
381 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
382 3ce1b845 2019-07-15 stsp errno = EINTR;
386 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
389 3ce1b845 2019-07-15 stsp static const struct got_error *
390 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
391 3ce1b845 2019-07-15 stsp const char *initial_content)
393 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
394 3ce1b845 2019-07-15 stsp char buf[1024];
395 3ce1b845 2019-07-15 stsp struct stat st, st2;
397 3ce1b845 2019-07-15 stsp int content_changed = 0;
398 3ce1b845 2019-07-15 stsp size_t len;
400 3ce1b845 2019-07-15 stsp *logmsg = NULL;
402 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
403 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
405 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
406 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
408 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
409 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
411 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
412 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
413 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
415 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
416 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
417 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
418 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
421 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
422 3ce1b845 2019-07-15 stsp if (fp == NULL) {
423 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
426 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
427 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
428 3ce1b845 2019-07-15 stsp content_changed = 1;
429 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
430 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
431 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
433 3ce1b845 2019-07-15 stsp fclose(fp);
435 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
436 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
440 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
441 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
442 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
445 3ce1b845 2019-07-15 stsp free(*logmsg);
446 3ce1b845 2019-07-15 stsp *logmsg = NULL;
448 3ce1b845 2019-07-15 stsp return err;
451 3ce1b845 2019-07-15 stsp static const struct got_error *
452 3ce1b845 2019-07-15 stsp collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
453 3ce1b845 2019-07-15 stsp const char *branch_name)
455 3ce1b845 2019-07-15 stsp char *initial_content = NULL, *logmsg_path = NULL;
456 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
459 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
460 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
461 3ce1b845 2019-07-15 stsp branch_name) == -1)
462 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
464 3ce1b845 2019-07-15 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
468 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
471 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
473 3ce1b845 2019-07-15 stsp free(initial_content);
474 3ce1b845 2019-07-15 stsp free(logmsg_path);
475 3ce1b845 2019-07-15 stsp return err;
478 3ce1b845 2019-07-15 stsp static const struct got_error *
479 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
481 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
482 3ce1b845 2019-07-15 stsp return NULL;
485 3ce1b845 2019-07-15 stsp static const struct got_error *
486 84792843 2019-08-09 stsp get_author(const char **author)
488 84792843 2019-08-09 stsp const char *got_author;
490 84792843 2019-08-09 stsp *author = NULL;
492 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
493 84792843 2019-08-09 stsp if (got_author == NULL) {
494 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
495 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
498 84792843 2019-08-09 stsp *author = got_author;
501 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
502 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
504 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
505 84792843 2019-08-09 stsp got_author++;
506 84792843 2019-08-09 stsp if (*got_author != '<')
507 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
508 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
509 84792843 2019-08-09 stsp got_author++;
510 84792843 2019-08-09 stsp if (*got_author != '@')
511 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
512 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
513 84792843 2019-08-09 stsp got_author++;
514 84792843 2019-08-09 stsp if (*got_author != '>')
515 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
517 84792843 2019-08-09 stsp return NULL;
520 84792843 2019-08-09 stsp static const struct got_error *
521 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
523 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
524 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
525 3ce1b845 2019-07-15 stsp char *editor = NULL;
526 84792843 2019-08-09 stsp const char *author;
527 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
528 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
529 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
530 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
531 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
533 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
534 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
536 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
538 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
539 3ce1b845 2019-07-15 stsp switch (ch) {
541 3ce1b845 2019-07-15 stsp branch_name = optarg;
544 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
545 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
546 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
551 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
552 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
553 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
558 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
560 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
566 3ce1b845 2019-07-15 stsp usage_init();
567 3ce1b845 2019-07-15 stsp /* NOTREACHED */
571 3ce1b845 2019-07-15 stsp argc -= optind;
572 3ce1b845 2019-07-15 stsp argv += optind;
574 3ce1b845 2019-07-15 stsp #ifndef PROFILE
575 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
576 3ce1b845 2019-07-15 stsp NULL) == -1)
577 3ce1b845 2019-07-15 stsp err(1, "pledge");
579 3ce1b845 2019-07-15 stsp if (argc != 1)
580 3ce1b845 2019-07-15 stsp usage_import();
582 84792843 2019-08-09 stsp error = get_author(&author);
584 84792843 2019-08-09 stsp return error;
586 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
587 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
588 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
589 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
591 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
592 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
596 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
597 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
601 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
602 3ce1b845 2019-07-15 stsp if (error) {
603 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
606 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
607 3ce1b845 2019-07-15 stsp "import target branch already exists");
611 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
612 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
613 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
616 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
619 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
620 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
622 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
623 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
626 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
631 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
632 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
634 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
638 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
639 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
643 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
647 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
651 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
655 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
656 3ce1b845 2019-07-15 stsp if (error) {
657 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
660 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
661 3ce1b845 2019-07-15 stsp branch_ref);
665 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
670 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
671 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
673 2c7829a4 2019-06-17 stsp free(repo_path);
674 3ce1b845 2019-07-15 stsp free(editor);
675 3ce1b845 2019-07-15 stsp free(refname);
676 3ce1b845 2019-07-15 stsp free(new_commit_id);
677 3ce1b845 2019-07-15 stsp free(id_str);
678 3ce1b845 2019-07-15 stsp if (branch_ref)
679 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
680 3ce1b845 2019-07-15 stsp if (head_ref)
681 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
682 2c7829a4 2019-06-17 stsp return error;
685 4ed7e80c 2018-05-20 stsp __dead static void
686 c09a553d 2018-03-12 stsp usage_checkout(void)
688 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
689 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
693 1ee397ad 2019-07-12 stsp static const struct got_error *
694 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
696 92a684f4 2018-03-12 stsp char *worktree_path = arg;
698 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
699 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
700 1ee397ad 2019-07-12 stsp return NULL;
702 92a684f4 2018-03-12 stsp while (path[0] == '/')
705 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
706 1ee397ad 2019-07-12 stsp return NULL;
709 99437157 2018-11-11 stsp static const struct got_error *
710 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
712 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
713 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
714 99437157 2018-11-11 stsp return NULL;
717 8069f636 2019-01-12 stsp static const struct got_error *
718 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
719 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
721 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
722 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
724 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
725 d5bea539 2019-05-13 stsp commit_id, base_commit_id, repo);
727 36a38700 2019-05-10 stsp return err;
729 d5bea539 2019-05-13 stsp if (yca_id == NULL)
730 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
733 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
734 d5bea539 2019-05-13 stsp * and the work tree's base commit.
736 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
738 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
746 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
747 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
748 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
750 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
751 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
752 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
754 d5bea539 2019-05-13 stsp free(yca_id);
755 d5bea539 2019-05-13 stsp return NULL;
758 a367ff0f 2019-05-14 stsp static const struct got_error *
759 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
760 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
761 a51a74b3 2019-07-27 stsp struct got_repository *repo)
763 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
764 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
765 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
766 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
768 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
772 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
773 a51a74b3 2019-07-27 stsp is_same_branch = 1;
776 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
777 a51a74b3 2019-07-27 stsp is_same_branch = 1;
781 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
785 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo);
790 a367ff0f 2019-05-14 stsp struct got_object_id *id;
791 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
793 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
794 a367ff0f 2019-05-14 stsp err = NULL;
796 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
798 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
805 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
807 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
808 a367ff0f 2019-05-14 stsp is_same_branch = 1;
815 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
816 a367ff0f 2019-05-14 stsp free(head_commit_id);
817 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
818 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
819 04f57cb3 2019-07-25 stsp return err;
822 04f57cb3 2019-07-25 stsp static const struct got_error *
823 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
824 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
826 04f57cb3 2019-07-25 stsp const struct got_error *err;
827 04f57cb3 2019-07-25 stsp struct got_reference *ref;
828 303e2782 2019-08-09 stsp struct got_tag_object *tag;
830 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
831 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
832 303e2782 2019-08-09 stsp if (err == NULL) {
833 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
834 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
835 303e2782 2019-08-09 stsp if (*commit_id == NULL)
836 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
837 303e2782 2019-08-09 stsp got_object_tag_close(tag);
838 303e2782 2019-08-09 stsp return err;
839 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
840 303e2782 2019-08-09 stsp return err;
842 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
843 04f57cb3 2019-07-25 stsp if (err == NULL) {
844 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
845 04f57cb3 2019-07-25 stsp got_ref_close(ref);
847 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
848 04f57cb3 2019-07-25 stsp return err;
849 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
850 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
852 a367ff0f 2019-05-14 stsp return err;
855 4ed7e80c 2018-05-20 stsp static const struct got_error *
856 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
858 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
859 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
860 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
861 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
862 c09a553d 2018-03-12 stsp char *repo_path = NULL;
863 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
864 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
865 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
866 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
867 72151b04 2019-05-11 stsp int ch, same_path_prefix;
868 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
870 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
872 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
873 0bb8a95e 2018-03-12 stsp switch (ch) {
875 08573d5b 2019-05-14 stsp branch_name = optarg;
878 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
879 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
880 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
883 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
886 2deda0b9 2019-03-07 stsp usage_checkout();
887 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
891 0bb8a95e 2018-03-12 stsp argc -= optind;
892 0bb8a95e 2018-03-12 stsp argv += optind;
894 6715a751 2018-03-16 stsp #ifndef PROFILE
895 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
896 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
897 c09a553d 2018-03-12 stsp err(1, "pledge");
899 0bb8a95e 2018-03-12 stsp if (argc == 1) {
900 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
901 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
902 76089277 2018-04-01 stsp if (repo_path == NULL)
903 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
904 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
905 76089277 2018-04-01 stsp if (cwd == NULL) {
906 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
909 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
910 230a42bd 2019-05-11 jcs base = basename(path_prefix);
911 230a42bd 2019-05-11 jcs if (base == NULL) {
912 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
913 230a42bd 2019-05-11 jcs path_prefix);
917 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
918 230a42bd 2019-05-11 jcs if (base == NULL) {
919 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
924 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
925 c09a553d 2018-03-12 stsp if (dotgit)
926 c09a553d 2018-03-12 stsp *dotgit = '\0';
927 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
928 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
933 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
934 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
935 76089277 2018-04-01 stsp if (repo_path == NULL) {
936 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
939 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
940 76089277 2018-04-01 stsp if (worktree_path == NULL) {
941 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
942 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
946 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
947 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
948 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
953 c09a553d 2018-03-12 stsp usage_checkout();
955 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
956 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
958 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
959 c09a553d 2018-03-12 stsp if (error != NULL)
962 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
963 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
964 c530dc23 2019-07-23 stsp if (error) {
965 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
966 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
968 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
969 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
970 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
975 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
979 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
980 c09a553d 2018-03-12 stsp if (error != NULL)
983 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
984 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
987 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
988 c09a553d 2018-03-12 stsp if (error != NULL)
991 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
992 e5dc7198 2018-12-29 stsp path_prefix);
993 e5dc7198 2018-12-29 stsp if (error != NULL)
995 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
996 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1000 8069f636 2019-01-12 stsp if (commit_id_str) {
1001 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1002 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1003 30837e32 2019-07-25 stsp if (error)
1004 8069f636 2019-01-12 stsp goto done;
1005 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1006 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1007 8069f636 2019-01-12 stsp if (error != NULL) {
1008 8069f636 2019-01-12 stsp free(commit_id);
1009 8069f636 2019-01-12 stsp goto done;
1011 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1012 45d344f6 2019-05-14 stsp if (error)
1013 45d344f6 2019-05-14 stsp goto done;
1014 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1015 8069f636 2019-01-12 stsp commit_id);
1016 8069f636 2019-01-12 stsp free(commit_id);
1017 8069f636 2019-01-12 stsp if (error)
1018 8069f636 2019-01-12 stsp goto done;
1021 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1022 f2ea84fa 2019-07-27 stsp if (error)
1023 f2ea84fa 2019-07-27 stsp goto done;
1024 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1025 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1026 c09a553d 2018-03-12 stsp if (error != NULL)
1027 c09a553d 2018-03-12 stsp goto done;
1029 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1032 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1033 8069f636 2019-01-12 stsp free(commit_id_str);
1034 76089277 2018-04-01 stsp free(repo_path);
1035 507dc3bb 2018-12-29 stsp free(worktree_path);
1036 507dc3bb 2018-12-29 stsp return error;
1039 507dc3bb 2018-12-29 stsp __dead static void
1040 507dc3bb 2018-12-29 stsp usage_update(void)
1042 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1043 507dc3bb 2018-12-29 stsp getprogname());
1047 1ee397ad 2019-07-12 stsp static const struct got_error *
1048 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1050 784955db 2019-01-12 stsp int *did_something = arg;
1052 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1053 1ee397ad 2019-07-12 stsp return NULL;
1055 1545c615 2019-02-10 stsp *did_something = 1;
1057 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1058 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1059 1ee397ad 2019-07-12 stsp return NULL;
1061 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1063 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1064 1ee397ad 2019-07-12 stsp return NULL;
1067 be7061eb 2018-12-30 stsp static const struct got_error *
1068 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1069 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1070 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1072 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1073 a1fb16d8 2019-05-24 stsp char *base_id_str;
1074 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1076 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1077 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1078 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1079 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1080 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1081 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1082 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1085 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1086 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1087 a1fb16d8 2019-05-24 stsp if (err) {
1088 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1089 a1fb16d8 2019-05-24 stsp return err;
1090 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1092 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1093 a1fb16d8 2019-05-24 stsp return NULL;
1095 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1096 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1097 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1099 a1fb16d8 2019-05-24 stsp return err;
1100 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1101 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1102 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1103 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1104 0ebf8283 2019-07-24 stsp return NULL;
1107 0ebf8283 2019-07-24 stsp static const struct got_error *
1108 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1110 0ebf8283 2019-07-24 stsp const struct got_error *err;
1111 0ebf8283 2019-07-24 stsp int in_progress;
1113 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1115 0ebf8283 2019-07-24 stsp return err;
1116 0ebf8283 2019-07-24 stsp if (in_progress)
1117 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1119 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1121 0ebf8283 2019-07-24 stsp return err;
1122 0ebf8283 2019-07-24 stsp if (in_progress)
1123 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1125 a1fb16d8 2019-05-24 stsp return NULL;
1128 a5edda0a 2019-07-27 stsp static const struct got_error *
1129 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1130 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1132 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1133 a5edda0a 2019-07-27 stsp char *path;
1136 a5edda0a 2019-07-27 stsp if (argc == 0) {
1137 a5edda0a 2019-07-27 stsp path = strdup("");
1138 a5edda0a 2019-07-27 stsp if (path == NULL)
1139 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1140 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1143 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1144 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1147 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1148 a5edda0a 2019-07-27 stsp if (err) {
1149 a5edda0a 2019-07-27 stsp free(path);
1154 a5edda0a 2019-07-27 stsp return err;
1157 a1fb16d8 2019-05-24 stsp static const struct got_error *
1158 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1160 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1161 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1162 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1163 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1164 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1165 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1166 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1167 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1168 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1169 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1170 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1172 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1174 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1175 507dc3bb 2018-12-29 stsp switch (ch) {
1177 024e9686 2019-05-14 stsp branch_name = optarg;
1180 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1181 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1182 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1185 2deda0b9 2019-03-07 stsp usage_update();
1186 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1190 507dc3bb 2018-12-29 stsp argc -= optind;
1191 507dc3bb 2018-12-29 stsp argv += optind;
1193 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1194 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1195 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1196 507dc3bb 2018-12-29 stsp err(1, "pledge");
1198 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1199 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1200 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1201 c4cdcb68 2019-04-03 stsp goto done;
1203 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1204 7d5807f4 2019-07-11 stsp if (error)
1205 7d5807f4 2019-07-11 stsp goto done;
1207 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1208 f2ea84fa 2019-07-27 stsp if (error)
1209 f2ea84fa 2019-07-27 stsp goto done;
1211 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1212 507dc3bb 2018-12-29 stsp if (error != NULL)
1213 507dc3bb 2018-12-29 stsp goto done;
1215 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1216 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1217 087fb88c 2019-08-04 stsp if (error)
1218 087fb88c 2019-08-04 stsp goto done;
1220 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1221 0266afb7 2019-01-04 stsp if (error)
1222 0266afb7 2019-01-04 stsp goto done;
1224 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1225 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1226 024e9686 2019-05-14 stsp if (error != NULL)
1227 024e9686 2019-05-14 stsp goto done;
1228 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1229 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1230 9c4b8182 2019-01-02 stsp if (error != NULL)
1231 9c4b8182 2019-01-02 stsp goto done;
1232 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1233 507dc3bb 2018-12-29 stsp if (error != NULL)
1234 507dc3bb 2018-12-29 stsp goto done;
1236 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1237 04f57cb3 2019-07-25 stsp free(commit_id_str);
1238 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1239 30837e32 2019-07-25 stsp if (error)
1240 a297e751 2019-07-11 stsp goto done;
1241 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1242 a297e751 2019-07-11 stsp if (error)
1243 507dc3bb 2018-12-29 stsp goto done;
1246 a1fb16d8 2019-05-24 stsp if (branch_name) {
1247 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1248 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1249 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1251 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1252 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1253 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1254 024e9686 2019-05-14 stsp goto done;
1256 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1257 024e9686 2019-05-14 stsp if (error)
1258 024e9686 2019-05-14 stsp goto done;
1259 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1260 a367ff0f 2019-05-14 stsp free(head_commit_id);
1261 024e9686 2019-05-14 stsp if (error != NULL)
1262 024e9686 2019-05-14 stsp goto done;
1263 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1264 a367ff0f 2019-05-14 stsp if (error)
1265 a367ff0f 2019-05-14 stsp goto done;
1266 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1267 024e9686 2019-05-14 stsp if (error)
1268 024e9686 2019-05-14 stsp goto done;
1270 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1271 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1272 a367ff0f 2019-05-14 stsp if (error != NULL) {
1273 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1274 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1275 024e9686 2019-05-14 stsp goto done;
1277 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1278 a367ff0f 2019-05-14 stsp if (error)
1279 a367ff0f 2019-05-14 stsp goto done;
1282 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1283 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1284 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1285 507dc3bb 2018-12-29 stsp commit_id);
1286 507dc3bb 2018-12-29 stsp if (error)
1287 507dc3bb 2018-12-29 stsp goto done;
1290 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1291 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1292 507dc3bb 2018-12-29 stsp if (error != NULL)
1293 507dc3bb 2018-12-29 stsp goto done;
1295 784955db 2019-01-12 stsp if (did_something)
1296 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1298 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1300 c09a553d 2018-03-12 stsp free(worktree_path);
1301 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1302 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1303 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1304 507dc3bb 2018-12-29 stsp free(commit_id);
1305 9c4b8182 2019-01-02 stsp free(commit_id_str);
1306 c09a553d 2018-03-12 stsp return error;
1309 f42b1b34 2018-03-12 stsp static const struct got_error *
1310 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1311 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1313 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1314 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1315 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1316 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1317 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1319 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1320 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1322 79109fed 2018-03-27 stsp return err;
1324 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1325 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1326 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1328 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1330 79109fed 2018-03-27 stsp return err;
1332 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1333 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1334 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1336 0f2b3dca 2018-12-22 stsp return err;
1338 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1340 79109fed 2018-03-27 stsp return err;
1343 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1345 0f2b3dca 2018-12-22 stsp goto done;
1347 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1348 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1349 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1350 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1351 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1353 79109fed 2018-03-27 stsp if (tree1)
1354 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1355 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1356 0f2b3dca 2018-12-22 stsp free(id_str1);
1357 0f2b3dca 2018-12-22 stsp free(id_str2);
1358 79109fed 2018-03-27 stsp return err;
1361 4bb494d5 2018-06-16 stsp static char *
1362 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1364 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
1365 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1367 6c281f94 2018-06-11 stsp *p = '\0';
1371 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1373 79109fed 2018-03-27 stsp static const struct got_error *
1374 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1375 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1376 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1378 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1379 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1380 6c281f94 2018-06-11 stsp char datebuf[26];
1381 45d799e2 2018-12-23 stsp time_t committer_time;
1382 45d799e2 2018-12-23 stsp const char *author, *committer;
1383 199a4027 2019-02-02 stsp char *refs_str = NULL;
1384 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1386 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1388 199a4027 2019-02-02 stsp const char *name;
1389 199a4027 2019-02-02 stsp if (got_object_id_cmp(re->id, id) != 0)
1391 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1392 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1394 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1395 199a4027 2019-02-02 stsp name += 5;
1396 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1398 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1399 e34f9ed6 2019-02-02 stsp name += 6;
1400 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1401 141c2bff 2019-02-04 stsp name += 8;
1402 199a4027 2019-02-02 stsp s = refs_str;
1403 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1404 199a4027 2019-02-02 stsp name) == -1) {
1405 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1411 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1413 8bf5b3c9 2018-03-17 stsp return err;
1415 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1416 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1417 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1418 832c249c 2018-06-10 stsp free(id_str);
1419 d3d493d7 2019-02-21 stsp id_str = NULL;
1420 d3d493d7 2019-02-21 stsp free(refs_str);
1421 d3d493d7 2019-02-21 stsp refs_str = NULL;
1422 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1423 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1424 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1425 dab5fe87 2018-09-14 stsp printf("date: %s UTC\n", datestr);
1426 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1427 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1428 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1429 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1430 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1431 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1432 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1433 3fe1abad 2018-06-10 stsp int n = 1;
1434 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1435 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1436 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1438 a0603db2 2018-06-10 stsp return err;
1439 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1440 a0603db2 2018-06-10 stsp free(id_str);
1444 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1445 621015ac 2018-07-23 stsp if (logmsg0 == NULL)
1446 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1448 621015ac 2018-07-23 stsp logmsg = logmsg0;
1450 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1452 832c249c 2018-06-10 stsp printf(" %s\n", line);
1453 832c249c 2018-06-10 stsp } while (line);
1454 621015ac 2018-07-23 stsp free(logmsg0);
1456 971751ac 2018-03-27 stsp if (show_patch) {
1457 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1458 971751ac 2018-03-27 stsp if (err == 0)
1459 971751ac 2018-03-27 stsp printf("\n");
1462 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1463 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1464 07862c20 2018-09-15 stsp return err;
1467 f42b1b34 2018-03-12 stsp static const struct got_error *
1468 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1469 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1470 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1472 f42b1b34 2018-03-12 stsp const struct got_error *err;
1473 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1475 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1476 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1478 f42b1b34 2018-03-12 stsp return err;
1479 31cedeaf 2018-09-15 stsp err = got_commit_graph_iter_start(graph, root_id, repo);
1481 fcc85cad 2018-07-22 stsp goto done;
1483 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1484 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1486 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1489 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1490 372ccdbb 2018-06-10 stsp if (err) {
1491 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1492 9ba79e04 2018-06-11 stsp err = NULL;
1495 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1497 31cedeaf 2018-09-15 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
1503 b43fbaa0 2018-06-11 stsp if (id == NULL)
1506 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1509 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1511 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1512 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1516 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1517 f42b1b34 2018-03-12 stsp return err;
1520 4ed7e80c 2018-05-20 stsp __dead static void
1521 6f3d1eb0 2018-03-12 stsp usage_log(void)
1523 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1524 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1528 4ed7e80c 2018-05-20 stsp static const struct got_error *
1529 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1531 f42b1b34 2018-03-12 stsp const struct got_error *error;
1532 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1533 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1534 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1535 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1536 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1537 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1538 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1539 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1540 64a96a6d 2018-04-01 stsp const char *errstr;
1541 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1543 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1545 6715a751 2018-03-16 stsp #ifndef PROFILE
1546 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1549 f42b1b34 2018-03-12 stsp err(1, "pledge");
1552 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1553 79109fed 2018-03-27 stsp switch (ch) {
1555 79109fed 2018-03-27 stsp show_patch = 1;
1558 d142fc45 2018-04-01 stsp start_commit = optarg;
1561 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1563 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1564 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1567 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
1568 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1569 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1572 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1575 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1576 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1577 04ca23f4 2018-07-16 stsp err(1, "-r option");
1578 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1581 2deda0b9 2019-03-07 stsp usage_log();
1582 79109fed 2018-03-27 stsp /* NOTREACHED */
1586 79109fed 2018-03-27 stsp argc -= optind;
1587 79109fed 2018-03-27 stsp argv += optind;
1589 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1590 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1591 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1592 04ca23f4 2018-07-16 stsp goto done;
1595 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1596 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1597 cffc0aa4 2019-02-05 stsp goto done;
1598 cffc0aa4 2019-02-05 stsp error = NULL;
1600 e7301579 2019-03-18 stsp if (argc == 0) {
1601 cbd1af7a 2019-03-18 stsp path = strdup("");
1602 e7301579 2019-03-18 stsp if (path == NULL) {
1603 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1604 cbd1af7a 2019-03-18 stsp goto done;
1606 e7301579 2019-03-18 stsp } else if (argc == 1) {
1607 e7301579 2019-03-18 stsp if (worktree) {
1608 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1610 e7301579 2019-03-18 stsp if (error)
1611 e7301579 2019-03-18 stsp goto done;
1613 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1614 e7301579 2019-03-18 stsp if (path == NULL) {
1615 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1616 e7301579 2019-03-18 stsp goto done;
1620 cbd1af7a 2019-03-18 stsp usage_log();
1622 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1623 5486daa2 2019-05-11 stsp repo_path = worktree ?
1624 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1626 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1627 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1628 cffc0aa4 2019-02-05 stsp goto done;
1631 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1632 d7d4f210 2018-03-12 stsp if (error != NULL)
1633 04ca23f4 2018-07-16 stsp goto done;
1635 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1636 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1637 c02c541e 2019-03-29 stsp if (error)
1638 c02c541e 2019-03-29 stsp goto done;
1640 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1641 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1642 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1643 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1644 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1645 3235492e 2018-04-01 stsp if (error != NULL)
1646 3235492e 2018-04-01 stsp return error;
1647 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1648 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1649 3235492e 2018-04-01 stsp if (error != NULL)
1650 3235492e 2018-04-01 stsp return error;
1651 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1653 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1654 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1655 3235492e 2018-04-01 stsp if (error == NULL) {
1656 1caad61b 2019-02-01 stsp int obj_type;
1657 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1658 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1659 d1f2edc9 2018-06-13 stsp if (error != NULL)
1660 1caad61b 2019-02-01 stsp goto done;
1661 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1662 1caad61b 2019-02-01 stsp if (error != NULL)
1663 1caad61b 2019-02-01 stsp goto done;
1664 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1665 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1666 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1667 1caad61b 2019-02-01 stsp if (error != NULL)
1668 1caad61b 2019-02-01 stsp goto done;
1669 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1670 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1671 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1672 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1673 1caad61b 2019-02-01 stsp goto done;
1676 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1677 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1678 1caad61b 2019-02-01 stsp if (id == NULL)
1679 638f9024 2019-05-13 stsp error = got_error_from_errno(
1680 230a42bd 2019-05-11 jcs "got_object_id_dup");
1681 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1682 1caad61b 2019-02-01 stsp if (error)
1683 1caad61b 2019-02-01 stsp goto done;
1684 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1685 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1686 1caad61b 2019-02-01 stsp goto done;
1688 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1689 d1f2edc9 2018-06-13 stsp if (error != NULL)
1690 1caad61b 2019-02-01 stsp goto done;
1692 15a94983 2018-12-23 stsp if (commit == NULL) {
1693 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1694 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1695 d1f2edc9 2018-06-13 stsp if (error != NULL)
1696 d1f2edc9 2018-06-13 stsp return error;
1699 d7d4f210 2018-03-12 stsp if (error != NULL)
1700 04ca23f4 2018-07-16 stsp goto done;
1702 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1703 04ca23f4 2018-07-16 stsp if (error != NULL)
1704 04ca23f4 2018-07-16 stsp goto done;
1705 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1706 04ca23f4 2018-07-16 stsp free(path);
1707 04ca23f4 2018-07-16 stsp path = in_repo_path;
1710 199a4027 2019-02-02 stsp error = got_ref_list(&refs, repo);
1711 199a4027 2019-02-02 stsp if (error)
1712 199a4027 2019-02-02 stsp goto done;
1714 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1715 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1717 04ca23f4 2018-07-16 stsp free(path);
1718 04ca23f4 2018-07-16 stsp free(repo_path);
1719 04ca23f4 2018-07-16 stsp free(cwd);
1721 cffc0aa4 2019-02-05 stsp if (worktree)
1722 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1723 ad242220 2018-09-08 stsp if (repo) {
1724 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1725 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1726 ad242220 2018-09-08 stsp if (error == NULL)
1727 ad242220 2018-09-08 stsp error = repo_error;
1729 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1730 8bf5b3c9 2018-03-17 stsp return error;
1733 4ed7e80c 2018-05-20 stsp __dead static void
1734 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1736 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1737 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1741 b72f483a 2019-02-05 stsp struct print_diff_arg {
1742 b72f483a 2019-02-05 stsp struct got_repository *repo;
1743 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1744 b72f483a 2019-02-05 stsp int diff_context;
1745 3fc0c068 2019-02-10 stsp const char *id_str;
1746 3fc0c068 2019-02-10 stsp int header_shown;
1747 98eaaa12 2019-08-03 stsp int diff_staged;
1750 4ed7e80c 2018-05-20 stsp static const struct got_error *
1751 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1752 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1753 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1755 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1756 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1757 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1758 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1759 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1760 b72f483a 2019-02-05 stsp struct stat sb;
1762 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1763 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1764 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1765 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1766 98eaaa12 2019-08-03 stsp return NULL;
1768 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1769 98eaaa12 2019-08-03 stsp return NULL;
1770 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1771 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1772 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1773 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1774 98eaaa12 2019-08-03 stsp return NULL;
1777 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1778 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1779 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1780 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1781 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1784 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1785 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1786 98eaaa12 2019-08-03 stsp switch (staged_status) {
1787 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1788 98eaaa12 2019-08-03 stsp label1 = path;
1789 98eaaa12 2019-08-03 stsp label2 = path;
1791 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1792 98eaaa12 2019-08-03 stsp label2 = path;
1794 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
1795 98eaaa12 2019-08-03 stsp label1 = path;
1798 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
1800 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1801 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
1804 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
1805 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
1806 4ce46740 2019-08-08 stsp char *id_str;
1807 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1810 4ce46740 2019-08-08 stsp goto done;
1811 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
1813 4ce46740 2019-08-08 stsp goto done;
1814 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1815 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
1816 4ce46740 2019-08-08 stsp free(id_str);
1817 4ce46740 2019-08-08 stsp goto done;
1819 4ce46740 2019-08-08 stsp free(id_str);
1820 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
1821 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1823 4ce46740 2019-08-08 stsp goto done;
1826 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1827 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1828 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1829 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1830 2ec1f75b 2019-03-26 stsp goto done;
1833 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1834 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1835 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1836 2ec1f75b 2019-03-26 stsp goto done;
1838 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1839 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1840 2ec1f75b 2019-03-26 stsp goto done;
1843 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1845 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1846 4ce46740 2019-08-08 stsp a->diff_context, stdout);
1848 b72f483a 2019-02-05 stsp if (blob1)
1849 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1850 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1851 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1852 b72f483a 2019-02-05 stsp free(abspath);
1853 927df6b7 2019-02-10 stsp return err;
1856 927df6b7 2019-02-10 stsp static const struct got_error *
1857 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
1858 0adb7196 2019-08-11 stsp const char *id_str, int obj_type, struct got_repository *repo)
1860 0adb7196 2019-08-11 stsp const struct got_error *err;
1861 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
1862 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
1864 0adb7196 2019-08-11 stsp *id = NULL;
1865 0adb7196 2019-08-11 stsp *label = NULL;
1867 d24820bf 2019-08-11 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY, repo);
1868 d24820bf 2019-08-11 stsp if (err == NULL) {
1869 d24820bf 2019-08-11 stsp *id = got_object_id_dup(got_object_tag_get_object_id(tag));
1870 d24820bf 2019-08-11 stsp if (*id == NULL)
1871 d24820bf 2019-08-11 stsp err = got_error_from_errno("got_object_id_dup");
1872 d24820bf 2019-08-11 stsp if (asprintf(label, "refs/tags/%s",
1873 1b7a69d3 2019-08-11 stsp got_object_tag_get_name(tag)) == -1)
1874 d24820bf 2019-08-11 stsp err = got_error_from_errno("asprintf");
1875 d24820bf 2019-08-11 stsp got_object_tag_close(tag);
1876 d24820bf 2019-08-11 stsp return err;
1877 d24820bf 2019-08-11 stsp } else if (err->code != GOT_ERR_NO_OBJ)
1878 d24820bf 2019-08-11 stsp return err;
1880 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
1881 0adb7196 2019-08-11 stsp if (err) {
1882 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1883 0adb7196 2019-08-11 stsp return err;
1884 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
1885 0adb7196 2019-08-11 stsp if (err != NULL)
1886 0adb7196 2019-08-11 stsp goto done;
1887 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
1888 0adb7196 2019-08-11 stsp if (*label == NULL) {
1889 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
1890 0adb7196 2019-08-11 stsp goto done;
1892 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
1894 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
1895 0adb7196 2019-08-11 stsp if (*label == NULL) {
1896 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
1897 0adb7196 2019-08-11 stsp goto done;
1902 0adb7196 2019-08-11 stsp got_ref_close(ref);
1903 0adb7196 2019-08-11 stsp return err;
1907 0adb7196 2019-08-11 stsp static const struct got_error *
1908 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1910 b00d56cd 2018-04-01 stsp const struct got_error *error;
1911 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1912 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1913 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1914 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1915 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1916 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1917 15a94983 2018-12-23 stsp int type1, type2;
1918 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
1919 c0cc5c62 2018-10-18 stsp const char *errstr;
1920 927df6b7 2019-02-10 stsp char *path = NULL;
1922 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1923 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1924 25eccc22 2019-01-04 stsp NULL) == -1)
1925 b00d56cd 2018-04-01 stsp err(1, "pledge");
1928 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1929 b00d56cd 2018-04-01 stsp switch (ch) {
1931 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1932 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1933 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1936 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
1937 b72f483a 2019-02-05 stsp if (repo_path == NULL)
1938 b72f483a 2019-02-05 stsp err(1, "-r option");
1939 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1942 98eaaa12 2019-08-03 stsp diff_staged = 1;
1945 2deda0b9 2019-03-07 stsp usage_diff();
1946 b00d56cd 2018-04-01 stsp /* NOTREACHED */
1950 b00d56cd 2018-04-01 stsp argc -= optind;
1951 b00d56cd 2018-04-01 stsp argv += optind;
1953 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
1954 b72f483a 2019-02-05 stsp if (cwd == NULL) {
1955 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1956 b72f483a 2019-02-05 stsp goto done;
1958 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
1959 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1960 927df6b7 2019-02-10 stsp goto done;
1961 927df6b7 2019-02-10 stsp if (argc <= 1) {
1962 927df6b7 2019-02-10 stsp if (worktree == NULL) {
1963 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
1964 927df6b7 2019-02-10 stsp goto done;
1966 b72f483a 2019-02-05 stsp if (repo_path)
1968 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
1969 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
1970 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
1971 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1972 927df6b7 2019-02-10 stsp goto done;
1974 927df6b7 2019-02-10 stsp if (argc == 1) {
1975 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1977 927df6b7 2019-02-10 stsp if (error)
1978 927df6b7 2019-02-10 stsp goto done;
1980 927df6b7 2019-02-10 stsp path = strdup("");
1981 927df6b7 2019-02-10 stsp if (path == NULL) {
1982 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1983 927df6b7 2019-02-10 stsp goto done;
1986 b72f483a 2019-02-05 stsp } else if (argc == 2) {
1987 98eaaa12 2019-08-03 stsp if (diff_staged)
1988 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
1989 98eaaa12 2019-08-03 stsp "objects in repository");
1990 15a94983 2018-12-23 stsp id_str1 = argv[0];
1991 15a94983 2018-12-23 stsp id_str2 = argv[1];
1992 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
1993 30db809c 2019-06-05 stsp repo_path =
1994 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
1995 30db809c 2019-06-05 stsp if (repo_path == NULL) {
1996 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
1997 30db809c 2019-06-05 stsp goto done;
2001 b00d56cd 2018-04-01 stsp usage_diff();
2003 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2004 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2005 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2006 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2009 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
2010 76089277 2018-04-01 stsp free(repo_path);
2011 b00d56cd 2018-04-01 stsp if (error != NULL)
2012 b00d56cd 2018-04-01 stsp goto done;
2014 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2015 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2016 c02c541e 2019-03-29 stsp if (error)
2017 c02c541e 2019-03-29 stsp goto done;
2019 30db809c 2019-06-05 stsp if (argc <= 1) {
2020 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2021 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2022 b72f483a 2019-02-05 stsp char *id_str;
2024 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2026 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2027 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2028 b72f483a 2019-02-05 stsp if (error)
2029 b72f483a 2019-02-05 stsp goto done;
2030 b72f483a 2019-02-05 stsp arg.repo = repo;
2031 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2032 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2033 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2034 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2035 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2037 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2038 72ea6654 2019-07-27 stsp if (error)
2039 72ea6654 2019-07-27 stsp goto done;
2041 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2042 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2043 b72f483a 2019-02-05 stsp free(id_str);
2044 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2045 b72f483a 2019-02-05 stsp goto done;
2048 0adb7196 2019-08-11 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, repo);
2049 0adb7196 2019-08-11 stsp if (error)
2050 0adb7196 2019-08-11 stsp goto done;
2052 0adb7196 2019-08-11 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, repo);
2053 0adb7196 2019-08-11 stsp if (error)
2054 0adb7196 2019-08-11 stsp goto done;
2056 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2057 15a94983 2018-12-23 stsp if (error)
2058 15a94983 2018-12-23 stsp goto done;
2060 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2061 15a94983 2018-12-23 stsp if (error)
2062 15a94983 2018-12-23 stsp goto done;
2064 15a94983 2018-12-23 stsp if (type1 != type2) {
2065 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2066 b00d56cd 2018-04-01 stsp goto done;
2069 15a94983 2018-12-23 stsp switch (type1) {
2070 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2071 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2072 54156555 2018-12-24 stsp diff_context, repo, stdout);
2074 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2075 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2076 54156555 2018-12-24 stsp diff_context, repo, stdout);
2078 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2079 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2080 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2081 c0cc5c62 2018-10-18 stsp repo, stdout);
2084 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2088 5e70831e 2019-05-28 stsp free(label1);
2089 5e70831e 2019-05-28 stsp free(label2);
2090 15a94983 2018-12-23 stsp free(id1);
2091 15a94983 2018-12-23 stsp free(id2);
2092 927df6b7 2019-02-10 stsp free(path);
2093 b72f483a 2019-02-05 stsp if (worktree)
2094 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2095 ad242220 2018-09-08 stsp if (repo) {
2096 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2097 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2098 ad242220 2018-09-08 stsp if (error == NULL)
2099 ad242220 2018-09-08 stsp error = repo_error;
2101 b00d56cd 2018-04-01 stsp return error;
2104 404c43c4 2018-06-21 stsp __dead static void
2105 404c43c4 2018-06-21 stsp usage_blame(void)
2107 9270e621 2019-02-05 stsp fprintf(stderr,
2108 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2109 404c43c4 2018-06-21 stsp getprogname());
2113 404c43c4 2018-06-21 stsp static const struct got_error *
2114 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2116 404c43c4 2018-06-21 stsp const struct got_error *error;
2117 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2118 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2119 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2120 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2121 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2124 404c43c4 2018-06-21 stsp #ifndef PROFILE
2125 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2126 36e2fb66 2019-01-04 stsp NULL) == -1)
2127 404c43c4 2018-06-21 stsp err(1, "pledge");
2130 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2131 404c43c4 2018-06-21 stsp switch (ch) {
2133 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2136 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2137 66bea077 2018-08-02 stsp if (repo_path == NULL)
2138 66bea077 2018-08-02 stsp err(1, "-r option");
2139 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2142 2deda0b9 2019-03-07 stsp usage_blame();
2143 404c43c4 2018-06-21 stsp /* NOTREACHED */
2147 404c43c4 2018-06-21 stsp argc -= optind;
2148 404c43c4 2018-06-21 stsp argv += optind;
2150 a39318fd 2018-08-02 stsp if (argc == 1)
2151 404c43c4 2018-06-21 stsp path = argv[0];
2153 404c43c4 2018-06-21 stsp usage_blame();
2155 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2156 66bea077 2018-08-02 stsp if (cwd == NULL) {
2157 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2158 66bea077 2018-08-02 stsp goto done;
2160 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2161 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2162 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2163 66bea077 2018-08-02 stsp goto done;
2165 0c06baac 2019-02-05 stsp error = NULL;
2166 0c06baac 2019-02-05 stsp if (worktree) {
2167 0c06baac 2019-02-05 stsp repo_path =
2168 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2169 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2170 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2171 0c06baac 2019-02-05 stsp if (error)
2172 0c06baac 2019-02-05 stsp goto done;
2174 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2175 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2176 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2177 0c06baac 2019-02-05 stsp goto done;
2182 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2183 c02c541e 2019-03-29 stsp if (error != NULL)
2184 36e2fb66 2019-01-04 stsp goto done;
2186 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2187 c02c541e 2019-03-29 stsp if (error)
2188 404c43c4 2018-06-21 stsp goto done;
2190 0c06baac 2019-02-05 stsp if (worktree) {
2191 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2192 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2193 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2194 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2195 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2196 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2197 6efaaa2d 2019-02-05 stsp path) == -1) {
2198 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2199 0c06baac 2019-02-05 stsp goto done;
2201 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2204 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2206 0c06baac 2019-02-05 stsp if (error)
2207 66bea077 2018-08-02 stsp goto done;
2209 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2210 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2211 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2212 404c43c4 2018-06-21 stsp if (error != NULL)
2213 66bea077 2018-08-02 stsp goto done;
2214 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2215 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2216 404c43c4 2018-06-21 stsp if (error != NULL)
2217 66bea077 2018-08-02 stsp goto done;
2219 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2220 30837e32 2019-07-25 stsp if (error)
2221 66bea077 2018-08-02 stsp goto done;
2224 66bea077 2018-08-02 stsp error = got_blame(in_repo_path, commit_id, repo, stdout);
2226 66bea077 2018-08-02 stsp free(in_repo_path);
2227 66bea077 2018-08-02 stsp free(repo_path);
2228 66bea077 2018-08-02 stsp free(cwd);
2229 404c43c4 2018-06-21 stsp free(commit_id);
2230 0c06baac 2019-02-05 stsp if (worktree)
2231 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2232 ad242220 2018-09-08 stsp if (repo) {
2233 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2234 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2235 ad242220 2018-09-08 stsp if (error == NULL)
2236 ad242220 2018-09-08 stsp error = repo_error;
2238 404c43c4 2018-06-21 stsp return error;
2241 5de5890b 2018-10-18 stsp __dead static void
2242 5de5890b 2018-10-18 stsp usage_tree(void)
2244 c1669e2e 2019-01-09 stsp fprintf(stderr,
2245 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2246 5de5890b 2018-10-18 stsp getprogname());
2250 c1669e2e 2019-01-09 stsp static void
2251 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2252 c1669e2e 2019-01-09 stsp const char *root_path)
2254 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2255 848d6979 2019-08-12 stsp const char *modestr = "";
2257 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2258 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2261 848d6979 2019-08-12 stsp if (S_ISLNK(te->mode))
2262 848d6979 2019-08-12 stsp modestr = "@";
2263 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
2264 848d6979 2019-08-12 stsp modestr = "/";
2265 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
2266 848d6979 2019-08-12 stsp modestr = "*";
2268 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2269 848d6979 2019-08-12 stsp is_root_path ? "" : "/", te->name, modestr);
2272 5de5890b 2018-10-18 stsp static const struct got_error *
2273 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2274 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2275 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2277 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2278 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2279 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2280 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2281 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2283 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2285 5de5890b 2018-10-18 stsp goto done;
2287 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2289 5de5890b 2018-10-18 stsp goto done;
2290 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2291 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2292 5de5890b 2018-10-18 stsp while (te) {
2293 5de5890b 2018-10-18 stsp char *id = NULL;
2295 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2298 5de5890b 2018-10-18 stsp if (show_ids) {
2299 5de5890b 2018-10-18 stsp char *id_str;
2300 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2302 5de5890b 2018-10-18 stsp goto done;
2303 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2304 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2305 5de5890b 2018-10-18 stsp free(id_str);
2306 5de5890b 2018-10-18 stsp goto done;
2308 5de5890b 2018-10-18 stsp free(id_str);
2310 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2313 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2314 c1669e2e 2019-01-09 stsp char *child_path;
2315 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2316 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2317 c1669e2e 2019-01-09 stsp te->name) == -1) {
2318 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2319 c1669e2e 2019-01-09 stsp goto done;
2321 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2322 c1669e2e 2019-01-09 stsp root_path, repo);
2323 c1669e2e 2019-01-09 stsp free(child_path);
2325 c1669e2e 2019-01-09 stsp goto done;
2328 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2332 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2333 5de5890b 2018-10-18 stsp free(tree_id);
2334 5de5890b 2018-10-18 stsp return err;
2337 5de5890b 2018-10-18 stsp static const struct got_error *
2338 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2340 5de5890b 2018-10-18 stsp const struct got_error *error;
2341 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2342 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2343 7a2c19d6 2019-02-05 stsp const char *path;
2344 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2345 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2346 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2347 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2350 5de5890b 2018-10-18 stsp #ifndef PROFILE
2351 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2352 0f8d269b 2019-01-04 stsp NULL) == -1)
2353 5de5890b 2018-10-18 stsp err(1, "pledge");
2356 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2357 5de5890b 2018-10-18 stsp switch (ch) {
2359 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2362 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2363 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2364 5de5890b 2018-10-18 stsp err(1, "-r option");
2365 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2368 5de5890b 2018-10-18 stsp show_ids = 1;
2371 c1669e2e 2019-01-09 stsp recurse = 1;
2374 2deda0b9 2019-03-07 stsp usage_tree();
2375 5de5890b 2018-10-18 stsp /* NOTREACHED */
2379 5de5890b 2018-10-18 stsp argc -= optind;
2380 5de5890b 2018-10-18 stsp argv += optind;
2382 5de5890b 2018-10-18 stsp if (argc == 1)
2383 5de5890b 2018-10-18 stsp path = argv[0];
2384 5de5890b 2018-10-18 stsp else if (argc > 1)
2385 5de5890b 2018-10-18 stsp usage_tree();
2387 7a2c19d6 2019-02-05 stsp path = NULL;
2389 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2390 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2391 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2392 9bf7a39b 2019-02-05 stsp goto done;
2394 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2395 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2396 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2397 7a2c19d6 2019-02-05 stsp goto done;
2399 7a2c19d6 2019-02-05 stsp error = NULL;
2400 7a2c19d6 2019-02-05 stsp if (worktree) {
2401 7a2c19d6 2019-02-05 stsp repo_path =
2402 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2403 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2404 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2405 7a2c19d6 2019-02-05 stsp if (error)
2406 7a2c19d6 2019-02-05 stsp goto done;
2408 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2409 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2410 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2411 7a2c19d6 2019-02-05 stsp goto done;
2416 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2417 5de5890b 2018-10-18 stsp if (error != NULL)
2418 c02c541e 2019-03-29 stsp goto done;
2420 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2421 c02c541e 2019-03-29 stsp if (error)
2422 5de5890b 2018-10-18 stsp goto done;
2424 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2425 9bf7a39b 2019-02-05 stsp if (worktree) {
2426 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2427 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2428 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2429 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2430 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2431 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2432 9bf7a39b 2019-02-05 stsp goto done;
2434 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2436 9bf7a39b 2019-02-05 stsp if (error)
2437 9bf7a39b 2019-02-05 stsp goto done;
2439 9bf7a39b 2019-02-05 stsp path = "/";
2441 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2442 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2443 9bf7a39b 2019-02-05 stsp if (error != NULL)
2444 9bf7a39b 2019-02-05 stsp goto done;
2447 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2448 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2449 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2450 5de5890b 2018-10-18 stsp if (error != NULL)
2451 5de5890b 2018-10-18 stsp goto done;
2452 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2453 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2454 5de5890b 2018-10-18 stsp if (error != NULL)
2455 5de5890b 2018-10-18 stsp goto done;
2457 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2458 30837e32 2019-07-25 stsp if (error)
2459 5de5890b 2018-10-18 stsp goto done;
2462 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2463 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2465 5de5890b 2018-10-18 stsp free(in_repo_path);
2466 5de5890b 2018-10-18 stsp free(repo_path);
2467 5de5890b 2018-10-18 stsp free(cwd);
2468 5de5890b 2018-10-18 stsp free(commit_id);
2469 7a2c19d6 2019-02-05 stsp if (worktree)
2470 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2471 5de5890b 2018-10-18 stsp if (repo) {
2472 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2473 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2474 5de5890b 2018-10-18 stsp if (error == NULL)
2475 5de5890b 2018-10-18 stsp error = repo_error;
2477 5de5890b 2018-10-18 stsp return error;
2480 6bad629b 2019-02-04 stsp __dead static void
2481 6bad629b 2019-02-04 stsp usage_status(void)
2483 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2487 b72f483a 2019-02-05 stsp static const struct got_error *
2488 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2489 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2490 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2492 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2493 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2494 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2495 b72f483a 2019-02-05 stsp return NULL;
2498 6bad629b 2019-02-04 stsp static const struct got_error *
2499 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2501 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2502 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2503 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2504 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2505 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2506 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2509 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2511 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2512 6bad629b 2019-02-04 stsp switch (ch) {
2514 2deda0b9 2019-03-07 stsp usage_status();
2515 6bad629b 2019-02-04 stsp /* NOTREACHED */
2519 6bad629b 2019-02-04 stsp argc -= optind;
2520 6bad629b 2019-02-04 stsp argv += optind;
2522 6bad629b 2019-02-04 stsp #ifndef PROFILE
2523 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2524 6bad629b 2019-02-04 stsp NULL) == -1)
2525 6bad629b 2019-02-04 stsp err(1, "pledge");
2527 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2528 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2529 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2530 927df6b7 2019-02-10 stsp goto done;
2533 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2534 927df6b7 2019-02-10 stsp if (error != NULL)
2535 a5edda0a 2019-07-27 stsp goto done;
2537 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2538 6bad629b 2019-02-04 stsp if (error != NULL)
2539 6bad629b 2019-02-04 stsp goto done;
2541 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2542 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2543 087fb88c 2019-08-04 stsp if (error)
2544 087fb88c 2019-08-04 stsp goto done;
2546 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2547 6bad629b 2019-02-04 stsp if (error)
2548 6bad629b 2019-02-04 stsp goto done;
2550 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2551 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2553 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2554 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2555 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2556 927df6b7 2019-02-10 stsp free(cwd);
2557 d0eebce4 2019-03-11 stsp return error;
2560 d0eebce4 2019-03-11 stsp __dead static void
2561 d0eebce4 2019-03-11 stsp usage_ref(void)
2563 d0eebce4 2019-03-11 stsp fprintf(stderr,
2564 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2565 d0eebce4 2019-03-11 stsp getprogname());
2569 d0eebce4 2019-03-11 stsp static const struct got_error *
2570 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2572 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2573 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2574 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2576 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2577 d0eebce4 2019-03-11 stsp err = got_ref_list(&refs, repo);
2579 d0eebce4 2019-03-11 stsp return err;
2581 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2582 d0eebce4 2019-03-11 stsp char *refstr;
2583 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2584 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2585 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2586 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2587 d0eebce4 2019-03-11 stsp free(refstr);
2590 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2591 d0eebce4 2019-03-11 stsp return NULL;
2594 d0eebce4 2019-03-11 stsp static const struct got_error *
2595 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2597 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2598 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2600 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2602 d0eebce4 2019-03-11 stsp return err;
2604 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2605 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2606 d0eebce4 2019-03-11 stsp return err;
2609 d0eebce4 2019-03-11 stsp static const struct got_error *
2610 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2612 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2613 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2614 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2617 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2618 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2619 d1644381 2019-07-14 stsp * an unintended typo.
2621 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2622 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2624 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2626 d83d9d5c 2019-05-13 stsp if (err) {
2627 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2629 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2630 d83d9d5c 2019-05-13 stsp return err;
2631 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2633 d83d9d5c 2019-05-13 stsp return err;
2634 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2635 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2637 d83d9d5c 2019-05-13 stsp return err;
2640 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2642 d0eebce4 2019-03-11 stsp goto done;
2644 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2647 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2649 d1c1ae5f 2019-08-12 stsp return err;
2652 d1c1ae5f 2019-08-12 stsp static const struct got_error *
2653 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
2655 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
2656 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
2657 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
2660 d1c1ae5f 2019-08-12 stsp * Don't let the user create a reference named '-'.
2661 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
2662 d1c1ae5f 2019-08-12 stsp * an unintended typo.
2664 d1c1ae5f 2019-08-12 stsp if (refname[0] == '-' && refname[1] == '\0')
2665 d1c1ae5f 2019-08-12 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2667 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
2669 d1c1ae5f 2019-08-12 stsp return err;
2671 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
2673 d1c1ae5f 2019-08-12 stsp goto done;
2675 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
2677 d1c1ae5f 2019-08-12 stsp if (target_ref)
2678 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
2680 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
2681 d0eebce4 2019-03-11 stsp return err;
2684 d0eebce4 2019-03-11 stsp static const struct got_error *
2685 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2687 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2688 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2689 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2690 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2691 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
2692 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2694 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2695 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
2696 d0eebce4 2019-03-11 stsp switch (ch) {
2698 d0eebce4 2019-03-11 stsp delref = optarg;
2701 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2702 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2703 d0eebce4 2019-03-11 stsp err(1, "-r option");
2704 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2707 d0eebce4 2019-03-11 stsp do_list = 1;
2710 d1c1ae5f 2019-08-12 stsp create_symref = 1;
2713 d0eebce4 2019-03-11 stsp usage_ref();
2714 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2718 d0eebce4 2019-03-11 stsp if (do_list && delref)
2719 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2721 d0eebce4 2019-03-11 stsp argc -= optind;
2722 d0eebce4 2019-03-11 stsp argv += optind;
2724 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2725 d1c1ae5f 2019-08-12 stsp if (create_symref)
2726 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
2727 d1c1ae5f 2019-08-12 stsp "-l or -d options");
2728 d0eebce4 2019-03-11 stsp if (argc > 0)
2729 d0eebce4 2019-03-11 stsp usage_ref();
2730 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2731 d0eebce4 2019-03-11 stsp usage_ref();
2733 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2734 e0b57350 2019-03-12 stsp if (do_list) {
2735 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2736 e0b57350 2019-03-12 stsp NULL) == -1)
2737 e0b57350 2019-03-12 stsp err(1, "pledge");
2739 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2740 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2741 e0b57350 2019-03-12 stsp err(1, "pledge");
2744 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
2745 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
2746 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2747 d0eebce4 2019-03-11 stsp goto done;
2750 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2751 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
2752 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2753 d0eebce4 2019-03-11 stsp goto done;
2755 d0eebce4 2019-03-11 stsp error = NULL;
2756 d0eebce4 2019-03-11 stsp if (worktree) {
2757 d0eebce4 2019-03-11 stsp repo_path =
2758 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
2759 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2760 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2761 d0eebce4 2019-03-11 stsp if (error)
2762 d0eebce4 2019-03-11 stsp goto done;
2764 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
2765 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
2766 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2767 d0eebce4 2019-03-11 stsp goto done;
2772 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
2773 d0eebce4 2019-03-11 stsp if (error != NULL)
2774 d0eebce4 2019-03-11 stsp goto done;
2776 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
2777 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2778 c02c541e 2019-03-29 stsp if (error)
2779 c02c541e 2019-03-29 stsp goto done;
2781 d0eebce4 2019-03-11 stsp if (do_list)
2782 d0eebce4 2019-03-11 stsp error = list_refs(repo);
2783 d0eebce4 2019-03-11 stsp else if (delref)
2784 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
2785 d1c1ae5f 2019-08-12 stsp else if (create_symref)
2786 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
2788 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
2791 4e759de4 2019-06-26 stsp got_repo_close(repo);
2792 4e759de4 2019-06-26 stsp if (worktree)
2793 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
2794 4e759de4 2019-06-26 stsp free(cwd);
2795 4e759de4 2019-06-26 stsp free(repo_path);
2796 4e759de4 2019-06-26 stsp return error;
2799 4e759de4 2019-06-26 stsp __dead static void
2800 4e759de4 2019-06-26 stsp usage_branch(void)
2802 4e759de4 2019-06-26 stsp fprintf(stderr,
2803 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
2804 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
2808 4e759de4 2019-06-26 stsp static const struct got_error *
2809 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
2811 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
2812 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
2813 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
2815 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
2817 4e759de4 2019-06-26 stsp err = got_ref_list(&refs, repo);
2819 4e759de4 2019-06-26 stsp return err;
2821 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2822 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
2823 4e759de4 2019-06-26 stsp char *refstr;
2824 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
2825 4e759de4 2019-06-26 stsp if (strncmp(refname, "refs/heads/", 11) != 0)
2827 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
2828 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
2829 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
2830 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
2832 ba882ee3 2019-07-11 stsp return err;
2833 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
2834 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
2835 ba882ee3 2019-07-11 stsp marker = "* ";
2837 ba882ee3 2019-07-11 stsp marker = "~ ";
2840 4e759de4 2019-06-26 stsp refname += 11;
2841 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
2842 4e759de4 2019-06-26 stsp if (refstr == NULL)
2843 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
2844 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
2845 4e759de4 2019-06-26 stsp free(refstr);
2848 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
2849 4e759de4 2019-06-26 stsp return NULL;
2852 4e759de4 2019-06-26 stsp static const struct got_error *
2853 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
2855 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2856 4e759de4 2019-06-26 stsp struct got_reference *ref;
2857 4e759de4 2019-06-26 stsp char *refname;
2859 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2860 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2862 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2864 4e759de4 2019-06-26 stsp goto done;
2866 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
2867 4e759de4 2019-06-26 stsp got_ref_close(ref);
2869 4e759de4 2019-06-26 stsp free(refname);
2870 4e759de4 2019-06-26 stsp return err;
2873 4e759de4 2019-06-26 stsp static const struct got_error *
2874 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
2875 4e759de4 2019-06-26 stsp const char *base_branch)
2877 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
2878 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
2879 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
2880 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
2881 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
2884 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
2885 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
2886 d3f84d51 2019-07-11 stsp * an unintended typo.
2888 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
2889 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2891 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2892 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
2893 4e759de4 2019-06-26 stsp if (base_refname == NULL)
2894 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
2895 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2896 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
2898 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
2900 4e759de4 2019-06-26 stsp goto done;
2901 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
2902 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
2904 4e759de4 2019-06-26 stsp goto done;
2906 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2907 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
2908 4e759de4 2019-06-26 stsp goto done;
2911 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
2912 4e759de4 2019-06-26 stsp if (err == NULL) {
2913 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
2914 4e759de4 2019-06-26 stsp goto done;
2915 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
2916 4e759de4 2019-06-26 stsp goto done;
2918 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
2920 4e759de4 2019-06-26 stsp goto done;
2922 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
2925 4e759de4 2019-06-26 stsp got_ref_close(ref);
2927 4e759de4 2019-06-26 stsp free(base_refname);
2928 4e759de4 2019-06-26 stsp free(refname);
2929 4e759de4 2019-06-26 stsp return err;
2932 4e759de4 2019-06-26 stsp static const struct got_error *
2933 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
2935 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
2936 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
2937 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
2938 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
2939 4e759de4 2019-06-26 stsp int ch, do_list = 0;
2940 4e759de4 2019-06-26 stsp const char *delref = NULL;
2942 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2943 4e759de4 2019-06-26 stsp switch (ch) {
2945 4e759de4 2019-06-26 stsp delref = optarg;
2948 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
2949 4e759de4 2019-06-26 stsp if (repo_path == NULL)
2950 4e759de4 2019-06-26 stsp err(1, "-r option");
2951 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
2954 4e759de4 2019-06-26 stsp do_list = 1;
2957 4e759de4 2019-06-26 stsp usage_branch();
2958 4e759de4 2019-06-26 stsp /* NOTREACHED */
2962 4e759de4 2019-06-26 stsp if (do_list && delref)
2963 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
2965 4e759de4 2019-06-26 stsp argc -= optind;
2966 4e759de4 2019-06-26 stsp argv += optind;
2968 4e759de4 2019-06-26 stsp if (do_list || delref) {
2969 4e759de4 2019-06-26 stsp if (argc > 0)
2970 4e759de4 2019-06-26 stsp usage_branch();
2971 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
2972 4e759de4 2019-06-26 stsp usage_branch();
2974 4e759de4 2019-06-26 stsp #ifndef PROFILE
2975 4e759de4 2019-06-26 stsp if (do_list) {
2976 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2977 4e759de4 2019-06-26 stsp NULL) == -1)
2978 4e759de4 2019-06-26 stsp err(1, "pledge");
2980 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2981 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
2982 4e759de4 2019-06-26 stsp err(1, "pledge");
2985 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
2986 4e759de4 2019-06-26 stsp if (cwd == NULL) {
2987 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
2988 4e759de4 2019-06-26 stsp goto done;
2991 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
2992 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
2993 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2994 4e759de4 2019-06-26 stsp goto done;
2996 4e759de4 2019-06-26 stsp error = NULL;
2997 4e759de4 2019-06-26 stsp if (worktree) {
2998 4e759de4 2019-06-26 stsp repo_path =
2999 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3000 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3001 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3002 4e759de4 2019-06-26 stsp if (error)
3003 4e759de4 2019-06-26 stsp goto done;
3005 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3006 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3007 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3008 4e759de4 2019-06-26 stsp goto done;
3013 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
3014 4e759de4 2019-06-26 stsp if (error != NULL)
3015 4e759de4 2019-06-26 stsp goto done;
3017 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3018 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3019 4e759de4 2019-06-26 stsp if (error)
3020 4e759de4 2019-06-26 stsp goto done;
3022 4e759de4 2019-06-26 stsp if (do_list)
3023 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3024 4e759de4 2019-06-26 stsp else if (delref)
3025 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
3027 4e759de4 2019-06-26 stsp const char *base_branch;
3028 4e759de4 2019-06-26 stsp if (argc == 1) {
3029 4e759de4 2019-06-26 stsp base_branch = worktree ?
3030 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3031 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3032 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
3033 dc5351b4 2019-07-30 stsp base_branch += 11;
3035 4e759de4 2019-06-26 stsp base_branch = argv[1];
3036 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
3040 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3041 d0eebce4 2019-03-11 stsp if (worktree)
3042 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3043 d0eebce4 2019-03-11 stsp free(cwd);
3044 d0eebce4 2019-03-11 stsp free(repo_path);
3045 d00136be 2019-03-26 stsp return error;
3048 d00136be 2019-03-26 stsp __dead static void
3049 d00136be 2019-03-26 stsp usage_add(void)
3051 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3055 d00136be 2019-03-26 stsp static const struct got_error *
3056 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
3058 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
3059 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
3060 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
3061 1dd54920 2019-05-11 stsp char *cwd = NULL;
3062 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
3063 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3066 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
3068 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3069 d00136be 2019-03-26 stsp switch (ch) {
3071 d00136be 2019-03-26 stsp usage_add();
3072 d00136be 2019-03-26 stsp /* NOTREACHED */
3076 d00136be 2019-03-26 stsp argc -= optind;
3077 d00136be 2019-03-26 stsp argv += optind;
3079 43012d58 2019-07-14 stsp #ifndef PROFILE
3080 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3081 43012d58 2019-07-14 stsp NULL) == -1)
3082 43012d58 2019-07-14 stsp err(1, "pledge");
3084 723c305c 2019-05-11 jcs if (argc < 1)
3085 d00136be 2019-03-26 stsp usage_add();
3087 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
3088 d00136be 2019-03-26 stsp if (cwd == NULL) {
3089 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3090 d00136be 2019-03-26 stsp goto done;
3093 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3094 d00136be 2019-03-26 stsp if (error)
3095 d00136be 2019-03-26 stsp goto done;
3097 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3098 031a5338 2019-03-26 stsp if (error != NULL)
3099 031a5338 2019-03-26 stsp goto done;
3101 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3102 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3103 d00136be 2019-03-26 stsp if (error)
3104 d00136be 2019-03-26 stsp goto done;
3106 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3107 6d022e97 2019-08-04 stsp if (error)
3108 6d022e97 2019-08-04 stsp goto done;
3110 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
3111 1dd54920 2019-05-11 stsp NULL, repo);
3114 031a5338 2019-03-26 stsp got_repo_close(repo);
3115 d00136be 2019-03-26 stsp if (worktree)
3116 d00136be 2019-03-26 stsp got_worktree_close(worktree);
3117 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
3118 1dd54920 2019-05-11 stsp free((char *)pe->path);
3119 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
3120 2ec1f75b 2019-03-26 stsp free(cwd);
3121 2ec1f75b 2019-03-26 stsp return error;
3124 2ec1f75b 2019-03-26 stsp __dead static void
3125 648e4ef7 2019-07-09 stsp usage_remove(void)
3127 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3131 2ec1f75b 2019-03-26 stsp static const struct got_error *
3132 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
3134 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
3135 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
3136 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
3137 17ed4618 2019-06-02 stsp char *cwd = NULL;
3138 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
3139 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3140 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
3142 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
3144 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
3145 2ec1f75b 2019-03-26 stsp switch (ch) {
3147 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
3150 2ec1f75b 2019-03-26 stsp usage_add();
3151 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
3155 2ec1f75b 2019-03-26 stsp argc -= optind;
3156 2ec1f75b 2019-03-26 stsp argv += optind;
3158 43012d58 2019-07-14 stsp #ifndef PROFILE
3159 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3160 43012d58 2019-07-14 stsp NULL) == -1)
3161 43012d58 2019-07-14 stsp err(1, "pledge");
3163 17ed4618 2019-06-02 stsp if (argc < 1)
3164 648e4ef7 2019-07-09 stsp usage_remove();
3166 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
3167 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
3168 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3169 2ec1f75b 2019-03-26 stsp goto done;
3171 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3172 2ec1f75b 2019-03-26 stsp if (error)
3173 2ec1f75b 2019-03-26 stsp goto done;
3175 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3177 2ec1f75b 2019-03-26 stsp goto done;
3179 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3180 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3181 2ec1f75b 2019-03-26 stsp if (error)
3182 2ec1f75b 2019-03-26 stsp goto done;
3184 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3185 6d022e97 2019-08-04 stsp if (error)
3186 6d022e97 2019-08-04 stsp goto done;
3188 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
3189 17ed4618 2019-06-02 stsp delete_local_mods, print_status, NULL, repo);
3190 a129376b 2019-03-28 stsp if (error)
3191 a129376b 2019-03-28 stsp goto done;
3194 a129376b 2019-03-28 stsp got_repo_close(repo);
3195 a129376b 2019-03-28 stsp if (worktree)
3196 a129376b 2019-03-28 stsp got_worktree_close(worktree);
3197 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
3198 17ed4618 2019-06-02 stsp free((char *)pe->path);
3199 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
3200 a129376b 2019-03-28 stsp free(cwd);
3201 a129376b 2019-03-28 stsp return error;
3204 a129376b 2019-03-28 stsp __dead static void
3205 a129376b 2019-03-28 stsp usage_revert(void)
3207 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
3208 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
3212 1ee397ad 2019-07-12 stsp static const struct got_error *
3213 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
3215 a129376b 2019-03-28 stsp while (path[0] == '/')
3217 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
3218 33aa809d 2019-08-08 stsp return NULL;
3221 33aa809d 2019-08-08 stsp struct choose_patch_arg {
3222 33aa809d 2019-08-08 stsp FILE *patch_script_file;
3223 33aa809d 2019-08-08 stsp const char *action;
3226 33aa809d 2019-08-08 stsp static const struct got_error *
3227 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
3228 33aa809d 2019-08-08 stsp int nchanges, const char *action)
3230 33aa809d 2019-08-08 stsp char *line = NULL;
3231 33aa809d 2019-08-08 stsp size_t linesize = 0;
3232 33aa809d 2019-08-08 stsp ssize_t linelen;
3234 33aa809d 2019-08-08 stsp switch (status) {
3235 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
3236 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
3238 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
3239 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
3241 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
3242 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
3243 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
3244 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3245 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
3246 33aa809d 2019-08-08 stsp printf("%s", line);
3247 33aa809d 2019-08-08 stsp if (ferror(patch_file))
3248 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3249 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3250 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
3251 33aa809d 2019-08-08 stsp path, n, nchanges, action);
3254 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
3257 33aa809d 2019-08-08 stsp return NULL;
3260 33aa809d 2019-08-08 stsp static const struct got_error *
3261 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
3262 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
3264 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3265 33aa809d 2019-08-08 stsp char *line = NULL;
3266 33aa809d 2019-08-08 stsp size_t linesize = 0;
3267 33aa809d 2019-08-08 stsp ssize_t linelen;
3268 33aa809d 2019-08-08 stsp int resp = ' ';
3269 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
3271 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3273 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
3275 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
3276 33aa809d 2019-08-08 stsp a->action);
3278 33aa809d 2019-08-08 stsp return err;
3279 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
3280 33aa809d 2019-08-08 stsp if (linelen == -1) {
3281 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
3282 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3283 33aa809d 2019-08-08 stsp return NULL;
3285 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
3287 33aa809d 2019-08-08 stsp *nl = '\0';
3288 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
3289 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
3290 33aa809d 2019-08-08 stsp printf("y\n");
3291 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
3292 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
3293 33aa809d 2019-08-08 stsp printf("n\n");
3294 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
3295 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
3296 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
3297 33aa809d 2019-08-08 stsp printf("q\n");
3299 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
3300 33aa809d 2019-08-08 stsp free(line);
3301 33aa809d 2019-08-08 stsp return NULL;
3304 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
3305 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
3306 33aa809d 2019-08-08 stsp a->action);
3308 33aa809d 2019-08-08 stsp return err;
3309 33aa809d 2019-08-08 stsp resp = getchar();
3310 33aa809d 2019-08-08 stsp if (resp == '\n')
3311 33aa809d 2019-08-08 stsp resp = getchar();
3312 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
3313 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
3314 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
3315 33aa809d 2019-08-08 stsp resp = ' ';
3317 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
3318 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
3319 33aa809d 2019-08-08 stsp resp = ' ';
3323 33aa809d 2019-08-08 stsp if (resp == 'y')
3324 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
3325 33aa809d 2019-08-08 stsp else if (resp == 'n')
3326 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
3327 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
3328 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
3330 1ee397ad 2019-07-12 stsp return NULL;
3334 a129376b 2019-03-28 stsp static const struct got_error *
3335 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
3337 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
3338 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
3339 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
3340 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
3341 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
3342 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
3343 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
3344 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
3345 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
3346 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
3348 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
3350 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
3351 a129376b 2019-03-28 stsp switch (ch) {
3353 33aa809d 2019-08-08 stsp pflag = 1;
3356 33aa809d 2019-08-08 stsp patch_script_path = optarg;
3359 0f6d7415 2019-08-08 stsp can_recurse = 1;
3362 a129376b 2019-03-28 stsp usage_revert();
3363 a129376b 2019-03-28 stsp /* NOTREACHED */
3367 a129376b 2019-03-28 stsp argc -= optind;
3368 a129376b 2019-03-28 stsp argv += optind;
3370 43012d58 2019-07-14 stsp #ifndef PROFILE
3371 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3372 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3373 43012d58 2019-07-14 stsp err(1, "pledge");
3375 e20a8b6f 2019-06-04 stsp if (argc < 1)
3376 a129376b 2019-03-28 stsp usage_revert();
3377 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
3378 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
3380 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
3381 a129376b 2019-03-28 stsp if (cwd == NULL) {
3382 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3383 a129376b 2019-03-28 stsp goto done;
3385 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
3386 2ec1f75b 2019-03-26 stsp if (error)
3387 2ec1f75b 2019-03-26 stsp goto done;
3389 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3390 a129376b 2019-03-28 stsp if (error != NULL)
3391 a129376b 2019-03-28 stsp goto done;
3393 33aa809d 2019-08-08 stsp if (patch_script_path) {
3394 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
3395 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
3396 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
3397 33aa809d 2019-08-08 stsp patch_script_path);
3398 33aa809d 2019-08-08 stsp goto done;
3401 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3402 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3403 a129376b 2019-03-28 stsp if (error)
3404 a129376b 2019-03-28 stsp goto done;
3406 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3407 6d022e97 2019-08-04 stsp if (error)
3408 6d022e97 2019-08-04 stsp goto done;
3410 0f6d7415 2019-08-08 stsp if (!can_recurse) {
3411 0f6d7415 2019-08-08 stsp char *ondisk_path;
3412 0f6d7415 2019-08-08 stsp struct stat sb;
3413 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
3414 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3415 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
3416 0f6d7415 2019-08-08 stsp pe->path) == -1) {
3417 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
3418 0f6d7415 2019-08-08 stsp goto done;
3420 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
3421 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
3422 0f6d7415 2019-08-08 stsp free(ondisk_path);
3425 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
3426 0f6d7415 2019-08-08 stsp ondisk_path);
3427 0f6d7415 2019-08-08 stsp free(ondisk_path);
3428 0f6d7415 2019-08-08 stsp goto done;
3430 0f6d7415 2019-08-08 stsp free(ondisk_path);
3431 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
3432 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
3433 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
3434 0f6d7415 2019-08-08 stsp goto done;
3439 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
3440 33aa809d 2019-08-08 stsp cpa.action = "revert";
3441 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
3442 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
3443 a129376b 2019-03-28 stsp if (error)
3444 a129376b 2019-03-28 stsp goto done;
3446 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
3447 33aa809d 2019-08-08 stsp error == NULL)
3448 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
3450 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
3451 2ec1f75b 2019-03-26 stsp if (worktree)
3452 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
3453 2ec1f75b 2019-03-26 stsp free(path);
3454 d00136be 2019-03-26 stsp free(cwd);
3455 6bad629b 2019-02-04 stsp return error;
3458 c4296144 2019-05-09 stsp __dead static void
3459 c4296144 2019-05-09 stsp usage_commit(void)
3461 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
3462 5c1e53bc 2019-07-28 stsp getprogname());
3466 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
3467 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
3468 e2ba3d07 2019-05-13 stsp const char *editor;
3469 e0870e44 2019-05-13 stsp const char *worktree_path;
3470 76d98825 2019-06-03 stsp const char *branch_name;
3471 314a6357 2019-05-13 stsp const char *repo_path;
3472 e0870e44 2019-05-13 stsp char *logmsg_path;
3476 33ad4cbe 2019-05-12 jcs static const struct got_error *
3477 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3480 76d98825 2019-06-03 stsp char *initial_content = NULL;
3481 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
3482 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
3483 e0870e44 2019-05-13 stsp char *template = NULL;
3484 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
3486 33ad4cbe 2019-05-12 jcs size_t len;
3488 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
3489 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3490 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
3491 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
3492 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
3493 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
3494 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
3495 33ad4cbe 2019-05-12 jcs return NULL;
3498 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3499 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
3501 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
3502 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
3503 76d98825 2019-06-03 stsp a->branch_name) == -1)
3504 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3506 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3508 e0870e44 2019-05-13 stsp goto done;
3510 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
3512 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
3513 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3514 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
3515 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
3516 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
3520 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3522 e2af0fd1 2019-08-08 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3523 e2af0fd1 2019-08-08 stsp unlink(a->logmsg_path);
3524 e2af0fd1 2019-08-08 stsp free(a->logmsg_path);
3525 e2af0fd1 2019-08-08 stsp a->logmsg_path = NULL;
3527 76d98825 2019-06-03 stsp free(initial_content);
3528 e0870e44 2019-05-13 stsp free(template);
3530 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
3531 3ce1b845 2019-07-15 stsp if (err == NULL) {
3532 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
3533 3ce1b845 2019-07-15 stsp if (err) {
3534 3ce1b845 2019-07-15 stsp free(*logmsg);
3535 3ce1b845 2019-07-15 stsp *logmsg = NULL;
3538 33ad4cbe 2019-05-12 jcs return err;
3541 c4296144 2019-05-09 stsp static const struct got_error *
3542 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
3544 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
3545 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
3546 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
3547 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
3548 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
3549 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
3550 84792843 2019-08-09 stsp const char *author;
3551 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
3552 e2ba3d07 2019-05-13 stsp char *editor = NULL;
3553 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
3554 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
3556 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
3557 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
3559 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
3560 c4296144 2019-05-09 stsp switch (ch) {
3562 c4296144 2019-05-09 stsp logmsg = optarg;
3565 c4296144 2019-05-09 stsp usage_commit();
3566 c4296144 2019-05-09 stsp /* NOTREACHED */
3570 c4296144 2019-05-09 stsp argc -= optind;
3571 c4296144 2019-05-09 stsp argv += optind;
3573 43012d58 2019-07-14 stsp #ifndef PROFILE
3574 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3575 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3576 43012d58 2019-07-14 stsp err(1, "pledge");
3578 84792843 2019-08-09 stsp error = get_author(&author);
3579 84792843 2019-08-09 stsp if (error)
3580 84792843 2019-08-09 stsp return error;
3582 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
3583 c4296144 2019-05-09 stsp if (cwd == NULL) {
3584 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3585 c4296144 2019-05-09 stsp goto done;
3587 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
3588 7d5807f4 2019-07-11 stsp if (error)
3589 7d5807f4 2019-07-11 stsp goto done;
3591 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3592 c4296144 2019-05-09 stsp if (error)
3593 a698f62e 2019-07-25 stsp goto done;
3594 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
3595 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
3596 c4296144 2019-05-09 stsp goto done;
3599 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
3600 916f288c 2019-07-30 stsp worktree);
3601 5c1e53bc 2019-07-28 stsp if (error)
3602 5c1e53bc 2019-07-28 stsp goto done;
3604 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3605 c4296144 2019-05-09 stsp if (error != NULL)
3606 c4296144 2019-05-09 stsp goto done;
3609 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
3610 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
3612 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
3613 314a6357 2019-05-13 stsp error = get_editor(&editor);
3615 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3616 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3617 c4296144 2019-05-09 stsp if (error)
3618 c4296144 2019-05-09 stsp goto done;
3620 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3621 087fb88c 2019-08-04 stsp if (error)
3622 087fb88c 2019-08-04 stsp goto done;
3624 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
3625 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
3626 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3627 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3628 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
3629 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
3630 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
3631 916f288c 2019-07-30 stsp goto done;
3633 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
3635 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
3636 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
3637 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3638 e0870e44 2019-05-13 stsp if (error) {
3639 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3640 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
3641 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
3642 c4296144 2019-05-09 stsp goto done;
3645 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
3646 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
3648 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
3649 c4296144 2019-05-09 stsp if (error)
3650 c4296144 2019-05-09 stsp goto done;
3651 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
3653 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
3655 c4296144 2019-05-09 stsp got_repo_close(repo);
3656 c4296144 2019-05-09 stsp if (worktree)
3657 c4296144 2019-05-09 stsp got_worktree_close(worktree);
3658 c4296144 2019-05-09 stsp free(cwd);
3659 c4296144 2019-05-09 stsp free(id_str);
3660 e2ba3d07 2019-05-13 stsp free(editor);
3661 234035bc 2019-06-01 stsp return error;
3664 234035bc 2019-06-01 stsp __dead static void
3665 234035bc 2019-06-01 stsp usage_cherrypick(void)
3667 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3671 234035bc 2019-06-01 stsp static const struct got_error *
3672 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
3674 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
3675 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
3676 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
3677 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
3678 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
3679 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
3680 234035bc 2019-06-01 stsp struct got_object_qid *pid;
3681 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
3682 234035bc 2019-06-01 stsp int ch, did_something = 0;
3684 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3685 234035bc 2019-06-01 stsp switch (ch) {
3687 234035bc 2019-06-01 stsp usage_cherrypick();
3688 234035bc 2019-06-01 stsp /* NOTREACHED */
3692 234035bc 2019-06-01 stsp argc -= optind;
3693 234035bc 2019-06-01 stsp argv += optind;
3695 43012d58 2019-07-14 stsp #ifndef PROFILE
3696 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3697 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3698 43012d58 2019-07-14 stsp err(1, "pledge");
3700 234035bc 2019-06-01 stsp if (argc != 1)
3701 234035bc 2019-06-01 stsp usage_cherrypick();
3703 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
3704 234035bc 2019-06-01 stsp if (cwd == NULL) {
3705 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
3706 234035bc 2019-06-01 stsp goto done;
3708 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
3709 234035bc 2019-06-01 stsp if (error)
3710 234035bc 2019-06-01 stsp goto done;
3712 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3713 234035bc 2019-06-01 stsp if (error != NULL)
3714 234035bc 2019-06-01 stsp goto done;
3716 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3717 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3718 234035bc 2019-06-01 stsp if (error)
3719 234035bc 2019-06-01 stsp goto done;
3721 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3722 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3723 234035bc 2019-06-01 stsp if (error != NULL) {
3724 234035bc 2019-06-01 stsp struct got_reference *ref;
3725 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3726 234035bc 2019-06-01 stsp goto done;
3727 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3728 234035bc 2019-06-01 stsp if (error != NULL)
3729 234035bc 2019-06-01 stsp goto done;
3730 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
3731 234035bc 2019-06-01 stsp got_ref_close(ref);
3732 234035bc 2019-06-01 stsp if (error != NULL)
3733 234035bc 2019-06-01 stsp goto done;
3735 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
3736 234035bc 2019-06-01 stsp if (error)
3737 234035bc 2019-06-01 stsp goto done;
3739 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
3740 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
3741 234035bc 2019-06-01 stsp if (error != NULL)
3742 234035bc 2019-06-01 stsp goto done;
3744 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3745 234035bc 2019-06-01 stsp if (error) {
3746 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
3747 234035bc 2019-06-01 stsp goto done;
3748 234035bc 2019-06-01 stsp error = NULL;
3750 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
3751 234035bc 2019-06-01 stsp goto done;
3754 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3755 234035bc 2019-06-01 stsp if (error)
3756 234035bc 2019-06-01 stsp goto done;
3757 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3758 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3759 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
3761 234035bc 2019-06-01 stsp if (error != NULL)
3762 234035bc 2019-06-01 stsp goto done;
3764 234035bc 2019-06-01 stsp if (did_something)
3765 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
3767 234035bc 2019-06-01 stsp if (commit)
3768 234035bc 2019-06-01 stsp got_object_commit_close(commit);
3769 234035bc 2019-06-01 stsp free(commit_id_str);
3770 234035bc 2019-06-01 stsp if (head_ref)
3771 234035bc 2019-06-01 stsp got_ref_close(head_ref);
3772 234035bc 2019-06-01 stsp if (worktree)
3773 234035bc 2019-06-01 stsp got_worktree_close(worktree);
3775 234035bc 2019-06-01 stsp got_repo_close(repo);
3776 c4296144 2019-05-09 stsp return error;
3779 5ef14e63 2019-06-02 stsp __dead static void
3780 5ef14e63 2019-06-02 stsp usage_backout(void)
3782 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3786 5ef14e63 2019-06-02 stsp static const struct got_error *
3787 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
3789 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
3790 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
3791 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
3792 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
3793 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
3794 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
3795 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
3796 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
3797 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
3799 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3800 5ef14e63 2019-06-02 stsp switch (ch) {
3802 5ef14e63 2019-06-02 stsp usage_backout();
3803 5ef14e63 2019-06-02 stsp /* NOTREACHED */
3807 5ef14e63 2019-06-02 stsp argc -= optind;
3808 5ef14e63 2019-06-02 stsp argv += optind;
3810 43012d58 2019-07-14 stsp #ifndef PROFILE
3811 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3812 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
3813 43012d58 2019-07-14 stsp err(1, "pledge");
3815 5ef14e63 2019-06-02 stsp if (argc != 1)
3816 5ef14e63 2019-06-02 stsp usage_backout();
3818 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
3819 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
3820 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
3821 5ef14e63 2019-06-02 stsp goto done;
3823 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
3824 5ef14e63 2019-06-02 stsp if (error)
3825 5ef14e63 2019-06-02 stsp goto done;
3827 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3828 5ef14e63 2019-06-02 stsp if (error != NULL)
3829 5ef14e63 2019-06-02 stsp goto done;
3831 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
3832 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3833 5ef14e63 2019-06-02 stsp if (error)
3834 5ef14e63 2019-06-02 stsp goto done;
3836 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3837 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
3838 5ef14e63 2019-06-02 stsp if (error != NULL) {
3839 5ef14e63 2019-06-02 stsp struct got_reference *ref;
3840 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3841 5ef14e63 2019-06-02 stsp goto done;
3842 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
3843 5ef14e63 2019-06-02 stsp if (error != NULL)
3844 5ef14e63 2019-06-02 stsp goto done;
3845 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
3846 5ef14e63 2019-06-02 stsp got_ref_close(ref);
3847 5ef14e63 2019-06-02 stsp if (error != NULL)
3848 5ef14e63 2019-06-02 stsp goto done;
3850 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
3851 5ef14e63 2019-06-02 stsp if (error)
3852 5ef14e63 2019-06-02 stsp goto done;
3854 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
3855 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
3856 5ef14e63 2019-06-02 stsp if (error != NULL)
3857 5ef14e63 2019-06-02 stsp goto done;
3859 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
3860 5ef14e63 2019-06-02 stsp if (error)
3861 5ef14e63 2019-06-02 stsp goto done;
3863 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3864 5ef14e63 2019-06-02 stsp if (error)
3865 5ef14e63 2019-06-02 stsp goto done;
3866 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3867 5ef14e63 2019-06-02 stsp if (pid == NULL) {
3868 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
3869 5ef14e63 2019-06-02 stsp goto done;
3872 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3873 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
3874 5ef14e63 2019-06-02 stsp if (error != NULL)
3875 5ef14e63 2019-06-02 stsp goto done;
3877 5ef14e63 2019-06-02 stsp if (did_something)
3878 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
3880 5ef14e63 2019-06-02 stsp if (commit)
3881 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
3882 5ef14e63 2019-06-02 stsp free(commit_id_str);
3883 5ef14e63 2019-06-02 stsp if (head_ref)
3884 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
3885 818c7501 2019-07-11 stsp if (worktree)
3886 818c7501 2019-07-11 stsp got_worktree_close(worktree);
3888 818c7501 2019-07-11 stsp got_repo_close(repo);
3889 818c7501 2019-07-11 stsp return error;
3892 818c7501 2019-07-11 stsp __dead static void
3893 818c7501 2019-07-11 stsp usage_rebase(void)
3895 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3896 af54c8f8 2019-07-11 stsp getprogname());
3901 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
3904 0ebf8283 2019-07-24 stsp size_t len;
3906 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
3907 0ebf8283 2019-07-24 stsp if (len > limit)
3908 0ebf8283 2019-07-24 stsp len = limit;
3909 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
3910 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
3912 0ebf8283 2019-07-24 stsp *nl = '\0';
3915 0ebf8283 2019-07-24 stsp static const struct got_error *
3916 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
3918 0ebf8283 2019-07-24 stsp const char *logmsg0 = NULL;
3920 0ebf8283 2019-07-24 stsp logmsg0 = got_object_commit_get_logmsg(commit);
3922 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)logmsg0[0]))
3923 0ebf8283 2019-07-24 stsp logmsg0++;
3925 0ebf8283 2019-07-24 stsp *logmsg = strdup(logmsg0);
3926 0ebf8283 2019-07-24 stsp if (*logmsg == NULL)
3927 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
3929 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
3930 0ebf8283 2019-07-24 stsp return NULL;
3933 818c7501 2019-07-11 stsp static const struct got_error *
3934 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
3935 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
3937 818c7501 2019-07-11 stsp const struct got_error *err;
3938 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
3940 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
3942 818c7501 2019-07-11 stsp goto done;
3944 ff0d2220 2019-07-11 stsp if (new_id) {
3945 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
3947 ff0d2220 2019-07-11 stsp goto done;
3950 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
3951 ff0d2220 2019-07-11 stsp if (new_id_str)
3952 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
3954 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
3956 0ebf8283 2019-07-24 stsp goto done;
3958 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
3959 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
3961 818c7501 2019-07-11 stsp free(old_id_str);
3962 818c7501 2019-07-11 stsp free(new_id_str);
3963 818c7501 2019-07-11 stsp return err;
3966 1ee397ad 2019-07-12 stsp static const struct got_error *
3967 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
3969 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
3971 818c7501 2019-07-11 stsp while (path[0] == '/')
3973 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
3975 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
3976 1ee397ad 2019-07-12 stsp return NULL;
3977 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3978 818c7501 2019-07-11 stsp *rebase_status = status;
3979 1ee397ad 2019-07-12 stsp return NULL;
3982 818c7501 2019-07-11 stsp static const struct got_error *
3983 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
3984 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
3985 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
3987 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
3988 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
3989 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
3992 818c7501 2019-07-11 stsp static const struct got_error *
3993 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
3994 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
3995 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
3996 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
3998 ff0d2220 2019-07-11 stsp const struct got_error *error;
3999 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
4000 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
4002 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4003 ff0d2220 2019-07-11 stsp if (error)
4004 ff0d2220 2019-07-11 stsp return error;
4006 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4007 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
4008 ff0d2220 2019-07-11 stsp if (error) {
4009 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4010 ff0d2220 2019-07-11 stsp goto done;
4011 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
4013 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
4014 ff0d2220 2019-07-11 stsp free(new_commit_id);
4017 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
4018 ff0d2220 2019-07-11 stsp return error;
4021 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
4022 64c6d990 2019-07-11 stsp const char *path_prefix;
4023 64c6d990 2019-07-11 stsp size_t len;
4024 8ca9bd68 2019-07-25 stsp int errcode;
4027 64c6d990 2019-07-11 stsp static const struct got_error *
4028 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4029 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
4030 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
4031 64c6d990 2019-07-11 stsp struct got_repository *repo)
4033 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
4035 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4036 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4037 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
4039 64c6d990 2019-07-11 stsp return NULL;
4042 64c6d990 2019-07-11 stsp static const struct got_error *
4043 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
4044 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
4045 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
4047 64c6d990 2019-07-11 stsp const struct got_error *err;
4048 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4049 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
4050 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
4052 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
4053 64c6d990 2019-07-11 stsp return NULL;
4055 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4057 64c6d990 2019-07-11 stsp goto done;
4059 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4061 64c6d990 2019-07-11 stsp goto done;
4063 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
4064 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
4066 64c6d990 2019-07-11 stsp goto done;
4068 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
4069 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
4071 64c6d990 2019-07-11 stsp goto done;
4073 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
4074 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
4075 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
4076 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
4077 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
4078 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
4079 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
4081 64c6d990 2019-07-11 stsp if (tree1)
4082 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
4083 64c6d990 2019-07-11 stsp if (tree2)
4084 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
4085 64c6d990 2019-07-11 stsp if (commit)
4086 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
4087 64c6d990 2019-07-11 stsp if (parent_commit)
4088 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
4089 64c6d990 2019-07-11 stsp return err;
4092 ff0d2220 2019-07-11 stsp static const struct got_error *
4093 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
4094 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
4095 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4096 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
4097 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
4099 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
4100 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
4101 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
4102 af61c510 2019-07-19 stsp struct got_object_qid *qid;
4103 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
4105 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4107 af61c510 2019-07-19 stsp return err;
4109 af61c510 2019-07-19 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo);
4111 af61c510 2019-07-19 stsp goto done;
4112 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4113 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
4114 af61c510 2019-07-19 stsp if (err) {
4115 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
4116 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
4117 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
4118 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
4119 af61c510 2019-07-19 stsp "been reached?!?");
4120 af61c510 2019-07-19 stsp goto done;
4121 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4122 af61c510 2019-07-19 stsp goto done;
4123 af61c510 2019-07-19 stsp err = got_commit_graph_fetch_commits(graph, 1, repo);
4125 af61c510 2019-07-19 stsp goto done;
4127 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
4128 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
4130 af61c510 2019-07-19 stsp goto done;
4132 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
4134 af61c510 2019-07-19 stsp goto done;
4135 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4136 af61c510 2019-07-19 stsp commit_id = parent_id;
4140 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
4141 af61c510 2019-07-19 stsp return err;
4144 af61c510 2019-07-19 stsp static const struct got_error *
4145 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
4147 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
4148 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
4149 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
4150 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
4151 818c7501 2019-07-11 stsp char *cwd = NULL;
4152 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
4153 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4154 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
4155 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
4156 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4157 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
4158 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4159 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4160 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
4161 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
4162 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
4163 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
4165 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
4166 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
4168 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
4169 818c7501 2019-07-11 stsp switch (ch) {
4171 818c7501 2019-07-11 stsp abort_rebase = 1;
4174 818c7501 2019-07-11 stsp continue_rebase = 1;
4177 818c7501 2019-07-11 stsp usage_rebase();
4178 818c7501 2019-07-11 stsp /* NOTREACHED */
4182 818c7501 2019-07-11 stsp argc -= optind;
4183 818c7501 2019-07-11 stsp argv += optind;
4185 43012d58 2019-07-14 stsp #ifndef PROFILE
4186 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4187 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4188 43012d58 2019-07-14 stsp err(1, "pledge");
4190 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
4191 818c7501 2019-07-11 stsp usage_rebase();
4192 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
4193 818c7501 2019-07-11 stsp if (argc != 0)
4194 818c7501 2019-07-11 stsp usage_rebase();
4195 818c7501 2019-07-11 stsp } else if (argc != 1)
4196 818c7501 2019-07-11 stsp usage_rebase();
4198 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
4199 818c7501 2019-07-11 stsp if (cwd == NULL) {
4200 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
4201 818c7501 2019-07-11 stsp goto done;
4203 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
4204 818c7501 2019-07-11 stsp if (error)
4205 818c7501 2019-07-11 stsp goto done;
4207 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4208 818c7501 2019-07-11 stsp if (error != NULL)
4209 818c7501 2019-07-11 stsp goto done;
4211 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4212 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4213 818c7501 2019-07-11 stsp if (error)
4214 818c7501 2019-07-11 stsp goto done;
4216 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4217 818c7501 2019-07-11 stsp if (error)
4218 818c7501 2019-07-11 stsp goto done;
4220 f6794adc 2019-07-23 stsp if (abort_rebase) {
4221 818c7501 2019-07-11 stsp int did_something;
4222 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4223 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4224 f6794adc 2019-07-23 stsp goto done;
4226 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4227 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4228 3e3a69f1 2019-07-25 stsp worktree, repo);
4229 818c7501 2019-07-11 stsp if (error)
4230 818c7501 2019-07-11 stsp goto done;
4231 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
4232 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
4233 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
4234 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
4235 818c7501 2019-07-11 stsp if (error)
4236 818c7501 2019-07-11 stsp goto done;
4237 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
4238 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
4241 818c7501 2019-07-11 stsp if (continue_rebase) {
4242 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4243 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4244 f6794adc 2019-07-23 stsp goto done;
4246 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4247 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4248 3e3a69f1 2019-07-25 stsp worktree, repo);
4249 818c7501 2019-07-11 stsp if (error)
4250 818c7501 2019-07-11 stsp goto done;
4252 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
4253 01757395 2019-07-12 stsp resume_commit_id, repo);
4254 818c7501 2019-07-11 stsp if (error)
4255 818c7501 2019-07-11 stsp goto done;
4257 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
4258 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
4259 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
4260 818c7501 2019-07-11 stsp goto done;
4263 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
4264 818c7501 2019-07-11 stsp if (error != NULL)
4265 818c7501 2019-07-11 stsp goto done;
4268 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
4269 ff0d2220 2019-07-11 stsp if (error)
4270 ff0d2220 2019-07-11 stsp goto done;
4272 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
4273 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
4275 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
4276 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
4277 a51a74b3 2019-07-27 stsp base_commit_id, branch_head_commit_id, repo);
4278 818c7501 2019-07-11 stsp if (error)
4279 818c7501 2019-07-11 stsp goto done;
4280 818c7501 2019-07-11 stsp if (yca_id == NULL) {
4281 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
4282 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
4283 818c7501 2019-07-11 stsp "with work tree's branch");
4284 818c7501 2019-07-11 stsp goto done;
4287 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
4288 a51a74b3 2019-07-27 stsp if (error) {
4289 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
4290 a51a74b3 2019-07-27 stsp goto done;
4291 a51a74b3 2019-07-27 stsp error = NULL;
4293 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
4294 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
4295 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
4296 a51a74b3 2019-07-27 stsp goto done;
4298 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
4299 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
4300 818c7501 2019-07-11 stsp if (error)
4301 818c7501 2019-07-11 stsp goto done;
4304 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
4305 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4306 818c7501 2019-07-11 stsp if (error)
4307 818c7501 2019-07-11 stsp goto done;
4309 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4310 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
4311 fc66b545 2019-08-12 stsp if (pid == NULL) {
4312 fc66b545 2019-08-12 stsp if (!continue_rebase) {
4313 fc66b545 2019-08-12 stsp int did_something;
4314 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
4315 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
4316 fc66b545 2019-08-12 stsp &did_something);
4317 fc66b545 2019-08-12 stsp if (error)
4318 fc66b545 2019-08-12 stsp goto done;
4319 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
4320 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
4322 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
4323 fc66b545 2019-08-12 stsp goto done;
4325 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
4326 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
4327 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
4328 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4329 818c7501 2019-07-11 stsp commit = NULL;
4330 818c7501 2019-07-11 stsp if (error)
4331 818c7501 2019-07-11 stsp goto done;
4333 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
4334 ff0d2220 2019-07-11 stsp if (continue_rebase)
4335 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
4336 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
4338 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
4339 818c7501 2019-07-11 stsp goto done;
4342 818c7501 2019-07-11 stsp pid = NULL;
4343 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
4344 818c7501 2019-07-11 stsp commit_id = qid->id;
4345 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
4346 818c7501 2019-07-11 stsp pid = qid;
4348 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
4349 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
4350 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
4351 818c7501 2019-07-11 stsp if (error)
4352 818c7501 2019-07-11 stsp goto done;
4354 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4355 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4359 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
4360 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
4361 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
4362 818c7501 2019-07-11 stsp if (error)
4363 818c7501 2019-07-11 stsp goto done;
4366 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
4367 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
4368 818c7501 2019-07-11 stsp if (error)
4369 818c7501 2019-07-11 stsp goto done;
4370 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
4371 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
4373 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
4374 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
4376 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
4377 818c7501 2019-07-11 stsp free(branch_head_commit_id);
4378 818c7501 2019-07-11 stsp free(resume_commit_id);
4379 818c7501 2019-07-11 stsp free(yca_id);
4380 818c7501 2019-07-11 stsp if (commit)
4381 818c7501 2019-07-11 stsp got_object_commit_close(commit);
4382 818c7501 2019-07-11 stsp if (branch)
4383 818c7501 2019-07-11 stsp got_ref_close(branch);
4384 818c7501 2019-07-11 stsp if (new_base_branch)
4385 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
4386 818c7501 2019-07-11 stsp if (tmp_branch)
4387 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
4388 5ef14e63 2019-06-02 stsp if (worktree)
4389 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
4391 5ef14e63 2019-06-02 stsp got_repo_close(repo);
4392 5ef14e63 2019-06-02 stsp return error;
4395 0ebf8283 2019-07-24 stsp __dead static void
4396 0ebf8283 2019-07-24 stsp usage_histedit(void)
4398 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
4399 0ebf8283 2019-07-24 stsp getprogname());
4403 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
4404 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
4405 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
4406 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
4407 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
4409 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
4410 0ebf8283 2019-07-24 stsp unsigned char code;
4411 0ebf8283 2019-07-24 stsp const char *name;
4412 0ebf8283 2019-07-24 stsp const char *desc;
4413 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
4414 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
4415 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4416 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4417 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4418 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
4419 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
4422 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
4423 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
4424 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
4425 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4426 0ebf8283 2019-07-24 stsp char *logmsg;
4428 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4430 0ebf8283 2019-07-24 stsp static const struct got_error *
4431 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4432 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4434 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4435 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
4436 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4439 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4441 0ebf8283 2019-07-24 stsp goto done;
4443 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
4445 0ebf8283 2019-07-24 stsp goto done;
4447 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
4449 0ebf8283 2019-07-24 stsp goto done;
4451 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4452 0ebf8283 2019-07-24 stsp if (n < 0)
4453 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4455 0ebf8283 2019-07-24 stsp if (commit)
4456 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4457 0ebf8283 2019-07-24 stsp free(id_str);
4458 0ebf8283 2019-07-24 stsp free(logmsg);
4459 0ebf8283 2019-07-24 stsp return err;
4462 0ebf8283 2019-07-24 stsp static const struct got_error *
4463 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4464 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4466 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4467 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
4469 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
4470 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4472 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4473 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4479 0ebf8283 2019-07-24 stsp return err;
4482 0ebf8283 2019-07-24 stsp static const struct got_error *
4483 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
4485 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4488 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
4489 0ebf8283 2019-07-24 stsp if (n < 0)
4490 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4492 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4493 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4494 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
4495 0ebf8283 2019-07-24 stsp cmd->desc);
4496 0ebf8283 2019-07-24 stsp if (n < 0) {
4497 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4501 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
4502 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
4503 0ebf8283 2019-07-24 stsp if (n < 0)
4504 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
4505 0ebf8283 2019-07-24 stsp return err;
4508 0ebf8283 2019-07-24 stsp static const struct got_error *
4509 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
4511 0ebf8283 2019-07-24 stsp static char msg[42];
4514 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4516 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
4517 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4519 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4522 0ebf8283 2019-07-24 stsp static const struct got_error *
4523 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4524 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
4526 0ebf8283 2019-07-24 stsp const struct got_error *err;
4527 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
4528 0ebf8283 2019-07-24 stsp char *id_str;
4530 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4532 0ebf8283 2019-07-24 stsp return err;
4534 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4536 0ebf8283 2019-07-24 stsp goto done;
4538 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4539 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4540 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(folded_commit)) == -1) {
4541 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4542 0ebf8283 2019-07-24 stsp goto done;
4545 0ebf8283 2019-07-24 stsp if (folded_commit)
4546 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
4547 0ebf8283 2019-07-24 stsp free(id_str);
4548 0ebf8283 2019-07-24 stsp return err;
4551 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
4552 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
4554 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
4556 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
4557 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4558 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
4559 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4560 3f9de99f 2019-07-24 stsp folded = prev;
4561 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
4564 0ebf8283 2019-07-24 stsp return folded;
4567 0ebf8283 2019-07-24 stsp static const struct got_error *
4568 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4569 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4571 0ebf8283 2019-07-24 stsp char *logmsg_path = NULL, *id_str = NULL;
4572 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4573 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4574 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4576 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
4578 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4580 0ebf8283 2019-07-24 stsp return err;
4582 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
4583 0ebf8283 2019-07-24 stsp if (folded) {
4584 0ebf8283 2019-07-24 stsp while (folded != hle) {
4585 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4586 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4589 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
4590 0ebf8283 2019-07-24 stsp logmsg, repo);
4592 0ebf8283 2019-07-24 stsp goto done;
4593 0ebf8283 2019-07-24 stsp free(logmsg);
4594 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4595 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
4599 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4601 0ebf8283 2019-07-24 stsp goto done;
4602 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
4603 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
4604 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", id_str,
4605 0ebf8283 2019-07-24 stsp got_object_commit_get_logmsg(commit)) == -1) {
4606 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
4607 0ebf8283 2019-07-24 stsp goto done;
4609 0ebf8283 2019-07-24 stsp free(logmsg);
4610 0ebf8283 2019-07-24 stsp logmsg = new_msg;
4612 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
4614 0ebf8283 2019-07-24 stsp goto done;
4616 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4618 0ebf8283 2019-07-24 stsp goto done;
4620 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
4621 0ebf8283 2019-07-24 stsp close(fd);
4623 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4625 0ebf8283 2019-07-24 stsp goto done;
4627 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4628 0ebf8283 2019-07-24 stsp if (err) {
4629 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4630 0ebf8283 2019-07-24 stsp goto done;
4631 0ebf8283 2019-07-24 stsp err = NULL;
4632 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(got_object_commit_get_logmsg(commit));
4633 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL)
4634 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4637 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4638 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
4639 0ebf8283 2019-07-24 stsp free(logmsg_path);
4640 0ebf8283 2019-07-24 stsp free(logmsg);
4641 0ebf8283 2019-07-24 stsp free(editor);
4642 0ebf8283 2019-07-24 stsp if (commit)
4643 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4644 0ebf8283 2019-07-24 stsp return err;
4647 0ebf8283 2019-07-24 stsp static const struct got_error *
4648 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
4649 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
4651 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4652 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
4653 0ebf8283 2019-07-24 stsp size_t size;
4654 0ebf8283 2019-07-24 stsp ssize_t len;
4655 0ebf8283 2019-07-24 stsp int lineno = 0, i;
4656 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
4657 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4658 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
4660 0ebf8283 2019-07-24 stsp for (;;) {
4661 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
4662 0ebf8283 2019-07-24 stsp if (len == -1) {
4663 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
4664 0ebf8283 2019-07-24 stsp if (feof(f))
4666 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
4667 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
4672 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4674 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
4675 0ebf8283 2019-07-24 stsp free(line);
4676 0ebf8283 2019-07-24 stsp line = NULL;
4679 0ebf8283 2019-07-24 stsp cmd = NULL;
4680 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
4681 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
4682 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4683 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
4684 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
4687 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4692 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
4693 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4696 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
4698 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
4699 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
4700 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
4703 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
4704 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
4708 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
4709 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
4710 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
4714 0ebf8283 2019-07-24 stsp free(line);
4715 0ebf8283 2019-07-24 stsp line = NULL;
4719 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
4721 0ebf8283 2019-07-24 stsp *end = '\0';
4723 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
4724 0ebf8283 2019-07-24 stsp if (err) {
4725 0ebf8283 2019-07-24 stsp /* override error code */
4726 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
4730 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
4731 0ebf8283 2019-07-24 stsp if (hle == NULL) {
4732 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
4735 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
4736 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
4737 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
4738 0ebf8283 2019-07-24 stsp commit_id = NULL;
4739 0ebf8283 2019-07-24 stsp free(line);
4740 0ebf8283 2019-07-24 stsp line = NULL;
4741 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4744 0ebf8283 2019-07-24 stsp free(line);
4745 0ebf8283 2019-07-24 stsp free(commit_id);
4746 0ebf8283 2019-07-24 stsp return err;
4749 0ebf8283 2019-07-24 stsp static const struct got_error *
4750 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
4751 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4753 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
4754 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
4755 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4756 bfce7f83 2019-07-27 stsp static char msg[80];
4757 bfce7f83 2019-07-27 stsp char *id_str;
4759 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
4760 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
4761 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
4762 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
4763 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
4765 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
4766 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4767 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
4770 bfce7f83 2019-07-27 stsp if (hle == NULL) {
4771 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
4773 bfce7f83 2019-07-27 stsp return err;
4774 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
4775 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
4776 bfce7f83 2019-07-27 stsp free(id_str);
4777 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
4781 bfce7f83 2019-07-27 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD)
4782 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
4783 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
4785 bfce7f83 2019-07-27 stsp return NULL;
4788 bfce7f83 2019-07-27 stsp static const struct got_error *
4789 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
4790 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
4791 bfce7f83 2019-07-27 stsp struct got_repository *repo)
4793 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4794 0ebf8283 2019-07-24 stsp char *editor;
4795 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4797 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
4799 0ebf8283 2019-07-24 stsp return err;
4801 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
4802 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
4803 0ebf8283 2019-07-24 stsp goto done;
4806 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4807 0ebf8283 2019-07-24 stsp if (f == NULL) {
4808 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
4809 0ebf8283 2019-07-24 stsp goto done;
4811 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4813 bfce7f83 2019-07-27 stsp goto done;
4815 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
4817 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4818 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4819 0ebf8283 2019-07-24 stsp free(editor);
4820 0ebf8283 2019-07-24 stsp return err;
4823 0ebf8283 2019-07-24 stsp static const struct got_error *
4824 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
4825 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
4827 0ebf8283 2019-07-24 stsp static const struct got_error *
4828 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
4829 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
4831 0ebf8283 2019-07-24 stsp const struct got_error *err;
4832 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4833 0ebf8283 2019-07-24 stsp char *path = NULL;
4835 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
4837 0ebf8283 2019-07-24 stsp return err;
4839 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
4841 0ebf8283 2019-07-24 stsp goto done;
4843 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
4845 0ebf8283 2019-07-24 stsp goto done;
4847 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
4848 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4849 0ebf8283 2019-07-24 stsp goto done;
4853 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
4854 0ebf8283 2019-07-24 stsp if (err) {
4855 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4856 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4857 0ebf8283 2019-07-24 stsp goto done;
4858 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
4859 0ebf8283 2019-07-24 stsp commits, path, repo);
4862 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4863 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4864 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
4865 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
4866 0ebf8283 2019-07-24 stsp free(path);
4867 0ebf8283 2019-07-24 stsp return err;
4870 0ebf8283 2019-07-24 stsp static const struct got_error *
4871 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
4872 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4874 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4875 0ebf8283 2019-07-24 stsp char *path = NULL;
4876 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4877 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
4878 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
4880 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
4882 0ebf8283 2019-07-24 stsp return err;
4884 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
4885 0ebf8283 2019-07-24 stsp if (f == NULL) {
4886 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4887 0ebf8283 2019-07-24 stsp goto done;
4889 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
4890 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
4895 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
4896 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
4897 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
4898 0ebf8283 2019-07-24 stsp if (n < 0) {
4899 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
4905 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4906 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4907 0ebf8283 2019-07-24 stsp free(path);
4908 0ebf8283 2019-07-24 stsp if (commit)
4909 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
4910 0ebf8283 2019-07-24 stsp return err;
4914 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
4916 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
4918 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
4919 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
4920 bfce7f83 2019-07-27 stsp free(hle);
4924 0ebf8283 2019-07-24 stsp static const struct got_error *
4925 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
4926 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4928 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4929 0ebf8283 2019-07-24 stsp FILE *f = NULL;
4931 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
4932 0ebf8283 2019-07-24 stsp if (f == NULL) {
4933 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
4934 0ebf8283 2019-07-24 stsp goto done;
4937 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
4939 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
4940 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
4941 0ebf8283 2019-07-24 stsp return err;
4944 0ebf8283 2019-07-24 stsp static const struct got_error *
4945 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
4946 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
4947 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
4949 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
4950 0ebf8283 2019-07-24 stsp int resp = ' ';
4952 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
4953 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
4954 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
4955 0ebf8283 2019-07-24 stsp resp = getchar();
4956 a61a4414 2019-08-07 stsp if (resp == '\n')
4957 a61a4414 2019-08-07 stsp resp = getchar();
4958 426ebf2e 2019-07-25 stsp if (resp == 'c') {
4959 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
4960 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
4962 426ebf2e 2019-07-25 stsp if (err) {
4963 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4964 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4966 bfce7f83 2019-07-27 stsp prev_err = err;
4967 426ebf2e 2019-07-25 stsp resp = ' ';
4971 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
4972 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
4973 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
4974 0ebf8283 2019-07-24 stsp commits, repo);
4975 426ebf2e 2019-07-25 stsp if (err) {
4976 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4977 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
4979 bfce7f83 2019-07-27 stsp prev_err = err;
4980 426ebf2e 2019-07-25 stsp resp = ' ';
4984 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
4985 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
4988 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
4991 0ebf8283 2019-07-24 stsp return err;
4994 0ebf8283 2019-07-24 stsp static const struct got_error *
4995 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
4996 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4997 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
4999 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5000 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5001 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5002 3e3a69f1 2019-07-25 stsp branch, repo);
5005 0ebf8283 2019-07-24 stsp static const struct got_error *
5006 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
5007 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5009 0ebf8283 2019-07-24 stsp const struct got_error *err;
5010 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5012 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
5014 0ebf8283 2019-07-24 stsp goto done;
5016 0ebf8283 2019-07-24 stsp if (new_id) {
5017 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
5019 0ebf8283 2019-07-24 stsp goto done;
5022 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
5023 0ebf8283 2019-07-24 stsp if (new_id_str)
5024 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
5026 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5027 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
5028 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
5029 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5030 0ebf8283 2019-07-24 stsp goto done;
5032 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
5034 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5036 0ebf8283 2019-07-24 stsp goto done;
5039 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
5040 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
5041 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
5042 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
5043 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5045 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
5046 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
5047 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5055 0ebf8283 2019-07-24 stsp free(old_id_str);
5056 0ebf8283 2019-07-24 stsp free(new_id_str);
5057 0ebf8283 2019-07-24 stsp return err;
5060 0ebf8283 2019-07-24 stsp static const struct got_error *
5061 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
5062 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5063 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5064 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5066 0ebf8283 2019-07-24 stsp const struct got_error *err;
5067 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5068 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
5070 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5071 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
5072 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5074 0ebf8283 2019-07-24 stsp return err;
5077 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5079 0ebf8283 2019-07-24 stsp return err;
5081 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5082 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
5083 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
5084 0ebf8283 2019-07-24 stsp if (err) {
5085 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5086 0ebf8283 2019-07-24 stsp goto done;
5087 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
5089 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
5090 0ebf8283 2019-07-24 stsp free(new_commit_id);
5093 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5094 0ebf8283 2019-07-24 stsp return err;
5097 0ebf8283 2019-07-24 stsp static const struct got_error *
5098 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
5099 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5101 0ebf8283 2019-07-24 stsp const struct got_error *error;
5102 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5104 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5106 0ebf8283 2019-07-24 stsp if (error)
5107 0ebf8283 2019-07-24 stsp return error;
5109 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5110 0ebf8283 2019-07-24 stsp if (error)
5111 0ebf8283 2019-07-24 stsp return error;
5113 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
5114 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5115 0ebf8283 2019-07-24 stsp return error;
5118 0ebf8283 2019-07-24 stsp static const struct got_error *
5119 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
5121 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
5122 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
5123 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5124 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
5125 0ebf8283 2019-07-24 stsp char *cwd = NULL;
5126 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
5127 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
5128 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
5129 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
5130 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
5131 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5132 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
5133 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5134 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
5135 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5136 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
5137 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
5138 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
5139 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
5140 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
5141 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5143 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
5144 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
5145 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
5147 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
5148 0ebf8283 2019-07-24 stsp switch (ch) {
5150 0ebf8283 2019-07-24 stsp abort_edit = 1;
5153 0ebf8283 2019-07-24 stsp continue_edit = 1;
5156 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
5159 0ebf8283 2019-07-24 stsp usage_histedit();
5160 0ebf8283 2019-07-24 stsp /* NOTREACHED */
5164 0ebf8283 2019-07-24 stsp argc -= optind;
5165 0ebf8283 2019-07-24 stsp argv += optind;
5167 0ebf8283 2019-07-24 stsp #ifndef PROFILE
5168 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5169 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
5170 0ebf8283 2019-07-24 stsp err(1, "pledge");
5172 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
5173 0ebf8283 2019-07-24 stsp usage_histedit();
5174 0ebf8283 2019-07-24 stsp if (argc != 0)
5175 0ebf8283 2019-07-24 stsp usage_histedit();
5178 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
5179 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
5180 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
5181 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
5182 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
5183 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
5186 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
5187 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
5188 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
5189 0ebf8283 2019-07-24 stsp goto done;
5191 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
5192 0ebf8283 2019-07-24 stsp if (error)
5193 0ebf8283 2019-07-24 stsp goto done;
5195 0ebf8283 2019-07-24 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5196 0ebf8283 2019-07-24 stsp if (error != NULL)
5197 0ebf8283 2019-07-24 stsp goto done;
5199 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5200 0ebf8283 2019-07-24 stsp if (error)
5201 0ebf8283 2019-07-24 stsp goto done;
5202 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
5203 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
5204 0ebf8283 2019-07-24 stsp goto done;
5207 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
5208 0ebf8283 2019-07-24 stsp if (error)
5209 0ebf8283 2019-07-24 stsp goto done;
5211 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
5212 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5213 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5214 3e3a69f1 2019-07-25 stsp worktree, repo);
5215 0ebf8283 2019-07-24 stsp if (error)
5216 0ebf8283 2019-07-24 stsp goto done;
5217 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5218 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5219 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
5220 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
5221 0ebf8283 2019-07-24 stsp if (error)
5222 0ebf8283 2019-07-24 stsp goto done;
5223 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
5224 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5225 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
5226 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
5227 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5228 0ebf8283 2019-07-24 stsp goto done;
5231 0ebf8283 2019-07-24 stsp if (continue_edit) {
5232 0ebf8283 2019-07-24 stsp char *path;
5234 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
5235 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5236 0ebf8283 2019-07-24 stsp goto done;
5239 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
5240 0ebf8283 2019-07-24 stsp if (error)
5241 0ebf8283 2019-07-24 stsp goto done;
5243 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
5244 0ebf8283 2019-07-24 stsp free(path);
5245 0ebf8283 2019-07-24 stsp if (error)
5246 0ebf8283 2019-07-24 stsp goto done;
5248 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5249 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5250 3e3a69f1 2019-07-25 stsp worktree, repo);
5251 0ebf8283 2019-07-24 stsp if (error)
5252 0ebf8283 2019-07-24 stsp goto done;
5254 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5255 0ebf8283 2019-07-24 stsp if (error)
5256 0ebf8283 2019-07-24 stsp goto done;
5258 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5259 0ebf8283 2019-07-24 stsp head_commit_id);
5260 0ebf8283 2019-07-24 stsp if (error)
5261 0ebf8283 2019-07-24 stsp goto done;
5262 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5263 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5264 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5265 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5266 3aac7cf7 2019-07-25 stsp goto done;
5268 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5269 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
5270 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5271 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5272 0ebf8283 2019-07-24 stsp commit = NULL;
5273 0ebf8283 2019-07-24 stsp if (error)
5274 0ebf8283 2019-07-24 stsp goto done;
5276 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
5277 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5278 0ebf8283 2019-07-24 stsp goto done;
5281 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
5282 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
5283 0ebf8283 2019-07-24 stsp if (error != NULL)
5284 0ebf8283 2019-07-24 stsp goto done;
5286 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
5287 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
5288 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
5289 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
5290 c7d20a3f 2019-07-30 stsp goto done;
5293 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
5294 bfce7f83 2019-07-27 stsp got_ref_close(branch);
5295 bfce7f83 2019-07-27 stsp branch = NULL;
5296 0ebf8283 2019-07-24 stsp if (error)
5297 0ebf8283 2019-07-24 stsp goto done;
5299 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5300 0ebf8283 2019-07-24 stsp head_commit_id);
5301 0ebf8283 2019-07-24 stsp if (error)
5302 0ebf8283 2019-07-24 stsp goto done;
5303 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5304 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5305 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
5306 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5307 3aac7cf7 2019-07-25 stsp goto done;
5309 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
5310 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
5311 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
5312 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
5313 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5314 0ebf8283 2019-07-24 stsp commit = NULL;
5315 0ebf8283 2019-07-24 stsp if (error)
5316 0ebf8283 2019-07-24 stsp goto done;
5318 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5319 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
5320 bfce7f83 2019-07-27 stsp if (error)
5321 bfce7f83 2019-07-27 stsp goto done;
5323 0ebf8283 2019-07-24 stsp if (edit_script_path) {
5324 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
5325 0ebf8283 2019-07-24 stsp edit_script_path, repo);
5326 6ba2bea2 2019-07-27 stsp if (error) {
5327 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5328 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5329 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5330 0ebf8283 2019-07-24 stsp goto done;
5333 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
5335 6ba2bea2 2019-07-27 stsp if (error) {
5336 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5337 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5338 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5339 0ebf8283 2019-07-24 stsp goto done;
5344 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
5346 6ba2bea2 2019-07-27 stsp if (error) {
5347 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
5348 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
5349 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
5350 0ebf8283 2019-07-24 stsp goto done;
5355 0ebf8283 2019-07-24 stsp error = histedit_check_script(&histedit_cmds, &commits, repo);
5356 0ebf8283 2019-07-24 stsp if (error)
5357 0ebf8283 2019-07-24 stsp goto done;
5359 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5360 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
5361 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
5362 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
5365 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
5366 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
5367 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
5368 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
5371 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
5372 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
5374 0ebf8283 2019-07-24 stsp if (error)
5375 0ebf8283 2019-07-24 stsp goto done;
5379 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
5380 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5381 0ebf8283 2019-07-24 stsp if (error)
5382 0ebf8283 2019-07-24 stsp goto done;
5386 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
5387 0ebf8283 2019-07-24 stsp hle->commit_id);
5388 0ebf8283 2019-07-24 stsp if (error)
5389 0ebf8283 2019-07-24 stsp goto done;
5390 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5391 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
5393 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
5394 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
5395 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5396 0ebf8283 2019-07-24 stsp if (error)
5397 0ebf8283 2019-07-24 stsp goto done;
5398 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5399 0ebf8283 2019-07-24 stsp commit = NULL;
5401 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5402 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5406 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5407 0ebf8283 2019-07-24 stsp char *id_str;
5408 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
5409 0ebf8283 2019-07-24 stsp if (error)
5410 0ebf8283 2019-07-24 stsp goto done;
5411 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
5413 0ebf8283 2019-07-24 stsp free(id_str);
5414 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5415 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
5416 3e3a69f1 2019-07-25 stsp fileindex);
5417 0ebf8283 2019-07-24 stsp goto done;
5420 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5421 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
5422 0ebf8283 2019-07-24 stsp if (error)
5423 0ebf8283 2019-07-24 stsp goto done;
5427 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
5428 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
5429 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5430 0ebf8283 2019-07-24 stsp if (error)
5431 0ebf8283 2019-07-24 stsp goto done;
5434 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5435 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
5436 0ebf8283 2019-07-24 stsp if (error)
5437 0ebf8283 2019-07-24 stsp goto done;
5438 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5439 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
5441 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
5442 3e3a69f1 2019-07-25 stsp branch, repo);
5444 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
5445 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
5446 0ebf8283 2019-07-24 stsp free(head_commit_id);
5447 0ebf8283 2019-07-24 stsp free(base_commit_id);
5448 0ebf8283 2019-07-24 stsp free(resume_commit_id);
5449 0ebf8283 2019-07-24 stsp if (commit)
5450 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5451 0ebf8283 2019-07-24 stsp if (branch)
5452 0ebf8283 2019-07-24 stsp got_ref_close(branch);
5453 0ebf8283 2019-07-24 stsp if (tmp_branch)
5454 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
5455 0ebf8283 2019-07-24 stsp if (worktree)
5456 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
5458 715dc77e 2019-08-03 stsp got_repo_close(repo);
5459 715dc77e 2019-08-03 stsp return error;
5462 715dc77e 2019-08-03 stsp __dead static void
5463 715dc77e 2019-08-03 stsp usage_stage(void)
5465 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
5466 f3055044 2019-08-07 stsp "[file-path ...]\n",
5467 715dc77e 2019-08-03 stsp getprogname());
5471 715dc77e 2019-08-03 stsp static const struct got_error *
5472 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
5473 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5474 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
5476 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
5477 408b4ebc 2019-08-03 stsp char *id_str = NULL;
5479 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
5480 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
5481 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5482 408b4ebc 2019-08-03 stsp return NULL;
5484 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
5485 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
5486 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
5488 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
5490 408b4ebc 2019-08-03 stsp return err;
5492 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
5493 408b4ebc 2019-08-03 stsp free(id_str);
5494 dc424a06 2019-08-07 stsp return NULL;
5497 dc424a06 2019-08-07 stsp static const struct got_error *
5498 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
5500 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
5501 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
5502 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
5503 715dc77e 2019-08-03 stsp char *cwd = NULL;
5504 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
5505 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
5506 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
5507 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
5508 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5509 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5511 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
5513 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
5514 715dc77e 2019-08-03 stsp switch (ch) {
5516 408b4ebc 2019-08-03 stsp list_stage = 1;
5519 dc424a06 2019-08-07 stsp pflag = 1;
5522 dc424a06 2019-08-07 stsp patch_script_path = optarg;
5525 715dc77e 2019-08-03 stsp usage_stage();
5526 715dc77e 2019-08-03 stsp /* NOTREACHED */
5530 715dc77e 2019-08-03 stsp argc -= optind;
5531 715dc77e 2019-08-03 stsp argv += optind;
5533 715dc77e 2019-08-03 stsp #ifndef PROFILE
5534 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5535 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
5536 715dc77e 2019-08-03 stsp err(1, "pledge");
5538 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
5539 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
5540 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
5541 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
5543 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
5544 715dc77e 2019-08-03 stsp if (cwd == NULL) {
5545 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
5546 715dc77e 2019-08-03 stsp goto done;
5549 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5550 715dc77e 2019-08-03 stsp if (error)
5551 715dc77e 2019-08-03 stsp goto done;
5553 715dc77e 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5554 715dc77e 2019-08-03 stsp if (error != NULL)
5555 715dc77e 2019-08-03 stsp goto done;
5557 dc424a06 2019-08-07 stsp if (patch_script_path) {
5558 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
5559 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
5560 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
5561 dc424a06 2019-08-07 stsp patch_script_path);
5562 dc424a06 2019-08-07 stsp goto done;
5565 715dc77e 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5566 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
5567 715dc77e 2019-08-03 stsp if (error)
5568 715dc77e 2019-08-03 stsp goto done;
5570 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5571 6d022e97 2019-08-04 stsp if (error)
5572 6d022e97 2019-08-04 stsp goto done;
5574 6d022e97 2019-08-04 stsp if (list_stage)
5575 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
5576 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
5578 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5579 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
5580 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
5581 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
5582 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
5585 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5586 2e1f37b0 2019-08-08 stsp error == NULL)
5587 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5589 ad493afc 2019-08-03 stsp got_repo_close(repo);
5590 ad493afc 2019-08-03 stsp if (worktree)
5591 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
5592 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5593 ad493afc 2019-08-03 stsp free((char *)pe->path);
5594 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
5595 ad493afc 2019-08-03 stsp free(cwd);
5596 ad493afc 2019-08-03 stsp return error;
5599 ad493afc 2019-08-03 stsp __dead static void
5600 ad493afc 2019-08-03 stsp usage_unstage(void)
5602 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
5603 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
5604 ad493afc 2019-08-03 stsp getprogname());
5609 ad493afc 2019-08-03 stsp static const struct got_error *
5610 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
5612 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
5613 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
5614 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
5615 ad493afc 2019-08-03 stsp char *cwd = NULL;
5616 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
5617 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
5618 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
5619 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
5620 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
5621 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
5623 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
5625 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
5626 ad493afc 2019-08-03 stsp switch (ch) {
5628 2e1f37b0 2019-08-08 stsp pflag = 1;
5631 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
5634 ad493afc 2019-08-03 stsp usage_unstage();
5635 ad493afc 2019-08-03 stsp /* NOTREACHED */
5639 ad493afc 2019-08-03 stsp argc -= optind;
5640 ad493afc 2019-08-03 stsp argv += optind;
5642 ad493afc 2019-08-03 stsp #ifndef PROFILE
5643 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5644 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
5645 ad493afc 2019-08-03 stsp err(1, "pledge");
5647 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
5648 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
5650 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
5651 ad493afc 2019-08-03 stsp if (cwd == NULL) {
5652 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
5653 ad493afc 2019-08-03 stsp goto done;
5656 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
5657 ad493afc 2019-08-03 stsp if (error)
5658 ad493afc 2019-08-03 stsp goto done;
5660 ad493afc 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5661 ad493afc 2019-08-03 stsp if (error != NULL)
5662 ad493afc 2019-08-03 stsp goto done;
5664 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
5665 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
5666 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
5667 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
5668 2e1f37b0 2019-08-08 stsp patch_script_path);
5669 2e1f37b0 2019-08-08 stsp goto done;
5673 ad493afc 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5674 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
5675 ad493afc 2019-08-03 stsp if (error)
5676 ad493afc 2019-08-03 stsp goto done;
5678 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5679 ad493afc 2019-08-03 stsp if (error)
5680 ad493afc 2019-08-03 stsp goto done;
5682 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
5683 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
5684 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
5685 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
5687 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
5688 2e1f37b0 2019-08-08 stsp error == NULL)
5689 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
5691 0ebf8283 2019-07-24 stsp got_repo_close(repo);
5692 715dc77e 2019-08-03 stsp if (worktree)
5693 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
5694 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
5695 715dc77e 2019-08-03 stsp free((char *)pe->path);
5696 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
5697 715dc77e 2019-08-03 stsp free(cwd);
5698 0ebf8283 2019-07-24 stsp return error;
