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 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
497 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
498 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
500 84792843 2019-08-09 stsp *author = NULL;
502 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
503 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
504 c9956ddf 2019-09-08 stsp if (name && email) {
505 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
506 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
507 aba9c984 2019-09-08 stsp return NULL;
510 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
511 84792843 2019-08-09 stsp if (got_author == NULL) {
512 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
513 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
514 c9956ddf 2019-09-08 stsp if (name && email) {
515 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
516 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
517 c9956ddf 2019-09-08 stsp return NULL;
519 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
520 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
523 aba9c984 2019-09-08 stsp *author = strdup(got_author);
524 aba9c984 2019-09-08 stsp if (*author == NULL)
525 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
528 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
529 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
531 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
532 84792843 2019-08-09 stsp got_author++;
533 aba9c984 2019-09-08 stsp if (*got_author != '<') {
534 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
537 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
538 84792843 2019-08-09 stsp got_author++;
539 aba9c984 2019-09-08 stsp if (*got_author != '@') {
540 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
543 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
544 84792843 2019-08-09 stsp got_author++;
545 84792843 2019-08-09 stsp if (*got_author != '>')
546 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
549 aba9c984 2019-09-08 stsp free(*author);
550 aba9c984 2019-09-08 stsp *author = NULL;
552 aba9c984 2019-09-08 stsp return err;
555 c9956ddf 2019-09-08 stsp static const struct got_error *
556 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
558 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
560 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
561 c9956ddf 2019-09-08 stsp if (homedir) {
562 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
563 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
566 c9956ddf 2019-09-08 stsp return NULL;
569 84792843 2019-08-09 stsp static const struct got_error *
570 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
572 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
573 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
574 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
575 3ce1b845 2019-07-15 stsp const char *branch_name = "master";
576 3ce1b845 2019-07-15 stsp char *refname = NULL, *id_str = NULL;
577 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
578 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
579 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
581 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
582 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
584 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
586 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
587 3ce1b845 2019-07-15 stsp switch (ch) {
589 3ce1b845 2019-07-15 stsp branch_name = optarg;
592 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
593 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
594 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
599 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
600 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
601 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
606 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
608 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
614 b2b65d18 2019-08-22 stsp usage_import();
615 3ce1b845 2019-07-15 stsp /* NOTREACHED */
619 3ce1b845 2019-07-15 stsp argc -= optind;
620 3ce1b845 2019-07-15 stsp argv += optind;
622 3ce1b845 2019-07-15 stsp #ifndef PROFILE
623 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
625 3ce1b845 2019-07-15 stsp NULL) == -1)
626 3ce1b845 2019-07-15 stsp err(1, "pledge");
628 3ce1b845 2019-07-15 stsp if (argc != 1)
629 3ce1b845 2019-07-15 stsp usage_import();
631 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
632 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
633 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
634 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
636 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
637 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
640 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
644 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
646 aba9c984 2019-09-08 stsp return error;
648 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
649 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
653 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
654 3ce1b845 2019-07-15 stsp if (error) {
655 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
658 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
659 3ce1b845 2019-07-15 stsp "import target branch already exists");
663 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
664 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
665 3ce1b845 2019-07-15 stsp error = got_error_from_errno("realpath");
668 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
671 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
672 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
674 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
675 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
678 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
683 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
684 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
686 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
690 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
691 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
695 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
699 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
703 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
707 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
708 3ce1b845 2019-07-15 stsp if (error) {
709 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
712 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
713 3ce1b845 2019-07-15 stsp branch_ref);
717 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
722 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
723 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
725 2c7829a4 2019-06-17 stsp free(repo_path);
726 3ce1b845 2019-07-15 stsp free(editor);
727 3ce1b845 2019-07-15 stsp free(refname);
728 3ce1b845 2019-07-15 stsp free(new_commit_id);
729 3ce1b845 2019-07-15 stsp free(id_str);
730 aba9c984 2019-09-08 stsp free(author);
731 c9956ddf 2019-09-08 stsp free(gitconfig_path);
732 3ce1b845 2019-07-15 stsp if (branch_ref)
733 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
734 3ce1b845 2019-07-15 stsp if (head_ref)
735 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
736 2c7829a4 2019-06-17 stsp return error;
739 4ed7e80c 2018-05-20 stsp __dead static void
740 c09a553d 2018-03-12 stsp usage_checkout(void)
742 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
743 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
747 1ee397ad 2019-07-12 stsp static const struct got_error *
748 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
750 92a684f4 2018-03-12 stsp char *worktree_path = arg;
752 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
753 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
754 1ee397ad 2019-07-12 stsp return NULL;
756 92a684f4 2018-03-12 stsp while (path[0] == '/')
759 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
760 1ee397ad 2019-07-12 stsp return NULL;
763 99437157 2018-11-11 stsp static const struct got_error *
764 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
766 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
767 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
768 99437157 2018-11-11 stsp return NULL;
771 8069f636 2019-01-12 stsp static const struct got_error *
772 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
773 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
775 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
776 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
778 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
779 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
781 36a38700 2019-05-10 stsp return err;
783 d5bea539 2019-05-13 stsp if (yca_id == NULL)
784 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
787 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
788 d5bea539 2019-05-13 stsp * and the work tree's base commit.
790 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
792 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
800 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
801 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
802 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
804 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
805 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
806 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
808 d5bea539 2019-05-13 stsp free(yca_id);
809 d5bea539 2019-05-13 stsp return NULL;
812 a367ff0f 2019-05-14 stsp static const struct got_error *
813 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
814 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
815 a51a74b3 2019-07-27 stsp struct got_repository *repo)
817 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
818 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
819 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
820 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
822 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
826 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
827 a51a74b3 2019-07-27 stsp is_same_branch = 1;
830 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
831 a51a74b3 2019-07-27 stsp is_same_branch = 1;
835 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
839 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
840 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
845 a367ff0f 2019-05-14 stsp struct got_object_id *id;
846 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
848 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
849 a367ff0f 2019-05-14 stsp err = NULL;
851 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
853 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
854 6fb7cd11 2019-08-22 stsp repo, check_cancelled, NULL);
860 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
862 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
863 a367ff0f 2019-05-14 stsp is_same_branch = 1;
870 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
871 a367ff0f 2019-05-14 stsp free(head_commit_id);
872 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
873 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
874 04f57cb3 2019-07-25 stsp return err;
877 04f57cb3 2019-07-25 stsp static const struct got_error *
878 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
879 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
881 04f57cb3 2019-07-25 stsp const struct got_error *err;
882 04f57cb3 2019-07-25 stsp struct got_reference *ref;
883 303e2782 2019-08-09 stsp struct got_tag_object *tag;
885 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
886 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
887 303e2782 2019-08-09 stsp if (err == NULL) {
888 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
889 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
890 303e2782 2019-08-09 stsp if (*commit_id == NULL)
891 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
892 303e2782 2019-08-09 stsp got_object_tag_close(tag);
893 303e2782 2019-08-09 stsp return err;
894 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
895 303e2782 2019-08-09 stsp return err;
897 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
898 04f57cb3 2019-07-25 stsp if (err == NULL) {
899 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
900 04f57cb3 2019-07-25 stsp got_ref_close(ref);
902 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
903 04f57cb3 2019-07-25 stsp return err;
904 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
905 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
907 a367ff0f 2019-05-14 stsp return err;
910 4ed7e80c 2018-05-20 stsp static const struct got_error *
911 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
913 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
914 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
915 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
916 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
917 c09a553d 2018-03-12 stsp char *repo_path = NULL;
918 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
919 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
920 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
921 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
922 72151b04 2019-05-11 stsp int ch, same_path_prefix;
923 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
925 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
927 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
928 0bb8a95e 2018-03-12 stsp switch (ch) {
930 08573d5b 2019-05-14 stsp branch_name = optarg;
933 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
934 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
935 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
938 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
941 2deda0b9 2019-03-07 stsp usage_checkout();
942 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
946 0bb8a95e 2018-03-12 stsp argc -= optind;
947 0bb8a95e 2018-03-12 stsp argv += optind;
949 6715a751 2018-03-16 stsp #ifndef PROFILE
950 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
951 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
952 c09a553d 2018-03-12 stsp err(1, "pledge");
954 0bb8a95e 2018-03-12 stsp if (argc == 1) {
955 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
956 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
957 76089277 2018-04-01 stsp if (repo_path == NULL)
958 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
959 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
960 76089277 2018-04-01 stsp if (cwd == NULL) {
961 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
964 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
965 230a42bd 2019-05-11 jcs base = basename(path_prefix);
966 230a42bd 2019-05-11 jcs if (base == NULL) {
967 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
968 230a42bd 2019-05-11 jcs path_prefix);
972 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
973 230a42bd 2019-05-11 jcs if (base == NULL) {
974 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
979 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
980 c09a553d 2018-03-12 stsp if (dotgit)
981 c09a553d 2018-03-12 stsp *dotgit = '\0';
982 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
983 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
988 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
989 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
990 76089277 2018-04-01 stsp if (repo_path == NULL) {
991 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
994 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
995 76089277 2018-04-01 stsp if (worktree_path == NULL) {
996 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
997 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1001 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1002 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1003 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1004 b4b3a7dd 2019-07-22 stsp goto done;
1008 c09a553d 2018-03-12 stsp usage_checkout();
1010 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1011 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1013 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1014 c09a553d 2018-03-12 stsp if (error != NULL)
1015 c02c541e 2019-03-29 stsp goto done;
1017 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1018 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1019 c530dc23 2019-07-23 stsp if (error) {
1020 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1021 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1022 c530dc23 2019-07-23 stsp goto done;
1023 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
1024 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1025 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1026 c530dc23 2019-07-23 stsp goto done;
1030 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1031 c02c541e 2019-03-29 stsp if (error)
1032 c09a553d 2018-03-12 stsp goto done;
1034 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1035 c09a553d 2018-03-12 stsp if (error != NULL)
1036 c09a553d 2018-03-12 stsp goto done;
1038 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1039 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1040 c09a553d 2018-03-12 stsp goto done;
1042 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1043 c09a553d 2018-03-12 stsp if (error != NULL)
1044 c09a553d 2018-03-12 stsp goto done;
1046 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1047 e5dc7198 2018-12-29 stsp path_prefix);
1048 e5dc7198 2018-12-29 stsp if (error != NULL)
1049 e5dc7198 2018-12-29 stsp goto done;
1050 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1051 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1052 49520a32 2018-12-29 stsp goto done;
1055 8069f636 2019-01-12 stsp if (commit_id_str) {
1056 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1057 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1058 30837e32 2019-07-25 stsp if (error)
1059 8069f636 2019-01-12 stsp goto done;
1060 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1061 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1062 8069f636 2019-01-12 stsp if (error != NULL) {
1063 8069f636 2019-01-12 stsp free(commit_id);
1064 8069f636 2019-01-12 stsp goto done;
1066 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1067 45d344f6 2019-05-14 stsp if (error)
1068 45d344f6 2019-05-14 stsp goto done;
1069 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1070 8069f636 2019-01-12 stsp commit_id);
1071 8069f636 2019-01-12 stsp free(commit_id);
1072 8069f636 2019-01-12 stsp if (error)
1073 8069f636 2019-01-12 stsp goto done;
1076 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1077 f2ea84fa 2019-07-27 stsp if (error)
1078 f2ea84fa 2019-07-27 stsp goto done;
1079 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1080 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1081 c09a553d 2018-03-12 stsp if (error != NULL)
1082 c09a553d 2018-03-12 stsp goto done;
1084 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1087 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1088 8069f636 2019-01-12 stsp free(commit_id_str);
1089 76089277 2018-04-01 stsp free(repo_path);
1090 507dc3bb 2018-12-29 stsp free(worktree_path);
1091 507dc3bb 2018-12-29 stsp return error;
1094 507dc3bb 2018-12-29 stsp __dead static void
1095 507dc3bb 2018-12-29 stsp usage_update(void)
1097 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1098 507dc3bb 2018-12-29 stsp getprogname());
1102 1ee397ad 2019-07-12 stsp static const struct got_error *
1103 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1105 784955db 2019-01-12 stsp int *did_something = arg;
1107 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1108 1ee397ad 2019-07-12 stsp return NULL;
1110 1545c615 2019-02-10 stsp *did_something = 1;
1112 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1113 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1114 1ee397ad 2019-07-12 stsp return NULL;
1116 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1118 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1119 1ee397ad 2019-07-12 stsp return NULL;
1122 be7061eb 2018-12-30 stsp static const struct got_error *
1123 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1124 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1125 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1127 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1128 a1fb16d8 2019-05-24 stsp char *base_id_str;
1129 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1131 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1132 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1133 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1134 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1135 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1136 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1137 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1140 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1141 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1142 a1fb16d8 2019-05-24 stsp if (err) {
1143 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1144 a1fb16d8 2019-05-24 stsp return err;
1145 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1147 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1148 a1fb16d8 2019-05-24 stsp return NULL;
1150 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1151 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1152 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1154 a1fb16d8 2019-05-24 stsp return err;
1155 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1156 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1157 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1158 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1159 0ebf8283 2019-07-24 stsp return NULL;
1162 0ebf8283 2019-07-24 stsp static const struct got_error *
1163 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1165 0ebf8283 2019-07-24 stsp const struct got_error *err;
1166 0ebf8283 2019-07-24 stsp int in_progress;
1168 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1170 0ebf8283 2019-07-24 stsp return err;
1171 0ebf8283 2019-07-24 stsp if (in_progress)
1172 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1174 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1176 0ebf8283 2019-07-24 stsp return err;
1177 0ebf8283 2019-07-24 stsp if (in_progress)
1178 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1180 a1fb16d8 2019-05-24 stsp return NULL;
1183 a5edda0a 2019-07-27 stsp static const struct got_error *
1184 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1185 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1187 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1188 a5edda0a 2019-07-27 stsp char *path;
1191 a5edda0a 2019-07-27 stsp if (argc == 0) {
1192 a5edda0a 2019-07-27 stsp path = strdup("");
1193 a5edda0a 2019-07-27 stsp if (path == NULL)
1194 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1195 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1198 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1199 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1202 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1203 a5edda0a 2019-07-27 stsp if (err) {
1204 a5edda0a 2019-07-27 stsp free(path);
1209 a5edda0a 2019-07-27 stsp return err;
1212 a1fb16d8 2019-05-24 stsp static const struct got_error *
1213 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1215 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1216 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1217 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1218 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1219 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1220 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1221 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1222 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1223 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1224 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1225 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1227 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1229 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1230 507dc3bb 2018-12-29 stsp switch (ch) {
1232 024e9686 2019-05-14 stsp branch_name = optarg;
1235 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1236 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1237 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1240 2deda0b9 2019-03-07 stsp usage_update();
1241 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1245 507dc3bb 2018-12-29 stsp argc -= optind;
1246 507dc3bb 2018-12-29 stsp argv += optind;
1248 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1249 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1250 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1251 507dc3bb 2018-12-29 stsp err(1, "pledge");
1253 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1254 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1255 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1256 c4cdcb68 2019-04-03 stsp goto done;
1258 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1259 7d5807f4 2019-07-11 stsp if (error)
1260 7d5807f4 2019-07-11 stsp goto done;
1262 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1263 f2ea84fa 2019-07-27 stsp if (error)
1264 f2ea84fa 2019-07-27 stsp goto done;
1266 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1268 507dc3bb 2018-12-29 stsp if (error != NULL)
1269 507dc3bb 2018-12-29 stsp goto done;
1271 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1272 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1273 087fb88c 2019-08-04 stsp if (error)
1274 087fb88c 2019-08-04 stsp goto done;
1276 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1277 0266afb7 2019-01-04 stsp if (error)
1278 0266afb7 2019-01-04 stsp goto done;
1280 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1281 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1282 024e9686 2019-05-14 stsp if (error != NULL)
1283 024e9686 2019-05-14 stsp goto done;
1284 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1285 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1286 9c4b8182 2019-01-02 stsp if (error != NULL)
1287 9c4b8182 2019-01-02 stsp goto done;
1288 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1289 507dc3bb 2018-12-29 stsp if (error != NULL)
1290 507dc3bb 2018-12-29 stsp goto done;
1292 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1293 04f57cb3 2019-07-25 stsp free(commit_id_str);
1294 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1295 30837e32 2019-07-25 stsp if (error)
1296 a297e751 2019-07-11 stsp goto done;
1297 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1298 a297e751 2019-07-11 stsp if (error)
1299 507dc3bb 2018-12-29 stsp goto done;
1302 a1fb16d8 2019-05-24 stsp if (branch_name) {
1303 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1304 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1305 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1307 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1308 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1309 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1310 024e9686 2019-05-14 stsp goto done;
1312 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1313 024e9686 2019-05-14 stsp if (error)
1314 024e9686 2019-05-14 stsp goto done;
1315 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1316 a367ff0f 2019-05-14 stsp free(head_commit_id);
1317 024e9686 2019-05-14 stsp if (error != NULL)
1318 024e9686 2019-05-14 stsp goto done;
1319 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1320 a367ff0f 2019-05-14 stsp if (error)
1321 a367ff0f 2019-05-14 stsp goto done;
1322 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1323 024e9686 2019-05-14 stsp if (error)
1324 024e9686 2019-05-14 stsp goto done;
1326 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1327 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1328 a367ff0f 2019-05-14 stsp if (error != NULL) {
1329 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1330 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1331 024e9686 2019-05-14 stsp goto done;
1333 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1334 a367ff0f 2019-05-14 stsp if (error)
1335 a367ff0f 2019-05-14 stsp goto done;
1338 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1339 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1340 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1341 507dc3bb 2018-12-29 stsp commit_id);
1342 507dc3bb 2018-12-29 stsp if (error)
1343 507dc3bb 2018-12-29 stsp goto done;
1346 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1347 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1348 507dc3bb 2018-12-29 stsp if (error != NULL)
1349 507dc3bb 2018-12-29 stsp goto done;
1351 784955db 2019-01-12 stsp if (did_something)
1352 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1354 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1356 c09a553d 2018-03-12 stsp free(worktree_path);
1357 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1358 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1359 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1360 507dc3bb 2018-12-29 stsp free(commit_id);
1361 9c4b8182 2019-01-02 stsp free(commit_id_str);
1362 c09a553d 2018-03-12 stsp return error;
1365 f42b1b34 2018-03-12 stsp static const struct got_error *
1366 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1367 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1369 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1370 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1372 44392932 2019-08-25 stsp if (blob_id1) {
1373 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1375 44392932 2019-08-25 stsp goto done;
1378 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1380 44392932 2019-08-25 stsp goto done;
1382 44392932 2019-08-25 stsp while (path[0] == '/')
1384 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1387 44392932 2019-08-25 stsp if (blob1)
1388 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1389 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1390 44392932 2019-08-25 stsp return err;
1393 44392932 2019-08-25 stsp static const struct got_error *
1394 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1395 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1397 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1398 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1399 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1401 44392932 2019-08-25 stsp if (tree_id1) {
1402 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1404 44392932 2019-08-25 stsp goto done;
1407 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1409 0f2b3dca 2018-12-22 stsp goto done;
1411 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1412 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1413 44392932 2019-08-25 stsp while (path[0] == '/')
1415 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1416 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1418 79109fed 2018-03-27 stsp if (tree1)
1419 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1420 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1421 44392932 2019-08-25 stsp return err;
1424 44392932 2019-08-25 stsp static const struct got_error *
1425 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1426 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1428 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1429 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1430 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1431 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1432 44392932 2019-08-25 stsp struct got_object_qid *qid;
1434 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1435 44392932 2019-08-25 stsp if (qid != NULL) {
1436 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1439 44392932 2019-08-25 stsp return err;
1442 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1443 44392932 2019-08-25 stsp int obj_type;
1444 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1446 44392932 2019-08-25 stsp goto done;
1447 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1448 44392932 2019-08-25 stsp if (err) {
1449 44392932 2019-08-25 stsp free(obj_id2);
1450 44392932 2019-08-25 stsp goto done;
1452 44392932 2019-08-25 stsp if (pcommit) {
1453 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1454 44392932 2019-08-25 stsp qid->id, path);
1455 44392932 2019-08-25 stsp if (err) {
1456 44392932 2019-08-25 stsp free(obj_id2);
1457 44392932 2019-08-25 stsp goto done;
1459 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1460 44392932 2019-08-25 stsp if (err) {
1461 44392932 2019-08-25 stsp free(obj_id2);
1462 44392932 2019-08-25 stsp goto done;
1465 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1466 44392932 2019-08-25 stsp if (err) {
1467 44392932 2019-08-25 stsp free(obj_id2);
1468 44392932 2019-08-25 stsp goto done;
1470 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1471 44392932 2019-08-25 stsp switch (obj_type) {
1472 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1473 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1476 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1477 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1481 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1484 44392932 2019-08-25 stsp free(obj_id1);
1485 44392932 2019-08-25 stsp free(obj_id2);
1487 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1488 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1490 44392932 2019-08-25 stsp goto done;
1491 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1492 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1494 44392932 2019-08-25 stsp goto done;
1495 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1496 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, repo);
1500 0f2b3dca 2018-12-22 stsp free(id_str1);
1501 0f2b3dca 2018-12-22 stsp free(id_str2);
1502 44392932 2019-08-25 stsp if (pcommit)
1503 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1504 79109fed 2018-03-27 stsp return err;
1507 4bb494d5 2018-06-16 stsp static char *
1508 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1510 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1511 09867e48 2019-08-13 stsp char *p, *s;
1513 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1514 09867e48 2019-08-13 stsp if (tm == NULL)
1515 09867e48 2019-08-13 stsp return NULL;
1516 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1517 09867e48 2019-08-13 stsp if (s == NULL)
1518 09867e48 2019-08-13 stsp return NULL;
1519 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1521 6c281f94 2018-06-11 stsp *p = '\0';
1525 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1527 79109fed 2018-03-27 stsp static const struct got_error *
1528 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1529 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1530 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1532 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1533 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1534 6c281f94 2018-06-11 stsp char datebuf[26];
1535 45d799e2 2018-12-23 stsp time_t committer_time;
1536 45d799e2 2018-12-23 stsp const char *author, *committer;
1537 199a4027 2019-02-02 stsp char *refs_str = NULL;
1538 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1540 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1542 199a4027 2019-02-02 stsp const char *name;
1543 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1546 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1547 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1549 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1550 199a4027 2019-02-02 stsp name += 5;
1551 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1553 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1554 e34f9ed6 2019-02-02 stsp name += 6;
1555 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1556 141c2bff 2019-02-04 stsp name += 8;
1557 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1558 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1559 5d844a1e 2019-08-13 stsp if (err) {
1560 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1561 5d844a1e 2019-08-13 stsp return err;
1562 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1563 5d844a1e 2019-08-13 stsp err = NULL;
1564 5d844a1e 2019-08-13 stsp tag = NULL;
1567 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1568 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1570 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1571 a436ad14 2019-08-13 stsp if (cmp != 0)
1573 199a4027 2019-02-02 stsp s = refs_str;
1574 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1575 199a4027 2019-02-02 stsp name) == -1) {
1576 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1578 34ca4898 2019-08-13 stsp return err;
1582 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1584 8bf5b3c9 2018-03-17 stsp return err;
1586 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1587 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1588 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1589 832c249c 2018-06-10 stsp free(id_str);
1590 d3d493d7 2019-02-21 stsp id_str = NULL;
1591 d3d493d7 2019-02-21 stsp free(refs_str);
1592 d3d493d7 2019-02-21 stsp refs_str = NULL;
1593 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1594 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1595 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1596 09867e48 2019-08-13 stsp if (datestr)
1597 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1598 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1599 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1600 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1601 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1602 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1603 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1604 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1605 3fe1abad 2018-06-10 stsp int n = 1;
1606 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1607 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1608 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1610 a0603db2 2018-06-10 stsp return err;
1611 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1612 a0603db2 2018-06-10 stsp free(id_str);
1616 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1618 5943eee2 2019-08-13 stsp return err;
1620 621015ac 2018-07-23 stsp logmsg = logmsg0;
1622 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1624 832c249c 2018-06-10 stsp printf(" %s\n", line);
1625 832c249c 2018-06-10 stsp } while (line);
1626 621015ac 2018-07-23 stsp free(logmsg0);
1628 971751ac 2018-03-27 stsp if (show_patch) {
1629 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1630 971751ac 2018-03-27 stsp if (err == 0)
1631 971751ac 2018-03-27 stsp printf("\n");
1634 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1635 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1636 07862c20 2018-09-15 stsp return err;
1639 f42b1b34 2018-03-12 stsp static const struct got_error *
1640 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1641 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1642 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1644 f42b1b34 2018-03-12 stsp const struct got_error *err;
1645 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1647 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1648 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1650 f42b1b34 2018-03-12 stsp return err;
1651 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1652 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1654 fcc85cad 2018-07-22 stsp goto done;
1656 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1657 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1659 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1662 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1663 372ccdbb 2018-06-10 stsp if (err) {
1664 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1665 9ba79e04 2018-06-11 stsp err = NULL;
1668 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1670 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
1671 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1677 b43fbaa0 2018-06-11 stsp if (id == NULL)
1680 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1683 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1684 44392932 2019-08-25 stsp diff_context, refs);
1685 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1686 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1690 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1691 f42b1b34 2018-03-12 stsp return err;
1694 4ed7e80c 2018-05-20 stsp __dead static void
1695 6f3d1eb0 2018-03-12 stsp usage_log(void)
1697 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1698 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1702 b1ebc001 2019-08-13 stsp static int
1703 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1705 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1706 b1ebc001 2019-08-13 stsp long long n;
1707 b1ebc001 2019-08-13 stsp const char *errstr;
1709 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1710 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1712 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1713 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1718 4ed7e80c 2018-05-20 stsp static const struct got_error *
1719 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1721 f42b1b34 2018-03-12 stsp const struct got_error *error;
1722 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1723 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1724 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1725 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1726 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1727 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1728 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1729 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1730 64a96a6d 2018-04-01 stsp const char *errstr;
1731 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1733 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1735 6715a751 2018-03-16 stsp #ifndef PROFILE
1736 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1739 f42b1b34 2018-03-12 stsp err(1, "pledge");
1742 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1744 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1745 79109fed 2018-03-27 stsp switch (ch) {
1747 79109fed 2018-03-27 stsp show_patch = 1;
1750 d142fc45 2018-04-01 stsp start_commit = optarg;
1753 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1755 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1756 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1759 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1760 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1761 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1764 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1767 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1768 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1769 04ca23f4 2018-07-16 stsp err(1, "-r option");
1770 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1773 2deda0b9 2019-03-07 stsp usage_log();
1774 79109fed 2018-03-27 stsp /* NOTREACHED */
1778 79109fed 2018-03-27 stsp argc -= optind;
1779 79109fed 2018-03-27 stsp argv += optind;
1781 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1782 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1783 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1784 04ca23f4 2018-07-16 stsp goto done;
1787 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1788 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1789 cffc0aa4 2019-02-05 stsp goto done;
1790 cffc0aa4 2019-02-05 stsp error = NULL;
1792 e7301579 2019-03-18 stsp if (argc == 0) {
1793 cbd1af7a 2019-03-18 stsp path = strdup("");
1794 e7301579 2019-03-18 stsp if (path == NULL) {
1795 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1796 cbd1af7a 2019-03-18 stsp goto done;
1798 e7301579 2019-03-18 stsp } else if (argc == 1) {
1799 e7301579 2019-03-18 stsp if (worktree) {
1800 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1802 e7301579 2019-03-18 stsp if (error)
1803 e7301579 2019-03-18 stsp goto done;
1805 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1806 e7301579 2019-03-18 stsp if (path == NULL) {
1807 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1808 e7301579 2019-03-18 stsp goto done;
1812 cbd1af7a 2019-03-18 stsp usage_log();
1814 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1815 5486daa2 2019-05-11 stsp repo_path = worktree ?
1816 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1818 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1819 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1820 cffc0aa4 2019-02-05 stsp goto done;
1823 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1824 d7d4f210 2018-03-12 stsp if (error != NULL)
1825 04ca23f4 2018-07-16 stsp goto done;
1827 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1828 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1829 c02c541e 2019-03-29 stsp if (error)
1830 c02c541e 2019-03-29 stsp goto done;
1832 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1833 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1834 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1835 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1836 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1837 3235492e 2018-04-01 stsp if (error != NULL)
1838 3235492e 2018-04-01 stsp return error;
1839 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1840 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1841 3235492e 2018-04-01 stsp if (error != NULL)
1842 3235492e 2018-04-01 stsp return error;
1843 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1845 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1846 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1847 3235492e 2018-04-01 stsp if (error == NULL) {
1848 1caad61b 2019-02-01 stsp int obj_type;
1849 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1850 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1851 d1f2edc9 2018-06-13 stsp if (error != NULL)
1852 1caad61b 2019-02-01 stsp goto done;
1853 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1854 1caad61b 2019-02-01 stsp if (error != NULL)
1855 1caad61b 2019-02-01 stsp goto done;
1856 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1857 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1858 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1859 1caad61b 2019-02-01 stsp if (error != NULL)
1860 1caad61b 2019-02-01 stsp goto done;
1861 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1862 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1863 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1864 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1865 1caad61b 2019-02-01 stsp goto done;
1868 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1869 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1870 1caad61b 2019-02-01 stsp if (id == NULL)
1871 638f9024 2019-05-13 stsp error = got_error_from_errno(
1872 230a42bd 2019-05-11 jcs "got_object_id_dup");
1873 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1874 1caad61b 2019-02-01 stsp if (error)
1875 1caad61b 2019-02-01 stsp goto done;
1876 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1877 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1878 1caad61b 2019-02-01 stsp goto done;
1880 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1881 d1f2edc9 2018-06-13 stsp if (error != NULL)
1882 1caad61b 2019-02-01 stsp goto done;
1884 15a94983 2018-12-23 stsp if (commit == NULL) {
1885 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1886 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1887 d1f2edc9 2018-06-13 stsp if (error != NULL)
1888 d1f2edc9 2018-06-13 stsp return error;
1891 d7d4f210 2018-03-12 stsp if (error != NULL)
1892 04ca23f4 2018-07-16 stsp goto done;
1894 deeabeae 2019-08-27 stsp if (worktree) {
1895 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1897 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
1898 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
1899 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
1900 deeabeae 2019-08-27 stsp goto done;
1902 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1905 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1906 04ca23f4 2018-07-16 stsp if (error != NULL)
1907 04ca23f4 2018-07-16 stsp goto done;
1908 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1909 04ca23f4 2018-07-16 stsp free(path);
1910 04ca23f4 2018-07-16 stsp path = in_repo_path;
1913 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
1914 199a4027 2019-02-02 stsp if (error)
1915 199a4027 2019-02-02 stsp goto done;
1917 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1918 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1920 04ca23f4 2018-07-16 stsp free(path);
1921 04ca23f4 2018-07-16 stsp free(repo_path);
1922 04ca23f4 2018-07-16 stsp free(cwd);
1924 cffc0aa4 2019-02-05 stsp if (worktree)
1925 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1926 ad242220 2018-09-08 stsp if (repo) {
1927 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1928 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1929 ad242220 2018-09-08 stsp if (error == NULL)
1930 ad242220 2018-09-08 stsp error = repo_error;
1932 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1933 8bf5b3c9 2018-03-17 stsp return error;
1936 4ed7e80c 2018-05-20 stsp __dead static void
1937 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1939 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1940 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1944 b72f483a 2019-02-05 stsp struct print_diff_arg {
1945 b72f483a 2019-02-05 stsp struct got_repository *repo;
1946 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1947 b72f483a 2019-02-05 stsp int diff_context;
1948 3fc0c068 2019-02-10 stsp const char *id_str;
1949 3fc0c068 2019-02-10 stsp int header_shown;
1950 98eaaa12 2019-08-03 stsp int diff_staged;
1953 4ed7e80c 2018-05-20 stsp static const struct got_error *
1954 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1955 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1956 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1958 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1959 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1960 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1961 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1962 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1963 b72f483a 2019-02-05 stsp struct stat sb;
1965 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1966 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1967 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1968 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1969 98eaaa12 2019-08-03 stsp return NULL;
1971 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1972 98eaaa12 2019-08-03 stsp return NULL;
1973 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
1974 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
1975 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1976 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1977 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1978 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1979 98eaaa12 2019-08-03 stsp return NULL;
1982 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1983 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1984 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1985 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1986 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1989 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1990 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1991 98eaaa12 2019-08-03 stsp switch (staged_status) {
1992 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1993 98eaaa12 2019-08-03 stsp label1 = path;
1994 98eaaa12 2019-08-03 stsp label2 = path;
1996 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1997 98eaaa12 2019-08-03 stsp label2 = path;
1999 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2000 98eaaa12 2019-08-03 stsp label1 = path;
2003 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2005 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2006 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
2009 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2010 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2011 4ce46740 2019-08-08 stsp char *id_str;
2012 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2015 4ce46740 2019-08-08 stsp goto done;
2016 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2018 4ce46740 2019-08-08 stsp goto done;
2019 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2020 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2021 4ce46740 2019-08-08 stsp free(id_str);
2022 4ce46740 2019-08-08 stsp goto done;
2024 4ce46740 2019-08-08 stsp free(id_str);
2025 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2026 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2028 4ce46740 2019-08-08 stsp goto done;
2031 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2032 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2033 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2034 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2035 2ec1f75b 2019-03-26 stsp goto done;
2038 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
2039 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
2040 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
2041 2ec1f75b 2019-03-26 stsp goto done;
2043 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
2044 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
2045 2ec1f75b 2019-03-26 stsp goto done;
2048 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2050 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2051 4ce46740 2019-08-08 stsp a->diff_context, stdout);
2053 b72f483a 2019-02-05 stsp if (blob1)
2054 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2055 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
2056 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2057 b72f483a 2019-02-05 stsp free(abspath);
2058 927df6b7 2019-02-10 stsp return err;
2061 927df6b7 2019-02-10 stsp static const struct got_error *
2062 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2063 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2064 01073a5d 2019-08-22 stsp struct got_repository *repo)
2066 0adb7196 2019-08-11 stsp const struct got_error *err;
2067 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2068 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2070 0adb7196 2019-08-11 stsp *id = NULL;
2071 0adb7196 2019-08-11 stsp *label = NULL;
2073 01073a5d 2019-08-22 stsp if (resolve_tags) {
2074 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2076 01073a5d 2019-08-22 stsp if (err == NULL) {
2077 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2078 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2079 01073a5d 2019-08-22 stsp if (*id == NULL)
2080 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2081 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2082 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2083 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2084 32f0ab81 2019-08-28 hiltjo free(*id);
2085 01073a5d 2019-08-22 stsp *id = NULL;
2087 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2088 01073a5d 2019-08-22 stsp return err;
2089 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2090 01073a5d 2019-08-22 stsp return err;
2093 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2094 0adb7196 2019-08-11 stsp if (err) {
2095 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2096 0adb7196 2019-08-11 stsp return err;
2097 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2098 0adb7196 2019-08-11 stsp if (err != NULL)
2099 0adb7196 2019-08-11 stsp goto done;
2100 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2101 0adb7196 2019-08-11 stsp if (*label == NULL) {
2102 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2103 0adb7196 2019-08-11 stsp goto done;
2105 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2107 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2108 0adb7196 2019-08-11 stsp if (*label == NULL) {
2109 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2110 0adb7196 2019-08-11 stsp goto done;
2115 0adb7196 2019-08-11 stsp got_ref_close(ref);
2116 0adb7196 2019-08-11 stsp return err;
2120 0adb7196 2019-08-11 stsp static const struct got_error *
2121 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2123 b00d56cd 2018-04-01 stsp const struct got_error *error;
2124 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2125 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2126 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2127 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2128 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2129 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2130 15a94983 2018-12-23 stsp int type1, type2;
2131 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
2132 c0cc5c62 2018-10-18 stsp const char *errstr;
2133 927df6b7 2019-02-10 stsp char *path = NULL;
2135 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2136 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2137 25eccc22 2019-01-04 stsp NULL) == -1)
2138 b00d56cd 2018-04-01 stsp err(1, "pledge");
2141 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
2142 b00d56cd 2018-04-01 stsp switch (ch) {
2144 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
2145 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2146 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2149 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2150 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2151 b72f483a 2019-02-05 stsp err(1, "-r option");
2152 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2155 98eaaa12 2019-08-03 stsp diff_staged = 1;
2158 2deda0b9 2019-03-07 stsp usage_diff();
2159 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2163 b00d56cd 2018-04-01 stsp argc -= optind;
2164 b00d56cd 2018-04-01 stsp argv += optind;
2166 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2167 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2168 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2169 b72f483a 2019-02-05 stsp goto done;
2171 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2172 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2173 927df6b7 2019-02-10 stsp goto done;
2174 927df6b7 2019-02-10 stsp if (argc <= 1) {
2175 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2176 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2177 927df6b7 2019-02-10 stsp goto done;
2179 b72f483a 2019-02-05 stsp if (repo_path)
2181 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2182 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2183 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2184 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2185 927df6b7 2019-02-10 stsp goto done;
2187 927df6b7 2019-02-10 stsp if (argc == 1) {
2188 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2190 927df6b7 2019-02-10 stsp if (error)
2191 927df6b7 2019-02-10 stsp goto done;
2193 927df6b7 2019-02-10 stsp path = strdup("");
2194 927df6b7 2019-02-10 stsp if (path == NULL) {
2195 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2196 927df6b7 2019-02-10 stsp goto done;
2199 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2200 98eaaa12 2019-08-03 stsp if (diff_staged)
2201 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2202 98eaaa12 2019-08-03 stsp "objects in repository");
2203 15a94983 2018-12-23 stsp id_str1 = argv[0];
2204 15a94983 2018-12-23 stsp id_str2 = argv[1];
2205 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2206 30db809c 2019-06-05 stsp repo_path =
2207 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2208 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2209 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2210 30db809c 2019-06-05 stsp goto done;
2214 b00d56cd 2018-04-01 stsp usage_diff();
2216 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2217 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2218 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2219 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2222 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2223 76089277 2018-04-01 stsp free(repo_path);
2224 b00d56cd 2018-04-01 stsp if (error != NULL)
2225 b00d56cd 2018-04-01 stsp goto done;
2227 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2228 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2229 c02c541e 2019-03-29 stsp if (error)
2230 c02c541e 2019-03-29 stsp goto done;
2232 30db809c 2019-06-05 stsp if (argc <= 1) {
2233 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2234 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2235 b72f483a 2019-02-05 stsp char *id_str;
2237 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2239 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2240 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2241 b72f483a 2019-02-05 stsp if (error)
2242 b72f483a 2019-02-05 stsp goto done;
2243 b72f483a 2019-02-05 stsp arg.repo = repo;
2244 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2245 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2246 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2247 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2248 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2250 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2251 72ea6654 2019-07-27 stsp if (error)
2252 72ea6654 2019-07-27 stsp goto done;
2254 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2255 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2256 b72f483a 2019-02-05 stsp free(id_str);
2257 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2258 b72f483a 2019-02-05 stsp goto done;
2261 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2263 0adb7196 2019-08-11 stsp if (error)
2264 0adb7196 2019-08-11 stsp goto done;
2266 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2268 0adb7196 2019-08-11 stsp if (error)
2269 0adb7196 2019-08-11 stsp goto done;
2271 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2272 15a94983 2018-12-23 stsp if (error)
2273 15a94983 2018-12-23 stsp goto done;
2275 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2276 15a94983 2018-12-23 stsp if (error)
2277 15a94983 2018-12-23 stsp goto done;
2279 15a94983 2018-12-23 stsp if (type1 != type2) {
2280 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2281 b00d56cd 2018-04-01 stsp goto done;
2284 15a94983 2018-12-23 stsp switch (type1) {
2285 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2286 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2287 54156555 2018-12-24 stsp diff_context, repo, stdout);
2289 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2290 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2291 54156555 2018-12-24 stsp diff_context, repo, stdout);
2293 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2294 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2295 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2296 c0cc5c62 2018-10-18 stsp repo, stdout);
2299 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2303 5e70831e 2019-05-28 stsp free(label1);
2304 5e70831e 2019-05-28 stsp free(label2);
2305 15a94983 2018-12-23 stsp free(id1);
2306 15a94983 2018-12-23 stsp free(id2);
2307 927df6b7 2019-02-10 stsp free(path);
2308 b72f483a 2019-02-05 stsp if (worktree)
2309 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2310 ad242220 2018-09-08 stsp if (repo) {
2311 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2312 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2313 ad242220 2018-09-08 stsp if (error == NULL)
2314 ad242220 2018-09-08 stsp error = repo_error;
2316 b00d56cd 2018-04-01 stsp return error;
2319 404c43c4 2018-06-21 stsp __dead static void
2320 404c43c4 2018-06-21 stsp usage_blame(void)
2322 9270e621 2019-02-05 stsp fprintf(stderr,
2323 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2324 404c43c4 2018-06-21 stsp getprogname());
2328 28315671 2019-08-14 stsp struct blame_line {
2329 28315671 2019-08-14 stsp int annotated;
2330 28315671 2019-08-14 stsp char *id_str;
2331 82f6abb8 2019-08-14 stsp char *committer;
2332 bcb49d15 2019-08-14 stsp char datebuf[9]; /* YY-MM-DD + NUL */
2335 28315671 2019-08-14 stsp struct blame_cb_args {
2336 28315671 2019-08-14 stsp struct blame_line *lines;
2337 28315671 2019-08-14 stsp int nlines;
2338 7ef28ff8 2019-08-14 stsp int nlines_prec;
2339 28315671 2019-08-14 stsp int lineno_cur;
2340 28315671 2019-08-14 stsp off_t *line_offsets;
2342 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2345 404c43c4 2018-06-21 stsp static const struct got_error *
2346 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2348 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2349 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2350 28315671 2019-08-14 stsp struct blame_line *bline;
2351 82f6abb8 2019-08-14 stsp char *line = NULL;
2352 28315671 2019-08-14 stsp size_t linesize = 0;
2353 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2354 28315671 2019-08-14 stsp off_t offset;
2355 bcb49d15 2019-08-14 stsp struct tm tm;
2356 bcb49d15 2019-08-14 stsp time_t committer_time;
2358 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2359 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2360 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2362 28315671 2019-08-14 stsp if (sigint_received)
2363 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2365 2839f8b9 2019-08-18 stsp if (lineno == -1)
2366 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2368 28315671 2019-08-14 stsp /* Annotate this line. */
2369 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2370 28315671 2019-08-14 stsp if (bline->annotated)
2371 28315671 2019-08-14 stsp return NULL;
2372 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2374 28315671 2019-08-14 stsp return err;
2376 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2378 82f6abb8 2019-08-14 stsp goto done;
2380 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2381 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2382 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2383 bcb49d15 2019-08-14 stsp goto done;
2386 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2387 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2388 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2389 bcb49d15 2019-08-14 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2390 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2391 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2392 82f6abb8 2019-08-14 stsp goto done;
2394 28315671 2019-08-14 stsp bline->annotated = 1;
2396 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2397 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2398 28315671 2019-08-14 stsp if (!bline->annotated)
2399 82f6abb8 2019-08-14 stsp goto done;
2401 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2402 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2403 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2404 82f6abb8 2019-08-14 stsp goto done;
2407 28315671 2019-08-14 stsp while (bline->annotated) {
2408 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2409 82f6abb8 2019-08-14 stsp size_t len;
2411 28315671 2019-08-14 stsp if (getline(&line, &linesize, a->f) == (ssize_t)-1) {
2412 28315671 2019-08-14 stsp if (ferror(a->f))
2413 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2417 82f6abb8 2019-08-14 stsp committer = bline->committer;
2418 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2419 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2420 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2421 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2423 82f6abb8 2019-08-14 stsp *at = '\0';
2424 82f6abb8 2019-08-14 stsp len = strlen(committer);
2425 82f6abb8 2019-08-14 stsp if (len >= 9)
2426 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2428 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2430 28315671 2019-08-14 stsp *nl = '\0';
2431 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2432 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2434 28315671 2019-08-14 stsp a->lineno_cur++;
2435 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2438 82f6abb8 2019-08-14 stsp if (commit)
2439 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2440 28315671 2019-08-14 stsp free(line);
2441 28315671 2019-08-14 stsp return err;
2444 28315671 2019-08-14 stsp static const struct got_error *
2445 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2447 404c43c4 2018-06-21 stsp const struct got_error *error;
2448 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2449 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2450 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2451 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2452 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2453 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2454 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2455 28315671 2019-08-14 stsp struct blame_cb_args bca;
2456 28315671 2019-08-14 stsp int ch, obj_type, i;
2457 b02560ec 2019-08-19 stsp size_t filesize;
2459 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2461 404c43c4 2018-06-21 stsp #ifndef PROFILE
2462 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2463 36e2fb66 2019-01-04 stsp NULL) == -1)
2464 404c43c4 2018-06-21 stsp err(1, "pledge");
2467 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2468 404c43c4 2018-06-21 stsp switch (ch) {
2470 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2473 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2474 66bea077 2018-08-02 stsp if (repo_path == NULL)
2475 66bea077 2018-08-02 stsp err(1, "-r option");
2476 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2479 2deda0b9 2019-03-07 stsp usage_blame();
2480 404c43c4 2018-06-21 stsp /* NOTREACHED */
2484 404c43c4 2018-06-21 stsp argc -= optind;
2485 404c43c4 2018-06-21 stsp argv += optind;
2487 a39318fd 2018-08-02 stsp if (argc == 1)
2488 404c43c4 2018-06-21 stsp path = argv[0];
2490 404c43c4 2018-06-21 stsp usage_blame();
2492 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2493 66bea077 2018-08-02 stsp if (cwd == NULL) {
2494 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2495 66bea077 2018-08-02 stsp goto done;
2497 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2498 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2499 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2500 66bea077 2018-08-02 stsp goto done;
2502 0c06baac 2019-02-05 stsp error = NULL;
2503 0c06baac 2019-02-05 stsp if (worktree) {
2504 0c06baac 2019-02-05 stsp repo_path =
2505 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2506 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2507 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2508 0c06baac 2019-02-05 stsp if (error)
2509 0c06baac 2019-02-05 stsp goto done;
2511 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2512 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2513 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2514 0c06baac 2019-02-05 stsp goto done;
2519 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2520 c02c541e 2019-03-29 stsp if (error != NULL)
2521 36e2fb66 2019-01-04 stsp goto done;
2523 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2524 c02c541e 2019-03-29 stsp if (error)
2525 404c43c4 2018-06-21 stsp goto done;
2527 0c06baac 2019-02-05 stsp if (worktree) {
2528 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2529 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2530 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2531 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2532 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2533 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2534 6efaaa2d 2019-02-05 stsp path) == -1) {
2535 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2536 0c06baac 2019-02-05 stsp goto done;
2538 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2541 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2543 0c06baac 2019-02-05 stsp if (error)
2544 66bea077 2018-08-02 stsp goto done;
2546 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2547 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2548 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2549 404c43c4 2018-06-21 stsp if (error != NULL)
2550 66bea077 2018-08-02 stsp goto done;
2551 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2552 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2553 404c43c4 2018-06-21 stsp if (error != NULL)
2554 66bea077 2018-08-02 stsp goto done;
2556 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2557 30837e32 2019-07-25 stsp if (error)
2558 66bea077 2018-08-02 stsp goto done;
2561 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2562 28315671 2019-08-14 stsp if (error)
2563 28315671 2019-08-14 stsp goto done;
2564 28315671 2019-08-14 stsp if (obj_id == NULL) {
2565 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2566 28315671 2019-08-14 stsp goto done;
2569 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2570 28315671 2019-08-14 stsp if (error)
2571 28315671 2019-08-14 stsp goto done;
2573 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2574 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2575 28315671 2019-08-14 stsp goto done;
2578 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2579 28315671 2019-08-14 stsp if (error)
2580 28315671 2019-08-14 stsp goto done;
2581 28315671 2019-08-14 stsp bca.f = got_opentemp();
2582 28315671 2019-08-14 stsp if (bca.f == NULL) {
2583 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2584 28315671 2019-08-14 stsp goto done;
2586 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2587 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2588 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2589 28315671 2019-08-14 stsp goto done;
2591 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2592 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2593 b02560ec 2019-08-19 stsp bca.nlines--;
2595 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2596 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2597 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2598 28315671 2019-08-14 stsp goto done;
2600 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2601 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2602 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2603 7ef28ff8 2019-08-14 stsp while (i > 0) {
2605 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2607 82f6abb8 2019-08-14 stsp bca.repo = repo;
2609 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2610 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2611 28315671 2019-08-14 stsp if (error)
2612 28315671 2019-08-14 stsp goto done;
2614 66bea077 2018-08-02 stsp free(in_repo_path);
2615 66bea077 2018-08-02 stsp free(repo_path);
2616 66bea077 2018-08-02 stsp free(cwd);
2617 404c43c4 2018-06-21 stsp free(commit_id);
2618 28315671 2019-08-14 stsp free(obj_id);
2620 28315671 2019-08-14 stsp got_object_blob_close(blob);
2621 0c06baac 2019-02-05 stsp if (worktree)
2622 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2623 ad242220 2018-09-08 stsp if (repo) {
2624 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2625 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2626 ad242220 2018-09-08 stsp if (error == NULL)
2627 ad242220 2018-09-08 stsp error = repo_error;
2629 28315671 2019-08-14 stsp for (i = 0; i < bca.nlines; i++) {
2630 28315671 2019-08-14 stsp struct blame_line *bline = &bca.lines[i];
2631 28315671 2019-08-14 stsp free(bline->id_str);
2632 82f6abb8 2019-08-14 stsp free(bline->committer);
2634 28315671 2019-08-14 stsp free(bca.lines);
2635 28315671 2019-08-14 stsp free(bca.line_offsets);
2636 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2637 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2638 404c43c4 2018-06-21 stsp return error;
2641 5de5890b 2018-10-18 stsp __dead static void
2642 5de5890b 2018-10-18 stsp usage_tree(void)
2644 c1669e2e 2019-01-09 stsp fprintf(stderr,
2645 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2646 5de5890b 2018-10-18 stsp getprogname());
2650 c1669e2e 2019-01-09 stsp static void
2651 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2652 c1669e2e 2019-01-09 stsp const char *root_path)
2654 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2655 848d6979 2019-08-12 stsp const char *modestr = "";
2657 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2658 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2661 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2662 63c5ca5d 2019-08-24 stsp modestr = "$";
2663 63c5ca5d 2019-08-24 stsp else if (S_ISLNK(te->mode))
2664 848d6979 2019-08-12 stsp modestr = "@";
2665 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
2666 848d6979 2019-08-12 stsp modestr = "/";
2667 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
2668 848d6979 2019-08-12 stsp modestr = "*";
2670 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2671 848d6979 2019-08-12 stsp is_root_path ? "" : "/", te->name, modestr);
2674 5de5890b 2018-10-18 stsp static const struct got_error *
2675 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2676 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2677 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2679 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2680 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2681 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2682 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2683 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2685 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2687 5de5890b 2018-10-18 stsp goto done;
2689 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2691 5de5890b 2018-10-18 stsp goto done;
2692 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2693 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2694 5de5890b 2018-10-18 stsp while (te) {
2695 5de5890b 2018-10-18 stsp char *id = NULL;
2697 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2700 5de5890b 2018-10-18 stsp if (show_ids) {
2701 5de5890b 2018-10-18 stsp char *id_str;
2702 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2704 5de5890b 2018-10-18 stsp goto done;
2705 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2706 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2707 5de5890b 2018-10-18 stsp free(id_str);
2708 5de5890b 2018-10-18 stsp goto done;
2710 5de5890b 2018-10-18 stsp free(id_str);
2712 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2715 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2716 c1669e2e 2019-01-09 stsp char *child_path;
2717 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2718 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2719 c1669e2e 2019-01-09 stsp te->name) == -1) {
2720 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2721 c1669e2e 2019-01-09 stsp goto done;
2723 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2724 c1669e2e 2019-01-09 stsp root_path, repo);
2725 c1669e2e 2019-01-09 stsp free(child_path);
2727 c1669e2e 2019-01-09 stsp goto done;
2730 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2734 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2735 5de5890b 2018-10-18 stsp free(tree_id);
2736 5de5890b 2018-10-18 stsp return err;
2739 5de5890b 2018-10-18 stsp static const struct got_error *
2740 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2742 5de5890b 2018-10-18 stsp const struct got_error *error;
2743 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2744 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2745 7a2c19d6 2019-02-05 stsp const char *path;
2746 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2747 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2748 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2749 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2752 5de5890b 2018-10-18 stsp #ifndef PROFILE
2753 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2754 0f8d269b 2019-01-04 stsp NULL) == -1)
2755 5de5890b 2018-10-18 stsp err(1, "pledge");
2758 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2759 5de5890b 2018-10-18 stsp switch (ch) {
2761 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2764 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2765 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2766 5de5890b 2018-10-18 stsp err(1, "-r option");
2767 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2770 5de5890b 2018-10-18 stsp show_ids = 1;
2773 c1669e2e 2019-01-09 stsp recurse = 1;
2776 2deda0b9 2019-03-07 stsp usage_tree();
2777 5de5890b 2018-10-18 stsp /* NOTREACHED */
2781 5de5890b 2018-10-18 stsp argc -= optind;
2782 5de5890b 2018-10-18 stsp argv += optind;
2784 5de5890b 2018-10-18 stsp if (argc == 1)
2785 5de5890b 2018-10-18 stsp path = argv[0];
2786 5de5890b 2018-10-18 stsp else if (argc > 1)
2787 5de5890b 2018-10-18 stsp usage_tree();
2789 7a2c19d6 2019-02-05 stsp path = NULL;
2791 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2792 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2793 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2794 9bf7a39b 2019-02-05 stsp goto done;
2796 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2797 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2798 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2799 7a2c19d6 2019-02-05 stsp goto done;
2801 7a2c19d6 2019-02-05 stsp error = NULL;
2802 7a2c19d6 2019-02-05 stsp if (worktree) {
2803 7a2c19d6 2019-02-05 stsp repo_path =
2804 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2805 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2806 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2807 7a2c19d6 2019-02-05 stsp if (error)
2808 7a2c19d6 2019-02-05 stsp goto done;
2810 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2811 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2812 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2813 7a2c19d6 2019-02-05 stsp goto done;
2818 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2819 5de5890b 2018-10-18 stsp if (error != NULL)
2820 c02c541e 2019-03-29 stsp goto done;
2822 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2823 c02c541e 2019-03-29 stsp if (error)
2824 5de5890b 2018-10-18 stsp goto done;
2826 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2827 9bf7a39b 2019-02-05 stsp if (worktree) {
2828 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2829 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2830 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2831 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2832 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2833 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2834 9bf7a39b 2019-02-05 stsp goto done;
2836 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2838 9bf7a39b 2019-02-05 stsp if (error)
2839 9bf7a39b 2019-02-05 stsp goto done;
2841 9bf7a39b 2019-02-05 stsp path = "/";
2843 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2844 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2845 9bf7a39b 2019-02-05 stsp if (error != NULL)
2846 9bf7a39b 2019-02-05 stsp goto done;
2849 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2850 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2851 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2852 5de5890b 2018-10-18 stsp if (error != NULL)
2853 5de5890b 2018-10-18 stsp goto done;
2854 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2855 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2856 5de5890b 2018-10-18 stsp if (error != NULL)
2857 5de5890b 2018-10-18 stsp goto done;
2859 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2860 30837e32 2019-07-25 stsp if (error)
2861 5de5890b 2018-10-18 stsp goto done;
2864 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2865 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2867 5de5890b 2018-10-18 stsp free(in_repo_path);
2868 5de5890b 2018-10-18 stsp free(repo_path);
2869 5de5890b 2018-10-18 stsp free(cwd);
2870 5de5890b 2018-10-18 stsp free(commit_id);
2871 7a2c19d6 2019-02-05 stsp if (worktree)
2872 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2873 5de5890b 2018-10-18 stsp if (repo) {
2874 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2875 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2876 5de5890b 2018-10-18 stsp if (error == NULL)
2877 5de5890b 2018-10-18 stsp error = repo_error;
2879 5de5890b 2018-10-18 stsp return error;
2882 6bad629b 2019-02-04 stsp __dead static void
2883 6bad629b 2019-02-04 stsp usage_status(void)
2885 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2889 b72f483a 2019-02-05 stsp static const struct got_error *
2890 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2891 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2892 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2894 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2895 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2896 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2897 b72f483a 2019-02-05 stsp return NULL;
2900 6bad629b 2019-02-04 stsp static const struct got_error *
2901 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2903 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2904 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2905 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2906 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2907 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2908 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2911 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2913 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2914 6bad629b 2019-02-04 stsp switch (ch) {
2916 2deda0b9 2019-03-07 stsp usage_status();
2917 6bad629b 2019-02-04 stsp /* NOTREACHED */
2921 6bad629b 2019-02-04 stsp argc -= optind;
2922 6bad629b 2019-02-04 stsp argv += optind;
2924 6bad629b 2019-02-04 stsp #ifndef PROFILE
2925 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2926 6bad629b 2019-02-04 stsp NULL) == -1)
2927 6bad629b 2019-02-04 stsp err(1, "pledge");
2929 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2930 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2931 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2932 927df6b7 2019-02-10 stsp goto done;
2935 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2936 927df6b7 2019-02-10 stsp if (error != NULL)
2937 a5edda0a 2019-07-27 stsp goto done;
2939 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2941 6bad629b 2019-02-04 stsp if (error != NULL)
2942 6bad629b 2019-02-04 stsp goto done;
2944 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2945 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2946 087fb88c 2019-08-04 stsp if (error)
2947 087fb88c 2019-08-04 stsp goto done;
2949 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2950 6bad629b 2019-02-04 stsp if (error)
2951 6bad629b 2019-02-04 stsp goto done;
2953 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2954 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2956 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2957 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2958 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2959 927df6b7 2019-02-10 stsp free(cwd);
2960 d0eebce4 2019-03-11 stsp return error;
2963 d0eebce4 2019-03-11 stsp __dead static void
2964 d0eebce4 2019-03-11 stsp usage_ref(void)
2966 d0eebce4 2019-03-11 stsp fprintf(stderr,
2967 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2968 d0eebce4 2019-03-11 stsp getprogname());
2972 d0eebce4 2019-03-11 stsp static const struct got_error *
2973 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2975 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2976 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2977 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2979 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2980 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2982 d0eebce4 2019-03-11 stsp return err;
2984 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2985 d0eebce4 2019-03-11 stsp char *refstr;
2986 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2987 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2988 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2989 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2990 d0eebce4 2019-03-11 stsp free(refstr);
2993 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2994 d0eebce4 2019-03-11 stsp return NULL;
2997 d0eebce4 2019-03-11 stsp static const struct got_error *
2998 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3000 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3001 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3003 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3005 d0eebce4 2019-03-11 stsp return err;
3007 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3008 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3009 d0eebce4 2019-03-11 stsp return err;
3012 d0eebce4 2019-03-11 stsp static const struct got_error *
3013 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3015 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3016 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3017 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3020 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
3021 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3022 d1644381 2019-07-14 stsp * an unintended typo.
3024 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
3025 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3027 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3029 d83d9d5c 2019-05-13 stsp if (err) {
3030 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3032 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3033 d83d9d5c 2019-05-13 stsp return err;
3034 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3036 d83d9d5c 2019-05-13 stsp return err;
3037 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3038 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3040 d83d9d5c 2019-05-13 stsp return err;
3043 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3045 d0eebce4 2019-03-11 stsp goto done;
3047 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3050 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3052 d1c1ae5f 2019-08-12 stsp return err;
3055 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3056 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3058 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3059 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3060 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3063 d1c1ae5f 2019-08-12 stsp * Don't let the user create a reference named '-'.
3064 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3065 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3067 d1c1ae5f 2019-08-12 stsp if (refname[0] == '-' && refname[1] == '\0')
3068 d1c1ae5f 2019-08-12 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3070 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3072 d1c1ae5f 2019-08-12 stsp return err;
3074 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3076 d1c1ae5f 2019-08-12 stsp goto done;
3078 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3080 d1c1ae5f 2019-08-12 stsp if (target_ref)
3081 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3083 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3084 d0eebce4 2019-03-11 stsp return err;
3087 d0eebce4 2019-03-11 stsp static const struct got_error *
3088 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3090 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3091 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3092 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3093 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3094 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3095 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3097 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3098 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3099 d0eebce4 2019-03-11 stsp switch (ch) {
3101 d0eebce4 2019-03-11 stsp delref = optarg;
3104 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3105 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3106 d0eebce4 2019-03-11 stsp err(1, "-r option");
3107 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3110 d0eebce4 2019-03-11 stsp do_list = 1;
3113 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3116 d0eebce4 2019-03-11 stsp usage_ref();
3117 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3121 d0eebce4 2019-03-11 stsp if (do_list && delref)
3122 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3124 d0eebce4 2019-03-11 stsp argc -= optind;
3125 d0eebce4 2019-03-11 stsp argv += optind;
3127 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3128 d1c1ae5f 2019-08-12 stsp if (create_symref)
3129 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3130 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3131 d0eebce4 2019-03-11 stsp if (argc > 0)
3132 d0eebce4 2019-03-11 stsp usage_ref();
3133 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3134 d0eebce4 2019-03-11 stsp usage_ref();
3136 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3137 e0b57350 2019-03-12 stsp if (do_list) {
3138 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3139 e0b57350 2019-03-12 stsp NULL) == -1)
3140 e0b57350 2019-03-12 stsp err(1, "pledge");
3142 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3143 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3144 e0b57350 2019-03-12 stsp err(1, "pledge");
3147 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3148 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3149 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3150 d0eebce4 2019-03-11 stsp goto done;
3153 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3154 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3155 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3156 d0eebce4 2019-03-11 stsp goto done;
3158 d0eebce4 2019-03-11 stsp error = NULL;
3159 d0eebce4 2019-03-11 stsp if (worktree) {
3160 d0eebce4 2019-03-11 stsp repo_path =
3161 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3162 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3163 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3164 d0eebce4 2019-03-11 stsp if (error)
3165 d0eebce4 2019-03-11 stsp goto done;
3167 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3168 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3169 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3170 d0eebce4 2019-03-11 stsp goto done;
3175 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3176 d0eebce4 2019-03-11 stsp if (error != NULL)
3177 d0eebce4 2019-03-11 stsp goto done;
3179 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3180 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3181 c02c541e 2019-03-29 stsp if (error)
3182 c02c541e 2019-03-29 stsp goto done;
3184 d0eebce4 2019-03-11 stsp if (do_list)
3185 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3186 d0eebce4 2019-03-11 stsp else if (delref)
3187 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3188 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3189 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3191 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3194 4e759de4 2019-06-26 stsp got_repo_close(repo);
3195 4e759de4 2019-06-26 stsp if (worktree)
3196 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3197 4e759de4 2019-06-26 stsp free(cwd);
3198 4e759de4 2019-06-26 stsp free(repo_path);
3199 4e759de4 2019-06-26 stsp return error;
3202 4e759de4 2019-06-26 stsp __dead static void
3203 4e759de4 2019-06-26 stsp usage_branch(void)
3205 4e759de4 2019-06-26 stsp fprintf(stderr,
3206 4e759de4 2019-06-26 stsp "usage: %s branch [-r repository] -l | -d name | "
3207 a4f89d48 2019-08-25 stsp "name [commit]\n", getprogname());
3211 4e759de4 2019-06-26 stsp static const struct got_error *
3212 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3214 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3215 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3216 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3218 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3220 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3221 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3223 4e759de4 2019-06-26 stsp return err;
3225 4e759de4 2019-06-26 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3226 ba882ee3 2019-07-11 stsp const char *refname, *marker = " ";
3227 4e759de4 2019-06-26 stsp char *refstr;
3228 4e759de4 2019-06-26 stsp refname = got_ref_get_name(re->ref);
3229 ba882ee3 2019-07-11 stsp if (worktree && strcmp(refname,
3230 ba882ee3 2019-07-11 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3231 ba882ee3 2019-07-11 stsp struct got_object_id *id = NULL;
3232 ba882ee3 2019-07-11 stsp err = got_ref_resolve(&id, repo, re->ref);
3234 ba882ee3 2019-07-11 stsp return err;
3235 ba882ee3 2019-07-11 stsp if (got_object_id_cmp(id,
3236 ba882ee3 2019-07-11 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3237 ba882ee3 2019-07-11 stsp marker = "* ";
3239 ba882ee3 2019-07-11 stsp marker = "~ ";
3242 29606af7 2019-08-23 stsp refname += strlen("refs/heads/");
3243 4e759de4 2019-06-26 stsp refstr = got_ref_to_str(re->ref);
3244 4e759de4 2019-06-26 stsp if (refstr == NULL)
3245 4e759de4 2019-06-26 stsp return got_error_from_errno("got_ref_to_str");
3246 ba882ee3 2019-07-11 stsp printf("%s%s: %s\n", marker, refname, refstr);
3247 4e759de4 2019-06-26 stsp free(refstr);
3250 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3251 4e759de4 2019-06-26 stsp return NULL;
3254 4e759de4 2019-06-26 stsp static const struct got_error *
3255 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3256 45cd4e47 2019-08-25 stsp const char *branch_name)
3258 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3259 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3260 4e759de4 2019-06-26 stsp char *refname;
3262 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3263 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3265 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3267 4e759de4 2019-06-26 stsp goto done;
3269 45cd4e47 2019-08-25 stsp if (worktree &&
3270 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3271 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3272 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3273 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3274 45cd4e47 2019-08-25 stsp goto done;
3277 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3280 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3281 4e759de4 2019-06-26 stsp free(refname);
3282 4e759de4 2019-06-26 stsp return err;
3285 4e759de4 2019-06-26 stsp static const struct got_error *
3286 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3287 4e759de4 2019-06-26 stsp const char *base_branch)
3289 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3290 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
3291 a4f89d48 2019-08-25 stsp char *label;
3292 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3293 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3296 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
3297 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3298 d3f84d51 2019-07-11 stsp * an unintended typo.
3300 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
3301 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3303 a4f89d48 2019-08-25 stsp err = match_object_id(&id, &label, base_branch,
3304 a4f89d48 2019-08-25 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3306 a4f89d48 2019-08-25 stsp return err;
3308 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3309 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3310 4e759de4 2019-06-26 stsp goto done;
3313 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3314 4e759de4 2019-06-26 stsp if (err == NULL) {
3315 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3316 4e759de4 2019-06-26 stsp goto done;
3317 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3318 4e759de4 2019-06-26 stsp goto done;
3320 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
3322 4e759de4 2019-06-26 stsp goto done;
3324 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3327 4e759de4 2019-06-26 stsp got_ref_close(ref);
3329 4e759de4 2019-06-26 stsp free(base_refname);
3330 4e759de4 2019-06-26 stsp free(refname);
3331 4e759de4 2019-06-26 stsp return err;
3334 4e759de4 2019-06-26 stsp static const struct got_error *
3335 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3337 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3338 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3339 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3340 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3341 4e759de4 2019-06-26 stsp int ch, do_list = 0;
3342 4e759de4 2019-06-26 stsp const char *delref = NULL;
3344 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3345 4e759de4 2019-06-26 stsp switch (ch) {
3347 4e759de4 2019-06-26 stsp delref = optarg;
3350 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3351 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3352 4e759de4 2019-06-26 stsp err(1, "-r option");
3353 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3356 4e759de4 2019-06-26 stsp do_list = 1;
3359 4e759de4 2019-06-26 stsp usage_branch();
3360 4e759de4 2019-06-26 stsp /* NOTREACHED */
3364 4e759de4 2019-06-26 stsp if (do_list && delref)
3365 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3367 4e759de4 2019-06-26 stsp argc -= optind;
3368 4e759de4 2019-06-26 stsp argv += optind;
3370 4e759de4 2019-06-26 stsp if (do_list || delref) {
3371 4e759de4 2019-06-26 stsp if (argc > 0)
3372 4e759de4 2019-06-26 stsp usage_branch();
3373 4e759de4 2019-06-26 stsp } else if (argc < 1 || argc > 2)
3374 4e759de4 2019-06-26 stsp usage_branch();
3376 4e759de4 2019-06-26 stsp #ifndef PROFILE
3377 4e759de4 2019-06-26 stsp if (do_list) {
3378 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3379 4e759de4 2019-06-26 stsp NULL) == -1)
3380 4e759de4 2019-06-26 stsp err(1, "pledge");
3382 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3383 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3384 4e759de4 2019-06-26 stsp err(1, "pledge");
3387 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3388 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3389 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3390 4e759de4 2019-06-26 stsp goto done;
3393 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3394 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3395 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3396 4e759de4 2019-06-26 stsp goto done;
3398 4e759de4 2019-06-26 stsp error = NULL;
3399 4e759de4 2019-06-26 stsp if (worktree) {
3400 4e759de4 2019-06-26 stsp repo_path =
3401 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3402 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3403 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3404 4e759de4 2019-06-26 stsp if (error)
3405 4e759de4 2019-06-26 stsp goto done;
3407 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3408 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3409 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3410 4e759de4 2019-06-26 stsp goto done;
3415 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3416 4e759de4 2019-06-26 stsp if (error != NULL)
3417 4e759de4 2019-06-26 stsp goto done;
3419 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3420 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3421 4e759de4 2019-06-26 stsp if (error)
3422 4e759de4 2019-06-26 stsp goto done;
3424 4e759de4 2019-06-26 stsp if (do_list)
3425 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3426 4e759de4 2019-06-26 stsp else if (delref)
3427 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3429 4e759de4 2019-06-26 stsp const char *base_branch;
3430 4e759de4 2019-06-26 stsp if (argc == 1) {
3431 4e759de4 2019-06-26 stsp base_branch = worktree ?
3432 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3433 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3434 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
3435 dc5351b4 2019-07-30 stsp base_branch += 11;
3437 4e759de4 2019-06-26 stsp base_branch = argv[1];
3438 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
3442 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3443 d0eebce4 2019-03-11 stsp if (worktree)
3444 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3445 d0eebce4 2019-03-11 stsp free(cwd);
3446 d0eebce4 2019-03-11 stsp free(repo_path);
3447 d00136be 2019-03-26 stsp return error;
3451 d00136be 2019-03-26 stsp __dead static void
3452 8e7bd50a 2019-08-22 stsp usage_tag(void)
3454 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3455 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3456 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3461 b8bad2ba 2019-08-23 stsp static const struct got_error *
3462 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3464 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3465 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3466 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3467 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3468 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3470 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3471 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3472 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3473 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3475 b8bad2ba 2019-08-23 stsp return err;
3476 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3479 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3482 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3483 b8bad2ba 2019-08-23 stsp free(re_id);
3486 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3487 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3490 b8bad2ba 2019-08-23 stsp while (se) {
3491 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3494 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3495 b8bad2ba 2019-08-23 stsp free(se_id);
3498 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3499 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3501 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3502 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3504 b8bad2ba 2019-08-23 stsp return err;
3505 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3508 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3513 b8bad2ba 2019-08-23 stsp return err;
3517 8e7bd50a 2019-08-22 stsp static const struct got_error *
3518 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3519 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3521 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3522 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3523 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3524 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3525 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3529 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3531 b8bad2ba 2019-08-23 stsp return err;
3532 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3534 b8bad2ba 2019-08-23 stsp goto done;
3536 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3538 b8bad2ba 2019-08-23 stsp goto done;
3539 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3541 b8bad2ba 2019-08-23 stsp goto done;
3543 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3544 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3546 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3547 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3549 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3550 b8bad2ba 2019-08-23 stsp *cmp = -1;
3552 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3554 b8bad2ba 2019-08-23 stsp free(id1);
3555 b8bad2ba 2019-08-23 stsp free(id2);
3557 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3559 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3560 b8bad2ba 2019-08-23 stsp return err;
3563 b8bad2ba 2019-08-23 stsp static const struct got_error *
3564 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3566 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3567 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3568 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3570 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3572 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3574 8e7bd50a 2019-08-22 stsp return err;
3576 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3577 8e7bd50a 2019-08-22 stsp const char *refname;
3578 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3579 8e7bd50a 2019-08-22 stsp char datebuf[26];
3580 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3581 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3582 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3584 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3585 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3587 8e7bd50a 2019-08-22 stsp refname += 10;
3588 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3589 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3590 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3593 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3594 8e7bd50a 2019-08-22 stsp free(refstr);
3596 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3599 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3603 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3604 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3605 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3606 2417344c 2019-08-23 stsp if (datestr)
3607 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3608 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3609 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3612 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3613 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3614 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3616 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3617 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3619 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3620 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3622 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3623 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3628 8e7bd50a 2019-08-22 stsp free(id_str);
3629 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3630 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3631 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3632 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3636 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3638 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3640 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3641 8e7bd50a 2019-08-22 stsp } while (line);
3642 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3645 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3646 8e7bd50a 2019-08-22 stsp return NULL;
3649 8e7bd50a 2019-08-22 stsp static const struct got_error *
3650 62870f63 2019-08-22 stsp get_tag_message(char **tagmsg, const char *commit_id_str,
3651 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3653 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3654 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3655 8e7bd50a 2019-08-22 stsp char *tagmsg_path = NULL, *editor = NULL;
3656 8e7bd50a 2019-08-22 stsp int fd = -1;
3658 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3659 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3660 8e7bd50a 2019-08-22 stsp goto done;
3663 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3664 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3665 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3666 8e7bd50a 2019-08-22 stsp goto done;
3669 8e7bd50a 2019-08-22 stsp err = got_opentemp_named_fd(&tagmsg_path, &fd, template);
3671 8e7bd50a 2019-08-22 stsp goto done;
3673 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3674 8e7bd50a 2019-08-22 stsp close(fd);
3676 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3678 8e7bd50a 2019-08-22 stsp goto done;
3679 8e7bd50a 2019-08-22 stsp err = edit_logmsg(tagmsg, editor, tagmsg_path, initial_content);
3681 8e7bd50a 2019-08-22 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3682 8e7bd50a 2019-08-22 stsp unlink(tagmsg_path);
3683 8e7bd50a 2019-08-22 stsp free(tagmsg_path);
3684 8e7bd50a 2019-08-22 stsp tagmsg_path = NULL;
3686 8e7bd50a 2019-08-22 stsp free(initial_content);
3687 8e7bd50a 2019-08-22 stsp free(template);
3688 8e7bd50a 2019-08-22 stsp free(editor);
3690 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3691 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3692 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3693 8e7bd50a 2019-08-22 stsp if (err) {
3694 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3695 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3698 8e7bd50a 2019-08-22 stsp return err;
3701 8e7bd50a 2019-08-22 stsp static const struct got_error *
3702 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3703 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3705 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3706 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3707 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3708 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3709 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3712 8e7bd50a 2019-08-22 stsp * Don't let the user create a tag named '-'.
3713 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3714 8e7bd50a 2019-08-22 stsp * an unintended typo.
3716 8e7bd50a 2019-08-22 stsp if (tag_name[0] == '-' && tag_name[1] == '\0')
3717 8e7bd50a 2019-08-22 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3719 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3721 8e7bd50a 2019-08-22 stsp return err;
3723 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3724 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3726 8e7bd50a 2019-08-22 stsp goto done;
3728 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3730 8e7bd50a 2019-08-22 stsp goto done;
3732 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3733 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3734 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3735 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3736 8e7bd50a 2019-08-22 stsp goto done;
3738 8e7bd50a 2019-08-22 stsp tag_name += 10;
3739 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3740 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3741 8e7bd50a 2019-08-22 stsp goto done;
3744 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3745 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3746 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3747 8e7bd50a 2019-08-22 stsp goto done;
3748 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3749 8e7bd50a 2019-08-22 stsp goto done;
3751 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3752 8e7bd50a 2019-08-22 stsp err = get_tag_message(&tagmsg, commit_id_str,
3753 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3755 8e7bd50a 2019-08-22 stsp goto done;
3758 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3759 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3761 8e7bd50a 2019-08-22 stsp goto done;
3763 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3765 8e7bd50a 2019-08-22 stsp goto done;
3767 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3769 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3770 8e7bd50a 2019-08-22 stsp char *tag_id_str;
3771 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&tag_id_str, tag_id);
3772 8e7bd50a 2019-08-22 stsp printf("Created tag %s\n", tag_id_str);
3773 8e7bd50a 2019-08-22 stsp free(tag_id_str);
3777 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3778 8e7bd50a 2019-08-22 stsp free(commit_id);
3779 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3780 8e7bd50a 2019-08-22 stsp free(refname);
3781 8e7bd50a 2019-08-22 stsp free(tagmsg);
3782 aba9c984 2019-09-08 stsp free(tagger);
3783 8e7bd50a 2019-08-22 stsp return err;
3786 8e7bd50a 2019-08-22 stsp static const struct got_error *
3787 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
3789 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
3790 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
3791 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
3792 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3793 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
3794 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3795 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
3797 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3798 8e7bd50a 2019-08-22 stsp switch (ch) {
3800 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
3803 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
3804 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3805 8e7bd50a 2019-08-22 stsp err(1, "-r option");
3806 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
3809 8e7bd50a 2019-08-22 stsp do_list = 1;
3812 8e7bd50a 2019-08-22 stsp usage_tag();
3813 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
3817 8e7bd50a 2019-08-22 stsp argc -= optind;
3818 8e7bd50a 2019-08-22 stsp argv += optind;
3820 8e7bd50a 2019-08-22 stsp if (do_list) {
3821 8e7bd50a 2019-08-22 stsp if (tagmsg)
3822 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
3823 8e7bd50a 2019-08-22 stsp if (argc > 0)
3824 8e7bd50a 2019-08-22 stsp usage_tag();
3825 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
3826 8e7bd50a 2019-08-22 stsp usage_tag();
3827 a2887370 2019-08-23 stsp else if (argc > 1)
3828 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
3829 a2887370 2019-08-23 stsp tag_name = argv[0];
3831 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
3832 8e7bd50a 2019-08-22 stsp if (do_list) {
3833 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3834 8e7bd50a 2019-08-22 stsp NULL) == -1)
3835 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3837 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3838 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
3839 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3842 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
3843 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
3844 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
3845 8e7bd50a 2019-08-22 stsp goto done;
3848 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
3849 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
3850 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3851 8e7bd50a 2019-08-22 stsp goto done;
3853 8e7bd50a 2019-08-22 stsp error = NULL;
3854 8e7bd50a 2019-08-22 stsp if (worktree) {
3855 8e7bd50a 2019-08-22 stsp repo_path =
3856 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
3857 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3858 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
3859 8e7bd50a 2019-08-22 stsp if (error)
3860 8e7bd50a 2019-08-22 stsp goto done;
3862 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
3863 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
3864 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
3865 8e7bd50a 2019-08-22 stsp goto done;
3870 8e7bd50a 2019-08-22 stsp if (do_list) {
3871 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3872 c9956ddf 2019-09-08 stsp if (error != NULL)
3873 c9956ddf 2019-09-08 stsp goto done;
3874 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3875 8e7bd50a 2019-08-22 stsp if (error)
3876 8e7bd50a 2019-08-22 stsp goto done;
3877 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
3879 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
3880 c9956ddf 2019-09-08 stsp if (error)
3881 c9956ddf 2019-09-08 stsp goto done;
3882 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
3883 c9956ddf 2019-09-08 stsp if (error != NULL)
3884 c9956ddf 2019-09-08 stsp goto done;
3886 8e7bd50a 2019-08-22 stsp if (tagmsg) {
3887 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3888 8e7bd50a 2019-08-22 stsp if (error)
3889 8e7bd50a 2019-08-22 stsp goto done;
3892 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
3893 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
3894 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
3895 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
3896 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3897 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
3898 8e7bd50a 2019-08-22 stsp if (error)
3899 8e7bd50a 2019-08-22 stsp goto done;
3900 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3901 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
3902 8e7bd50a 2019-08-22 stsp if (error)
3903 8e7bd50a 2019-08-22 stsp goto done;
3904 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
3905 8e7bd50a 2019-08-22 stsp free(commit_id);
3906 8e7bd50a 2019-08-22 stsp if (error)
3907 8e7bd50a 2019-08-22 stsp goto done;
3910 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
3911 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
3915 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
3916 8e7bd50a 2019-08-22 stsp if (worktree)
3917 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
3918 8e7bd50a 2019-08-22 stsp free(cwd);
3919 8e7bd50a 2019-08-22 stsp free(repo_path);
3920 c9956ddf 2019-09-08 stsp free(gitconfig_path);
3921 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3922 8e7bd50a 2019-08-22 stsp return error;
3925 8e7bd50a 2019-08-22 stsp __dead static void
3926 d00136be 2019-03-26 stsp usage_add(void)
3928 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3932 d00136be 2019-03-26 stsp static const struct got_error *
3933 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
3935 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
3936 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
3937 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
3938 1dd54920 2019-05-11 stsp char *cwd = NULL;
3939 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
3940 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3943 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
3945 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3946 d00136be 2019-03-26 stsp switch (ch) {
3948 d00136be 2019-03-26 stsp usage_add();
3949 d00136be 2019-03-26 stsp /* NOTREACHED */
3953 d00136be 2019-03-26 stsp argc -= optind;
3954 d00136be 2019-03-26 stsp argv += optind;
3956 43012d58 2019-07-14 stsp #ifndef PROFILE
3957 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3958 43012d58 2019-07-14 stsp NULL) == -1)
3959 43012d58 2019-07-14 stsp err(1, "pledge");
3961 723c305c 2019-05-11 jcs if (argc < 1)
3962 d00136be 2019-03-26 stsp usage_add();
3964 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
3965 d00136be 2019-03-26 stsp if (cwd == NULL) {
3966 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3967 d00136be 2019-03-26 stsp goto done;
3970 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
3971 d00136be 2019-03-26 stsp if (error)
3972 d00136be 2019-03-26 stsp goto done;
3974 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3976 031a5338 2019-03-26 stsp if (error != NULL)
3977 031a5338 2019-03-26 stsp goto done;
3979 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3980 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3981 d00136be 2019-03-26 stsp if (error)
3982 d00136be 2019-03-26 stsp goto done;
3984 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3985 6d022e97 2019-08-04 stsp if (error)
3986 6d022e97 2019-08-04 stsp goto done;
3988 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
3989 1dd54920 2019-05-11 stsp NULL, repo);
3992 031a5338 2019-03-26 stsp got_repo_close(repo);
3993 d00136be 2019-03-26 stsp if (worktree)
3994 d00136be 2019-03-26 stsp got_worktree_close(worktree);
3995 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
3996 1dd54920 2019-05-11 stsp free((char *)pe->path);
3997 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
3998 2ec1f75b 2019-03-26 stsp free(cwd);
3999 2ec1f75b 2019-03-26 stsp return error;
4002 2ec1f75b 2019-03-26 stsp __dead static void
4003 648e4ef7 2019-07-09 stsp usage_remove(void)
4005 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4009 2a06fe5f 2019-08-24 stsp static const struct got_error *
4010 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4011 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
4012 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4013 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
4015 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4016 2a06fe5f 2019-08-24 stsp return NULL;
4017 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4018 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4019 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4020 2a06fe5f 2019-08-24 stsp return NULL;
4023 2ec1f75b 2019-03-26 stsp static const struct got_error *
4024 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4026 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4027 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4028 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4029 17ed4618 2019-06-02 stsp char *cwd = NULL;
4030 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4031 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4032 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
4034 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4036 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
4037 2ec1f75b 2019-03-26 stsp switch (ch) {
4039 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4042 2ec1f75b 2019-03-26 stsp usage_add();
4043 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4047 2ec1f75b 2019-03-26 stsp argc -= optind;
4048 2ec1f75b 2019-03-26 stsp argv += optind;
4050 43012d58 2019-07-14 stsp #ifndef PROFILE
4051 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4052 43012d58 2019-07-14 stsp NULL) == -1)
4053 43012d58 2019-07-14 stsp err(1, "pledge");
4055 17ed4618 2019-06-02 stsp if (argc < 1)
4056 648e4ef7 2019-07-09 stsp usage_remove();
4058 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4059 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4060 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4061 2ec1f75b 2019-03-26 stsp goto done;
4063 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4064 2ec1f75b 2019-03-26 stsp if (error)
4065 2ec1f75b 2019-03-26 stsp goto done;
4067 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4070 2ec1f75b 2019-03-26 stsp goto done;
4072 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4073 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4074 2ec1f75b 2019-03-26 stsp if (error)
4075 2ec1f75b 2019-03-26 stsp goto done;
4077 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4078 6d022e97 2019-08-04 stsp if (error)
4079 6d022e97 2019-08-04 stsp goto done;
4081 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4082 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
4083 a129376b 2019-03-28 stsp if (error)
4084 a129376b 2019-03-28 stsp goto done;
4087 a129376b 2019-03-28 stsp got_repo_close(repo);
4088 a129376b 2019-03-28 stsp if (worktree)
4089 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4090 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4091 17ed4618 2019-06-02 stsp free((char *)pe->path);
4092 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4093 a129376b 2019-03-28 stsp free(cwd);
4094 a129376b 2019-03-28 stsp return error;
4097 a129376b 2019-03-28 stsp __dead static void
4098 a129376b 2019-03-28 stsp usage_revert(void)
4100 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4101 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4105 1ee397ad 2019-07-12 stsp static const struct got_error *
4106 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4108 a129376b 2019-03-28 stsp while (path[0] == '/')
4110 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4111 33aa809d 2019-08-08 stsp return NULL;
4114 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4115 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4116 33aa809d 2019-08-08 stsp const char *action;
4119 33aa809d 2019-08-08 stsp static const struct got_error *
4120 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4121 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4123 33aa809d 2019-08-08 stsp char *line = NULL;
4124 33aa809d 2019-08-08 stsp size_t linesize = 0;
4125 33aa809d 2019-08-08 stsp ssize_t linelen;
4127 33aa809d 2019-08-08 stsp switch (status) {
4128 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4129 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4131 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4132 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4134 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4135 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4136 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4137 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4138 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4139 33aa809d 2019-08-08 stsp printf("%s", line);
4140 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4141 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4142 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4143 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4144 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4147 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4150 33aa809d 2019-08-08 stsp return NULL;
4153 33aa809d 2019-08-08 stsp static const struct got_error *
4154 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4155 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4157 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4158 33aa809d 2019-08-08 stsp char *line = NULL;
4159 33aa809d 2019-08-08 stsp size_t linesize = 0;
4160 33aa809d 2019-08-08 stsp ssize_t linelen;
4161 33aa809d 2019-08-08 stsp int resp = ' ';
4162 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4164 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4166 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4168 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4169 33aa809d 2019-08-08 stsp a->action);
4171 33aa809d 2019-08-08 stsp return err;
4172 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4173 33aa809d 2019-08-08 stsp if (linelen == -1) {
4174 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4175 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4176 33aa809d 2019-08-08 stsp return NULL;
4178 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4180 33aa809d 2019-08-08 stsp *nl = '\0';
4181 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4182 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4183 33aa809d 2019-08-08 stsp printf("y\n");
4184 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4185 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4186 33aa809d 2019-08-08 stsp printf("n\n");
4187 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4188 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4189 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4190 33aa809d 2019-08-08 stsp printf("q\n");
4192 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4193 33aa809d 2019-08-08 stsp free(line);
4194 33aa809d 2019-08-08 stsp return NULL;
4197 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4198 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4199 33aa809d 2019-08-08 stsp a->action);
4201 33aa809d 2019-08-08 stsp return err;
4202 33aa809d 2019-08-08 stsp resp = getchar();
4203 33aa809d 2019-08-08 stsp if (resp == '\n')
4204 33aa809d 2019-08-08 stsp resp = getchar();
4205 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4206 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4207 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4208 33aa809d 2019-08-08 stsp resp = ' ';
4210 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4211 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4212 33aa809d 2019-08-08 stsp resp = ' ';
4216 33aa809d 2019-08-08 stsp if (resp == 'y')
4217 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4218 33aa809d 2019-08-08 stsp else if (resp == 'n')
4219 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4220 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4221 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4223 1ee397ad 2019-07-12 stsp return NULL;
4227 a129376b 2019-03-28 stsp static const struct got_error *
4228 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4230 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4231 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4232 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4233 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4234 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4235 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4236 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4237 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4238 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4239 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4241 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4243 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4244 a129376b 2019-03-28 stsp switch (ch) {
4246 33aa809d 2019-08-08 stsp pflag = 1;
4249 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4252 0f6d7415 2019-08-08 stsp can_recurse = 1;
4255 a129376b 2019-03-28 stsp usage_revert();
4256 a129376b 2019-03-28 stsp /* NOTREACHED */
4260 a129376b 2019-03-28 stsp argc -= optind;
4261 a129376b 2019-03-28 stsp argv += optind;
4263 43012d58 2019-07-14 stsp #ifndef PROFILE
4264 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4265 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4266 43012d58 2019-07-14 stsp err(1, "pledge");
4268 e20a8b6f 2019-06-04 stsp if (argc < 1)
4269 a129376b 2019-03-28 stsp usage_revert();
4270 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4271 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4273 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4274 a129376b 2019-03-28 stsp if (cwd == NULL) {
4275 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4276 a129376b 2019-03-28 stsp goto done;
4278 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4279 2ec1f75b 2019-03-26 stsp if (error)
4280 2ec1f75b 2019-03-26 stsp goto done;
4282 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4284 a129376b 2019-03-28 stsp if (error != NULL)
4285 a129376b 2019-03-28 stsp goto done;
4287 33aa809d 2019-08-08 stsp if (patch_script_path) {
4288 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4289 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4290 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4291 33aa809d 2019-08-08 stsp patch_script_path);
4292 33aa809d 2019-08-08 stsp goto done;
4295 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4296 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4297 a129376b 2019-03-28 stsp if (error)
4298 a129376b 2019-03-28 stsp goto done;
4300 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4301 6d022e97 2019-08-04 stsp if (error)
4302 6d022e97 2019-08-04 stsp goto done;
4304 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4305 0f6d7415 2019-08-08 stsp char *ondisk_path;
4306 0f6d7415 2019-08-08 stsp struct stat sb;
4307 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4308 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4309 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4310 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4311 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4312 0f6d7415 2019-08-08 stsp goto done;
4314 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4315 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4316 0f6d7415 2019-08-08 stsp free(ondisk_path);
4319 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4320 0f6d7415 2019-08-08 stsp ondisk_path);
4321 0f6d7415 2019-08-08 stsp free(ondisk_path);
4322 0f6d7415 2019-08-08 stsp goto done;
4324 0f6d7415 2019-08-08 stsp free(ondisk_path);
4325 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4326 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4327 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4328 0f6d7415 2019-08-08 stsp goto done;
4333 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4334 33aa809d 2019-08-08 stsp cpa.action = "revert";
4335 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4336 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4337 a129376b 2019-03-28 stsp if (error)
4338 a129376b 2019-03-28 stsp goto done;
4340 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4341 33aa809d 2019-08-08 stsp error == NULL)
4342 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4344 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4345 2ec1f75b 2019-03-26 stsp if (worktree)
4346 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4347 2ec1f75b 2019-03-26 stsp free(path);
4348 d00136be 2019-03-26 stsp free(cwd);
4349 6bad629b 2019-02-04 stsp return error;
4352 c4296144 2019-05-09 stsp __dead static void
4353 c4296144 2019-05-09 stsp usage_commit(void)
4355 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4356 5c1e53bc 2019-07-28 stsp getprogname());
4360 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4361 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4362 e2ba3d07 2019-05-13 stsp const char *editor;
4363 e0870e44 2019-05-13 stsp const char *worktree_path;
4364 76d98825 2019-06-03 stsp const char *branch_name;
4365 314a6357 2019-05-13 stsp const char *repo_path;
4366 e0870e44 2019-05-13 stsp char *logmsg_path;
4370 33ad4cbe 2019-05-12 jcs static const struct got_error *
4371 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4374 76d98825 2019-06-03 stsp char *initial_content = NULL;
4375 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4376 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4377 e0870e44 2019-05-13 stsp char *template = NULL;
4378 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4380 33ad4cbe 2019-05-12 jcs size_t len;
4382 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4383 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4384 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4385 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4386 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4387 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4388 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4389 33ad4cbe 2019-05-12 jcs return NULL;
4392 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4393 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4395 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4396 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4397 76d98825 2019-06-03 stsp a->branch_name) == -1)
4398 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4400 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4402 e0870e44 2019-05-13 stsp goto done;
4404 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4406 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4407 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4408 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4409 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4410 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4414 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4416 e2af0fd1 2019-08-08 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
4417 e2af0fd1 2019-08-08 stsp unlink(a->logmsg_path);
4418 e2af0fd1 2019-08-08 stsp free(a->logmsg_path);
4419 e2af0fd1 2019-08-08 stsp a->logmsg_path = NULL;
4421 76d98825 2019-06-03 stsp free(initial_content);
4422 e0870e44 2019-05-13 stsp free(template);
4424 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4425 3ce1b845 2019-07-15 stsp if (err == NULL) {
4426 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4427 3ce1b845 2019-07-15 stsp if (err) {
4428 3ce1b845 2019-07-15 stsp free(*logmsg);
4429 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4432 33ad4cbe 2019-05-12 jcs return err;
4435 c4296144 2019-05-09 stsp static const struct got_error *
4436 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4438 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4439 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4440 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4441 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4442 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4443 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4444 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4445 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4446 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
4447 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4449 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4450 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4452 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4453 c4296144 2019-05-09 stsp switch (ch) {
4455 c4296144 2019-05-09 stsp logmsg = optarg;
4458 c4296144 2019-05-09 stsp usage_commit();
4459 c4296144 2019-05-09 stsp /* NOTREACHED */
4463 c4296144 2019-05-09 stsp argc -= optind;
4464 c4296144 2019-05-09 stsp argv += optind;
4466 43012d58 2019-07-14 stsp #ifndef PROFILE
4467 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4468 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4469 43012d58 2019-07-14 stsp err(1, "pledge");
4471 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4472 c4296144 2019-05-09 stsp if (cwd == NULL) {
4473 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4474 c4296144 2019-05-09 stsp goto done;
4476 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4477 7d5807f4 2019-07-11 stsp if (error)
4478 7d5807f4 2019-07-11 stsp goto done;
4480 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4481 c4296144 2019-05-09 stsp if (error)
4482 a698f62e 2019-07-25 stsp goto done;
4483 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4484 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4485 c4296144 2019-05-09 stsp goto done;
4488 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4489 916f288c 2019-07-30 stsp worktree);
4490 5c1e53bc 2019-07-28 stsp if (error)
4491 5c1e53bc 2019-07-28 stsp goto done;
4493 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4494 c9956ddf 2019-09-08 stsp if (error)
4495 c9956ddf 2019-09-08 stsp goto done;
4496 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4497 c9956ddf 2019-09-08 stsp gitconfig_path);
4498 c4296144 2019-05-09 stsp if (error != NULL)
4499 c4296144 2019-05-09 stsp goto done;
4501 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4502 aba9c984 2019-09-08 stsp if (error)
4503 aba9c984 2019-09-08 stsp return error;
4506 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4507 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4509 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4510 314a6357 2019-05-13 stsp error = get_editor(&editor);
4512 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4513 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4514 c4296144 2019-05-09 stsp if (error)
4515 c4296144 2019-05-09 stsp goto done;
4517 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4518 087fb88c 2019-08-04 stsp if (error)
4519 087fb88c 2019-08-04 stsp goto done;
4521 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4522 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4523 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4524 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4525 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4526 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4527 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4528 916f288c 2019-07-30 stsp goto done;
4530 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4532 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4533 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4534 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4535 e0870e44 2019-05-13 stsp if (error) {
4536 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
4537 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4538 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
4539 c4296144 2019-05-09 stsp goto done;
4542 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
4543 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
4545 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4546 c4296144 2019-05-09 stsp if (error)
4547 c4296144 2019-05-09 stsp goto done;
4548 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4550 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4552 c4296144 2019-05-09 stsp got_repo_close(repo);
4553 c4296144 2019-05-09 stsp if (worktree)
4554 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4555 c4296144 2019-05-09 stsp free(cwd);
4556 c4296144 2019-05-09 stsp free(id_str);
4557 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4558 e2ba3d07 2019-05-13 stsp free(editor);
4559 aba9c984 2019-09-08 stsp free(author);
4560 234035bc 2019-06-01 stsp return error;
4563 234035bc 2019-06-01 stsp __dead static void
4564 234035bc 2019-06-01 stsp usage_cherrypick(void)
4566 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4570 234035bc 2019-06-01 stsp static const struct got_error *
4571 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4573 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4574 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4575 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4576 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4577 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4578 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4579 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4580 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4581 234035bc 2019-06-01 stsp int ch, did_something = 0;
4583 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4584 234035bc 2019-06-01 stsp switch (ch) {
4586 234035bc 2019-06-01 stsp usage_cherrypick();
4587 234035bc 2019-06-01 stsp /* NOTREACHED */
4591 234035bc 2019-06-01 stsp argc -= optind;
4592 234035bc 2019-06-01 stsp argv += optind;
4594 43012d58 2019-07-14 stsp #ifndef PROFILE
4595 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4596 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4597 43012d58 2019-07-14 stsp err(1, "pledge");
4599 234035bc 2019-06-01 stsp if (argc != 1)
4600 234035bc 2019-06-01 stsp usage_cherrypick();
4602 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4603 234035bc 2019-06-01 stsp if (cwd == NULL) {
4604 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4605 234035bc 2019-06-01 stsp goto done;
4607 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4608 234035bc 2019-06-01 stsp if (error)
4609 234035bc 2019-06-01 stsp goto done;
4611 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4613 234035bc 2019-06-01 stsp if (error != NULL)
4614 234035bc 2019-06-01 stsp goto done;
4616 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4617 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4618 234035bc 2019-06-01 stsp if (error)
4619 234035bc 2019-06-01 stsp goto done;
4621 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4622 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4623 234035bc 2019-06-01 stsp if (error != NULL) {
4624 234035bc 2019-06-01 stsp struct got_reference *ref;
4625 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4626 234035bc 2019-06-01 stsp goto done;
4627 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4628 234035bc 2019-06-01 stsp if (error != NULL)
4629 234035bc 2019-06-01 stsp goto done;
4630 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4631 234035bc 2019-06-01 stsp got_ref_close(ref);
4632 234035bc 2019-06-01 stsp if (error != NULL)
4633 234035bc 2019-06-01 stsp goto done;
4635 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4636 234035bc 2019-06-01 stsp if (error)
4637 234035bc 2019-06-01 stsp goto done;
4639 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4640 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4641 234035bc 2019-06-01 stsp if (error != NULL)
4642 234035bc 2019-06-01 stsp goto done;
4644 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4645 234035bc 2019-06-01 stsp if (error) {
4646 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4647 234035bc 2019-06-01 stsp goto done;
4648 234035bc 2019-06-01 stsp error = NULL;
4650 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4651 234035bc 2019-06-01 stsp goto done;
4654 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4655 234035bc 2019-06-01 stsp if (error)
4656 234035bc 2019-06-01 stsp goto done;
4657 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4658 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4659 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4661 234035bc 2019-06-01 stsp if (error != NULL)
4662 234035bc 2019-06-01 stsp goto done;
4664 234035bc 2019-06-01 stsp if (did_something)
4665 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4667 234035bc 2019-06-01 stsp if (commit)
4668 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4669 234035bc 2019-06-01 stsp free(commit_id_str);
4670 234035bc 2019-06-01 stsp if (head_ref)
4671 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4672 234035bc 2019-06-01 stsp if (worktree)
4673 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4675 234035bc 2019-06-01 stsp got_repo_close(repo);
4676 c4296144 2019-05-09 stsp return error;
4679 5ef14e63 2019-06-02 stsp __dead static void
4680 5ef14e63 2019-06-02 stsp usage_backout(void)
4682 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4686 5ef14e63 2019-06-02 stsp static const struct got_error *
4687 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4689 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4690 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4691 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4692 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4693 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4694 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4695 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4696 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4697 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4699 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4700 5ef14e63 2019-06-02 stsp switch (ch) {
4702 5ef14e63 2019-06-02 stsp usage_backout();
4703 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4707 5ef14e63 2019-06-02 stsp argc -= optind;
4708 5ef14e63 2019-06-02 stsp argv += optind;
4710 43012d58 2019-07-14 stsp #ifndef PROFILE
4711 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4712 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4713 43012d58 2019-07-14 stsp err(1, "pledge");
4715 5ef14e63 2019-06-02 stsp if (argc != 1)
4716 5ef14e63 2019-06-02 stsp usage_backout();
4718 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4719 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4720 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4721 5ef14e63 2019-06-02 stsp goto done;
4723 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4724 5ef14e63 2019-06-02 stsp if (error)
4725 5ef14e63 2019-06-02 stsp goto done;
4727 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4729 5ef14e63 2019-06-02 stsp if (error != NULL)
4730 5ef14e63 2019-06-02 stsp goto done;
4732 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4733 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4734 5ef14e63 2019-06-02 stsp if (error)
4735 5ef14e63 2019-06-02 stsp goto done;
4737 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4738 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4739 5ef14e63 2019-06-02 stsp if (error != NULL) {
4740 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4741 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4742 5ef14e63 2019-06-02 stsp goto done;
4743 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4744 5ef14e63 2019-06-02 stsp if (error != NULL)
4745 5ef14e63 2019-06-02 stsp goto done;
4746 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4747 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4748 5ef14e63 2019-06-02 stsp if (error != NULL)
4749 5ef14e63 2019-06-02 stsp goto done;
4751 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4752 5ef14e63 2019-06-02 stsp if (error)
4753 5ef14e63 2019-06-02 stsp goto done;
4755 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4756 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4757 5ef14e63 2019-06-02 stsp if (error != NULL)
4758 5ef14e63 2019-06-02 stsp goto done;
4760 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4761 5ef14e63 2019-06-02 stsp if (error)
4762 5ef14e63 2019-06-02 stsp goto done;
4764 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4765 5ef14e63 2019-06-02 stsp if (error)
4766 5ef14e63 2019-06-02 stsp goto done;
4767 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4768 5ef14e63 2019-06-02 stsp if (pid == NULL) {
4769 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
4770 5ef14e63 2019-06-02 stsp goto done;
4773 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4774 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
4775 5ef14e63 2019-06-02 stsp if (error != NULL)
4776 5ef14e63 2019-06-02 stsp goto done;
4778 5ef14e63 2019-06-02 stsp if (did_something)
4779 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
4781 5ef14e63 2019-06-02 stsp if (commit)
4782 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
4783 5ef14e63 2019-06-02 stsp free(commit_id_str);
4784 5ef14e63 2019-06-02 stsp if (head_ref)
4785 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
4786 818c7501 2019-07-11 stsp if (worktree)
4787 818c7501 2019-07-11 stsp got_worktree_close(worktree);
4789 818c7501 2019-07-11 stsp got_repo_close(repo);
4790 818c7501 2019-07-11 stsp return error;
4793 818c7501 2019-07-11 stsp __dead static void
4794 818c7501 2019-07-11 stsp usage_rebase(void)
4796 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4797 af54c8f8 2019-07-11 stsp getprogname());
4802 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
4805 0ebf8283 2019-07-24 stsp size_t len;
4807 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
4808 0ebf8283 2019-07-24 stsp if (len > limit)
4809 0ebf8283 2019-07-24 stsp len = limit;
4810 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
4811 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
4813 0ebf8283 2019-07-24 stsp *nl = '\0';
4816 0ebf8283 2019-07-24 stsp static const struct got_error *
4817 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4819 5943eee2 2019-08-13 stsp const struct got_error *err;
4820 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
4821 5943eee2 2019-08-13 stsp const char *s;
4823 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
4825 5943eee2 2019-08-13 stsp return err;
4827 5943eee2 2019-08-13 stsp s = logmsg0;
4828 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
4831 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
4832 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
4833 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4834 5943eee2 2019-08-13 stsp goto done;
4837 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
4839 5943eee2 2019-08-13 stsp free(logmsg0);
4840 5943eee2 2019-08-13 stsp return err;
4843 818c7501 2019-07-11 stsp static const struct got_error *
4844 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
4845 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
4847 818c7501 2019-07-11 stsp const struct got_error *err;
4848 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4850 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
4852 818c7501 2019-07-11 stsp goto done;
4854 ff0d2220 2019-07-11 stsp if (new_id) {
4855 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
4857 ff0d2220 2019-07-11 stsp goto done;
4860 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
4861 ff0d2220 2019-07-11 stsp if (new_id_str)
4862 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
4864 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4866 0ebf8283 2019-07-24 stsp goto done;
4868 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
4869 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4871 818c7501 2019-07-11 stsp free(old_id_str);
4872 818c7501 2019-07-11 stsp free(new_id_str);
4873 818c7501 2019-07-11 stsp return err;
4876 1ee397ad 2019-07-12 stsp static const struct got_error *
4877 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
4879 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
4881 818c7501 2019-07-11 stsp while (path[0] == '/')
4883 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
4885 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
4886 1ee397ad 2019-07-12 stsp return NULL;
4887 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4888 818c7501 2019-07-11 stsp *rebase_status = status;
4889 1ee397ad 2019-07-12 stsp return NULL;
4892 818c7501 2019-07-11 stsp static const struct got_error *
4893 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4894 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
4895 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
4897 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
4898 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
4899 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
4902 818c7501 2019-07-11 stsp static const struct got_error *
4903 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
4904 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4905 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
4906 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4908 ff0d2220 2019-07-11 stsp const struct got_error *error;
4909 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
4910 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
4912 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4913 ff0d2220 2019-07-11 stsp if (error)
4914 ff0d2220 2019-07-11 stsp return error;
4916 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4917 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
4918 ff0d2220 2019-07-11 stsp if (error) {
4919 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4920 ff0d2220 2019-07-11 stsp goto done;
4921 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
4923 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
4924 ff0d2220 2019-07-11 stsp free(new_commit_id);
4927 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
4928 ff0d2220 2019-07-11 stsp return error;
4931 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
4932 64c6d990 2019-07-11 stsp const char *path_prefix;
4933 64c6d990 2019-07-11 stsp size_t len;
4934 8ca9bd68 2019-07-25 stsp int errcode;
4937 64c6d990 2019-07-11 stsp static const struct got_error *
4938 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4939 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
4940 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
4941 64c6d990 2019-07-11 stsp struct got_repository *repo)
4943 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
4945 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4946 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4947 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
4949 64c6d990 2019-07-11 stsp return NULL;
4952 64c6d990 2019-07-11 stsp static const struct got_error *
4953 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
4954 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
4955 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
4957 64c6d990 2019-07-11 stsp const struct got_error *err;
4958 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4959 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
4960 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
4962 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
4963 64c6d990 2019-07-11 stsp return NULL;
4965 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4967 64c6d990 2019-07-11 stsp goto done;
4969 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4971 64c6d990 2019-07-11 stsp goto done;
4973 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
4974 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
4976 64c6d990 2019-07-11 stsp goto done;
4978 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
4979 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
4981 64c6d990 2019-07-11 stsp goto done;
4983 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
4984 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
4985 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
4986 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
4987 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
4988 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
4989 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
4991 64c6d990 2019-07-11 stsp if (tree1)
4992 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
4993 64c6d990 2019-07-11 stsp if (tree2)
4994 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
4995 64c6d990 2019-07-11 stsp if (commit)
4996 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
4997 64c6d990 2019-07-11 stsp if (parent_commit)
4998 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
4999 64c6d990 2019-07-11 stsp return err;
5002 ff0d2220 2019-07-11 stsp static const struct got_error *
5003 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5004 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5005 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5006 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5007 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5009 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5010 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5011 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5012 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5013 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5015 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5017 af61c510 2019-07-19 stsp return err;
5019 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5020 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5022 af61c510 2019-07-19 stsp goto done;
5023 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5024 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5025 af61c510 2019-07-19 stsp if (err) {
5026 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5027 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5028 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5029 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5030 af61c510 2019-07-19 stsp "been reached?!?");
5031 af61c510 2019-07-19 stsp goto done;
5032 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5033 af61c510 2019-07-19 stsp goto done;
5034 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5035 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5037 af61c510 2019-07-19 stsp goto done;
5039 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5040 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5042 af61c510 2019-07-19 stsp goto done;
5044 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5046 af61c510 2019-07-19 stsp goto done;
5047 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5048 af61c510 2019-07-19 stsp commit_id = parent_id;
5052 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5053 af61c510 2019-07-19 stsp return err;
5056 af61c510 2019-07-19 stsp static const struct got_error *
5057 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5059 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5060 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5061 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5062 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5063 818c7501 2019-07-11 stsp char *cwd = NULL;
5064 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5065 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5066 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5067 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5068 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5069 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5070 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5071 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5072 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5073 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5074 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5075 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5077 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5078 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5080 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5081 818c7501 2019-07-11 stsp switch (ch) {
5083 818c7501 2019-07-11 stsp abort_rebase = 1;
5086 818c7501 2019-07-11 stsp continue_rebase = 1;
5089 818c7501 2019-07-11 stsp usage_rebase();
5090 818c7501 2019-07-11 stsp /* NOTREACHED */
5094 818c7501 2019-07-11 stsp argc -= optind;
5095 818c7501 2019-07-11 stsp argv += optind;
5097 43012d58 2019-07-14 stsp #ifndef PROFILE
5098 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5099 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5100 43012d58 2019-07-14 stsp err(1, "pledge");
5102 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5103 818c7501 2019-07-11 stsp usage_rebase();
5104 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5105 818c7501 2019-07-11 stsp if (argc != 0)
5106 818c7501 2019-07-11 stsp usage_rebase();
5107 818c7501 2019-07-11 stsp } else if (argc != 1)
5108 818c7501 2019-07-11 stsp usage_rebase();
5110 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5111 818c7501 2019-07-11 stsp if (cwd == NULL) {
5112 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5113 818c7501 2019-07-11 stsp goto done;
5115 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5116 818c7501 2019-07-11 stsp if (error)
5117 818c7501 2019-07-11 stsp goto done;
5119 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5121 818c7501 2019-07-11 stsp if (error != NULL)
5122 818c7501 2019-07-11 stsp goto done;
5124 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5125 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5126 818c7501 2019-07-11 stsp if (error)
5127 818c7501 2019-07-11 stsp goto done;
5129 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5130 818c7501 2019-07-11 stsp if (error)
5131 818c7501 2019-07-11 stsp goto done;
5133 f6794adc 2019-07-23 stsp if (abort_rebase) {
5134 818c7501 2019-07-11 stsp int did_something;
5135 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5136 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5137 f6794adc 2019-07-23 stsp goto done;
5139 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5140 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5141 3e3a69f1 2019-07-25 stsp worktree, repo);
5142 818c7501 2019-07-11 stsp if (error)
5143 818c7501 2019-07-11 stsp goto done;
5144 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5145 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5146 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5147 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5148 818c7501 2019-07-11 stsp if (error)
5149 818c7501 2019-07-11 stsp goto done;
5150 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5151 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5154 818c7501 2019-07-11 stsp if (continue_rebase) {
5155 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5156 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5157 f6794adc 2019-07-23 stsp goto done;
5159 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5160 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5161 3e3a69f1 2019-07-25 stsp worktree, repo);
5162 818c7501 2019-07-11 stsp if (error)
5163 818c7501 2019-07-11 stsp goto done;
5165 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5166 01757395 2019-07-12 stsp resume_commit_id, repo);
5167 818c7501 2019-07-11 stsp if (error)
5168 818c7501 2019-07-11 stsp goto done;
5170 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5171 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5172 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5173 818c7501 2019-07-11 stsp goto done;
5176 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5177 818c7501 2019-07-11 stsp if (error != NULL)
5178 818c7501 2019-07-11 stsp goto done;
5181 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5182 ff0d2220 2019-07-11 stsp if (error)
5183 ff0d2220 2019-07-11 stsp goto done;
5185 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5186 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5188 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5189 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5190 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5191 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5192 818c7501 2019-07-11 stsp if (error)
5193 818c7501 2019-07-11 stsp goto done;
5194 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5195 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5196 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5197 818c7501 2019-07-11 stsp "with work tree's branch");
5198 818c7501 2019-07-11 stsp goto done;
5201 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5202 a51a74b3 2019-07-27 stsp if (error) {
5203 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5204 a51a74b3 2019-07-27 stsp goto done;
5205 a51a74b3 2019-07-27 stsp error = NULL;
5207 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5208 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5209 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5210 a51a74b3 2019-07-27 stsp goto done;
5212 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5213 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5214 818c7501 2019-07-11 stsp if (error)
5215 818c7501 2019-07-11 stsp goto done;
5218 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5219 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5220 818c7501 2019-07-11 stsp if (error)
5221 818c7501 2019-07-11 stsp goto done;
5223 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5224 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5225 fc66b545 2019-08-12 stsp if (pid == NULL) {
5226 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5227 fc66b545 2019-08-12 stsp int did_something;
5228 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5229 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5230 fc66b545 2019-08-12 stsp &did_something);
5231 fc66b545 2019-08-12 stsp if (error)
5232 fc66b545 2019-08-12 stsp goto done;
5233 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5234 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5236 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5237 fc66b545 2019-08-12 stsp goto done;
5239 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5240 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5241 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5242 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5243 818c7501 2019-07-11 stsp commit = NULL;
5244 818c7501 2019-07-11 stsp if (error)
5245 818c7501 2019-07-11 stsp goto done;
5247 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5248 ff0d2220 2019-07-11 stsp if (continue_rebase)
5249 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5250 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5252 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5253 818c7501 2019-07-11 stsp goto done;
5256 818c7501 2019-07-11 stsp pid = NULL;
5257 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5258 818c7501 2019-07-11 stsp commit_id = qid->id;
5259 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5260 818c7501 2019-07-11 stsp pid = qid;
5262 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5263 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5264 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5265 818c7501 2019-07-11 stsp if (error)
5266 818c7501 2019-07-11 stsp goto done;
5268 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5269 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5273 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5274 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5275 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5276 818c7501 2019-07-11 stsp if (error)
5277 818c7501 2019-07-11 stsp goto done;
5280 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5281 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5282 818c7501 2019-07-11 stsp if (error)
5283 818c7501 2019-07-11 stsp goto done;
5284 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5285 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5287 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5288 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5290 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5291 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5292 818c7501 2019-07-11 stsp free(resume_commit_id);
5293 818c7501 2019-07-11 stsp free(yca_id);
5294 818c7501 2019-07-11 stsp if (commit)
5295 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5296 818c7501 2019-07-11 stsp if (branch)
5297 818c7501 2019-07-11 stsp got_ref_close(branch);
5298 818c7501 2019-07-11 stsp if (new_base_branch)
5299 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5300 818c7501 2019-07-11 stsp if (tmp_branch)
5301 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5302 5ef14e63 2019-06-02 stsp if (worktree)
5303 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5305 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5306 5ef14e63 2019-06-02 stsp return error;
5309 0ebf8283 2019-07-24 stsp __dead static void
5310 0ebf8283 2019-07-24 stsp usage_histedit(void)
5312 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5313 0ebf8283 2019-07-24 stsp getprogname());
5317 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5318 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5319 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5320 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5321 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5323 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5324 0ebf8283 2019-07-24 stsp unsigned char code;
5325 0ebf8283 2019-07-24 stsp const char *name;
5326 0ebf8283 2019-07-24 stsp const char *desc;
5327 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5328 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5329 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5330 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5331 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5332 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5333 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5336 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5337 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5338 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5339 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5340 0ebf8283 2019-07-24 stsp char *logmsg;
5342 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5344 0ebf8283 2019-07-24 stsp static const struct got_error *
5345 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5346 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5348 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5349 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5350 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5353 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5355 0ebf8283 2019-07-24 stsp goto done;
5357 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5359 0ebf8283 2019-07-24 stsp goto done;
5361 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5363 0ebf8283 2019-07-24 stsp goto done;
5365 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5366 0ebf8283 2019-07-24 stsp if (n < 0)
5367 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5369 0ebf8283 2019-07-24 stsp if (commit)
5370 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5371 0ebf8283 2019-07-24 stsp free(id_str);
5372 0ebf8283 2019-07-24 stsp free(logmsg);
5373 0ebf8283 2019-07-24 stsp return err;
5376 0ebf8283 2019-07-24 stsp static const struct got_error *
5377 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5378 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5380 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5381 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5383 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5384 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5386 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5387 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5393 0ebf8283 2019-07-24 stsp return err;
5396 0ebf8283 2019-07-24 stsp static const struct got_error *
5397 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5399 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5402 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5403 0ebf8283 2019-07-24 stsp if (n < 0)
5404 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5406 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5407 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5408 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5409 0ebf8283 2019-07-24 stsp cmd->desc);
5410 0ebf8283 2019-07-24 stsp if (n < 0) {
5411 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5415 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5416 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5417 0ebf8283 2019-07-24 stsp if (n < 0)
5418 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5419 0ebf8283 2019-07-24 stsp return err;
5422 0ebf8283 2019-07-24 stsp static const struct got_error *
5423 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5425 0ebf8283 2019-07-24 stsp static char msg[42];
5428 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5430 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5431 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5433 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5436 0ebf8283 2019-07-24 stsp static const struct got_error *
5437 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5438 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5440 0ebf8283 2019-07-24 stsp const struct got_error *err;
5441 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5442 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5444 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5446 0ebf8283 2019-07-24 stsp return err;
5448 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5450 0ebf8283 2019-07-24 stsp goto done;
5452 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5454 5943eee2 2019-08-13 stsp goto done;
5455 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5456 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5457 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5458 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5459 0ebf8283 2019-07-24 stsp goto done;
5462 0ebf8283 2019-07-24 stsp if (folded_commit)
5463 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5464 0ebf8283 2019-07-24 stsp free(id_str);
5465 5943eee2 2019-08-13 stsp free(folded_logmsg);
5466 0ebf8283 2019-07-24 stsp return err;
5469 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5470 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5472 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5474 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5475 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5476 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5477 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5478 3f9de99f 2019-07-24 stsp folded = prev;
5479 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5482 0ebf8283 2019-07-24 stsp return folded;
5485 0ebf8283 2019-07-24 stsp static const struct got_error *
5486 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5487 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5489 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5490 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5491 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5492 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5494 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5496 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5498 0ebf8283 2019-07-24 stsp return err;
5500 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5501 0ebf8283 2019-07-24 stsp if (folded) {
5502 0ebf8283 2019-07-24 stsp while (folded != hle) {
5503 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5504 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5507 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5508 0ebf8283 2019-07-24 stsp logmsg, repo);
5510 0ebf8283 2019-07-24 stsp goto done;
5511 0ebf8283 2019-07-24 stsp free(logmsg);
5512 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5513 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5517 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5519 0ebf8283 2019-07-24 stsp goto done;
5520 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5522 5943eee2 2019-08-13 stsp goto done;
5523 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5524 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5525 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5526 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5527 0ebf8283 2019-07-24 stsp goto done;
5529 0ebf8283 2019-07-24 stsp free(logmsg);
5530 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5532 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5534 0ebf8283 2019-07-24 stsp goto done;
5536 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5538 0ebf8283 2019-07-24 stsp goto done;
5540 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5541 0ebf8283 2019-07-24 stsp close(fd);
5543 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5545 0ebf8283 2019-07-24 stsp goto done;
5547 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5548 0ebf8283 2019-07-24 stsp if (err) {
5549 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5550 0ebf8283 2019-07-24 stsp goto done;
5551 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5554 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5555 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5556 0ebf8283 2019-07-24 stsp free(logmsg_path);
5557 0ebf8283 2019-07-24 stsp free(logmsg);
5558 5943eee2 2019-08-13 stsp free(orig_logmsg);
5559 0ebf8283 2019-07-24 stsp free(editor);
5560 0ebf8283 2019-07-24 stsp if (commit)
5561 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5562 0ebf8283 2019-07-24 stsp return err;
5565 0ebf8283 2019-07-24 stsp static const struct got_error *
5566 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5567 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5569 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5570 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5571 0ebf8283 2019-07-24 stsp size_t size;
5572 0ebf8283 2019-07-24 stsp ssize_t len;
5573 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5574 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5575 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5576 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5578 0ebf8283 2019-07-24 stsp for (;;) {
5579 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5580 0ebf8283 2019-07-24 stsp if (len == -1) {
5581 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5582 0ebf8283 2019-07-24 stsp if (feof(f))
5584 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5585 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5590 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5592 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5593 0ebf8283 2019-07-24 stsp free(line);
5594 0ebf8283 2019-07-24 stsp line = NULL;
5597 0ebf8283 2019-07-24 stsp cmd = NULL;
5598 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5599 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5600 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5601 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5602 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5605 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5610 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5611 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5614 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5616 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5617 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5618 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5621 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5622 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5626 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5627 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5628 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5632 0ebf8283 2019-07-24 stsp free(line);
5633 0ebf8283 2019-07-24 stsp line = NULL;
5637 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5639 0ebf8283 2019-07-24 stsp *end = '\0';
5641 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5642 0ebf8283 2019-07-24 stsp if (err) {
5643 0ebf8283 2019-07-24 stsp /* override error code */
5644 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5648 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5649 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5650 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5653 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5654 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5655 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5656 0ebf8283 2019-07-24 stsp commit_id = NULL;
5657 0ebf8283 2019-07-24 stsp free(line);
5658 0ebf8283 2019-07-24 stsp line = NULL;
5659 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5662 0ebf8283 2019-07-24 stsp free(line);
5663 0ebf8283 2019-07-24 stsp free(commit_id);
5664 0ebf8283 2019-07-24 stsp return err;
5667 0ebf8283 2019-07-24 stsp static const struct got_error *
5668 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5669 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5671 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5672 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5673 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5674 bfce7f83 2019-07-27 stsp static char msg[80];
5675 bfce7f83 2019-07-27 stsp char *id_str;
5677 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5678 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5679 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5680 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5681 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5683 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5684 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5685 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5688 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5689 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5691 bfce7f83 2019-07-27 stsp return err;
5692 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5693 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5694 bfce7f83 2019-07-27 stsp free(id_str);
5695 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5699 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5700 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5701 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5702 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5704 bfce7f83 2019-07-27 stsp return NULL;
5707 bfce7f83 2019-07-27 stsp static const struct got_error *
5708 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5709 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5710 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5712 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5713 0ebf8283 2019-07-24 stsp char *editor;
5714 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5716 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5718 0ebf8283 2019-07-24 stsp return err;
5720 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5721 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5722 0ebf8283 2019-07-24 stsp goto done;
5725 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5726 0ebf8283 2019-07-24 stsp if (f == NULL) {
5727 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5728 0ebf8283 2019-07-24 stsp goto done;
5730 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5732 bfce7f83 2019-07-27 stsp goto done;
5734 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
5736 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5737 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5738 0ebf8283 2019-07-24 stsp free(editor);
5739 0ebf8283 2019-07-24 stsp return err;
5742 0ebf8283 2019-07-24 stsp static const struct got_error *
5743 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5744 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
5746 0ebf8283 2019-07-24 stsp static const struct got_error *
5747 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
5748 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5750 0ebf8283 2019-07-24 stsp const struct got_error *err;
5751 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5752 0ebf8283 2019-07-24 stsp char *path = NULL;
5754 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
5756 0ebf8283 2019-07-24 stsp return err;
5758 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
5760 0ebf8283 2019-07-24 stsp goto done;
5762 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
5764 0ebf8283 2019-07-24 stsp goto done;
5766 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
5767 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5768 0ebf8283 2019-07-24 stsp goto done;
5772 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
5773 0ebf8283 2019-07-24 stsp if (err) {
5774 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5775 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5776 0ebf8283 2019-07-24 stsp goto done;
5777 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
5778 0ebf8283 2019-07-24 stsp commits, path, repo);
5781 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5782 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5783 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
5784 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
5785 0ebf8283 2019-07-24 stsp free(path);
5786 0ebf8283 2019-07-24 stsp return err;
5789 0ebf8283 2019-07-24 stsp static const struct got_error *
5790 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
5791 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5793 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5794 0ebf8283 2019-07-24 stsp char *path = NULL;
5795 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5796 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5797 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5799 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
5801 0ebf8283 2019-07-24 stsp return err;
5803 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
5804 0ebf8283 2019-07-24 stsp if (f == NULL) {
5805 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5806 0ebf8283 2019-07-24 stsp goto done;
5808 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5809 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5814 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5815 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
5816 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
5817 0ebf8283 2019-07-24 stsp if (n < 0) {
5818 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5824 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5825 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5826 0ebf8283 2019-07-24 stsp free(path);
5827 0ebf8283 2019-07-24 stsp if (commit)
5828 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5829 0ebf8283 2019-07-24 stsp return err;
5833 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
5835 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5837 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
5838 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
5839 bfce7f83 2019-07-27 stsp free(hle);
5843 0ebf8283 2019-07-24 stsp static const struct got_error *
5844 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
5845 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5847 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5848 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5850 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5851 0ebf8283 2019-07-24 stsp if (f == NULL) {
5852 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5853 0ebf8283 2019-07-24 stsp goto done;
5856 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5858 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5859 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5860 0ebf8283 2019-07-24 stsp return err;
5863 0ebf8283 2019-07-24 stsp static const struct got_error *
5864 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5865 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
5866 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5868 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
5869 0ebf8283 2019-07-24 stsp int resp = ' ';
5871 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
5872 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5873 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
5874 0ebf8283 2019-07-24 stsp resp = getchar();
5875 a61a4414 2019-08-07 stsp if (resp == '\n')
5876 a61a4414 2019-08-07 stsp resp = getchar();
5877 426ebf2e 2019-07-25 stsp if (resp == 'c') {
5878 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5879 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
5881 426ebf2e 2019-07-25 stsp if (err) {
5882 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5883 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5885 bfce7f83 2019-07-27 stsp prev_err = err;
5886 426ebf2e 2019-07-25 stsp resp = ' ';
5890 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
5891 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5892 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
5893 0ebf8283 2019-07-24 stsp commits, repo);
5894 426ebf2e 2019-07-25 stsp if (err) {
5895 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5896 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5898 bfce7f83 2019-07-27 stsp prev_err = err;
5899 426ebf2e 2019-07-25 stsp resp = ' ';
5903 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
5904 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5907 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
5910 0ebf8283 2019-07-24 stsp return err;
5913 0ebf8283 2019-07-24 stsp static const struct got_error *
5914 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
5915 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5916 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
5918 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5919 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5920 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5921 3e3a69f1 2019-07-25 stsp branch, repo);
5924 0ebf8283 2019-07-24 stsp static const struct got_error *
5925 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
5926 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5928 0ebf8283 2019-07-24 stsp const struct got_error *err;
5929 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5931 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
5933 0ebf8283 2019-07-24 stsp goto done;
5935 0ebf8283 2019-07-24 stsp if (new_id) {
5936 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
5938 0ebf8283 2019-07-24 stsp goto done;
5941 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
5942 0ebf8283 2019-07-24 stsp if (new_id_str)
5943 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
5945 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5946 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
5947 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
5948 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5949 0ebf8283 2019-07-24 stsp goto done;
5951 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
5953 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5955 0ebf8283 2019-07-24 stsp goto done;
5958 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
5959 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
5960 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
5961 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
5962 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5964 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
5965 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
5966 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5974 0ebf8283 2019-07-24 stsp free(old_id_str);
5975 0ebf8283 2019-07-24 stsp free(new_id_str);
5976 0ebf8283 2019-07-24 stsp return err;
5979 0ebf8283 2019-07-24 stsp static const struct got_error *
5980 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
5981 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5982 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5983 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5985 0ebf8283 2019-07-24 stsp const struct got_error *err;
5986 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
5987 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
5989 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5990 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
5991 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5993 0ebf8283 2019-07-24 stsp return err;
5996 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5998 0ebf8283 2019-07-24 stsp return err;
6000 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6001 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6002 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6003 0ebf8283 2019-07-24 stsp if (err) {
6004 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6005 0ebf8283 2019-07-24 stsp goto done;
6006 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6008 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6009 0ebf8283 2019-07-24 stsp free(new_commit_id);
6012 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6013 0ebf8283 2019-07-24 stsp return err;
6016 0ebf8283 2019-07-24 stsp static const struct got_error *
6017 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6018 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6020 0ebf8283 2019-07-24 stsp const struct got_error *error;
6021 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6023 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6025 0ebf8283 2019-07-24 stsp if (error)
6026 0ebf8283 2019-07-24 stsp return error;
6028 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6029 0ebf8283 2019-07-24 stsp if (error)
6030 0ebf8283 2019-07-24 stsp return error;
6032 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6033 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6034 0ebf8283 2019-07-24 stsp return error;
6037 0ebf8283 2019-07-24 stsp static const struct got_error *
6038 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6040 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6041 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6042 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6043 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6044 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6045 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6046 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6047 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6048 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6049 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6050 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6051 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6052 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6053 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6054 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6055 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6056 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6057 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6058 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6059 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6060 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6062 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6063 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6064 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6066 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6067 0ebf8283 2019-07-24 stsp switch (ch) {
6069 0ebf8283 2019-07-24 stsp abort_edit = 1;
6072 0ebf8283 2019-07-24 stsp continue_edit = 1;
6075 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6078 0ebf8283 2019-07-24 stsp usage_histedit();
6079 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6083 0ebf8283 2019-07-24 stsp argc -= optind;
6084 0ebf8283 2019-07-24 stsp argv += optind;
6086 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6087 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6088 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6089 0ebf8283 2019-07-24 stsp err(1, "pledge");
6091 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6092 0ebf8283 2019-07-24 stsp usage_histedit();
6093 0ebf8283 2019-07-24 stsp if (argc != 0)
6094 0ebf8283 2019-07-24 stsp usage_histedit();
6097 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6098 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6099 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6100 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6101 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6102 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6105 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6106 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6107 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6108 0ebf8283 2019-07-24 stsp goto done;
6110 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6111 0ebf8283 2019-07-24 stsp if (error)
6112 0ebf8283 2019-07-24 stsp goto done;
6114 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6116 0ebf8283 2019-07-24 stsp if (error != NULL)
6117 0ebf8283 2019-07-24 stsp goto done;
6119 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6120 0ebf8283 2019-07-24 stsp if (error)
6121 0ebf8283 2019-07-24 stsp goto done;
6122 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6123 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6124 0ebf8283 2019-07-24 stsp goto done;
6127 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6128 0ebf8283 2019-07-24 stsp if (error)
6129 0ebf8283 2019-07-24 stsp goto done;
6131 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6132 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6133 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6134 3e3a69f1 2019-07-25 stsp worktree, repo);
6135 0ebf8283 2019-07-24 stsp if (error)
6136 0ebf8283 2019-07-24 stsp goto done;
6137 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6138 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6139 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6140 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6141 0ebf8283 2019-07-24 stsp if (error)
6142 0ebf8283 2019-07-24 stsp goto done;
6143 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6144 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6145 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6146 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6147 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6148 0ebf8283 2019-07-24 stsp goto done;
6151 0ebf8283 2019-07-24 stsp if (continue_edit) {
6152 0ebf8283 2019-07-24 stsp char *path;
6154 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6155 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6156 0ebf8283 2019-07-24 stsp goto done;
6159 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6160 0ebf8283 2019-07-24 stsp if (error)
6161 0ebf8283 2019-07-24 stsp goto done;
6163 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6164 0ebf8283 2019-07-24 stsp free(path);
6165 0ebf8283 2019-07-24 stsp if (error)
6166 0ebf8283 2019-07-24 stsp goto done;
6168 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6169 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6170 3e3a69f1 2019-07-25 stsp worktree, repo);
6171 0ebf8283 2019-07-24 stsp if (error)
6172 0ebf8283 2019-07-24 stsp goto done;
6174 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6175 0ebf8283 2019-07-24 stsp if (error)
6176 0ebf8283 2019-07-24 stsp goto done;
6178 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6179 0ebf8283 2019-07-24 stsp head_commit_id);
6180 0ebf8283 2019-07-24 stsp if (error)
6181 0ebf8283 2019-07-24 stsp goto done;
6182 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6183 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6184 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6185 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6186 3aac7cf7 2019-07-25 stsp goto done;
6188 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6189 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6190 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6191 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6192 0ebf8283 2019-07-24 stsp commit = NULL;
6193 0ebf8283 2019-07-24 stsp if (error)
6194 0ebf8283 2019-07-24 stsp goto done;
6196 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6197 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6198 0ebf8283 2019-07-24 stsp goto done;
6201 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6202 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6203 0ebf8283 2019-07-24 stsp if (error != NULL)
6204 0ebf8283 2019-07-24 stsp goto done;
6206 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6207 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6208 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6209 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6210 c7d20a3f 2019-07-30 stsp goto done;
6213 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6214 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6215 bfce7f83 2019-07-27 stsp branch = NULL;
6216 0ebf8283 2019-07-24 stsp if (error)
6217 0ebf8283 2019-07-24 stsp goto done;
6219 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6220 0ebf8283 2019-07-24 stsp head_commit_id);
6221 0ebf8283 2019-07-24 stsp if (error)
6222 0ebf8283 2019-07-24 stsp goto done;
6223 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6224 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6225 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6226 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6227 3aac7cf7 2019-07-25 stsp goto done;
6229 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6230 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6231 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6232 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6233 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6234 0ebf8283 2019-07-24 stsp commit = NULL;
6235 0ebf8283 2019-07-24 stsp if (error)
6236 0ebf8283 2019-07-24 stsp goto done;
6238 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6239 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6240 bfce7f83 2019-07-27 stsp if (error)
6241 bfce7f83 2019-07-27 stsp goto done;
6243 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6244 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6245 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6246 6ba2bea2 2019-07-27 stsp if (error) {
6247 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6248 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6249 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6250 0ebf8283 2019-07-24 stsp goto done;
6253 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6255 6ba2bea2 2019-07-27 stsp if (error) {
6256 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6257 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6258 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6259 0ebf8283 2019-07-24 stsp goto done;
6264 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6266 6ba2bea2 2019-07-27 stsp if (error) {
6267 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6268 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6269 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6270 0ebf8283 2019-07-24 stsp goto done;
6275 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6276 4ec14e60 2019-08-28 hiltjo if (error)
6277 0ebf8283 2019-07-24 stsp goto done;
6279 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6280 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6281 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6282 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6285 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6286 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6287 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6288 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6291 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6292 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6294 0ebf8283 2019-07-24 stsp if (error)
6295 0ebf8283 2019-07-24 stsp goto done;
6299 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6300 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6301 0ebf8283 2019-07-24 stsp if (error)
6302 0ebf8283 2019-07-24 stsp goto done;
6306 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6307 0ebf8283 2019-07-24 stsp hle->commit_id);
6308 0ebf8283 2019-07-24 stsp if (error)
6309 0ebf8283 2019-07-24 stsp goto done;
6310 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6311 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6313 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6314 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6315 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6316 0ebf8283 2019-07-24 stsp if (error)
6317 0ebf8283 2019-07-24 stsp goto done;
6318 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6319 0ebf8283 2019-07-24 stsp commit = NULL;
6321 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6322 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6326 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6327 0ebf8283 2019-07-24 stsp char *id_str;
6328 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6329 0ebf8283 2019-07-24 stsp if (error)
6330 0ebf8283 2019-07-24 stsp goto done;
6331 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6333 0ebf8283 2019-07-24 stsp free(id_str);
6334 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6335 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6336 3e3a69f1 2019-07-25 stsp fileindex);
6337 0ebf8283 2019-07-24 stsp goto done;
6340 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6341 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6342 0ebf8283 2019-07-24 stsp if (error)
6343 0ebf8283 2019-07-24 stsp goto done;
6347 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6348 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6349 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6350 0ebf8283 2019-07-24 stsp if (error)
6351 0ebf8283 2019-07-24 stsp goto done;
6354 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6355 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6356 0ebf8283 2019-07-24 stsp if (error)
6357 0ebf8283 2019-07-24 stsp goto done;
6358 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6359 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6361 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6362 3e3a69f1 2019-07-25 stsp branch, repo);
6364 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6365 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6366 0ebf8283 2019-07-24 stsp free(head_commit_id);
6367 0ebf8283 2019-07-24 stsp free(base_commit_id);
6368 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6369 0ebf8283 2019-07-24 stsp if (commit)
6370 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6371 0ebf8283 2019-07-24 stsp if (branch)
6372 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6373 0ebf8283 2019-07-24 stsp if (tmp_branch)
6374 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6375 0ebf8283 2019-07-24 stsp if (worktree)
6376 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6378 715dc77e 2019-08-03 stsp got_repo_close(repo);
6379 715dc77e 2019-08-03 stsp return error;
6382 715dc77e 2019-08-03 stsp __dead static void
6383 715dc77e 2019-08-03 stsp usage_stage(void)
6385 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6386 f3055044 2019-08-07 stsp "[file-path ...]\n",
6387 715dc77e 2019-08-03 stsp getprogname());
6391 715dc77e 2019-08-03 stsp static const struct got_error *
6392 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6393 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6394 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6396 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6397 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6399 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6400 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6401 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6402 408b4ebc 2019-08-03 stsp return NULL;
6404 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6405 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6406 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6408 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6410 408b4ebc 2019-08-03 stsp return err;
6412 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6413 408b4ebc 2019-08-03 stsp free(id_str);
6414 dc424a06 2019-08-07 stsp return NULL;
6417 dc424a06 2019-08-07 stsp static const struct got_error *
6418 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6420 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6421 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6422 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6423 715dc77e 2019-08-03 stsp char *cwd = NULL;
6424 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6425 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6426 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6427 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6428 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6429 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6431 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6433 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6434 715dc77e 2019-08-03 stsp switch (ch) {
6436 408b4ebc 2019-08-03 stsp list_stage = 1;
6439 dc424a06 2019-08-07 stsp pflag = 1;
6442 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6445 715dc77e 2019-08-03 stsp usage_stage();
6446 715dc77e 2019-08-03 stsp /* NOTREACHED */
6450 715dc77e 2019-08-03 stsp argc -= optind;
6451 715dc77e 2019-08-03 stsp argv += optind;
6453 715dc77e 2019-08-03 stsp #ifndef PROFILE
6454 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6455 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6456 715dc77e 2019-08-03 stsp err(1, "pledge");
6458 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6459 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6460 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6461 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6463 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6464 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6465 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6466 715dc77e 2019-08-03 stsp goto done;
6469 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6470 715dc77e 2019-08-03 stsp if (error)
6471 715dc77e 2019-08-03 stsp goto done;
6473 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6475 715dc77e 2019-08-03 stsp if (error != NULL)
6476 715dc77e 2019-08-03 stsp goto done;
6478 dc424a06 2019-08-07 stsp if (patch_script_path) {
6479 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6480 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6481 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6482 dc424a06 2019-08-07 stsp patch_script_path);
6483 dc424a06 2019-08-07 stsp goto done;
6486 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6487 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6488 715dc77e 2019-08-03 stsp if (error)
6489 715dc77e 2019-08-03 stsp goto done;
6491 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6492 6d022e97 2019-08-04 stsp if (error)
6493 6d022e97 2019-08-04 stsp goto done;
6495 6d022e97 2019-08-04 stsp if (list_stage)
6496 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6497 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6499 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6500 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6501 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6502 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6503 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6506 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6507 2e1f37b0 2019-08-08 stsp error == NULL)
6508 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6510 ad493afc 2019-08-03 stsp got_repo_close(repo);
6511 ad493afc 2019-08-03 stsp if (worktree)
6512 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6513 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6514 ad493afc 2019-08-03 stsp free((char *)pe->path);
6515 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6516 ad493afc 2019-08-03 stsp free(cwd);
6517 ad493afc 2019-08-03 stsp return error;
6520 ad493afc 2019-08-03 stsp __dead static void
6521 ad493afc 2019-08-03 stsp usage_unstage(void)
6523 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6524 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6525 ad493afc 2019-08-03 stsp getprogname());
6530 ad493afc 2019-08-03 stsp static const struct got_error *
6531 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6533 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6534 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6535 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6536 ad493afc 2019-08-03 stsp char *cwd = NULL;
6537 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6538 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6539 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6540 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6541 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6542 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6544 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6546 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6547 ad493afc 2019-08-03 stsp switch (ch) {
6549 2e1f37b0 2019-08-08 stsp pflag = 1;
6552 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6555 ad493afc 2019-08-03 stsp usage_unstage();
6556 ad493afc 2019-08-03 stsp /* NOTREACHED */
6560 ad493afc 2019-08-03 stsp argc -= optind;
6561 ad493afc 2019-08-03 stsp argv += optind;
6563 ad493afc 2019-08-03 stsp #ifndef PROFILE
6564 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6565 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6566 ad493afc 2019-08-03 stsp err(1, "pledge");
6568 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6569 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6571 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6572 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6573 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6574 ad493afc 2019-08-03 stsp goto done;
6577 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6578 ad493afc 2019-08-03 stsp if (error)
6579 ad493afc 2019-08-03 stsp goto done;
6581 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6583 ad493afc 2019-08-03 stsp if (error != NULL)
6584 ad493afc 2019-08-03 stsp goto done;
6586 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
6587 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6588 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
6589 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
6590 2e1f37b0 2019-08-08 stsp patch_script_path);
6591 2e1f37b0 2019-08-08 stsp goto done;
6595 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6596 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
6597 ad493afc 2019-08-03 stsp if (error)
6598 ad493afc 2019-08-03 stsp goto done;
6600 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6601 ad493afc 2019-08-03 stsp if (error)
6602 ad493afc 2019-08-03 stsp goto done;
6604 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6605 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
6606 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
6607 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6609 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6610 2e1f37b0 2019-08-08 stsp error == NULL)
6611 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6613 0ebf8283 2019-07-24 stsp got_repo_close(repo);
6614 715dc77e 2019-08-03 stsp if (worktree)
6615 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
6616 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6617 715dc77e 2019-08-03 stsp free((char *)pe->path);
6618 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
6619 715dc77e 2019-08-03 stsp free(cwd);
6620 01073a5d 2019-08-22 stsp return error;
6623 01073a5d 2019-08-22 stsp __dead static void
6624 01073a5d 2019-08-22 stsp usage_cat(void)
6626 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6627 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
6631 01073a5d 2019-08-22 stsp static const struct got_error *
6632 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6634 01073a5d 2019-08-22 stsp const struct got_error *err;
6635 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
6637 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
6639 01073a5d 2019-08-22 stsp return err;
6641 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6642 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
6643 01073a5d 2019-08-22 stsp return err;
6646 01073a5d 2019-08-22 stsp static const struct got_error *
6647 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6649 01073a5d 2019-08-22 stsp const struct got_error *err;
6650 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
6651 01073a5d 2019-08-22 stsp const struct got_tree_entries *entries;
6652 01073a5d 2019-08-22 stsp struct got_tree_entry *te;
6654 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
6656 01073a5d 2019-08-22 stsp return err;
6658 01073a5d 2019-08-22 stsp entries = got_object_tree_get_entries(tree);
6659 01073a5d 2019-08-22 stsp te = SIMPLEQ_FIRST(&entries->head);
6660 01073a5d 2019-08-22 stsp while (te) {
6661 01073a5d 2019-08-22 stsp char *id_str;
6662 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
6664 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, te->id);
6667 01073a5d 2019-08-22 stsp fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6668 01073a5d 2019-08-22 stsp free(id_str);
6669 01073a5d 2019-08-22 stsp te = SIMPLEQ_NEXT(te, entry);
6672 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
6673 01073a5d 2019-08-22 stsp return err;
6676 01073a5d 2019-08-22 stsp static const struct got_error *
6677 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6679 01073a5d 2019-08-22 stsp const struct got_error *err;
6680 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
6681 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
6682 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
6683 01073a5d 2019-08-22 stsp char *id_str = NULL;
6684 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
6686 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
6688 01073a5d 2019-08-22 stsp return err;
6690 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6692 01073a5d 2019-08-22 stsp goto done;
6694 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6695 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6696 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
6697 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
6698 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6699 01073a5d 2019-08-22 stsp char *pid_str;
6700 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
6702 01073a5d 2019-08-22 stsp goto done;
6703 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6704 01073a5d 2019-08-22 stsp free(pid_str);
6706 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6707 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6708 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
6710 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6711 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6712 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
6714 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
6715 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
6716 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
6718 01073a5d 2019-08-22 stsp free(id_str);
6719 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
6720 01073a5d 2019-08-22 stsp return err;
6723 01073a5d 2019-08-22 stsp static const struct got_error *
6724 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6726 01073a5d 2019-08-22 stsp const struct got_error *err;
6727 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
6728 01073a5d 2019-08-22 stsp char *id_str = NULL;
6729 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
6731 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
6733 01073a5d 2019-08-22 stsp return err;
6735 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
6737 01073a5d 2019-08-22 stsp goto done;
6739 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
6741 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
6742 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
6743 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6744 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
6746 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
6747 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6748 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
6750 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
6751 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6752 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
6754 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
6755 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6756 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
6762 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
6763 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
6765 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
6766 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
6767 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
6769 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
6770 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
6771 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
6773 01073a5d 2019-08-22 stsp free(id_str);
6774 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
6775 01073a5d 2019-08-22 stsp return err;
6778 01073a5d 2019-08-22 stsp static const struct got_error *
6779 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
6781 01073a5d 2019-08-22 stsp const struct got_error *error;
6782 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
6783 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
6784 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
6785 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
6786 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
6787 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
6789 01073a5d 2019-08-22 stsp #ifndef PROFILE
6790 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6791 01073a5d 2019-08-22 stsp NULL) == -1)
6792 01073a5d 2019-08-22 stsp err(1, "pledge");
6795 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
6796 01073a5d 2019-08-22 stsp switch (ch) {
6798 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
6801 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6802 01073a5d 2019-08-22 stsp if (repo_path == NULL)
6803 01073a5d 2019-08-22 stsp err(1, "-r option");
6804 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6807 896e9b6f 2019-08-26 stsp force_path = 1;
6810 01073a5d 2019-08-22 stsp usage_cat();
6811 01073a5d 2019-08-22 stsp /* NOTREACHED */
6815 01073a5d 2019-08-22 stsp argc -= optind;
6816 01073a5d 2019-08-22 stsp argv += optind;
6818 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
6819 01073a5d 2019-08-22 stsp if (cwd == NULL) {
6820 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
6821 01073a5d 2019-08-22 stsp goto done;
6823 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6824 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6825 01073a5d 2019-08-22 stsp goto done;
6826 01073a5d 2019-08-22 stsp if (worktree) {
6827 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6828 01073a5d 2019-08-22 stsp repo_path = strdup(
6829 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
6830 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6831 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
6832 01073a5d 2019-08-22 stsp goto done;
6837 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6838 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
6839 01073a5d 2019-08-22 stsp if (repo_path == NULL)
6840 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
6843 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6844 01073a5d 2019-08-22 stsp free(repo_path);
6845 01073a5d 2019-08-22 stsp if (error != NULL)
6846 01073a5d 2019-08-22 stsp goto done;
6848 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6849 896e9b6f 2019-08-26 stsp if (error)
6850 896e9b6f 2019-08-26 stsp goto done;
6852 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
6853 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
6854 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
6855 01073a5d 2019-08-22 stsp if (error)
6856 01073a5d 2019-08-22 stsp goto done;
6858 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
6859 896e9b6f 2019-08-26 stsp if (force_path) {
6860 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
6862 896e9b6f 2019-08-26 stsp if (error)
6865 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
6866 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
6867 896e9b6f 2019-08-26 stsp if (error) {
6868 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
6869 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
6871 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
6872 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
6873 896e9b6f 2019-08-26 stsp if (error)
6878 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
6879 01073a5d 2019-08-22 stsp if (error)
6882 01073a5d 2019-08-22 stsp switch (obj_type) {
6883 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
6884 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
6886 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
6887 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
6889 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
6890 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
6892 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
6893 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
6896 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
6899 01073a5d 2019-08-22 stsp if (error)
6901 01073a5d 2019-08-22 stsp free(label);
6902 01073a5d 2019-08-22 stsp label = NULL;
6904 01073a5d 2019-08-22 stsp id = NULL;
6908 01073a5d 2019-08-22 stsp free(label);
6910 896e9b6f 2019-08-26 stsp free(commit_id);
6911 01073a5d 2019-08-22 stsp if (worktree)
6912 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
6913 01073a5d 2019-08-22 stsp if (repo) {
6914 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
6915 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
6916 01073a5d 2019-08-22 stsp if (error == NULL)
6917 01073a5d 2019-08-22 stsp error = repo_error;
6919 0ebf8283 2019-07-24 stsp return error;
