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 8e158b01 2019-09-22 stsp free(logmsg);
679 3ce1b845 2019-07-15 stsp error = collect_import_msg(&logmsg, editor, path_dir, refname);
684 3ce1b845 2019-07-15 stsp if (unveil(path_dir, "r") != 0)
685 3ce1b845 2019-07-15 stsp return got_error_from_errno2("unveil", path_dir);
687 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
691 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
692 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
696 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
700 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
704 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
708 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
709 3ce1b845 2019-07-15 stsp if (error) {
710 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
713 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
714 3ce1b845 2019-07-15 stsp branch_ref);
718 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
723 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
724 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
726 8e158b01 2019-09-22 stsp free(logmsg);
727 2c7829a4 2019-06-17 stsp free(repo_path);
728 3ce1b845 2019-07-15 stsp free(editor);
729 3ce1b845 2019-07-15 stsp free(refname);
730 3ce1b845 2019-07-15 stsp free(new_commit_id);
731 3ce1b845 2019-07-15 stsp free(id_str);
732 aba9c984 2019-09-08 stsp free(author);
733 c9956ddf 2019-09-08 stsp free(gitconfig_path);
734 3ce1b845 2019-07-15 stsp if (branch_ref)
735 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
736 3ce1b845 2019-07-15 stsp if (head_ref)
737 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
738 2c7829a4 2019-06-17 stsp return error;
741 4ed7e80c 2018-05-20 stsp __dead static void
742 c09a553d 2018-03-12 stsp usage_checkout(void)
744 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
745 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
749 1ee397ad 2019-07-12 stsp static const struct got_error *
750 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
752 92a684f4 2018-03-12 stsp char *worktree_path = arg;
754 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
755 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
756 1ee397ad 2019-07-12 stsp return NULL;
758 92a684f4 2018-03-12 stsp while (path[0] == '/')
761 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
762 1ee397ad 2019-07-12 stsp return NULL;
765 99437157 2018-11-11 stsp static const struct got_error *
766 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
768 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
769 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
770 99437157 2018-11-11 stsp return NULL;
773 8069f636 2019-01-12 stsp static const struct got_error *
774 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
775 024e9686 2019-05-14 stsp struct got_object_id *base_commit_id, struct got_repository *repo)
777 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
778 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
780 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
781 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
783 36a38700 2019-05-10 stsp return err;
785 d5bea539 2019-05-13 stsp if (yca_id == NULL)
786 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
789 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
790 d5bea539 2019-05-13 stsp * and the work tree's base commit.
792 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
794 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
802 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
803 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
804 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
806 d5bea539 2019-05-13 stsp if (got_object_id_cmp(commit_id, yca_id) != 0 &&
807 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
808 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
810 d5bea539 2019-05-13 stsp free(yca_id);
811 d5bea539 2019-05-13 stsp return NULL;
814 a367ff0f 2019-05-14 stsp static const struct got_error *
815 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
816 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
817 a51a74b3 2019-07-27 stsp struct got_repository *repo)
819 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
820 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
821 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
822 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
824 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
828 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
829 a51a74b3 2019-07-27 stsp is_same_branch = 1;
832 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
833 a51a74b3 2019-07-27 stsp is_same_branch = 1;
837 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
841 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
842 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
847 a367ff0f 2019-05-14 stsp struct got_object_id *id;
848 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
850 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
851 a367ff0f 2019-05-14 stsp err = NULL;
853 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
855 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
856 6fb7cd11 2019-08-22 stsp repo, check_cancelled, NULL);
862 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
864 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
865 a367ff0f 2019-05-14 stsp is_same_branch = 1;
872 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
873 a367ff0f 2019-05-14 stsp free(head_commit_id);
874 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
875 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
876 04f57cb3 2019-07-25 stsp return err;
879 04f57cb3 2019-07-25 stsp static const struct got_error *
880 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
881 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
883 04f57cb3 2019-07-25 stsp const struct got_error *err;
884 04f57cb3 2019-07-25 stsp struct got_reference *ref;
885 303e2782 2019-08-09 stsp struct got_tag_object *tag;
887 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
888 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
889 303e2782 2019-08-09 stsp if (err == NULL) {
890 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
891 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
892 303e2782 2019-08-09 stsp if (*commit_id == NULL)
893 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
894 303e2782 2019-08-09 stsp got_object_tag_close(tag);
895 303e2782 2019-08-09 stsp return err;
896 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
897 303e2782 2019-08-09 stsp return err;
899 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
900 04f57cb3 2019-07-25 stsp if (err == NULL) {
901 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
902 04f57cb3 2019-07-25 stsp got_ref_close(ref);
904 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
905 04f57cb3 2019-07-25 stsp return err;
906 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
907 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
909 a367ff0f 2019-05-14 stsp return err;
912 4ed7e80c 2018-05-20 stsp static const struct got_error *
913 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
915 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
916 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
917 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
918 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
919 c09a553d 2018-03-12 stsp char *repo_path = NULL;
920 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
921 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
922 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
923 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
924 72151b04 2019-05-11 stsp int ch, same_path_prefix;
925 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
927 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
929 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
930 0bb8a95e 2018-03-12 stsp switch (ch) {
932 08573d5b 2019-05-14 stsp branch_name = optarg;
935 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
936 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
937 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
940 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
943 2deda0b9 2019-03-07 stsp usage_checkout();
944 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
948 0bb8a95e 2018-03-12 stsp argc -= optind;
949 0bb8a95e 2018-03-12 stsp argv += optind;
951 6715a751 2018-03-16 stsp #ifndef PROFILE
952 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
953 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
954 c09a553d 2018-03-12 stsp err(1, "pledge");
956 0bb8a95e 2018-03-12 stsp if (argc == 1) {
957 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
958 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
959 76089277 2018-04-01 stsp if (repo_path == NULL)
960 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
961 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
962 76089277 2018-04-01 stsp if (cwd == NULL) {
963 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
966 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
967 230a42bd 2019-05-11 jcs base = basename(path_prefix);
968 230a42bd 2019-05-11 jcs if (base == NULL) {
969 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
970 230a42bd 2019-05-11 jcs path_prefix);
974 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
975 230a42bd 2019-05-11 jcs if (base == NULL) {
976 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
981 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
982 c09a553d 2018-03-12 stsp if (dotgit)
983 c09a553d 2018-03-12 stsp *dotgit = '\0';
984 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
985 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
990 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
991 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
992 76089277 2018-04-01 stsp if (repo_path == NULL) {
993 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
996 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
997 76089277 2018-04-01 stsp if (worktree_path == NULL) {
998 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
999 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1001 b4b3a7dd 2019-07-22 stsp goto done;
1003 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1004 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1005 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1006 b4b3a7dd 2019-07-22 stsp goto done;
1010 c09a553d 2018-03-12 stsp usage_checkout();
1012 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1013 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1015 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1016 c09a553d 2018-03-12 stsp if (error != NULL)
1017 c02c541e 2019-03-29 stsp goto done;
1019 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1020 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1021 c530dc23 2019-07-23 stsp if (error) {
1022 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1023 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1024 c530dc23 2019-07-23 stsp goto done;
1025 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
1026 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1027 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1028 c530dc23 2019-07-23 stsp goto done;
1032 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1033 c02c541e 2019-03-29 stsp if (error)
1034 c09a553d 2018-03-12 stsp goto done;
1036 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1037 c09a553d 2018-03-12 stsp if (error != NULL)
1038 c09a553d 2018-03-12 stsp goto done;
1040 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1041 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1042 c09a553d 2018-03-12 stsp goto done;
1044 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1045 c09a553d 2018-03-12 stsp if (error != NULL)
1046 c09a553d 2018-03-12 stsp goto done;
1048 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1049 e5dc7198 2018-12-29 stsp path_prefix);
1050 e5dc7198 2018-12-29 stsp if (error != NULL)
1051 e5dc7198 2018-12-29 stsp goto done;
1052 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1053 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1054 49520a32 2018-12-29 stsp goto done;
1057 8069f636 2019-01-12 stsp if (commit_id_str) {
1058 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1059 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1060 30837e32 2019-07-25 stsp if (error)
1061 8069f636 2019-01-12 stsp goto done;
1062 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1063 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1064 8069f636 2019-01-12 stsp if (error != NULL) {
1065 8069f636 2019-01-12 stsp free(commit_id);
1066 8069f636 2019-01-12 stsp goto done;
1068 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1069 45d344f6 2019-05-14 stsp if (error)
1070 45d344f6 2019-05-14 stsp goto done;
1071 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1072 8069f636 2019-01-12 stsp commit_id);
1073 8069f636 2019-01-12 stsp free(commit_id);
1074 8069f636 2019-01-12 stsp if (error)
1075 8069f636 2019-01-12 stsp goto done;
1078 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1079 f2ea84fa 2019-07-27 stsp if (error)
1080 f2ea84fa 2019-07-27 stsp goto done;
1081 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1082 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1083 c09a553d 2018-03-12 stsp if (error != NULL)
1084 c09a553d 2018-03-12 stsp goto done;
1086 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1089 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1090 8069f636 2019-01-12 stsp free(commit_id_str);
1091 76089277 2018-04-01 stsp free(repo_path);
1092 507dc3bb 2018-12-29 stsp free(worktree_path);
1093 507dc3bb 2018-12-29 stsp return error;
1096 507dc3bb 2018-12-29 stsp __dead static void
1097 507dc3bb 2018-12-29 stsp usage_update(void)
1099 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1100 507dc3bb 2018-12-29 stsp getprogname());
1104 1ee397ad 2019-07-12 stsp static const struct got_error *
1105 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1107 784955db 2019-01-12 stsp int *did_something = arg;
1109 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1110 1ee397ad 2019-07-12 stsp return NULL;
1112 1545c615 2019-02-10 stsp *did_something = 1;
1114 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1115 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1116 1ee397ad 2019-07-12 stsp return NULL;
1118 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1120 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1121 1ee397ad 2019-07-12 stsp return NULL;
1124 be7061eb 2018-12-30 stsp static const struct got_error *
1125 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1126 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1127 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1129 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1130 a1fb16d8 2019-05-24 stsp char *base_id_str;
1131 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1133 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1134 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1135 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1136 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1137 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1138 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1139 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1142 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1143 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree), repo);
1144 a1fb16d8 2019-05-24 stsp if (err) {
1145 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1146 a1fb16d8 2019-05-24 stsp return err;
1147 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1149 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1150 a1fb16d8 2019-05-24 stsp return NULL;
1152 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1153 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1154 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1156 a1fb16d8 2019-05-24 stsp return err;
1157 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1158 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1159 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1160 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1161 0ebf8283 2019-07-24 stsp return NULL;
1164 0ebf8283 2019-07-24 stsp static const struct got_error *
1165 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1167 0ebf8283 2019-07-24 stsp const struct got_error *err;
1168 0ebf8283 2019-07-24 stsp int in_progress;
1170 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1172 0ebf8283 2019-07-24 stsp return err;
1173 0ebf8283 2019-07-24 stsp if (in_progress)
1174 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1176 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1178 0ebf8283 2019-07-24 stsp return err;
1179 0ebf8283 2019-07-24 stsp if (in_progress)
1180 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1182 a1fb16d8 2019-05-24 stsp return NULL;
1185 a5edda0a 2019-07-27 stsp static const struct got_error *
1186 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1187 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1189 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1190 a5edda0a 2019-07-27 stsp char *path;
1193 a5edda0a 2019-07-27 stsp if (argc == 0) {
1194 a5edda0a 2019-07-27 stsp path = strdup("");
1195 a5edda0a 2019-07-27 stsp if (path == NULL)
1196 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1197 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1200 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1201 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1204 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1205 a5edda0a 2019-07-27 stsp if (err) {
1206 a5edda0a 2019-07-27 stsp free(path);
1211 a5edda0a 2019-07-27 stsp return err;
1214 a1fb16d8 2019-05-24 stsp static const struct got_error *
1215 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1217 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1218 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1219 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1220 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1221 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1222 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1223 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1224 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1225 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1226 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1227 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1229 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1231 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1232 507dc3bb 2018-12-29 stsp switch (ch) {
1234 024e9686 2019-05-14 stsp branch_name = optarg;
1237 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1238 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1239 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1242 2deda0b9 2019-03-07 stsp usage_update();
1243 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1247 507dc3bb 2018-12-29 stsp argc -= optind;
1248 507dc3bb 2018-12-29 stsp argv += optind;
1250 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1251 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1252 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1253 507dc3bb 2018-12-29 stsp err(1, "pledge");
1255 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1256 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1257 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1258 c4cdcb68 2019-04-03 stsp goto done;
1260 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1261 7d5807f4 2019-07-11 stsp if (error)
1262 7d5807f4 2019-07-11 stsp goto done;
1264 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1265 f2ea84fa 2019-07-27 stsp if (error)
1266 f2ea84fa 2019-07-27 stsp goto done;
1268 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1270 507dc3bb 2018-12-29 stsp if (error != NULL)
1271 507dc3bb 2018-12-29 stsp goto done;
1273 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1274 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1275 087fb88c 2019-08-04 stsp if (error)
1276 087fb88c 2019-08-04 stsp goto done;
1278 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1279 0266afb7 2019-01-04 stsp if (error)
1280 0266afb7 2019-01-04 stsp goto done;
1282 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1283 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1284 024e9686 2019-05-14 stsp if (error != NULL)
1285 024e9686 2019-05-14 stsp goto done;
1286 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1287 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1288 9c4b8182 2019-01-02 stsp if (error != NULL)
1289 9c4b8182 2019-01-02 stsp goto done;
1290 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1291 507dc3bb 2018-12-29 stsp if (error != NULL)
1292 507dc3bb 2018-12-29 stsp goto done;
1294 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1295 04f57cb3 2019-07-25 stsp free(commit_id_str);
1296 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1297 30837e32 2019-07-25 stsp if (error)
1298 a297e751 2019-07-11 stsp goto done;
1299 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1300 a297e751 2019-07-11 stsp if (error)
1301 507dc3bb 2018-12-29 stsp goto done;
1304 a1fb16d8 2019-05-24 stsp if (branch_name) {
1305 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1306 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1307 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1309 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1310 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1311 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1312 024e9686 2019-05-14 stsp goto done;
1314 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1315 024e9686 2019-05-14 stsp if (error)
1316 024e9686 2019-05-14 stsp goto done;
1317 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id, head_commit_id, repo);
1318 a367ff0f 2019-05-14 stsp free(head_commit_id);
1319 024e9686 2019-05-14 stsp if (error != NULL)
1320 024e9686 2019-05-14 stsp goto done;
1321 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1322 a367ff0f 2019-05-14 stsp if (error)
1323 a367ff0f 2019-05-14 stsp goto done;
1324 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1325 024e9686 2019-05-14 stsp if (error)
1326 024e9686 2019-05-14 stsp goto done;
1328 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1329 024e9686 2019-05-14 stsp got_worktree_get_base_commit_id(worktree), repo);
1330 a367ff0f 2019-05-14 stsp if (error != NULL) {
1331 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1332 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1333 024e9686 2019-05-14 stsp goto done;
1335 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1336 a367ff0f 2019-05-14 stsp if (error)
1337 a367ff0f 2019-05-14 stsp goto done;
1340 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1341 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1342 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1343 507dc3bb 2018-12-29 stsp commit_id);
1344 507dc3bb 2018-12-29 stsp if (error)
1345 507dc3bb 2018-12-29 stsp goto done;
1348 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1349 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1350 507dc3bb 2018-12-29 stsp if (error != NULL)
1351 507dc3bb 2018-12-29 stsp goto done;
1353 784955db 2019-01-12 stsp if (did_something)
1354 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1356 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1358 c09a553d 2018-03-12 stsp free(worktree_path);
1359 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1360 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1361 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1362 507dc3bb 2018-12-29 stsp free(commit_id);
1363 9c4b8182 2019-01-02 stsp free(commit_id_str);
1364 c09a553d 2018-03-12 stsp return error;
1367 f42b1b34 2018-03-12 stsp static const struct got_error *
1368 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1369 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1371 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1372 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1374 44392932 2019-08-25 stsp if (blob_id1) {
1375 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1377 44392932 2019-08-25 stsp goto done;
1380 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1382 44392932 2019-08-25 stsp goto done;
1384 44392932 2019-08-25 stsp while (path[0] == '/')
1386 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1389 44392932 2019-08-25 stsp if (blob1)
1390 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1391 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1392 44392932 2019-08-25 stsp return err;
1395 44392932 2019-08-25 stsp static const struct got_error *
1396 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1397 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1399 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1400 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1401 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1403 44392932 2019-08-25 stsp if (tree_id1) {
1404 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1406 44392932 2019-08-25 stsp goto done;
1409 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1411 0f2b3dca 2018-12-22 stsp goto done;
1413 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1414 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1415 44392932 2019-08-25 stsp while (path[0] == '/')
1417 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1418 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1420 79109fed 2018-03-27 stsp if (tree1)
1421 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1422 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
1423 44392932 2019-08-25 stsp return err;
1426 44392932 2019-08-25 stsp static const struct got_error *
1427 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1428 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1430 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1431 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1432 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1433 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1434 44392932 2019-08-25 stsp struct got_object_qid *qid;
1436 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1437 44392932 2019-08-25 stsp if (qid != NULL) {
1438 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1441 44392932 2019-08-25 stsp return err;
1444 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1445 44392932 2019-08-25 stsp int obj_type;
1446 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1448 44392932 2019-08-25 stsp goto done;
1449 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1450 44392932 2019-08-25 stsp if (err) {
1451 44392932 2019-08-25 stsp free(obj_id2);
1452 44392932 2019-08-25 stsp goto done;
1454 44392932 2019-08-25 stsp if (pcommit) {
1455 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1456 44392932 2019-08-25 stsp qid->id, path);
1457 44392932 2019-08-25 stsp if (err) {
1458 44392932 2019-08-25 stsp free(obj_id2);
1459 44392932 2019-08-25 stsp goto done;
1461 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1462 44392932 2019-08-25 stsp if (err) {
1463 44392932 2019-08-25 stsp free(obj_id2);
1464 44392932 2019-08-25 stsp goto done;
1467 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1468 44392932 2019-08-25 stsp if (err) {
1469 44392932 2019-08-25 stsp free(obj_id2);
1470 44392932 2019-08-25 stsp goto done;
1472 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1473 44392932 2019-08-25 stsp switch (obj_type) {
1474 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1475 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1478 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1479 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1483 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1486 44392932 2019-08-25 stsp free(obj_id1);
1487 44392932 2019-08-25 stsp free(obj_id2);
1489 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1490 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1492 44392932 2019-08-25 stsp goto done;
1493 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1494 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1496 44392932 2019-08-25 stsp goto done;
1497 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1498 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, repo);
1502 0f2b3dca 2018-12-22 stsp free(id_str1);
1503 0f2b3dca 2018-12-22 stsp free(id_str2);
1504 44392932 2019-08-25 stsp if (pcommit)
1505 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1506 79109fed 2018-03-27 stsp return err;
1509 4bb494d5 2018-06-16 stsp static char *
1510 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1512 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1513 09867e48 2019-08-13 stsp char *p, *s;
1515 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1516 09867e48 2019-08-13 stsp if (tm == NULL)
1517 09867e48 2019-08-13 stsp return NULL;
1518 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1519 09867e48 2019-08-13 stsp if (s == NULL)
1520 09867e48 2019-08-13 stsp return NULL;
1521 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1523 6c281f94 2018-06-11 stsp *p = '\0';
1527 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1529 79109fed 2018-03-27 stsp static const struct got_error *
1530 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1531 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1532 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1534 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1535 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1536 6c281f94 2018-06-11 stsp char datebuf[26];
1537 45d799e2 2018-12-23 stsp time_t committer_time;
1538 45d799e2 2018-12-23 stsp const char *author, *committer;
1539 199a4027 2019-02-02 stsp char *refs_str = NULL;
1540 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1542 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1544 199a4027 2019-02-02 stsp const char *name;
1545 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1548 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1549 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1551 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1552 199a4027 2019-02-02 stsp name += 5;
1553 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1555 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1556 e34f9ed6 2019-02-02 stsp name += 6;
1557 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1558 141c2bff 2019-02-04 stsp name += 8;
1559 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1560 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1561 5d844a1e 2019-08-13 stsp if (err) {
1562 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1563 5d844a1e 2019-08-13 stsp return err;
1564 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1565 5d844a1e 2019-08-13 stsp err = NULL;
1566 5d844a1e 2019-08-13 stsp tag = NULL;
1569 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1570 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1572 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1573 a436ad14 2019-08-13 stsp if (cmp != 0)
1575 199a4027 2019-02-02 stsp s = refs_str;
1576 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1577 199a4027 2019-02-02 stsp name) == -1) {
1578 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1580 34ca4898 2019-08-13 stsp return err;
1584 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1586 8bf5b3c9 2018-03-17 stsp return err;
1588 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1589 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1590 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1591 832c249c 2018-06-10 stsp free(id_str);
1592 d3d493d7 2019-02-21 stsp id_str = NULL;
1593 d3d493d7 2019-02-21 stsp free(refs_str);
1594 d3d493d7 2019-02-21 stsp refs_str = NULL;
1595 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1596 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1597 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1598 09867e48 2019-08-13 stsp if (datestr)
1599 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1600 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1601 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1602 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1603 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1604 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1605 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1606 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1607 3fe1abad 2018-06-10 stsp int n = 1;
1608 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1609 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1610 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1612 a0603db2 2018-06-10 stsp return err;
1613 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1614 a0603db2 2018-06-10 stsp free(id_str);
1618 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1620 5943eee2 2019-08-13 stsp return err;
1622 621015ac 2018-07-23 stsp logmsg = logmsg0;
1624 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1626 832c249c 2018-06-10 stsp printf(" %s\n", line);
1627 832c249c 2018-06-10 stsp } while (line);
1628 621015ac 2018-07-23 stsp free(logmsg0);
1630 971751ac 2018-03-27 stsp if (show_patch) {
1631 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1632 971751ac 2018-03-27 stsp if (err == 0)
1633 971751ac 2018-03-27 stsp printf("\n");
1636 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1637 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1638 07862c20 2018-09-15 stsp return err;
1641 f42b1b34 2018-03-12 stsp static const struct got_error *
1642 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1643 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1644 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1646 f42b1b34 2018-03-12 stsp const struct got_error *err;
1647 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1649 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1650 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1652 f42b1b34 2018-03-12 stsp return err;
1653 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1654 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1656 fcc85cad 2018-07-22 stsp goto done;
1658 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1659 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1661 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1664 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1665 372ccdbb 2018-06-10 stsp if (err) {
1666 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1667 9ba79e04 2018-06-11 stsp err = NULL;
1670 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1672 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
1673 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1679 b43fbaa0 2018-06-11 stsp if (id == NULL)
1682 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1685 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1686 44392932 2019-08-25 stsp diff_context, refs);
1687 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1688 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1692 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1693 f42b1b34 2018-03-12 stsp return err;
1696 4ed7e80c 2018-05-20 stsp __dead static void
1697 6f3d1eb0 2018-03-12 stsp usage_log(void)
1699 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1700 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1704 b1ebc001 2019-08-13 stsp static int
1705 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1707 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1708 b1ebc001 2019-08-13 stsp long long n;
1709 b1ebc001 2019-08-13 stsp const char *errstr;
1711 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1712 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1714 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1715 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1720 4ed7e80c 2018-05-20 stsp static const struct got_error *
1721 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1723 f42b1b34 2018-03-12 stsp const struct got_error *error;
1724 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1725 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1726 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1727 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1728 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1729 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1730 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1731 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1732 64a96a6d 2018-04-01 stsp const char *errstr;
1733 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1735 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1737 6715a751 2018-03-16 stsp #ifndef PROFILE
1738 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1741 f42b1b34 2018-03-12 stsp err(1, "pledge");
1744 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1746 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1747 79109fed 2018-03-27 stsp switch (ch) {
1749 79109fed 2018-03-27 stsp show_patch = 1;
1752 d142fc45 2018-04-01 stsp start_commit = optarg;
1755 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1757 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1758 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1761 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1762 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1763 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1766 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1769 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1770 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1771 04ca23f4 2018-07-16 stsp err(1, "-r option");
1772 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1775 2deda0b9 2019-03-07 stsp usage_log();
1776 79109fed 2018-03-27 stsp /* NOTREACHED */
1780 79109fed 2018-03-27 stsp argc -= optind;
1781 79109fed 2018-03-27 stsp argv += optind;
1783 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1784 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1785 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1786 04ca23f4 2018-07-16 stsp goto done;
1789 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1790 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1791 cffc0aa4 2019-02-05 stsp goto done;
1792 cffc0aa4 2019-02-05 stsp error = NULL;
1794 e7301579 2019-03-18 stsp if (argc == 0) {
1795 cbd1af7a 2019-03-18 stsp path = strdup("");
1796 e7301579 2019-03-18 stsp if (path == NULL) {
1797 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1798 cbd1af7a 2019-03-18 stsp goto done;
1800 e7301579 2019-03-18 stsp } else if (argc == 1) {
1801 e7301579 2019-03-18 stsp if (worktree) {
1802 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1804 e7301579 2019-03-18 stsp if (error)
1805 e7301579 2019-03-18 stsp goto done;
1807 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1808 e7301579 2019-03-18 stsp if (path == NULL) {
1809 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1810 e7301579 2019-03-18 stsp goto done;
1814 cbd1af7a 2019-03-18 stsp usage_log();
1816 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1817 5486daa2 2019-05-11 stsp repo_path = worktree ?
1818 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1820 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1821 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1822 cffc0aa4 2019-02-05 stsp goto done;
1825 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1826 d7d4f210 2018-03-12 stsp if (error != NULL)
1827 04ca23f4 2018-07-16 stsp goto done;
1829 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1830 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1831 c02c541e 2019-03-29 stsp if (error)
1832 c02c541e 2019-03-29 stsp goto done;
1834 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1835 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1836 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1837 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1838 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1839 3235492e 2018-04-01 stsp if (error != NULL)
1840 3235492e 2018-04-01 stsp return error;
1841 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1842 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1843 3235492e 2018-04-01 stsp if (error != NULL)
1844 3235492e 2018-04-01 stsp return error;
1845 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1847 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1848 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1849 3235492e 2018-04-01 stsp if (error == NULL) {
1850 1caad61b 2019-02-01 stsp int obj_type;
1851 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1852 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1853 d1f2edc9 2018-06-13 stsp if (error != NULL)
1854 1caad61b 2019-02-01 stsp goto done;
1855 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1856 1caad61b 2019-02-01 stsp if (error != NULL)
1857 1caad61b 2019-02-01 stsp goto done;
1858 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1859 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1860 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1861 1caad61b 2019-02-01 stsp if (error != NULL)
1862 1caad61b 2019-02-01 stsp goto done;
1863 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1864 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1865 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1866 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1867 1caad61b 2019-02-01 stsp goto done;
1870 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1871 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1872 1caad61b 2019-02-01 stsp if (id == NULL)
1873 638f9024 2019-05-13 stsp error = got_error_from_errno(
1874 230a42bd 2019-05-11 jcs "got_object_id_dup");
1875 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1876 1caad61b 2019-02-01 stsp if (error)
1877 1caad61b 2019-02-01 stsp goto done;
1878 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1879 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1880 1caad61b 2019-02-01 stsp goto done;
1882 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1883 d1f2edc9 2018-06-13 stsp if (error != NULL)
1884 1caad61b 2019-02-01 stsp goto done;
1886 15a94983 2018-12-23 stsp if (commit == NULL) {
1887 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1888 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1889 d1f2edc9 2018-06-13 stsp if (error != NULL)
1890 d1f2edc9 2018-06-13 stsp return error;
1893 d7d4f210 2018-03-12 stsp if (error != NULL)
1894 04ca23f4 2018-07-16 stsp goto done;
1896 deeabeae 2019-08-27 stsp if (worktree) {
1897 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1899 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
1900 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
1901 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
1902 deeabeae 2019-08-27 stsp goto done;
1904 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1907 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1908 04ca23f4 2018-07-16 stsp if (error != NULL)
1909 04ca23f4 2018-07-16 stsp goto done;
1910 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1911 04ca23f4 2018-07-16 stsp free(path);
1912 04ca23f4 2018-07-16 stsp path = in_repo_path;
1915 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
1916 199a4027 2019-02-02 stsp if (error)
1917 199a4027 2019-02-02 stsp goto done;
1919 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1920 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1922 04ca23f4 2018-07-16 stsp free(path);
1923 04ca23f4 2018-07-16 stsp free(repo_path);
1924 04ca23f4 2018-07-16 stsp free(cwd);
1926 cffc0aa4 2019-02-05 stsp if (worktree)
1927 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1928 ad242220 2018-09-08 stsp if (repo) {
1929 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1930 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1931 ad242220 2018-09-08 stsp if (error == NULL)
1932 ad242220 2018-09-08 stsp error = repo_error;
1934 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1935 8bf5b3c9 2018-03-17 stsp return error;
1938 4ed7e80c 2018-05-20 stsp __dead static void
1939 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1941 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1942 927df6b7 2019-02-10 stsp "[object1 object2 | path]\n", getprogname());
1946 b72f483a 2019-02-05 stsp struct print_diff_arg {
1947 b72f483a 2019-02-05 stsp struct got_repository *repo;
1948 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
1949 b72f483a 2019-02-05 stsp int diff_context;
1950 3fc0c068 2019-02-10 stsp const char *id_str;
1951 3fc0c068 2019-02-10 stsp int header_shown;
1952 98eaaa12 2019-08-03 stsp int diff_staged;
1955 4ed7e80c 2018-05-20 stsp static const struct got_error *
1956 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
1957 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
1958 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1960 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
1961 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1962 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
1963 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
1964 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
1965 b72f483a 2019-02-05 stsp struct stat sb;
1967 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1968 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
1969 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
1970 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
1971 98eaaa12 2019-08-03 stsp return NULL;
1973 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
1974 98eaaa12 2019-08-03 stsp return NULL;
1975 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
1976 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
1977 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
1978 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
1979 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
1980 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
1981 98eaaa12 2019-08-03 stsp return NULL;
1984 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
1985 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
1986 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
1987 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
1988 3fc0c068 2019-02-10 stsp a->header_shown = 1;
1991 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
1992 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
1993 98eaaa12 2019-08-03 stsp switch (staged_status) {
1994 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
1995 98eaaa12 2019-08-03 stsp label1 = path;
1996 98eaaa12 2019-08-03 stsp label2 = path;
1998 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
1999 98eaaa12 2019-08-03 stsp label2 = path;
2001 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2002 98eaaa12 2019-08-03 stsp label1 = path;
2005 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2007 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2008 98eaaa12 2019-08-03 stsp label1, label2, a->diff_context, a->repo, stdout);
2011 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2012 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2013 4ce46740 2019-08-08 stsp char *id_str;
2014 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2017 4ce46740 2019-08-08 stsp goto done;
2018 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2020 4ce46740 2019-08-08 stsp goto done;
2021 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2022 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2023 4ce46740 2019-08-08 stsp free(id_str);
2024 4ce46740 2019-08-08 stsp goto done;
2026 4ce46740 2019-08-08 stsp free(id_str);
2027 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2028 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2030 4ce46740 2019-08-08 stsp goto done;
2033 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2034 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2035 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2036 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2037 2ec1f75b 2019-03-26 stsp goto done;
2040 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
2041 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
2042 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
2043 2ec1f75b 2019-03-26 stsp goto done;
2045 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
2046 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
2047 2ec1f75b 2019-03-26 stsp goto done;
2050 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2052 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2053 4ce46740 2019-08-08 stsp a->diff_context, stdout);
2055 b72f483a 2019-02-05 stsp if (blob1)
2056 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2057 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
2058 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2059 b72f483a 2019-02-05 stsp free(abspath);
2060 927df6b7 2019-02-10 stsp return err;
2063 927df6b7 2019-02-10 stsp static const struct got_error *
2064 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2065 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2066 01073a5d 2019-08-22 stsp struct got_repository *repo)
2068 0adb7196 2019-08-11 stsp const struct got_error *err;
2069 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2070 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2072 0adb7196 2019-08-11 stsp *id = NULL;
2073 0adb7196 2019-08-11 stsp *label = NULL;
2075 01073a5d 2019-08-22 stsp if (resolve_tags) {
2076 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2078 01073a5d 2019-08-22 stsp if (err == NULL) {
2079 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2080 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2081 01073a5d 2019-08-22 stsp if (*id == NULL)
2082 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2083 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2084 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2085 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2086 32f0ab81 2019-08-28 hiltjo free(*id);
2087 01073a5d 2019-08-22 stsp *id = NULL;
2089 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2090 01073a5d 2019-08-22 stsp return err;
2091 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2092 01073a5d 2019-08-22 stsp return err;
2095 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2096 0adb7196 2019-08-11 stsp if (err) {
2097 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2098 0adb7196 2019-08-11 stsp return err;
2099 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2100 0adb7196 2019-08-11 stsp if (err != NULL)
2101 0adb7196 2019-08-11 stsp goto done;
2102 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2103 0adb7196 2019-08-11 stsp if (*label == NULL) {
2104 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2105 0adb7196 2019-08-11 stsp goto done;
2107 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2109 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2110 0adb7196 2019-08-11 stsp if (*label == NULL) {
2111 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2112 0adb7196 2019-08-11 stsp goto done;
2117 0adb7196 2019-08-11 stsp got_ref_close(ref);
2118 0adb7196 2019-08-11 stsp return err;
2122 0adb7196 2019-08-11 stsp static const struct got_error *
2123 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2125 b00d56cd 2018-04-01 stsp const struct got_error *error;
2126 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2127 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2128 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2129 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2130 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2131 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2132 15a94983 2018-12-23 stsp int type1, type2;
2133 98eaaa12 2019-08-03 stsp int diff_context = 3, diff_staged = 0, ch;
2134 c0cc5c62 2018-10-18 stsp const char *errstr;
2135 927df6b7 2019-02-10 stsp char *path = NULL;
2137 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2138 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2139 25eccc22 2019-01-04 stsp NULL) == -1)
2140 b00d56cd 2018-04-01 stsp err(1, "pledge");
2143 98eaaa12 2019-08-03 stsp while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
2144 b00d56cd 2018-04-01 stsp switch (ch) {
2146 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
2147 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2148 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2151 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2152 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2153 b72f483a 2019-02-05 stsp err(1, "-r option");
2154 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2157 98eaaa12 2019-08-03 stsp diff_staged = 1;
2160 2deda0b9 2019-03-07 stsp usage_diff();
2161 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2165 b00d56cd 2018-04-01 stsp argc -= optind;
2166 b00d56cd 2018-04-01 stsp argv += optind;
2168 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2169 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2170 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2171 b72f483a 2019-02-05 stsp goto done;
2173 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2174 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2175 927df6b7 2019-02-10 stsp goto done;
2176 927df6b7 2019-02-10 stsp if (argc <= 1) {
2177 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2178 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2179 927df6b7 2019-02-10 stsp goto done;
2181 b72f483a 2019-02-05 stsp if (repo_path)
2183 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2184 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2185 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2186 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2187 927df6b7 2019-02-10 stsp goto done;
2189 927df6b7 2019-02-10 stsp if (argc == 1) {
2190 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2192 927df6b7 2019-02-10 stsp if (error)
2193 927df6b7 2019-02-10 stsp goto done;
2195 927df6b7 2019-02-10 stsp path = strdup("");
2196 927df6b7 2019-02-10 stsp if (path == NULL) {
2197 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2198 927df6b7 2019-02-10 stsp goto done;
2201 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2202 98eaaa12 2019-08-03 stsp if (diff_staged)
2203 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2204 98eaaa12 2019-08-03 stsp "objects in repository");
2205 15a94983 2018-12-23 stsp id_str1 = argv[0];
2206 15a94983 2018-12-23 stsp id_str2 = argv[1];
2207 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2208 30db809c 2019-06-05 stsp repo_path =
2209 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2210 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2211 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2212 30db809c 2019-06-05 stsp goto done;
2216 b00d56cd 2018-04-01 stsp usage_diff();
2218 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2219 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2220 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2221 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2224 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2225 76089277 2018-04-01 stsp free(repo_path);
2226 b00d56cd 2018-04-01 stsp if (error != NULL)
2227 b00d56cd 2018-04-01 stsp goto done;
2229 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2230 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2231 c02c541e 2019-03-29 stsp if (error)
2232 c02c541e 2019-03-29 stsp goto done;
2234 30db809c 2019-06-05 stsp if (argc <= 1) {
2235 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2236 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2237 b72f483a 2019-02-05 stsp char *id_str;
2239 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2241 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2242 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2243 b72f483a 2019-02-05 stsp if (error)
2244 b72f483a 2019-02-05 stsp goto done;
2245 b72f483a 2019-02-05 stsp arg.repo = repo;
2246 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2247 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2248 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2249 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2250 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2252 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2253 72ea6654 2019-07-27 stsp if (error)
2254 72ea6654 2019-07-27 stsp goto done;
2256 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2257 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2258 b72f483a 2019-02-05 stsp free(id_str);
2259 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2260 b72f483a 2019-02-05 stsp goto done;
2263 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2265 0adb7196 2019-08-11 stsp if (error)
2266 0adb7196 2019-08-11 stsp goto done;
2268 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2270 0adb7196 2019-08-11 stsp if (error)
2271 0adb7196 2019-08-11 stsp goto done;
2273 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2274 15a94983 2018-12-23 stsp if (error)
2275 15a94983 2018-12-23 stsp goto done;
2277 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2278 15a94983 2018-12-23 stsp if (error)
2279 15a94983 2018-12-23 stsp goto done;
2281 15a94983 2018-12-23 stsp if (type1 != type2) {
2282 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2283 b00d56cd 2018-04-01 stsp goto done;
2286 15a94983 2018-12-23 stsp switch (type1) {
2287 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2288 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2289 54156555 2018-12-24 stsp diff_context, repo, stdout);
2291 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2292 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2293 54156555 2018-12-24 stsp diff_context, repo, stdout);
2295 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2296 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2297 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2298 c0cc5c62 2018-10-18 stsp repo, stdout);
2301 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2305 5e70831e 2019-05-28 stsp free(label1);
2306 5e70831e 2019-05-28 stsp free(label2);
2307 15a94983 2018-12-23 stsp free(id1);
2308 15a94983 2018-12-23 stsp free(id2);
2309 927df6b7 2019-02-10 stsp free(path);
2310 b72f483a 2019-02-05 stsp if (worktree)
2311 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2312 ad242220 2018-09-08 stsp if (repo) {
2313 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2314 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2315 ad242220 2018-09-08 stsp if (error == NULL)
2316 ad242220 2018-09-08 stsp error = repo_error;
2318 b00d56cd 2018-04-01 stsp return error;
2321 404c43c4 2018-06-21 stsp __dead static void
2322 404c43c4 2018-06-21 stsp usage_blame(void)
2324 9270e621 2019-02-05 stsp fprintf(stderr,
2325 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2326 404c43c4 2018-06-21 stsp getprogname());
2330 28315671 2019-08-14 stsp struct blame_line {
2331 28315671 2019-08-14 stsp int annotated;
2332 28315671 2019-08-14 stsp char *id_str;
2333 82f6abb8 2019-08-14 stsp char *committer;
2334 bcb49d15 2019-08-14 stsp char datebuf[9]; /* YY-MM-DD + NUL */
2337 28315671 2019-08-14 stsp struct blame_cb_args {
2338 28315671 2019-08-14 stsp struct blame_line *lines;
2339 28315671 2019-08-14 stsp int nlines;
2340 7ef28ff8 2019-08-14 stsp int nlines_prec;
2341 28315671 2019-08-14 stsp int lineno_cur;
2342 28315671 2019-08-14 stsp off_t *line_offsets;
2344 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2347 404c43c4 2018-06-21 stsp static const struct got_error *
2348 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2350 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2351 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2352 28315671 2019-08-14 stsp struct blame_line *bline;
2353 82f6abb8 2019-08-14 stsp char *line = NULL;
2354 28315671 2019-08-14 stsp size_t linesize = 0;
2355 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2356 28315671 2019-08-14 stsp off_t offset;
2357 bcb49d15 2019-08-14 stsp struct tm tm;
2358 bcb49d15 2019-08-14 stsp time_t committer_time;
2360 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2361 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2362 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2364 28315671 2019-08-14 stsp if (sigint_received)
2365 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2367 2839f8b9 2019-08-18 stsp if (lineno == -1)
2368 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2370 28315671 2019-08-14 stsp /* Annotate this line. */
2371 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2372 28315671 2019-08-14 stsp if (bline->annotated)
2373 28315671 2019-08-14 stsp return NULL;
2374 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2376 28315671 2019-08-14 stsp return err;
2378 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2380 82f6abb8 2019-08-14 stsp goto done;
2382 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2383 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2384 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2385 bcb49d15 2019-08-14 stsp goto done;
2388 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2389 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2390 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2391 bcb49d15 2019-08-14 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2392 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2393 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2394 82f6abb8 2019-08-14 stsp goto done;
2396 28315671 2019-08-14 stsp bline->annotated = 1;
2398 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2399 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2400 28315671 2019-08-14 stsp if (!bline->annotated)
2401 82f6abb8 2019-08-14 stsp goto done;
2403 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2404 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2405 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2406 82f6abb8 2019-08-14 stsp goto done;
2409 28315671 2019-08-14 stsp while (bline->annotated) {
2410 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2411 82f6abb8 2019-08-14 stsp size_t len;
2413 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2414 28315671 2019-08-14 stsp if (ferror(a->f))
2415 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2419 82f6abb8 2019-08-14 stsp committer = bline->committer;
2420 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2421 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2422 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2423 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2425 82f6abb8 2019-08-14 stsp *at = '\0';
2426 82f6abb8 2019-08-14 stsp len = strlen(committer);
2427 82f6abb8 2019-08-14 stsp if (len >= 9)
2428 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2430 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2432 28315671 2019-08-14 stsp *nl = '\0';
2433 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2434 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2436 28315671 2019-08-14 stsp a->lineno_cur++;
2437 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2440 82f6abb8 2019-08-14 stsp if (commit)
2441 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2442 28315671 2019-08-14 stsp free(line);
2443 28315671 2019-08-14 stsp return err;
2446 28315671 2019-08-14 stsp static const struct got_error *
2447 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2449 404c43c4 2018-06-21 stsp const struct got_error *error;
2450 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2451 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2452 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2453 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2454 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2455 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2456 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2457 28315671 2019-08-14 stsp struct blame_cb_args bca;
2458 28315671 2019-08-14 stsp int ch, obj_type, i;
2459 b02560ec 2019-08-19 stsp size_t filesize;
2461 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2463 404c43c4 2018-06-21 stsp #ifndef PROFILE
2464 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2465 36e2fb66 2019-01-04 stsp NULL) == -1)
2466 404c43c4 2018-06-21 stsp err(1, "pledge");
2469 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2470 404c43c4 2018-06-21 stsp switch (ch) {
2472 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2475 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2476 66bea077 2018-08-02 stsp if (repo_path == NULL)
2477 66bea077 2018-08-02 stsp err(1, "-r option");
2478 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2481 2deda0b9 2019-03-07 stsp usage_blame();
2482 404c43c4 2018-06-21 stsp /* NOTREACHED */
2486 404c43c4 2018-06-21 stsp argc -= optind;
2487 404c43c4 2018-06-21 stsp argv += optind;
2489 a39318fd 2018-08-02 stsp if (argc == 1)
2490 404c43c4 2018-06-21 stsp path = argv[0];
2492 404c43c4 2018-06-21 stsp usage_blame();
2494 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2495 66bea077 2018-08-02 stsp if (cwd == NULL) {
2496 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2497 66bea077 2018-08-02 stsp goto done;
2499 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2500 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2501 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2502 66bea077 2018-08-02 stsp goto done;
2504 0c06baac 2019-02-05 stsp error = NULL;
2505 0c06baac 2019-02-05 stsp if (worktree) {
2506 0c06baac 2019-02-05 stsp repo_path =
2507 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2508 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2509 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2510 0c06baac 2019-02-05 stsp if (error)
2511 0c06baac 2019-02-05 stsp goto done;
2513 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2514 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2515 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2516 0c06baac 2019-02-05 stsp goto done;
2521 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2522 c02c541e 2019-03-29 stsp if (error != NULL)
2523 36e2fb66 2019-01-04 stsp goto done;
2525 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2526 c02c541e 2019-03-29 stsp if (error)
2527 404c43c4 2018-06-21 stsp goto done;
2529 0c06baac 2019-02-05 stsp if (worktree) {
2530 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2531 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2532 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2533 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2534 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2535 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2536 6efaaa2d 2019-02-05 stsp path) == -1) {
2537 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2538 0c06baac 2019-02-05 stsp goto done;
2540 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2543 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2545 0c06baac 2019-02-05 stsp if (error)
2546 66bea077 2018-08-02 stsp goto done;
2548 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2549 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2550 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2551 404c43c4 2018-06-21 stsp if (error != NULL)
2552 66bea077 2018-08-02 stsp goto done;
2553 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2554 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2555 404c43c4 2018-06-21 stsp if (error != NULL)
2556 66bea077 2018-08-02 stsp goto done;
2558 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2559 30837e32 2019-07-25 stsp if (error)
2560 66bea077 2018-08-02 stsp goto done;
2563 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2564 28315671 2019-08-14 stsp if (error)
2565 28315671 2019-08-14 stsp goto done;
2566 28315671 2019-08-14 stsp if (obj_id == NULL) {
2567 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2568 28315671 2019-08-14 stsp goto done;
2571 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2572 28315671 2019-08-14 stsp if (error)
2573 28315671 2019-08-14 stsp goto done;
2575 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2576 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2577 28315671 2019-08-14 stsp goto done;
2580 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2581 28315671 2019-08-14 stsp if (error)
2582 28315671 2019-08-14 stsp goto done;
2583 28315671 2019-08-14 stsp bca.f = got_opentemp();
2584 28315671 2019-08-14 stsp if (bca.f == NULL) {
2585 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2586 28315671 2019-08-14 stsp goto done;
2588 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2589 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2590 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2591 28315671 2019-08-14 stsp goto done;
2593 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2594 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2595 b02560ec 2019-08-19 stsp bca.nlines--;
2597 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2598 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2599 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2600 28315671 2019-08-14 stsp goto done;
2602 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2603 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2604 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2605 7ef28ff8 2019-08-14 stsp while (i > 0) {
2607 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2609 82f6abb8 2019-08-14 stsp bca.repo = repo;
2611 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2612 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2613 28315671 2019-08-14 stsp if (error)
2614 28315671 2019-08-14 stsp goto done;
2616 66bea077 2018-08-02 stsp free(in_repo_path);
2617 66bea077 2018-08-02 stsp free(repo_path);
2618 66bea077 2018-08-02 stsp free(cwd);
2619 404c43c4 2018-06-21 stsp free(commit_id);
2620 28315671 2019-08-14 stsp free(obj_id);
2622 28315671 2019-08-14 stsp got_object_blob_close(blob);
2623 0c06baac 2019-02-05 stsp if (worktree)
2624 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2625 ad242220 2018-09-08 stsp if (repo) {
2626 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2627 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2628 ad242220 2018-09-08 stsp if (error == NULL)
2629 ad242220 2018-09-08 stsp error = repo_error;
2631 3affba96 2019-09-22 stsp if (bca.lines) {
2632 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2633 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2634 3affba96 2019-09-22 stsp free(bline->id_str);
2635 3affba96 2019-09-22 stsp free(bline->committer);
2637 3affba96 2019-09-22 stsp free(bca.lines);
2639 28315671 2019-08-14 stsp free(bca.line_offsets);
2640 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2641 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2642 404c43c4 2018-06-21 stsp return error;
2645 5de5890b 2018-10-18 stsp __dead static void
2646 5de5890b 2018-10-18 stsp usage_tree(void)
2648 c1669e2e 2019-01-09 stsp fprintf(stderr,
2649 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2650 5de5890b 2018-10-18 stsp getprogname());
2654 c1669e2e 2019-01-09 stsp static void
2655 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2656 c1669e2e 2019-01-09 stsp const char *root_path)
2658 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2659 848d6979 2019-08-12 stsp const char *modestr = "";
2661 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2662 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2665 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2666 63c5ca5d 2019-08-24 stsp modestr = "$";
2667 63c5ca5d 2019-08-24 stsp else if (S_ISLNK(te->mode))
2668 848d6979 2019-08-12 stsp modestr = "@";
2669 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
2670 848d6979 2019-08-12 stsp modestr = "/";
2671 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
2672 848d6979 2019-08-12 stsp modestr = "*";
2674 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2675 848d6979 2019-08-12 stsp is_root_path ? "" : "/", te->name, modestr);
2678 5de5890b 2018-10-18 stsp static const struct got_error *
2679 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2680 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2681 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2683 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2684 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2685 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2686 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2687 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2689 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2691 5de5890b 2018-10-18 stsp goto done;
2693 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2695 5de5890b 2018-10-18 stsp goto done;
2696 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2697 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2698 5de5890b 2018-10-18 stsp while (te) {
2699 5de5890b 2018-10-18 stsp char *id = NULL;
2701 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2704 5de5890b 2018-10-18 stsp if (show_ids) {
2705 5de5890b 2018-10-18 stsp char *id_str;
2706 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2708 5de5890b 2018-10-18 stsp goto done;
2709 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2710 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2711 5de5890b 2018-10-18 stsp free(id_str);
2712 5de5890b 2018-10-18 stsp goto done;
2714 5de5890b 2018-10-18 stsp free(id_str);
2716 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2719 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2720 c1669e2e 2019-01-09 stsp char *child_path;
2721 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2722 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2723 c1669e2e 2019-01-09 stsp te->name) == -1) {
2724 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2725 c1669e2e 2019-01-09 stsp goto done;
2727 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2728 c1669e2e 2019-01-09 stsp root_path, repo);
2729 c1669e2e 2019-01-09 stsp free(child_path);
2731 c1669e2e 2019-01-09 stsp goto done;
2734 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2738 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2739 5de5890b 2018-10-18 stsp free(tree_id);
2740 5de5890b 2018-10-18 stsp return err;
2743 5de5890b 2018-10-18 stsp static const struct got_error *
2744 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2746 5de5890b 2018-10-18 stsp const struct got_error *error;
2747 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2748 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2749 7a2c19d6 2019-02-05 stsp const char *path;
2750 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2751 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2752 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2753 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2756 5de5890b 2018-10-18 stsp #ifndef PROFILE
2757 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2758 0f8d269b 2019-01-04 stsp NULL) == -1)
2759 5de5890b 2018-10-18 stsp err(1, "pledge");
2762 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2763 5de5890b 2018-10-18 stsp switch (ch) {
2765 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2768 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2769 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2770 5de5890b 2018-10-18 stsp err(1, "-r option");
2771 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2774 5de5890b 2018-10-18 stsp show_ids = 1;
2777 c1669e2e 2019-01-09 stsp recurse = 1;
2780 2deda0b9 2019-03-07 stsp usage_tree();
2781 5de5890b 2018-10-18 stsp /* NOTREACHED */
2785 5de5890b 2018-10-18 stsp argc -= optind;
2786 5de5890b 2018-10-18 stsp argv += optind;
2788 5de5890b 2018-10-18 stsp if (argc == 1)
2789 5de5890b 2018-10-18 stsp path = argv[0];
2790 5de5890b 2018-10-18 stsp else if (argc > 1)
2791 5de5890b 2018-10-18 stsp usage_tree();
2793 7a2c19d6 2019-02-05 stsp path = NULL;
2795 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2796 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2797 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2798 9bf7a39b 2019-02-05 stsp goto done;
2800 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2801 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2802 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2803 7a2c19d6 2019-02-05 stsp goto done;
2805 7a2c19d6 2019-02-05 stsp error = NULL;
2806 7a2c19d6 2019-02-05 stsp if (worktree) {
2807 7a2c19d6 2019-02-05 stsp repo_path =
2808 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2809 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2810 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2811 7a2c19d6 2019-02-05 stsp if (error)
2812 7a2c19d6 2019-02-05 stsp goto done;
2814 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2815 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2816 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2817 7a2c19d6 2019-02-05 stsp goto done;
2822 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2823 5de5890b 2018-10-18 stsp if (error != NULL)
2824 c02c541e 2019-03-29 stsp goto done;
2826 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2827 c02c541e 2019-03-29 stsp if (error)
2828 5de5890b 2018-10-18 stsp goto done;
2830 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2831 9bf7a39b 2019-02-05 stsp if (worktree) {
2832 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2833 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2834 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2835 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2836 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2837 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2838 9bf7a39b 2019-02-05 stsp goto done;
2840 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2842 9bf7a39b 2019-02-05 stsp if (error)
2843 9bf7a39b 2019-02-05 stsp goto done;
2845 9bf7a39b 2019-02-05 stsp path = "/";
2847 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2848 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2849 9bf7a39b 2019-02-05 stsp if (error != NULL)
2850 9bf7a39b 2019-02-05 stsp goto done;
2853 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2854 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2855 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2856 5de5890b 2018-10-18 stsp if (error != NULL)
2857 5de5890b 2018-10-18 stsp goto done;
2858 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2859 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2860 5de5890b 2018-10-18 stsp if (error != NULL)
2861 5de5890b 2018-10-18 stsp goto done;
2863 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2864 30837e32 2019-07-25 stsp if (error)
2865 5de5890b 2018-10-18 stsp goto done;
2868 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2869 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2871 5de5890b 2018-10-18 stsp free(in_repo_path);
2872 5de5890b 2018-10-18 stsp free(repo_path);
2873 5de5890b 2018-10-18 stsp free(cwd);
2874 5de5890b 2018-10-18 stsp free(commit_id);
2875 7a2c19d6 2019-02-05 stsp if (worktree)
2876 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2877 5de5890b 2018-10-18 stsp if (repo) {
2878 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2879 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2880 5de5890b 2018-10-18 stsp if (error == NULL)
2881 5de5890b 2018-10-18 stsp error = repo_error;
2883 5de5890b 2018-10-18 stsp return error;
2886 6bad629b 2019-02-04 stsp __dead static void
2887 6bad629b 2019-02-04 stsp usage_status(void)
2889 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2893 b72f483a 2019-02-05 stsp static const struct got_error *
2894 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2895 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2896 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2898 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2899 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2900 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2901 b72f483a 2019-02-05 stsp return NULL;
2904 6bad629b 2019-02-04 stsp static const struct got_error *
2905 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2907 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2908 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2909 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2910 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2911 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2912 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2915 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2917 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2918 6bad629b 2019-02-04 stsp switch (ch) {
2920 2deda0b9 2019-03-07 stsp usage_status();
2921 6bad629b 2019-02-04 stsp /* NOTREACHED */
2925 6bad629b 2019-02-04 stsp argc -= optind;
2926 6bad629b 2019-02-04 stsp argv += optind;
2928 6bad629b 2019-02-04 stsp #ifndef PROFILE
2929 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2930 6bad629b 2019-02-04 stsp NULL) == -1)
2931 6bad629b 2019-02-04 stsp err(1, "pledge");
2933 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
2934 927df6b7 2019-02-10 stsp if (cwd == NULL) {
2935 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2936 927df6b7 2019-02-10 stsp goto done;
2939 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2940 927df6b7 2019-02-10 stsp if (error != NULL)
2941 a5edda0a 2019-07-27 stsp goto done;
2943 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2945 6bad629b 2019-02-04 stsp if (error != NULL)
2946 6bad629b 2019-02-04 stsp goto done;
2948 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2949 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2950 087fb88c 2019-08-04 stsp if (error)
2951 087fb88c 2019-08-04 stsp goto done;
2953 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2954 6bad629b 2019-02-04 stsp if (error)
2955 6bad629b 2019-02-04 stsp goto done;
2957 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2958 6bad629b 2019-02-04 stsp check_cancelled, NULL);
2960 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2961 a5edda0a 2019-07-27 stsp free((char *)pe->path);
2962 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2963 927df6b7 2019-02-10 stsp free(cwd);
2964 d0eebce4 2019-03-11 stsp return error;
2967 d0eebce4 2019-03-11 stsp __dead static void
2968 d0eebce4 2019-03-11 stsp usage_ref(void)
2970 d0eebce4 2019-03-11 stsp fprintf(stderr,
2971 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2972 d0eebce4 2019-03-11 stsp getprogname());
2976 d0eebce4 2019-03-11 stsp static const struct got_error *
2977 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
2979 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
2980 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
2981 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
2983 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
2984 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2986 d0eebce4 2019-03-11 stsp return err;
2988 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
2989 d0eebce4 2019-03-11 stsp char *refstr;
2990 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
2991 d0eebce4 2019-03-11 stsp if (refstr == NULL)
2992 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
2993 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2994 d0eebce4 2019-03-11 stsp free(refstr);
2997 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2998 d0eebce4 2019-03-11 stsp return NULL;
3001 d0eebce4 2019-03-11 stsp static const struct got_error *
3002 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3004 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3005 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3007 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3009 d0eebce4 2019-03-11 stsp return err;
3011 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3012 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3013 d0eebce4 2019-03-11 stsp return err;
3016 d0eebce4 2019-03-11 stsp static const struct got_error *
3017 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3019 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3020 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3021 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3024 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
3025 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3026 d1644381 2019-07-14 stsp * an unintended typo.
3028 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
3029 d1644381 2019-07-14 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3031 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3033 d83d9d5c 2019-05-13 stsp if (err) {
3034 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3036 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3037 d83d9d5c 2019-05-13 stsp return err;
3038 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3040 d83d9d5c 2019-05-13 stsp return err;
3041 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3042 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3044 d83d9d5c 2019-05-13 stsp return err;
3047 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3049 d0eebce4 2019-03-11 stsp goto done;
3051 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3054 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3056 d1c1ae5f 2019-08-12 stsp return err;
3059 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3060 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3062 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3063 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3064 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3067 d1c1ae5f 2019-08-12 stsp * Don't let the user create a reference named '-'.
3068 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3069 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3071 d1c1ae5f 2019-08-12 stsp if (refname[0] == '-' && refname[1] == '\0')
3072 d1c1ae5f 2019-08-12 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3074 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3076 d1c1ae5f 2019-08-12 stsp return err;
3078 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3080 d1c1ae5f 2019-08-12 stsp goto done;
3082 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3084 d1c1ae5f 2019-08-12 stsp if (target_ref)
3085 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3087 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3088 d0eebce4 2019-03-11 stsp return err;
3091 d0eebce4 2019-03-11 stsp static const struct got_error *
3092 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3094 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3095 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3096 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3097 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3098 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3099 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3101 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3102 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3103 d0eebce4 2019-03-11 stsp switch (ch) {
3105 d0eebce4 2019-03-11 stsp delref = optarg;
3108 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3109 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3110 d0eebce4 2019-03-11 stsp err(1, "-r option");
3111 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3114 d0eebce4 2019-03-11 stsp do_list = 1;
3117 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3120 d0eebce4 2019-03-11 stsp usage_ref();
3121 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3125 d0eebce4 2019-03-11 stsp if (do_list && delref)
3126 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3128 d0eebce4 2019-03-11 stsp argc -= optind;
3129 d0eebce4 2019-03-11 stsp argv += optind;
3131 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3132 d1c1ae5f 2019-08-12 stsp if (create_symref)
3133 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3134 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3135 d0eebce4 2019-03-11 stsp if (argc > 0)
3136 d0eebce4 2019-03-11 stsp usage_ref();
3137 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3138 d0eebce4 2019-03-11 stsp usage_ref();
3140 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3141 e0b57350 2019-03-12 stsp if (do_list) {
3142 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3143 e0b57350 2019-03-12 stsp NULL) == -1)
3144 e0b57350 2019-03-12 stsp err(1, "pledge");
3146 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3147 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3148 e0b57350 2019-03-12 stsp err(1, "pledge");
3151 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3152 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3153 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3154 d0eebce4 2019-03-11 stsp goto done;
3157 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3158 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3159 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3160 d0eebce4 2019-03-11 stsp goto done;
3162 d0eebce4 2019-03-11 stsp error = NULL;
3163 d0eebce4 2019-03-11 stsp if (worktree) {
3164 d0eebce4 2019-03-11 stsp repo_path =
3165 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3166 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3167 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3168 d0eebce4 2019-03-11 stsp if (error)
3169 d0eebce4 2019-03-11 stsp goto done;
3171 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3172 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3173 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3174 d0eebce4 2019-03-11 stsp goto done;
3179 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3180 d0eebce4 2019-03-11 stsp if (error != NULL)
3181 d0eebce4 2019-03-11 stsp goto done;
3183 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3184 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3185 c02c541e 2019-03-29 stsp if (error)
3186 c02c541e 2019-03-29 stsp goto done;
3188 d0eebce4 2019-03-11 stsp if (do_list)
3189 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3190 d0eebce4 2019-03-11 stsp else if (delref)
3191 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3192 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3193 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3195 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3198 4e759de4 2019-06-26 stsp got_repo_close(repo);
3199 4e759de4 2019-06-26 stsp if (worktree)
3200 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3201 4e759de4 2019-06-26 stsp free(cwd);
3202 4e759de4 2019-06-26 stsp free(repo_path);
3203 4e759de4 2019-06-26 stsp return error;
3206 4e759de4 2019-06-26 stsp __dead static void
3207 4e759de4 2019-06-26 stsp usage_branch(void)
3209 4e759de4 2019-06-26 stsp fprintf(stderr,
3210 ad89fa31 2019-10-04 stsp "usage: %s branch [-r repository] [-l] | -d name | "
3211 ad89fa31 2019-10-04 stsp "[name [commit]]\n", getprogname());
3215 4e759de4 2019-06-26 stsp static const struct got_error *
3216 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3217 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3219 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3220 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3221 4e99b47e 2019-10-04 stsp char *refstr;
3223 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3224 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3225 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3226 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3228 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3230 4e99b47e 2019-10-04 stsp return err;
3231 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3232 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3233 4e99b47e 2019-10-04 stsp marker = "* ";
3235 4e99b47e 2019-10-04 stsp marker = "~ ";
3239 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3240 4e99b47e 2019-10-04 stsp refname += 11;
3241 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3242 4e99b47e 2019-10-04 stsp refname += 18;
3244 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3245 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3246 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3248 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3249 4e99b47e 2019-10-04 stsp free(refstr);
3250 4e99b47e 2019-10-04 stsp return NULL;
3253 4e99b47e 2019-10-04 stsp static const struct got_error *
3254 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3256 ad89fa31 2019-10-04 stsp const char *refname;
3258 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3259 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3261 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3263 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3264 ad89fa31 2019-10-04 stsp refname += 11;
3265 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3266 ad89fa31 2019-10-04 stsp refname += 18;
3268 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3270 ad89fa31 2019-10-04 stsp return NULL;
3273 ad89fa31 2019-10-04 stsp static const struct got_error *
3274 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3276 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3277 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3278 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3279 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3280 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3282 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3284 4e99b47e 2019-10-04 stsp if (worktree) {
3285 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3286 4e99b47e 2019-10-04 stsp worktree);
3288 4e99b47e 2019-10-04 stsp return err;
3290 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3291 4e99b47e 2019-10-04 stsp worktree);
3293 4e99b47e 2019-10-04 stsp return err;
3295 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3296 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3297 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3299 4e99b47e 2019-10-04 stsp return err;
3300 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3301 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3305 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3306 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3308 4e759de4 2019-06-26 stsp return err;
3310 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3311 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3313 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3314 4e759de4 2019-06-26 stsp return NULL;
3317 4e759de4 2019-06-26 stsp static const struct got_error *
3318 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3319 45cd4e47 2019-08-25 stsp const char *branch_name)
3321 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3322 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3323 4e759de4 2019-06-26 stsp char *refname;
3325 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3326 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3328 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3330 4e759de4 2019-06-26 stsp goto done;
3332 45cd4e47 2019-08-25 stsp if (worktree &&
3333 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3334 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3335 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3336 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3337 45cd4e47 2019-08-25 stsp goto done;
3340 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3343 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3344 4e759de4 2019-06-26 stsp free(refname);
3345 4e759de4 2019-06-26 stsp return err;
3348 4e759de4 2019-06-26 stsp static const struct got_error *
3349 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3350 4e759de4 2019-06-26 stsp const char *base_branch)
3352 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3353 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
3354 a4f89d48 2019-08-25 stsp char *label;
3355 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3356 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3359 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
3360 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3361 d3f84d51 2019-07-11 stsp * an unintended typo.
3363 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
3364 d3f84d51 2019-07-11 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3366 a4f89d48 2019-08-25 stsp err = match_object_id(&id, &label, base_branch,
3367 a4f89d48 2019-08-25 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3369 a4f89d48 2019-08-25 stsp return err;
3371 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3372 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3373 4e759de4 2019-06-26 stsp goto done;
3376 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3377 4e759de4 2019-06-26 stsp if (err == NULL) {
3378 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3379 4e759de4 2019-06-26 stsp goto done;
3380 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3381 4e759de4 2019-06-26 stsp goto done;
3383 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
3385 4e759de4 2019-06-26 stsp goto done;
3387 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3390 4e759de4 2019-06-26 stsp got_ref_close(ref);
3392 4e759de4 2019-06-26 stsp free(base_refname);
3393 4e759de4 2019-06-26 stsp free(refname);
3394 4e759de4 2019-06-26 stsp return err;
3397 4e759de4 2019-06-26 stsp static const struct got_error *
3398 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3400 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3401 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3402 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3403 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3404 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3405 4e759de4 2019-06-26 stsp const char *delref = NULL;
3407 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3408 4e759de4 2019-06-26 stsp switch (ch) {
3410 4e759de4 2019-06-26 stsp delref = optarg;
3413 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3414 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3415 4e759de4 2019-06-26 stsp err(1, "-r option");
3416 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3419 4e759de4 2019-06-26 stsp do_list = 1;
3422 4e759de4 2019-06-26 stsp usage_branch();
3423 4e759de4 2019-06-26 stsp /* NOTREACHED */
3427 4e759de4 2019-06-26 stsp if (do_list && delref)
3428 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3430 4e759de4 2019-06-26 stsp argc -= optind;
3431 4e759de4 2019-06-26 stsp argv += optind;
3433 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3434 ad89fa31 2019-10-04 stsp do_show = 1;
3436 4e759de4 2019-06-26 stsp if (do_list || delref) {
3437 4e759de4 2019-06-26 stsp if (argc > 0)
3438 4e759de4 2019-06-26 stsp usage_branch();
3439 ad89fa31 2019-10-04 stsp } else if (!do_show && (argc < 1 || argc > 2))
3440 4e759de4 2019-06-26 stsp usage_branch();
3442 4e759de4 2019-06-26 stsp #ifndef PROFILE
3443 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3444 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3445 4e759de4 2019-06-26 stsp NULL) == -1)
3446 4e759de4 2019-06-26 stsp err(1, "pledge");
3448 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3449 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3450 4e759de4 2019-06-26 stsp err(1, "pledge");
3453 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3454 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3455 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3456 4e759de4 2019-06-26 stsp goto done;
3459 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3460 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3461 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3462 4e759de4 2019-06-26 stsp goto done;
3464 4e759de4 2019-06-26 stsp error = NULL;
3465 4e759de4 2019-06-26 stsp if (worktree) {
3466 4e759de4 2019-06-26 stsp repo_path =
3467 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3468 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3469 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3470 4e759de4 2019-06-26 stsp if (error)
3471 4e759de4 2019-06-26 stsp goto done;
3473 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3474 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3475 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3476 4e759de4 2019-06-26 stsp goto done;
3481 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3482 4e759de4 2019-06-26 stsp if (error != NULL)
3483 4e759de4 2019-06-26 stsp goto done;
3485 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3486 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3487 4e759de4 2019-06-26 stsp if (error)
3488 4e759de4 2019-06-26 stsp goto done;
3490 ad89fa31 2019-10-04 stsp if (do_show)
3491 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3492 ad89fa31 2019-10-04 stsp else if (do_list)
3493 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3494 4e759de4 2019-06-26 stsp else if (delref)
3495 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3497 4e759de4 2019-06-26 stsp const char *base_branch;
3498 4e759de4 2019-06-26 stsp if (argc == 1) {
3499 4e759de4 2019-06-26 stsp base_branch = worktree ?
3500 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3501 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3502 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
3503 dc5351b4 2019-07-30 stsp base_branch += 11;
3505 4e759de4 2019-06-26 stsp base_branch = argv[1];
3506 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
3510 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3511 d0eebce4 2019-03-11 stsp if (worktree)
3512 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3513 d0eebce4 2019-03-11 stsp free(cwd);
3514 d0eebce4 2019-03-11 stsp free(repo_path);
3515 d00136be 2019-03-26 stsp return error;
3519 d00136be 2019-03-26 stsp __dead static void
3520 8e7bd50a 2019-08-22 stsp usage_tag(void)
3522 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3523 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3524 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3529 b8bad2ba 2019-08-23 stsp static const struct got_error *
3530 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3532 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3533 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3534 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3535 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3536 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3538 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3539 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3540 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3541 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3543 b8bad2ba 2019-08-23 stsp return err;
3544 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3547 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3550 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3551 b8bad2ba 2019-08-23 stsp free(re_id);
3554 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3555 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3558 b8bad2ba 2019-08-23 stsp while (se) {
3559 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3562 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3563 b8bad2ba 2019-08-23 stsp free(se_id);
3566 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3567 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3569 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3570 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3572 b8bad2ba 2019-08-23 stsp return err;
3573 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3576 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3581 b8bad2ba 2019-08-23 stsp return err;
3585 8e7bd50a 2019-08-22 stsp static const struct got_error *
3586 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3587 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3589 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3590 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3591 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3592 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3593 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3597 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3599 b8bad2ba 2019-08-23 stsp return err;
3600 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3602 b8bad2ba 2019-08-23 stsp goto done;
3604 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3606 b8bad2ba 2019-08-23 stsp goto done;
3607 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3609 b8bad2ba 2019-08-23 stsp goto done;
3611 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3612 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3614 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3615 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3617 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3618 b8bad2ba 2019-08-23 stsp *cmp = -1;
3620 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3622 b8bad2ba 2019-08-23 stsp free(id1);
3623 b8bad2ba 2019-08-23 stsp free(id2);
3625 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3627 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3628 b8bad2ba 2019-08-23 stsp return err;
3631 b8bad2ba 2019-08-23 stsp static const struct got_error *
3632 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3634 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3635 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3636 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3638 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3640 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3642 8e7bd50a 2019-08-22 stsp return err;
3644 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3645 8e7bd50a 2019-08-22 stsp const char *refname;
3646 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3647 8e7bd50a 2019-08-22 stsp char datebuf[26];
3648 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3649 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3650 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3652 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3653 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3655 8e7bd50a 2019-08-22 stsp refname += 10;
3656 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3657 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3658 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3661 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3662 8e7bd50a 2019-08-22 stsp free(refstr);
3664 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3667 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3671 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3672 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3673 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3674 2417344c 2019-08-23 stsp if (datestr)
3675 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3676 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3677 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3680 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3681 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3682 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3684 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3685 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3687 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3688 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3690 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3691 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3696 8e7bd50a 2019-08-22 stsp free(id_str);
3697 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3698 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3699 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3700 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3704 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3706 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3708 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3709 8e7bd50a 2019-08-22 stsp } while (line);
3710 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3713 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3714 8e7bd50a 2019-08-22 stsp return NULL;
3717 8e7bd50a 2019-08-22 stsp static const struct got_error *
3718 62870f63 2019-08-22 stsp get_tag_message(char **tagmsg, const char *commit_id_str,
3719 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3721 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3722 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3723 8e7bd50a 2019-08-22 stsp char *tagmsg_path = NULL, *editor = NULL;
3724 8e7bd50a 2019-08-22 stsp int fd = -1;
3726 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3727 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3728 8e7bd50a 2019-08-22 stsp goto done;
3731 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3732 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3733 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3734 8e7bd50a 2019-08-22 stsp goto done;
3737 8e7bd50a 2019-08-22 stsp err = got_opentemp_named_fd(&tagmsg_path, &fd, template);
3739 8e7bd50a 2019-08-22 stsp goto done;
3741 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3742 8e7bd50a 2019-08-22 stsp close(fd);
3744 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3746 8e7bd50a 2019-08-22 stsp goto done;
3747 8e7bd50a 2019-08-22 stsp err = edit_logmsg(tagmsg, editor, tagmsg_path, initial_content);
3749 8e7bd50a 2019-08-22 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3750 8e7bd50a 2019-08-22 stsp unlink(tagmsg_path);
3751 8e7bd50a 2019-08-22 stsp free(tagmsg_path);
3752 8e7bd50a 2019-08-22 stsp tagmsg_path = NULL;
3754 8e7bd50a 2019-08-22 stsp free(initial_content);
3755 8e7bd50a 2019-08-22 stsp free(template);
3756 8e7bd50a 2019-08-22 stsp free(editor);
3758 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3759 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3760 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3761 8e7bd50a 2019-08-22 stsp if (err) {
3762 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3763 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3766 8e7bd50a 2019-08-22 stsp return err;
3769 8e7bd50a 2019-08-22 stsp static const struct got_error *
3770 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3771 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3773 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3774 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3775 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3776 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3777 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3780 8e7bd50a 2019-08-22 stsp * Don't let the user create a tag named '-'.
3781 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3782 8e7bd50a 2019-08-22 stsp * an unintended typo.
3784 8e7bd50a 2019-08-22 stsp if (tag_name[0] == '-' && tag_name[1] == '\0')
3785 8e7bd50a 2019-08-22 stsp return got_error(GOT_ERR_BAD_REF_NAME);
3787 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3789 8e7bd50a 2019-08-22 stsp return err;
3791 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3792 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3794 8e7bd50a 2019-08-22 stsp goto done;
3796 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3798 8e7bd50a 2019-08-22 stsp goto done;
3800 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3801 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3802 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3803 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3804 8e7bd50a 2019-08-22 stsp goto done;
3806 8e7bd50a 2019-08-22 stsp tag_name += 10;
3807 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3808 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3809 8e7bd50a 2019-08-22 stsp goto done;
3812 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3813 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3814 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3815 8e7bd50a 2019-08-22 stsp goto done;
3816 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3817 8e7bd50a 2019-08-22 stsp goto done;
3819 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3820 8e7bd50a 2019-08-22 stsp err = get_tag_message(&tagmsg, commit_id_str,
3821 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3823 8e7bd50a 2019-08-22 stsp goto done;
3826 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3827 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3829 8e7bd50a 2019-08-22 stsp goto done;
3831 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3833 8e7bd50a 2019-08-22 stsp goto done;
3835 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3837 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3838 8e7bd50a 2019-08-22 stsp char *tag_id_str;
3839 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&tag_id_str, tag_id);
3840 8e7bd50a 2019-08-22 stsp printf("Created tag %s\n", tag_id_str);
3841 8e7bd50a 2019-08-22 stsp free(tag_id_str);
3845 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3846 8e7bd50a 2019-08-22 stsp free(commit_id);
3847 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3848 8e7bd50a 2019-08-22 stsp free(refname);
3849 8e7bd50a 2019-08-22 stsp free(tagmsg);
3850 aba9c984 2019-09-08 stsp free(tagger);
3851 8e7bd50a 2019-08-22 stsp return err;
3854 8e7bd50a 2019-08-22 stsp static const struct got_error *
3855 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
3857 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
3858 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
3859 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
3860 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3861 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
3862 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3863 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
3865 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3866 8e7bd50a 2019-08-22 stsp switch (ch) {
3868 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
3871 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
3872 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3873 8e7bd50a 2019-08-22 stsp err(1, "-r option");
3874 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
3877 8e7bd50a 2019-08-22 stsp do_list = 1;
3880 8e7bd50a 2019-08-22 stsp usage_tag();
3881 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
3885 8e7bd50a 2019-08-22 stsp argc -= optind;
3886 8e7bd50a 2019-08-22 stsp argv += optind;
3888 8e7bd50a 2019-08-22 stsp if (do_list) {
3889 8e7bd50a 2019-08-22 stsp if (tagmsg)
3890 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
3891 8e7bd50a 2019-08-22 stsp if (argc > 0)
3892 8e7bd50a 2019-08-22 stsp usage_tag();
3893 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
3894 8e7bd50a 2019-08-22 stsp usage_tag();
3895 a2887370 2019-08-23 stsp else if (argc > 1)
3896 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
3897 a2887370 2019-08-23 stsp tag_name = argv[0];
3899 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
3900 8e7bd50a 2019-08-22 stsp if (do_list) {
3901 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3902 8e7bd50a 2019-08-22 stsp NULL) == -1)
3903 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3905 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3906 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
3907 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3910 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
3911 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
3912 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
3913 8e7bd50a 2019-08-22 stsp goto done;
3916 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
3917 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
3918 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3919 8e7bd50a 2019-08-22 stsp goto done;
3921 8e7bd50a 2019-08-22 stsp error = NULL;
3922 8e7bd50a 2019-08-22 stsp if (worktree) {
3923 8e7bd50a 2019-08-22 stsp repo_path =
3924 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
3925 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3926 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
3927 8e7bd50a 2019-08-22 stsp if (error)
3928 8e7bd50a 2019-08-22 stsp goto done;
3930 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
3931 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
3932 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
3933 8e7bd50a 2019-08-22 stsp goto done;
3938 8e7bd50a 2019-08-22 stsp if (do_list) {
3939 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3940 c9956ddf 2019-09-08 stsp if (error != NULL)
3941 c9956ddf 2019-09-08 stsp goto done;
3942 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3943 8e7bd50a 2019-08-22 stsp if (error)
3944 8e7bd50a 2019-08-22 stsp goto done;
3945 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
3947 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
3948 c9956ddf 2019-09-08 stsp if (error)
3949 c9956ddf 2019-09-08 stsp goto done;
3950 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
3951 c9956ddf 2019-09-08 stsp if (error != NULL)
3952 c9956ddf 2019-09-08 stsp goto done;
3954 8e7bd50a 2019-08-22 stsp if (tagmsg) {
3955 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3956 8e7bd50a 2019-08-22 stsp if (error)
3957 8e7bd50a 2019-08-22 stsp goto done;
3960 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
3961 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
3962 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
3963 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
3964 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3965 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
3966 8e7bd50a 2019-08-22 stsp if (error)
3967 8e7bd50a 2019-08-22 stsp goto done;
3968 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3969 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
3970 8e7bd50a 2019-08-22 stsp if (error)
3971 8e7bd50a 2019-08-22 stsp goto done;
3972 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
3973 8e7bd50a 2019-08-22 stsp free(commit_id);
3974 8e7bd50a 2019-08-22 stsp if (error)
3975 8e7bd50a 2019-08-22 stsp goto done;
3978 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
3979 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
3983 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
3984 8e7bd50a 2019-08-22 stsp if (worktree)
3985 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
3986 8e7bd50a 2019-08-22 stsp free(cwd);
3987 8e7bd50a 2019-08-22 stsp free(repo_path);
3988 c9956ddf 2019-09-08 stsp free(gitconfig_path);
3989 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3990 8e7bd50a 2019-08-22 stsp return error;
3993 8e7bd50a 2019-08-22 stsp __dead static void
3994 d00136be 2019-03-26 stsp usage_add(void)
3996 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
4000 d00136be 2019-03-26 stsp static const struct got_error *
4001 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4003 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4004 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4005 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4006 1dd54920 2019-05-11 stsp char *cwd = NULL;
4007 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4008 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4011 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4013 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4014 d00136be 2019-03-26 stsp switch (ch) {
4016 d00136be 2019-03-26 stsp usage_add();
4017 d00136be 2019-03-26 stsp /* NOTREACHED */
4021 d00136be 2019-03-26 stsp argc -= optind;
4022 d00136be 2019-03-26 stsp argv += optind;
4024 43012d58 2019-07-14 stsp #ifndef PROFILE
4025 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4026 43012d58 2019-07-14 stsp NULL) == -1)
4027 43012d58 2019-07-14 stsp err(1, "pledge");
4029 723c305c 2019-05-11 jcs if (argc < 1)
4030 d00136be 2019-03-26 stsp usage_add();
4032 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4033 d00136be 2019-03-26 stsp if (cwd == NULL) {
4034 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4035 d00136be 2019-03-26 stsp goto done;
4038 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4039 d00136be 2019-03-26 stsp if (error)
4040 d00136be 2019-03-26 stsp goto done;
4042 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4044 031a5338 2019-03-26 stsp if (error != NULL)
4045 031a5338 2019-03-26 stsp goto done;
4047 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4048 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4049 d00136be 2019-03-26 stsp if (error)
4050 d00136be 2019-03-26 stsp goto done;
4052 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4053 6d022e97 2019-08-04 stsp if (error)
4054 6d022e97 2019-08-04 stsp goto done;
4056 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
4057 1dd54920 2019-05-11 stsp NULL, repo);
4060 031a5338 2019-03-26 stsp got_repo_close(repo);
4061 d00136be 2019-03-26 stsp if (worktree)
4062 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4063 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4064 1dd54920 2019-05-11 stsp free((char *)pe->path);
4065 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4066 2ec1f75b 2019-03-26 stsp free(cwd);
4067 2ec1f75b 2019-03-26 stsp return error;
4070 2ec1f75b 2019-03-26 stsp __dead static void
4071 648e4ef7 2019-07-09 stsp usage_remove(void)
4073 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4077 2a06fe5f 2019-08-24 stsp static const struct got_error *
4078 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4079 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
4080 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4081 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
4083 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4084 2a06fe5f 2019-08-24 stsp return NULL;
4085 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4086 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4087 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4088 2a06fe5f 2019-08-24 stsp return NULL;
4091 2ec1f75b 2019-03-26 stsp static const struct got_error *
4092 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4094 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4095 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4096 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4097 17ed4618 2019-06-02 stsp char *cwd = NULL;
4098 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4099 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4100 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
4102 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4104 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
4105 2ec1f75b 2019-03-26 stsp switch (ch) {
4107 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4110 2ec1f75b 2019-03-26 stsp usage_add();
4111 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4115 2ec1f75b 2019-03-26 stsp argc -= optind;
4116 2ec1f75b 2019-03-26 stsp argv += optind;
4118 43012d58 2019-07-14 stsp #ifndef PROFILE
4119 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4120 43012d58 2019-07-14 stsp NULL) == -1)
4121 43012d58 2019-07-14 stsp err(1, "pledge");
4123 17ed4618 2019-06-02 stsp if (argc < 1)
4124 648e4ef7 2019-07-09 stsp usage_remove();
4126 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4127 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4128 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4129 2ec1f75b 2019-03-26 stsp goto done;
4131 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4132 2ec1f75b 2019-03-26 stsp if (error)
4133 2ec1f75b 2019-03-26 stsp goto done;
4135 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4138 2ec1f75b 2019-03-26 stsp goto done;
4140 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4141 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4142 2ec1f75b 2019-03-26 stsp if (error)
4143 2ec1f75b 2019-03-26 stsp goto done;
4145 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4146 6d022e97 2019-08-04 stsp if (error)
4147 6d022e97 2019-08-04 stsp goto done;
4149 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4150 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
4151 a129376b 2019-03-28 stsp if (error)
4152 a129376b 2019-03-28 stsp goto done;
4155 a129376b 2019-03-28 stsp got_repo_close(repo);
4156 a129376b 2019-03-28 stsp if (worktree)
4157 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4158 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4159 17ed4618 2019-06-02 stsp free((char *)pe->path);
4160 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4161 a129376b 2019-03-28 stsp free(cwd);
4162 a129376b 2019-03-28 stsp return error;
4165 a129376b 2019-03-28 stsp __dead static void
4166 a129376b 2019-03-28 stsp usage_revert(void)
4168 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4169 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4173 1ee397ad 2019-07-12 stsp static const struct got_error *
4174 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4176 a129376b 2019-03-28 stsp while (path[0] == '/')
4178 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4179 33aa809d 2019-08-08 stsp return NULL;
4182 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4183 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4184 33aa809d 2019-08-08 stsp const char *action;
4187 33aa809d 2019-08-08 stsp static const struct got_error *
4188 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4189 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4191 33aa809d 2019-08-08 stsp char *line = NULL;
4192 33aa809d 2019-08-08 stsp size_t linesize = 0;
4193 33aa809d 2019-08-08 stsp ssize_t linelen;
4195 33aa809d 2019-08-08 stsp switch (status) {
4196 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4197 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4199 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4200 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4202 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4203 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4204 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4205 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4206 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4207 33aa809d 2019-08-08 stsp printf("%s", line);
4208 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4209 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4210 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4211 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4212 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4215 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4218 33aa809d 2019-08-08 stsp return NULL;
4221 33aa809d 2019-08-08 stsp static const struct got_error *
4222 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4223 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4225 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4226 33aa809d 2019-08-08 stsp char *line = NULL;
4227 33aa809d 2019-08-08 stsp size_t linesize = 0;
4228 33aa809d 2019-08-08 stsp ssize_t linelen;
4229 33aa809d 2019-08-08 stsp int resp = ' ';
4230 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4232 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4234 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4236 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4237 33aa809d 2019-08-08 stsp a->action);
4239 33aa809d 2019-08-08 stsp return err;
4240 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4241 33aa809d 2019-08-08 stsp if (linelen == -1) {
4242 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4243 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4244 33aa809d 2019-08-08 stsp return NULL;
4246 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4248 33aa809d 2019-08-08 stsp *nl = '\0';
4249 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4250 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4251 33aa809d 2019-08-08 stsp printf("y\n");
4252 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4253 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4254 33aa809d 2019-08-08 stsp printf("n\n");
4255 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4256 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4257 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4258 33aa809d 2019-08-08 stsp printf("q\n");
4260 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4261 33aa809d 2019-08-08 stsp free(line);
4262 33aa809d 2019-08-08 stsp return NULL;
4265 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4266 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4267 33aa809d 2019-08-08 stsp a->action);
4269 33aa809d 2019-08-08 stsp return err;
4270 33aa809d 2019-08-08 stsp resp = getchar();
4271 33aa809d 2019-08-08 stsp if (resp == '\n')
4272 33aa809d 2019-08-08 stsp resp = getchar();
4273 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4274 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4275 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4276 33aa809d 2019-08-08 stsp resp = ' ';
4278 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4279 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4280 33aa809d 2019-08-08 stsp resp = ' ';
4284 33aa809d 2019-08-08 stsp if (resp == 'y')
4285 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4286 33aa809d 2019-08-08 stsp else if (resp == 'n')
4287 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4288 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4289 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4291 1ee397ad 2019-07-12 stsp return NULL;
4295 a129376b 2019-03-28 stsp static const struct got_error *
4296 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4298 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4299 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4300 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4301 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4302 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4303 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4304 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4305 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4306 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4307 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4309 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4311 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4312 a129376b 2019-03-28 stsp switch (ch) {
4314 33aa809d 2019-08-08 stsp pflag = 1;
4317 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4320 0f6d7415 2019-08-08 stsp can_recurse = 1;
4323 a129376b 2019-03-28 stsp usage_revert();
4324 a129376b 2019-03-28 stsp /* NOTREACHED */
4328 a129376b 2019-03-28 stsp argc -= optind;
4329 a129376b 2019-03-28 stsp argv += optind;
4331 43012d58 2019-07-14 stsp #ifndef PROFILE
4332 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4333 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4334 43012d58 2019-07-14 stsp err(1, "pledge");
4336 e20a8b6f 2019-06-04 stsp if (argc < 1)
4337 a129376b 2019-03-28 stsp usage_revert();
4338 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4339 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4341 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4342 a129376b 2019-03-28 stsp if (cwd == NULL) {
4343 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4344 a129376b 2019-03-28 stsp goto done;
4346 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4347 2ec1f75b 2019-03-26 stsp if (error)
4348 2ec1f75b 2019-03-26 stsp goto done;
4350 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4352 a129376b 2019-03-28 stsp if (error != NULL)
4353 a129376b 2019-03-28 stsp goto done;
4355 33aa809d 2019-08-08 stsp if (patch_script_path) {
4356 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4357 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4358 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4359 33aa809d 2019-08-08 stsp patch_script_path);
4360 33aa809d 2019-08-08 stsp goto done;
4363 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4364 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4365 a129376b 2019-03-28 stsp if (error)
4366 a129376b 2019-03-28 stsp goto done;
4368 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4369 6d022e97 2019-08-04 stsp if (error)
4370 6d022e97 2019-08-04 stsp goto done;
4372 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4373 0f6d7415 2019-08-08 stsp char *ondisk_path;
4374 0f6d7415 2019-08-08 stsp struct stat sb;
4375 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4376 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4377 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4378 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4379 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4380 0f6d7415 2019-08-08 stsp goto done;
4382 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4383 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4384 0f6d7415 2019-08-08 stsp free(ondisk_path);
4387 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4388 0f6d7415 2019-08-08 stsp ondisk_path);
4389 0f6d7415 2019-08-08 stsp free(ondisk_path);
4390 0f6d7415 2019-08-08 stsp goto done;
4392 0f6d7415 2019-08-08 stsp free(ondisk_path);
4393 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4394 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4395 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4396 0f6d7415 2019-08-08 stsp goto done;
4401 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4402 33aa809d 2019-08-08 stsp cpa.action = "revert";
4403 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4404 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4405 a129376b 2019-03-28 stsp if (error)
4406 a129376b 2019-03-28 stsp goto done;
4408 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4409 33aa809d 2019-08-08 stsp error == NULL)
4410 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4412 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4413 2ec1f75b 2019-03-26 stsp if (worktree)
4414 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4415 2ec1f75b 2019-03-26 stsp free(path);
4416 d00136be 2019-03-26 stsp free(cwd);
4417 6bad629b 2019-02-04 stsp return error;
4420 c4296144 2019-05-09 stsp __dead static void
4421 c4296144 2019-05-09 stsp usage_commit(void)
4423 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4424 5c1e53bc 2019-07-28 stsp getprogname());
4428 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4429 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4430 e2ba3d07 2019-05-13 stsp const char *editor;
4431 e0870e44 2019-05-13 stsp const char *worktree_path;
4432 76d98825 2019-06-03 stsp const char *branch_name;
4433 314a6357 2019-05-13 stsp const char *repo_path;
4434 e0870e44 2019-05-13 stsp char *logmsg_path;
4438 33ad4cbe 2019-05-12 jcs static const struct got_error *
4439 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4442 76d98825 2019-06-03 stsp char *initial_content = NULL;
4443 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4444 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4445 e0870e44 2019-05-13 stsp char *template = NULL;
4446 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4448 33ad4cbe 2019-05-12 jcs size_t len;
4450 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4451 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4452 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4453 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4454 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4455 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4456 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4457 33ad4cbe 2019-05-12 jcs return NULL;
4460 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4461 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4463 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4464 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4465 76d98825 2019-06-03 stsp a->branch_name) == -1)
4466 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4468 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4470 e0870e44 2019-05-13 stsp goto done;
4472 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4474 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4475 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4476 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4477 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4478 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4482 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4484 e2af0fd1 2019-08-08 stsp if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
4485 e2af0fd1 2019-08-08 stsp unlink(a->logmsg_path);
4486 e2af0fd1 2019-08-08 stsp free(a->logmsg_path);
4487 e2af0fd1 2019-08-08 stsp a->logmsg_path = NULL;
4489 76d98825 2019-06-03 stsp free(initial_content);
4490 e0870e44 2019-05-13 stsp free(template);
4492 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4493 3ce1b845 2019-07-15 stsp if (err == NULL) {
4494 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4495 3ce1b845 2019-07-15 stsp if (err) {
4496 3ce1b845 2019-07-15 stsp free(*logmsg);
4497 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4500 33ad4cbe 2019-05-12 jcs return err;
4503 c4296144 2019-05-09 stsp static const struct got_error *
4504 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4506 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4507 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4508 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4509 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4510 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4511 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4512 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4513 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4514 916f288c 2019-07-30 stsp int ch, rebase_in_progress, histedit_in_progress;
4515 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4517 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4518 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4520 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4521 c4296144 2019-05-09 stsp switch (ch) {
4523 c4296144 2019-05-09 stsp logmsg = optarg;
4526 c4296144 2019-05-09 stsp usage_commit();
4527 c4296144 2019-05-09 stsp /* NOTREACHED */
4531 c4296144 2019-05-09 stsp argc -= optind;
4532 c4296144 2019-05-09 stsp argv += optind;
4534 43012d58 2019-07-14 stsp #ifndef PROFILE
4535 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4536 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4537 43012d58 2019-07-14 stsp err(1, "pledge");
4539 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4540 c4296144 2019-05-09 stsp if (cwd == NULL) {
4541 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4542 c4296144 2019-05-09 stsp goto done;
4544 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4545 7d5807f4 2019-07-11 stsp if (error)
4546 7d5807f4 2019-07-11 stsp goto done;
4548 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4549 c4296144 2019-05-09 stsp if (error)
4550 a698f62e 2019-07-25 stsp goto done;
4551 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4552 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4553 c4296144 2019-05-09 stsp goto done;
4556 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4557 916f288c 2019-07-30 stsp worktree);
4558 5c1e53bc 2019-07-28 stsp if (error)
4559 5c1e53bc 2019-07-28 stsp goto done;
4561 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4562 c9956ddf 2019-09-08 stsp if (error)
4563 c9956ddf 2019-09-08 stsp goto done;
4564 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4565 c9956ddf 2019-09-08 stsp gitconfig_path);
4566 c4296144 2019-05-09 stsp if (error != NULL)
4567 c4296144 2019-05-09 stsp goto done;
4569 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4570 aba9c984 2019-09-08 stsp if (error)
4571 aba9c984 2019-09-08 stsp return error;
4574 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4575 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4577 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4578 314a6357 2019-05-13 stsp error = get_editor(&editor);
4580 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4581 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4582 c4296144 2019-05-09 stsp if (error)
4583 c4296144 2019-05-09 stsp goto done;
4585 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4586 087fb88c 2019-08-04 stsp if (error)
4587 087fb88c 2019-08-04 stsp goto done;
4589 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4590 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4591 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4592 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4593 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4594 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4595 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4596 916f288c 2019-07-30 stsp goto done;
4598 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4600 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4601 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4602 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4603 e0870e44 2019-05-13 stsp if (error) {
4604 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
4605 e0870e44 2019-05-13 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4606 e0870e44 2019-05-13 stsp getprogname(), cl_arg.logmsg_path);
4607 c4296144 2019-05-09 stsp goto done;
4610 e0870e44 2019-05-13 stsp if (cl_arg.logmsg_path)
4611 e0870e44 2019-05-13 stsp unlink(cl_arg.logmsg_path);
4613 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4614 c4296144 2019-05-09 stsp if (error)
4615 c4296144 2019-05-09 stsp goto done;
4616 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4618 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4620 c4296144 2019-05-09 stsp got_repo_close(repo);
4621 c4296144 2019-05-09 stsp if (worktree)
4622 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4623 c4296144 2019-05-09 stsp free(cwd);
4624 c4296144 2019-05-09 stsp free(id_str);
4625 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4626 e2ba3d07 2019-05-13 stsp free(editor);
4627 aba9c984 2019-09-08 stsp free(author);
4628 234035bc 2019-06-01 stsp return error;
4631 234035bc 2019-06-01 stsp __dead static void
4632 234035bc 2019-06-01 stsp usage_cherrypick(void)
4634 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4638 234035bc 2019-06-01 stsp static const struct got_error *
4639 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4641 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4642 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4643 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4644 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4645 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4646 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4647 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4648 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4649 234035bc 2019-06-01 stsp int ch, did_something = 0;
4651 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4652 234035bc 2019-06-01 stsp switch (ch) {
4654 234035bc 2019-06-01 stsp usage_cherrypick();
4655 234035bc 2019-06-01 stsp /* NOTREACHED */
4659 234035bc 2019-06-01 stsp argc -= optind;
4660 234035bc 2019-06-01 stsp argv += optind;
4662 43012d58 2019-07-14 stsp #ifndef PROFILE
4663 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4664 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4665 43012d58 2019-07-14 stsp err(1, "pledge");
4667 234035bc 2019-06-01 stsp if (argc != 1)
4668 234035bc 2019-06-01 stsp usage_cherrypick();
4670 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4671 234035bc 2019-06-01 stsp if (cwd == NULL) {
4672 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4673 234035bc 2019-06-01 stsp goto done;
4675 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4676 234035bc 2019-06-01 stsp if (error)
4677 234035bc 2019-06-01 stsp goto done;
4679 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4681 234035bc 2019-06-01 stsp if (error != NULL)
4682 234035bc 2019-06-01 stsp goto done;
4684 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4685 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4686 234035bc 2019-06-01 stsp if (error)
4687 234035bc 2019-06-01 stsp goto done;
4689 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4690 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4691 234035bc 2019-06-01 stsp if (error != NULL) {
4692 234035bc 2019-06-01 stsp struct got_reference *ref;
4693 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4694 234035bc 2019-06-01 stsp goto done;
4695 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4696 234035bc 2019-06-01 stsp if (error != NULL)
4697 234035bc 2019-06-01 stsp goto done;
4698 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4699 234035bc 2019-06-01 stsp got_ref_close(ref);
4700 234035bc 2019-06-01 stsp if (error != NULL)
4701 234035bc 2019-06-01 stsp goto done;
4703 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4704 234035bc 2019-06-01 stsp if (error)
4705 234035bc 2019-06-01 stsp goto done;
4707 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4708 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4709 234035bc 2019-06-01 stsp if (error != NULL)
4710 234035bc 2019-06-01 stsp goto done;
4712 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4713 234035bc 2019-06-01 stsp if (error) {
4714 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4715 234035bc 2019-06-01 stsp goto done;
4716 234035bc 2019-06-01 stsp error = NULL;
4718 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4719 234035bc 2019-06-01 stsp goto done;
4722 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4723 234035bc 2019-06-01 stsp if (error)
4724 234035bc 2019-06-01 stsp goto done;
4725 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4726 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4727 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4729 234035bc 2019-06-01 stsp if (error != NULL)
4730 234035bc 2019-06-01 stsp goto done;
4732 234035bc 2019-06-01 stsp if (did_something)
4733 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4735 234035bc 2019-06-01 stsp if (commit)
4736 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4737 234035bc 2019-06-01 stsp free(commit_id_str);
4738 234035bc 2019-06-01 stsp if (head_ref)
4739 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4740 234035bc 2019-06-01 stsp if (worktree)
4741 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4743 234035bc 2019-06-01 stsp got_repo_close(repo);
4744 c4296144 2019-05-09 stsp return error;
4747 5ef14e63 2019-06-02 stsp __dead static void
4748 5ef14e63 2019-06-02 stsp usage_backout(void)
4750 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4754 5ef14e63 2019-06-02 stsp static const struct got_error *
4755 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4757 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4758 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4759 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4760 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4761 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4762 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4763 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4764 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4765 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4767 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4768 5ef14e63 2019-06-02 stsp switch (ch) {
4770 5ef14e63 2019-06-02 stsp usage_backout();
4771 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4775 5ef14e63 2019-06-02 stsp argc -= optind;
4776 5ef14e63 2019-06-02 stsp argv += optind;
4778 43012d58 2019-07-14 stsp #ifndef PROFILE
4779 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4780 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4781 43012d58 2019-07-14 stsp err(1, "pledge");
4783 5ef14e63 2019-06-02 stsp if (argc != 1)
4784 5ef14e63 2019-06-02 stsp usage_backout();
4786 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4787 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4788 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4789 5ef14e63 2019-06-02 stsp goto done;
4791 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4792 5ef14e63 2019-06-02 stsp if (error)
4793 5ef14e63 2019-06-02 stsp goto done;
4795 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4797 5ef14e63 2019-06-02 stsp if (error != NULL)
4798 5ef14e63 2019-06-02 stsp goto done;
4800 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4801 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4802 5ef14e63 2019-06-02 stsp if (error)
4803 5ef14e63 2019-06-02 stsp goto done;
4805 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4806 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4807 5ef14e63 2019-06-02 stsp if (error != NULL) {
4808 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4809 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4810 5ef14e63 2019-06-02 stsp goto done;
4811 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4812 5ef14e63 2019-06-02 stsp if (error != NULL)
4813 5ef14e63 2019-06-02 stsp goto done;
4814 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4815 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4816 5ef14e63 2019-06-02 stsp if (error != NULL)
4817 5ef14e63 2019-06-02 stsp goto done;
4819 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4820 5ef14e63 2019-06-02 stsp if (error)
4821 5ef14e63 2019-06-02 stsp goto done;
4823 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4824 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4825 5ef14e63 2019-06-02 stsp if (error != NULL)
4826 5ef14e63 2019-06-02 stsp goto done;
4828 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4829 5ef14e63 2019-06-02 stsp if (error)
4830 5ef14e63 2019-06-02 stsp goto done;
4832 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4833 5ef14e63 2019-06-02 stsp if (error)
4834 5ef14e63 2019-06-02 stsp goto done;
4835 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4836 5ef14e63 2019-06-02 stsp if (pid == NULL) {
4837 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
4838 5ef14e63 2019-06-02 stsp goto done;
4841 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4842 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
4843 5ef14e63 2019-06-02 stsp if (error != NULL)
4844 5ef14e63 2019-06-02 stsp goto done;
4846 5ef14e63 2019-06-02 stsp if (did_something)
4847 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
4849 5ef14e63 2019-06-02 stsp if (commit)
4850 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
4851 5ef14e63 2019-06-02 stsp free(commit_id_str);
4852 5ef14e63 2019-06-02 stsp if (head_ref)
4853 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
4854 818c7501 2019-07-11 stsp if (worktree)
4855 818c7501 2019-07-11 stsp got_worktree_close(worktree);
4857 818c7501 2019-07-11 stsp got_repo_close(repo);
4858 818c7501 2019-07-11 stsp return error;
4861 818c7501 2019-07-11 stsp __dead static void
4862 818c7501 2019-07-11 stsp usage_rebase(void)
4864 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4865 af54c8f8 2019-07-11 stsp getprogname());
4870 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
4873 0ebf8283 2019-07-24 stsp size_t len;
4875 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
4876 0ebf8283 2019-07-24 stsp if (len > limit)
4877 0ebf8283 2019-07-24 stsp len = limit;
4878 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
4879 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
4881 0ebf8283 2019-07-24 stsp *nl = '\0';
4884 0ebf8283 2019-07-24 stsp static const struct got_error *
4885 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4887 5943eee2 2019-08-13 stsp const struct got_error *err;
4888 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
4889 5943eee2 2019-08-13 stsp const char *s;
4891 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
4893 5943eee2 2019-08-13 stsp return err;
4895 5943eee2 2019-08-13 stsp s = logmsg0;
4896 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
4899 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
4900 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
4901 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4902 5943eee2 2019-08-13 stsp goto done;
4905 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
4907 5943eee2 2019-08-13 stsp free(logmsg0);
4908 5943eee2 2019-08-13 stsp return err;
4911 818c7501 2019-07-11 stsp static const struct got_error *
4912 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
4913 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
4915 818c7501 2019-07-11 stsp const struct got_error *err;
4916 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4918 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
4920 818c7501 2019-07-11 stsp goto done;
4922 ff0d2220 2019-07-11 stsp if (new_id) {
4923 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
4925 ff0d2220 2019-07-11 stsp goto done;
4928 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
4929 ff0d2220 2019-07-11 stsp if (new_id_str)
4930 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
4932 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
4934 0ebf8283 2019-07-24 stsp goto done;
4936 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
4937 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
4939 818c7501 2019-07-11 stsp free(old_id_str);
4940 818c7501 2019-07-11 stsp free(new_id_str);
4941 818c7501 2019-07-11 stsp return err;
4944 1ee397ad 2019-07-12 stsp static const struct got_error *
4945 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
4947 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
4949 818c7501 2019-07-11 stsp while (path[0] == '/')
4951 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
4953 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
4954 1ee397ad 2019-07-12 stsp return NULL;
4955 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4956 818c7501 2019-07-11 stsp *rebase_status = status;
4957 1ee397ad 2019-07-12 stsp return NULL;
4960 818c7501 2019-07-11 stsp static const struct got_error *
4961 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4962 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
4963 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
4965 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
4966 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
4967 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
4970 818c7501 2019-07-11 stsp static const struct got_error *
4971 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
4972 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4973 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
4974 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4976 ff0d2220 2019-07-11 stsp const struct got_error *error;
4977 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
4978 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
4980 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4981 ff0d2220 2019-07-11 stsp if (error)
4982 ff0d2220 2019-07-11 stsp return error;
4984 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4985 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
4986 ff0d2220 2019-07-11 stsp if (error) {
4987 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4988 ff0d2220 2019-07-11 stsp goto done;
4989 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
4991 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
4992 ff0d2220 2019-07-11 stsp free(new_commit_id);
4995 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
4996 ff0d2220 2019-07-11 stsp return error;
4999 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5000 64c6d990 2019-07-11 stsp const char *path_prefix;
5001 64c6d990 2019-07-11 stsp size_t len;
5002 8ca9bd68 2019-07-25 stsp int errcode;
5005 64c6d990 2019-07-11 stsp static const struct got_error *
5006 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5007 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5008 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5009 64c6d990 2019-07-11 stsp struct got_repository *repo)
5011 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5013 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5014 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5015 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5017 64c6d990 2019-07-11 stsp return NULL;
5020 64c6d990 2019-07-11 stsp static const struct got_error *
5021 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5022 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5023 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5025 64c6d990 2019-07-11 stsp const struct got_error *err;
5026 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5027 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5028 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5030 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5031 64c6d990 2019-07-11 stsp return NULL;
5033 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5035 64c6d990 2019-07-11 stsp goto done;
5037 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5039 64c6d990 2019-07-11 stsp goto done;
5041 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5042 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5044 64c6d990 2019-07-11 stsp goto done;
5046 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5047 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5049 64c6d990 2019-07-11 stsp goto done;
5051 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5052 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5053 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5054 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5055 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5056 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5057 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5059 64c6d990 2019-07-11 stsp if (tree1)
5060 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5061 64c6d990 2019-07-11 stsp if (tree2)
5062 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5063 64c6d990 2019-07-11 stsp if (commit)
5064 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5065 64c6d990 2019-07-11 stsp if (parent_commit)
5066 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5067 64c6d990 2019-07-11 stsp return err;
5070 ff0d2220 2019-07-11 stsp static const struct got_error *
5071 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5072 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5073 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5074 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5075 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5077 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5078 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5079 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5080 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5081 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5083 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5085 af61c510 2019-07-19 stsp return err;
5087 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5088 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5090 af61c510 2019-07-19 stsp goto done;
5091 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5092 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5093 af61c510 2019-07-19 stsp if (err) {
5094 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5095 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5096 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5097 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5098 af61c510 2019-07-19 stsp "been reached?!?");
5099 af61c510 2019-07-19 stsp goto done;
5100 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5101 af61c510 2019-07-19 stsp goto done;
5102 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5103 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5105 af61c510 2019-07-19 stsp goto done;
5107 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5108 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5110 af61c510 2019-07-19 stsp goto done;
5112 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5114 af61c510 2019-07-19 stsp goto done;
5115 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5116 af61c510 2019-07-19 stsp commit_id = parent_id;
5120 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5121 af61c510 2019-07-19 stsp return err;
5124 af61c510 2019-07-19 stsp static const struct got_error *
5125 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5127 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5128 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5129 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5130 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5131 818c7501 2019-07-11 stsp char *cwd = NULL;
5132 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5133 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5134 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5135 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5136 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5137 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5138 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5139 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5140 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5141 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5142 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5143 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5145 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5146 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5148 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5149 818c7501 2019-07-11 stsp switch (ch) {
5151 818c7501 2019-07-11 stsp abort_rebase = 1;
5154 818c7501 2019-07-11 stsp continue_rebase = 1;
5157 818c7501 2019-07-11 stsp usage_rebase();
5158 818c7501 2019-07-11 stsp /* NOTREACHED */
5162 818c7501 2019-07-11 stsp argc -= optind;
5163 818c7501 2019-07-11 stsp argv += optind;
5165 43012d58 2019-07-14 stsp #ifndef PROFILE
5166 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5167 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5168 43012d58 2019-07-14 stsp err(1, "pledge");
5170 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5171 818c7501 2019-07-11 stsp usage_rebase();
5172 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5173 818c7501 2019-07-11 stsp if (argc != 0)
5174 818c7501 2019-07-11 stsp usage_rebase();
5175 818c7501 2019-07-11 stsp } else if (argc != 1)
5176 818c7501 2019-07-11 stsp usage_rebase();
5178 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5179 818c7501 2019-07-11 stsp if (cwd == NULL) {
5180 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5181 818c7501 2019-07-11 stsp goto done;
5183 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5184 818c7501 2019-07-11 stsp if (error)
5185 818c7501 2019-07-11 stsp goto done;
5187 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5189 818c7501 2019-07-11 stsp if (error != NULL)
5190 818c7501 2019-07-11 stsp goto done;
5192 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5193 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5194 818c7501 2019-07-11 stsp if (error)
5195 818c7501 2019-07-11 stsp goto done;
5197 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5198 818c7501 2019-07-11 stsp if (error)
5199 818c7501 2019-07-11 stsp goto done;
5201 f6794adc 2019-07-23 stsp if (abort_rebase) {
5202 818c7501 2019-07-11 stsp int did_something;
5203 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5204 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5205 f6794adc 2019-07-23 stsp goto done;
5207 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5208 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5209 3e3a69f1 2019-07-25 stsp worktree, repo);
5210 818c7501 2019-07-11 stsp if (error)
5211 818c7501 2019-07-11 stsp goto done;
5212 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5213 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5214 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5215 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5216 818c7501 2019-07-11 stsp if (error)
5217 818c7501 2019-07-11 stsp goto done;
5218 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5219 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5222 818c7501 2019-07-11 stsp if (continue_rebase) {
5223 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5224 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5225 f6794adc 2019-07-23 stsp goto done;
5227 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5228 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5229 3e3a69f1 2019-07-25 stsp worktree, repo);
5230 818c7501 2019-07-11 stsp if (error)
5231 818c7501 2019-07-11 stsp goto done;
5233 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5234 01757395 2019-07-12 stsp resume_commit_id, repo);
5235 818c7501 2019-07-11 stsp if (error)
5236 818c7501 2019-07-11 stsp goto done;
5238 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5239 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5240 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5241 818c7501 2019-07-11 stsp goto done;
5244 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5245 818c7501 2019-07-11 stsp if (error != NULL)
5246 818c7501 2019-07-11 stsp goto done;
5249 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5250 ff0d2220 2019-07-11 stsp if (error)
5251 ff0d2220 2019-07-11 stsp goto done;
5253 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5254 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5256 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5257 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5258 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5259 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5260 818c7501 2019-07-11 stsp if (error)
5261 818c7501 2019-07-11 stsp goto done;
5262 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5263 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5264 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5265 818c7501 2019-07-11 stsp "with work tree's branch");
5266 818c7501 2019-07-11 stsp goto done;
5269 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5270 a51a74b3 2019-07-27 stsp if (error) {
5271 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5272 a51a74b3 2019-07-27 stsp goto done;
5273 a51a74b3 2019-07-27 stsp error = NULL;
5275 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5276 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5277 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5278 a51a74b3 2019-07-27 stsp goto done;
5280 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5281 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5282 818c7501 2019-07-11 stsp if (error)
5283 818c7501 2019-07-11 stsp goto done;
5286 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5287 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5288 818c7501 2019-07-11 stsp if (error)
5289 818c7501 2019-07-11 stsp goto done;
5291 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5292 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5293 fc66b545 2019-08-12 stsp if (pid == NULL) {
5294 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5295 fc66b545 2019-08-12 stsp int did_something;
5296 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5297 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5298 fc66b545 2019-08-12 stsp &did_something);
5299 fc66b545 2019-08-12 stsp if (error)
5300 fc66b545 2019-08-12 stsp goto done;
5301 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5302 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5304 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5305 fc66b545 2019-08-12 stsp goto done;
5307 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5308 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5309 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5310 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5311 818c7501 2019-07-11 stsp commit = NULL;
5312 818c7501 2019-07-11 stsp if (error)
5313 818c7501 2019-07-11 stsp goto done;
5315 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5316 ff0d2220 2019-07-11 stsp if (continue_rebase)
5317 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5318 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5320 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5321 818c7501 2019-07-11 stsp goto done;
5324 818c7501 2019-07-11 stsp pid = NULL;
5325 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5326 818c7501 2019-07-11 stsp commit_id = qid->id;
5327 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5328 818c7501 2019-07-11 stsp pid = qid;
5330 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5331 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5332 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5333 818c7501 2019-07-11 stsp if (error)
5334 818c7501 2019-07-11 stsp goto done;
5336 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5337 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5341 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5342 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5343 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5344 818c7501 2019-07-11 stsp if (error)
5345 818c7501 2019-07-11 stsp goto done;
5348 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5349 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5350 818c7501 2019-07-11 stsp if (error)
5351 818c7501 2019-07-11 stsp goto done;
5352 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5353 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5355 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5356 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5358 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5359 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5360 818c7501 2019-07-11 stsp free(resume_commit_id);
5361 818c7501 2019-07-11 stsp free(yca_id);
5362 818c7501 2019-07-11 stsp if (commit)
5363 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5364 818c7501 2019-07-11 stsp if (branch)
5365 818c7501 2019-07-11 stsp got_ref_close(branch);
5366 818c7501 2019-07-11 stsp if (new_base_branch)
5367 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5368 818c7501 2019-07-11 stsp if (tmp_branch)
5369 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5370 5ef14e63 2019-06-02 stsp if (worktree)
5371 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5373 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5374 5ef14e63 2019-06-02 stsp return error;
5377 0ebf8283 2019-07-24 stsp __dead static void
5378 0ebf8283 2019-07-24 stsp usage_histedit(void)
5380 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5381 0ebf8283 2019-07-24 stsp getprogname());
5385 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5386 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5387 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5388 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5389 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5391 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5392 0ebf8283 2019-07-24 stsp unsigned char code;
5393 0ebf8283 2019-07-24 stsp const char *name;
5394 0ebf8283 2019-07-24 stsp const char *desc;
5395 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5396 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5397 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5398 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5399 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5400 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5401 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5404 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5405 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5406 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5407 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5408 0ebf8283 2019-07-24 stsp char *logmsg;
5410 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5412 0ebf8283 2019-07-24 stsp static const struct got_error *
5413 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5414 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5416 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5417 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5418 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5421 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5423 0ebf8283 2019-07-24 stsp goto done;
5425 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5427 0ebf8283 2019-07-24 stsp goto done;
5429 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5431 0ebf8283 2019-07-24 stsp goto done;
5433 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5434 0ebf8283 2019-07-24 stsp if (n < 0)
5435 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5437 0ebf8283 2019-07-24 stsp if (commit)
5438 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5439 0ebf8283 2019-07-24 stsp free(id_str);
5440 0ebf8283 2019-07-24 stsp free(logmsg);
5441 0ebf8283 2019-07-24 stsp return err;
5444 0ebf8283 2019-07-24 stsp static const struct got_error *
5445 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5446 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5448 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5449 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5451 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5452 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5454 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5455 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5461 0ebf8283 2019-07-24 stsp return err;
5464 0ebf8283 2019-07-24 stsp static const struct got_error *
5465 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5467 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5470 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5471 0ebf8283 2019-07-24 stsp if (n < 0)
5472 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5474 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5475 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5476 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5477 0ebf8283 2019-07-24 stsp cmd->desc);
5478 0ebf8283 2019-07-24 stsp if (n < 0) {
5479 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5483 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5484 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5485 0ebf8283 2019-07-24 stsp if (n < 0)
5486 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5487 0ebf8283 2019-07-24 stsp return err;
5490 0ebf8283 2019-07-24 stsp static const struct got_error *
5491 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5493 0ebf8283 2019-07-24 stsp static char msg[42];
5496 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5498 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5499 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5501 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5504 0ebf8283 2019-07-24 stsp static const struct got_error *
5505 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5506 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5508 0ebf8283 2019-07-24 stsp const struct got_error *err;
5509 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5510 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5512 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5514 0ebf8283 2019-07-24 stsp return err;
5516 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5518 0ebf8283 2019-07-24 stsp goto done;
5520 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5522 5943eee2 2019-08-13 stsp goto done;
5523 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5524 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5525 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5526 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5527 0ebf8283 2019-07-24 stsp goto done;
5530 0ebf8283 2019-07-24 stsp if (folded_commit)
5531 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5532 0ebf8283 2019-07-24 stsp free(id_str);
5533 5943eee2 2019-08-13 stsp free(folded_logmsg);
5534 0ebf8283 2019-07-24 stsp return err;
5537 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5538 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5540 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5542 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5543 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5544 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5545 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5546 3f9de99f 2019-07-24 stsp folded = prev;
5547 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5550 0ebf8283 2019-07-24 stsp return folded;
5553 0ebf8283 2019-07-24 stsp static const struct got_error *
5554 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5555 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5557 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5558 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5559 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5560 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5562 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5564 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5566 0ebf8283 2019-07-24 stsp return err;
5568 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5569 0ebf8283 2019-07-24 stsp if (folded) {
5570 0ebf8283 2019-07-24 stsp while (folded != hle) {
5571 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5572 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5575 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5576 0ebf8283 2019-07-24 stsp logmsg, repo);
5578 0ebf8283 2019-07-24 stsp goto done;
5579 0ebf8283 2019-07-24 stsp free(logmsg);
5580 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5581 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5585 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5587 0ebf8283 2019-07-24 stsp goto done;
5588 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5590 5943eee2 2019-08-13 stsp goto done;
5591 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5592 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5593 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5594 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5595 0ebf8283 2019-07-24 stsp goto done;
5597 0ebf8283 2019-07-24 stsp free(logmsg);
5598 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5600 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5602 0ebf8283 2019-07-24 stsp goto done;
5604 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5606 0ebf8283 2019-07-24 stsp goto done;
5608 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5609 0ebf8283 2019-07-24 stsp close(fd);
5611 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5613 0ebf8283 2019-07-24 stsp goto done;
5615 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5616 0ebf8283 2019-07-24 stsp if (err) {
5617 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5618 0ebf8283 2019-07-24 stsp goto done;
5619 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5622 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5623 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5624 0ebf8283 2019-07-24 stsp free(logmsg_path);
5625 0ebf8283 2019-07-24 stsp free(logmsg);
5626 5943eee2 2019-08-13 stsp free(orig_logmsg);
5627 0ebf8283 2019-07-24 stsp free(editor);
5628 0ebf8283 2019-07-24 stsp if (commit)
5629 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5630 0ebf8283 2019-07-24 stsp return err;
5633 0ebf8283 2019-07-24 stsp static const struct got_error *
5634 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5635 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5637 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5638 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5639 0ebf8283 2019-07-24 stsp size_t size;
5640 0ebf8283 2019-07-24 stsp ssize_t len;
5641 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5642 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5643 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5644 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5646 0ebf8283 2019-07-24 stsp for (;;) {
5647 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5648 0ebf8283 2019-07-24 stsp if (len == -1) {
5649 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5650 0ebf8283 2019-07-24 stsp if (feof(f))
5652 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5653 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5658 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5660 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5661 0ebf8283 2019-07-24 stsp free(line);
5662 0ebf8283 2019-07-24 stsp line = NULL;
5665 0ebf8283 2019-07-24 stsp cmd = NULL;
5666 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5667 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5668 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5669 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5670 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5673 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5678 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5679 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5682 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5684 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5685 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5686 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5689 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5690 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5694 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5695 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5696 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5700 0ebf8283 2019-07-24 stsp free(line);
5701 0ebf8283 2019-07-24 stsp line = NULL;
5705 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5707 0ebf8283 2019-07-24 stsp *end = '\0';
5709 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5710 0ebf8283 2019-07-24 stsp if (err) {
5711 0ebf8283 2019-07-24 stsp /* override error code */
5712 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5716 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5717 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5718 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5721 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5722 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5723 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5724 0ebf8283 2019-07-24 stsp commit_id = NULL;
5725 0ebf8283 2019-07-24 stsp free(line);
5726 0ebf8283 2019-07-24 stsp line = NULL;
5727 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5730 0ebf8283 2019-07-24 stsp free(line);
5731 0ebf8283 2019-07-24 stsp free(commit_id);
5732 0ebf8283 2019-07-24 stsp return err;
5735 0ebf8283 2019-07-24 stsp static const struct got_error *
5736 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5737 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5739 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5740 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5741 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5742 bfce7f83 2019-07-27 stsp static char msg[80];
5743 bfce7f83 2019-07-27 stsp char *id_str;
5745 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5746 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5747 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5748 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5749 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5751 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5752 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5753 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5756 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5757 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5759 bfce7f83 2019-07-27 stsp return err;
5760 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5761 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5762 bfce7f83 2019-07-27 stsp free(id_str);
5763 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5767 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5768 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5769 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5770 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5772 bfce7f83 2019-07-27 stsp return NULL;
5775 bfce7f83 2019-07-27 stsp static const struct got_error *
5776 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5777 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5778 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5780 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5781 0ebf8283 2019-07-24 stsp char *editor;
5782 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5784 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5786 0ebf8283 2019-07-24 stsp return err;
5788 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5789 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5790 0ebf8283 2019-07-24 stsp goto done;
5793 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5794 0ebf8283 2019-07-24 stsp if (f == NULL) {
5795 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5796 0ebf8283 2019-07-24 stsp goto done;
5798 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5800 bfce7f83 2019-07-27 stsp goto done;
5802 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
5804 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5805 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5806 0ebf8283 2019-07-24 stsp free(editor);
5807 0ebf8283 2019-07-24 stsp return err;
5810 0ebf8283 2019-07-24 stsp static const struct got_error *
5811 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5812 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
5814 0ebf8283 2019-07-24 stsp static const struct got_error *
5815 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
5816 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5818 0ebf8283 2019-07-24 stsp const struct got_error *err;
5819 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5820 0ebf8283 2019-07-24 stsp char *path = NULL;
5822 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
5824 0ebf8283 2019-07-24 stsp return err;
5826 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
5828 0ebf8283 2019-07-24 stsp goto done;
5830 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
5832 0ebf8283 2019-07-24 stsp goto done;
5834 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
5835 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5836 0ebf8283 2019-07-24 stsp goto done;
5840 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
5841 0ebf8283 2019-07-24 stsp if (err) {
5842 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5843 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5844 0ebf8283 2019-07-24 stsp goto done;
5845 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
5846 0ebf8283 2019-07-24 stsp commits, path, repo);
5849 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5850 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5851 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
5852 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
5853 0ebf8283 2019-07-24 stsp free(path);
5854 0ebf8283 2019-07-24 stsp return err;
5857 0ebf8283 2019-07-24 stsp static const struct got_error *
5858 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
5859 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5861 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5862 0ebf8283 2019-07-24 stsp char *path = NULL;
5863 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5864 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5865 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5867 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
5869 0ebf8283 2019-07-24 stsp return err;
5871 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
5872 0ebf8283 2019-07-24 stsp if (f == NULL) {
5873 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5874 0ebf8283 2019-07-24 stsp goto done;
5876 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5877 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5882 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5883 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
5884 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
5885 0ebf8283 2019-07-24 stsp if (n < 0) {
5886 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5892 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5893 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5894 0ebf8283 2019-07-24 stsp free(path);
5895 0ebf8283 2019-07-24 stsp if (commit)
5896 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5897 0ebf8283 2019-07-24 stsp return err;
5901 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
5903 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5905 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
5906 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
5907 bfce7f83 2019-07-27 stsp free(hle);
5911 0ebf8283 2019-07-24 stsp static const struct got_error *
5912 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
5913 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5915 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5916 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5918 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5919 0ebf8283 2019-07-24 stsp if (f == NULL) {
5920 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5921 0ebf8283 2019-07-24 stsp goto done;
5924 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5926 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5927 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5928 0ebf8283 2019-07-24 stsp return err;
5931 0ebf8283 2019-07-24 stsp static const struct got_error *
5932 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5933 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
5934 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
5936 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
5937 0ebf8283 2019-07-24 stsp int resp = ' ';
5939 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
5940 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5941 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
5942 0ebf8283 2019-07-24 stsp resp = getchar();
5943 a61a4414 2019-08-07 stsp if (resp == '\n')
5944 a61a4414 2019-08-07 stsp resp = getchar();
5945 426ebf2e 2019-07-25 stsp if (resp == 'c') {
5946 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5947 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
5949 426ebf2e 2019-07-25 stsp if (err) {
5950 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5951 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5953 bfce7f83 2019-07-27 stsp prev_err = err;
5954 426ebf2e 2019-07-25 stsp resp = ' ';
5958 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
5959 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
5960 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
5961 0ebf8283 2019-07-24 stsp commits, repo);
5962 426ebf2e 2019-07-25 stsp if (err) {
5963 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5964 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5966 bfce7f83 2019-07-27 stsp prev_err = err;
5967 426ebf2e 2019-07-25 stsp resp = ' ';
5971 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
5972 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5975 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
5978 0ebf8283 2019-07-24 stsp return err;
5981 0ebf8283 2019-07-24 stsp static const struct got_error *
5982 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
5983 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5984 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
5986 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
5987 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
5988 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5989 3e3a69f1 2019-07-25 stsp branch, repo);
5992 0ebf8283 2019-07-24 stsp static const struct got_error *
5993 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
5994 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5996 0ebf8283 2019-07-24 stsp const struct got_error *err;
5997 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5999 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6001 0ebf8283 2019-07-24 stsp goto done;
6003 0ebf8283 2019-07-24 stsp if (new_id) {
6004 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6006 0ebf8283 2019-07-24 stsp goto done;
6009 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6010 0ebf8283 2019-07-24 stsp if (new_id_str)
6011 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6013 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6014 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6015 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6016 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6017 0ebf8283 2019-07-24 stsp goto done;
6019 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6021 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6023 0ebf8283 2019-07-24 stsp goto done;
6026 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6027 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6028 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6029 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6030 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6032 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6033 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6034 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6042 0ebf8283 2019-07-24 stsp free(old_id_str);
6043 0ebf8283 2019-07-24 stsp free(new_id_str);
6044 0ebf8283 2019-07-24 stsp return err;
6047 0ebf8283 2019-07-24 stsp static const struct got_error *
6048 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6049 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6050 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6051 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6053 0ebf8283 2019-07-24 stsp const struct got_error *err;
6054 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6055 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6057 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6058 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6059 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6061 0ebf8283 2019-07-24 stsp return err;
6064 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6066 0ebf8283 2019-07-24 stsp return err;
6068 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6069 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6070 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6071 0ebf8283 2019-07-24 stsp if (err) {
6072 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6073 0ebf8283 2019-07-24 stsp goto done;
6074 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6076 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6077 0ebf8283 2019-07-24 stsp free(new_commit_id);
6080 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6081 0ebf8283 2019-07-24 stsp return err;
6084 0ebf8283 2019-07-24 stsp static const struct got_error *
6085 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6086 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6088 0ebf8283 2019-07-24 stsp const struct got_error *error;
6089 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6091 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6093 0ebf8283 2019-07-24 stsp if (error)
6094 0ebf8283 2019-07-24 stsp return error;
6096 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6097 0ebf8283 2019-07-24 stsp if (error)
6098 0ebf8283 2019-07-24 stsp return error;
6100 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6101 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6102 0ebf8283 2019-07-24 stsp return error;
6105 0ebf8283 2019-07-24 stsp static const struct got_error *
6106 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6108 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6109 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6110 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6111 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6112 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6113 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6114 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6115 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6116 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6117 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6118 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6119 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6120 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6121 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6122 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6123 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6124 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6125 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6126 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6127 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6128 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6130 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6131 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6132 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6134 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6135 0ebf8283 2019-07-24 stsp switch (ch) {
6137 0ebf8283 2019-07-24 stsp abort_edit = 1;
6140 0ebf8283 2019-07-24 stsp continue_edit = 1;
6143 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6146 0ebf8283 2019-07-24 stsp usage_histedit();
6147 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6151 0ebf8283 2019-07-24 stsp argc -= optind;
6152 0ebf8283 2019-07-24 stsp argv += optind;
6154 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6155 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6156 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6157 0ebf8283 2019-07-24 stsp err(1, "pledge");
6159 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6160 0ebf8283 2019-07-24 stsp usage_histedit();
6161 0ebf8283 2019-07-24 stsp if (argc != 0)
6162 0ebf8283 2019-07-24 stsp usage_histedit();
6165 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6166 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6167 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6168 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6169 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6170 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6173 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6174 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6175 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6176 0ebf8283 2019-07-24 stsp goto done;
6178 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6179 0ebf8283 2019-07-24 stsp if (error)
6180 0ebf8283 2019-07-24 stsp goto done;
6182 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6184 0ebf8283 2019-07-24 stsp if (error != NULL)
6185 0ebf8283 2019-07-24 stsp goto done;
6187 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6188 0ebf8283 2019-07-24 stsp if (error)
6189 0ebf8283 2019-07-24 stsp goto done;
6190 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6191 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6192 0ebf8283 2019-07-24 stsp goto done;
6195 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6196 0ebf8283 2019-07-24 stsp if (error)
6197 0ebf8283 2019-07-24 stsp goto done;
6199 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6200 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6201 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6202 3e3a69f1 2019-07-25 stsp worktree, repo);
6203 0ebf8283 2019-07-24 stsp if (error)
6204 0ebf8283 2019-07-24 stsp goto done;
6205 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6206 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6207 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6208 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6209 0ebf8283 2019-07-24 stsp if (error)
6210 0ebf8283 2019-07-24 stsp goto done;
6211 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6212 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6213 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6214 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6215 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6216 0ebf8283 2019-07-24 stsp goto done;
6219 0ebf8283 2019-07-24 stsp if (continue_edit) {
6220 0ebf8283 2019-07-24 stsp char *path;
6222 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6223 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6224 0ebf8283 2019-07-24 stsp goto done;
6227 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6228 0ebf8283 2019-07-24 stsp if (error)
6229 0ebf8283 2019-07-24 stsp goto done;
6231 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6232 0ebf8283 2019-07-24 stsp free(path);
6233 0ebf8283 2019-07-24 stsp if (error)
6234 0ebf8283 2019-07-24 stsp goto done;
6236 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6237 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6238 3e3a69f1 2019-07-25 stsp worktree, repo);
6239 0ebf8283 2019-07-24 stsp if (error)
6240 0ebf8283 2019-07-24 stsp goto done;
6242 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6243 0ebf8283 2019-07-24 stsp if (error)
6244 0ebf8283 2019-07-24 stsp goto done;
6246 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6247 0ebf8283 2019-07-24 stsp head_commit_id);
6248 0ebf8283 2019-07-24 stsp if (error)
6249 0ebf8283 2019-07-24 stsp goto done;
6250 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6251 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6252 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6253 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6254 3aac7cf7 2019-07-25 stsp goto done;
6256 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6257 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6258 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6259 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6260 0ebf8283 2019-07-24 stsp commit = NULL;
6261 0ebf8283 2019-07-24 stsp if (error)
6262 0ebf8283 2019-07-24 stsp goto done;
6264 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6265 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6266 0ebf8283 2019-07-24 stsp goto done;
6269 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6270 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6271 0ebf8283 2019-07-24 stsp if (error != NULL)
6272 0ebf8283 2019-07-24 stsp goto done;
6274 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6275 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6276 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6277 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6278 c7d20a3f 2019-07-30 stsp goto done;
6281 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6282 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6283 bfce7f83 2019-07-27 stsp branch = NULL;
6284 0ebf8283 2019-07-24 stsp if (error)
6285 0ebf8283 2019-07-24 stsp goto done;
6287 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6288 0ebf8283 2019-07-24 stsp head_commit_id);
6289 0ebf8283 2019-07-24 stsp if (error)
6290 0ebf8283 2019-07-24 stsp goto done;
6291 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6292 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6293 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6294 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6295 3aac7cf7 2019-07-25 stsp goto done;
6297 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6298 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6299 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6300 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6301 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6302 0ebf8283 2019-07-24 stsp commit = NULL;
6303 0ebf8283 2019-07-24 stsp if (error)
6304 0ebf8283 2019-07-24 stsp goto done;
6306 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6307 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6308 bfce7f83 2019-07-27 stsp if (error)
6309 bfce7f83 2019-07-27 stsp goto done;
6311 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6312 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6313 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6314 6ba2bea2 2019-07-27 stsp if (error) {
6315 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6316 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6317 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6318 0ebf8283 2019-07-24 stsp goto done;
6321 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6323 6ba2bea2 2019-07-27 stsp if (error) {
6324 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6325 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6326 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6327 0ebf8283 2019-07-24 stsp goto done;
6332 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6334 6ba2bea2 2019-07-27 stsp if (error) {
6335 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6336 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6337 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6338 0ebf8283 2019-07-24 stsp goto done;
6343 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6344 4ec14e60 2019-08-28 hiltjo if (error)
6345 0ebf8283 2019-07-24 stsp goto done;
6347 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6348 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6349 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6350 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6353 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6354 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6355 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6356 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6359 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6360 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6362 0ebf8283 2019-07-24 stsp if (error)
6363 0ebf8283 2019-07-24 stsp goto done;
6367 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6368 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6369 0ebf8283 2019-07-24 stsp if (error)
6370 0ebf8283 2019-07-24 stsp goto done;
6374 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6375 0ebf8283 2019-07-24 stsp hle->commit_id);
6376 0ebf8283 2019-07-24 stsp if (error)
6377 0ebf8283 2019-07-24 stsp goto done;
6378 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6379 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6381 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6382 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6383 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6384 0ebf8283 2019-07-24 stsp if (error)
6385 0ebf8283 2019-07-24 stsp goto done;
6386 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6387 0ebf8283 2019-07-24 stsp commit = NULL;
6389 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6390 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6394 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6395 0ebf8283 2019-07-24 stsp char *id_str;
6396 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6397 0ebf8283 2019-07-24 stsp if (error)
6398 0ebf8283 2019-07-24 stsp goto done;
6399 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6401 0ebf8283 2019-07-24 stsp free(id_str);
6402 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6403 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6404 3e3a69f1 2019-07-25 stsp fileindex);
6405 0ebf8283 2019-07-24 stsp goto done;
6408 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6409 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6410 0ebf8283 2019-07-24 stsp if (error)
6411 0ebf8283 2019-07-24 stsp goto done;
6415 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6416 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6417 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6418 0ebf8283 2019-07-24 stsp if (error)
6419 0ebf8283 2019-07-24 stsp goto done;
6422 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6423 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6424 0ebf8283 2019-07-24 stsp if (error)
6425 0ebf8283 2019-07-24 stsp goto done;
6426 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6427 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6429 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6430 3e3a69f1 2019-07-25 stsp branch, repo);
6432 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6433 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6434 0ebf8283 2019-07-24 stsp free(head_commit_id);
6435 0ebf8283 2019-07-24 stsp free(base_commit_id);
6436 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6437 0ebf8283 2019-07-24 stsp if (commit)
6438 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6439 0ebf8283 2019-07-24 stsp if (branch)
6440 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6441 0ebf8283 2019-07-24 stsp if (tmp_branch)
6442 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6443 0ebf8283 2019-07-24 stsp if (worktree)
6444 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6446 715dc77e 2019-08-03 stsp got_repo_close(repo);
6447 715dc77e 2019-08-03 stsp return error;
6450 715dc77e 2019-08-03 stsp __dead static void
6451 715dc77e 2019-08-03 stsp usage_stage(void)
6453 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6454 f3055044 2019-08-07 stsp "[file-path ...]\n",
6455 715dc77e 2019-08-03 stsp getprogname());
6459 715dc77e 2019-08-03 stsp static const struct got_error *
6460 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6461 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6462 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6464 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6465 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6467 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6468 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6469 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6470 408b4ebc 2019-08-03 stsp return NULL;
6472 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6473 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6474 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6476 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6478 408b4ebc 2019-08-03 stsp return err;
6480 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6481 408b4ebc 2019-08-03 stsp free(id_str);
6482 dc424a06 2019-08-07 stsp return NULL;
6485 dc424a06 2019-08-07 stsp static const struct got_error *
6486 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6488 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6489 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6490 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6491 715dc77e 2019-08-03 stsp char *cwd = NULL;
6492 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6493 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6494 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6495 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6496 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6497 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6499 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6501 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6502 715dc77e 2019-08-03 stsp switch (ch) {
6504 408b4ebc 2019-08-03 stsp list_stage = 1;
6507 dc424a06 2019-08-07 stsp pflag = 1;
6510 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6513 715dc77e 2019-08-03 stsp usage_stage();
6514 715dc77e 2019-08-03 stsp /* NOTREACHED */
6518 715dc77e 2019-08-03 stsp argc -= optind;
6519 715dc77e 2019-08-03 stsp argv += optind;
6521 715dc77e 2019-08-03 stsp #ifndef PROFILE
6522 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6523 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6524 715dc77e 2019-08-03 stsp err(1, "pledge");
6526 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6527 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6528 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6529 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6531 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6532 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6533 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6534 715dc77e 2019-08-03 stsp goto done;
6537 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6538 715dc77e 2019-08-03 stsp if (error)
6539 715dc77e 2019-08-03 stsp goto done;
6541 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6543 715dc77e 2019-08-03 stsp if (error != NULL)
6544 715dc77e 2019-08-03 stsp goto done;
6546 dc424a06 2019-08-07 stsp if (patch_script_path) {
6547 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6548 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6549 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6550 dc424a06 2019-08-07 stsp patch_script_path);
6551 dc424a06 2019-08-07 stsp goto done;
6554 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6555 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6556 715dc77e 2019-08-03 stsp if (error)
6557 715dc77e 2019-08-03 stsp goto done;
6559 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6560 6d022e97 2019-08-04 stsp if (error)
6561 6d022e97 2019-08-04 stsp goto done;
6563 6d022e97 2019-08-04 stsp if (list_stage)
6564 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6565 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6567 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6568 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6569 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6570 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6571 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6574 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6575 2e1f37b0 2019-08-08 stsp error == NULL)
6576 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6578 ad493afc 2019-08-03 stsp got_repo_close(repo);
6579 ad493afc 2019-08-03 stsp if (worktree)
6580 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6581 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6582 ad493afc 2019-08-03 stsp free((char *)pe->path);
6583 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6584 ad493afc 2019-08-03 stsp free(cwd);
6585 ad493afc 2019-08-03 stsp return error;
6588 ad493afc 2019-08-03 stsp __dead static void
6589 ad493afc 2019-08-03 stsp usage_unstage(void)
6591 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6592 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6593 ad493afc 2019-08-03 stsp getprogname());
6598 ad493afc 2019-08-03 stsp static const struct got_error *
6599 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6601 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6602 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6603 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6604 ad493afc 2019-08-03 stsp char *cwd = NULL;
6605 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6606 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6607 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6608 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6609 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6610 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6612 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6614 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6615 ad493afc 2019-08-03 stsp switch (ch) {
6617 2e1f37b0 2019-08-08 stsp pflag = 1;
6620 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6623 ad493afc 2019-08-03 stsp usage_unstage();
6624 ad493afc 2019-08-03 stsp /* NOTREACHED */
6628 ad493afc 2019-08-03 stsp argc -= optind;
6629 ad493afc 2019-08-03 stsp argv += optind;
6631 ad493afc 2019-08-03 stsp #ifndef PROFILE
6632 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6633 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6634 ad493afc 2019-08-03 stsp err(1, "pledge");
6636 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6637 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6639 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6640 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6641 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6642 ad493afc 2019-08-03 stsp goto done;
6645 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6646 ad493afc 2019-08-03 stsp if (error)
6647 ad493afc 2019-08-03 stsp goto done;
6649 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6651 ad493afc 2019-08-03 stsp if (error != NULL)
6652 ad493afc 2019-08-03 stsp goto done;
6654 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
6655 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6656 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
6657 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
6658 2e1f37b0 2019-08-08 stsp patch_script_path);
6659 2e1f37b0 2019-08-08 stsp goto done;
6663 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6664 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
6665 ad493afc 2019-08-03 stsp if (error)
6666 ad493afc 2019-08-03 stsp goto done;
6668 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6669 ad493afc 2019-08-03 stsp if (error)
6670 ad493afc 2019-08-03 stsp goto done;
6672 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6673 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
6674 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
6675 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6677 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6678 2e1f37b0 2019-08-08 stsp error == NULL)
6679 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6681 0ebf8283 2019-07-24 stsp got_repo_close(repo);
6682 715dc77e 2019-08-03 stsp if (worktree)
6683 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
6684 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6685 715dc77e 2019-08-03 stsp free((char *)pe->path);
6686 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
6687 715dc77e 2019-08-03 stsp free(cwd);
6688 01073a5d 2019-08-22 stsp return error;
6691 01073a5d 2019-08-22 stsp __dead static void
6692 01073a5d 2019-08-22 stsp usage_cat(void)
6694 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6695 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
6699 01073a5d 2019-08-22 stsp static const struct got_error *
6700 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6702 01073a5d 2019-08-22 stsp const struct got_error *err;
6703 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
6705 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
6707 01073a5d 2019-08-22 stsp return err;
6709 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6710 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
6711 01073a5d 2019-08-22 stsp return err;
6714 01073a5d 2019-08-22 stsp static const struct got_error *
6715 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6717 01073a5d 2019-08-22 stsp const struct got_error *err;
6718 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
6719 01073a5d 2019-08-22 stsp const struct got_tree_entries *entries;
6720 01073a5d 2019-08-22 stsp struct got_tree_entry *te;
6722 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
6724 01073a5d 2019-08-22 stsp return err;
6726 01073a5d 2019-08-22 stsp entries = got_object_tree_get_entries(tree);
6727 01073a5d 2019-08-22 stsp te = SIMPLEQ_FIRST(&entries->head);
6728 01073a5d 2019-08-22 stsp while (te) {
6729 01073a5d 2019-08-22 stsp char *id_str;
6730 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
6732 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, te->id);
6735 01073a5d 2019-08-22 stsp fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6736 01073a5d 2019-08-22 stsp free(id_str);
6737 01073a5d 2019-08-22 stsp te = SIMPLEQ_NEXT(te, entry);
6740 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
6741 01073a5d 2019-08-22 stsp return err;
6744 01073a5d 2019-08-22 stsp static const struct got_error *
6745 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6747 01073a5d 2019-08-22 stsp const struct got_error *err;
6748 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
6749 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
6750 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
6751 01073a5d 2019-08-22 stsp char *id_str = NULL;
6752 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
6754 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
6756 01073a5d 2019-08-22 stsp return err;
6758 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6760 01073a5d 2019-08-22 stsp goto done;
6762 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6763 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6764 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
6765 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
6766 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6767 01073a5d 2019-08-22 stsp char *pid_str;
6768 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
6770 01073a5d 2019-08-22 stsp goto done;
6771 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6772 01073a5d 2019-08-22 stsp free(pid_str);
6774 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6775 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6776 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
6778 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6779 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6780 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
6782 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
6783 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
6784 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
6786 01073a5d 2019-08-22 stsp free(id_str);
6787 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
6788 01073a5d 2019-08-22 stsp return err;
6791 01073a5d 2019-08-22 stsp static const struct got_error *
6792 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6794 01073a5d 2019-08-22 stsp const struct got_error *err;
6795 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
6796 01073a5d 2019-08-22 stsp char *id_str = NULL;
6797 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
6799 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
6801 01073a5d 2019-08-22 stsp return err;
6803 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
6805 01073a5d 2019-08-22 stsp goto done;
6807 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
6809 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
6810 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
6811 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6812 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
6814 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
6815 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6816 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
6818 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
6819 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6820 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
6822 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
6823 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6824 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
6830 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
6831 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
6833 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
6834 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
6835 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
6837 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
6838 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
6839 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
6841 01073a5d 2019-08-22 stsp free(id_str);
6842 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
6843 01073a5d 2019-08-22 stsp return err;
6846 01073a5d 2019-08-22 stsp static const struct got_error *
6847 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
6849 01073a5d 2019-08-22 stsp const struct got_error *error;
6850 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
6851 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
6852 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
6853 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
6854 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
6855 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
6857 01073a5d 2019-08-22 stsp #ifndef PROFILE
6858 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6859 01073a5d 2019-08-22 stsp NULL) == -1)
6860 01073a5d 2019-08-22 stsp err(1, "pledge");
6863 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
6864 01073a5d 2019-08-22 stsp switch (ch) {
6866 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
6869 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
6870 01073a5d 2019-08-22 stsp if (repo_path == NULL)
6871 01073a5d 2019-08-22 stsp err(1, "-r option");
6872 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
6875 896e9b6f 2019-08-26 stsp force_path = 1;
6878 01073a5d 2019-08-22 stsp usage_cat();
6879 01073a5d 2019-08-22 stsp /* NOTREACHED */
6883 01073a5d 2019-08-22 stsp argc -= optind;
6884 01073a5d 2019-08-22 stsp argv += optind;
6886 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
6887 01073a5d 2019-08-22 stsp if (cwd == NULL) {
6888 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
6889 01073a5d 2019-08-22 stsp goto done;
6891 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
6892 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6893 01073a5d 2019-08-22 stsp goto done;
6894 01073a5d 2019-08-22 stsp if (worktree) {
6895 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6896 01073a5d 2019-08-22 stsp repo_path = strdup(
6897 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
6898 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6899 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
6900 01073a5d 2019-08-22 stsp goto done;
6905 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
6906 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
6907 01073a5d 2019-08-22 stsp if (repo_path == NULL)
6908 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
6911 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
6912 01073a5d 2019-08-22 stsp free(repo_path);
6913 01073a5d 2019-08-22 stsp if (error != NULL)
6914 01073a5d 2019-08-22 stsp goto done;
6916 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6917 896e9b6f 2019-08-26 stsp if (error)
6918 896e9b6f 2019-08-26 stsp goto done;
6920 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
6921 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
6922 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
6923 01073a5d 2019-08-22 stsp if (error)
6924 01073a5d 2019-08-22 stsp goto done;
6926 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
6927 896e9b6f 2019-08-26 stsp if (force_path) {
6928 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
6930 896e9b6f 2019-08-26 stsp if (error)
6933 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
6934 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
6935 896e9b6f 2019-08-26 stsp if (error) {
6936 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
6937 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
6939 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
6940 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
6941 896e9b6f 2019-08-26 stsp if (error)
6946 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
6947 01073a5d 2019-08-22 stsp if (error)
6950 01073a5d 2019-08-22 stsp switch (obj_type) {
6951 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
6952 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
6954 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
6955 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
6957 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
6958 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
6960 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
6961 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
6964 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
6967 01073a5d 2019-08-22 stsp if (error)
6969 01073a5d 2019-08-22 stsp free(label);
6970 01073a5d 2019-08-22 stsp label = NULL;
6972 01073a5d 2019-08-22 stsp id = NULL;
6976 01073a5d 2019-08-22 stsp free(label);
6978 896e9b6f 2019-08-26 stsp free(commit_id);
6979 01073a5d 2019-08-22 stsp if (worktree)
6980 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
6981 01073a5d 2019-08-22 stsp if (repo) {
6982 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
6983 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
6984 01073a5d 2019-08-22 stsp if (error == NULL)
6985 01073a5d 2019-08-22 stsp error = repo_error;
6987 0ebf8283 2019-07-24 stsp return error;
