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 e6209546 2019-08-22 stsp #include "got_cancel.h"
45 c09a553d 2018-03-12 stsp #include "got_worktree.h"
46 79109fed 2018-03-27 stsp #include "got_diff.h"
47 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
48 404c43c4 2018-06-21 stsp #include "got_blame.h"
49 63219cd2 2019-01-04 stsp #include "got_privsep.h"
50 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
52 5c860e29 2018-03-12 stsp #ifndef nitems
53 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
56 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
57 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
60 99437157 2018-11-11 stsp catch_sigint(int signo)
62 99437157 2018-11-11 stsp sigint_received = 1;
66 99437157 2018-11-11 stsp catch_sigpipe(int signo)
68 99437157 2018-11-11 stsp sigpipe_received = 1;
72 8cfb4057 2019-07-09 stsp struct got_cmd {
73 5c860e29 2018-03-12 stsp const char *cmd_name;
74 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
75 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
76 97b3a7be 2019-07-09 stsp const char *cmd_alias;
79 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
80 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
81 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
83 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
84 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
85 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
86 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
87 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
88 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
89 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
90 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
91 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
92 d00136be 2019-03-26 stsp __dead static void usage_add(void);
93 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
94 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
95 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
96 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
97 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
98 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
99 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
100 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
101 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
102 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
104 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
105 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
106 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
107 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
108 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
110 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
111 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
112 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
113 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
114 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
115 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
116 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
117 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
118 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
119 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
120 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
121 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
122 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
123 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
124 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
125 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
126 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
128 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
129 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
130 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
131 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
132 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
133 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
134 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
135 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
136 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
137 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
138 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
139 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
140 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
141 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
142 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
143 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
144 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
145 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
146 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
147 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
148 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
149 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
150 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
151 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
154 ce5b7c56 2019-07-09 stsp static void
155 ce5b7c56 2019-07-09 stsp list_commands(void)
159 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
160 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
161 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
162 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
164 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
168 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
170 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
171 5c860e29 2018-03-12 stsp unsigned int i;
173 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
175 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
177 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
178 5c860e29 2018-03-12 stsp switch (ch) {
186 ce5b7c56 2019-07-09 stsp usage(hflag);
187 5c860e29 2018-03-12 stsp /* NOTREACHED */
191 5c860e29 2018-03-12 stsp argc -= optind;
192 5c860e29 2018-03-12 stsp argv += optind;
193 1e70621d 2018-03-27 stsp optind = 0;
195 53ccebc2 2019-07-30 stsp if (Vflag) {
196 53ccebc2 2019-07-30 stsp got_version_print_str();
200 5c860e29 2018-03-12 stsp if (argc <= 0)
201 ce5b7c56 2019-07-09 stsp usage(hflag);
203 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
204 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
206 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
207 d7d4f210 2018-03-12 stsp const struct got_error *error;
209 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
211 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
212 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
216 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
218 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
219 80d5f134 2018-11-11 stsp if (error && !(sigint_received || sigpipe_received)) {
220 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
227 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
228 ce5b7c56 2019-07-09 stsp list_commands();
232 4ed7e80c 2018-05-20 stsp __dead static void
233 ce5b7c56 2019-07-09 stsp usage(int hflag)
235 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
236 53ccebc2 2019-07-30 stsp getprogname());
238 ce5b7c56 2019-07-09 stsp list_commands();
242 0266afb7 2019-01-04 stsp static const struct got_error *
243 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
245 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
246 e2ba3d07 2019-05-13 stsp const char *editor;
248 8920fa04 2019-08-18 stsp *abspath = NULL;
250 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
251 e2ba3d07 2019-05-13 stsp if (editor == NULL)
252 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
254 0ee7065d 2019-05-13 stsp if (editor) {
255 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
257 0ee7065d 2019-05-13 stsp return err;
260 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
261 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
262 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
263 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
266 e2ba3d07 2019-05-13 stsp return NULL;
269 e2ba3d07 2019-05-13 stsp static const struct got_error *
270 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
271 c530dc23 2019-07-23 stsp const char *worktree_path)
273 163ce85a 2019-05-13 stsp const struct got_error *err;
275 37c06ea4 2019-07-15 stsp #ifdef PROFILE
276 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
277 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
279 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
280 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
282 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
283 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
285 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
286 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
288 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
289 163ce85a 2019-05-13 stsp if (err != NULL)
290 163ce85a 2019-05-13 stsp return err;
292 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
293 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
295 0266afb7 2019-01-04 stsp return NULL;
298 2c7829a4 2019-06-17 stsp __dead static void
299 2c7829a4 2019-06-17 stsp usage_init(void)
301 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
305 2c7829a4 2019-06-17 stsp static const struct got_error *
306 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
308 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
309 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
312 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
313 2c7829a4 2019-06-17 stsp switch (ch) {
315 2c7829a4 2019-06-17 stsp usage_init();
316 2c7829a4 2019-06-17 stsp /* NOTREACHED */
320 2c7829a4 2019-06-17 stsp argc -= optind;
321 2c7829a4 2019-06-17 stsp argv += optind;
323 2c7829a4 2019-06-17 stsp #ifndef PROFILE
324 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
325 2c7829a4 2019-06-17 stsp err(1, "pledge");
327 2c7829a4 2019-06-17 stsp if (argc != 1)
328 bc20e173 2019-06-17 stsp usage_init();
330 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
331 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
332 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
334 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
336 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
337 2c7829a4 2019-06-17 stsp if (error &&
338 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
341 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
345 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
346 2c7829a4 2019-06-17 stsp if (error != NULL)
350 3ce1b845 2019-07-15 stsp free(repo_path);
351 3ce1b845 2019-07-15 stsp return error;
354 3ce1b845 2019-07-15 stsp __dead static void
355 3ce1b845 2019-07-15 stsp usage_import(void)
357 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
358 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
363 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
366 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
367 3ce1b845 2019-07-15 stsp int st = -1;
369 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
370 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
371 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
373 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
375 3ce1b845 2019-07-15 stsp goto doneediting;
377 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
378 3ce1b845 2019-07-15 stsp _exit(127);
381 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
382 3ce1b845 2019-07-15 stsp if (errno != EINTR)
385 3ce1b845 2019-07-15 stsp doneediting:
386 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
387 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
388 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
390 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
391 3ce1b845 2019-07-15 stsp errno = EINTR;
395 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
398 3ce1b845 2019-07-15 stsp static const struct got_error *
399 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
400 3ce1b845 2019-07-15 stsp const char *initial_content)
402 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
403 3ce1b845 2019-07-15 stsp char buf[1024];
404 3ce1b845 2019-07-15 stsp struct stat st, st2;
406 3ce1b845 2019-07-15 stsp int content_changed = 0;
407 3ce1b845 2019-07-15 stsp size_t len;
409 3ce1b845 2019-07-15 stsp *logmsg = NULL;
411 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
412 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
414 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
415 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
417 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
418 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
420 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
421 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
422 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
424 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
425 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
426 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
427 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
430 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
431 3ce1b845 2019-07-15 stsp if (fp == NULL) {
432 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
435 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
436 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
437 3ce1b845 2019-07-15 stsp content_changed = 1;
438 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
439 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
440 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
442 3ce1b845 2019-07-15 stsp fclose(fp);
444 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
445 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
449 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
450 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
451 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
454 3ce1b845 2019-07-15 stsp free(*logmsg);
455 3ce1b845 2019-07-15 stsp *logmsg = NULL;
457 3ce1b845 2019-07-15 stsp return err;
460 3ce1b845 2019-07-15 stsp static const struct got_error *
461 3ce1b845 2019-07-15 stsp collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
462 3ce1b845 2019-07-15 stsp const char *branch_name)
464 3ce1b845 2019-07-15 stsp char *initial_content = NULL, *logmsg_path = NULL;
465 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
468 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
469 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
470 3ce1b845 2019-07-15 stsp branch_name) == -1)
471 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
473 3ce1b845 2019-07-15 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
477 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
480 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
482 3ce1b845 2019-07-15 stsp free(initial_content);
483 3ce1b845 2019-07-15 stsp free(logmsg_path);
484 3ce1b845 2019-07-15 stsp return err;
487 3ce1b845 2019-07-15 stsp static const struct got_error *
488 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
490 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
491 3ce1b845 2019-07-15 stsp return NULL;
494 3ce1b845 2019-07-15 stsp static const struct got_error *
495 84792843 2019-08-09 stsp get_author(const char **author)
497 84792843 2019-08-09 stsp const char *got_author;
499 84792843 2019-08-09 stsp *author = NULL;
501 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
502 84792843 2019-08-09 stsp if (got_author == NULL) {
503 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
504 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
507 84792843 2019-08-09 stsp *author = got_author;
510 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
511 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
513 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
514 84792843 2019-08-09 stsp got_author++;
515 84792843 2019-08-09 stsp if (*got_author != '<')
516 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
517 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
518 84792843 2019-08-09 stsp got_author++;
519 84792843 2019-08-09 stsp if (*got_author != '@')
520 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
521 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
522 84792843 2019-08-09 stsp got_author++;
523 84792843 2019-08-09 stsp if (*got_author != '>')
524 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_EMAIL);
526 84792843 2019-08-09 stsp return NULL;
529 84792843 2019-08-09 stsp static const struct got_error *
530 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
532 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
533 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
534 3ce1b845 2019-07-15 stsp char *editor = NULL;
535 84792843 2019-08-09 stsp const char *author;
536 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
537 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
538 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
539 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
540 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
542 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
543 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
545 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
547 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
548 3ce1b845 2019-07-15 stsp switch (ch) {
550 3ce1b845 2019-07-15 stsp branch_name = optarg;
553 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
554 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
555 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
560 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
561 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
562 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
567 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
569 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
575 b2b65d18 2019-08-22 stsp usage_import();
576 3ce1b845 2019-07-15 stsp /* NOTREACHED */
580 3ce1b845 2019-07-15 stsp argc -= optind;
581 3ce1b845 2019-07-15 stsp argv += optind;
583 3ce1b845 2019-07-15 stsp #ifndef PROFILE
584 3ce1b845 2019-07-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
585 3ce1b845 2019-07-15 stsp NULL) == -1)
586 3ce1b845 2019-07-15 stsp err(1, "pledge");
588 3ce1b845 2019-07-15 stsp if (argc != 1)
589 3ce1b845 2019-07-15 stsp usage_import();
591 84792843 2019-08-09 stsp error = get_author(&author);
593 84792843 2019-08-09 stsp return error;
595 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
596 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
597 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
598 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
600 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
601 3ce1b845 2019-07-15 stsp error = got_repo_open(&repo, repo_path);
605 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
606 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
610 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
611 3ce1b845 2019-07-15 stsp if (error) {
612 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
615 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
616 3ce1b845 2019-07-15 stsp "import target branch already exists");
620 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
621 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
622 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
625 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
628 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
629 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
631 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
632 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
635 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
640 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
641 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
643 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
647 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
648 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
652 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
656 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
660 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
664 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
665 3ce1b845 2019-07-15 stsp if (error) {
666 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
669 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
670 3ce1b845 2019-07-15 stsp branch_ref);
674 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
679 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
680 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
682 2c7829a4 2019-06-17 stsp free(repo_path);
683 3ce1b845 2019-07-15 stsp free(editor);
684 3ce1b845 2019-07-15 stsp free(refname);
685 3ce1b845 2019-07-15 stsp free(new_commit_id);
686 3ce1b845 2019-07-15 stsp free(id_str);
687 3ce1b845 2019-07-15 stsp if (branch_ref)
688 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
689 3ce1b845 2019-07-15 stsp if (head_ref)
690 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
691 2c7829a4 2019-06-17 stsp return error;
694 4ed7e80c 2018-05-20 stsp __dead static void
695 c09a553d 2018-03-12 stsp usage_checkout(void)
697 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
698 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
702 1ee397ad 2019-07-12 stsp static const struct got_error *
703 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
705 92a684f4 2018-03-12 stsp char *worktree_path = arg;
707 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
708 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
709 1ee397ad 2019-07-12 stsp return NULL;
711 92a684f4 2018-03-12 stsp while (path[0] == '/')
714 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
715 1ee397ad 2019-07-12 stsp return NULL;
718 99437157 2018-11-11 stsp static const struct got_error *
719 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
721 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
722 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
723 99437157 2018-11-11 stsp return NULL;
726 8069f636 2019-01-12 stsp static const struct got_error *
727 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
728 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
730 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
731 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
733 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
734 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
736 36a38700 2019-05-10 stsp return err;
738 d5bea539 2019-05-13 stsp if (yca_id == NULL)
739 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
742 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
743 d5bea539 2019-05-13 stsp * and the work tree's base commit.
745 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
747 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
755 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
756 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
757 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
759 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
760 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
761 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
763 d5bea539 2019-05-13 stsp free(yca_id);
764 d5bea539 2019-05-13 stsp return NULL;
767 a367ff0f 2019-05-14 stsp static const struct got_error *
768 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
769 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
770 a51a74b3 2019-07-27 stsp struct got_repository *repo)
772 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
773 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
774 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
775 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
777 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
781 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
782 a51a74b3 2019-07-27 stsp is_same_branch = 1;
785 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
786 a51a74b3 2019-07-27 stsp is_same_branch = 1;
790 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
794 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
795 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
800 a367ff0f 2019-05-14 stsp struct got_object_id *id;
801 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
803 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
804 a367ff0f 2019-05-14 stsp err = NULL;
806 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
808 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
809 6fb7cd11 2019-08-22 stsp repo, check_cancelled, NULL);
815 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
817 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
818 a367ff0f 2019-05-14 stsp is_same_branch = 1;
825 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
826 a367ff0f 2019-05-14 stsp free(head_commit_id);
827 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
828 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
829 04f57cb3 2019-07-25 stsp return err;
832 04f57cb3 2019-07-25 stsp static const struct got_error *
833 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
834 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
836 04f57cb3 2019-07-25 stsp const struct got_error *err;
837 04f57cb3 2019-07-25 stsp struct got_reference *ref;
838 303e2782 2019-08-09 stsp struct got_tag_object *tag;
840 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
841 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
842 303e2782 2019-08-09 stsp if (err == NULL) {
843 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
844 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
845 303e2782 2019-08-09 stsp if (*commit_id == NULL)
846 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
847 303e2782 2019-08-09 stsp got_object_tag_close(tag);
848 303e2782 2019-08-09 stsp return err;
849 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
850 303e2782 2019-08-09 stsp return err;
852 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
853 04f57cb3 2019-07-25 stsp if (err == NULL) {
854 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
855 04f57cb3 2019-07-25 stsp got_ref_close(ref);
857 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
858 04f57cb3 2019-07-25 stsp return err;
859 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
860 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
862 a367ff0f 2019-05-14 stsp return err;
865 4ed7e80c 2018-05-20 stsp static const struct got_error *
866 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
868 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
869 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
870 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
871 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
872 c09a553d 2018-03-12 stsp char *repo_path = NULL;
873 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
874 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
875 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
876 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
877 72151b04 2019-05-11 stsp int ch, same_path_prefix;
878 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
880 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
882 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
883 0bb8a95e 2018-03-12 stsp switch (ch) {
885 08573d5b 2019-05-14 stsp branch_name = optarg;
888 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
889 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
890 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
893 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
896 2deda0b9 2019-03-07 stsp usage_checkout();
897 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
901 0bb8a95e 2018-03-12 stsp argc -= optind;
902 0bb8a95e 2018-03-12 stsp argv += optind;
904 6715a751 2018-03-16 stsp #ifndef PROFILE
905 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
906 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
907 c09a553d 2018-03-12 stsp err(1, "pledge");
909 0bb8a95e 2018-03-12 stsp if (argc == 1) {
910 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
911 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
912 76089277 2018-04-01 stsp if (repo_path == NULL)
913 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
914 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
915 76089277 2018-04-01 stsp if (cwd == NULL) {
916 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
919 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
920 230a42bd 2019-05-11 jcs base = basename(path_prefix);
921 230a42bd 2019-05-11 jcs if (base == NULL) {
922 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
923 230a42bd 2019-05-11 jcs path_prefix);
927 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
928 230a42bd 2019-05-11 jcs if (base == NULL) {
929 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
934 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
935 c09a553d 2018-03-12 stsp if (dotgit)
936 c09a553d 2018-03-12 stsp *dotgit = '\0';
937 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
938 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
943 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
944 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
945 76089277 2018-04-01 stsp if (repo_path == NULL) {
946 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
949 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
950 76089277 2018-04-01 stsp if (worktree_path == NULL) {
951 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
952 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
956 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
957 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
958 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
963 c09a553d 2018-03-12 stsp usage_checkout();
965 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
966 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
968 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
969 c09a553d 2018-03-12 stsp if (error != NULL)
972 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
973 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
974 c530dc23 2019-07-23 stsp if (error) {
975 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
976 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
978 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
979 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
980 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
985 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
989 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
990 c09a553d 2018-03-12 stsp if (error != NULL)
993 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
994 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
997 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
998 c09a553d 2018-03-12 stsp if (error != NULL)
1001 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1002 e5dc7198 2018-12-29 stsp path_prefix);
1003 e5dc7198 2018-12-29 stsp if (error != NULL)
1004 e5dc7198 2018-12-29 stsp goto done;
1005 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1006 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1007 49520a32 2018-12-29 stsp goto done;
1010 8069f636 2019-01-12 stsp if (commit_id_str) {
1011 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1012 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1013 30837e32 2019-07-25 stsp if (error)
1014 8069f636 2019-01-12 stsp goto done;
1015 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1016 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1017 8069f636 2019-01-12 stsp if (error != NULL) {
1018 8069f636 2019-01-12 stsp free(commit_id);
1019 8069f636 2019-01-12 stsp goto done;
1021 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1022 45d344f6 2019-05-14 stsp if (error)
1023 45d344f6 2019-05-14 stsp goto done;
1024 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1025 8069f636 2019-01-12 stsp commit_id);
1026 8069f636 2019-01-12 stsp free(commit_id);
1027 8069f636 2019-01-12 stsp if (error)
1028 8069f636 2019-01-12 stsp goto done;
1031 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1032 f2ea84fa 2019-07-27 stsp if (error)
1033 f2ea84fa 2019-07-27 stsp goto done;
1034 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1035 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1036 c09a553d 2018-03-12 stsp if (error != NULL)
1037 c09a553d 2018-03-12 stsp goto done;
1039 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1042 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1043 8069f636 2019-01-12 stsp free(commit_id_str);
1044 76089277 2018-04-01 stsp free(repo_path);
1045 507dc3bb 2018-12-29 stsp free(worktree_path);
1046 507dc3bb 2018-12-29 stsp return error;
1049 507dc3bb 2018-12-29 stsp __dead static void
1050 507dc3bb 2018-12-29 stsp usage_update(void)
1052 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1053 507dc3bb 2018-12-29 stsp getprogname());
1057 1ee397ad 2019-07-12 stsp static const struct got_error *
1058 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1060 784955db 2019-01-12 stsp int *did_something = arg;
1062 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1063 1ee397ad 2019-07-12 stsp return NULL;
1065 1545c615 2019-02-10 stsp *did_something = 1;
1067 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1068 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1069 1ee397ad 2019-07-12 stsp return NULL;
1071 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1073 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1074 1ee397ad 2019-07-12 stsp return NULL;
1077 be7061eb 2018-12-30 stsp static const struct got_error *
1078 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1079 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1080 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1082 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1083 a1fb16d8 2019-05-24 stsp char *base_id_str;
1084 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1086 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1087 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1088 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1089 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1090 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1091 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1092 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1095 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1096 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1097 a1fb16d8 2019-05-24 stsp if (err) {
1098 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1099 a1fb16d8 2019-05-24 stsp return err;
1100 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1102 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1103 a1fb16d8 2019-05-24 stsp return NULL;
1105 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1106 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1107 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1109 a1fb16d8 2019-05-24 stsp return err;
1110 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1111 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1112 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1113 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1114 0ebf8283 2019-07-24 stsp return NULL;
1117 0ebf8283 2019-07-24 stsp static const struct got_error *
1118 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1120 0ebf8283 2019-07-24 stsp const struct got_error *err;
1121 0ebf8283 2019-07-24 stsp int in_progress;
1123 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1125 0ebf8283 2019-07-24 stsp return err;
1126 0ebf8283 2019-07-24 stsp if (in_progress)
1127 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1129 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1131 0ebf8283 2019-07-24 stsp return err;
1132 0ebf8283 2019-07-24 stsp if (in_progress)
1133 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1135 a1fb16d8 2019-05-24 stsp return NULL;
1138 a5edda0a 2019-07-27 stsp static const struct got_error *
1139 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1140 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1142 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1143 a5edda0a 2019-07-27 stsp char *path;
1146 a5edda0a 2019-07-27 stsp if (argc == 0) {
1147 a5edda0a 2019-07-27 stsp path = strdup("");
1148 a5edda0a 2019-07-27 stsp if (path == NULL)
1149 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1150 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1153 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1154 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1157 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1158 a5edda0a 2019-07-27 stsp if (err) {
1159 a5edda0a 2019-07-27 stsp free(path);
1164 a5edda0a 2019-07-27 stsp return err;
1167 a1fb16d8 2019-05-24 stsp static const struct got_error *
1168 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1170 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1171 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1172 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1173 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1174 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1175 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1176 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1177 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1178 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1179 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1180 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1182 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1184 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1185 507dc3bb 2018-12-29 stsp switch (ch) {
1187 024e9686 2019-05-14 stsp branch_name = optarg;
1190 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1191 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1192 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1195 2deda0b9 2019-03-07 stsp usage_update();
1196 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1200 507dc3bb 2018-12-29 stsp argc -= optind;
1201 507dc3bb 2018-12-29 stsp argv += optind;
1203 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1204 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1205 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1206 507dc3bb 2018-12-29 stsp err(1, "pledge");
1208 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1209 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1210 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1211 c4cdcb68 2019-04-03 stsp goto done;
1213 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1214 7d5807f4 2019-07-11 stsp if (error)
1215 7d5807f4 2019-07-11 stsp goto done;
1217 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1218 f2ea84fa 2019-07-27 stsp if (error)
1219 f2ea84fa 2019-07-27 stsp goto done;
1221 507dc3bb 2018-12-29 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1222 507dc3bb 2018-12-29 stsp if (error != NULL)
1223 507dc3bb 2018-12-29 stsp goto done;
1225 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1226 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1227 087fb88c 2019-08-04 stsp if (error)
1228 087fb88c 2019-08-04 stsp goto done;
1230 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1231 0266afb7 2019-01-04 stsp if (error)
1232 0266afb7 2019-01-04 stsp goto done;
1234 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1235 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1236 024e9686 2019-05-14 stsp if (error != NULL)
1237 024e9686 2019-05-14 stsp goto done;
1238 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1239 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1240 9c4b8182 2019-01-02 stsp if (error != NULL)
1241 9c4b8182 2019-01-02 stsp goto done;
1242 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1243 507dc3bb 2018-12-29 stsp if (error != NULL)
1244 507dc3bb 2018-12-29 stsp goto done;
1246 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1247 04f57cb3 2019-07-25 stsp free(commit_id_str);
1248 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1249 30837e32 2019-07-25 stsp if (error)
1250 a297e751 2019-07-11 stsp goto done;
1251 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1252 a297e751 2019-07-11 stsp if (error)
1253 507dc3bb 2018-12-29 stsp goto done;
1256 a1fb16d8 2019-05-24 stsp if (branch_name) {
1257 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1258 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1259 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1261 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1262 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1263 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1264 024e9686 2019-05-14 stsp goto done;
1266 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1267 024e9686 2019-05-14 stsp if (error)
1268 024e9686 2019-05-14 stsp goto done;
1269 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1270 a367ff0f 2019-05-14 stsp free(head_commit_id);
1271 024e9686 2019-05-14 stsp if (error != NULL)
1272 024e9686 2019-05-14 stsp goto done;
1273 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1274 a367ff0f 2019-05-14 stsp if (error)
1275 a367ff0f 2019-05-14 stsp goto done;
1276 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1277 024e9686 2019-05-14 stsp if (error)
1278 024e9686 2019-05-14 stsp goto done;
1280 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1281 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1282 a367ff0f 2019-05-14 stsp if (error != NULL) {
1283 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1284 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1285 024e9686 2019-05-14 stsp goto done;
1287 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1288 a367ff0f 2019-05-14 stsp if (error)
1289 a367ff0f 2019-05-14 stsp goto done;
1292 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1293 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1294 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1295 507dc3bb 2018-12-29 stsp commit_id);
1296 507dc3bb 2018-12-29 stsp if (error)
1297 507dc3bb 2018-12-29 stsp goto done;
1300 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1301 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1302 507dc3bb 2018-12-29 stsp if (error != NULL)
1303 507dc3bb 2018-12-29 stsp goto done;
1305 784955db 2019-01-12 stsp if (did_something)
1306 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1308 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1310 c09a553d 2018-03-12 stsp free(worktree_path);
1311 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1312 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1313 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1314 507dc3bb 2018-12-29 stsp free(commit_id);
1315 9c4b8182 2019-01-02 stsp free(commit_id_str);
1316 c09a553d 2018-03-12 stsp return error;
1319 f42b1b34 2018-03-12 stsp static const struct got_error *
1320 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1321 c0cc5c62 2018-10-18 stsp int diff_context, struct got_repository *repo)
1323 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1324 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
1325 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1326 0f2b3dca 2018-12-22 stsp char *id_str1 = NULL, *id_str2;
1327 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1329 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo,
1330 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
1332 79109fed 2018-03-27 stsp return err;
1334 45d799e2 2018-12-23 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1335 79f35eb3 2018-06-11 stsp if (qid != NULL) {
1336 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
1338 117e771c 2018-07-23 stsp err = got_object_open_as_commit(&pcommit, repo, qid->id);
1340 79109fed 2018-03-27 stsp return err;
1342 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo,
1343 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(pcommit));
1344 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
1346 0f2b3dca 2018-12-22 stsp return err;
1348 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str1, qid->id);
1350 79109fed 2018-03-27 stsp return err;
1353 0f2b3dca 2018-12-22 stsp err = got_object_id_str(&id_str2, id);
1355 0f2b3dca 2018-12-22 stsp goto done;
1357 56765ebb 2018-12-23 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1358 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1359 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1360 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
1361 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1363 79109fed 2018-03-27 stsp if (tree1)
1364 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1365 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1366 0f2b3dca 2018-12-22 stsp free(id_str1);
1367 0f2b3dca 2018-12-22 stsp free(id_str2);
1368 79109fed 2018-03-27 stsp return err;
1371 4bb494d5 2018-06-16 stsp static char *
1372 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1374 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1375 09867e48 2019-08-13 stsp char *p, *s;
1377 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1378 09867e48 2019-08-13 stsp if (tm == NULL)
1379 09867e48 2019-08-13 stsp return NULL;
1380 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1381 09867e48 2019-08-13 stsp if (s == NULL)
1382 09867e48 2019-08-13 stsp return NULL;
1383 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1385 6c281f94 2018-06-11 stsp *p = '\0';
1389 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1391 79109fed 2018-03-27 stsp static const struct got_error *
1392 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1393 199a4027 2019-02-02 stsp struct got_repository *repo, int show_patch, int diff_context,
1394 199a4027 2019-02-02 stsp struct got_reflist_head *refs)
1396 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1397 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1398 6c281f94 2018-06-11 stsp char datebuf[26];
1399 45d799e2 2018-12-23 stsp time_t committer_time;
1400 45d799e2 2018-12-23 stsp const char *author, *committer;
1401 199a4027 2019-02-02 stsp char *refs_str = NULL;
1402 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1404 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1406 199a4027 2019-02-02 stsp const char *name;
1407 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1410 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1411 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1413 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1414 199a4027 2019-02-02 stsp name += 5;
1415 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1417 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1418 e34f9ed6 2019-02-02 stsp name += 6;
1419 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1420 141c2bff 2019-02-04 stsp name += 8;
1421 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1422 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1423 5d844a1e 2019-08-13 stsp if (err) {
1424 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1425 5d844a1e 2019-08-13 stsp return err;
1426 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1427 5d844a1e 2019-08-13 stsp err = NULL;
1428 5d844a1e 2019-08-13 stsp tag = NULL;
1431 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1432 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1434 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1435 a436ad14 2019-08-13 stsp if (cmp != 0)
1437 199a4027 2019-02-02 stsp s = refs_str;
1438 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1439 199a4027 2019-02-02 stsp name) == -1) {
1440 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1442 34ca4898 2019-08-13 stsp return err;
1446 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1448 8bf5b3c9 2018-03-17 stsp return err;
1450 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1451 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1452 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1453 832c249c 2018-06-10 stsp free(id_str);
1454 d3d493d7 2019-02-21 stsp id_str = NULL;
1455 d3d493d7 2019-02-21 stsp free(refs_str);
1456 d3d493d7 2019-02-21 stsp refs_str = NULL;
1457 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1458 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1459 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1460 09867e48 2019-08-13 stsp if (datestr)
1461 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1462 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1463 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1464 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1465 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1466 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1467 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1468 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1469 3fe1abad 2018-06-10 stsp int n = 1;
1470 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1471 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1472 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1474 a0603db2 2018-06-10 stsp return err;
1475 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1476 a0603db2 2018-06-10 stsp free(id_str);
1480 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1482 5943eee2 2019-08-13 stsp return err;
1484 621015ac 2018-07-23 stsp logmsg = logmsg0;
1486 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1488 832c249c 2018-06-10 stsp printf(" %s\n", line);
1489 832c249c 2018-06-10 stsp } while (line);
1490 621015ac 2018-07-23 stsp free(logmsg0);
1492 971751ac 2018-03-27 stsp if (show_patch) {
1493 c0cc5c62 2018-10-18 stsp err = print_patch(commit, id, diff_context, repo);
1494 971751ac 2018-03-27 stsp if (err == 0)
1495 971751ac 2018-03-27 stsp printf("\n");
1498 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1499 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1500 07862c20 2018-09-15 stsp return err;
1503 f42b1b34 2018-03-12 stsp static const struct got_error *
1504 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1505 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1506 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1508 f42b1b34 2018-03-12 stsp const struct got_error *err;
1509 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1511 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1512 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1514 f42b1b34 2018-03-12 stsp return err;
1515 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1516 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1518 fcc85cad 2018-07-22 stsp goto done;
1520 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1521 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1523 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1526 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1527 372ccdbb 2018-06-10 stsp if (err) {
1528 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1529 9ba79e04 2018-06-11 stsp err = NULL;
1532 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1534 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
1535 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1541 b43fbaa0 2018-06-11 stsp if (id == NULL)
1544 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1547 199a4027 2019-02-02 stsp err = print_commit(commit, id, repo, show_patch, diff_context,
1549 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1550 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1554 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1555 f42b1b34 2018-03-12 stsp return err;
1558 4ed7e80c 2018-05-20 stsp __dead static void
1559 6f3d1eb0 2018-03-12 stsp usage_log(void)
1561 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1562 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1566 b1ebc001 2019-08-13 stsp static int
1567 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1569 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1570 b1ebc001 2019-08-13 stsp long long n;
1571 b1ebc001 2019-08-13 stsp const char *errstr;
1573 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1574 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1576 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1577 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1582 4ed7e80c 2018-05-20 stsp static const struct got_error *
1583 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1585 f42b1b34 2018-03-12 stsp const struct got_error *error;
1586 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1587 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1588 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1589 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1590 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1591 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1592 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1593 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1594 64a96a6d 2018-04-01 stsp const char *errstr;
1595 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1597 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1599 6715a751 2018-03-16 stsp #ifndef PROFILE
1600 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1603 f42b1b34 2018-03-12 stsp err(1, "pledge");
1606 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1608 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1609 79109fed 2018-03-27 stsp switch (ch) {
1611 79109fed 2018-03-27 stsp show_patch = 1;
1614 d142fc45 2018-04-01 stsp start_commit = optarg;
1617 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1619 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1620 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1623 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1624 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1625 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1628 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1631 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1632 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1633 04ca23f4 2018-07-16 stsp err(1, "-r option");
1634 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1637 2deda0b9 2019-03-07 stsp usage_log();
1638 79109fed 2018-03-27 stsp /* NOTREACHED */
1642 79109fed 2018-03-27 stsp argc -= optind;
1643 79109fed 2018-03-27 stsp argv += optind;
1645 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1646 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1647 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1648 04ca23f4 2018-07-16 stsp goto done;
1651 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1652 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1653 cffc0aa4 2019-02-05 stsp goto done;
1654 cffc0aa4 2019-02-05 stsp error = NULL;
1656 e7301579 2019-03-18 stsp if (argc == 0) {
1657 cbd1af7a 2019-03-18 stsp path = strdup("");
1658 e7301579 2019-03-18 stsp if (path == NULL) {
1659 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1660 cbd1af7a 2019-03-18 stsp goto done;
1662 e7301579 2019-03-18 stsp } else if (argc == 1) {
1663 e7301579 2019-03-18 stsp if (worktree) {
1664 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1666 e7301579 2019-03-18 stsp if (error)
1667 e7301579 2019-03-18 stsp goto done;
1669 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1670 e7301579 2019-03-18 stsp if (path == NULL) {
1671 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1672 e7301579 2019-03-18 stsp goto done;
1676 cbd1af7a 2019-03-18 stsp usage_log();
1678 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1679 5486daa2 2019-05-11 stsp repo_path = worktree ?
1680 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1682 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1683 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1684 cffc0aa4 2019-02-05 stsp goto done;
1687 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
1688 d7d4f210 2018-03-12 stsp if (error != NULL)
1689 04ca23f4 2018-07-16 stsp goto done;
1691 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1692 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1693 c02c541e 2019-03-29 stsp if (error)
1694 c02c541e 2019-03-29 stsp goto done;
1696 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1697 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1698 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1699 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1700 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1701 3235492e 2018-04-01 stsp if (error != NULL)
1702 3235492e 2018-04-01 stsp return error;
1703 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1704 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1705 3235492e 2018-04-01 stsp if (error != NULL)
1706 3235492e 2018-04-01 stsp return error;
1707 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1709 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1710 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1711 3235492e 2018-04-01 stsp if (error == NULL) {
1712 1caad61b 2019-02-01 stsp int obj_type;
1713 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1714 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1715 d1f2edc9 2018-06-13 stsp if (error != NULL)
1716 1caad61b 2019-02-01 stsp goto done;
1717 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1718 1caad61b 2019-02-01 stsp if (error != NULL)
1719 1caad61b 2019-02-01 stsp goto done;
1720 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1721 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1722 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1723 1caad61b 2019-02-01 stsp if (error != NULL)
1724 1caad61b 2019-02-01 stsp goto done;
1725 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1726 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1727 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1728 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1729 1caad61b 2019-02-01 stsp goto done;
1732 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1733 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1734 1caad61b 2019-02-01 stsp if (id == NULL)
1735 638f9024 2019-05-13 stsp error = got_error_from_errno(
1736 230a42bd 2019-05-11 jcs "got_object_id_dup");
1737 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1738 1caad61b 2019-02-01 stsp if (error)
1739 1caad61b 2019-02-01 stsp goto done;
1740 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1741 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1742 1caad61b 2019-02-01 stsp goto done;
1744 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1745 d1f2edc9 2018-06-13 stsp if (error != NULL)
1746 1caad61b 2019-02-01 stsp goto done;
1748 15a94983 2018-12-23 stsp if (commit == NULL) {
1749 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1750 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1751 d1f2edc9 2018-06-13 stsp if (error != NULL)
1752 d1f2edc9 2018-06-13 stsp return error;
1755 d7d4f210 2018-03-12 stsp if (error != NULL)
1756 04ca23f4 2018-07-16 stsp goto done;
1758 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1759 04ca23f4 2018-07-16 stsp if (error != NULL)
1760 04ca23f4 2018-07-16 stsp goto done;
1761 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1762 04ca23f4 2018-07-16 stsp free(path);
1763 04ca23f4 2018-07-16 stsp path = in_repo_path;
1766 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
1767 199a4027 2019-02-02 stsp if (error)
1768 199a4027 2019-02-02 stsp goto done;
1770 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1771 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1773 04ca23f4 2018-07-16 stsp free(path);
1774 04ca23f4 2018-07-16 stsp free(repo_path);
1775 04ca23f4 2018-07-16 stsp free(cwd);
1777 cffc0aa4 2019-02-05 stsp if (worktree)
1778 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1779 ad242220 2018-09-08 stsp if (repo) {
1780 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1781 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1782 ad242220 2018-09-08 stsp if (error == NULL)
1783 ad242220 2018-09-08 stsp error = repo_error;
1785 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1786 8bf5b3c9 2018-03-17 stsp return error;
1789 4ed7e80c 2018-05-20 stsp __dead static void
1790 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1792 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1793 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1797 b72f483a 2019-02-05 stsp struct print_diff_arg {
1798 b72f483a 2019-02-05 stsp struct got_repository *repo;
1799 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1800 b72f483a 2019-02-05 stsp int diff_context;
1801 3fc0c068 2019-02-10 stsp const char *id_str;
1802 3fc0c068 2019-02-10 stsp int header_shown;
1803 98eaaa12 2019-08-03 stsp int diff_staged;
1806 4ed7e80c 2018-05-20 stsp static const struct got_error *
1807 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1808 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1809 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1811 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1812 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1813 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1814 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1815 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1816 b72f483a 2019-02-05 stsp struct stat sb;
1818 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1819 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1820 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1821 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1822 98eaaa12 2019-08-03 stsp return NULL;
1824 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1825 98eaaa12 2019-08-03 stsp return NULL;
1826 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
1827 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
1828 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1829 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1830 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1831 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1832 98eaaa12 2019-08-03 stsp return NULL;
1835 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1836 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1837 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1838 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1839 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1842 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1843 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1844 98eaaa12 2019-08-03 stsp switch (staged_status) {
1845 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1846 98eaaa12 2019-08-03 stsp label1 = path;
1847 98eaaa12 2019-08-03 stsp label2 = path;
1849 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1850 98eaaa12 2019-08-03 stsp label2 = path;
1852 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
1853 98eaaa12 2019-08-03 stsp label1 = path;
1856 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
1858 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1859 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
1862 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
1863 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
1864 4ce46740 2019-08-08 stsp char *id_str;
1865 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1868 4ce46740 2019-08-08 stsp goto done;
1869 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
1871 4ce46740 2019-08-08 stsp goto done;
1872 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1873 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
1874 4ce46740 2019-08-08 stsp free(id_str);
1875 4ce46740 2019-08-08 stsp goto done;
1877 4ce46740 2019-08-08 stsp free(id_str);
1878 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
1879 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1881 4ce46740 2019-08-08 stsp goto done;
1884 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
1885 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
1886 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
1887 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1888 2ec1f75b 2019-03-26 stsp goto done;
1891 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
1892 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
1893 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1894 2ec1f75b 2019-03-26 stsp goto done;
1896 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
1897 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
1898 2ec1f75b 2019-03-26 stsp goto done;
1901 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
1903 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1904 4ce46740 2019-08-08 stsp a->diff_context, stdout);
1906 b72f483a 2019-02-05 stsp if (blob1)
1907 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
1908 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
1909 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1910 b72f483a 2019-02-05 stsp free(abspath);
1911 927df6b7 2019-02-10 stsp return err;
1914 927df6b7 2019-02-10 stsp static const struct got_error *
1915 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
1916 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
1917 01073a5d 2019-08-22 stsp struct got_repository *repo)
1919 0adb7196 2019-08-11 stsp const struct got_error *err;
1920 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
1921 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
1923 0adb7196 2019-08-11 stsp *id = NULL;
1924 0adb7196 2019-08-11 stsp *label = NULL;
1926 01073a5d 2019-08-22 stsp if (resolve_tags) {
1927 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
1929 01073a5d 2019-08-22 stsp if (err == NULL) {
1930 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
1931 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
1932 01073a5d 2019-08-22 stsp if (*id == NULL)
1933 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
1934 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
1935 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
1936 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
1938 01073a5d 2019-08-22 stsp *id = NULL;
1940 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
1941 01073a5d 2019-08-22 stsp return err;
1942 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
1943 01073a5d 2019-08-22 stsp return err;
1946 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
1947 0adb7196 2019-08-11 stsp if (err) {
1948 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1949 0adb7196 2019-08-11 stsp return err;
1950 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
1951 0adb7196 2019-08-11 stsp if (err != NULL)
1952 0adb7196 2019-08-11 stsp goto done;
1953 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
1954 0adb7196 2019-08-11 stsp if (*label == NULL) {
1955 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
1956 0adb7196 2019-08-11 stsp goto done;
1958 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
1960 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
1961 0adb7196 2019-08-11 stsp if (*label == NULL) {
1962 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
1963 0adb7196 2019-08-11 stsp goto done;
1968 0adb7196 2019-08-11 stsp got_ref_close(ref);
1969 0adb7196 2019-08-11 stsp return err;
1973 0adb7196 2019-08-11 stsp static const struct got_error *
1974 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
1976 b00d56cd 2018-04-01 stsp const struct got_error *error;
1977 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
1978 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
1979 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
1980 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1981 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
1982 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
1983 15a94983 2018-12-23 stsp int type1, type2;
1984 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
1985 c0cc5c62 2018-10-18 stsp const char *errstr;
1986 927df6b7 2019-02-10 stsp char *path = NULL;
1988 b00d56cd 2018-04-01 stsp #ifndef PROFILE
1989 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1990 25eccc22 2019-01-04 stsp NULL) == -1)
1991 b00d56cd 2018-04-01 stsp err(1, "pledge");
1994 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1995 b00d56cd 2018-04-01 stsp switch (ch) {
1997 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1998 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1999 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2002 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2003 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2004 b72f483a 2019-02-05 stsp err(1, "-r option");
2005 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2008 98eaaa12 2019-08-03 stsp diff_staged = 1;
2011 2deda0b9 2019-03-07 stsp usage_diff();
2012 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2016 b00d56cd 2018-04-01 stsp argc -= optind;
2017 b00d56cd 2018-04-01 stsp argv += optind;
2019 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2020 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2021 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2022 b72f483a 2019-02-05 stsp goto done;
2024 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2025 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2026 927df6b7 2019-02-10 stsp goto done;
2027 927df6b7 2019-02-10 stsp if (argc <= 1) {
2028 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2029 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2030 927df6b7 2019-02-10 stsp goto done;
2032 b72f483a 2019-02-05 stsp if (repo_path)
2034 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2035 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2036 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2037 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2038 927df6b7 2019-02-10 stsp goto done;
2040 927df6b7 2019-02-10 stsp if (argc == 1) {
2041 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2043 927df6b7 2019-02-10 stsp if (error)
2044 927df6b7 2019-02-10 stsp goto done;
2046 927df6b7 2019-02-10 stsp path = strdup("");
2047 927df6b7 2019-02-10 stsp if (path == NULL) {
2048 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2049 927df6b7 2019-02-10 stsp goto done;
2052 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2053 98eaaa12 2019-08-03 stsp if (diff_staged)
2054 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2055 98eaaa12 2019-08-03 stsp "objects in repository");
2056 15a94983 2018-12-23 stsp id_str1 = argv[0];
2057 15a94983 2018-12-23 stsp id_str2 = argv[1];
2058 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2059 30db809c 2019-06-05 stsp repo_path =
2060 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2061 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2062 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2063 30db809c 2019-06-05 stsp goto done;
2067 b00d56cd 2018-04-01 stsp usage_diff();
2069 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2070 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2071 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2072 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2075 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
2076 76089277 2018-04-01 stsp free(repo_path);
2077 b00d56cd 2018-04-01 stsp if (error != NULL)
2078 b00d56cd 2018-04-01 stsp goto done;
2080 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2081 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2082 c02c541e 2019-03-29 stsp if (error)
2083 c02c541e 2019-03-29 stsp goto done;
2085 30db809c 2019-06-05 stsp if (argc <= 1) {
2086 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2087 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2088 b72f483a 2019-02-05 stsp char *id_str;
2090 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2092 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2093 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2094 b72f483a 2019-02-05 stsp if (error)
2095 b72f483a 2019-02-05 stsp goto done;
2096 b72f483a 2019-02-05 stsp arg.repo = repo;
2097 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2098 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2099 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2100 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2101 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2103 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2104 72ea6654 2019-07-27 stsp if (error)
2105 72ea6654 2019-07-27 stsp goto done;
2107 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2108 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2109 b72f483a 2019-02-05 stsp free(id_str);
2110 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2111 b72f483a 2019-02-05 stsp goto done;
2114 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2116 0adb7196 2019-08-11 stsp if (error)
2117 0adb7196 2019-08-11 stsp goto done;
2119 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2121 0adb7196 2019-08-11 stsp if (error)
2122 0adb7196 2019-08-11 stsp goto done;
2124 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2125 15a94983 2018-12-23 stsp if (error)
2126 15a94983 2018-12-23 stsp goto done;
2128 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2129 15a94983 2018-12-23 stsp if (error)
2130 15a94983 2018-12-23 stsp goto done;
2132 15a94983 2018-12-23 stsp if (type1 != type2) {
2133 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2134 b00d56cd 2018-04-01 stsp goto done;
2137 15a94983 2018-12-23 stsp switch (type1) {
2138 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2139 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2140 54156555 2018-12-24 stsp diff_context, repo, stdout);
2142 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2143 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2144 54156555 2018-12-24 stsp diff_context, repo, stdout);
2146 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2147 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2148 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2149 c0cc5c62 2018-10-18 stsp repo, stdout);
2152 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2156 5e70831e 2019-05-28 stsp free(label1);
2157 5e70831e 2019-05-28 stsp free(label2);
2158 15a94983 2018-12-23 stsp free(id1);
2159 15a94983 2018-12-23 stsp free(id2);
2160 927df6b7 2019-02-10 stsp free(path);
2161 b72f483a 2019-02-05 stsp if (worktree)
2162 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2163 ad242220 2018-09-08 stsp if (repo) {
2164 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2165 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2166 ad242220 2018-09-08 stsp if (error == NULL)
2167 ad242220 2018-09-08 stsp error = repo_error;
2169 b00d56cd 2018-04-01 stsp return error;
2172 404c43c4 2018-06-21 stsp __dead static void
2173 404c43c4 2018-06-21 stsp usage_blame(void)
2175 9270e621 2019-02-05 stsp fprintf(stderr,
2176 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2177 404c43c4 2018-06-21 stsp getprogname());
2181 28315671 2019-08-14 stsp struct blame_line {
2182 28315671 2019-08-14 stsp int annotated;
2183 28315671 2019-08-14 stsp char *id_str;
2184 82f6abb8 2019-08-14 stsp char *committer;
2185 bcb49d15 2019-08-14 stsp char datebuf[9]; /* YY-MM-DD + NUL */
2188 28315671 2019-08-14 stsp struct blame_cb_args {
2189 28315671 2019-08-14 stsp struct blame_line *lines;
2190 28315671 2019-08-14 stsp int nlines;
2191 7ef28ff8 2019-08-14 stsp int nlines_prec;
2192 28315671 2019-08-14 stsp int lineno_cur;
2193 28315671 2019-08-14 stsp off_t *line_offsets;
2195 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2198 404c43c4 2018-06-21 stsp static const struct got_error *
2199 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2201 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2202 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2203 28315671 2019-08-14 stsp struct blame_line *bline;
2204 82f6abb8 2019-08-14 stsp char *line = NULL;
2205 28315671 2019-08-14 stsp size_t linesize = 0;
2206 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2207 28315671 2019-08-14 stsp off_t offset;
2208 bcb49d15 2019-08-14 stsp struct tm tm;
2209 bcb49d15 2019-08-14 stsp time_t committer_time;
2211 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2212 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2213 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2215 28315671 2019-08-14 stsp if (sigint_received)
2216 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2218 2839f8b9 2019-08-18 stsp if (lineno == -1)
2219 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2221 28315671 2019-08-14 stsp /* Annotate this line. */
2222 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2223 28315671 2019-08-14 stsp if (bline->annotated)
2224 28315671 2019-08-14 stsp return NULL;
2225 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2227 28315671 2019-08-14 stsp return err;
2229 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2231 82f6abb8 2019-08-14 stsp goto done;
2233 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2234 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2235 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2236 bcb49d15 2019-08-14 stsp goto done;
2239 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2240 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2241 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2242 bcb49d15 2019-08-14 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2243 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2244 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2245 82f6abb8 2019-08-14 stsp goto done;
2247 28315671 2019-08-14 stsp bline->annotated = 1;
2249 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2250 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2251 28315671 2019-08-14 stsp if (!bline->annotated)
2252 82f6abb8 2019-08-14 stsp goto done;
2254 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2255 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2256 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2257 82f6abb8 2019-08-14 stsp goto done;
2260 28315671 2019-08-14 stsp while (bline->annotated) {
2261 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2262 82f6abb8 2019-08-14 stsp size_t len;
2264 28315671 2019-08-14 stsp if (getline(&line, &linesize, a->f) == (ssize_t)-1) {
2265 28315671 2019-08-14 stsp if (ferror(a->f))
2266 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2270 82f6abb8 2019-08-14 stsp committer = bline->committer;
2271 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2272 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2273 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2274 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2276 82f6abb8 2019-08-14 stsp *at = '\0';
2277 82f6abb8 2019-08-14 stsp len = strlen(committer);
2278 82f6abb8 2019-08-14 stsp if (len >= 9)
2279 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2281 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2283 28315671 2019-08-14 stsp *nl = '\0';
2284 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2285 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2287 28315671 2019-08-14 stsp a->lineno_cur++;
2288 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2291 82f6abb8 2019-08-14 stsp if (commit)
2292 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2293 28315671 2019-08-14 stsp free(line);
2294 28315671 2019-08-14 stsp return err;
2297 28315671 2019-08-14 stsp static const struct got_error *
2298 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2300 404c43c4 2018-06-21 stsp const struct got_error *error;
2301 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2302 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2303 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2304 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2305 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2306 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2307 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2308 28315671 2019-08-14 stsp struct blame_cb_args bca;
2309 28315671 2019-08-14 stsp int ch, obj_type, i;
2310 b02560ec 2019-08-19 stsp size_t filesize;
2312 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2314 404c43c4 2018-06-21 stsp #ifndef PROFILE
2315 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2316 36e2fb66 2019-01-04 stsp NULL) == -1)
2317 404c43c4 2018-06-21 stsp err(1, "pledge");
2320 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2321 404c43c4 2018-06-21 stsp switch (ch) {
2323 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2326 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2327 66bea077 2018-08-02 stsp if (repo_path == NULL)
2328 66bea077 2018-08-02 stsp err(1, "-r option");
2329 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2332 2deda0b9 2019-03-07 stsp usage_blame();
2333 404c43c4 2018-06-21 stsp /* NOTREACHED */
2337 404c43c4 2018-06-21 stsp argc -= optind;
2338 404c43c4 2018-06-21 stsp argv += optind;
2340 a39318fd 2018-08-02 stsp if (argc == 1)
2341 404c43c4 2018-06-21 stsp path = argv[0];
2343 404c43c4 2018-06-21 stsp usage_blame();
2345 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2346 66bea077 2018-08-02 stsp if (cwd == NULL) {
2347 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2348 66bea077 2018-08-02 stsp goto done;
2350 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2351 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2352 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2353 66bea077 2018-08-02 stsp goto done;
2355 0c06baac 2019-02-05 stsp error = NULL;
2356 0c06baac 2019-02-05 stsp if (worktree) {
2357 0c06baac 2019-02-05 stsp repo_path =
2358 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2359 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2360 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2361 0c06baac 2019-02-05 stsp if (error)
2362 0c06baac 2019-02-05 stsp goto done;
2364 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2365 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2366 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2367 0c06baac 2019-02-05 stsp goto done;
2372 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2373 c02c541e 2019-03-29 stsp if (error != NULL)
2374 36e2fb66 2019-01-04 stsp goto done;
2376 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2377 c02c541e 2019-03-29 stsp if (error)
2378 404c43c4 2018-06-21 stsp goto done;
2380 0c06baac 2019-02-05 stsp if (worktree) {
2381 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2382 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2383 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2384 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2385 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2386 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2387 6efaaa2d 2019-02-05 stsp path) == -1) {
2388 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2389 0c06baac 2019-02-05 stsp goto done;
2391 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2394 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2396 0c06baac 2019-02-05 stsp if (error)
2397 66bea077 2018-08-02 stsp goto done;
2399 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2400 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2401 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2402 404c43c4 2018-06-21 stsp if (error != NULL)
2403 66bea077 2018-08-02 stsp goto done;
2404 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2405 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2406 404c43c4 2018-06-21 stsp if (error != NULL)
2407 66bea077 2018-08-02 stsp goto done;
2409 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2410 30837e32 2019-07-25 stsp if (error)
2411 66bea077 2018-08-02 stsp goto done;
2414 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2415 28315671 2019-08-14 stsp if (error)
2416 28315671 2019-08-14 stsp goto done;
2417 28315671 2019-08-14 stsp if (obj_id == NULL) {
2418 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2419 28315671 2019-08-14 stsp goto done;
2422 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2423 28315671 2019-08-14 stsp if (error)
2424 28315671 2019-08-14 stsp goto done;
2426 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2427 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2428 28315671 2019-08-14 stsp goto done;
2431 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2432 28315671 2019-08-14 stsp if (error)
2433 28315671 2019-08-14 stsp goto done;
2434 28315671 2019-08-14 stsp bca.f = got_opentemp();
2435 28315671 2019-08-14 stsp if (bca.f == NULL) {
2436 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2437 28315671 2019-08-14 stsp goto done;
2439 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2440 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2441 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2442 28315671 2019-08-14 stsp goto done;
2444 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2445 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2446 b02560ec 2019-08-19 stsp bca.nlines--;
2448 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2449 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2450 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2451 28315671 2019-08-14 stsp goto done;
2453 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2454 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2455 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2456 7ef28ff8 2019-08-14 stsp while (i > 0) {
2458 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2460 82f6abb8 2019-08-14 stsp bca.repo = repo;
2462 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2463 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2464 28315671 2019-08-14 stsp if (error)
2465 28315671 2019-08-14 stsp goto done;
2467 66bea077 2018-08-02 stsp free(in_repo_path);
2468 66bea077 2018-08-02 stsp free(repo_path);
2469 66bea077 2018-08-02 stsp free(cwd);
2470 404c43c4 2018-06-21 stsp free(commit_id);
2471 28315671 2019-08-14 stsp free(obj_id);
2473 28315671 2019-08-14 stsp got_object_blob_close(blob);
2474 0c06baac 2019-02-05 stsp if (worktree)
2475 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2476 ad242220 2018-09-08 stsp if (repo) {
2477 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2478 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2479 ad242220 2018-09-08 stsp if (error == NULL)
2480 ad242220 2018-09-08 stsp error = repo_error;
2482 28315671 2019-08-14 stsp for (i = 0; i < bca.nlines; i++) {
2483 28315671 2019-08-14 stsp struct blame_line *bline = &bca.lines[i];
2484 28315671 2019-08-14 stsp free(bline->id_str);
2485 82f6abb8 2019-08-14 stsp free(bline->committer);
2487 28315671 2019-08-14 stsp free(bca.lines);
2488 28315671 2019-08-14 stsp free(bca.line_offsets);
2489 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2490 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2491 404c43c4 2018-06-21 stsp return error;
2494 5de5890b 2018-10-18 stsp __dead static void
2495 5de5890b 2018-10-18 stsp usage_tree(void)
2497 c1669e2e 2019-01-09 stsp fprintf(stderr,
2498 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2499 5de5890b 2018-10-18 stsp getprogname());
2503 c1669e2e 2019-01-09 stsp static void
2504 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2505 c1669e2e 2019-01-09 stsp const char *root_path)
2507 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2508 848d6979 2019-08-12 stsp const char *modestr = "";
2510 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2511 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2514 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2515 63c5ca5d 2019-08-24 stsp modestr = "$";
2516 63c5ca5d 2019-08-24 stsp else if (S_ISLNK(te->mode))
2517 848d6979 2019-08-12 stsp modestr = "@";
2518 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
2519 848d6979 2019-08-12 stsp modestr = "/";
2520 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
2521 848d6979 2019-08-12 stsp modestr = "*";
2523 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2524 848d6979 2019-08-12 stsp is_root_path ? "" : "/", te->name, modestr);
2527 5de5890b 2018-10-18 stsp static const struct got_error *
2528 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2529 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2530 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2532 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2533 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2534 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2535 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2536 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2538 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2540 5de5890b 2018-10-18 stsp goto done;
2542 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2544 5de5890b 2018-10-18 stsp goto done;
2545 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2546 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2547 5de5890b 2018-10-18 stsp while (te) {
2548 5de5890b 2018-10-18 stsp char *id = NULL;
2550 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2553 5de5890b 2018-10-18 stsp if (show_ids) {
2554 5de5890b 2018-10-18 stsp char *id_str;
2555 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2557 5de5890b 2018-10-18 stsp goto done;
2558 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2559 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2560 5de5890b 2018-10-18 stsp free(id_str);
2561 5de5890b 2018-10-18 stsp goto done;
2563 5de5890b 2018-10-18 stsp free(id_str);
2565 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2568 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2569 c1669e2e 2019-01-09 stsp char *child_path;
2570 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2571 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2572 c1669e2e 2019-01-09 stsp te->name) == -1) {
2573 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2574 c1669e2e 2019-01-09 stsp goto done;
2576 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2577 c1669e2e 2019-01-09 stsp root_path, repo);
2578 c1669e2e 2019-01-09 stsp free(child_path);
2580 c1669e2e 2019-01-09 stsp goto done;
2583 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2587 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2588 5de5890b 2018-10-18 stsp free(tree_id);
2589 5de5890b 2018-10-18 stsp return err;
2592 5de5890b 2018-10-18 stsp static const struct got_error *
2593 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2595 5de5890b 2018-10-18 stsp const struct got_error *error;
2596 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2597 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2598 7a2c19d6 2019-02-05 stsp const char *path;
2599 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2600 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2601 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2602 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2605 5de5890b 2018-10-18 stsp #ifndef PROFILE
2606 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2607 0f8d269b 2019-01-04 stsp NULL) == -1)
2608 5de5890b 2018-10-18 stsp err(1, "pledge");
2611 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2612 5de5890b 2018-10-18 stsp switch (ch) {
2614 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2617 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2618 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2619 5de5890b 2018-10-18 stsp err(1, "-r option");
2620 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2623 5de5890b 2018-10-18 stsp show_ids = 1;
2626 c1669e2e 2019-01-09 stsp recurse = 1;
2629 2deda0b9 2019-03-07 stsp usage_tree();
2630 5de5890b 2018-10-18 stsp /* NOTREACHED */
2634 5de5890b 2018-10-18 stsp argc -= optind;
2635 5de5890b 2018-10-18 stsp argv += optind;
2637 5de5890b 2018-10-18 stsp if (argc == 1)
2638 5de5890b 2018-10-18 stsp path = argv[0];
2639 5de5890b 2018-10-18 stsp else if (argc > 1)
2640 5de5890b 2018-10-18 stsp usage_tree();
2642 7a2c19d6 2019-02-05 stsp path = NULL;
2644 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2645 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2646 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2647 9bf7a39b 2019-02-05 stsp goto done;
2649 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2650 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2651 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2652 7a2c19d6 2019-02-05 stsp goto done;
2654 7a2c19d6 2019-02-05 stsp error = NULL;
2655 7a2c19d6 2019-02-05 stsp if (worktree) {
2656 7a2c19d6 2019-02-05 stsp repo_path =
2657 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2658 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2659 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2660 7a2c19d6 2019-02-05 stsp if (error)
2661 7a2c19d6 2019-02-05 stsp goto done;
2663 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2664 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2665 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2666 7a2c19d6 2019-02-05 stsp goto done;
2671 5de5890b 2018-10-18 stsp error = got_repo_open(&repo, repo_path);
2672 5de5890b 2018-10-18 stsp if (error != NULL)
2673 c02c541e 2019-03-29 stsp goto done;
2675 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2676 c02c541e 2019-03-29 stsp if (error)
2677 5de5890b 2018-10-18 stsp goto done;
2679 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2680 9bf7a39b 2019-02-05 stsp if (worktree) {
2681 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2682 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2683 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2684 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2685 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2686 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2687 9bf7a39b 2019-02-05 stsp goto done;
2689 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2691 9bf7a39b 2019-02-05 stsp if (error)
2692 9bf7a39b 2019-02-05 stsp goto done;
2694 9bf7a39b 2019-02-05 stsp path = "/";
2696 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2697 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2698 9bf7a39b 2019-02-05 stsp if (error != NULL)
2699 9bf7a39b 2019-02-05 stsp goto done;
2702 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2703 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2704 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2705 5de5890b 2018-10-18 stsp if (error != NULL)
2706 5de5890b 2018-10-18 stsp goto done;
2707 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2708 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2709 5de5890b 2018-10-18 stsp if (error != NULL)
2710 5de5890b 2018-10-18 stsp goto done;
2712 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2713 30837e32 2019-07-25 stsp if (error)
2714 5de5890b 2018-10-18 stsp goto done;
2717 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2718 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2720 5de5890b 2018-10-18 stsp free(in_repo_path);
2721 5de5890b 2018-10-18 stsp free(repo_path);
2722 5de5890b 2018-10-18 stsp free(cwd);
2723 5de5890b 2018-10-18 stsp free(commit_id);
2724 7a2c19d6 2019-02-05 stsp if (worktree)
2725 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2726 5de5890b 2018-10-18 stsp if (repo) {
2727 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2728 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2729 5de5890b 2018-10-18 stsp if (error == NULL)
2730 5de5890b 2018-10-18 stsp error = repo_error;
2732 5de5890b 2018-10-18 stsp return error;
2735 6bad629b 2019-02-04 stsp __dead static void
2736 6bad629b 2019-02-04 stsp usage_status(void)
2738 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2742 b72f483a 2019-02-05 stsp static const struct got_error *
2743 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2744 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2745 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2747 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2748 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2749 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2750 b72f483a 2019-02-05 stsp return NULL;
2753 6bad629b 2019-02-04 stsp static const struct got_error *
2754 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2756 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2757 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2758 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2759 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2760 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2761 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2764 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2766 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2767 6bad629b 2019-02-04 stsp switch (ch) {
2769 2deda0b9 2019-03-07 stsp usage_status();
2770 6bad629b 2019-02-04 stsp /* NOTREACHED */
2774 6bad629b 2019-02-04 stsp argc -= optind;
2775 6bad629b 2019-02-04 stsp argv += optind;
2777 6bad629b 2019-02-04 stsp #ifndef PROFILE
2778 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2779 6bad629b 2019-02-04 stsp NULL) == -1)
2780 6bad629b 2019-02-04 stsp err(1, "pledge");
2782 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2783 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2784 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2785 927df6b7 2019-02-10 stsp goto done;
2788 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2789 927df6b7 2019-02-10 stsp if (error != NULL)
2790 a5edda0a 2019-07-27 stsp goto done;
2792 6bad629b 2019-02-04 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2793 6bad629b 2019-02-04 stsp if (error != NULL)
2794 6bad629b 2019-02-04 stsp goto done;
2796 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2797 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2798 087fb88c 2019-08-04 stsp if (error)
2799 087fb88c 2019-08-04 stsp goto done;
2801 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2802 6bad629b 2019-02-04 stsp if (error)
2803 6bad629b 2019-02-04 stsp goto done;
2805 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2806 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2808 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2809 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2810 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2811 927df6b7 2019-02-10 stsp free(cwd);
2812 d0eebce4 2019-03-11 stsp return error;
2815 d0eebce4 2019-03-11 stsp __dead static void
2816 d0eebce4 2019-03-11 stsp usage_ref(void)
2818 d0eebce4 2019-03-11 stsp fprintf(stderr,
2819 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2820 d0eebce4 2019-03-11 stsp getprogname());
2824 d0eebce4 2019-03-11 stsp static const struct got_error *
2825 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2827 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2828 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2829 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2831 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2832 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2834 d0eebce4 2019-03-11 stsp return err;
2836 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2837 d0eebce4 2019-03-11 stsp char *refstr;
2838 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2839 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2840 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2841 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2842 d0eebce4 2019-03-11 stsp free(refstr);
2845 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2846 d0eebce4 2019-03-11 stsp return NULL;
2849 d0eebce4 2019-03-11 stsp static const struct got_error *
2850 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
2852 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2853 d0eebce4 2019-03-11 stsp struct got_reference *ref;
2855 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
2857 d0eebce4 2019-03-11 stsp return err;
2859 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
2860 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2861 d0eebce4 2019-03-11 stsp return err;
2864 d0eebce4 2019-03-11 stsp static const struct got_error *
2865 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
2867 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
2868 d0eebce4 2019-03-11 stsp struct got_object_id *id;
2869 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
2872 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
2873 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
2874 d1644381 2019-07-14 stsp * an unintended typo.
2876 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
2877 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2879 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2881 d83d9d5c 2019-05-13 stsp if (err) {
2882 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
2884 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2885 d83d9d5c 2019-05-13 stsp return err;
2886 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
2888 d83d9d5c 2019-05-13 stsp return err;
2889 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
2890 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
2892 d83d9d5c 2019-05-13 stsp return err;
2895 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
2897 d0eebce4 2019-03-11 stsp goto done;
2899 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
2902 d0eebce4 2019-03-11 stsp got_ref_close(ref);
2904 d1c1ae5f 2019-08-12 stsp return err;
2907 d1c1ae5f 2019-08-12 stsp static const struct got_error *
2908 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
2910 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
2911 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
2912 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
2915 d1c1ae5f 2019-08-12 stsp * Don't let the user create a reference named '-'.
2916 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
2917 d1c1ae5f 2019-08-12 stsp * an unintended typo.
2919 d1c1ae5f 2019-08-12 stsp if (refname[0] == '-' && refname[1] == '\0')
2920 d1c1ae5f 2019-08-12 stsp return got_error(GOT_ERR_BAD_REF_NAME);
2922 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
2924 d1c1ae5f 2019-08-12 stsp return err;
2926 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
2928 d1c1ae5f 2019-08-12 stsp goto done;
2930 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
2932 d1c1ae5f 2019-08-12 stsp if (target_ref)
2933 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
2935 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
2936 d0eebce4 2019-03-11 stsp return err;
2939 d0eebce4 2019-03-11 stsp static const struct got_error *
2940 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
2942 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
2943 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
2944 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
2945 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
2946 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
2947 d0eebce4 2019-03-11 stsp const char *delref = NULL;
2949 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
2950 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
2951 d0eebce4 2019-03-11 stsp switch (ch) {
2953 d0eebce4 2019-03-11 stsp delref = optarg;
2956 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
2957 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
2958 d0eebce4 2019-03-11 stsp err(1, "-r option");
2959 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2962 d0eebce4 2019-03-11 stsp do_list = 1;
2965 d1c1ae5f 2019-08-12 stsp create_symref = 1;
2968 d0eebce4 2019-03-11 stsp usage_ref();
2969 d0eebce4 2019-03-11 stsp /* NOTREACHED */
2973 d0eebce4 2019-03-11 stsp if (do_list && delref)
2974 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
2976 d0eebce4 2019-03-11 stsp argc -= optind;
2977 d0eebce4 2019-03-11 stsp argv += optind;
2979 d0eebce4 2019-03-11 stsp if (do_list || delref) {
2980 d1c1ae5f 2019-08-12 stsp if (create_symref)
2981 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
2982 d1c1ae5f 2019-08-12 stsp "-l or -d options");
2983 d0eebce4 2019-03-11 stsp if (argc > 0)
2984 d0eebce4 2019-03-11 stsp usage_ref();
2985 d0eebce4 2019-03-11 stsp } else if (argc != 2)
2986 d0eebce4 2019-03-11 stsp usage_ref();
2988 d0eebce4 2019-03-11 stsp #ifndef PROFILE
2989 e0b57350 2019-03-12 stsp if (do_list) {
2990 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2991 e0b57350 2019-03-12 stsp NULL) == -1)
2992 e0b57350 2019-03-12 stsp err(1, "pledge");
2994 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2995 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
2996 e0b57350 2019-03-12 stsp err(1, "pledge");
2999 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3000 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3001 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3002 d0eebce4 2019-03-11 stsp goto done;
3005 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3006 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3007 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3008 d0eebce4 2019-03-11 stsp goto done;
3010 d0eebce4 2019-03-11 stsp error = NULL;
3011 d0eebce4 2019-03-11 stsp if (worktree) {
3012 d0eebce4 2019-03-11 stsp repo_path =
3013 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3014 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3015 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3016 d0eebce4 2019-03-11 stsp if (error)
3017 d0eebce4 2019-03-11 stsp goto done;
3019 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3020 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3021 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3022 d0eebce4 2019-03-11 stsp goto done;
3027 d0eebce4 2019-03-11 stsp error = got_repo_open(&repo, repo_path);
3028 d0eebce4 2019-03-11 stsp if (error != NULL)
3029 d0eebce4 2019-03-11 stsp goto done;
3031 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3032 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3033 c02c541e 2019-03-29 stsp if (error)
3034 c02c541e 2019-03-29 stsp goto done;
3036 d0eebce4 2019-03-11 stsp if (do_list)
3037 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3038 d0eebce4 2019-03-11 stsp else if (delref)
3039 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3040 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3041 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3043 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3046 4e759de4 2019-06-26 stsp got_repo_close(repo);
3047 4e759de4 2019-06-26 stsp if (worktree)
3048 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3049 4e759de4 2019-06-26 stsp free(cwd);
3050 4e759de4 2019-06-26 stsp free(repo_path);
3051 4e759de4 2019-06-26 stsp return error;
3054 4e759de4 2019-06-26 stsp __dead static void
3055 4e759de4 2019-06-26 stsp usage_branch(void)
3057 4e759de4 2019-06-26 stsp fprintf(stderr,
3058 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
3059 4e759de4 2019-06-26 stsp "name [base-branch]\n", getprogname());
3063 4e759de4 2019-06-26 stsp static const struct got_error *
3064 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3066 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3067 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3068 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3070 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3072 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3073 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3075 4e759de4 2019-06-26 stsp return err;
3077 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3078 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
3079 4e759de4 2019-06-26 stsp char *refstr;
3080 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
3081 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
3082 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3083 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
3084 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
3086 ba882ee3 2019-07-11 stsp return err;
3087 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
3088 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3089 ba882ee3 2019-07-11 stsp marker = "* ";
3091 ba882ee3 2019-07-11 stsp marker = "~ ";
3094 29606af7 2019-08-23 stsp refname += strlen("refs/heads/");
3095 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
3096 4e759de4 2019-06-26 stsp if (refstr == NULL)
3097 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
3098 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
3099 4e759de4 2019-06-26 stsp free(refstr);
3102 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3103 4e759de4 2019-06-26 stsp return NULL;
3106 4e759de4 2019-06-26 stsp static const struct got_error *
3107 4e759de4 2019-06-26 stsp delete_branch(struct got_repository *repo, const char *branch_name)
3109 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3110 4e759de4 2019-06-26 stsp struct got_reference *ref;
3111 4e759de4 2019-06-26 stsp char *refname;
3113 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3114 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3116 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3118 4e759de4 2019-06-26 stsp goto done;
3120 4e759de4 2019-06-26 stsp err = got_ref_delete(ref, repo);
3121 4e759de4 2019-06-26 stsp got_ref_close(ref);
3123 4e759de4 2019-06-26 stsp free(refname);
3124 4e759de4 2019-06-26 stsp return err;
3127 4e759de4 2019-06-26 stsp static const struct got_error *
3128 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3129 4e759de4 2019-06-26 stsp const char *base_branch)
3131 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3132 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
3133 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3134 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3135 4e759de4 2019-06-26 stsp struct got_reference *base_ref;
3138 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
3139 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3140 d3f84d51 2019-07-11 stsp * an unintended typo.
3142 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
3143 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3145 4e759de4 2019-06-26 stsp if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
3146 4e759de4 2019-06-26 stsp base_refname = strdup(GOT_REF_HEAD);
3147 4e759de4 2019-06-26 stsp if (base_refname == NULL)
3148 4e759de4 2019-06-26 stsp return got_error_from_errno("strdup");
3149 4e759de4 2019-06-26 stsp } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
3150 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3152 4e759de4 2019-06-26 stsp err = got_ref_open(&base_ref, repo, base_refname, 0);
3154 4e759de4 2019-06-26 stsp goto done;
3155 4e759de4 2019-06-26 stsp err = got_ref_resolve(&id, repo, base_ref);
3156 4e759de4 2019-06-26 stsp got_ref_close(base_ref);
3158 4e759de4 2019-06-26 stsp goto done;
3160 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3161 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3162 4e759de4 2019-06-26 stsp goto done;
3165 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3166 4e759de4 2019-06-26 stsp if (err == NULL) {
3167 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3168 4e759de4 2019-06-26 stsp goto done;
3169 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3170 4e759de4 2019-06-26 stsp goto done;
3172 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
3174 4e759de4 2019-06-26 stsp goto done;
3176 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3179 4e759de4 2019-06-26 stsp got_ref_close(ref);
3181 4e759de4 2019-06-26 stsp free(base_refname);
3182 4e759de4 2019-06-26 stsp free(refname);
3183 4e759de4 2019-06-26 stsp return err;
3186 4e759de4 2019-06-26 stsp static const struct got_error *
3187 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3189 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3190 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3191 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3192 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3193 4e759de4 2019-06-26 stsp int ch, do_list = 0;
3194 4e759de4 2019-06-26 stsp const char *delref = NULL;
3196 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3197 4e759de4 2019-06-26 stsp switch (ch) {
3199 4e759de4 2019-06-26 stsp delref = optarg;
3202 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3203 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3204 4e759de4 2019-06-26 stsp err(1, "-r option");
3205 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3208 4e759de4 2019-06-26 stsp do_list = 1;
3211 4e759de4 2019-06-26 stsp usage_branch();
3212 4e759de4 2019-06-26 stsp /* NOTREACHED */
3216 4e759de4 2019-06-26 stsp if (do_list && delref)
3217 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3219 4e759de4 2019-06-26 stsp argc -= optind;
3220 4e759de4 2019-06-26 stsp argv += optind;
3222 4e759de4 2019-06-26 stsp if (do_list || delref) {
3223 4e759de4 2019-06-26 stsp if (argc > 0)
3224 4e759de4 2019-06-26 stsp usage_branch();
3225 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
3226 4e759de4 2019-06-26 stsp usage_branch();
3228 4e759de4 2019-06-26 stsp #ifndef PROFILE
3229 4e759de4 2019-06-26 stsp if (do_list) {
3230 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3231 4e759de4 2019-06-26 stsp NULL) == -1)
3232 4e759de4 2019-06-26 stsp err(1, "pledge");
3234 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3235 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3236 4e759de4 2019-06-26 stsp err(1, "pledge");
3239 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3240 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3241 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3242 4e759de4 2019-06-26 stsp goto done;
3245 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3246 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3247 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3248 4e759de4 2019-06-26 stsp goto done;
3250 4e759de4 2019-06-26 stsp error = NULL;
3251 4e759de4 2019-06-26 stsp if (worktree) {
3252 4e759de4 2019-06-26 stsp repo_path =
3253 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3254 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3255 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3256 4e759de4 2019-06-26 stsp if (error)
3257 4e759de4 2019-06-26 stsp goto done;
3259 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3260 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3261 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3262 4e759de4 2019-06-26 stsp goto done;
3267 4e759de4 2019-06-26 stsp error = got_repo_open(&repo, repo_path);
3268 4e759de4 2019-06-26 stsp if (error != NULL)
3269 4e759de4 2019-06-26 stsp goto done;
3271 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3272 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3273 4e759de4 2019-06-26 stsp if (error)
3274 4e759de4 2019-06-26 stsp goto done;
3276 4e759de4 2019-06-26 stsp if (do_list)
3277 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3278 4e759de4 2019-06-26 stsp else if (delref)
3279 4e759de4 2019-06-26 stsp error = delete_branch(repo, delref);
3281 4e759de4 2019-06-26 stsp const char *base_branch;
3282 4e759de4 2019-06-26 stsp if (argc == 1) {
3283 4e759de4 2019-06-26 stsp base_branch = worktree ?
3284 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3285 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3286 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
3287 dc5351b4 2019-07-30 stsp base_branch += 11;
3289 4e759de4 2019-06-26 stsp base_branch = argv[1];
3290 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
3294 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3295 d0eebce4 2019-03-11 stsp if (worktree)
3296 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3297 d0eebce4 2019-03-11 stsp free(cwd);
3298 d0eebce4 2019-03-11 stsp free(repo_path);
3299 d00136be 2019-03-26 stsp return error;
3303 d00136be 2019-03-26 stsp __dead static void
3304 8e7bd50a 2019-08-22 stsp usage_tag(void)
3306 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3307 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3308 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3313 b8bad2ba 2019-08-23 stsp static const struct got_error *
3314 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3316 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3317 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3318 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3319 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3320 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3322 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3323 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3324 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3325 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3327 b8bad2ba 2019-08-23 stsp return err;
3328 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3331 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3334 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3335 b8bad2ba 2019-08-23 stsp free(re_id);
3338 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3339 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3342 b8bad2ba 2019-08-23 stsp while (se) {
3343 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3346 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3347 b8bad2ba 2019-08-23 stsp free(se_id);
3350 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3351 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3353 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3354 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3356 b8bad2ba 2019-08-23 stsp return err;
3357 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3360 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3365 b8bad2ba 2019-08-23 stsp return err;
3369 8e7bd50a 2019-08-22 stsp static const struct got_error *
3370 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3371 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3373 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3374 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3375 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3376 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3377 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3381 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3383 b8bad2ba 2019-08-23 stsp return err;
3384 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3386 b8bad2ba 2019-08-23 stsp goto done;
3388 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3390 b8bad2ba 2019-08-23 stsp goto done;
3391 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3393 b8bad2ba 2019-08-23 stsp goto done;
3395 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3396 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3398 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3399 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3401 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3402 b8bad2ba 2019-08-23 stsp *cmp = -1;
3404 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3406 b8bad2ba 2019-08-23 stsp free(id1);
3407 b8bad2ba 2019-08-23 stsp free(id2);
3409 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3411 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3412 b8bad2ba 2019-08-23 stsp return err;
3415 b8bad2ba 2019-08-23 stsp static const struct got_error *
3416 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3418 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3419 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3420 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3422 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3424 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3426 8e7bd50a 2019-08-22 stsp return err;
3428 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3429 8e7bd50a 2019-08-22 stsp const char *refname;
3430 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3431 8e7bd50a 2019-08-22 stsp char datebuf[26];
3432 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3433 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3434 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3436 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3437 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3439 8e7bd50a 2019-08-22 stsp refname += 10;
3440 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3441 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3442 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3445 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3446 8e7bd50a 2019-08-22 stsp free(refstr);
3448 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3451 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3455 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3456 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3457 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3458 2417344c 2019-08-23 stsp if (datestr)
3459 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3460 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3461 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3464 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3465 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3466 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3468 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3469 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3471 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3472 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3474 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3475 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3480 8e7bd50a 2019-08-22 stsp free(id_str);
3481 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3482 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3483 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3484 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3488 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3490 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3492 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3493 8e7bd50a 2019-08-22 stsp } while (line);
3494 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3497 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3498 8e7bd50a 2019-08-22 stsp return NULL;
3501 8e7bd50a 2019-08-22 stsp static const struct got_error *
3502 62870f63 2019-08-22 stsp get_tag_message(char **tagmsg, const char *commit_id_str,
3503 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3505 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3506 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3507 8e7bd50a 2019-08-22 stsp char *tagmsg_path = NULL, *editor = NULL;
3508 8e7bd50a 2019-08-22 stsp int fd = -1;
3510 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3511 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3512 8e7bd50a 2019-08-22 stsp goto done;
3515 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3516 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3517 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3518 8e7bd50a 2019-08-22 stsp goto done;
3521 8e7bd50a 2019-08-22 stsp err = got_opentemp_named_fd(&tagmsg_path, &fd, template);
3523 8e7bd50a 2019-08-22 stsp goto done;
3525 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3526 8e7bd50a 2019-08-22 stsp close(fd);
3528 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3530 8e7bd50a 2019-08-22 stsp goto done;
3531 8e7bd50a 2019-08-22 stsp err = edit_logmsg(tagmsg, editor, tagmsg_path, initial_content);
3533 8e7bd50a 2019-08-22 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3534 8e7bd50a 2019-08-22 stsp unlink(tagmsg_path);
3535 8e7bd50a 2019-08-22 stsp free(tagmsg_path);
3536 8e7bd50a 2019-08-22 stsp tagmsg_path = NULL;
3538 8e7bd50a 2019-08-22 stsp free(initial_content);
3539 8e7bd50a 2019-08-22 stsp free(template);
3540 8e7bd50a 2019-08-22 stsp free(editor);
3542 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3543 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3544 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3545 8e7bd50a 2019-08-22 stsp if (err) {
3546 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3547 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3550 8e7bd50a 2019-08-22 stsp return err;
3553 8e7bd50a 2019-08-22 stsp static const struct got_error *
3554 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3555 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3557 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3558 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3559 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3560 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3561 8e7bd50a 2019-08-22 stsp char *refname = NULL, *tagmsg = NULL;
3562 8e7bd50a 2019-08-22 stsp const char *tagger;
3565 8e7bd50a 2019-08-22 stsp * Don't let the user create a tag named '-'.
3566 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3567 8e7bd50a 2019-08-22 stsp * an unintended typo.
3569 8e7bd50a 2019-08-22 stsp if (tag_name[0] == '-' && tag_name[1] == '\0')
3570 8e7bd50a 2019-08-22 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3572 8e7bd50a 2019-08-22 stsp err = get_author(&tagger);
3574 8e7bd50a 2019-08-22 stsp return err;
3576 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3577 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3579 8e7bd50a 2019-08-22 stsp goto done;
3581 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3583 8e7bd50a 2019-08-22 stsp goto done;
3585 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3586 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3587 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3588 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3589 8e7bd50a 2019-08-22 stsp goto done;
3591 8e7bd50a 2019-08-22 stsp tag_name += 10;
3592 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3593 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3594 8e7bd50a 2019-08-22 stsp goto done;
3597 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3598 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3599 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3600 8e7bd50a 2019-08-22 stsp goto done;
3601 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3602 8e7bd50a 2019-08-22 stsp goto done;
3604 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3605 8e7bd50a 2019-08-22 stsp err = get_tag_message(&tagmsg, commit_id_str,
3606 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3608 8e7bd50a 2019-08-22 stsp goto done;
3611 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3612 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3614 8e7bd50a 2019-08-22 stsp goto done;
3616 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3618 8e7bd50a 2019-08-22 stsp goto done;
3620 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3622 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3623 8e7bd50a 2019-08-22 stsp char *tag_id_str;
3624 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&tag_id_str, tag_id);
3625 8e7bd50a 2019-08-22 stsp printf("Created tag %s\n", tag_id_str);
3626 8e7bd50a 2019-08-22 stsp free(tag_id_str);
3630 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3631 8e7bd50a 2019-08-22 stsp free(commit_id);
3632 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3633 8e7bd50a 2019-08-22 stsp free(refname);
3634 8e7bd50a 2019-08-22 stsp free(tagmsg);
3635 8e7bd50a 2019-08-22 stsp return err;
3638 8e7bd50a 2019-08-22 stsp static const struct got_error *
3639 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
3641 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
3642 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
3643 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
3644 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3645 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3646 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
3648 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3649 8e7bd50a 2019-08-22 stsp switch (ch) {
3651 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
3654 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
3655 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3656 8e7bd50a 2019-08-22 stsp err(1, "-r option");
3657 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
3660 8e7bd50a 2019-08-22 stsp do_list = 1;
3663 8e7bd50a 2019-08-22 stsp usage_tag();
3664 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
3668 8e7bd50a 2019-08-22 stsp argc -= optind;
3669 8e7bd50a 2019-08-22 stsp argv += optind;
3671 8e7bd50a 2019-08-22 stsp if (do_list) {
3672 8e7bd50a 2019-08-22 stsp if (tagmsg)
3673 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
3674 8e7bd50a 2019-08-22 stsp if (argc > 0)
3675 8e7bd50a 2019-08-22 stsp usage_tag();
3676 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
3677 8e7bd50a 2019-08-22 stsp usage_tag();
3678 a2887370 2019-08-23 stsp else if (argc > 1)
3679 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
3680 a2887370 2019-08-23 stsp tag_name = argv[0];
3682 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
3683 8e7bd50a 2019-08-22 stsp if (do_list) {
3684 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3685 8e7bd50a 2019-08-22 stsp NULL) == -1)
3686 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3688 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3689 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
3690 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3693 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
3694 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
3695 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
3696 8e7bd50a 2019-08-22 stsp goto done;
3699 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
3700 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
3701 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3702 8e7bd50a 2019-08-22 stsp goto done;
3704 8e7bd50a 2019-08-22 stsp error = NULL;
3705 8e7bd50a 2019-08-22 stsp if (worktree) {
3706 8e7bd50a 2019-08-22 stsp repo_path =
3707 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
3708 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3709 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
3710 8e7bd50a 2019-08-22 stsp if (error)
3711 8e7bd50a 2019-08-22 stsp goto done;
3713 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
3714 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
3715 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
3716 8e7bd50a 2019-08-22 stsp goto done;
3721 8e7bd50a 2019-08-22 stsp error = got_repo_open(&repo, repo_path);
3722 8e7bd50a 2019-08-22 stsp if (error != NULL)
3723 8e7bd50a 2019-08-22 stsp goto done;
3726 8e7bd50a 2019-08-22 stsp if (do_list) {
3727 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3728 8e7bd50a 2019-08-22 stsp if (error)
3729 8e7bd50a 2019-08-22 stsp goto done;
3730 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
3732 8e7bd50a 2019-08-22 stsp if (tagmsg) {
3733 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3734 8e7bd50a 2019-08-22 stsp if (error)
3735 8e7bd50a 2019-08-22 stsp goto done;
3738 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
3739 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
3740 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
3741 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
3742 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3743 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
3744 8e7bd50a 2019-08-22 stsp if (error)
3745 8e7bd50a 2019-08-22 stsp goto done;
3746 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3747 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
3748 8e7bd50a 2019-08-22 stsp if (error)
3749 8e7bd50a 2019-08-22 stsp goto done;
3750 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
3751 8e7bd50a 2019-08-22 stsp free(commit_id);
3752 8e7bd50a 2019-08-22 stsp if (error)
3753 8e7bd50a 2019-08-22 stsp goto done;
3756 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
3757 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
3761 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
3762 8e7bd50a 2019-08-22 stsp if (worktree)
3763 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
3764 8e7bd50a 2019-08-22 stsp free(cwd);
3765 8e7bd50a 2019-08-22 stsp free(repo_path);
3766 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3767 8e7bd50a 2019-08-22 stsp return error;
3770 8e7bd50a 2019-08-22 stsp __dead static void
3771 d00136be 2019-03-26 stsp usage_add(void)
3773 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3777 d00136be 2019-03-26 stsp static const struct got_error *
3778 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
3780 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
3781 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
3782 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
3783 1dd54920 2019-05-11 stsp char *cwd = NULL;
3784 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
3785 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3788 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
3790 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3791 d00136be 2019-03-26 stsp switch (ch) {
3793 d00136be 2019-03-26 stsp usage_add();
3794 d00136be 2019-03-26 stsp /* NOTREACHED */
3798 d00136be 2019-03-26 stsp argc -= optind;
3799 d00136be 2019-03-26 stsp argv += optind;
3801 43012d58 2019-07-14 stsp #ifndef PROFILE
3802 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3803 43012d58 2019-07-14 stsp NULL) == -1)
3804 43012d58 2019-07-14 stsp err(1, "pledge");
3806 723c305c 2019-05-11 jcs if (argc < 1)
3807 d00136be 2019-03-26 stsp usage_add();
3809 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
3810 d00136be 2019-03-26 stsp if (cwd == NULL) {
3811 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3812 d00136be 2019-03-26 stsp goto done;
3815 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3816 d00136be 2019-03-26 stsp if (error)
3817 d00136be 2019-03-26 stsp goto done;
3819 031a5338 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3820 031a5338 2019-03-26 stsp if (error != NULL)
3821 031a5338 2019-03-26 stsp goto done;
3823 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3824 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3825 d00136be 2019-03-26 stsp if (error)
3826 d00136be 2019-03-26 stsp goto done;
3828 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3829 6d022e97 2019-08-04 stsp if (error)
3830 6d022e97 2019-08-04 stsp goto done;
3832 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
3833 1dd54920 2019-05-11 stsp NULL, repo);
3836 031a5338 2019-03-26 stsp got_repo_close(repo);
3837 d00136be 2019-03-26 stsp if (worktree)
3838 d00136be 2019-03-26 stsp got_worktree_close(worktree);
3839 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
3840 1dd54920 2019-05-11 stsp free((char *)pe->path);
3841 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
3842 2ec1f75b 2019-03-26 stsp free(cwd);
3843 2ec1f75b 2019-03-26 stsp return error;
3846 2ec1f75b 2019-03-26 stsp __dead static void
3847 648e4ef7 2019-07-09 stsp usage_remove(void)
3849 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3853 2a06fe5f 2019-08-24 stsp static const struct got_error *
3854 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
3855 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
3856 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3857 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
3859 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3860 2a06fe5f 2019-08-24 stsp return NULL;
3861 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3862 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
3863 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
3864 2a06fe5f 2019-08-24 stsp return NULL;
3867 2ec1f75b 2019-03-26 stsp static const struct got_error *
3868 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
3870 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
3871 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
3872 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
3873 17ed4618 2019-06-02 stsp char *cwd = NULL;
3874 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
3875 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3876 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
3878 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
3880 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
3881 2ec1f75b 2019-03-26 stsp switch (ch) {
3883 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
3886 2ec1f75b 2019-03-26 stsp usage_add();
3887 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
3891 2ec1f75b 2019-03-26 stsp argc -= optind;
3892 2ec1f75b 2019-03-26 stsp argv += optind;
3894 43012d58 2019-07-14 stsp #ifndef PROFILE
3895 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3896 43012d58 2019-07-14 stsp NULL) == -1)
3897 43012d58 2019-07-14 stsp err(1, "pledge");
3899 17ed4618 2019-06-02 stsp if (argc < 1)
3900 648e4ef7 2019-07-09 stsp usage_remove();
3902 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
3903 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
3904 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3905 2ec1f75b 2019-03-26 stsp goto done;
3907 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3908 2ec1f75b 2019-03-26 stsp if (error)
3909 2ec1f75b 2019-03-26 stsp goto done;
3911 2ec1f75b 2019-03-26 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3913 2ec1f75b 2019-03-26 stsp goto done;
3915 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3916 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3917 2ec1f75b 2019-03-26 stsp if (error)
3918 2ec1f75b 2019-03-26 stsp goto done;
3920 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3921 6d022e97 2019-08-04 stsp if (error)
3922 6d022e97 2019-08-04 stsp goto done;
3924 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
3925 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
3926 a129376b 2019-03-28 stsp if (error)
3927 a129376b 2019-03-28 stsp goto done;
3930 a129376b 2019-03-28 stsp got_repo_close(repo);
3931 a129376b 2019-03-28 stsp if (worktree)
3932 a129376b 2019-03-28 stsp got_worktree_close(worktree);
3933 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
3934 17ed4618 2019-06-02 stsp free((char *)pe->path);
3935 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
3936 a129376b 2019-03-28 stsp free(cwd);
3937 a129376b 2019-03-28 stsp return error;
3940 a129376b 2019-03-28 stsp __dead static void
3941 a129376b 2019-03-28 stsp usage_revert(void)
3943 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
3944 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
3948 1ee397ad 2019-07-12 stsp static const struct got_error *
3949 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
3951 a129376b 2019-03-28 stsp while (path[0] == '/')
3953 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
3954 33aa809d 2019-08-08 stsp return NULL;
3957 33aa809d 2019-08-08 stsp struct choose_patch_arg {
3958 33aa809d 2019-08-08 stsp FILE *patch_script_file;
3959 33aa809d 2019-08-08 stsp const char *action;
3962 33aa809d 2019-08-08 stsp static const struct got_error *
3963 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
3964 33aa809d 2019-08-08 stsp int nchanges, const char *action)
3966 33aa809d 2019-08-08 stsp char *line = NULL;
3967 33aa809d 2019-08-08 stsp size_t linesize = 0;
3968 33aa809d 2019-08-08 stsp ssize_t linelen;
3970 33aa809d 2019-08-08 stsp switch (status) {
3971 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
3972 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
3974 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
3975 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
3977 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
3978 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
3979 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
3980 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3981 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
3982 33aa809d 2019-08-08 stsp printf("%s", line);
3983 33aa809d 2019-08-08 stsp if (ferror(patch_file))
3984 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
3985 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
3986 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
3987 33aa809d 2019-08-08 stsp path, n, nchanges, action);
3990 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
3993 33aa809d 2019-08-08 stsp return NULL;
3996 33aa809d 2019-08-08 stsp static const struct got_error *
3997 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
3998 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4000 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4001 33aa809d 2019-08-08 stsp char *line = NULL;
4002 33aa809d 2019-08-08 stsp size_t linesize = 0;
4003 33aa809d 2019-08-08 stsp ssize_t linelen;
4004 33aa809d 2019-08-08 stsp int resp = ' ';
4005 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4007 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4009 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4011 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4012 33aa809d 2019-08-08 stsp a->action);
4014 33aa809d 2019-08-08 stsp return err;
4015 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4016 33aa809d 2019-08-08 stsp if (linelen == -1) {
4017 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4018 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4019 33aa809d 2019-08-08 stsp return NULL;
4021 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4023 33aa809d 2019-08-08 stsp *nl = '\0';
4024 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4025 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4026 33aa809d 2019-08-08 stsp printf("y\n");
4027 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4028 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4029 33aa809d 2019-08-08 stsp printf("n\n");
4030 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4031 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4032 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4033 33aa809d 2019-08-08 stsp printf("q\n");
4035 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4036 33aa809d 2019-08-08 stsp free(line);
4037 33aa809d 2019-08-08 stsp return NULL;
4040 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4041 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4042 33aa809d 2019-08-08 stsp a->action);
4044 33aa809d 2019-08-08 stsp return err;
4045 33aa809d 2019-08-08 stsp resp = getchar();
4046 33aa809d 2019-08-08 stsp if (resp == '\n')
4047 33aa809d 2019-08-08 stsp resp = getchar();
4048 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4049 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4050 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4051 33aa809d 2019-08-08 stsp resp = ' ';
4053 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4054 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4055 33aa809d 2019-08-08 stsp resp = ' ';
4059 33aa809d 2019-08-08 stsp if (resp == 'y')
4060 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4061 33aa809d 2019-08-08 stsp else if (resp == 'n')
4062 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4063 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4064 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4066 1ee397ad 2019-07-12 stsp return NULL;
4070 a129376b 2019-03-28 stsp static const struct got_error *
4071 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4073 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4074 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4075 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4076 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4077 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4078 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4079 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4080 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4081 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4082 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4084 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4086 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4087 a129376b 2019-03-28 stsp switch (ch) {
4089 33aa809d 2019-08-08 stsp pflag = 1;
4092 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4095 0f6d7415 2019-08-08 stsp can_recurse = 1;
4098 a129376b 2019-03-28 stsp usage_revert();
4099 a129376b 2019-03-28 stsp /* NOTREACHED */
4103 a129376b 2019-03-28 stsp argc -= optind;
4104 a129376b 2019-03-28 stsp argv += optind;
4106 43012d58 2019-07-14 stsp #ifndef PROFILE
4107 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4108 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4109 43012d58 2019-07-14 stsp err(1, "pledge");
4111 e20a8b6f 2019-06-04 stsp if (argc < 1)
4112 a129376b 2019-03-28 stsp usage_revert();
4113 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4114 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4116 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4117 a129376b 2019-03-28 stsp if (cwd == NULL) {
4118 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4119 a129376b 2019-03-28 stsp goto done;
4121 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4122 2ec1f75b 2019-03-26 stsp if (error)
4123 2ec1f75b 2019-03-26 stsp goto done;
4125 a129376b 2019-03-28 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4126 a129376b 2019-03-28 stsp if (error != NULL)
4127 a129376b 2019-03-28 stsp goto done;
4129 33aa809d 2019-08-08 stsp if (patch_script_path) {
4130 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4131 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4132 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4133 33aa809d 2019-08-08 stsp patch_script_path);
4134 33aa809d 2019-08-08 stsp goto done;
4137 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4138 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4139 a129376b 2019-03-28 stsp if (error)
4140 a129376b 2019-03-28 stsp goto done;
4142 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4143 6d022e97 2019-08-04 stsp if (error)
4144 6d022e97 2019-08-04 stsp goto done;
4146 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4147 0f6d7415 2019-08-08 stsp char *ondisk_path;
4148 0f6d7415 2019-08-08 stsp struct stat sb;
4149 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4150 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4151 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4152 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4153 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4154 0f6d7415 2019-08-08 stsp goto done;
4156 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4157 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4158 0f6d7415 2019-08-08 stsp free(ondisk_path);
4161 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4162 0f6d7415 2019-08-08 stsp ondisk_path);
4163 0f6d7415 2019-08-08 stsp free(ondisk_path);
4164 0f6d7415 2019-08-08 stsp goto done;
4166 0f6d7415 2019-08-08 stsp free(ondisk_path);
4167 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4168 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4169 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4170 0f6d7415 2019-08-08 stsp goto done;
4175 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4176 33aa809d 2019-08-08 stsp cpa.action = "revert";
4177 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4178 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4179 a129376b 2019-03-28 stsp if (error)
4180 a129376b 2019-03-28 stsp goto done;
4182 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4183 33aa809d 2019-08-08 stsp error == NULL)
4184 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4186 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4187 2ec1f75b 2019-03-26 stsp if (worktree)
4188 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4189 2ec1f75b 2019-03-26 stsp free(path);
4190 d00136be 2019-03-26 stsp free(cwd);
4191 6bad629b 2019-02-04 stsp return error;
4194 c4296144 2019-05-09 stsp __dead static void
4195 c4296144 2019-05-09 stsp usage_commit(void)
4197 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4198 5c1e53bc 2019-07-28 stsp getprogname());
4202 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4203 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4204 e2ba3d07 2019-05-13 stsp const char *editor;
4205 e0870e44 2019-05-13 stsp const char *worktree_path;
4206 76d98825 2019-06-03 stsp const char *branch_name;
4207 314a6357 2019-05-13 stsp const char *repo_path;
4208 e0870e44 2019-05-13 stsp char *logmsg_path;
4212 33ad4cbe 2019-05-12 jcs static const struct got_error *
4213 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4216 76d98825 2019-06-03 stsp char *initial_content = NULL;
4217 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4218 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4219 e0870e44 2019-05-13 stsp char *template = NULL;
4220 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4222 33ad4cbe 2019-05-12 jcs size_t len;
4224 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4225 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4226 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4227 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4228 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4229 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4230 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4231 33ad4cbe 2019-05-12 jcs return NULL;
4234 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4235 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4237 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4238 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4239 76d98825 2019-06-03 stsp a->branch_name) == -1)
4240 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4242 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4244 e0870e44 2019-05-13 stsp goto done;
4246 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4248 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4249 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4250 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4251 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4252 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4256 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4258 e2af0fd1 2019-08-08 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
4259 e2af0fd1 2019-08-08 stsp unlink(a->logmsg_path);
4260 e2af0fd1 2019-08-08 stsp free(a->logmsg_path);
4261 e2af0fd1 2019-08-08 stsp a->logmsg_path = NULL;
4263 76d98825 2019-06-03 stsp free(initial_content);
4264 e0870e44 2019-05-13 stsp free(template);
4266 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4267 3ce1b845 2019-07-15 stsp if (err == NULL) {
4268 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4269 3ce1b845 2019-07-15 stsp if (err) {
4270 3ce1b845 2019-07-15 stsp free(*logmsg);
4271 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4274 33ad4cbe 2019-05-12 jcs return err;
4277 c4296144 2019-05-09 stsp static const struct got_error *
4278 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4280 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4281 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4282 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4283 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4284 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4285 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4286 84792843 2019-08-09 stsp const char *author;
4287 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg cl_arg;
4288 e2ba3d07 2019-05-13 stsp char *editor = NULL;
4289 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
4290 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4292 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4293 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4295 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4296 c4296144 2019-05-09 stsp switch (ch) {
4298 c4296144 2019-05-09 stsp logmsg = optarg;
4301 c4296144 2019-05-09 stsp usage_commit();
4302 c4296144 2019-05-09 stsp /* NOTREACHED */
4306 c4296144 2019-05-09 stsp argc -= optind;
4307 c4296144 2019-05-09 stsp argv += optind;
4309 43012d58 2019-07-14 stsp #ifndef PROFILE
4310 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4311 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4312 43012d58 2019-07-14 stsp err(1, "pledge");
4314 84792843 2019-08-09 stsp error = get_author(&author);
4315 84792843 2019-08-09 stsp if (error)
4316 84792843 2019-08-09 stsp return error;
4318 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4319 c4296144 2019-05-09 stsp if (cwd == NULL) {
4320 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4321 c4296144 2019-05-09 stsp goto done;
4323 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4324 7d5807f4 2019-07-11 stsp if (error)
4325 7d5807f4 2019-07-11 stsp goto done;
4327 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4328 c4296144 2019-05-09 stsp if (error)
4329 a698f62e 2019-07-25 stsp goto done;
4330 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4331 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4332 c4296144 2019-05-09 stsp goto done;
4335 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4336 916f288c 2019-07-30 stsp worktree);
4337 5c1e53bc 2019-07-28 stsp if (error)
4338 5c1e53bc 2019-07-28 stsp goto done;
4340 c4296144 2019-05-09 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4341 c4296144 2019-05-09 stsp if (error != NULL)
4342 c4296144 2019-05-09 stsp goto done;
4345 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4346 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4348 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4349 314a6357 2019-05-13 stsp error = get_editor(&editor);
4351 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4352 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4353 c4296144 2019-05-09 stsp if (error)
4354 c4296144 2019-05-09 stsp goto done;
4356 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4357 087fb88c 2019-08-04 stsp if (error)
4358 087fb88c 2019-08-04 stsp goto done;
4360 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4361 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4362 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4363 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4364 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4365 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4366 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4367 916f288c 2019-07-30 stsp goto done;
4369 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4371 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4372 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4373 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4374 e0870e44 2019-05-13 stsp if (error) {
4375 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
4376 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4377 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
4378 c4296144 2019-05-09 stsp goto done;
4381 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
4382 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
4384 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4385 c4296144 2019-05-09 stsp if (error)
4386 c4296144 2019-05-09 stsp goto done;
4387 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4389 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4391 c4296144 2019-05-09 stsp got_repo_close(repo);
4392 c4296144 2019-05-09 stsp if (worktree)
4393 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4394 c4296144 2019-05-09 stsp free(cwd);
4395 c4296144 2019-05-09 stsp free(id_str);
4396 e2ba3d07 2019-05-13 stsp free(editor);
4397 234035bc 2019-06-01 stsp return error;
4400 234035bc 2019-06-01 stsp __dead static void
4401 234035bc 2019-06-01 stsp usage_cherrypick(void)
4403 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4407 234035bc 2019-06-01 stsp static const struct got_error *
4408 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4410 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4411 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4412 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4413 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4414 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4415 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4416 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4417 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4418 234035bc 2019-06-01 stsp int ch, did_something = 0;
4420 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4421 234035bc 2019-06-01 stsp switch (ch) {
4423 234035bc 2019-06-01 stsp usage_cherrypick();
4424 234035bc 2019-06-01 stsp /* NOTREACHED */
4428 234035bc 2019-06-01 stsp argc -= optind;
4429 234035bc 2019-06-01 stsp argv += optind;
4431 43012d58 2019-07-14 stsp #ifndef PROFILE
4432 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4433 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4434 43012d58 2019-07-14 stsp err(1, "pledge");
4436 234035bc 2019-06-01 stsp if (argc != 1)
4437 234035bc 2019-06-01 stsp usage_cherrypick();
4439 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4440 234035bc 2019-06-01 stsp if (cwd == NULL) {
4441 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4442 234035bc 2019-06-01 stsp goto done;
4444 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4445 234035bc 2019-06-01 stsp if (error)
4446 234035bc 2019-06-01 stsp goto done;
4448 234035bc 2019-06-01 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4449 234035bc 2019-06-01 stsp if (error != NULL)
4450 234035bc 2019-06-01 stsp goto done;
4452 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4453 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4454 234035bc 2019-06-01 stsp if (error)
4455 234035bc 2019-06-01 stsp goto done;
4457 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4458 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4459 234035bc 2019-06-01 stsp if (error != NULL) {
4460 234035bc 2019-06-01 stsp struct got_reference *ref;
4461 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4462 234035bc 2019-06-01 stsp goto done;
4463 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4464 234035bc 2019-06-01 stsp if (error != NULL)
4465 234035bc 2019-06-01 stsp goto done;
4466 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4467 234035bc 2019-06-01 stsp got_ref_close(ref);
4468 234035bc 2019-06-01 stsp if (error != NULL)
4469 234035bc 2019-06-01 stsp goto done;
4471 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4472 234035bc 2019-06-01 stsp if (error)
4473 234035bc 2019-06-01 stsp goto done;
4475 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4476 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4477 234035bc 2019-06-01 stsp if (error != NULL)
4478 234035bc 2019-06-01 stsp goto done;
4480 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4481 234035bc 2019-06-01 stsp if (error) {
4482 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4483 234035bc 2019-06-01 stsp goto done;
4484 234035bc 2019-06-01 stsp error = NULL;
4486 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4487 234035bc 2019-06-01 stsp goto done;
4490 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4491 234035bc 2019-06-01 stsp if (error)
4492 234035bc 2019-06-01 stsp goto done;
4493 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4494 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4495 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4497 234035bc 2019-06-01 stsp if (error != NULL)
4498 234035bc 2019-06-01 stsp goto done;
4500 234035bc 2019-06-01 stsp if (did_something)
4501 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4503 234035bc 2019-06-01 stsp if (commit)
4504 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4505 234035bc 2019-06-01 stsp free(commit_id_str);
4506 234035bc 2019-06-01 stsp if (head_ref)
4507 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4508 234035bc 2019-06-01 stsp if (worktree)
4509 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4511 234035bc 2019-06-01 stsp got_repo_close(repo);
4512 c4296144 2019-05-09 stsp return error;
4515 5ef14e63 2019-06-02 stsp __dead static void
4516 5ef14e63 2019-06-02 stsp usage_backout(void)
4518 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4522 5ef14e63 2019-06-02 stsp static const struct got_error *
4523 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4525 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4526 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4527 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4528 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4529 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4530 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4531 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4532 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4533 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4535 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4536 5ef14e63 2019-06-02 stsp switch (ch) {
4538 5ef14e63 2019-06-02 stsp usage_backout();
4539 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4543 5ef14e63 2019-06-02 stsp argc -= optind;
4544 5ef14e63 2019-06-02 stsp argv += optind;
4546 43012d58 2019-07-14 stsp #ifndef PROFILE
4547 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4548 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4549 43012d58 2019-07-14 stsp err(1, "pledge");
4551 5ef14e63 2019-06-02 stsp if (argc != 1)
4552 5ef14e63 2019-06-02 stsp usage_backout();
4554 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4555 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4556 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4557 5ef14e63 2019-06-02 stsp goto done;
4559 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4560 5ef14e63 2019-06-02 stsp if (error)
4561 5ef14e63 2019-06-02 stsp goto done;
4563 5ef14e63 2019-06-02 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4564 5ef14e63 2019-06-02 stsp if (error != NULL)
4565 5ef14e63 2019-06-02 stsp goto done;
4567 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4568 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4569 5ef14e63 2019-06-02 stsp if (error)
4570 5ef14e63 2019-06-02 stsp goto done;
4572 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4573 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4574 5ef14e63 2019-06-02 stsp if (error != NULL) {
4575 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4576 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4577 5ef14e63 2019-06-02 stsp goto done;
4578 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4579 5ef14e63 2019-06-02 stsp if (error != NULL)
4580 5ef14e63 2019-06-02 stsp goto done;
4581 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4582 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4583 5ef14e63 2019-06-02 stsp if (error != NULL)
4584 5ef14e63 2019-06-02 stsp goto done;
4586 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4587 5ef14e63 2019-06-02 stsp if (error)
4588 5ef14e63 2019-06-02 stsp goto done;
4590 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4591 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4592 5ef14e63 2019-06-02 stsp if (error != NULL)
4593 5ef14e63 2019-06-02 stsp goto done;
4595 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4596 5ef14e63 2019-06-02 stsp if (error)
4597 5ef14e63 2019-06-02 stsp goto done;
4599 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4600 5ef14e63 2019-06-02 stsp if (error)
4601 5ef14e63 2019-06-02 stsp goto done;
4602 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4603 5ef14e63 2019-06-02 stsp if (pid == NULL) {
4604 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
4605 5ef14e63 2019-06-02 stsp goto done;
4608 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4609 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
4610 5ef14e63 2019-06-02 stsp if (error != NULL)
4611 5ef14e63 2019-06-02 stsp goto done;
4613 5ef14e63 2019-06-02 stsp if (did_something)
4614 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
4616 5ef14e63 2019-06-02 stsp if (commit)
4617 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
4618 5ef14e63 2019-06-02 stsp free(commit_id_str);
4619 5ef14e63 2019-06-02 stsp if (head_ref)
4620 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
4621 818c7501 2019-07-11 stsp if (worktree)
4622 818c7501 2019-07-11 stsp got_worktree_close(worktree);
4624 818c7501 2019-07-11 stsp got_repo_close(repo);
4625 818c7501 2019-07-11 stsp return error;
4628 818c7501 2019-07-11 stsp __dead static void
4629 818c7501 2019-07-11 stsp usage_rebase(void)
4631 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4632 af54c8f8 2019-07-11 stsp getprogname());
4637 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
4640 0ebf8283 2019-07-24 stsp size_t len;
4642 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
4643 0ebf8283 2019-07-24 stsp if (len > limit)
4644 0ebf8283 2019-07-24 stsp len = limit;
4645 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
4646 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
4648 0ebf8283 2019-07-24 stsp *nl = '\0';
4651 0ebf8283 2019-07-24 stsp static const struct got_error *
4652 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4654 5943eee2 2019-08-13 stsp const struct got_error *err;
4655 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
4656 5943eee2 2019-08-13 stsp const char *s;
4658 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
4660 5943eee2 2019-08-13 stsp return err;
4662 5943eee2 2019-08-13 stsp s = logmsg0;
4663 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
4666 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
4667 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
4668 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4669 5943eee2 2019-08-13 stsp goto done;
4672 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
4674 5943eee2 2019-08-13 stsp free(logmsg0);
4675 5943eee2 2019-08-13 stsp return err;
4678 818c7501 2019-07-11 stsp static const struct got_error *
4679 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
4680 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
4682 818c7501 2019-07-11 stsp const struct got_error *err;
4683 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4685 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
4687 818c7501 2019-07-11 stsp goto done;
4689 ff0d2220 2019-07-11 stsp if (new_id) {
4690 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
4692 ff0d2220 2019-07-11 stsp goto done;
4695 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
4696 ff0d2220 2019-07-11 stsp if (new_id_str)
4697 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
4699 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4701 0ebf8283 2019-07-24 stsp goto done;
4703 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
4704 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4706 818c7501 2019-07-11 stsp free(old_id_str);
4707 818c7501 2019-07-11 stsp free(new_id_str);
4708 818c7501 2019-07-11 stsp return err;
4711 1ee397ad 2019-07-12 stsp static const struct got_error *
4712 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
4714 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
4716 818c7501 2019-07-11 stsp while (path[0] == '/')
4718 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
4720 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
4721 1ee397ad 2019-07-12 stsp return NULL;
4722 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4723 818c7501 2019-07-11 stsp *rebase_status = status;
4724 1ee397ad 2019-07-12 stsp return NULL;
4727 818c7501 2019-07-11 stsp static const struct got_error *
4728 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4729 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
4730 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
4732 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
4733 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
4734 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
4737 818c7501 2019-07-11 stsp static const struct got_error *
4738 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
4739 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4740 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
4741 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4743 ff0d2220 2019-07-11 stsp const struct got_error *error;
4744 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
4745 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
4747 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4748 ff0d2220 2019-07-11 stsp if (error)
4749 ff0d2220 2019-07-11 stsp return error;
4751 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4752 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
4753 ff0d2220 2019-07-11 stsp if (error) {
4754 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4755 ff0d2220 2019-07-11 stsp goto done;
4756 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
4758 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
4759 ff0d2220 2019-07-11 stsp free(new_commit_id);
4762 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
4763 ff0d2220 2019-07-11 stsp return error;
4766 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
4767 64c6d990 2019-07-11 stsp const char *path_prefix;
4768 64c6d990 2019-07-11 stsp size_t len;
4769 8ca9bd68 2019-07-25 stsp int errcode;
4772 64c6d990 2019-07-11 stsp static const struct got_error *
4773 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4774 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
4775 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
4776 64c6d990 2019-07-11 stsp struct got_repository *repo)
4778 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
4780 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4781 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4782 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
4784 64c6d990 2019-07-11 stsp return NULL;
4787 64c6d990 2019-07-11 stsp static const struct got_error *
4788 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
4789 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
4790 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
4792 64c6d990 2019-07-11 stsp const struct got_error *err;
4793 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4794 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
4795 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
4797 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
4798 64c6d990 2019-07-11 stsp return NULL;
4800 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4802 64c6d990 2019-07-11 stsp goto done;
4804 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4806 64c6d990 2019-07-11 stsp goto done;
4808 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
4809 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
4811 64c6d990 2019-07-11 stsp goto done;
4813 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
4814 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
4816 64c6d990 2019-07-11 stsp goto done;
4818 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
4819 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
4820 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
4821 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
4822 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
4823 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
4824 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
4826 64c6d990 2019-07-11 stsp if (tree1)
4827 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
4828 64c6d990 2019-07-11 stsp if (tree2)
4829 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
4830 64c6d990 2019-07-11 stsp if (commit)
4831 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
4832 64c6d990 2019-07-11 stsp if (parent_commit)
4833 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
4834 64c6d990 2019-07-11 stsp return err;
4837 ff0d2220 2019-07-11 stsp static const struct got_error *
4838 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
4839 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
4840 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4841 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
4842 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
4844 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
4845 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
4846 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
4847 af61c510 2019-07-19 stsp struct got_object_qid *qid;
4848 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
4850 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4852 af61c510 2019-07-19 stsp return err;
4854 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
4855 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
4857 af61c510 2019-07-19 stsp goto done;
4858 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4859 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
4860 af61c510 2019-07-19 stsp if (err) {
4861 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
4862 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
4863 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
4864 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
4865 af61c510 2019-07-19 stsp "been reached?!?");
4866 af61c510 2019-07-19 stsp goto done;
4867 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4868 af61c510 2019-07-19 stsp goto done;
4869 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
4870 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
4872 af61c510 2019-07-19 stsp goto done;
4874 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
4875 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
4877 af61c510 2019-07-19 stsp goto done;
4879 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
4881 af61c510 2019-07-19 stsp goto done;
4882 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4883 af61c510 2019-07-19 stsp commit_id = parent_id;
4887 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
4888 af61c510 2019-07-19 stsp return err;
4891 af61c510 2019-07-19 stsp static const struct got_error *
4892 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
4894 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
4895 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
4896 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
4897 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
4898 818c7501 2019-07-11 stsp char *cwd = NULL;
4899 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
4900 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4901 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
4902 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
4903 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4904 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
4905 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4906 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4907 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
4908 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
4909 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
4910 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
4912 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
4913 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
4915 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
4916 818c7501 2019-07-11 stsp switch (ch) {
4918 818c7501 2019-07-11 stsp abort_rebase = 1;
4921 818c7501 2019-07-11 stsp continue_rebase = 1;
4924 818c7501 2019-07-11 stsp usage_rebase();
4925 818c7501 2019-07-11 stsp /* NOTREACHED */
4929 818c7501 2019-07-11 stsp argc -= optind;
4930 818c7501 2019-07-11 stsp argv += optind;
4932 43012d58 2019-07-14 stsp #ifndef PROFILE
4933 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4934 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4935 43012d58 2019-07-14 stsp err(1, "pledge");
4937 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
4938 818c7501 2019-07-11 stsp usage_rebase();
4939 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
4940 818c7501 2019-07-11 stsp if (argc != 0)
4941 818c7501 2019-07-11 stsp usage_rebase();
4942 818c7501 2019-07-11 stsp } else if (argc != 1)
4943 818c7501 2019-07-11 stsp usage_rebase();
4945 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
4946 818c7501 2019-07-11 stsp if (cwd == NULL) {
4947 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
4948 818c7501 2019-07-11 stsp goto done;
4950 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
4951 818c7501 2019-07-11 stsp if (error)
4952 818c7501 2019-07-11 stsp goto done;
4954 818c7501 2019-07-11 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4955 818c7501 2019-07-11 stsp if (error != NULL)
4956 818c7501 2019-07-11 stsp goto done;
4958 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4959 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4960 818c7501 2019-07-11 stsp if (error)
4961 818c7501 2019-07-11 stsp goto done;
4963 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4964 818c7501 2019-07-11 stsp if (error)
4965 818c7501 2019-07-11 stsp goto done;
4967 f6794adc 2019-07-23 stsp if (abort_rebase) {
4968 818c7501 2019-07-11 stsp int did_something;
4969 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4970 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4971 f6794adc 2019-07-23 stsp goto done;
4973 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4974 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4975 3e3a69f1 2019-07-25 stsp worktree, repo);
4976 818c7501 2019-07-11 stsp if (error)
4977 818c7501 2019-07-11 stsp goto done;
4978 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
4979 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
4980 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
4981 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
4982 818c7501 2019-07-11 stsp if (error)
4983 818c7501 2019-07-11 stsp goto done;
4984 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
4985 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
4988 818c7501 2019-07-11 stsp if (continue_rebase) {
4989 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
4990 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
4991 f6794adc 2019-07-23 stsp goto done;
4993 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
4994 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
4995 3e3a69f1 2019-07-25 stsp worktree, repo);
4996 818c7501 2019-07-11 stsp if (error)
4997 818c7501 2019-07-11 stsp goto done;
4999 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5000 01757395 2019-07-12 stsp resume_commit_id, repo);
5001 818c7501 2019-07-11 stsp if (error)
5002 818c7501 2019-07-11 stsp goto done;
5004 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5005 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5006 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5007 818c7501 2019-07-11 stsp goto done;
5010 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5011 818c7501 2019-07-11 stsp if (error != NULL)
5012 818c7501 2019-07-11 stsp goto done;
5015 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5016 ff0d2220 2019-07-11 stsp if (error)
5017 ff0d2220 2019-07-11 stsp goto done;
5019 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5020 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5022 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5023 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5024 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5025 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5026 818c7501 2019-07-11 stsp if (error)
5027 818c7501 2019-07-11 stsp goto done;
5028 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5029 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5030 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5031 818c7501 2019-07-11 stsp "with work tree's branch");
5032 818c7501 2019-07-11 stsp goto done;
5035 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5036 a51a74b3 2019-07-27 stsp if (error) {
5037 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5038 a51a74b3 2019-07-27 stsp goto done;
5039 a51a74b3 2019-07-27 stsp error = NULL;
5041 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5042 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5043 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5044 a51a74b3 2019-07-27 stsp goto done;
5046 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5047 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5048 818c7501 2019-07-11 stsp if (error)
5049 818c7501 2019-07-11 stsp goto done;
5052 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5053 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5054 818c7501 2019-07-11 stsp if (error)
5055 818c7501 2019-07-11 stsp goto done;
5057 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5058 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5059 fc66b545 2019-08-12 stsp if (pid == NULL) {
5060 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5061 fc66b545 2019-08-12 stsp int did_something;
5062 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5063 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5064 fc66b545 2019-08-12 stsp &did_something);
5065 fc66b545 2019-08-12 stsp if (error)
5066 fc66b545 2019-08-12 stsp goto done;
5067 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5068 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5070 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5071 fc66b545 2019-08-12 stsp goto done;
5073 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5074 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5075 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5076 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5077 818c7501 2019-07-11 stsp commit = NULL;
5078 818c7501 2019-07-11 stsp if (error)
5079 818c7501 2019-07-11 stsp goto done;
5081 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5082 ff0d2220 2019-07-11 stsp if (continue_rebase)
5083 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5084 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5086 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5087 818c7501 2019-07-11 stsp goto done;
5090 818c7501 2019-07-11 stsp pid = NULL;
5091 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5092 818c7501 2019-07-11 stsp commit_id = qid->id;
5093 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5094 818c7501 2019-07-11 stsp pid = qid;
5096 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5097 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5098 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5099 818c7501 2019-07-11 stsp if (error)
5100 818c7501 2019-07-11 stsp goto done;
5102 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5103 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5107 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5108 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5109 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5110 818c7501 2019-07-11 stsp if (error)
5111 818c7501 2019-07-11 stsp goto done;
5114 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5115 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5116 818c7501 2019-07-11 stsp if (error)
5117 818c7501 2019-07-11 stsp goto done;
5118 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5119 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5121 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5122 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5124 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5125 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5126 818c7501 2019-07-11 stsp free(resume_commit_id);
5127 818c7501 2019-07-11 stsp free(yca_id);
5128 818c7501 2019-07-11 stsp if (commit)
5129 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5130 818c7501 2019-07-11 stsp if (branch)
5131 818c7501 2019-07-11 stsp got_ref_close(branch);
5132 818c7501 2019-07-11 stsp if (new_base_branch)
5133 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5134 818c7501 2019-07-11 stsp if (tmp_branch)
5135 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5136 5ef14e63 2019-06-02 stsp if (worktree)
5137 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5139 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5140 5ef14e63 2019-06-02 stsp return error;
5143 0ebf8283 2019-07-24 stsp __dead static void
5144 0ebf8283 2019-07-24 stsp usage_histedit(void)
5146 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5147 0ebf8283 2019-07-24 stsp getprogname());
5151 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5152 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5153 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5154 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5155 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5157 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5158 0ebf8283 2019-07-24 stsp unsigned char code;
5159 0ebf8283 2019-07-24 stsp const char *name;
5160 0ebf8283 2019-07-24 stsp const char *desc;
5161 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5162 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5163 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5164 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5165 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5166 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5167 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5170 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5171 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5172 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5173 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5174 0ebf8283 2019-07-24 stsp char *logmsg;
5176 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5178 0ebf8283 2019-07-24 stsp static const struct got_error *
5179 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5180 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5182 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5183 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5184 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5187 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5189 0ebf8283 2019-07-24 stsp goto done;
5191 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5193 0ebf8283 2019-07-24 stsp goto done;
5195 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5197 0ebf8283 2019-07-24 stsp goto done;
5199 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5200 0ebf8283 2019-07-24 stsp if (n < 0)
5201 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5203 0ebf8283 2019-07-24 stsp if (commit)
5204 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5205 0ebf8283 2019-07-24 stsp free(id_str);
5206 0ebf8283 2019-07-24 stsp free(logmsg);
5207 0ebf8283 2019-07-24 stsp return err;
5210 0ebf8283 2019-07-24 stsp static const struct got_error *
5211 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5212 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5214 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5215 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5217 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5218 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5220 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5221 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5227 0ebf8283 2019-07-24 stsp return err;
5230 0ebf8283 2019-07-24 stsp static const struct got_error *
5231 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5233 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5236 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5237 0ebf8283 2019-07-24 stsp if (n < 0)
5238 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5240 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5241 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5242 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5243 0ebf8283 2019-07-24 stsp cmd->desc);
5244 0ebf8283 2019-07-24 stsp if (n < 0) {
5245 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5249 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5250 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5251 0ebf8283 2019-07-24 stsp if (n < 0)
5252 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5253 0ebf8283 2019-07-24 stsp return err;
5256 0ebf8283 2019-07-24 stsp static const struct got_error *
5257 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5259 0ebf8283 2019-07-24 stsp static char msg[42];
5262 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5264 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5265 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5267 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5270 0ebf8283 2019-07-24 stsp static const struct got_error *
5271 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5272 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5274 0ebf8283 2019-07-24 stsp const struct got_error *err;
5275 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5276 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5278 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5280 0ebf8283 2019-07-24 stsp return err;
5282 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5284 0ebf8283 2019-07-24 stsp goto done;
5286 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5288 5943eee2 2019-08-13 stsp goto done;
5289 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5290 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5291 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5292 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5293 0ebf8283 2019-07-24 stsp goto done;
5296 0ebf8283 2019-07-24 stsp if (folded_commit)
5297 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5298 0ebf8283 2019-07-24 stsp free(id_str);
5299 5943eee2 2019-08-13 stsp free(folded_logmsg);
5300 0ebf8283 2019-07-24 stsp return err;
5303 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5304 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5306 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5308 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5309 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5310 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5311 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5312 3f9de99f 2019-07-24 stsp folded = prev;
5313 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5316 0ebf8283 2019-07-24 stsp return folded;
5319 0ebf8283 2019-07-24 stsp static const struct got_error *
5320 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5321 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5323 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5324 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5325 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5326 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5328 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5330 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5332 0ebf8283 2019-07-24 stsp return err;
5334 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5335 0ebf8283 2019-07-24 stsp if (folded) {
5336 0ebf8283 2019-07-24 stsp while (folded != hle) {
5337 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5338 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5341 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5342 0ebf8283 2019-07-24 stsp logmsg, repo);
5344 0ebf8283 2019-07-24 stsp goto done;
5345 0ebf8283 2019-07-24 stsp free(logmsg);
5346 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5347 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5351 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5353 0ebf8283 2019-07-24 stsp goto done;
5354 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5356 5943eee2 2019-08-13 stsp goto done;
5357 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5358 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5359 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5360 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5361 0ebf8283 2019-07-24 stsp goto done;
5363 0ebf8283 2019-07-24 stsp free(logmsg);
5364 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5366 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5368 0ebf8283 2019-07-24 stsp goto done;
5370 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5372 0ebf8283 2019-07-24 stsp goto done;
5374 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5375 0ebf8283 2019-07-24 stsp close(fd);
5377 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5379 0ebf8283 2019-07-24 stsp goto done;
5381 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5382 0ebf8283 2019-07-24 stsp if (err) {
5383 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5384 0ebf8283 2019-07-24 stsp goto done;
5385 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5388 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5389 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5390 0ebf8283 2019-07-24 stsp free(logmsg_path);
5391 0ebf8283 2019-07-24 stsp free(logmsg);
5392 5943eee2 2019-08-13 stsp free(orig_logmsg);
5393 0ebf8283 2019-07-24 stsp free(editor);
5394 0ebf8283 2019-07-24 stsp if (commit)
5395 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5396 0ebf8283 2019-07-24 stsp return err;
5399 0ebf8283 2019-07-24 stsp static const struct got_error *
5400 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5401 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5403 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5404 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5405 0ebf8283 2019-07-24 stsp size_t size;
5406 0ebf8283 2019-07-24 stsp ssize_t len;
5407 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5408 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5409 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5410 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5412 0ebf8283 2019-07-24 stsp for (;;) {
5413 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5414 0ebf8283 2019-07-24 stsp if (len == -1) {
5415 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5416 0ebf8283 2019-07-24 stsp if (feof(f))
5418 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5419 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5424 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5426 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5427 0ebf8283 2019-07-24 stsp free(line);
5428 0ebf8283 2019-07-24 stsp line = NULL;
5431 0ebf8283 2019-07-24 stsp cmd = NULL;
5432 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5433 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5434 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5435 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5436 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5439 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5444 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5445 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5448 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5450 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5451 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5452 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5455 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5456 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5460 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5461 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5462 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5466 0ebf8283 2019-07-24 stsp free(line);
5467 0ebf8283 2019-07-24 stsp line = NULL;
5471 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5473 0ebf8283 2019-07-24 stsp *end = '\0';
5475 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5476 0ebf8283 2019-07-24 stsp if (err) {
5477 0ebf8283 2019-07-24 stsp /* override error code */
5478 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5482 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5483 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5484 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5487 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5488 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5489 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5490 0ebf8283 2019-07-24 stsp commit_id = NULL;
5491 0ebf8283 2019-07-24 stsp free(line);
5492 0ebf8283 2019-07-24 stsp line = NULL;
5493 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5496 0ebf8283 2019-07-24 stsp free(line);
5497 0ebf8283 2019-07-24 stsp free(commit_id);
5498 0ebf8283 2019-07-24 stsp return err;
5501 0ebf8283 2019-07-24 stsp static const struct got_error *
5502 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5503 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5505 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5506 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5507 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5508 bfce7f83 2019-07-27 stsp static char msg[80];
5509 bfce7f83 2019-07-27 stsp char *id_str;
5511 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5512 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5513 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5514 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5515 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5517 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5518 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5519 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5522 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5523 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5525 bfce7f83 2019-07-27 stsp return err;
5526 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5527 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5528 bfce7f83 2019-07-27 stsp free(id_str);
5529 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5533 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5534 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5535 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5536 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5538 bfce7f83 2019-07-27 stsp return NULL;
5541 bfce7f83 2019-07-27 stsp static const struct got_error *
5542 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5543 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5544 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5546 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5547 0ebf8283 2019-07-24 stsp char *editor;
5548 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5550 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5552 0ebf8283 2019-07-24 stsp return err;
5554 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5555 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5556 0ebf8283 2019-07-24 stsp goto done;
5559 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5560 0ebf8283 2019-07-24 stsp if (f == NULL) {
5561 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5562 0ebf8283 2019-07-24 stsp goto done;
5564 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5566 bfce7f83 2019-07-27 stsp goto done;
5568 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
5570 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5571 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5572 0ebf8283 2019-07-24 stsp free(editor);
5573 0ebf8283 2019-07-24 stsp return err;
5576 0ebf8283 2019-07-24 stsp static const struct got_error *
5577 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5578 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
5580 0ebf8283 2019-07-24 stsp static const struct got_error *
5581 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
5582 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5584 0ebf8283 2019-07-24 stsp const struct got_error *err;
5585 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5586 0ebf8283 2019-07-24 stsp char *path = NULL;
5588 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
5590 0ebf8283 2019-07-24 stsp return err;
5592 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
5594 0ebf8283 2019-07-24 stsp goto done;
5596 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
5598 0ebf8283 2019-07-24 stsp goto done;
5600 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
5601 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5602 0ebf8283 2019-07-24 stsp goto done;
5606 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
5607 0ebf8283 2019-07-24 stsp if (err) {
5608 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5609 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5610 0ebf8283 2019-07-24 stsp goto done;
5611 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
5612 0ebf8283 2019-07-24 stsp commits, path, repo);
5615 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5616 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5617 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
5618 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
5619 0ebf8283 2019-07-24 stsp free(path);
5620 0ebf8283 2019-07-24 stsp return err;
5623 0ebf8283 2019-07-24 stsp static const struct got_error *
5624 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
5625 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5627 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5628 0ebf8283 2019-07-24 stsp char *path = NULL;
5629 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5630 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5631 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5633 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
5635 0ebf8283 2019-07-24 stsp return err;
5637 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
5638 0ebf8283 2019-07-24 stsp if (f == NULL) {
5639 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5640 0ebf8283 2019-07-24 stsp goto done;
5642 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5643 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5648 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5649 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
5650 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
5651 0ebf8283 2019-07-24 stsp if (n < 0) {
5652 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5658 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5659 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5660 0ebf8283 2019-07-24 stsp free(path);
5661 0ebf8283 2019-07-24 stsp if (commit)
5662 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5663 0ebf8283 2019-07-24 stsp return err;
5667 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
5669 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5671 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
5672 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
5673 bfce7f83 2019-07-27 stsp free(hle);
5677 0ebf8283 2019-07-24 stsp static const struct got_error *
5678 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
5679 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5681 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5682 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5684 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5685 0ebf8283 2019-07-24 stsp if (f == NULL) {
5686 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5687 0ebf8283 2019-07-24 stsp goto done;
5690 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5692 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5693 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5694 0ebf8283 2019-07-24 stsp return err;
5697 0ebf8283 2019-07-24 stsp static const struct got_error *
5698 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5699 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
5700 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5702 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
5703 0ebf8283 2019-07-24 stsp int resp = ' ';
5705 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
5706 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5707 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
5708 0ebf8283 2019-07-24 stsp resp = getchar();
5709 a61a4414 2019-08-07 stsp if (resp == '\n')
5710 a61a4414 2019-08-07 stsp resp = getchar();
5711 426ebf2e 2019-07-25 stsp if (resp == 'c') {
5712 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5713 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
5715 426ebf2e 2019-07-25 stsp if (err) {
5716 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5717 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5719 bfce7f83 2019-07-27 stsp prev_err = err;
5720 426ebf2e 2019-07-25 stsp resp = ' ';
5724 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
5725 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5726 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
5727 0ebf8283 2019-07-24 stsp commits, repo);
5728 426ebf2e 2019-07-25 stsp if (err) {
5729 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5730 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5732 bfce7f83 2019-07-27 stsp prev_err = err;
5733 426ebf2e 2019-07-25 stsp resp = ' ';
5737 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
5738 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5741 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
5744 0ebf8283 2019-07-24 stsp return err;
5747 0ebf8283 2019-07-24 stsp static const struct got_error *
5748 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
5749 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5750 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
5752 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5753 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5754 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5755 3e3a69f1 2019-07-25 stsp branch, repo);
5758 0ebf8283 2019-07-24 stsp static const struct got_error *
5759 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
5760 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5762 0ebf8283 2019-07-24 stsp const struct got_error *err;
5763 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5765 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
5767 0ebf8283 2019-07-24 stsp goto done;
5769 0ebf8283 2019-07-24 stsp if (new_id) {
5770 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
5772 0ebf8283 2019-07-24 stsp goto done;
5775 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
5776 0ebf8283 2019-07-24 stsp if (new_id_str)
5777 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
5779 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5780 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
5781 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
5782 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5783 0ebf8283 2019-07-24 stsp goto done;
5785 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
5787 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5789 0ebf8283 2019-07-24 stsp goto done;
5792 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
5793 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
5794 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
5795 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
5796 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5798 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
5799 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
5800 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5808 0ebf8283 2019-07-24 stsp free(old_id_str);
5809 0ebf8283 2019-07-24 stsp free(new_id_str);
5810 0ebf8283 2019-07-24 stsp return err;
5813 0ebf8283 2019-07-24 stsp static const struct got_error *
5814 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
5815 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5816 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5817 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5819 0ebf8283 2019-07-24 stsp const struct got_error *err;
5820 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5821 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
5823 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5824 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
5825 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5827 0ebf8283 2019-07-24 stsp return err;
5830 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5832 0ebf8283 2019-07-24 stsp return err;
5834 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5835 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
5836 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
5837 0ebf8283 2019-07-24 stsp if (err) {
5838 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5839 0ebf8283 2019-07-24 stsp goto done;
5840 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
5842 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
5843 0ebf8283 2019-07-24 stsp free(new_commit_id);
5846 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5847 0ebf8283 2019-07-24 stsp return err;
5850 0ebf8283 2019-07-24 stsp static const struct got_error *
5851 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
5852 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5854 0ebf8283 2019-07-24 stsp const struct got_error *error;
5855 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5857 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5859 0ebf8283 2019-07-24 stsp if (error)
5860 0ebf8283 2019-07-24 stsp return error;
5862 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5863 0ebf8283 2019-07-24 stsp if (error)
5864 0ebf8283 2019-07-24 stsp return error;
5866 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
5867 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5868 0ebf8283 2019-07-24 stsp return error;
5871 0ebf8283 2019-07-24 stsp static const struct got_error *
5872 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
5874 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
5875 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
5876 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5877 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
5878 0ebf8283 2019-07-24 stsp char *cwd = NULL;
5879 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
5880 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
5881 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
5882 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
5883 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
5884 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5885 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
5886 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5887 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
5888 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5889 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
5890 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
5891 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
5892 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
5893 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
5894 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5896 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
5897 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
5898 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
5900 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
5901 0ebf8283 2019-07-24 stsp switch (ch) {
5903 0ebf8283 2019-07-24 stsp abort_edit = 1;
5906 0ebf8283 2019-07-24 stsp continue_edit = 1;
5909 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
5912 0ebf8283 2019-07-24 stsp usage_histedit();
5913 0ebf8283 2019-07-24 stsp /* NOTREACHED */
5917 0ebf8283 2019-07-24 stsp argc -= optind;
5918 0ebf8283 2019-07-24 stsp argv += optind;
5920 0ebf8283 2019-07-24 stsp #ifndef PROFILE
5921 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5922 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
5923 0ebf8283 2019-07-24 stsp err(1, "pledge");
5925 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
5926 0ebf8283 2019-07-24 stsp usage_histedit();
5927 0ebf8283 2019-07-24 stsp if (argc != 0)
5928 0ebf8283 2019-07-24 stsp usage_histedit();
5931 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
5932 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
5933 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
5934 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
5935 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
5936 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
5939 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
5940 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
5941 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
5942 0ebf8283 2019-07-24 stsp goto done;
5944 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
5945 0ebf8283 2019-07-24 stsp if (error)
5946 0ebf8283 2019-07-24 stsp goto done;
5948 0ebf8283 2019-07-24 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5949 0ebf8283 2019-07-24 stsp if (error != NULL)
5950 0ebf8283 2019-07-24 stsp goto done;
5952 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5953 0ebf8283 2019-07-24 stsp if (error)
5954 0ebf8283 2019-07-24 stsp goto done;
5955 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
5956 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
5957 0ebf8283 2019-07-24 stsp goto done;
5960 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
5961 0ebf8283 2019-07-24 stsp if (error)
5962 0ebf8283 2019-07-24 stsp goto done;
5964 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
5965 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
5966 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
5967 3e3a69f1 2019-07-25 stsp worktree, repo);
5968 0ebf8283 2019-07-24 stsp if (error)
5969 0ebf8283 2019-07-24 stsp goto done;
5970 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5971 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5972 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
5973 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
5974 0ebf8283 2019-07-24 stsp if (error)
5975 0ebf8283 2019-07-24 stsp goto done;
5976 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
5977 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5978 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
5979 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
5980 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5981 0ebf8283 2019-07-24 stsp goto done;
5984 0ebf8283 2019-07-24 stsp if (continue_edit) {
5985 0ebf8283 2019-07-24 stsp char *path;
5987 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
5988 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
5989 0ebf8283 2019-07-24 stsp goto done;
5992 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
5993 0ebf8283 2019-07-24 stsp if (error)
5994 0ebf8283 2019-07-24 stsp goto done;
5996 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
5997 0ebf8283 2019-07-24 stsp free(path);
5998 0ebf8283 2019-07-24 stsp if (error)
5999 0ebf8283 2019-07-24 stsp goto done;
6001 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6002 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6003 3e3a69f1 2019-07-25 stsp worktree, repo);
6004 0ebf8283 2019-07-24 stsp if (error)
6005 0ebf8283 2019-07-24 stsp goto done;
6007 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6008 0ebf8283 2019-07-24 stsp if (error)
6009 0ebf8283 2019-07-24 stsp goto done;
6011 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6012 0ebf8283 2019-07-24 stsp head_commit_id);
6013 0ebf8283 2019-07-24 stsp if (error)
6014 0ebf8283 2019-07-24 stsp goto done;
6015 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6016 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6017 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6018 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6019 3aac7cf7 2019-07-25 stsp goto done;
6021 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6022 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6023 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6024 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6025 0ebf8283 2019-07-24 stsp commit = NULL;
6026 0ebf8283 2019-07-24 stsp if (error)
6027 0ebf8283 2019-07-24 stsp goto done;
6029 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6030 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6031 0ebf8283 2019-07-24 stsp goto done;
6034 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6035 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6036 0ebf8283 2019-07-24 stsp if (error != NULL)
6037 0ebf8283 2019-07-24 stsp goto done;
6039 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6040 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6041 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6042 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6043 c7d20a3f 2019-07-30 stsp goto done;
6046 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6047 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6048 bfce7f83 2019-07-27 stsp branch = NULL;
6049 0ebf8283 2019-07-24 stsp if (error)
6050 0ebf8283 2019-07-24 stsp goto done;
6052 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6053 0ebf8283 2019-07-24 stsp head_commit_id);
6054 0ebf8283 2019-07-24 stsp if (error)
6055 0ebf8283 2019-07-24 stsp goto done;
6056 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6057 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6058 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6059 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6060 3aac7cf7 2019-07-25 stsp goto done;
6062 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6063 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6064 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6065 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6066 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6067 0ebf8283 2019-07-24 stsp commit = NULL;
6068 0ebf8283 2019-07-24 stsp if (error)
6069 0ebf8283 2019-07-24 stsp goto done;
6071 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6072 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6073 bfce7f83 2019-07-27 stsp if (error)
6074 bfce7f83 2019-07-27 stsp goto done;
6076 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6077 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6078 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6079 6ba2bea2 2019-07-27 stsp if (error) {
6080 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6081 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6082 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6083 0ebf8283 2019-07-24 stsp goto done;
6086 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6088 6ba2bea2 2019-07-27 stsp if (error) {
6089 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6090 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6091 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6092 0ebf8283 2019-07-24 stsp goto done;
6097 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6099 6ba2bea2 2019-07-27 stsp if (error) {
6100 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6101 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6102 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6103 0ebf8283 2019-07-24 stsp goto done;
6108 0ebf8283 2019-07-24 stsp error = histedit_check_script(&histedit_cmds, &commits, repo);
6109 0ebf8283 2019-07-24 stsp if (error)
6110 0ebf8283 2019-07-24 stsp goto done;
6112 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6113 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6114 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6115 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6118 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6119 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6120 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6121 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6124 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6125 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6127 0ebf8283 2019-07-24 stsp if (error)
6128 0ebf8283 2019-07-24 stsp goto done;
6132 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6133 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6134 0ebf8283 2019-07-24 stsp if (error)
6135 0ebf8283 2019-07-24 stsp goto done;
6139 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6140 0ebf8283 2019-07-24 stsp hle->commit_id);
6141 0ebf8283 2019-07-24 stsp if (error)
6142 0ebf8283 2019-07-24 stsp goto done;
6143 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6144 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6146 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6147 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6148 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6149 0ebf8283 2019-07-24 stsp if (error)
6150 0ebf8283 2019-07-24 stsp goto done;
6151 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6152 0ebf8283 2019-07-24 stsp commit = NULL;
6154 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6155 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6159 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6160 0ebf8283 2019-07-24 stsp char *id_str;
6161 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6162 0ebf8283 2019-07-24 stsp if (error)
6163 0ebf8283 2019-07-24 stsp goto done;
6164 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6166 0ebf8283 2019-07-24 stsp free(id_str);
6167 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6168 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6169 3e3a69f1 2019-07-25 stsp fileindex);
6170 0ebf8283 2019-07-24 stsp goto done;
6173 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6174 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6175 0ebf8283 2019-07-24 stsp if (error)
6176 0ebf8283 2019-07-24 stsp goto done;
6180 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6181 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6182 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6183 0ebf8283 2019-07-24 stsp if (error)
6184 0ebf8283 2019-07-24 stsp goto done;
6187 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6188 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6189 0ebf8283 2019-07-24 stsp if (error)
6190 0ebf8283 2019-07-24 stsp goto done;
6191 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6192 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6194 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6195 3e3a69f1 2019-07-25 stsp branch, repo);
6197 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6198 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6199 0ebf8283 2019-07-24 stsp free(head_commit_id);
6200 0ebf8283 2019-07-24 stsp free(base_commit_id);
6201 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6202 0ebf8283 2019-07-24 stsp if (commit)
6203 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6204 0ebf8283 2019-07-24 stsp if (branch)
6205 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6206 0ebf8283 2019-07-24 stsp if (tmp_branch)
6207 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6208 0ebf8283 2019-07-24 stsp if (worktree)
6209 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6211 715dc77e 2019-08-03 stsp got_repo_close(repo);
6212 715dc77e 2019-08-03 stsp return error;
6215 715dc77e 2019-08-03 stsp __dead static void
6216 715dc77e 2019-08-03 stsp usage_stage(void)
6218 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6219 f3055044 2019-08-07 stsp "[file-path ...]\n",
6220 715dc77e 2019-08-03 stsp getprogname());
6224 715dc77e 2019-08-03 stsp static const struct got_error *
6225 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6226 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6227 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6229 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6230 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6232 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6233 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6234 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6235 408b4ebc 2019-08-03 stsp return NULL;
6237 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6238 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6239 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6241 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6243 408b4ebc 2019-08-03 stsp return err;
6245 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6246 408b4ebc 2019-08-03 stsp free(id_str);
6247 dc424a06 2019-08-07 stsp return NULL;
6250 dc424a06 2019-08-07 stsp static const struct got_error *
6251 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6253 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6254 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6255 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6256 715dc77e 2019-08-03 stsp char *cwd = NULL;
6257 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6258 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6259 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6260 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6261 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6262 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6264 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6266 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6267 715dc77e 2019-08-03 stsp switch (ch) {
6269 408b4ebc 2019-08-03 stsp list_stage = 1;
6272 dc424a06 2019-08-07 stsp pflag = 1;
6275 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6278 715dc77e 2019-08-03 stsp usage_stage();
6279 715dc77e 2019-08-03 stsp /* NOTREACHED */
6283 715dc77e 2019-08-03 stsp argc -= optind;
6284 715dc77e 2019-08-03 stsp argv += optind;
6286 715dc77e 2019-08-03 stsp #ifndef PROFILE
6287 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6288 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6289 715dc77e 2019-08-03 stsp err(1, "pledge");
6291 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6292 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6293 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6294 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6296 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6297 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6298 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6299 715dc77e 2019-08-03 stsp goto done;
6302 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6303 715dc77e 2019-08-03 stsp if (error)
6304 715dc77e 2019-08-03 stsp goto done;
6306 715dc77e 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6307 715dc77e 2019-08-03 stsp if (error != NULL)
6308 715dc77e 2019-08-03 stsp goto done;
6310 dc424a06 2019-08-07 stsp if (patch_script_path) {
6311 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6312 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6313 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6314 dc424a06 2019-08-07 stsp patch_script_path);
6315 dc424a06 2019-08-07 stsp goto done;
6318 715dc77e 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6319 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6320 715dc77e 2019-08-03 stsp if (error)
6321 715dc77e 2019-08-03 stsp goto done;
6323 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6324 6d022e97 2019-08-04 stsp if (error)
6325 6d022e97 2019-08-04 stsp goto done;
6327 6d022e97 2019-08-04 stsp if (list_stage)
6328 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6329 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6331 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6332 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6333 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6334 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6335 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6338 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6339 2e1f37b0 2019-08-08 stsp error == NULL)
6340 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6342 ad493afc 2019-08-03 stsp got_repo_close(repo);
6343 ad493afc 2019-08-03 stsp if (worktree)
6344 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6345 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6346 ad493afc 2019-08-03 stsp free((char *)pe->path);
6347 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6348 ad493afc 2019-08-03 stsp free(cwd);
6349 ad493afc 2019-08-03 stsp return error;
6352 ad493afc 2019-08-03 stsp __dead static void
6353 ad493afc 2019-08-03 stsp usage_unstage(void)
6355 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6356 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6357 ad493afc 2019-08-03 stsp getprogname());
6362 ad493afc 2019-08-03 stsp static const struct got_error *
6363 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6365 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6366 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6367 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6368 ad493afc 2019-08-03 stsp char *cwd = NULL;
6369 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6370 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6371 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6372 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6373 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6374 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6376 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6378 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6379 ad493afc 2019-08-03 stsp switch (ch) {
6381 2e1f37b0 2019-08-08 stsp pflag = 1;
6384 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6387 ad493afc 2019-08-03 stsp usage_unstage();
6388 ad493afc 2019-08-03 stsp /* NOTREACHED */
6392 ad493afc 2019-08-03 stsp argc -= optind;
6393 ad493afc 2019-08-03 stsp argv += optind;
6395 ad493afc 2019-08-03 stsp #ifndef PROFILE
6396 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6397 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6398 ad493afc 2019-08-03 stsp err(1, "pledge");
6400 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6401 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6403 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6404 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6405 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6406 ad493afc 2019-08-03 stsp goto done;
6409 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6410 ad493afc 2019-08-03 stsp if (error)
6411 ad493afc 2019-08-03 stsp goto done;
6413 ad493afc 2019-08-03 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6414 ad493afc 2019-08-03 stsp if (error != NULL)
6415 ad493afc 2019-08-03 stsp goto done;
6417 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
6418 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6419 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
6420 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
6421 2e1f37b0 2019-08-08 stsp patch_script_path);
6422 2e1f37b0 2019-08-08 stsp goto done;
6426 ad493afc 2019-08-03 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6427 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
6428 ad493afc 2019-08-03 stsp if (error)
6429 ad493afc 2019-08-03 stsp goto done;
6431 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6432 ad493afc 2019-08-03 stsp if (error)
6433 ad493afc 2019-08-03 stsp goto done;
6435 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6436 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
6437 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
6438 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6440 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6441 2e1f37b0 2019-08-08 stsp error == NULL)
6442 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6444 0ebf8283 2019-07-24 stsp got_repo_close(repo);
6445 715dc77e 2019-08-03 stsp if (worktree)
6446 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
6447 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6448 715dc77e 2019-08-03 stsp free((char *)pe->path);
6449 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
6450 715dc77e 2019-08-03 stsp free(cwd);
6451 01073a5d 2019-08-22 stsp return error;
6454 01073a5d 2019-08-22 stsp __dead static void
6455 01073a5d 2019-08-22 stsp usage_cat(void)
6457 01073a5d 2019-08-22 stsp fprintf(stderr, "usage: %s cat [-r repository ] object1 "
6458 01073a5d 2019-08-22 stsp "[object2 ...]\n", getprogname());
6462 01073a5d 2019-08-22 stsp static const struct got_error *
6463 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6465 01073a5d 2019-08-22 stsp const struct got_error *err;
6466 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
6468 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
6470 01073a5d 2019-08-22 stsp return err;
6472 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6473 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
6474 01073a5d 2019-08-22 stsp return err;
6477 01073a5d 2019-08-22 stsp static const struct got_error *
6478 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6480 01073a5d 2019-08-22 stsp const struct got_error *err;
6481 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
6482 01073a5d 2019-08-22 stsp const struct got_tree_entries *entries;
6483 01073a5d 2019-08-22 stsp struct got_tree_entry *te;
6485 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
6487 01073a5d 2019-08-22 stsp return err;
6489 01073a5d 2019-08-22 stsp entries = got_object_tree_get_entries(tree);
6490 01073a5d 2019-08-22 stsp te = SIMPLEQ_FIRST(&entries->head);
6491 01073a5d 2019-08-22 stsp while (te) {
6492 01073a5d 2019-08-22 stsp char *id_str;
6493 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
6495 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, te->id);
6498 01073a5d 2019-08-22 stsp fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6499 01073a5d 2019-08-22 stsp free(id_str);
6500 01073a5d 2019-08-22 stsp te = SIMPLEQ_NEXT(te, entry);
6503 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
6504 01073a5d 2019-08-22 stsp return err;
6507 01073a5d 2019-08-22 stsp static const struct got_error *
6508 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6510 01073a5d 2019-08-22 stsp const struct got_error *err;
6511 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
6512 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
6513 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
6514 01073a5d 2019-08-22 stsp char *id_str = NULL;
6515 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
6517 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
6519 01073a5d 2019-08-22 stsp return err;
6521 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6523 01073a5d 2019-08-22 stsp goto done;
6525 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6526 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6527 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
6528 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
6529 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6530 01073a5d 2019-08-22 stsp char *pid_str;
6531 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
6533 01073a5d 2019-08-22 stsp goto done;
6534 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6535 01073a5d 2019-08-22 stsp free(pid_str);
6537 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6538 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6539 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
6541 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6542 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6543 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
6545 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
6546 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
6547 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
6549 01073a5d 2019-08-22 stsp free(id_str);
6550 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
6551 01073a5d 2019-08-22 stsp return err;
6554 01073a5d 2019-08-22 stsp static const struct got_error *
6555 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6557 01073a5d 2019-08-22 stsp const struct got_error *err;
6558 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
6559 01073a5d 2019-08-22 stsp char *id_str = NULL;
6560 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
6562 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
6564 01073a5d 2019-08-22 stsp return err;
6566 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
6568 01073a5d 2019-08-22 stsp goto done;
6570 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
6572 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
6573 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
6574 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6575 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
6577 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
6578 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6579 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
6581 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
6582 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6583 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
6585 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
6586 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6587 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
6593 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
6594 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
6596 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
6597 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
6598 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
6600 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
6601 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
6602 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
6604 01073a5d 2019-08-22 stsp free(id_str);
6605 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
6606 01073a5d 2019-08-22 stsp return err;
6609 01073a5d 2019-08-22 stsp static const struct got_error *
6610 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
6612 01073a5d 2019-08-22 stsp const struct got_error *error;
6613 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
6614 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
6615 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
6616 01073a5d 2019-08-22 stsp struct got_object_id *id = NULL;
6617 01073a5d 2019-08-22 stsp int ch, obj_type, i;
6619 01073a5d 2019-08-22 stsp #ifndef PROFILE
6620 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6621 01073a5d 2019-08-22 stsp NULL) == -1)
6622 01073a5d 2019-08-22 stsp err(1, "pledge");
6625 01073a5d 2019-08-22 stsp while ((ch = getopt(argc, argv, "r:")) != -1) {
6626 01073a5d 2019-08-22 stsp switch (ch) {
6628 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6629 01073a5d 2019-08-22 stsp if (repo_path == NULL)
6630 01073a5d 2019-08-22 stsp err(1, "-r option");
6631 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6634 01073a5d 2019-08-22 stsp usage_cat();
6635 01073a5d 2019-08-22 stsp /* NOTREACHED */
6639 01073a5d 2019-08-22 stsp argc -= optind;
6640 01073a5d 2019-08-22 stsp argv += optind;
6642 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
6643 01073a5d 2019-08-22 stsp if (cwd == NULL) {
6644 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
6645 01073a5d 2019-08-22 stsp goto done;
6647 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6648 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6649 01073a5d 2019-08-22 stsp goto done;
6650 01073a5d 2019-08-22 stsp if (worktree) {
6651 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6652 01073a5d 2019-08-22 stsp repo_path = strdup(
6653 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
6654 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6655 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
6656 01073a5d 2019-08-22 stsp goto done;
6661 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6662 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
6663 01073a5d 2019-08-22 stsp if (repo_path == NULL)
6664 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
6667 01073a5d 2019-08-22 stsp error = got_repo_open(&repo, repo_path);
6668 01073a5d 2019-08-22 stsp free(repo_path);
6669 01073a5d 2019-08-22 stsp if (error != NULL)
6670 01073a5d 2019-08-22 stsp goto done;
6672 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6673 01073a5d 2019-08-22 stsp if (error)
6674 01073a5d 2019-08-22 stsp goto done;
6676 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
6677 01073a5d 2019-08-22 stsp error = match_object_id(&id, &label, argv[i],
6678 01073a5d 2019-08-22 stsp GOT_OBJ_TYPE_ANY, 0, repo);
6679 01073a5d 2019-08-22 stsp if (error)
6682 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
6683 01073a5d 2019-08-22 stsp if (error)
6686 01073a5d 2019-08-22 stsp switch (obj_type) {
6687 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
6688 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
6690 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
6691 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
6693 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
6694 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
6696 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
6697 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
6700 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
6703 01073a5d 2019-08-22 stsp if (error)
6705 01073a5d 2019-08-22 stsp free(label);
6706 01073a5d 2019-08-22 stsp label = NULL;
6708 01073a5d 2019-08-22 stsp id = NULL;
6712 01073a5d 2019-08-22 stsp free(label);
6714 01073a5d 2019-08-22 stsp if (worktree)
6715 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
6716 01073a5d 2019-08-22 stsp if (repo) {
6717 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
6718 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
6719 01073a5d 2019-08-22 stsp if (error == NULL)
6720 01073a5d 2019-08-22 stsp error = repo_error;
6722 0ebf8283 2019-07-24 stsp return error;
