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 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
101 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
102 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
103 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
105 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
106 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
107 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
108 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
110 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
111 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
112 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
113 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
114 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
115 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
116 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
117 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
118 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
119 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
120 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
121 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
122 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
123 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
124 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
125 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
126 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
127 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
128 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
130 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
131 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
132 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
133 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
134 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
135 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
136 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
137 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
138 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
139 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
140 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
141 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
142 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
143 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
144 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
145 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
146 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
147 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
148 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
149 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
150 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
151 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
152 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
153 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
154 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
157 ce5b7c56 2019-07-09 stsp static void
158 ce5b7c56 2019-07-09 stsp list_commands(void)
162 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
163 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
164 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
165 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
167 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
171 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
173 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
174 5c860e29 2018-03-12 stsp unsigned int i;
176 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
178 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
180 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
181 5c860e29 2018-03-12 stsp switch (ch) {
189 ce5b7c56 2019-07-09 stsp usage(hflag);
190 5c860e29 2018-03-12 stsp /* NOTREACHED */
194 5c860e29 2018-03-12 stsp argc -= optind;
195 5c860e29 2018-03-12 stsp argv += optind;
196 1e70621d 2018-03-27 stsp optind = 0;
198 53ccebc2 2019-07-30 stsp if (Vflag) {
199 53ccebc2 2019-07-30 stsp got_version_print_str();
203 5c860e29 2018-03-12 stsp if (argc <= 0)
204 ce5b7c56 2019-07-09 stsp usage(hflag);
206 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
207 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
209 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
210 d7d4f210 2018-03-12 stsp const struct got_error *error;
212 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
214 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
215 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
219 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
221 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
222 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
223 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
224 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
225 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
226 70015d7a 2019-11-08 stsp !(sigint_received &&
227 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
228 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
235 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
236 ce5b7c56 2019-07-09 stsp list_commands();
240 4ed7e80c 2018-05-20 stsp __dead static void
241 ce5b7c56 2019-07-09 stsp usage(int hflag)
243 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
244 53ccebc2 2019-07-30 stsp getprogname());
246 ce5b7c56 2019-07-09 stsp list_commands();
250 0266afb7 2019-01-04 stsp static const struct got_error *
251 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
253 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
254 e2ba3d07 2019-05-13 stsp const char *editor;
256 8920fa04 2019-08-18 stsp *abspath = NULL;
258 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
259 e2ba3d07 2019-05-13 stsp if (editor == NULL)
260 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
262 0ee7065d 2019-05-13 stsp if (editor) {
263 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
265 0ee7065d 2019-05-13 stsp return err;
268 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
269 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
270 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
271 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
274 e2ba3d07 2019-05-13 stsp return NULL;
277 e2ba3d07 2019-05-13 stsp static const struct got_error *
278 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
279 c530dc23 2019-07-23 stsp const char *worktree_path)
281 163ce85a 2019-05-13 stsp const struct got_error *err;
283 37c06ea4 2019-07-15 stsp #ifdef PROFILE
284 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
285 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
287 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
288 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
290 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
291 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
293 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
294 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
296 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
297 163ce85a 2019-05-13 stsp if (err != NULL)
298 163ce85a 2019-05-13 stsp return err;
300 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
301 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
303 0266afb7 2019-01-04 stsp return NULL;
306 2c7829a4 2019-06-17 stsp __dead static void
307 2c7829a4 2019-06-17 stsp usage_init(void)
309 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
313 2c7829a4 2019-06-17 stsp static const struct got_error *
314 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
316 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
317 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
320 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
321 2c7829a4 2019-06-17 stsp switch (ch) {
323 2c7829a4 2019-06-17 stsp usage_init();
324 2c7829a4 2019-06-17 stsp /* NOTREACHED */
328 2c7829a4 2019-06-17 stsp argc -= optind;
329 2c7829a4 2019-06-17 stsp argv += optind;
331 2c7829a4 2019-06-17 stsp #ifndef PROFILE
332 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
333 2c7829a4 2019-06-17 stsp err(1, "pledge");
335 2c7829a4 2019-06-17 stsp if (argc != 1)
336 bc20e173 2019-06-17 stsp usage_init();
338 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
339 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
340 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
342 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
344 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
345 2c7829a4 2019-06-17 stsp if (error &&
346 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
349 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
353 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
354 2c7829a4 2019-06-17 stsp if (error != NULL)
358 3ce1b845 2019-07-15 stsp free(repo_path);
359 3ce1b845 2019-07-15 stsp return error;
362 3ce1b845 2019-07-15 stsp __dead static void
363 3ce1b845 2019-07-15 stsp usage_import(void)
365 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
366 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
371 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
374 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
375 3ce1b845 2019-07-15 stsp int st = -1;
377 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
378 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
379 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
381 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
383 3ce1b845 2019-07-15 stsp goto doneediting;
385 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
386 3ce1b845 2019-07-15 stsp _exit(127);
389 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
390 3ce1b845 2019-07-15 stsp if (errno != EINTR)
393 3ce1b845 2019-07-15 stsp doneediting:
394 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
395 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
396 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
398 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
399 3ce1b845 2019-07-15 stsp errno = EINTR;
403 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
406 3ce1b845 2019-07-15 stsp static const struct got_error *
407 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
408 3ce1b845 2019-07-15 stsp const char *initial_content)
410 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
411 3ce1b845 2019-07-15 stsp char buf[1024];
412 3ce1b845 2019-07-15 stsp struct stat st, st2;
414 3ce1b845 2019-07-15 stsp int content_changed = 0;
415 3ce1b845 2019-07-15 stsp size_t len;
417 3ce1b845 2019-07-15 stsp *logmsg = NULL;
419 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
420 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
422 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
423 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
425 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
426 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
428 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
429 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
430 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
432 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
433 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
434 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
435 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
438 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
439 3ce1b845 2019-07-15 stsp if (fp == NULL) {
440 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
443 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
444 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
445 3ce1b845 2019-07-15 stsp content_changed = 1;
446 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
447 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
448 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
450 3ce1b845 2019-07-15 stsp fclose(fp);
452 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
453 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
457 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
458 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
459 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
462 3ce1b845 2019-07-15 stsp free(*logmsg);
463 3ce1b845 2019-07-15 stsp *logmsg = NULL;
465 3ce1b845 2019-07-15 stsp return err;
468 3ce1b845 2019-07-15 stsp static const struct got_error *
469 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
470 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
472 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
473 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
476 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
477 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
478 3ce1b845 2019-07-15 stsp branch_name) == -1)
479 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
481 ef293bdd 2019-10-21 stsp err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
485 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
488 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
490 3ce1b845 2019-07-15 stsp free(initial_content);
491 3ce1b845 2019-07-15 stsp return err;
494 3ce1b845 2019-07-15 stsp static const struct got_error *
495 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
497 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
498 3ce1b845 2019-07-15 stsp return NULL;
501 3ce1b845 2019-07-15 stsp static const struct got_error *
502 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
504 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
505 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
507 84792843 2019-08-09 stsp *author = NULL;
509 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
510 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
511 c9956ddf 2019-09-08 stsp if (name && email) {
512 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
513 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
514 aba9c984 2019-09-08 stsp return NULL;
517 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
518 84792843 2019-08-09 stsp if (got_author == NULL) {
519 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
520 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
521 c9956ddf 2019-09-08 stsp if (name && email) {
522 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
523 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
524 c9956ddf 2019-09-08 stsp return NULL;
526 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
527 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
530 aba9c984 2019-09-08 stsp *author = strdup(got_author);
531 aba9c984 2019-09-08 stsp if (*author == NULL)
532 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
535 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
536 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
538 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
539 84792843 2019-08-09 stsp got_author++;
540 aba9c984 2019-09-08 stsp if (*got_author != '<') {
541 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
544 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
545 84792843 2019-08-09 stsp got_author++;
546 aba9c984 2019-09-08 stsp if (*got_author != '@') {
547 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
550 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
551 84792843 2019-08-09 stsp got_author++;
552 84792843 2019-08-09 stsp if (*got_author != '>')
553 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
556 aba9c984 2019-09-08 stsp free(*author);
557 aba9c984 2019-09-08 stsp *author = NULL;
559 aba9c984 2019-09-08 stsp return err;
562 c9956ddf 2019-09-08 stsp static const struct got_error *
563 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
565 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
567 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
568 c9956ddf 2019-09-08 stsp if (homedir) {
569 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
570 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
573 c9956ddf 2019-09-08 stsp return NULL;
576 84792843 2019-08-09 stsp static const struct got_error *
577 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
579 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
580 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
581 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
582 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
583 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
584 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
585 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
586 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
588 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
589 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
590 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
592 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
594 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
595 3ce1b845 2019-07-15 stsp switch (ch) {
597 3ce1b845 2019-07-15 stsp branch_name = optarg;
600 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
601 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
602 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
607 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
608 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
609 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
615 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
617 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
623 b2b65d18 2019-08-22 stsp usage_import();
624 3ce1b845 2019-07-15 stsp /* NOTREACHED */
628 3ce1b845 2019-07-15 stsp argc -= optind;
629 3ce1b845 2019-07-15 stsp argv += optind;
631 3ce1b845 2019-07-15 stsp #ifndef PROFILE
632 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
634 3ce1b845 2019-07-15 stsp NULL) == -1)
635 3ce1b845 2019-07-15 stsp err(1, "pledge");
637 3ce1b845 2019-07-15 stsp if (argc != 1)
638 3ce1b845 2019-07-15 stsp usage_import();
640 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
641 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
642 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
643 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
645 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
646 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
649 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
653 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
655 aba9c984 2019-09-08 stsp return error;
657 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
658 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
662 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
663 3ce1b845 2019-07-15 stsp if (error) {
664 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
667 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
668 3ce1b845 2019-07-15 stsp "import target branch already exists");
672 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
673 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
674 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
677 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
680 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
681 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
683 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
684 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
687 8e158b01 2019-09-22 stsp free(logmsg);
688 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
689 ef293bdd 2019-10-21 stsp path_dir, refname);
690 ef293bdd 2019-10-21 stsp if (error) {
691 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
692 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
693 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
698 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
699 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
700 ef293bdd 2019-10-21 stsp if (logmsg_path)
701 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
705 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
706 ef293bdd 2019-10-21 stsp if (error) {
707 ef293bdd 2019-10-21 stsp if (logmsg_path)
708 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
712 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
713 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
714 ef293bdd 2019-10-21 stsp if (error) {
715 ef293bdd 2019-10-21 stsp if (logmsg_path)
716 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
720 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
721 ef293bdd 2019-10-21 stsp if (error) {
722 ef293bdd 2019-10-21 stsp if (logmsg_path)
723 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
727 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
728 ef293bdd 2019-10-21 stsp if (error) {
729 ef293bdd 2019-10-21 stsp if (logmsg_path)
730 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
734 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
735 ef293bdd 2019-10-21 stsp if (error) {
736 ef293bdd 2019-10-21 stsp if (logmsg_path)
737 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
741 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
742 3ce1b845 2019-07-15 stsp if (error) {
743 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
744 ef293bdd 2019-10-21 stsp if (logmsg_path)
745 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
749 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
750 3ce1b845 2019-07-15 stsp branch_ref);
751 ef293bdd 2019-10-21 stsp if (error) {
752 ef293bdd 2019-10-21 stsp if (logmsg_path)
753 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
757 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
758 ef293bdd 2019-10-21 stsp if (error) {
759 ef293bdd 2019-10-21 stsp if (logmsg_path)
760 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
765 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
766 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
768 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
769 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
770 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
771 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
772 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
773 8e158b01 2019-09-22 stsp free(logmsg);
774 ef293bdd 2019-10-21 stsp free(logmsg_path);
775 2c7829a4 2019-06-17 stsp free(repo_path);
776 3ce1b845 2019-07-15 stsp free(editor);
777 3ce1b845 2019-07-15 stsp free(refname);
778 3ce1b845 2019-07-15 stsp free(new_commit_id);
779 3ce1b845 2019-07-15 stsp free(id_str);
780 aba9c984 2019-09-08 stsp free(author);
781 c9956ddf 2019-09-08 stsp free(gitconfig_path);
782 3ce1b845 2019-07-15 stsp if (branch_ref)
783 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
784 3ce1b845 2019-07-15 stsp if (head_ref)
785 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
786 2c7829a4 2019-06-17 stsp return error;
789 4ed7e80c 2018-05-20 stsp __dead static void
790 c09a553d 2018-03-12 stsp usage_checkout(void)
792 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
793 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
797 1ee397ad 2019-07-12 stsp static const struct got_error *
798 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
800 92a684f4 2018-03-12 stsp char *worktree_path = arg;
802 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
803 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
804 1ee397ad 2019-07-12 stsp return NULL;
806 92a684f4 2018-03-12 stsp while (path[0] == '/')
809 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
810 1ee397ad 2019-07-12 stsp return NULL;
813 99437157 2018-11-11 stsp static const struct got_error *
814 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
816 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
817 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
818 99437157 2018-11-11 stsp return NULL;
821 8069f636 2019-01-12 stsp static const struct got_error *
822 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
823 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
824 3aef623b 2019-10-15 stsp struct got_repository *repo)
826 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
827 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
829 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
830 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
832 36a38700 2019-05-10 stsp return err;
834 d5bea539 2019-05-13 stsp if (yca_id == NULL)
835 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
838 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
839 d5bea539 2019-05-13 stsp * and the work tree's base commit.
841 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
843 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
851 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
852 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
853 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
855 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
856 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
857 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
858 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
859 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
860 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
862 d5bea539 2019-05-13 stsp free(yca_id);
863 d5bea539 2019-05-13 stsp return NULL;
866 a367ff0f 2019-05-14 stsp static const struct got_error *
867 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
868 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
869 a51a74b3 2019-07-27 stsp struct got_repository *repo)
871 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
872 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
873 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
874 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
876 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
880 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
881 a51a74b3 2019-07-27 stsp is_same_branch = 1;
884 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
885 a51a74b3 2019-07-27 stsp is_same_branch = 1;
889 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
893 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
894 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
899 a367ff0f 2019-05-14 stsp struct got_object_id *id;
900 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
902 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
903 a367ff0f 2019-05-14 stsp err = NULL;
905 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
907 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
908 6fb7cd11 2019-08-22 stsp repo, check_cancelled, NULL);
914 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
916 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
917 a367ff0f 2019-05-14 stsp is_same_branch = 1;
924 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
925 a367ff0f 2019-05-14 stsp free(head_commit_id);
926 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
927 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
928 04f57cb3 2019-07-25 stsp return err;
931 04f57cb3 2019-07-25 stsp static const struct got_error *
932 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
933 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
935 04f57cb3 2019-07-25 stsp const struct got_error *err;
936 04f57cb3 2019-07-25 stsp struct got_reference *ref;
937 303e2782 2019-08-09 stsp struct got_tag_object *tag;
939 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
940 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
941 303e2782 2019-08-09 stsp if (err == NULL) {
942 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
943 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
944 303e2782 2019-08-09 stsp if (*commit_id == NULL)
945 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
946 303e2782 2019-08-09 stsp got_object_tag_close(tag);
947 303e2782 2019-08-09 stsp return err;
948 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
949 303e2782 2019-08-09 stsp return err;
951 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
952 04f57cb3 2019-07-25 stsp if (err == NULL) {
953 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
954 04f57cb3 2019-07-25 stsp got_ref_close(ref);
956 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
957 04f57cb3 2019-07-25 stsp return err;
958 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
959 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
961 a367ff0f 2019-05-14 stsp return err;
964 4ed7e80c 2018-05-20 stsp static const struct got_error *
965 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
967 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
968 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
969 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
970 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
971 c09a553d 2018-03-12 stsp char *repo_path = NULL;
972 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
973 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
974 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
975 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
976 72151b04 2019-05-11 stsp int ch, same_path_prefix;
977 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
979 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
981 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
982 0bb8a95e 2018-03-12 stsp switch (ch) {
984 08573d5b 2019-05-14 stsp branch_name = optarg;
987 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
988 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
989 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
992 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
995 2deda0b9 2019-03-07 stsp usage_checkout();
996 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1000 0bb8a95e 2018-03-12 stsp argc -= optind;
1001 0bb8a95e 2018-03-12 stsp argv += optind;
1003 6715a751 2018-03-16 stsp #ifndef PROFILE
1004 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1005 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1006 c09a553d 2018-03-12 stsp err(1, "pledge");
1008 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1009 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1010 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1011 76089277 2018-04-01 stsp if (repo_path == NULL)
1012 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1013 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1014 76089277 2018-04-01 stsp if (cwd == NULL) {
1015 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1016 76089277 2018-04-01 stsp goto done;
1018 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1019 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1020 230a42bd 2019-05-11 jcs if (base == NULL) {
1021 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1022 230a42bd 2019-05-11 jcs path_prefix);
1026 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1027 230a42bd 2019-05-11 jcs if (base == NULL) {
1028 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1029 230a42bd 2019-05-11 jcs repo_path);
1033 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1034 c09a553d 2018-03-12 stsp if (dotgit)
1035 c09a553d 2018-03-12 stsp *dotgit = '\0';
1036 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1037 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1038 c09a553d 2018-03-12 stsp free(cwd);
1039 76089277 2018-04-01 stsp goto done;
1041 c09a553d 2018-03-12 stsp free(cwd);
1042 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1043 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1044 76089277 2018-04-01 stsp if (repo_path == NULL) {
1045 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1046 76089277 2018-04-01 stsp goto done;
1048 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1049 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1050 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1051 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1053 b4b3a7dd 2019-07-22 stsp goto done;
1055 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1056 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1057 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1058 b4b3a7dd 2019-07-22 stsp goto done;
1062 c09a553d 2018-03-12 stsp usage_checkout();
1064 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1065 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1067 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1068 c09a553d 2018-03-12 stsp if (error != NULL)
1069 c02c541e 2019-03-29 stsp goto done;
1071 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1072 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1073 c530dc23 2019-07-23 stsp if (error) {
1074 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1075 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1076 c530dc23 2019-07-23 stsp goto done;
1077 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
1078 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1079 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1080 c530dc23 2019-07-23 stsp goto done;
1084 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1085 c02c541e 2019-03-29 stsp if (error)
1086 c09a553d 2018-03-12 stsp goto done;
1088 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1089 c09a553d 2018-03-12 stsp if (error != NULL)
1090 c09a553d 2018-03-12 stsp goto done;
1092 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1093 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1094 c09a553d 2018-03-12 stsp goto done;
1096 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1097 c09a553d 2018-03-12 stsp if (error != NULL)
1098 c09a553d 2018-03-12 stsp goto done;
1100 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1101 e5dc7198 2018-12-29 stsp path_prefix);
1102 e5dc7198 2018-12-29 stsp if (error != NULL)
1103 e5dc7198 2018-12-29 stsp goto done;
1104 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1105 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1106 49520a32 2018-12-29 stsp goto done;
1109 8069f636 2019-01-12 stsp if (commit_id_str) {
1110 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1111 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1112 30837e32 2019-07-25 stsp if (error)
1113 8069f636 2019-01-12 stsp goto done;
1114 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1115 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1116 8069f636 2019-01-12 stsp if (error != NULL) {
1117 8069f636 2019-01-12 stsp free(commit_id);
1118 8069f636 2019-01-12 stsp goto done;
1120 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1121 45d344f6 2019-05-14 stsp if (error)
1122 45d344f6 2019-05-14 stsp goto done;
1123 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1124 8069f636 2019-01-12 stsp commit_id);
1125 8069f636 2019-01-12 stsp free(commit_id);
1126 8069f636 2019-01-12 stsp if (error)
1127 8069f636 2019-01-12 stsp goto done;
1130 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1131 f2ea84fa 2019-07-27 stsp if (error)
1132 f2ea84fa 2019-07-27 stsp goto done;
1133 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1134 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1135 c09a553d 2018-03-12 stsp if (error != NULL)
1136 c09a553d 2018-03-12 stsp goto done;
1138 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1141 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1142 8069f636 2019-01-12 stsp free(commit_id_str);
1143 76089277 2018-04-01 stsp free(repo_path);
1144 507dc3bb 2018-12-29 stsp free(worktree_path);
1145 507dc3bb 2018-12-29 stsp return error;
1148 507dc3bb 2018-12-29 stsp __dead static void
1149 507dc3bb 2018-12-29 stsp usage_update(void)
1151 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1152 507dc3bb 2018-12-29 stsp getprogname());
1156 1ee397ad 2019-07-12 stsp static const struct got_error *
1157 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1159 784955db 2019-01-12 stsp int *did_something = arg;
1161 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1162 1ee397ad 2019-07-12 stsp return NULL;
1164 1545c615 2019-02-10 stsp *did_something = 1;
1166 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1167 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1168 1ee397ad 2019-07-12 stsp return NULL;
1170 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1172 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1173 1ee397ad 2019-07-12 stsp return NULL;
1176 be7061eb 2018-12-30 stsp static const struct got_error *
1177 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1178 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1179 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1181 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1182 a1fb16d8 2019-05-24 stsp char *base_id_str;
1183 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1185 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1186 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1187 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1188 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1189 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1190 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1191 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1194 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1195 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1196 a1fb16d8 2019-05-24 stsp if (err) {
1197 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1198 a1fb16d8 2019-05-24 stsp return err;
1199 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1201 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1202 a1fb16d8 2019-05-24 stsp return NULL;
1204 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1205 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1206 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1208 a1fb16d8 2019-05-24 stsp return err;
1209 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1210 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1211 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1212 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1213 0ebf8283 2019-07-24 stsp return NULL;
1216 0ebf8283 2019-07-24 stsp static const struct got_error *
1217 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1219 0ebf8283 2019-07-24 stsp const struct got_error *err;
1220 0ebf8283 2019-07-24 stsp int in_progress;
1222 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1224 0ebf8283 2019-07-24 stsp return err;
1225 0ebf8283 2019-07-24 stsp if (in_progress)
1226 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1228 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1230 0ebf8283 2019-07-24 stsp return err;
1231 0ebf8283 2019-07-24 stsp if (in_progress)
1232 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1234 a1fb16d8 2019-05-24 stsp return NULL;
1237 a5edda0a 2019-07-27 stsp static const struct got_error *
1238 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1239 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1241 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1242 a5edda0a 2019-07-27 stsp char *path;
1245 a5edda0a 2019-07-27 stsp if (argc == 0) {
1246 a5edda0a 2019-07-27 stsp path = strdup("");
1247 a5edda0a 2019-07-27 stsp if (path == NULL)
1248 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1249 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1252 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1253 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1256 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1257 a5edda0a 2019-07-27 stsp if (err) {
1258 a5edda0a 2019-07-27 stsp free(path);
1263 a5edda0a 2019-07-27 stsp return err;
1266 a1fb16d8 2019-05-24 stsp static const struct got_error *
1267 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1269 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1270 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1271 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1272 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1273 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1274 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1275 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1276 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1277 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1278 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1279 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1281 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1283 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1284 507dc3bb 2018-12-29 stsp switch (ch) {
1286 024e9686 2019-05-14 stsp branch_name = optarg;
1289 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1290 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1291 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1294 2deda0b9 2019-03-07 stsp usage_update();
1295 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1299 507dc3bb 2018-12-29 stsp argc -= optind;
1300 507dc3bb 2018-12-29 stsp argv += optind;
1302 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1303 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1304 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1305 507dc3bb 2018-12-29 stsp err(1, "pledge");
1307 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1308 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1309 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1310 c4cdcb68 2019-04-03 stsp goto done;
1312 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1313 7d5807f4 2019-07-11 stsp if (error)
1314 7d5807f4 2019-07-11 stsp goto done;
1316 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1317 f2ea84fa 2019-07-27 stsp if (error)
1318 f2ea84fa 2019-07-27 stsp goto done;
1320 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1322 507dc3bb 2018-12-29 stsp if (error != NULL)
1323 507dc3bb 2018-12-29 stsp goto done;
1325 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1326 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1327 087fb88c 2019-08-04 stsp if (error)
1328 087fb88c 2019-08-04 stsp goto done;
1330 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1331 0266afb7 2019-01-04 stsp if (error)
1332 0266afb7 2019-01-04 stsp goto done;
1334 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1335 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1336 024e9686 2019-05-14 stsp if (error != NULL)
1337 024e9686 2019-05-14 stsp goto done;
1338 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1339 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1340 9c4b8182 2019-01-02 stsp if (error != NULL)
1341 9c4b8182 2019-01-02 stsp goto done;
1342 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1343 507dc3bb 2018-12-29 stsp if (error != NULL)
1344 507dc3bb 2018-12-29 stsp goto done;
1346 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1347 04f57cb3 2019-07-25 stsp free(commit_id_str);
1348 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1349 30837e32 2019-07-25 stsp if (error)
1350 a297e751 2019-07-11 stsp goto done;
1351 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1352 a297e751 2019-07-11 stsp if (error)
1353 507dc3bb 2018-12-29 stsp goto done;
1356 a1fb16d8 2019-05-24 stsp if (branch_name) {
1357 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1358 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1359 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1361 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1362 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1363 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1364 024e9686 2019-05-14 stsp goto done;
1366 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1367 024e9686 2019-05-14 stsp if (error)
1368 024e9686 2019-05-14 stsp goto done;
1369 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1371 a367ff0f 2019-05-14 stsp free(head_commit_id);
1372 024e9686 2019-05-14 stsp if (error != NULL)
1373 024e9686 2019-05-14 stsp goto done;
1374 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1375 a367ff0f 2019-05-14 stsp if (error)
1376 a367ff0f 2019-05-14 stsp goto done;
1377 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1378 024e9686 2019-05-14 stsp if (error)
1379 024e9686 2019-05-14 stsp goto done;
1381 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1382 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1383 a367ff0f 2019-05-14 stsp if (error != NULL) {
1384 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1385 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1386 024e9686 2019-05-14 stsp goto done;
1388 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1389 a367ff0f 2019-05-14 stsp if (error)
1390 a367ff0f 2019-05-14 stsp goto done;
1393 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1394 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1395 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1396 507dc3bb 2018-12-29 stsp commit_id);
1397 507dc3bb 2018-12-29 stsp if (error)
1398 507dc3bb 2018-12-29 stsp goto done;
1401 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1402 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1403 507dc3bb 2018-12-29 stsp if (error != NULL)
1404 507dc3bb 2018-12-29 stsp goto done;
1406 784955db 2019-01-12 stsp if (did_something)
1407 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1409 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1411 c09a553d 2018-03-12 stsp free(worktree_path);
1412 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1413 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1414 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1415 507dc3bb 2018-12-29 stsp free(commit_id);
1416 9c4b8182 2019-01-02 stsp free(commit_id_str);
1417 c09a553d 2018-03-12 stsp return error;
1420 f42b1b34 2018-03-12 stsp static const struct got_error *
1421 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1422 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1423 63035f9f 2019-10-06 stsp struct got_repository *repo)
1425 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1426 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1428 44392932 2019-08-25 stsp if (blob_id1) {
1429 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1431 44392932 2019-08-25 stsp goto done;
1434 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1436 44392932 2019-08-25 stsp goto done;
1438 44392932 2019-08-25 stsp while (path[0] == '/')
1440 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1441 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1443 44392932 2019-08-25 stsp if (blob1)
1444 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1445 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1446 44392932 2019-08-25 stsp return err;
1449 44392932 2019-08-25 stsp static const struct got_error *
1450 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1451 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1452 63035f9f 2019-10-06 stsp struct got_repository *repo)
1454 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1455 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1456 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1458 44392932 2019-08-25 stsp if (tree_id1) {
1459 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1461 44392932 2019-08-25 stsp goto done;
1464 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1466 0f2b3dca 2018-12-22 stsp goto done;
1468 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1469 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1470 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1471 44392932 2019-08-25 stsp while (path[0] == '/')
1473 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1474 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1476 79109fed 2018-03-27 stsp if (tree1)
1477 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1478 366e0a5f 2019-10-10 stsp if (tree2)
1479 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1480 44392932 2019-08-25 stsp return err;
1483 44392932 2019-08-25 stsp static const struct got_error *
1484 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1485 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1487 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1488 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1489 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1490 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1491 44392932 2019-08-25 stsp struct got_object_qid *qid;
1493 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1494 44392932 2019-08-25 stsp if (qid != NULL) {
1495 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1498 44392932 2019-08-25 stsp return err;
1501 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1502 44392932 2019-08-25 stsp int obj_type;
1503 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1505 44392932 2019-08-25 stsp goto done;
1506 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1507 44392932 2019-08-25 stsp if (err) {
1508 44392932 2019-08-25 stsp free(obj_id2);
1509 44392932 2019-08-25 stsp goto done;
1511 44392932 2019-08-25 stsp if (pcommit) {
1512 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1513 44392932 2019-08-25 stsp qid->id, path);
1514 44392932 2019-08-25 stsp if (err) {
1515 44392932 2019-08-25 stsp free(obj_id2);
1516 44392932 2019-08-25 stsp goto done;
1518 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1519 44392932 2019-08-25 stsp if (err) {
1520 44392932 2019-08-25 stsp free(obj_id2);
1521 44392932 2019-08-25 stsp goto done;
1524 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1525 44392932 2019-08-25 stsp if (err) {
1526 44392932 2019-08-25 stsp free(obj_id2);
1527 44392932 2019-08-25 stsp goto done;
1529 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1530 44392932 2019-08-25 stsp switch (obj_type) {
1531 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1532 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1535 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1536 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1540 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1543 44392932 2019-08-25 stsp free(obj_id1);
1544 44392932 2019-08-25 stsp free(obj_id2);
1546 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1547 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1549 44392932 2019-08-25 stsp goto done;
1550 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1551 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1553 44392932 2019-08-25 stsp goto done;
1554 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1555 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1559 0f2b3dca 2018-12-22 stsp free(id_str1);
1560 0f2b3dca 2018-12-22 stsp free(id_str2);
1561 44392932 2019-08-25 stsp if (pcommit)
1562 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1563 79109fed 2018-03-27 stsp return err;
1566 4bb494d5 2018-06-16 stsp static char *
1567 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1569 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1570 09867e48 2019-08-13 stsp char *p, *s;
1572 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1573 09867e48 2019-08-13 stsp if (tm == NULL)
1574 09867e48 2019-08-13 stsp return NULL;
1575 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1576 09867e48 2019-08-13 stsp if (s == NULL)
1577 09867e48 2019-08-13 stsp return NULL;
1578 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1580 6c281f94 2018-06-11 stsp *p = '\0';
1584 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1586 79109fed 2018-03-27 stsp static const struct got_error *
1587 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1588 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1589 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1591 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1592 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1593 6c281f94 2018-06-11 stsp char datebuf[26];
1594 45d799e2 2018-12-23 stsp time_t committer_time;
1595 45d799e2 2018-12-23 stsp const char *author, *committer;
1596 199a4027 2019-02-02 stsp char *refs_str = NULL;
1597 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1599 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1601 199a4027 2019-02-02 stsp const char *name;
1602 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1605 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1606 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1608 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1609 199a4027 2019-02-02 stsp name += 5;
1610 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1612 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1613 e34f9ed6 2019-02-02 stsp name += 6;
1614 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1615 141c2bff 2019-02-04 stsp name += 8;
1616 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1617 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1618 5d844a1e 2019-08-13 stsp if (err) {
1619 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1620 5d844a1e 2019-08-13 stsp return err;
1621 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1622 5d844a1e 2019-08-13 stsp err = NULL;
1623 5d844a1e 2019-08-13 stsp tag = NULL;
1626 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1627 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1629 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1630 a436ad14 2019-08-13 stsp if (cmp != 0)
1632 199a4027 2019-02-02 stsp s = refs_str;
1633 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1634 199a4027 2019-02-02 stsp name) == -1) {
1635 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1637 34ca4898 2019-08-13 stsp return err;
1641 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1643 8bf5b3c9 2018-03-17 stsp return err;
1645 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1646 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1647 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1648 832c249c 2018-06-10 stsp free(id_str);
1649 d3d493d7 2019-02-21 stsp id_str = NULL;
1650 d3d493d7 2019-02-21 stsp free(refs_str);
1651 d3d493d7 2019-02-21 stsp refs_str = NULL;
1652 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1653 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1654 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1655 09867e48 2019-08-13 stsp if (datestr)
1656 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1657 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1658 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1659 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1660 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1661 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1662 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1663 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1664 3fe1abad 2018-06-10 stsp int n = 1;
1665 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1666 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1667 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1669 a0603db2 2018-06-10 stsp return err;
1670 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1671 a0603db2 2018-06-10 stsp free(id_str);
1675 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1677 5943eee2 2019-08-13 stsp return err;
1679 621015ac 2018-07-23 stsp logmsg = logmsg0;
1681 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1683 832c249c 2018-06-10 stsp printf(" %s\n", line);
1684 832c249c 2018-06-10 stsp } while (line);
1685 621015ac 2018-07-23 stsp free(logmsg0);
1687 971751ac 2018-03-27 stsp if (show_patch) {
1688 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1689 971751ac 2018-03-27 stsp if (err == 0)
1690 971751ac 2018-03-27 stsp printf("\n");
1693 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1694 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1695 07862c20 2018-09-15 stsp return err;
1698 f42b1b34 2018-03-12 stsp static const struct got_error *
1699 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1700 15a94983 2018-12-23 stsp char *path, int show_patch, int diff_context, int limit,
1701 199a4027 2019-02-02 stsp int first_parent_traversal, struct got_reflist_head *refs)
1703 f42b1b34 2018-03-12 stsp const struct got_error *err;
1704 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1706 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1707 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1709 f42b1b34 2018-03-12 stsp return err;
1710 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1711 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1713 fcc85cad 2018-07-22 stsp goto done;
1715 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1716 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1718 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1721 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1722 372ccdbb 2018-06-10 stsp if (err) {
1723 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1724 9ba79e04 2018-06-11 stsp err = NULL;
1727 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1729 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
1730 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1736 b43fbaa0 2018-06-11 stsp if (id == NULL)
1739 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1742 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1743 44392932 2019-08-25 stsp diff_context, refs);
1744 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1745 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1749 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1750 f42b1b34 2018-03-12 stsp return err;
1753 4ed7e80c 2018-05-20 stsp __dead static void
1754 6f3d1eb0 2018-03-12 stsp usage_log(void)
1756 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1757 04ca23f4 2018-07-16 stsp "[-r repository-path] [path]\n", getprogname());
1761 b1ebc001 2019-08-13 stsp static int
1762 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1764 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1765 b1ebc001 2019-08-13 stsp long long n;
1766 b1ebc001 2019-08-13 stsp const char *errstr;
1768 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1769 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1771 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1772 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1777 4ed7e80c 2018-05-20 stsp static const struct got_error *
1778 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1780 f42b1b34 2018-03-12 stsp const struct got_error *error;
1781 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1782 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1783 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1784 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1785 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1786 d142fc45 2018-04-01 stsp char *start_commit = NULL;
1787 c0cc5c62 2018-10-18 stsp int diff_context = 3, ch;
1788 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1789 64a96a6d 2018-04-01 stsp const char *errstr;
1790 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1792 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1794 6715a751 2018-03-16 stsp #ifndef PROFILE
1795 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1798 f42b1b34 2018-03-12 stsp err(1, "pledge");
1801 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1803 cc54c501 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1804 79109fed 2018-03-27 stsp switch (ch) {
1806 79109fed 2018-03-27 stsp show_patch = 1;
1809 d142fc45 2018-04-01 stsp start_commit = optarg;
1812 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1814 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1815 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1818 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1819 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1820 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1823 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1826 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1827 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1828 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1830 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1833 2deda0b9 2019-03-07 stsp usage_log();
1834 79109fed 2018-03-27 stsp /* NOTREACHED */
1838 79109fed 2018-03-27 stsp argc -= optind;
1839 79109fed 2018-03-27 stsp argv += optind;
1841 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1842 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1843 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1844 04ca23f4 2018-07-16 stsp goto done;
1847 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1848 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1849 cffc0aa4 2019-02-05 stsp goto done;
1850 cffc0aa4 2019-02-05 stsp error = NULL;
1852 e7301579 2019-03-18 stsp if (argc == 0) {
1853 cbd1af7a 2019-03-18 stsp path = strdup("");
1854 e7301579 2019-03-18 stsp if (path == NULL) {
1855 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1856 cbd1af7a 2019-03-18 stsp goto done;
1858 e7301579 2019-03-18 stsp } else if (argc == 1) {
1859 e7301579 2019-03-18 stsp if (worktree) {
1860 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1862 e7301579 2019-03-18 stsp if (error)
1863 e7301579 2019-03-18 stsp goto done;
1865 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1866 e7301579 2019-03-18 stsp if (path == NULL) {
1867 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1868 e7301579 2019-03-18 stsp goto done;
1872 cbd1af7a 2019-03-18 stsp usage_log();
1874 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1875 5486daa2 2019-05-11 stsp repo_path = worktree ?
1876 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1878 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1879 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1880 cffc0aa4 2019-02-05 stsp goto done;
1883 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1884 d7d4f210 2018-03-12 stsp if (error != NULL)
1885 04ca23f4 2018-07-16 stsp goto done;
1887 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1888 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1889 c02c541e 2019-03-29 stsp if (error)
1890 c02c541e 2019-03-29 stsp goto done;
1892 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1893 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1894 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1895 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1896 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1897 3235492e 2018-04-01 stsp if (error != NULL)
1898 3235492e 2018-04-01 stsp return error;
1899 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1900 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1901 3235492e 2018-04-01 stsp if (error != NULL)
1902 3235492e 2018-04-01 stsp return error;
1903 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1905 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1906 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1907 3235492e 2018-04-01 stsp if (error == NULL) {
1908 1caad61b 2019-02-01 stsp int obj_type;
1909 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1910 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1911 d1f2edc9 2018-06-13 stsp if (error != NULL)
1912 1caad61b 2019-02-01 stsp goto done;
1913 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1914 1caad61b 2019-02-01 stsp if (error != NULL)
1915 1caad61b 2019-02-01 stsp goto done;
1916 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1917 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1918 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1919 1caad61b 2019-02-01 stsp if (error != NULL)
1920 1caad61b 2019-02-01 stsp goto done;
1921 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1922 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1923 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1924 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1925 1caad61b 2019-02-01 stsp goto done;
1928 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1929 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1930 1caad61b 2019-02-01 stsp if (id == NULL)
1931 638f9024 2019-05-13 stsp error = got_error_from_errno(
1932 230a42bd 2019-05-11 jcs "got_object_id_dup");
1933 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1934 1caad61b 2019-02-01 stsp if (error)
1935 1caad61b 2019-02-01 stsp goto done;
1936 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1937 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1938 1caad61b 2019-02-01 stsp goto done;
1940 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1941 d1f2edc9 2018-06-13 stsp if (error != NULL)
1942 1caad61b 2019-02-01 stsp goto done;
1944 15a94983 2018-12-23 stsp if (commit == NULL) {
1945 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1946 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1947 d1f2edc9 2018-06-13 stsp if (error != NULL)
1948 d1f2edc9 2018-06-13 stsp return error;
1951 d7d4f210 2018-03-12 stsp if (error != NULL)
1952 04ca23f4 2018-07-16 stsp goto done;
1954 deeabeae 2019-08-27 stsp if (worktree) {
1955 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
1957 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
1958 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
1959 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
1960 deeabeae 2019-08-27 stsp goto done;
1962 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
1965 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
1966 04ca23f4 2018-07-16 stsp if (error != NULL)
1967 04ca23f4 2018-07-16 stsp goto done;
1968 04ca23f4 2018-07-16 stsp if (in_repo_path) {
1969 04ca23f4 2018-07-16 stsp free(path);
1970 04ca23f4 2018-07-16 stsp path = in_repo_path;
1973 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
1974 199a4027 2019-02-02 stsp if (error)
1975 199a4027 2019-02-02 stsp goto done;
1977 15a94983 2018-12-23 stsp error = print_commits(id, repo, path, show_patch,
1978 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
1980 04ca23f4 2018-07-16 stsp free(path);
1981 04ca23f4 2018-07-16 stsp free(repo_path);
1982 04ca23f4 2018-07-16 stsp free(cwd);
1984 cffc0aa4 2019-02-05 stsp if (worktree)
1985 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
1986 ad242220 2018-09-08 stsp if (repo) {
1987 ad242220 2018-09-08 stsp const struct got_error *repo_error;
1988 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
1989 ad242220 2018-09-08 stsp if (error == NULL)
1990 ad242220 2018-09-08 stsp error = repo_error;
1992 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
1993 8bf5b3c9 2018-03-17 stsp return error;
1996 4ed7e80c 2018-05-20 stsp __dead static void
1997 3f8b7d6a 2018-04-01 stsp usage_diff(void)
1999 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2000 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2004 b72f483a 2019-02-05 stsp struct print_diff_arg {
2005 b72f483a 2019-02-05 stsp struct got_repository *repo;
2006 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2007 b72f483a 2019-02-05 stsp int diff_context;
2008 3fc0c068 2019-02-10 stsp const char *id_str;
2009 3fc0c068 2019-02-10 stsp int header_shown;
2010 98eaaa12 2019-08-03 stsp int diff_staged;
2011 63035f9f 2019-10-06 stsp int ignore_whitespace;
2014 4ed7e80c 2018-05-20 stsp static const struct got_error *
2015 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2016 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2017 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2019 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2020 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2021 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2022 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2023 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2024 b72f483a 2019-02-05 stsp struct stat sb;
2026 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2027 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2028 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2029 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2030 98eaaa12 2019-08-03 stsp return NULL;
2032 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2033 98eaaa12 2019-08-03 stsp return NULL;
2034 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2035 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2036 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2037 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2038 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2039 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2040 98eaaa12 2019-08-03 stsp return NULL;
2043 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2044 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2045 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2046 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2047 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2050 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2051 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2052 98eaaa12 2019-08-03 stsp switch (staged_status) {
2053 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2054 98eaaa12 2019-08-03 stsp label1 = path;
2055 98eaaa12 2019-08-03 stsp label2 = path;
2057 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2058 98eaaa12 2019-08-03 stsp label2 = path;
2060 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2061 98eaaa12 2019-08-03 stsp label1 = path;
2064 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2066 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2067 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2068 63035f9f 2019-10-06 stsp a->repo, stdout);
2071 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2072 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2073 4ce46740 2019-08-08 stsp char *id_str;
2074 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2077 4ce46740 2019-08-08 stsp goto done;
2078 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2080 4ce46740 2019-08-08 stsp goto done;
2081 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2082 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2083 4ce46740 2019-08-08 stsp free(id_str);
2084 4ce46740 2019-08-08 stsp goto done;
2086 4ce46740 2019-08-08 stsp free(id_str);
2087 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2088 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2090 4ce46740 2019-08-08 stsp goto done;
2093 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2094 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2095 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2096 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2097 2ec1f75b 2019-03-26 stsp goto done;
2100 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
2101 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
2102 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
2103 2ec1f75b 2019-03-26 stsp goto done;
2105 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
2106 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
2107 2ec1f75b 2019-03-26 stsp goto done;
2110 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2112 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2113 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2115 b72f483a 2019-02-05 stsp if (blob1)
2116 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2117 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
2118 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2119 b72f483a 2019-02-05 stsp free(abspath);
2120 927df6b7 2019-02-10 stsp return err;
2123 927df6b7 2019-02-10 stsp static const struct got_error *
2124 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2125 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2126 01073a5d 2019-08-22 stsp struct got_repository *repo)
2128 0adb7196 2019-08-11 stsp const struct got_error *err;
2129 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2130 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2132 0adb7196 2019-08-11 stsp *id = NULL;
2133 0adb7196 2019-08-11 stsp *label = NULL;
2135 01073a5d 2019-08-22 stsp if (resolve_tags) {
2136 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2138 01073a5d 2019-08-22 stsp if (err == NULL) {
2139 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2140 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2141 01073a5d 2019-08-22 stsp if (*id == NULL)
2142 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2143 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2144 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2145 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2146 32f0ab81 2019-08-28 hiltjo free(*id);
2147 01073a5d 2019-08-22 stsp *id = NULL;
2149 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2150 01073a5d 2019-08-22 stsp return err;
2151 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2152 01073a5d 2019-08-22 stsp return err;
2155 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2156 0adb7196 2019-08-11 stsp if (err) {
2157 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2158 0adb7196 2019-08-11 stsp return err;
2159 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2160 0adb7196 2019-08-11 stsp if (err != NULL)
2161 0adb7196 2019-08-11 stsp goto done;
2162 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2163 0adb7196 2019-08-11 stsp if (*label == NULL) {
2164 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2165 0adb7196 2019-08-11 stsp goto done;
2167 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2169 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2170 0adb7196 2019-08-11 stsp if (*label == NULL) {
2171 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2172 0adb7196 2019-08-11 stsp goto done;
2177 0adb7196 2019-08-11 stsp got_ref_close(ref);
2178 0adb7196 2019-08-11 stsp return err;
2182 0adb7196 2019-08-11 stsp static const struct got_error *
2183 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2185 b00d56cd 2018-04-01 stsp const struct got_error *error;
2186 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2187 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2188 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2189 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2190 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2191 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2192 15a94983 2018-12-23 stsp int type1, type2;
2193 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2194 c0cc5c62 2018-10-18 stsp const char *errstr;
2195 927df6b7 2019-02-10 stsp char *path = NULL;
2197 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2198 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2199 25eccc22 2019-01-04 stsp NULL) == -1)
2200 b00d56cd 2018-04-01 stsp err(1, "pledge");
2203 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2204 b00d56cd 2018-04-01 stsp switch (ch) {
2206 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
2207 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2208 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2211 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2212 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2213 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2215 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2218 98eaaa12 2019-08-03 stsp diff_staged = 1;
2221 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2224 2deda0b9 2019-03-07 stsp usage_diff();
2225 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2229 b00d56cd 2018-04-01 stsp argc -= optind;
2230 b00d56cd 2018-04-01 stsp argv += optind;
2232 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2233 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2234 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2235 b72f483a 2019-02-05 stsp goto done;
2237 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2238 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2239 927df6b7 2019-02-10 stsp goto done;
2240 927df6b7 2019-02-10 stsp if (argc <= 1) {
2241 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2242 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2243 927df6b7 2019-02-10 stsp goto done;
2245 b72f483a 2019-02-05 stsp if (repo_path)
2247 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2248 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2249 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2250 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2251 927df6b7 2019-02-10 stsp goto done;
2253 927df6b7 2019-02-10 stsp if (argc == 1) {
2254 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2256 927df6b7 2019-02-10 stsp if (error)
2257 927df6b7 2019-02-10 stsp goto done;
2259 927df6b7 2019-02-10 stsp path = strdup("");
2260 927df6b7 2019-02-10 stsp if (path == NULL) {
2261 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2262 927df6b7 2019-02-10 stsp goto done;
2265 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2266 98eaaa12 2019-08-03 stsp if (diff_staged)
2267 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2268 98eaaa12 2019-08-03 stsp "objects in repository");
2269 15a94983 2018-12-23 stsp id_str1 = argv[0];
2270 15a94983 2018-12-23 stsp id_str2 = argv[1];
2271 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2272 30db809c 2019-06-05 stsp repo_path =
2273 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2274 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2275 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2276 30db809c 2019-06-05 stsp goto done;
2280 b00d56cd 2018-04-01 stsp usage_diff();
2282 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2283 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2284 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2285 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2288 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2289 76089277 2018-04-01 stsp free(repo_path);
2290 b00d56cd 2018-04-01 stsp if (error != NULL)
2291 b00d56cd 2018-04-01 stsp goto done;
2293 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2294 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2295 c02c541e 2019-03-29 stsp if (error)
2296 c02c541e 2019-03-29 stsp goto done;
2298 30db809c 2019-06-05 stsp if (argc <= 1) {
2299 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2300 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2301 b72f483a 2019-02-05 stsp char *id_str;
2303 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2305 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2306 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2307 b72f483a 2019-02-05 stsp if (error)
2308 b72f483a 2019-02-05 stsp goto done;
2309 b72f483a 2019-02-05 stsp arg.repo = repo;
2310 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2311 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2312 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2313 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2314 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2315 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2317 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2318 72ea6654 2019-07-27 stsp if (error)
2319 72ea6654 2019-07-27 stsp goto done;
2321 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2322 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2323 b72f483a 2019-02-05 stsp free(id_str);
2324 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2325 b72f483a 2019-02-05 stsp goto done;
2328 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2330 0adb7196 2019-08-11 stsp if (error)
2331 0adb7196 2019-08-11 stsp goto done;
2333 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2335 0adb7196 2019-08-11 stsp if (error)
2336 0adb7196 2019-08-11 stsp goto done;
2338 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2339 15a94983 2018-12-23 stsp if (error)
2340 15a94983 2018-12-23 stsp goto done;
2342 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2343 15a94983 2018-12-23 stsp if (error)
2344 15a94983 2018-12-23 stsp goto done;
2346 15a94983 2018-12-23 stsp if (type1 != type2) {
2347 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2348 b00d56cd 2018-04-01 stsp goto done;
2351 15a94983 2018-12-23 stsp switch (type1) {
2352 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2353 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2354 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2356 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2357 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2358 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2360 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2361 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2362 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2363 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2366 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2370 5e70831e 2019-05-28 stsp free(label1);
2371 5e70831e 2019-05-28 stsp free(label2);
2372 15a94983 2018-12-23 stsp free(id1);
2373 15a94983 2018-12-23 stsp free(id2);
2374 927df6b7 2019-02-10 stsp free(path);
2375 b72f483a 2019-02-05 stsp if (worktree)
2376 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2377 ad242220 2018-09-08 stsp if (repo) {
2378 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2379 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2380 ad242220 2018-09-08 stsp if (error == NULL)
2381 ad242220 2018-09-08 stsp error = repo_error;
2383 b00d56cd 2018-04-01 stsp return error;
2386 404c43c4 2018-06-21 stsp __dead static void
2387 404c43c4 2018-06-21 stsp usage_blame(void)
2389 9270e621 2019-02-05 stsp fprintf(stderr,
2390 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2391 404c43c4 2018-06-21 stsp getprogname());
2395 28315671 2019-08-14 stsp struct blame_line {
2396 28315671 2019-08-14 stsp int annotated;
2397 28315671 2019-08-14 stsp char *id_str;
2398 82f6abb8 2019-08-14 stsp char *committer;
2399 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2402 28315671 2019-08-14 stsp struct blame_cb_args {
2403 28315671 2019-08-14 stsp struct blame_line *lines;
2404 28315671 2019-08-14 stsp int nlines;
2405 7ef28ff8 2019-08-14 stsp int nlines_prec;
2406 28315671 2019-08-14 stsp int lineno_cur;
2407 28315671 2019-08-14 stsp off_t *line_offsets;
2409 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2412 404c43c4 2018-06-21 stsp static const struct got_error *
2413 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2415 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2416 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2417 28315671 2019-08-14 stsp struct blame_line *bline;
2418 82f6abb8 2019-08-14 stsp char *line = NULL;
2419 28315671 2019-08-14 stsp size_t linesize = 0;
2420 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2421 28315671 2019-08-14 stsp off_t offset;
2422 bcb49d15 2019-08-14 stsp struct tm tm;
2423 bcb49d15 2019-08-14 stsp time_t committer_time;
2425 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2426 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2427 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2429 28315671 2019-08-14 stsp if (sigint_received)
2430 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2432 2839f8b9 2019-08-18 stsp if (lineno == -1)
2433 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2435 28315671 2019-08-14 stsp /* Annotate this line. */
2436 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2437 28315671 2019-08-14 stsp if (bline->annotated)
2438 28315671 2019-08-14 stsp return NULL;
2439 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2441 28315671 2019-08-14 stsp return err;
2443 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2445 82f6abb8 2019-08-14 stsp goto done;
2447 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2448 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2449 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2450 bcb49d15 2019-08-14 stsp goto done;
2453 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2454 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2455 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2456 11db6024 2019-10-21 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G/%m/%d",
2457 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2458 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2459 82f6abb8 2019-08-14 stsp goto done;
2461 28315671 2019-08-14 stsp bline->annotated = 1;
2463 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2464 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2465 28315671 2019-08-14 stsp if (!bline->annotated)
2466 82f6abb8 2019-08-14 stsp goto done;
2468 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2469 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2470 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2471 82f6abb8 2019-08-14 stsp goto done;
2474 28315671 2019-08-14 stsp while (bline->annotated) {
2475 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2476 82f6abb8 2019-08-14 stsp size_t len;
2478 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2479 28315671 2019-08-14 stsp if (ferror(a->f))
2480 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2484 82f6abb8 2019-08-14 stsp committer = bline->committer;
2485 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2486 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2487 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2488 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2490 82f6abb8 2019-08-14 stsp *at = '\0';
2491 82f6abb8 2019-08-14 stsp len = strlen(committer);
2492 82f6abb8 2019-08-14 stsp if (len >= 9)
2493 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2495 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2497 28315671 2019-08-14 stsp *nl = '\0';
2498 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2499 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2501 28315671 2019-08-14 stsp a->lineno_cur++;
2502 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2505 82f6abb8 2019-08-14 stsp if (commit)
2506 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2507 28315671 2019-08-14 stsp free(line);
2508 28315671 2019-08-14 stsp return err;
2511 28315671 2019-08-14 stsp static const struct got_error *
2512 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2514 404c43c4 2018-06-21 stsp const struct got_error *error;
2515 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2516 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2517 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2518 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2519 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2520 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2521 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2522 28315671 2019-08-14 stsp struct blame_cb_args bca;
2523 28315671 2019-08-14 stsp int ch, obj_type, i;
2524 b02560ec 2019-08-19 stsp size_t filesize;
2526 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2528 404c43c4 2018-06-21 stsp #ifndef PROFILE
2529 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2530 36e2fb66 2019-01-04 stsp NULL) == -1)
2531 404c43c4 2018-06-21 stsp err(1, "pledge");
2534 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2535 404c43c4 2018-06-21 stsp switch (ch) {
2537 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2540 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2541 66bea077 2018-08-02 stsp if (repo_path == NULL)
2542 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2544 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2547 2deda0b9 2019-03-07 stsp usage_blame();
2548 404c43c4 2018-06-21 stsp /* NOTREACHED */
2552 404c43c4 2018-06-21 stsp argc -= optind;
2553 404c43c4 2018-06-21 stsp argv += optind;
2555 a39318fd 2018-08-02 stsp if (argc == 1)
2556 404c43c4 2018-06-21 stsp path = argv[0];
2558 404c43c4 2018-06-21 stsp usage_blame();
2560 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2561 66bea077 2018-08-02 stsp if (cwd == NULL) {
2562 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2563 66bea077 2018-08-02 stsp goto done;
2565 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2566 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2567 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2568 66bea077 2018-08-02 stsp goto done;
2570 0c06baac 2019-02-05 stsp error = NULL;
2571 0c06baac 2019-02-05 stsp if (worktree) {
2572 0c06baac 2019-02-05 stsp repo_path =
2573 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2574 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2575 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2576 0c06baac 2019-02-05 stsp if (error)
2577 0c06baac 2019-02-05 stsp goto done;
2579 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2580 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2581 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2582 0c06baac 2019-02-05 stsp goto done;
2587 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2588 c02c541e 2019-03-29 stsp if (error != NULL)
2589 36e2fb66 2019-01-04 stsp goto done;
2591 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2592 c02c541e 2019-03-29 stsp if (error)
2593 404c43c4 2018-06-21 stsp goto done;
2595 0c06baac 2019-02-05 stsp if (worktree) {
2596 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2597 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2598 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2599 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2600 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2601 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2602 6efaaa2d 2019-02-05 stsp path) == -1) {
2603 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2604 0c06baac 2019-02-05 stsp goto done;
2606 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2609 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2611 0c06baac 2019-02-05 stsp if (error)
2612 66bea077 2018-08-02 stsp goto done;
2614 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2615 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2616 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2617 404c43c4 2018-06-21 stsp if (error != NULL)
2618 66bea077 2018-08-02 stsp goto done;
2619 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2620 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2621 404c43c4 2018-06-21 stsp if (error != NULL)
2622 66bea077 2018-08-02 stsp goto done;
2624 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2625 30837e32 2019-07-25 stsp if (error)
2626 66bea077 2018-08-02 stsp goto done;
2629 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2630 28315671 2019-08-14 stsp if (error)
2631 28315671 2019-08-14 stsp goto done;
2632 28315671 2019-08-14 stsp if (obj_id == NULL) {
2633 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2634 28315671 2019-08-14 stsp goto done;
2637 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2638 28315671 2019-08-14 stsp if (error)
2639 28315671 2019-08-14 stsp goto done;
2641 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2642 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2643 28315671 2019-08-14 stsp goto done;
2646 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2647 28315671 2019-08-14 stsp if (error)
2648 28315671 2019-08-14 stsp goto done;
2649 28315671 2019-08-14 stsp bca.f = got_opentemp();
2650 28315671 2019-08-14 stsp if (bca.f == NULL) {
2651 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2652 28315671 2019-08-14 stsp goto done;
2654 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2655 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2656 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2657 28315671 2019-08-14 stsp goto done;
2659 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2660 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2661 b02560ec 2019-08-19 stsp bca.nlines--;
2663 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2664 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2665 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2666 28315671 2019-08-14 stsp goto done;
2668 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2669 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2670 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2671 7ef28ff8 2019-08-14 stsp while (i > 0) {
2673 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2675 82f6abb8 2019-08-14 stsp bca.repo = repo;
2677 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2678 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2679 28315671 2019-08-14 stsp if (error)
2680 28315671 2019-08-14 stsp goto done;
2682 66bea077 2018-08-02 stsp free(in_repo_path);
2683 66bea077 2018-08-02 stsp free(repo_path);
2684 66bea077 2018-08-02 stsp free(cwd);
2685 404c43c4 2018-06-21 stsp free(commit_id);
2686 28315671 2019-08-14 stsp free(obj_id);
2688 28315671 2019-08-14 stsp got_object_blob_close(blob);
2689 0c06baac 2019-02-05 stsp if (worktree)
2690 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2691 ad242220 2018-09-08 stsp if (repo) {
2692 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2693 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2694 ad242220 2018-09-08 stsp if (error == NULL)
2695 ad242220 2018-09-08 stsp error = repo_error;
2697 3affba96 2019-09-22 stsp if (bca.lines) {
2698 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2699 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2700 3affba96 2019-09-22 stsp free(bline->id_str);
2701 3affba96 2019-09-22 stsp free(bline->committer);
2703 3affba96 2019-09-22 stsp free(bca.lines);
2705 28315671 2019-08-14 stsp free(bca.line_offsets);
2706 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2707 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2708 404c43c4 2018-06-21 stsp return error;
2711 5de5890b 2018-10-18 stsp __dead static void
2712 5de5890b 2018-10-18 stsp usage_tree(void)
2714 c1669e2e 2019-01-09 stsp fprintf(stderr,
2715 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2716 5de5890b 2018-10-18 stsp getprogname());
2720 c1669e2e 2019-01-09 stsp static void
2721 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2722 c1669e2e 2019-01-09 stsp const char *root_path)
2724 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2725 848d6979 2019-08-12 stsp const char *modestr = "";
2727 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2728 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2731 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2732 63c5ca5d 2019-08-24 stsp modestr = "$";
2733 63c5ca5d 2019-08-24 stsp else if (S_ISLNK(te->mode))
2734 848d6979 2019-08-12 stsp modestr = "@";
2735 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
2736 848d6979 2019-08-12 stsp modestr = "/";
2737 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
2738 848d6979 2019-08-12 stsp modestr = "*";
2740 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2741 848d6979 2019-08-12 stsp is_root_path ? "" : "/", te->name, modestr);
2744 5de5890b 2018-10-18 stsp static const struct got_error *
2745 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2746 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2747 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2749 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2750 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2751 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2752 5de5890b 2018-10-18 stsp const struct got_tree_entries *entries;
2753 5de5890b 2018-10-18 stsp struct got_tree_entry *te;
2755 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2757 5de5890b 2018-10-18 stsp goto done;
2759 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2761 5de5890b 2018-10-18 stsp goto done;
2762 5de5890b 2018-10-18 stsp entries = got_object_tree_get_entries(tree);
2763 5de5890b 2018-10-18 stsp te = SIMPLEQ_FIRST(&entries->head);
2764 5de5890b 2018-10-18 stsp while (te) {
2765 5de5890b 2018-10-18 stsp char *id = NULL;
2767 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2770 5de5890b 2018-10-18 stsp if (show_ids) {
2771 5de5890b 2018-10-18 stsp char *id_str;
2772 5de5890b 2018-10-18 stsp err = got_object_id_str(&id_str, te->id);
2774 5de5890b 2018-10-18 stsp goto done;
2775 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2776 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2777 5de5890b 2018-10-18 stsp free(id_str);
2778 5de5890b 2018-10-18 stsp goto done;
2780 5de5890b 2018-10-18 stsp free(id_str);
2782 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2785 c1669e2e 2019-01-09 stsp if (recurse && S_ISDIR(te->mode)) {
2786 c1669e2e 2019-01-09 stsp char *child_path;
2787 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2788 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2789 c1669e2e 2019-01-09 stsp te->name) == -1) {
2790 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2791 c1669e2e 2019-01-09 stsp goto done;
2793 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2794 c1669e2e 2019-01-09 stsp root_path, repo);
2795 c1669e2e 2019-01-09 stsp free(child_path);
2797 c1669e2e 2019-01-09 stsp goto done;
2800 c1669e2e 2019-01-09 stsp te = SIMPLEQ_NEXT(te, entry);
2804 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2805 5de5890b 2018-10-18 stsp free(tree_id);
2806 5de5890b 2018-10-18 stsp return err;
2809 5de5890b 2018-10-18 stsp static const struct got_error *
2810 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2812 5de5890b 2018-10-18 stsp const struct got_error *error;
2813 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2814 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2815 7a2c19d6 2019-02-05 stsp const char *path;
2816 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2817 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2818 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2819 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2822 5de5890b 2018-10-18 stsp #ifndef PROFILE
2823 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2824 0f8d269b 2019-01-04 stsp NULL) == -1)
2825 5de5890b 2018-10-18 stsp err(1, "pledge");
2828 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2829 5de5890b 2018-10-18 stsp switch (ch) {
2831 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2834 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2835 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2836 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2838 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2841 5de5890b 2018-10-18 stsp show_ids = 1;
2844 c1669e2e 2019-01-09 stsp recurse = 1;
2847 2deda0b9 2019-03-07 stsp usage_tree();
2848 5de5890b 2018-10-18 stsp /* NOTREACHED */
2852 5de5890b 2018-10-18 stsp argc -= optind;
2853 5de5890b 2018-10-18 stsp argv += optind;
2855 5de5890b 2018-10-18 stsp if (argc == 1)
2856 5de5890b 2018-10-18 stsp path = argv[0];
2857 5de5890b 2018-10-18 stsp else if (argc > 1)
2858 5de5890b 2018-10-18 stsp usage_tree();
2860 7a2c19d6 2019-02-05 stsp path = NULL;
2862 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2863 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2864 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2865 9bf7a39b 2019-02-05 stsp goto done;
2867 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2868 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2869 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2870 7a2c19d6 2019-02-05 stsp goto done;
2872 7a2c19d6 2019-02-05 stsp error = NULL;
2873 7a2c19d6 2019-02-05 stsp if (worktree) {
2874 7a2c19d6 2019-02-05 stsp repo_path =
2875 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2876 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2877 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2878 7a2c19d6 2019-02-05 stsp if (error)
2879 7a2c19d6 2019-02-05 stsp goto done;
2881 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2882 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2883 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2884 7a2c19d6 2019-02-05 stsp goto done;
2889 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2890 5de5890b 2018-10-18 stsp if (error != NULL)
2891 c02c541e 2019-03-29 stsp goto done;
2893 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2894 c02c541e 2019-03-29 stsp if (error)
2895 5de5890b 2018-10-18 stsp goto done;
2897 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2898 9bf7a39b 2019-02-05 stsp if (worktree) {
2899 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2900 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2901 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2902 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2903 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2904 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2905 9bf7a39b 2019-02-05 stsp goto done;
2907 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2909 9bf7a39b 2019-02-05 stsp if (error)
2910 9bf7a39b 2019-02-05 stsp goto done;
2912 9bf7a39b 2019-02-05 stsp path = "/";
2914 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2915 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2916 9bf7a39b 2019-02-05 stsp if (error != NULL)
2917 9bf7a39b 2019-02-05 stsp goto done;
2920 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2921 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2922 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2923 5de5890b 2018-10-18 stsp if (error != NULL)
2924 5de5890b 2018-10-18 stsp goto done;
2925 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2926 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2927 5de5890b 2018-10-18 stsp if (error != NULL)
2928 5de5890b 2018-10-18 stsp goto done;
2930 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2931 30837e32 2019-07-25 stsp if (error)
2932 5de5890b 2018-10-18 stsp goto done;
2935 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2936 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2938 5de5890b 2018-10-18 stsp free(in_repo_path);
2939 5de5890b 2018-10-18 stsp free(repo_path);
2940 5de5890b 2018-10-18 stsp free(cwd);
2941 5de5890b 2018-10-18 stsp free(commit_id);
2942 7a2c19d6 2019-02-05 stsp if (worktree)
2943 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2944 5de5890b 2018-10-18 stsp if (repo) {
2945 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2946 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2947 5de5890b 2018-10-18 stsp if (error == NULL)
2948 5de5890b 2018-10-18 stsp error = repo_error;
2950 5de5890b 2018-10-18 stsp return error;
2953 6bad629b 2019-02-04 stsp __dead static void
2954 6bad629b 2019-02-04 stsp usage_status(void)
2956 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2960 b72f483a 2019-02-05 stsp static const struct got_error *
2961 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2962 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2963 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2965 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2966 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2967 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2968 b72f483a 2019-02-05 stsp return NULL;
2971 6bad629b 2019-02-04 stsp static const struct got_error *
2972 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2974 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2975 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2976 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2977 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2978 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2979 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2982 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2984 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2985 6bad629b 2019-02-04 stsp switch (ch) {
2987 2deda0b9 2019-03-07 stsp usage_status();
2988 6bad629b 2019-02-04 stsp /* NOTREACHED */
2992 6bad629b 2019-02-04 stsp argc -= optind;
2993 6bad629b 2019-02-04 stsp argv += optind;
2995 6bad629b 2019-02-04 stsp #ifndef PROFILE
2996 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2997 6bad629b 2019-02-04 stsp NULL) == -1)
2998 6bad629b 2019-02-04 stsp err(1, "pledge");
3000 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3001 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3002 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3003 927df6b7 2019-02-10 stsp goto done;
3006 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3007 927df6b7 2019-02-10 stsp if (error != NULL)
3008 a5edda0a 2019-07-27 stsp goto done;
3010 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3012 6bad629b 2019-02-04 stsp if (error != NULL)
3013 6bad629b 2019-02-04 stsp goto done;
3015 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3016 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3017 087fb88c 2019-08-04 stsp if (error)
3018 087fb88c 2019-08-04 stsp goto done;
3020 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3021 6bad629b 2019-02-04 stsp if (error)
3022 6bad629b 2019-02-04 stsp goto done;
3024 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3025 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3027 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3028 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3029 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3030 927df6b7 2019-02-10 stsp free(cwd);
3031 d0eebce4 2019-03-11 stsp return error;
3034 d0eebce4 2019-03-11 stsp __dead static void
3035 d0eebce4 2019-03-11 stsp usage_ref(void)
3037 d0eebce4 2019-03-11 stsp fprintf(stderr,
3038 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3039 d0eebce4 2019-03-11 stsp getprogname());
3043 d0eebce4 2019-03-11 stsp static const struct got_error *
3044 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3046 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3047 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3048 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3050 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3051 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3053 d0eebce4 2019-03-11 stsp return err;
3055 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3056 d0eebce4 2019-03-11 stsp char *refstr;
3057 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3058 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3059 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3060 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3061 d0eebce4 2019-03-11 stsp free(refstr);
3064 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3065 d0eebce4 2019-03-11 stsp return NULL;
3068 d0eebce4 2019-03-11 stsp static const struct got_error *
3069 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3071 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3072 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3074 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3076 d0eebce4 2019-03-11 stsp return err;
3078 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3079 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3080 d0eebce4 2019-03-11 stsp return err;
3083 d0eebce4 2019-03-11 stsp static const struct got_error *
3084 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3086 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3087 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3088 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3091 d1644381 2019-07-14 stsp * Don't let the user create a reference named '-'.
3092 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3093 d1644381 2019-07-14 stsp * an unintended typo.
3095 d1644381 2019-07-14 stsp if (refname[0] == '-' && refname[1] == '\0')
3096 24b5452a 2019-10-09 stsp return got_error_path(refname, GOT_ERR_BAD_REF_NAME);
3098 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3100 d83d9d5c 2019-05-13 stsp if (err) {
3101 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3103 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3104 d83d9d5c 2019-05-13 stsp return err;
3105 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3107 d83d9d5c 2019-05-13 stsp return err;
3108 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3109 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3111 d83d9d5c 2019-05-13 stsp return err;
3114 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3116 d0eebce4 2019-03-11 stsp goto done;
3118 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3121 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3123 d1c1ae5f 2019-08-12 stsp return err;
3126 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3127 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3129 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3130 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3131 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3134 d1c1ae5f 2019-08-12 stsp * Don't let the user create a reference named '-'.
3135 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3136 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3138 d1c1ae5f 2019-08-12 stsp if (refname[0] == '-' && refname[1] == '\0')
3139 24b5452a 2019-10-09 stsp return got_error_path(refname, GOT_ERR_BAD_REF_NAME);
3141 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3143 d1c1ae5f 2019-08-12 stsp return err;
3145 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3147 d1c1ae5f 2019-08-12 stsp goto done;
3149 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3151 d1c1ae5f 2019-08-12 stsp if (target_ref)
3152 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3154 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3155 d0eebce4 2019-03-11 stsp return err;
3158 d0eebce4 2019-03-11 stsp static const struct got_error *
3159 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3161 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3162 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3163 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3164 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3165 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3166 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3168 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3169 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3170 d0eebce4 2019-03-11 stsp switch (ch) {
3172 d0eebce4 2019-03-11 stsp delref = optarg;
3175 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3176 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3177 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3179 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3182 d0eebce4 2019-03-11 stsp do_list = 1;
3185 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3188 d0eebce4 2019-03-11 stsp usage_ref();
3189 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3193 d0eebce4 2019-03-11 stsp if (do_list && delref)
3194 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3196 d0eebce4 2019-03-11 stsp argc -= optind;
3197 d0eebce4 2019-03-11 stsp argv += optind;
3199 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3200 d1c1ae5f 2019-08-12 stsp if (create_symref)
3201 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3202 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3203 d0eebce4 2019-03-11 stsp if (argc > 0)
3204 d0eebce4 2019-03-11 stsp usage_ref();
3205 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3206 d0eebce4 2019-03-11 stsp usage_ref();
3208 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3209 e0b57350 2019-03-12 stsp if (do_list) {
3210 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3211 e0b57350 2019-03-12 stsp NULL) == -1)
3212 e0b57350 2019-03-12 stsp err(1, "pledge");
3214 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3215 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3216 e0b57350 2019-03-12 stsp err(1, "pledge");
3219 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3220 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3221 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3222 d0eebce4 2019-03-11 stsp goto done;
3225 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3226 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3227 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3228 d0eebce4 2019-03-11 stsp goto done;
3230 d0eebce4 2019-03-11 stsp error = NULL;
3231 d0eebce4 2019-03-11 stsp if (worktree) {
3232 d0eebce4 2019-03-11 stsp repo_path =
3233 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3234 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3235 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3236 d0eebce4 2019-03-11 stsp if (error)
3237 d0eebce4 2019-03-11 stsp goto done;
3239 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3240 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3241 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3242 d0eebce4 2019-03-11 stsp goto done;
3247 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3248 d0eebce4 2019-03-11 stsp if (error != NULL)
3249 d0eebce4 2019-03-11 stsp goto done;
3251 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3252 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3253 c02c541e 2019-03-29 stsp if (error)
3254 c02c541e 2019-03-29 stsp goto done;
3256 d0eebce4 2019-03-11 stsp if (do_list)
3257 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3258 d0eebce4 2019-03-11 stsp else if (delref)
3259 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3260 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3261 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3263 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3266 4e759de4 2019-06-26 stsp got_repo_close(repo);
3267 4e759de4 2019-06-26 stsp if (worktree)
3268 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3269 4e759de4 2019-06-26 stsp free(cwd);
3270 4e759de4 2019-06-26 stsp free(repo_path);
3271 4e759de4 2019-06-26 stsp return error;
3274 4e759de4 2019-06-26 stsp __dead static void
3275 4e759de4 2019-06-26 stsp usage_branch(void)
3277 4e759de4 2019-06-26 stsp fprintf(stderr,
3278 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3279 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3283 4e759de4 2019-06-26 stsp static const struct got_error *
3284 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3285 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3287 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3288 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3289 4e99b47e 2019-10-04 stsp char *refstr;
3291 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3292 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3293 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3294 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3296 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3298 4e99b47e 2019-10-04 stsp return err;
3299 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3300 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3301 4e99b47e 2019-10-04 stsp marker = "* ";
3303 4e99b47e 2019-10-04 stsp marker = "~ ";
3307 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3308 4e99b47e 2019-10-04 stsp refname += 11;
3309 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3310 4e99b47e 2019-10-04 stsp refname += 18;
3312 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3313 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3314 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3316 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3317 4e99b47e 2019-10-04 stsp free(refstr);
3318 4e99b47e 2019-10-04 stsp return NULL;
3321 4e99b47e 2019-10-04 stsp static const struct got_error *
3322 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3324 ad89fa31 2019-10-04 stsp const char *refname;
3326 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3327 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3329 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3331 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3332 ad89fa31 2019-10-04 stsp refname += 11;
3333 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3334 ad89fa31 2019-10-04 stsp refname += 18;
3336 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3338 ad89fa31 2019-10-04 stsp return NULL;
3341 ad89fa31 2019-10-04 stsp static const struct got_error *
3342 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3344 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3345 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3346 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3347 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3348 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3350 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3352 4e99b47e 2019-10-04 stsp if (worktree) {
3353 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3354 4e99b47e 2019-10-04 stsp worktree);
3356 4e99b47e 2019-10-04 stsp return err;
3358 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3359 4e99b47e 2019-10-04 stsp worktree);
3361 4e99b47e 2019-10-04 stsp return err;
3363 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3364 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3365 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3367 4e99b47e 2019-10-04 stsp return err;
3368 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3369 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3373 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3374 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3376 4e759de4 2019-06-26 stsp return err;
3378 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3379 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3381 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3382 4e759de4 2019-06-26 stsp return NULL;
3385 4e759de4 2019-06-26 stsp static const struct got_error *
3386 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3387 45cd4e47 2019-08-25 stsp const char *branch_name)
3389 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3390 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3391 4e759de4 2019-06-26 stsp char *refname;
3393 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3394 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3396 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3398 4e759de4 2019-06-26 stsp goto done;
3400 45cd4e47 2019-08-25 stsp if (worktree &&
3401 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3402 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3403 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3404 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3405 45cd4e47 2019-08-25 stsp goto done;
3408 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3411 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3412 4e759de4 2019-06-26 stsp free(refname);
3413 4e759de4 2019-06-26 stsp return err;
3416 4e759de4 2019-06-26 stsp static const struct got_error *
3417 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3418 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3420 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3421 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3422 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3425 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
3426 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3427 d3f84d51 2019-07-11 stsp * an unintended typo.
3429 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
3430 24b5452a 2019-10-09 stsp return got_error_path(branch_name, GOT_ERR_BAD_REF_NAME);
3432 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3433 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3434 4e759de4 2019-06-26 stsp goto done;
3437 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3438 4e759de4 2019-06-26 stsp if (err == NULL) {
3439 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3440 4e759de4 2019-06-26 stsp goto done;
3441 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3442 4e759de4 2019-06-26 stsp goto done;
3444 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3446 4e759de4 2019-06-26 stsp goto done;
3448 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3451 4e759de4 2019-06-26 stsp got_ref_close(ref);
3452 4e759de4 2019-06-26 stsp free(base_refname);
3453 4e759de4 2019-06-26 stsp free(refname);
3454 4e759de4 2019-06-26 stsp return err;
3457 4e759de4 2019-06-26 stsp static const struct got_error *
3458 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3460 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3461 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3462 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3463 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3464 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3465 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3467 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3468 4e759de4 2019-06-26 stsp switch (ch) {
3470 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3473 4e759de4 2019-06-26 stsp delref = optarg;
3476 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3477 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3478 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3480 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3483 4e759de4 2019-06-26 stsp do_list = 1;
3486 4e759de4 2019-06-26 stsp usage_branch();
3487 4e759de4 2019-06-26 stsp /* NOTREACHED */
3491 4e759de4 2019-06-26 stsp if (do_list && delref)
3492 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3494 4e759de4 2019-06-26 stsp argc -= optind;
3495 4e759de4 2019-06-26 stsp argv += optind;
3497 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3498 ad89fa31 2019-10-04 stsp do_show = 1;
3500 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3501 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3503 4e759de4 2019-06-26 stsp if (do_list || delref) {
3504 4e759de4 2019-06-26 stsp if (argc > 0)
3505 4e759de4 2019-06-26 stsp usage_branch();
3506 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3507 4e759de4 2019-06-26 stsp usage_branch();
3509 4e759de4 2019-06-26 stsp #ifndef PROFILE
3510 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3511 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3512 4e759de4 2019-06-26 stsp NULL) == -1)
3513 4e759de4 2019-06-26 stsp err(1, "pledge");
3515 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3516 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3517 4e759de4 2019-06-26 stsp err(1, "pledge");
3520 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3521 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3522 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3523 4e759de4 2019-06-26 stsp goto done;
3526 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3527 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3528 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3529 4e759de4 2019-06-26 stsp goto done;
3531 4e759de4 2019-06-26 stsp error = NULL;
3532 4e759de4 2019-06-26 stsp if (worktree) {
3533 4e759de4 2019-06-26 stsp repo_path =
3534 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3535 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3536 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3537 4e759de4 2019-06-26 stsp if (error)
3538 4e759de4 2019-06-26 stsp goto done;
3540 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3541 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3542 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3543 4e759de4 2019-06-26 stsp goto done;
3548 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3549 4e759de4 2019-06-26 stsp if (error != NULL)
3550 4e759de4 2019-06-26 stsp goto done;
3552 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3553 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3554 4e759de4 2019-06-26 stsp if (error)
3555 4e759de4 2019-06-26 stsp goto done;
3557 ad89fa31 2019-10-04 stsp if (do_show)
3558 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3559 ad89fa31 2019-10-04 stsp else if (do_list)
3560 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3561 4e759de4 2019-06-26 stsp else if (delref)
3562 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3564 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3565 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3566 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3567 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3568 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3569 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3570 a74f7e83 2019-11-10 stsp if (error)
3571 a74f7e83 2019-11-10 stsp goto done;
3572 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3573 a74f7e83 2019-11-10 stsp free(commit_id);
3577 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3578 d0eebce4 2019-03-11 stsp if (worktree)
3579 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3580 d0eebce4 2019-03-11 stsp free(cwd);
3581 d0eebce4 2019-03-11 stsp free(repo_path);
3582 d00136be 2019-03-26 stsp return error;
3586 d00136be 2019-03-26 stsp __dead static void
3587 8e7bd50a 2019-08-22 stsp usage_tag(void)
3589 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3590 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3591 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3596 b8bad2ba 2019-08-23 stsp static const struct got_error *
3597 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3599 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3600 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3601 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3602 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3603 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3605 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3606 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3607 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3608 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3610 b8bad2ba 2019-08-23 stsp return err;
3611 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3614 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3617 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3618 b8bad2ba 2019-08-23 stsp free(re_id);
3621 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3622 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3625 b8bad2ba 2019-08-23 stsp while (se) {
3626 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3629 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3630 b8bad2ba 2019-08-23 stsp free(se_id);
3633 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3634 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3636 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3637 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3639 b8bad2ba 2019-08-23 stsp return err;
3640 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3643 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3648 b8bad2ba 2019-08-23 stsp return err;
3652 8e7bd50a 2019-08-22 stsp static const struct got_error *
3653 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3654 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3656 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3657 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3658 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3659 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3660 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3664 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3666 b8bad2ba 2019-08-23 stsp return err;
3667 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3669 b8bad2ba 2019-08-23 stsp goto done;
3671 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3673 b8bad2ba 2019-08-23 stsp goto done;
3674 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3676 b8bad2ba 2019-08-23 stsp goto done;
3678 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3679 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3681 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3682 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3684 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3685 b8bad2ba 2019-08-23 stsp *cmp = -1;
3687 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3689 b8bad2ba 2019-08-23 stsp free(id1);
3690 b8bad2ba 2019-08-23 stsp free(id2);
3692 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3694 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3695 b8bad2ba 2019-08-23 stsp return err;
3698 b8bad2ba 2019-08-23 stsp static const struct got_error *
3699 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3701 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3702 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3703 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3705 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3707 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3709 8e7bd50a 2019-08-22 stsp return err;
3711 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3712 8e7bd50a 2019-08-22 stsp const char *refname;
3713 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3714 8e7bd50a 2019-08-22 stsp char datebuf[26];
3715 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3716 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3717 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3719 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3720 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3722 8e7bd50a 2019-08-22 stsp refname += 10;
3723 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3724 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3725 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3728 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3729 8e7bd50a 2019-08-22 stsp free(refstr);
3731 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3734 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3738 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3739 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3740 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3741 2417344c 2019-08-23 stsp if (datestr)
3742 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3743 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3744 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3747 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3748 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3749 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3751 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3752 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3754 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3755 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3757 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3758 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3763 8e7bd50a 2019-08-22 stsp free(id_str);
3764 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3765 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3766 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3767 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3771 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3773 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3775 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3776 8e7bd50a 2019-08-22 stsp } while (line);
3777 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3780 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3781 8e7bd50a 2019-08-22 stsp return NULL;
3784 8e7bd50a 2019-08-22 stsp static const struct got_error *
3785 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3786 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3788 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3789 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3790 f372d5cd 2019-10-21 stsp char *editor = NULL;
3791 8e7bd50a 2019-08-22 stsp int fd = -1;
3793 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3794 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3795 8e7bd50a 2019-08-22 stsp goto done;
3798 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3799 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3800 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3801 8e7bd50a 2019-08-22 stsp goto done;
3804 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3806 8e7bd50a 2019-08-22 stsp goto done;
3808 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3809 8e7bd50a 2019-08-22 stsp close(fd);
3811 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3813 8e7bd50a 2019-08-22 stsp goto done;
3814 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3816 8e7bd50a 2019-08-22 stsp free(initial_content);
3817 8e7bd50a 2019-08-22 stsp free(template);
3818 8e7bd50a 2019-08-22 stsp free(editor);
3820 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3821 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3822 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3823 8e7bd50a 2019-08-22 stsp if (err) {
3824 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3825 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3828 8e7bd50a 2019-08-22 stsp return err;
3831 8e7bd50a 2019-08-22 stsp static const struct got_error *
3832 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3833 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3835 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3836 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3837 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3838 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3839 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3840 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3841 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3844 8e7bd50a 2019-08-22 stsp * Don't let the user create a tag named '-'.
3845 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3846 8e7bd50a 2019-08-22 stsp * an unintended typo.
3848 8e7bd50a 2019-08-22 stsp if (tag_name[0] == '-' && tag_name[1] == '\0')
3849 24b5452a 2019-10-09 stsp return got_error_path(tag_name, GOT_ERR_BAD_REF_NAME);
3851 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3853 8e7bd50a 2019-08-22 stsp return err;
3855 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3856 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3858 8e7bd50a 2019-08-22 stsp goto done;
3860 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3862 8e7bd50a 2019-08-22 stsp goto done;
3864 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3865 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3866 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3867 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3868 8e7bd50a 2019-08-22 stsp goto done;
3870 8e7bd50a 2019-08-22 stsp tag_name += 10;
3871 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3872 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3873 8e7bd50a 2019-08-22 stsp goto done;
3876 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3877 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3878 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3879 8e7bd50a 2019-08-22 stsp goto done;
3880 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3881 8e7bd50a 2019-08-22 stsp goto done;
3883 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3884 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3885 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3886 f372d5cd 2019-10-21 stsp if (err) {
3887 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3888 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3889 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3890 8e7bd50a 2019-08-22 stsp goto done;
3894 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3895 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3896 f372d5cd 2019-10-21 stsp if (err) {
3897 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3898 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3899 8e7bd50a 2019-08-22 stsp goto done;
3902 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3903 f372d5cd 2019-10-21 stsp if (err) {
3904 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3905 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3906 8e7bd50a 2019-08-22 stsp goto done;
3909 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3910 f372d5cd 2019-10-21 stsp if (err) {
3911 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3912 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3913 f372d5cd 2019-10-21 stsp goto done;
3916 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
3917 f372d5cd 2019-10-21 stsp if (err) {
3918 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3919 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3920 f372d5cd 2019-10-21 stsp goto done;
3922 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
3924 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
3925 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
3926 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
3927 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3928 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
3929 f372d5cd 2019-10-21 stsp free(tag_id_str);
3931 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3932 8e7bd50a 2019-08-22 stsp free(commit_id);
3933 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3934 8e7bd50a 2019-08-22 stsp free(refname);
3935 8e7bd50a 2019-08-22 stsp free(tagmsg);
3936 f372d5cd 2019-10-21 stsp free(tagmsg_path);
3937 aba9c984 2019-09-08 stsp free(tagger);
3938 8e7bd50a 2019-08-22 stsp return err;
3941 8e7bd50a 2019-08-22 stsp static const struct got_error *
3942 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
3944 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
3945 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
3946 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
3947 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3948 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
3949 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3950 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
3952 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3953 8e7bd50a 2019-08-22 stsp switch (ch) {
3955 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
3958 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
3959 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3960 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3962 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
3965 8e7bd50a 2019-08-22 stsp do_list = 1;
3968 8e7bd50a 2019-08-22 stsp usage_tag();
3969 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
3973 8e7bd50a 2019-08-22 stsp argc -= optind;
3974 8e7bd50a 2019-08-22 stsp argv += optind;
3976 8e7bd50a 2019-08-22 stsp if (do_list) {
3977 8e7bd50a 2019-08-22 stsp if (tagmsg)
3978 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
3979 8e7bd50a 2019-08-22 stsp if (argc > 0)
3980 8e7bd50a 2019-08-22 stsp usage_tag();
3981 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
3982 8e7bd50a 2019-08-22 stsp usage_tag();
3983 a2887370 2019-08-23 stsp else if (argc > 1)
3984 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
3985 a2887370 2019-08-23 stsp tag_name = argv[0];
3987 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
3988 8e7bd50a 2019-08-22 stsp if (do_list) {
3989 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3990 8e7bd50a 2019-08-22 stsp NULL) == -1)
3991 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3993 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3994 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
3995 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3998 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
3999 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4000 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4001 8e7bd50a 2019-08-22 stsp goto done;
4004 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4005 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4006 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4007 8e7bd50a 2019-08-22 stsp goto done;
4009 8e7bd50a 2019-08-22 stsp error = NULL;
4010 8e7bd50a 2019-08-22 stsp if (worktree) {
4011 8e7bd50a 2019-08-22 stsp repo_path =
4012 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4013 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4014 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4015 8e7bd50a 2019-08-22 stsp if (error)
4016 8e7bd50a 2019-08-22 stsp goto done;
4018 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4019 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4020 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4021 8e7bd50a 2019-08-22 stsp goto done;
4026 8e7bd50a 2019-08-22 stsp if (do_list) {
4027 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4028 c9956ddf 2019-09-08 stsp if (error != NULL)
4029 c9956ddf 2019-09-08 stsp goto done;
4030 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4031 8e7bd50a 2019-08-22 stsp if (error)
4032 8e7bd50a 2019-08-22 stsp goto done;
4033 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4035 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4036 c9956ddf 2019-09-08 stsp if (error)
4037 c9956ddf 2019-09-08 stsp goto done;
4038 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4039 c9956ddf 2019-09-08 stsp if (error != NULL)
4040 c9956ddf 2019-09-08 stsp goto done;
4042 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4043 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4044 8e7bd50a 2019-08-22 stsp if (error)
4045 8e7bd50a 2019-08-22 stsp goto done;
4048 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4049 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4050 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4051 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4052 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4053 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4054 8e7bd50a 2019-08-22 stsp if (error)
4055 8e7bd50a 2019-08-22 stsp goto done;
4056 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4057 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4058 8e7bd50a 2019-08-22 stsp if (error)
4059 8e7bd50a 2019-08-22 stsp goto done;
4060 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4061 8e7bd50a 2019-08-22 stsp free(commit_id);
4062 8e7bd50a 2019-08-22 stsp if (error)
4063 8e7bd50a 2019-08-22 stsp goto done;
4066 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4067 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4071 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4072 8e7bd50a 2019-08-22 stsp if (worktree)
4073 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4074 8e7bd50a 2019-08-22 stsp free(cwd);
4075 8e7bd50a 2019-08-22 stsp free(repo_path);
4076 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4077 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4078 8e7bd50a 2019-08-22 stsp return error;
4081 8e7bd50a 2019-08-22 stsp __dead static void
4082 d00136be 2019-03-26 stsp usage_add(void)
4084 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
4088 d00136be 2019-03-26 stsp static const struct got_error *
4089 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4091 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4093 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4094 4e68cba3 2019-11-23 stsp return NULL;
4097 4e68cba3 2019-11-23 stsp static const struct got_error *
4098 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4100 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4101 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4102 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4103 1dd54920 2019-05-11 stsp char *cwd = NULL;
4104 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4105 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4106 4e68cba3 2019-11-23 stsp int ch, can_recurse = 0;
4108 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4110 4e68cba3 2019-11-23 stsp while ((ch = getopt(argc, argv, "R")) != -1) {
4111 d00136be 2019-03-26 stsp switch (ch) {
4113 4e68cba3 2019-11-23 stsp can_recurse = 1;
4116 d00136be 2019-03-26 stsp usage_add();
4117 d00136be 2019-03-26 stsp /* NOTREACHED */
4121 d00136be 2019-03-26 stsp argc -= optind;
4122 d00136be 2019-03-26 stsp argv += optind;
4124 43012d58 2019-07-14 stsp #ifndef PROFILE
4125 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4126 43012d58 2019-07-14 stsp NULL) == -1)
4127 43012d58 2019-07-14 stsp err(1, "pledge");
4129 723c305c 2019-05-11 jcs if (argc < 1)
4130 d00136be 2019-03-26 stsp usage_add();
4132 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4133 d00136be 2019-03-26 stsp if (cwd == NULL) {
4134 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4135 d00136be 2019-03-26 stsp goto done;
4138 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4139 d00136be 2019-03-26 stsp if (error)
4140 d00136be 2019-03-26 stsp goto done;
4142 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4144 031a5338 2019-03-26 stsp if (error != NULL)
4145 031a5338 2019-03-26 stsp goto done;
4147 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4148 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4149 d00136be 2019-03-26 stsp if (error)
4150 d00136be 2019-03-26 stsp goto done;
4152 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4153 6d022e97 2019-08-04 stsp if (error)
4154 6d022e97 2019-08-04 stsp goto done;
4156 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4157 4e68cba3 2019-11-23 stsp char *ondisk_path;
4158 4e68cba3 2019-11-23 stsp struct stat sb;
4159 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4160 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4161 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4162 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4163 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4164 4e68cba3 2019-11-23 stsp goto done;
4166 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4167 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4168 4e68cba3 2019-11-23 stsp free(ondisk_path);
4171 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4172 4e68cba3 2019-11-23 stsp ondisk_path);
4173 4e68cba3 2019-11-23 stsp free(ondisk_path);
4174 4e68cba3 2019-11-23 stsp goto done;
4176 4e68cba3 2019-11-23 stsp free(ondisk_path);
4177 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4178 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4179 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4180 4e68cba3 2019-11-23 stsp goto done;
4184 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4185 1dd54920 2019-05-11 stsp NULL, repo);
4188 031a5338 2019-03-26 stsp got_repo_close(repo);
4189 d00136be 2019-03-26 stsp if (worktree)
4190 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4191 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4192 1dd54920 2019-05-11 stsp free((char *)pe->path);
4193 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4194 2ec1f75b 2019-03-26 stsp free(cwd);
4195 2ec1f75b 2019-03-26 stsp return error;
4198 2ec1f75b 2019-03-26 stsp __dead static void
4199 648e4ef7 2019-07-09 stsp usage_remove(void)
4201 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4205 2a06fe5f 2019-08-24 stsp static const struct got_error *
4206 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4207 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
4208 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4209 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
4211 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4212 2a06fe5f 2019-08-24 stsp return NULL;
4213 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4214 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4215 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4216 2a06fe5f 2019-08-24 stsp return NULL;
4219 2ec1f75b 2019-03-26 stsp static const struct got_error *
4220 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4222 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4223 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4224 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4225 17ed4618 2019-06-02 stsp char *cwd = NULL;
4226 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4227 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4228 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
4230 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4232 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
4233 2ec1f75b 2019-03-26 stsp switch (ch) {
4235 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4238 2ec1f75b 2019-03-26 stsp usage_add();
4239 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4243 2ec1f75b 2019-03-26 stsp argc -= optind;
4244 2ec1f75b 2019-03-26 stsp argv += optind;
4246 43012d58 2019-07-14 stsp #ifndef PROFILE
4247 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4248 43012d58 2019-07-14 stsp NULL) == -1)
4249 43012d58 2019-07-14 stsp err(1, "pledge");
4251 17ed4618 2019-06-02 stsp if (argc < 1)
4252 648e4ef7 2019-07-09 stsp usage_remove();
4254 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4255 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4256 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4257 2ec1f75b 2019-03-26 stsp goto done;
4259 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4260 2ec1f75b 2019-03-26 stsp if (error)
4261 2ec1f75b 2019-03-26 stsp goto done;
4263 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4266 2ec1f75b 2019-03-26 stsp goto done;
4268 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4269 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4270 2ec1f75b 2019-03-26 stsp if (error)
4271 2ec1f75b 2019-03-26 stsp goto done;
4273 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4274 6d022e97 2019-08-04 stsp if (error)
4275 6d022e97 2019-08-04 stsp goto done;
4277 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4278 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
4279 a129376b 2019-03-28 stsp if (error)
4280 a129376b 2019-03-28 stsp goto done;
4283 a129376b 2019-03-28 stsp got_repo_close(repo);
4284 a129376b 2019-03-28 stsp if (worktree)
4285 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4286 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4287 17ed4618 2019-06-02 stsp free((char *)pe->path);
4288 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4289 a129376b 2019-03-28 stsp free(cwd);
4290 a129376b 2019-03-28 stsp return error;
4293 a129376b 2019-03-28 stsp __dead static void
4294 a129376b 2019-03-28 stsp usage_revert(void)
4296 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4297 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4301 1ee397ad 2019-07-12 stsp static const struct got_error *
4302 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4304 a129376b 2019-03-28 stsp while (path[0] == '/')
4306 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4307 33aa809d 2019-08-08 stsp return NULL;
4310 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4311 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4312 33aa809d 2019-08-08 stsp const char *action;
4315 33aa809d 2019-08-08 stsp static const struct got_error *
4316 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4317 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4319 33aa809d 2019-08-08 stsp char *line = NULL;
4320 33aa809d 2019-08-08 stsp size_t linesize = 0;
4321 33aa809d 2019-08-08 stsp ssize_t linelen;
4323 33aa809d 2019-08-08 stsp switch (status) {
4324 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4325 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4327 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4328 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4330 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4331 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4332 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4333 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4334 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4335 33aa809d 2019-08-08 stsp printf("%s", line);
4336 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4337 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4338 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4339 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4340 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4343 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4346 33aa809d 2019-08-08 stsp return NULL;
4349 33aa809d 2019-08-08 stsp static const struct got_error *
4350 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4351 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4353 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4354 33aa809d 2019-08-08 stsp char *line = NULL;
4355 33aa809d 2019-08-08 stsp size_t linesize = 0;
4356 33aa809d 2019-08-08 stsp ssize_t linelen;
4357 33aa809d 2019-08-08 stsp int resp = ' ';
4358 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4360 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4362 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4364 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4365 33aa809d 2019-08-08 stsp a->action);
4367 33aa809d 2019-08-08 stsp return err;
4368 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4369 33aa809d 2019-08-08 stsp if (linelen == -1) {
4370 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4371 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4372 33aa809d 2019-08-08 stsp return NULL;
4374 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4376 33aa809d 2019-08-08 stsp *nl = '\0';
4377 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4378 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4379 33aa809d 2019-08-08 stsp printf("y\n");
4380 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4381 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4382 33aa809d 2019-08-08 stsp printf("n\n");
4383 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4384 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4385 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4386 33aa809d 2019-08-08 stsp printf("q\n");
4388 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4389 33aa809d 2019-08-08 stsp free(line);
4390 33aa809d 2019-08-08 stsp return NULL;
4393 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4394 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4395 33aa809d 2019-08-08 stsp a->action);
4397 33aa809d 2019-08-08 stsp return err;
4398 33aa809d 2019-08-08 stsp resp = getchar();
4399 33aa809d 2019-08-08 stsp if (resp == '\n')
4400 33aa809d 2019-08-08 stsp resp = getchar();
4401 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4402 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4403 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4404 33aa809d 2019-08-08 stsp resp = ' ';
4406 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4407 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4408 33aa809d 2019-08-08 stsp resp = ' ';
4412 33aa809d 2019-08-08 stsp if (resp == 'y')
4413 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4414 33aa809d 2019-08-08 stsp else if (resp == 'n')
4415 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4416 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4417 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4419 1ee397ad 2019-07-12 stsp return NULL;
4423 a129376b 2019-03-28 stsp static const struct got_error *
4424 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4426 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4427 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4428 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4429 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4430 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4431 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4432 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4433 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4434 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4435 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4437 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4439 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4440 a129376b 2019-03-28 stsp switch (ch) {
4442 33aa809d 2019-08-08 stsp pflag = 1;
4445 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4448 0f6d7415 2019-08-08 stsp can_recurse = 1;
4451 a129376b 2019-03-28 stsp usage_revert();
4452 a129376b 2019-03-28 stsp /* NOTREACHED */
4456 a129376b 2019-03-28 stsp argc -= optind;
4457 a129376b 2019-03-28 stsp argv += optind;
4459 43012d58 2019-07-14 stsp #ifndef PROFILE
4460 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4461 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4462 43012d58 2019-07-14 stsp err(1, "pledge");
4464 e20a8b6f 2019-06-04 stsp if (argc < 1)
4465 a129376b 2019-03-28 stsp usage_revert();
4466 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4467 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4469 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4470 a129376b 2019-03-28 stsp if (cwd == NULL) {
4471 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4472 a129376b 2019-03-28 stsp goto done;
4474 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4475 2ec1f75b 2019-03-26 stsp if (error)
4476 2ec1f75b 2019-03-26 stsp goto done;
4478 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4480 a129376b 2019-03-28 stsp if (error != NULL)
4481 a129376b 2019-03-28 stsp goto done;
4483 33aa809d 2019-08-08 stsp if (patch_script_path) {
4484 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4485 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4486 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4487 33aa809d 2019-08-08 stsp patch_script_path);
4488 33aa809d 2019-08-08 stsp goto done;
4491 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4492 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4493 a129376b 2019-03-28 stsp if (error)
4494 a129376b 2019-03-28 stsp goto done;
4496 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4497 6d022e97 2019-08-04 stsp if (error)
4498 6d022e97 2019-08-04 stsp goto done;
4500 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4501 0f6d7415 2019-08-08 stsp char *ondisk_path;
4502 0f6d7415 2019-08-08 stsp struct stat sb;
4503 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4504 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4505 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4506 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4507 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4508 0f6d7415 2019-08-08 stsp goto done;
4510 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4511 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4512 0f6d7415 2019-08-08 stsp free(ondisk_path);
4515 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4516 0f6d7415 2019-08-08 stsp ondisk_path);
4517 0f6d7415 2019-08-08 stsp free(ondisk_path);
4518 0f6d7415 2019-08-08 stsp goto done;
4520 0f6d7415 2019-08-08 stsp free(ondisk_path);
4521 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4522 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4523 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4524 0f6d7415 2019-08-08 stsp goto done;
4529 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4530 33aa809d 2019-08-08 stsp cpa.action = "revert";
4531 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4532 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4533 a129376b 2019-03-28 stsp if (error)
4534 a129376b 2019-03-28 stsp goto done;
4536 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4537 33aa809d 2019-08-08 stsp error == NULL)
4538 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4540 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4541 2ec1f75b 2019-03-26 stsp if (worktree)
4542 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4543 2ec1f75b 2019-03-26 stsp free(path);
4544 d00136be 2019-03-26 stsp free(cwd);
4545 6bad629b 2019-02-04 stsp return error;
4548 c4296144 2019-05-09 stsp __dead static void
4549 c4296144 2019-05-09 stsp usage_commit(void)
4551 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4552 5c1e53bc 2019-07-28 stsp getprogname());
4556 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4557 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4558 e2ba3d07 2019-05-13 stsp const char *editor;
4559 e0870e44 2019-05-13 stsp const char *worktree_path;
4560 76d98825 2019-06-03 stsp const char *branch_name;
4561 314a6357 2019-05-13 stsp const char *repo_path;
4562 e0870e44 2019-05-13 stsp char *logmsg_path;
4566 33ad4cbe 2019-05-12 jcs static const struct got_error *
4567 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4570 76d98825 2019-06-03 stsp char *initial_content = NULL;
4571 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4572 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4573 e0870e44 2019-05-13 stsp char *template = NULL;
4574 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4576 33ad4cbe 2019-05-12 jcs size_t len;
4578 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4579 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4580 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4581 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4582 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4583 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4584 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4585 33ad4cbe 2019-05-12 jcs return NULL;
4588 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4589 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4591 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4592 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4593 76d98825 2019-06-03 stsp a->branch_name) == -1)
4594 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4596 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4598 e0870e44 2019-05-13 stsp goto done;
4600 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4602 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4603 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4604 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4605 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4606 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4610 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4612 76d98825 2019-06-03 stsp free(initial_content);
4613 e0870e44 2019-05-13 stsp free(template);
4615 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4616 3ce1b845 2019-07-15 stsp if (err == NULL) {
4617 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4618 3ce1b845 2019-07-15 stsp if (err) {
4619 3ce1b845 2019-07-15 stsp free(*logmsg);
4620 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4623 33ad4cbe 2019-05-12 jcs return err;
4626 c4296144 2019-05-09 stsp static const struct got_error *
4627 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4629 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4630 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4631 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4632 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4633 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4634 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4635 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4636 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4637 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4638 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4640 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4641 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4643 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4644 c4296144 2019-05-09 stsp switch (ch) {
4646 c4296144 2019-05-09 stsp logmsg = optarg;
4649 c4296144 2019-05-09 stsp usage_commit();
4650 c4296144 2019-05-09 stsp /* NOTREACHED */
4654 c4296144 2019-05-09 stsp argc -= optind;
4655 c4296144 2019-05-09 stsp argv += optind;
4657 43012d58 2019-07-14 stsp #ifndef PROFILE
4658 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4659 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4660 43012d58 2019-07-14 stsp err(1, "pledge");
4662 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4663 c4296144 2019-05-09 stsp if (cwd == NULL) {
4664 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4665 c4296144 2019-05-09 stsp goto done;
4667 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4668 7d5807f4 2019-07-11 stsp if (error)
4669 7d5807f4 2019-07-11 stsp goto done;
4671 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4672 c4296144 2019-05-09 stsp if (error)
4673 a698f62e 2019-07-25 stsp goto done;
4674 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4675 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4676 c4296144 2019-05-09 stsp goto done;
4679 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4680 916f288c 2019-07-30 stsp worktree);
4681 5c1e53bc 2019-07-28 stsp if (error)
4682 5c1e53bc 2019-07-28 stsp goto done;
4684 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4685 c9956ddf 2019-09-08 stsp if (error)
4686 c9956ddf 2019-09-08 stsp goto done;
4687 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4688 c9956ddf 2019-09-08 stsp gitconfig_path);
4689 c4296144 2019-05-09 stsp if (error != NULL)
4690 c4296144 2019-05-09 stsp goto done;
4692 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4693 aba9c984 2019-09-08 stsp if (error)
4694 aba9c984 2019-09-08 stsp return error;
4697 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4698 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4700 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4701 314a6357 2019-05-13 stsp error = get_editor(&editor);
4703 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4704 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4705 c4296144 2019-05-09 stsp if (error)
4706 c4296144 2019-05-09 stsp goto done;
4708 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4709 087fb88c 2019-08-04 stsp if (error)
4710 087fb88c 2019-08-04 stsp goto done;
4712 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4713 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4714 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4715 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4716 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4717 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4718 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4719 916f288c 2019-07-30 stsp goto done;
4721 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4723 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4724 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4725 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4726 e0870e44 2019-05-13 stsp if (error) {
4727 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4728 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4729 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4730 c4296144 2019-05-09 stsp goto done;
4733 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4734 c4296144 2019-05-09 stsp if (error)
4735 c4296144 2019-05-09 stsp goto done;
4736 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4738 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4739 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4740 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4741 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4742 7266f21f 2019-10-21 stsp error == NULL)
4743 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4744 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4746 c4296144 2019-05-09 stsp got_repo_close(repo);
4747 c4296144 2019-05-09 stsp if (worktree)
4748 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4749 c4296144 2019-05-09 stsp free(cwd);
4750 c4296144 2019-05-09 stsp free(id_str);
4751 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4752 e2ba3d07 2019-05-13 stsp free(editor);
4753 aba9c984 2019-09-08 stsp free(author);
4754 234035bc 2019-06-01 stsp return error;
4757 234035bc 2019-06-01 stsp __dead static void
4758 234035bc 2019-06-01 stsp usage_cherrypick(void)
4760 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4764 234035bc 2019-06-01 stsp static const struct got_error *
4765 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4767 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4768 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4769 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4770 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4771 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4772 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4773 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4774 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4775 234035bc 2019-06-01 stsp int ch, did_something = 0;
4777 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4778 234035bc 2019-06-01 stsp switch (ch) {
4780 234035bc 2019-06-01 stsp usage_cherrypick();
4781 234035bc 2019-06-01 stsp /* NOTREACHED */
4785 234035bc 2019-06-01 stsp argc -= optind;
4786 234035bc 2019-06-01 stsp argv += optind;
4788 43012d58 2019-07-14 stsp #ifndef PROFILE
4789 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4790 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4791 43012d58 2019-07-14 stsp err(1, "pledge");
4793 234035bc 2019-06-01 stsp if (argc != 1)
4794 234035bc 2019-06-01 stsp usage_cherrypick();
4796 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4797 234035bc 2019-06-01 stsp if (cwd == NULL) {
4798 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4799 234035bc 2019-06-01 stsp goto done;
4801 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4802 234035bc 2019-06-01 stsp if (error)
4803 234035bc 2019-06-01 stsp goto done;
4805 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4807 234035bc 2019-06-01 stsp if (error != NULL)
4808 234035bc 2019-06-01 stsp goto done;
4810 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4811 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4812 234035bc 2019-06-01 stsp if (error)
4813 234035bc 2019-06-01 stsp goto done;
4815 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4816 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4817 234035bc 2019-06-01 stsp if (error != NULL) {
4818 234035bc 2019-06-01 stsp struct got_reference *ref;
4819 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4820 234035bc 2019-06-01 stsp goto done;
4821 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4822 234035bc 2019-06-01 stsp if (error != NULL)
4823 234035bc 2019-06-01 stsp goto done;
4824 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4825 234035bc 2019-06-01 stsp got_ref_close(ref);
4826 234035bc 2019-06-01 stsp if (error != NULL)
4827 234035bc 2019-06-01 stsp goto done;
4829 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4830 234035bc 2019-06-01 stsp if (error)
4831 234035bc 2019-06-01 stsp goto done;
4833 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4834 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4835 234035bc 2019-06-01 stsp if (error != NULL)
4836 234035bc 2019-06-01 stsp goto done;
4838 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4839 234035bc 2019-06-01 stsp if (error) {
4840 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4841 234035bc 2019-06-01 stsp goto done;
4842 234035bc 2019-06-01 stsp error = NULL;
4844 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4845 234035bc 2019-06-01 stsp goto done;
4848 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4849 234035bc 2019-06-01 stsp if (error)
4850 234035bc 2019-06-01 stsp goto done;
4851 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4852 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4853 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4855 234035bc 2019-06-01 stsp if (error != NULL)
4856 234035bc 2019-06-01 stsp goto done;
4858 234035bc 2019-06-01 stsp if (did_something)
4859 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4861 234035bc 2019-06-01 stsp if (commit)
4862 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4863 234035bc 2019-06-01 stsp free(commit_id_str);
4864 234035bc 2019-06-01 stsp if (head_ref)
4865 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4866 234035bc 2019-06-01 stsp if (worktree)
4867 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4869 234035bc 2019-06-01 stsp got_repo_close(repo);
4870 c4296144 2019-05-09 stsp return error;
4873 5ef14e63 2019-06-02 stsp __dead static void
4874 5ef14e63 2019-06-02 stsp usage_backout(void)
4876 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4880 5ef14e63 2019-06-02 stsp static const struct got_error *
4881 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4883 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4884 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4885 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4886 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4887 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4888 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4889 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4890 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4891 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4893 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4894 5ef14e63 2019-06-02 stsp switch (ch) {
4896 5ef14e63 2019-06-02 stsp usage_backout();
4897 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4901 5ef14e63 2019-06-02 stsp argc -= optind;
4902 5ef14e63 2019-06-02 stsp argv += optind;
4904 43012d58 2019-07-14 stsp #ifndef PROFILE
4905 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4906 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4907 43012d58 2019-07-14 stsp err(1, "pledge");
4909 5ef14e63 2019-06-02 stsp if (argc != 1)
4910 5ef14e63 2019-06-02 stsp usage_backout();
4912 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4913 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4914 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4915 5ef14e63 2019-06-02 stsp goto done;
4917 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4918 5ef14e63 2019-06-02 stsp if (error)
4919 5ef14e63 2019-06-02 stsp goto done;
4921 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4923 5ef14e63 2019-06-02 stsp if (error != NULL)
4924 5ef14e63 2019-06-02 stsp goto done;
4926 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4927 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4928 5ef14e63 2019-06-02 stsp if (error)
4929 5ef14e63 2019-06-02 stsp goto done;
4931 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4932 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4933 5ef14e63 2019-06-02 stsp if (error != NULL) {
4934 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4935 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4936 5ef14e63 2019-06-02 stsp goto done;
4937 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4938 5ef14e63 2019-06-02 stsp if (error != NULL)
4939 5ef14e63 2019-06-02 stsp goto done;
4940 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4941 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4942 5ef14e63 2019-06-02 stsp if (error != NULL)
4943 5ef14e63 2019-06-02 stsp goto done;
4945 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4946 5ef14e63 2019-06-02 stsp if (error)
4947 5ef14e63 2019-06-02 stsp goto done;
4949 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4950 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4951 5ef14e63 2019-06-02 stsp if (error != NULL)
4952 5ef14e63 2019-06-02 stsp goto done;
4954 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4955 5ef14e63 2019-06-02 stsp if (error)
4956 5ef14e63 2019-06-02 stsp goto done;
4958 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4959 5ef14e63 2019-06-02 stsp if (error)
4960 5ef14e63 2019-06-02 stsp goto done;
4961 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4962 5ef14e63 2019-06-02 stsp if (pid == NULL) {
4963 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
4964 5ef14e63 2019-06-02 stsp goto done;
4967 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4968 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
4969 5ef14e63 2019-06-02 stsp if (error != NULL)
4970 5ef14e63 2019-06-02 stsp goto done;
4972 5ef14e63 2019-06-02 stsp if (did_something)
4973 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
4975 5ef14e63 2019-06-02 stsp if (commit)
4976 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
4977 5ef14e63 2019-06-02 stsp free(commit_id_str);
4978 5ef14e63 2019-06-02 stsp if (head_ref)
4979 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
4980 818c7501 2019-07-11 stsp if (worktree)
4981 818c7501 2019-07-11 stsp got_worktree_close(worktree);
4983 818c7501 2019-07-11 stsp got_repo_close(repo);
4984 818c7501 2019-07-11 stsp return error;
4987 818c7501 2019-07-11 stsp __dead static void
4988 818c7501 2019-07-11 stsp usage_rebase(void)
4990 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4991 af54c8f8 2019-07-11 stsp getprogname());
4996 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
4999 0ebf8283 2019-07-24 stsp size_t len;
5001 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5002 0ebf8283 2019-07-24 stsp if (len > limit)
5003 0ebf8283 2019-07-24 stsp len = limit;
5004 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5005 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5007 0ebf8283 2019-07-24 stsp *nl = '\0';
5010 0ebf8283 2019-07-24 stsp static const struct got_error *
5011 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5013 5943eee2 2019-08-13 stsp const struct got_error *err;
5014 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5015 5943eee2 2019-08-13 stsp const char *s;
5017 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5019 5943eee2 2019-08-13 stsp return err;
5021 5943eee2 2019-08-13 stsp s = logmsg0;
5022 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5025 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5026 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5027 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5028 5943eee2 2019-08-13 stsp goto done;
5031 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5033 5943eee2 2019-08-13 stsp free(logmsg0);
5034 5943eee2 2019-08-13 stsp return err;
5037 818c7501 2019-07-11 stsp static const struct got_error *
5038 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5039 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5041 818c7501 2019-07-11 stsp const struct got_error *err;
5042 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5044 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5046 818c7501 2019-07-11 stsp goto done;
5048 ff0d2220 2019-07-11 stsp if (new_id) {
5049 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5051 ff0d2220 2019-07-11 stsp goto done;
5054 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5055 ff0d2220 2019-07-11 stsp if (new_id_str)
5056 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5058 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5060 0ebf8283 2019-07-24 stsp goto done;
5062 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5063 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5065 818c7501 2019-07-11 stsp free(old_id_str);
5066 818c7501 2019-07-11 stsp free(new_id_str);
5067 818c7501 2019-07-11 stsp return err;
5070 1ee397ad 2019-07-12 stsp static const struct got_error *
5071 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5073 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5075 818c7501 2019-07-11 stsp while (path[0] == '/')
5077 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5079 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5080 1ee397ad 2019-07-12 stsp return NULL;
5081 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5082 818c7501 2019-07-11 stsp *rebase_status = status;
5083 1ee397ad 2019-07-12 stsp return NULL;
5086 818c7501 2019-07-11 stsp static const struct got_error *
5087 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5088 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5089 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5091 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5092 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5093 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5096 818c7501 2019-07-11 stsp static const struct got_error *
5097 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5098 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5099 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5100 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5102 ff0d2220 2019-07-11 stsp const struct got_error *error;
5103 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5104 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5106 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5107 ff0d2220 2019-07-11 stsp if (error)
5108 ff0d2220 2019-07-11 stsp return error;
5110 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5111 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5112 ff0d2220 2019-07-11 stsp if (error) {
5113 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5114 ff0d2220 2019-07-11 stsp goto done;
5115 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5117 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5118 ff0d2220 2019-07-11 stsp free(new_commit_id);
5121 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5122 ff0d2220 2019-07-11 stsp return error;
5125 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5126 64c6d990 2019-07-11 stsp const char *path_prefix;
5127 64c6d990 2019-07-11 stsp size_t len;
5128 8ca9bd68 2019-07-25 stsp int errcode;
5131 64c6d990 2019-07-11 stsp static const struct got_error *
5132 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5133 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5134 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5135 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5137 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5139 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5140 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5141 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5143 64c6d990 2019-07-11 stsp return NULL;
5146 64c6d990 2019-07-11 stsp static const struct got_error *
5147 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5148 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5149 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5151 64c6d990 2019-07-11 stsp const struct got_error *err;
5152 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5153 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5154 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5156 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5157 64c6d990 2019-07-11 stsp return NULL;
5159 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5161 64c6d990 2019-07-11 stsp goto done;
5163 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5165 64c6d990 2019-07-11 stsp goto done;
5167 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5168 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5170 64c6d990 2019-07-11 stsp goto done;
5172 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5173 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5175 64c6d990 2019-07-11 stsp goto done;
5177 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5178 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5179 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5180 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5181 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5182 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5183 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5185 64c6d990 2019-07-11 stsp if (tree1)
5186 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5187 64c6d990 2019-07-11 stsp if (tree2)
5188 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5189 64c6d990 2019-07-11 stsp if (commit)
5190 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5191 64c6d990 2019-07-11 stsp if (parent_commit)
5192 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5193 64c6d990 2019-07-11 stsp return err;
5196 ff0d2220 2019-07-11 stsp static const struct got_error *
5197 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5198 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5199 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5200 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5201 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5203 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5204 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5205 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5206 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5207 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5209 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5211 af61c510 2019-07-19 stsp return err;
5213 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5214 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5216 af61c510 2019-07-19 stsp goto done;
5217 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5218 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5219 af61c510 2019-07-19 stsp if (err) {
5220 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5221 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5222 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5223 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5224 af61c510 2019-07-19 stsp "been reached?!?");
5225 af61c510 2019-07-19 stsp goto done;
5226 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5227 af61c510 2019-07-19 stsp goto done;
5228 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5229 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5231 af61c510 2019-07-19 stsp goto done;
5233 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5234 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5236 af61c510 2019-07-19 stsp goto done;
5238 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5240 af61c510 2019-07-19 stsp goto done;
5241 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5242 af61c510 2019-07-19 stsp commit_id = parent_id;
5246 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5247 af61c510 2019-07-19 stsp return err;
5250 af61c510 2019-07-19 stsp static const struct got_error *
5251 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5253 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5254 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5255 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5256 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5257 818c7501 2019-07-11 stsp char *cwd = NULL;
5258 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5259 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5260 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5261 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5262 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5263 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5264 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5265 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5266 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5267 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5268 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5269 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5271 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5272 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5274 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5275 818c7501 2019-07-11 stsp switch (ch) {
5277 818c7501 2019-07-11 stsp abort_rebase = 1;
5280 818c7501 2019-07-11 stsp continue_rebase = 1;
5283 818c7501 2019-07-11 stsp usage_rebase();
5284 818c7501 2019-07-11 stsp /* NOTREACHED */
5288 818c7501 2019-07-11 stsp argc -= optind;
5289 818c7501 2019-07-11 stsp argv += optind;
5291 43012d58 2019-07-14 stsp #ifndef PROFILE
5292 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5293 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5294 43012d58 2019-07-14 stsp err(1, "pledge");
5296 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5297 818c7501 2019-07-11 stsp usage_rebase();
5298 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5299 818c7501 2019-07-11 stsp if (argc != 0)
5300 818c7501 2019-07-11 stsp usage_rebase();
5301 818c7501 2019-07-11 stsp } else if (argc != 1)
5302 818c7501 2019-07-11 stsp usage_rebase();
5304 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5305 818c7501 2019-07-11 stsp if (cwd == NULL) {
5306 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5307 818c7501 2019-07-11 stsp goto done;
5309 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5310 818c7501 2019-07-11 stsp if (error)
5311 818c7501 2019-07-11 stsp goto done;
5313 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5315 818c7501 2019-07-11 stsp if (error != NULL)
5316 818c7501 2019-07-11 stsp goto done;
5318 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5319 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5320 818c7501 2019-07-11 stsp if (error)
5321 818c7501 2019-07-11 stsp goto done;
5323 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5324 818c7501 2019-07-11 stsp if (error)
5325 818c7501 2019-07-11 stsp goto done;
5327 f6794adc 2019-07-23 stsp if (abort_rebase) {
5328 818c7501 2019-07-11 stsp int did_something;
5329 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5330 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5331 f6794adc 2019-07-23 stsp goto done;
5333 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5334 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5335 3e3a69f1 2019-07-25 stsp worktree, repo);
5336 818c7501 2019-07-11 stsp if (error)
5337 818c7501 2019-07-11 stsp goto done;
5338 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5339 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5340 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5341 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5342 818c7501 2019-07-11 stsp if (error)
5343 818c7501 2019-07-11 stsp goto done;
5344 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5345 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5348 818c7501 2019-07-11 stsp if (continue_rebase) {
5349 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5350 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5351 f6794adc 2019-07-23 stsp goto done;
5353 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5354 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5355 3e3a69f1 2019-07-25 stsp worktree, repo);
5356 818c7501 2019-07-11 stsp if (error)
5357 818c7501 2019-07-11 stsp goto done;
5359 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5360 01757395 2019-07-12 stsp resume_commit_id, repo);
5361 818c7501 2019-07-11 stsp if (error)
5362 818c7501 2019-07-11 stsp goto done;
5364 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5365 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5366 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5367 818c7501 2019-07-11 stsp goto done;
5370 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5371 818c7501 2019-07-11 stsp if (error != NULL)
5372 818c7501 2019-07-11 stsp goto done;
5375 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5376 ff0d2220 2019-07-11 stsp if (error)
5377 ff0d2220 2019-07-11 stsp goto done;
5379 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5380 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5382 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5383 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5384 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5385 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5386 818c7501 2019-07-11 stsp if (error)
5387 818c7501 2019-07-11 stsp goto done;
5388 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5389 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5390 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5391 818c7501 2019-07-11 stsp "with work tree's branch");
5392 818c7501 2019-07-11 stsp goto done;
5395 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5396 a51a74b3 2019-07-27 stsp if (error) {
5397 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5398 a51a74b3 2019-07-27 stsp goto done;
5399 a51a74b3 2019-07-27 stsp error = NULL;
5401 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5402 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5403 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5404 a51a74b3 2019-07-27 stsp goto done;
5406 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5407 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5408 818c7501 2019-07-11 stsp if (error)
5409 818c7501 2019-07-11 stsp goto done;
5412 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5413 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5414 818c7501 2019-07-11 stsp if (error)
5415 818c7501 2019-07-11 stsp goto done;
5417 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5418 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5419 fc66b545 2019-08-12 stsp if (pid == NULL) {
5420 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5421 fc66b545 2019-08-12 stsp int did_something;
5422 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5423 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5424 fc66b545 2019-08-12 stsp &did_something);
5425 fc66b545 2019-08-12 stsp if (error)
5426 fc66b545 2019-08-12 stsp goto done;
5427 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5428 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5430 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5431 fc66b545 2019-08-12 stsp goto done;
5433 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5434 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5435 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5436 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5437 818c7501 2019-07-11 stsp commit = NULL;
5438 818c7501 2019-07-11 stsp if (error)
5439 818c7501 2019-07-11 stsp goto done;
5441 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5442 ff0d2220 2019-07-11 stsp if (continue_rebase)
5443 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5444 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5446 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5447 818c7501 2019-07-11 stsp goto done;
5450 818c7501 2019-07-11 stsp pid = NULL;
5451 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5452 818c7501 2019-07-11 stsp commit_id = qid->id;
5453 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5454 818c7501 2019-07-11 stsp pid = qid;
5456 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5457 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5458 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5459 818c7501 2019-07-11 stsp if (error)
5460 818c7501 2019-07-11 stsp goto done;
5462 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5463 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5467 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5468 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5469 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5470 818c7501 2019-07-11 stsp if (error)
5471 818c7501 2019-07-11 stsp goto done;
5474 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5475 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5476 818c7501 2019-07-11 stsp if (error)
5477 818c7501 2019-07-11 stsp goto done;
5478 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5479 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5481 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5482 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5484 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5485 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5486 818c7501 2019-07-11 stsp free(resume_commit_id);
5487 818c7501 2019-07-11 stsp free(yca_id);
5488 818c7501 2019-07-11 stsp if (commit)
5489 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5490 818c7501 2019-07-11 stsp if (branch)
5491 818c7501 2019-07-11 stsp got_ref_close(branch);
5492 818c7501 2019-07-11 stsp if (new_base_branch)
5493 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5494 818c7501 2019-07-11 stsp if (tmp_branch)
5495 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5496 5ef14e63 2019-06-02 stsp if (worktree)
5497 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5499 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5500 5ef14e63 2019-06-02 stsp return error;
5503 0ebf8283 2019-07-24 stsp __dead static void
5504 0ebf8283 2019-07-24 stsp usage_histedit(void)
5506 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5507 0ebf8283 2019-07-24 stsp getprogname());
5511 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5512 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5513 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5514 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5515 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5517 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5518 0ebf8283 2019-07-24 stsp unsigned char code;
5519 0ebf8283 2019-07-24 stsp const char *name;
5520 0ebf8283 2019-07-24 stsp const char *desc;
5521 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5522 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5523 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5524 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5525 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5526 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5527 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5530 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5531 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5532 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5533 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5534 0ebf8283 2019-07-24 stsp char *logmsg;
5536 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5538 0ebf8283 2019-07-24 stsp static const struct got_error *
5539 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5540 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5542 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5543 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5544 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5547 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5549 0ebf8283 2019-07-24 stsp goto done;
5551 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5553 0ebf8283 2019-07-24 stsp goto done;
5555 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5557 0ebf8283 2019-07-24 stsp goto done;
5559 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5560 0ebf8283 2019-07-24 stsp if (n < 0)
5561 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5563 0ebf8283 2019-07-24 stsp if (commit)
5564 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5565 0ebf8283 2019-07-24 stsp free(id_str);
5566 0ebf8283 2019-07-24 stsp free(logmsg);
5567 0ebf8283 2019-07-24 stsp return err;
5570 0ebf8283 2019-07-24 stsp static const struct got_error *
5571 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5572 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5574 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5575 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5577 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5578 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5580 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5581 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5587 0ebf8283 2019-07-24 stsp return err;
5590 0ebf8283 2019-07-24 stsp static const struct got_error *
5591 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5593 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5596 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5597 0ebf8283 2019-07-24 stsp if (n < 0)
5598 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5600 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5601 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5602 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5603 0ebf8283 2019-07-24 stsp cmd->desc);
5604 0ebf8283 2019-07-24 stsp if (n < 0) {
5605 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5609 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5610 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5611 0ebf8283 2019-07-24 stsp if (n < 0)
5612 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5613 0ebf8283 2019-07-24 stsp return err;
5616 0ebf8283 2019-07-24 stsp static const struct got_error *
5617 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5619 0ebf8283 2019-07-24 stsp static char msg[42];
5622 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5624 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5625 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5627 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5630 0ebf8283 2019-07-24 stsp static const struct got_error *
5631 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5632 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5634 0ebf8283 2019-07-24 stsp const struct got_error *err;
5635 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5636 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5638 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5640 0ebf8283 2019-07-24 stsp return err;
5642 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5644 0ebf8283 2019-07-24 stsp goto done;
5646 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5648 5943eee2 2019-08-13 stsp goto done;
5649 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5650 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5651 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5652 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5653 0ebf8283 2019-07-24 stsp goto done;
5656 0ebf8283 2019-07-24 stsp if (folded_commit)
5657 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5658 0ebf8283 2019-07-24 stsp free(id_str);
5659 5943eee2 2019-08-13 stsp free(folded_logmsg);
5660 0ebf8283 2019-07-24 stsp return err;
5663 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5664 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5666 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5668 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5669 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5670 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5671 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5672 3f9de99f 2019-07-24 stsp folded = prev;
5673 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5676 0ebf8283 2019-07-24 stsp return folded;
5679 0ebf8283 2019-07-24 stsp static const struct got_error *
5680 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5681 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5683 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5684 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5685 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5686 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5688 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5690 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5692 0ebf8283 2019-07-24 stsp return err;
5694 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5695 0ebf8283 2019-07-24 stsp if (folded) {
5696 0ebf8283 2019-07-24 stsp while (folded != hle) {
5697 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5698 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5701 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5702 0ebf8283 2019-07-24 stsp logmsg, repo);
5704 0ebf8283 2019-07-24 stsp goto done;
5705 0ebf8283 2019-07-24 stsp free(logmsg);
5706 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5707 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5711 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5713 0ebf8283 2019-07-24 stsp goto done;
5714 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5716 5943eee2 2019-08-13 stsp goto done;
5717 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5718 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5719 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5720 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5721 0ebf8283 2019-07-24 stsp goto done;
5723 0ebf8283 2019-07-24 stsp free(logmsg);
5724 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5726 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5728 0ebf8283 2019-07-24 stsp goto done;
5730 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5732 0ebf8283 2019-07-24 stsp goto done;
5734 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5735 0ebf8283 2019-07-24 stsp close(fd);
5737 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5739 0ebf8283 2019-07-24 stsp goto done;
5741 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5742 0ebf8283 2019-07-24 stsp if (err) {
5743 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5744 0ebf8283 2019-07-24 stsp goto done;
5745 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5748 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5749 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5750 0ebf8283 2019-07-24 stsp free(logmsg_path);
5751 0ebf8283 2019-07-24 stsp free(logmsg);
5752 5943eee2 2019-08-13 stsp free(orig_logmsg);
5753 0ebf8283 2019-07-24 stsp free(editor);
5754 0ebf8283 2019-07-24 stsp if (commit)
5755 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5756 0ebf8283 2019-07-24 stsp return err;
5759 0ebf8283 2019-07-24 stsp static const struct got_error *
5760 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5761 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5763 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5764 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5765 0ebf8283 2019-07-24 stsp size_t size;
5766 0ebf8283 2019-07-24 stsp ssize_t len;
5767 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5768 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5769 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5770 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5772 0ebf8283 2019-07-24 stsp for (;;) {
5773 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5774 0ebf8283 2019-07-24 stsp if (len == -1) {
5775 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5776 0ebf8283 2019-07-24 stsp if (feof(f))
5778 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5779 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5784 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5786 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5787 0ebf8283 2019-07-24 stsp free(line);
5788 0ebf8283 2019-07-24 stsp line = NULL;
5791 0ebf8283 2019-07-24 stsp cmd = NULL;
5792 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5793 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5794 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5795 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5796 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5799 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5804 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5805 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5808 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5810 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5811 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5812 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5815 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5816 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5820 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5821 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5822 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5826 0ebf8283 2019-07-24 stsp free(line);
5827 0ebf8283 2019-07-24 stsp line = NULL;
5831 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5833 0ebf8283 2019-07-24 stsp *end = '\0';
5835 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5836 0ebf8283 2019-07-24 stsp if (err) {
5837 0ebf8283 2019-07-24 stsp /* override error code */
5838 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5842 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5843 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5844 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5847 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5848 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5849 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5850 0ebf8283 2019-07-24 stsp commit_id = NULL;
5851 0ebf8283 2019-07-24 stsp free(line);
5852 0ebf8283 2019-07-24 stsp line = NULL;
5853 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5856 0ebf8283 2019-07-24 stsp free(line);
5857 0ebf8283 2019-07-24 stsp free(commit_id);
5858 0ebf8283 2019-07-24 stsp return err;
5861 0ebf8283 2019-07-24 stsp static const struct got_error *
5862 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5863 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5865 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5866 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5867 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5868 bfce7f83 2019-07-27 stsp static char msg[80];
5869 bfce7f83 2019-07-27 stsp char *id_str;
5871 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5872 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5873 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5874 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5875 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5877 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5878 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5879 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5882 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5883 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5885 bfce7f83 2019-07-27 stsp return err;
5886 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5887 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5888 bfce7f83 2019-07-27 stsp free(id_str);
5889 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5893 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5894 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5895 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5896 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5898 bfce7f83 2019-07-27 stsp return NULL;
5901 bfce7f83 2019-07-27 stsp static const struct got_error *
5902 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5903 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5904 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5906 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5907 0ebf8283 2019-07-24 stsp char *editor;
5908 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5910 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5912 0ebf8283 2019-07-24 stsp return err;
5914 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5915 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5916 0ebf8283 2019-07-24 stsp goto done;
5919 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5920 0ebf8283 2019-07-24 stsp if (f == NULL) {
5921 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5922 0ebf8283 2019-07-24 stsp goto done;
5924 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5926 bfce7f83 2019-07-27 stsp goto done;
5928 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
5930 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5931 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5932 0ebf8283 2019-07-24 stsp free(editor);
5933 0ebf8283 2019-07-24 stsp return err;
5936 0ebf8283 2019-07-24 stsp static const struct got_error *
5937 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5938 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
5940 0ebf8283 2019-07-24 stsp static const struct got_error *
5941 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
5942 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5944 0ebf8283 2019-07-24 stsp const struct got_error *err;
5945 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5946 0ebf8283 2019-07-24 stsp char *path = NULL;
5948 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
5950 0ebf8283 2019-07-24 stsp return err;
5952 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
5954 0ebf8283 2019-07-24 stsp goto done;
5956 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
5958 0ebf8283 2019-07-24 stsp goto done;
5960 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
5961 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5962 0ebf8283 2019-07-24 stsp goto done;
5966 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
5967 0ebf8283 2019-07-24 stsp if (err) {
5968 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5969 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5970 0ebf8283 2019-07-24 stsp goto done;
5971 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
5972 0ebf8283 2019-07-24 stsp commits, path, repo);
5975 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5976 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5977 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
5978 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
5979 0ebf8283 2019-07-24 stsp free(path);
5980 0ebf8283 2019-07-24 stsp return err;
5983 0ebf8283 2019-07-24 stsp static const struct got_error *
5984 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
5985 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5987 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5988 0ebf8283 2019-07-24 stsp char *path = NULL;
5989 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5990 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5991 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5993 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
5995 0ebf8283 2019-07-24 stsp return err;
5997 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
5998 0ebf8283 2019-07-24 stsp if (f == NULL) {
5999 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6000 0ebf8283 2019-07-24 stsp goto done;
6002 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6003 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6008 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6009 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6010 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6011 0ebf8283 2019-07-24 stsp if (n < 0) {
6012 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6018 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6019 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6020 0ebf8283 2019-07-24 stsp free(path);
6021 0ebf8283 2019-07-24 stsp if (commit)
6022 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6023 0ebf8283 2019-07-24 stsp return err;
6027 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6029 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6031 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6032 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6033 bfce7f83 2019-07-27 stsp free(hle);
6037 0ebf8283 2019-07-24 stsp static const struct got_error *
6038 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6039 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6041 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6042 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6044 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6045 0ebf8283 2019-07-24 stsp if (f == NULL) {
6046 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6047 0ebf8283 2019-07-24 stsp goto done;
6050 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6052 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6053 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6054 0ebf8283 2019-07-24 stsp return err;
6057 0ebf8283 2019-07-24 stsp static const struct got_error *
6058 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6059 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6060 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6062 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6063 0ebf8283 2019-07-24 stsp int resp = ' ';
6065 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6066 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6067 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6068 0ebf8283 2019-07-24 stsp resp = getchar();
6069 a61a4414 2019-08-07 stsp if (resp == '\n')
6070 a61a4414 2019-08-07 stsp resp = getchar();
6071 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6072 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6073 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6075 426ebf2e 2019-07-25 stsp if (err) {
6076 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6077 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6079 bfce7f83 2019-07-27 stsp prev_err = err;
6080 426ebf2e 2019-07-25 stsp resp = ' ';
6084 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6085 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6086 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6087 0ebf8283 2019-07-24 stsp commits, repo);
6088 426ebf2e 2019-07-25 stsp if (err) {
6089 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6090 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6092 bfce7f83 2019-07-27 stsp prev_err = err;
6093 426ebf2e 2019-07-25 stsp resp = ' ';
6097 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6098 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6101 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6104 0ebf8283 2019-07-24 stsp return err;
6107 0ebf8283 2019-07-24 stsp static const struct got_error *
6108 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6109 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6110 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6112 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6113 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6114 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6115 3e3a69f1 2019-07-25 stsp branch, repo);
6118 0ebf8283 2019-07-24 stsp static const struct got_error *
6119 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6120 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6122 0ebf8283 2019-07-24 stsp const struct got_error *err;
6123 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6125 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6127 0ebf8283 2019-07-24 stsp goto done;
6129 0ebf8283 2019-07-24 stsp if (new_id) {
6130 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6132 0ebf8283 2019-07-24 stsp goto done;
6135 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6136 0ebf8283 2019-07-24 stsp if (new_id_str)
6137 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6139 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6140 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6141 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6142 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6143 0ebf8283 2019-07-24 stsp goto done;
6145 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6147 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6149 0ebf8283 2019-07-24 stsp goto done;
6152 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6153 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6154 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6155 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6156 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6158 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6159 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6160 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6168 0ebf8283 2019-07-24 stsp free(old_id_str);
6169 0ebf8283 2019-07-24 stsp free(new_id_str);
6170 0ebf8283 2019-07-24 stsp return err;
6173 0ebf8283 2019-07-24 stsp static const struct got_error *
6174 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6175 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6176 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6177 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6179 0ebf8283 2019-07-24 stsp const struct got_error *err;
6180 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6181 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6183 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6184 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6185 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6187 0ebf8283 2019-07-24 stsp return err;
6190 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6192 0ebf8283 2019-07-24 stsp return err;
6194 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6195 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6196 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6197 0ebf8283 2019-07-24 stsp if (err) {
6198 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6199 0ebf8283 2019-07-24 stsp goto done;
6200 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6202 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6203 0ebf8283 2019-07-24 stsp free(new_commit_id);
6206 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6207 0ebf8283 2019-07-24 stsp return err;
6210 0ebf8283 2019-07-24 stsp static const struct got_error *
6211 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6212 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6214 0ebf8283 2019-07-24 stsp const struct got_error *error;
6215 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6217 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6219 0ebf8283 2019-07-24 stsp if (error)
6220 0ebf8283 2019-07-24 stsp return error;
6222 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6223 0ebf8283 2019-07-24 stsp if (error)
6224 0ebf8283 2019-07-24 stsp return error;
6226 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6227 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6228 0ebf8283 2019-07-24 stsp return error;
6231 0ebf8283 2019-07-24 stsp static const struct got_error *
6232 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6234 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6235 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6236 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6237 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6238 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6239 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6240 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6241 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6242 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6243 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6244 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6245 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6246 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6247 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6248 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6249 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6250 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6251 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6252 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6253 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6254 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6256 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6257 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6258 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6260 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6261 0ebf8283 2019-07-24 stsp switch (ch) {
6263 0ebf8283 2019-07-24 stsp abort_edit = 1;
6266 0ebf8283 2019-07-24 stsp continue_edit = 1;
6269 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6272 0ebf8283 2019-07-24 stsp usage_histedit();
6273 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6277 0ebf8283 2019-07-24 stsp argc -= optind;
6278 0ebf8283 2019-07-24 stsp argv += optind;
6280 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6281 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6282 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6283 0ebf8283 2019-07-24 stsp err(1, "pledge");
6285 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6286 0ebf8283 2019-07-24 stsp usage_histedit();
6287 0ebf8283 2019-07-24 stsp if (argc != 0)
6288 0ebf8283 2019-07-24 stsp usage_histedit();
6291 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6292 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6293 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6294 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6295 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6296 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6299 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6300 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6301 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6302 0ebf8283 2019-07-24 stsp goto done;
6304 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6305 0ebf8283 2019-07-24 stsp if (error)
6306 0ebf8283 2019-07-24 stsp goto done;
6308 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6310 0ebf8283 2019-07-24 stsp if (error != NULL)
6311 0ebf8283 2019-07-24 stsp goto done;
6313 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6314 0ebf8283 2019-07-24 stsp if (error)
6315 0ebf8283 2019-07-24 stsp goto done;
6316 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6317 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6318 0ebf8283 2019-07-24 stsp goto done;
6321 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6322 0ebf8283 2019-07-24 stsp if (error)
6323 0ebf8283 2019-07-24 stsp goto done;
6325 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6326 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6327 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6328 3e3a69f1 2019-07-25 stsp worktree, repo);
6329 0ebf8283 2019-07-24 stsp if (error)
6330 0ebf8283 2019-07-24 stsp goto done;
6331 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6332 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6333 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6334 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6335 0ebf8283 2019-07-24 stsp if (error)
6336 0ebf8283 2019-07-24 stsp goto done;
6337 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6338 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6339 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6340 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6341 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6342 0ebf8283 2019-07-24 stsp goto done;
6345 0ebf8283 2019-07-24 stsp if (continue_edit) {
6346 0ebf8283 2019-07-24 stsp char *path;
6348 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6349 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6350 0ebf8283 2019-07-24 stsp goto done;
6353 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6354 0ebf8283 2019-07-24 stsp if (error)
6355 0ebf8283 2019-07-24 stsp goto done;
6357 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6358 0ebf8283 2019-07-24 stsp free(path);
6359 0ebf8283 2019-07-24 stsp if (error)
6360 0ebf8283 2019-07-24 stsp goto done;
6362 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6363 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6364 3e3a69f1 2019-07-25 stsp worktree, repo);
6365 0ebf8283 2019-07-24 stsp if (error)
6366 0ebf8283 2019-07-24 stsp goto done;
6368 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6369 0ebf8283 2019-07-24 stsp if (error)
6370 0ebf8283 2019-07-24 stsp goto done;
6372 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6373 0ebf8283 2019-07-24 stsp head_commit_id);
6374 0ebf8283 2019-07-24 stsp if (error)
6375 0ebf8283 2019-07-24 stsp goto done;
6376 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6377 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6378 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6379 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6380 3aac7cf7 2019-07-25 stsp goto done;
6382 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6383 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6384 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6385 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6386 0ebf8283 2019-07-24 stsp commit = NULL;
6387 0ebf8283 2019-07-24 stsp if (error)
6388 0ebf8283 2019-07-24 stsp goto done;
6390 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6391 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6392 0ebf8283 2019-07-24 stsp goto done;
6395 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6396 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6397 0ebf8283 2019-07-24 stsp if (error != NULL)
6398 0ebf8283 2019-07-24 stsp goto done;
6400 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6401 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6402 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6403 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6404 c7d20a3f 2019-07-30 stsp goto done;
6407 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6408 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6409 bfce7f83 2019-07-27 stsp branch = NULL;
6410 0ebf8283 2019-07-24 stsp if (error)
6411 0ebf8283 2019-07-24 stsp goto done;
6413 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6414 0ebf8283 2019-07-24 stsp head_commit_id);
6415 0ebf8283 2019-07-24 stsp if (error)
6416 0ebf8283 2019-07-24 stsp goto done;
6417 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6418 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6419 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6420 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6421 3aac7cf7 2019-07-25 stsp goto done;
6423 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6424 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6425 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6426 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6427 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6428 0ebf8283 2019-07-24 stsp commit = NULL;
6429 0ebf8283 2019-07-24 stsp if (error)
6430 0ebf8283 2019-07-24 stsp goto done;
6432 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6433 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6434 bfce7f83 2019-07-27 stsp if (error)
6435 bfce7f83 2019-07-27 stsp goto done;
6437 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6438 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6439 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6440 6ba2bea2 2019-07-27 stsp if (error) {
6441 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6442 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6443 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6444 0ebf8283 2019-07-24 stsp goto done;
6447 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6449 6ba2bea2 2019-07-27 stsp if (error) {
6450 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6451 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6452 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6453 0ebf8283 2019-07-24 stsp goto done;
6458 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6460 6ba2bea2 2019-07-27 stsp if (error) {
6461 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6462 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6463 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6464 0ebf8283 2019-07-24 stsp goto done;
6469 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6470 4ec14e60 2019-08-28 hiltjo if (error)
6471 0ebf8283 2019-07-24 stsp goto done;
6473 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6474 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6475 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6476 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6479 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6480 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6481 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6482 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6485 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6486 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6488 0ebf8283 2019-07-24 stsp if (error)
6489 0ebf8283 2019-07-24 stsp goto done;
6493 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6494 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6495 0ebf8283 2019-07-24 stsp if (error)
6496 0ebf8283 2019-07-24 stsp goto done;
6500 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6501 0ebf8283 2019-07-24 stsp hle->commit_id);
6502 0ebf8283 2019-07-24 stsp if (error)
6503 0ebf8283 2019-07-24 stsp goto done;
6504 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6505 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6507 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6508 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6509 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6510 0ebf8283 2019-07-24 stsp if (error)
6511 0ebf8283 2019-07-24 stsp goto done;
6512 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6513 0ebf8283 2019-07-24 stsp commit = NULL;
6515 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6516 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6520 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6521 0ebf8283 2019-07-24 stsp char *id_str;
6522 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6523 0ebf8283 2019-07-24 stsp if (error)
6524 0ebf8283 2019-07-24 stsp goto done;
6525 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6527 0ebf8283 2019-07-24 stsp free(id_str);
6528 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6529 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6530 3e3a69f1 2019-07-25 stsp fileindex);
6531 0ebf8283 2019-07-24 stsp goto done;
6534 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6535 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6536 0ebf8283 2019-07-24 stsp if (error)
6537 0ebf8283 2019-07-24 stsp goto done;
6541 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6542 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6543 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6544 0ebf8283 2019-07-24 stsp if (error)
6545 0ebf8283 2019-07-24 stsp goto done;
6548 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6549 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6550 0ebf8283 2019-07-24 stsp if (error)
6551 0ebf8283 2019-07-24 stsp goto done;
6552 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6553 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6555 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6556 3e3a69f1 2019-07-25 stsp branch, repo);
6558 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6559 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6560 0ebf8283 2019-07-24 stsp free(head_commit_id);
6561 0ebf8283 2019-07-24 stsp free(base_commit_id);
6562 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6563 0ebf8283 2019-07-24 stsp if (commit)
6564 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6565 0ebf8283 2019-07-24 stsp if (branch)
6566 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6567 0ebf8283 2019-07-24 stsp if (tmp_branch)
6568 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6569 0ebf8283 2019-07-24 stsp if (worktree)
6570 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6572 2822a352 2019-10-15 stsp got_repo_close(repo);
6573 2822a352 2019-10-15 stsp return error;
6576 2822a352 2019-10-15 stsp __dead static void
6577 2822a352 2019-10-15 stsp usage_integrate(void)
6579 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6583 2822a352 2019-10-15 stsp static const struct got_error *
6584 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6586 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6587 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6588 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6589 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6590 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6591 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6592 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6593 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6594 2822a352 2019-10-15 stsp int ch, did_something = 0;
6596 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6597 2822a352 2019-10-15 stsp switch (ch) {
6599 2822a352 2019-10-15 stsp usage_integrate();
6600 2822a352 2019-10-15 stsp /* NOTREACHED */
6604 2822a352 2019-10-15 stsp argc -= optind;
6605 2822a352 2019-10-15 stsp argv += optind;
6607 2822a352 2019-10-15 stsp if (argc != 1)
6608 2822a352 2019-10-15 stsp usage_integrate();
6609 2822a352 2019-10-15 stsp branch_arg = argv[0];
6611 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6612 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6613 2822a352 2019-10-15 stsp err(1, "pledge");
6615 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6616 2822a352 2019-10-15 stsp if (cwd == NULL) {
6617 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6618 2822a352 2019-10-15 stsp goto done;
6621 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6622 2822a352 2019-10-15 stsp if (error)
6623 2822a352 2019-10-15 stsp goto done;
6625 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6626 2822a352 2019-10-15 stsp if (error)
6627 2822a352 2019-10-15 stsp goto done;
6629 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6631 2822a352 2019-10-15 stsp if (error != NULL)
6632 2822a352 2019-10-15 stsp goto done;
6634 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6635 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6636 2822a352 2019-10-15 stsp if (error)
6637 2822a352 2019-10-15 stsp goto done;
6639 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6640 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6641 2822a352 2019-10-15 stsp goto done;
6644 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6645 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6646 2822a352 2019-10-15 stsp if (error)
6647 2822a352 2019-10-15 stsp goto done;
6649 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6650 2822a352 2019-10-15 stsp if (refname == NULL) {
6651 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6652 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6653 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6654 2822a352 2019-10-15 stsp goto done;
6656 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6657 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6658 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6659 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6660 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6661 2822a352 2019-10-15 stsp goto done;
6664 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6665 2822a352 2019-10-15 stsp if (error)
6666 2822a352 2019-10-15 stsp goto done;
6668 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6669 2822a352 2019-10-15 stsp if (error)
6670 2822a352 2019-10-15 stsp goto done;
6672 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6673 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6674 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6675 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6676 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6677 2822a352 2019-10-15 stsp goto done;
6680 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6681 2822a352 2019-10-15 stsp if (error) {
6682 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6683 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6684 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6685 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6686 2822a352 2019-10-15 stsp goto done;
6689 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6690 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6691 2822a352 2019-10-15 stsp check_cancelled, NULL);
6692 2822a352 2019-10-15 stsp if (error)
6693 2822a352 2019-10-15 stsp goto done;
6695 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6698 715dc77e 2019-08-03 stsp got_repo_close(repo);
6699 2822a352 2019-10-15 stsp if (worktree)
6700 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6701 2822a352 2019-10-15 stsp free(cwd);
6702 2822a352 2019-10-15 stsp free(base_commit_id);
6703 2822a352 2019-10-15 stsp free(commit_id);
6704 2822a352 2019-10-15 stsp free(refname);
6705 2822a352 2019-10-15 stsp free(base_refname);
6706 715dc77e 2019-08-03 stsp return error;
6709 715dc77e 2019-08-03 stsp __dead static void
6710 715dc77e 2019-08-03 stsp usage_stage(void)
6712 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6713 f3055044 2019-08-07 stsp "[file-path ...]\n",
6714 715dc77e 2019-08-03 stsp getprogname());
6718 715dc77e 2019-08-03 stsp static const struct got_error *
6719 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6720 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6721 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6723 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6724 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6726 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6727 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6728 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6729 408b4ebc 2019-08-03 stsp return NULL;
6731 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6732 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6733 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6735 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6737 408b4ebc 2019-08-03 stsp return err;
6739 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6740 408b4ebc 2019-08-03 stsp free(id_str);
6741 dc424a06 2019-08-07 stsp return NULL;
6744 dc424a06 2019-08-07 stsp static const struct got_error *
6745 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6747 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6748 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6749 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6750 715dc77e 2019-08-03 stsp char *cwd = NULL;
6751 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6752 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6753 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6754 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6755 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6756 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6758 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6760 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6761 715dc77e 2019-08-03 stsp switch (ch) {
6763 408b4ebc 2019-08-03 stsp list_stage = 1;
6766 dc424a06 2019-08-07 stsp pflag = 1;
6769 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6772 715dc77e 2019-08-03 stsp usage_stage();
6773 715dc77e 2019-08-03 stsp /* NOTREACHED */
6777 715dc77e 2019-08-03 stsp argc -= optind;
6778 715dc77e 2019-08-03 stsp argv += optind;
6780 715dc77e 2019-08-03 stsp #ifndef PROFILE
6781 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6782 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6783 715dc77e 2019-08-03 stsp err(1, "pledge");
6785 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6786 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6787 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6788 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6790 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6791 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6792 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6793 715dc77e 2019-08-03 stsp goto done;
6796 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6797 715dc77e 2019-08-03 stsp if (error)
6798 715dc77e 2019-08-03 stsp goto done;
6800 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6802 715dc77e 2019-08-03 stsp if (error != NULL)
6803 715dc77e 2019-08-03 stsp goto done;
6805 dc424a06 2019-08-07 stsp if (patch_script_path) {
6806 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6807 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6808 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6809 dc424a06 2019-08-07 stsp patch_script_path);
6810 dc424a06 2019-08-07 stsp goto done;
6813 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6814 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6815 715dc77e 2019-08-03 stsp if (error)
6816 715dc77e 2019-08-03 stsp goto done;
6818 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6819 6d022e97 2019-08-04 stsp if (error)
6820 6d022e97 2019-08-04 stsp goto done;
6822 6d022e97 2019-08-04 stsp if (list_stage)
6823 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6824 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6826 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6827 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6828 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6829 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6830 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6833 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6834 2e1f37b0 2019-08-08 stsp error == NULL)
6835 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6837 ad493afc 2019-08-03 stsp got_repo_close(repo);
6838 ad493afc 2019-08-03 stsp if (worktree)
6839 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6840 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6841 ad493afc 2019-08-03 stsp free((char *)pe->path);
6842 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6843 ad493afc 2019-08-03 stsp free(cwd);
6844 ad493afc 2019-08-03 stsp return error;
6847 ad493afc 2019-08-03 stsp __dead static void
6848 ad493afc 2019-08-03 stsp usage_unstage(void)
6850 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6851 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6852 ad493afc 2019-08-03 stsp getprogname());
6857 ad493afc 2019-08-03 stsp static const struct got_error *
6858 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6860 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6861 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6862 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6863 ad493afc 2019-08-03 stsp char *cwd = NULL;
6864 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6865 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6866 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6867 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6868 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6869 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6871 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6873 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6874 ad493afc 2019-08-03 stsp switch (ch) {
6876 2e1f37b0 2019-08-08 stsp pflag = 1;
6879 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6882 ad493afc 2019-08-03 stsp usage_unstage();
6883 ad493afc 2019-08-03 stsp /* NOTREACHED */
6887 ad493afc 2019-08-03 stsp argc -= optind;
6888 ad493afc 2019-08-03 stsp argv += optind;
6890 ad493afc 2019-08-03 stsp #ifndef PROFILE
6891 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6892 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6893 ad493afc 2019-08-03 stsp err(1, "pledge");
6895 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6896 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6898 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6899 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6900 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6901 ad493afc 2019-08-03 stsp goto done;
6904 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6905 ad493afc 2019-08-03 stsp if (error)
6906 ad493afc 2019-08-03 stsp goto done;
6908 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6910 ad493afc 2019-08-03 stsp if (error != NULL)
6911 ad493afc 2019-08-03 stsp goto done;
6913 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
6914 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6915 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
6916 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
6917 2e1f37b0 2019-08-08 stsp patch_script_path);
6918 2e1f37b0 2019-08-08 stsp goto done;
6922 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6923 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
6924 ad493afc 2019-08-03 stsp if (error)
6925 ad493afc 2019-08-03 stsp goto done;
6927 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6928 ad493afc 2019-08-03 stsp if (error)
6929 ad493afc 2019-08-03 stsp goto done;
6931 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6932 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
6933 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
6934 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6936 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6937 2e1f37b0 2019-08-08 stsp error == NULL)
6938 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6940 0ebf8283 2019-07-24 stsp got_repo_close(repo);
6941 715dc77e 2019-08-03 stsp if (worktree)
6942 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
6943 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6944 715dc77e 2019-08-03 stsp free((char *)pe->path);
6945 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
6946 715dc77e 2019-08-03 stsp free(cwd);
6947 01073a5d 2019-08-22 stsp return error;
6950 01073a5d 2019-08-22 stsp __dead static void
6951 01073a5d 2019-08-22 stsp usage_cat(void)
6953 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6954 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
6958 01073a5d 2019-08-22 stsp static const struct got_error *
6959 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6961 01073a5d 2019-08-22 stsp const struct got_error *err;
6962 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
6964 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
6966 01073a5d 2019-08-22 stsp return err;
6968 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6969 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
6970 01073a5d 2019-08-22 stsp return err;
6973 01073a5d 2019-08-22 stsp static const struct got_error *
6974 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6976 01073a5d 2019-08-22 stsp const struct got_error *err;
6977 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
6978 01073a5d 2019-08-22 stsp const struct got_tree_entries *entries;
6979 01073a5d 2019-08-22 stsp struct got_tree_entry *te;
6981 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
6983 01073a5d 2019-08-22 stsp return err;
6985 01073a5d 2019-08-22 stsp entries = got_object_tree_get_entries(tree);
6986 01073a5d 2019-08-22 stsp te = SIMPLEQ_FIRST(&entries->head);
6987 01073a5d 2019-08-22 stsp while (te) {
6988 01073a5d 2019-08-22 stsp char *id_str;
6989 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
6991 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, te->id);
6994 01073a5d 2019-08-22 stsp fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6995 01073a5d 2019-08-22 stsp free(id_str);
6996 01073a5d 2019-08-22 stsp te = SIMPLEQ_NEXT(te, entry);
6999 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7000 01073a5d 2019-08-22 stsp return err;
7003 01073a5d 2019-08-22 stsp static const struct got_error *
7004 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7006 01073a5d 2019-08-22 stsp const struct got_error *err;
7007 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7008 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7009 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7010 01073a5d 2019-08-22 stsp char *id_str = NULL;
7011 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7013 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7015 01073a5d 2019-08-22 stsp return err;
7017 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7019 01073a5d 2019-08-22 stsp goto done;
7021 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7022 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7023 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7024 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7025 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7026 01073a5d 2019-08-22 stsp char *pid_str;
7027 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7029 01073a5d 2019-08-22 stsp goto done;
7030 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7031 01073a5d 2019-08-22 stsp free(pid_str);
7033 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7034 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7035 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7037 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7038 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7039 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7041 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7042 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7043 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7045 01073a5d 2019-08-22 stsp free(id_str);
7046 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7047 01073a5d 2019-08-22 stsp return err;
7050 01073a5d 2019-08-22 stsp static const struct got_error *
7051 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7053 01073a5d 2019-08-22 stsp const struct got_error *err;
7054 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7055 01073a5d 2019-08-22 stsp char *id_str = NULL;
7056 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7058 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7060 01073a5d 2019-08-22 stsp return err;
7062 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7064 01073a5d 2019-08-22 stsp goto done;
7066 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7068 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7069 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7070 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7071 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7073 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7074 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7075 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7077 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7078 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7079 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7081 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7082 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7083 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7089 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7090 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7092 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7093 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7094 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7096 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7097 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7098 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7100 01073a5d 2019-08-22 stsp free(id_str);
7101 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7102 01073a5d 2019-08-22 stsp return err;
7105 01073a5d 2019-08-22 stsp static const struct got_error *
7106 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7108 01073a5d 2019-08-22 stsp const struct got_error *error;
7109 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7110 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7111 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7112 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7113 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7114 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7116 01073a5d 2019-08-22 stsp #ifndef PROFILE
7117 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7118 01073a5d 2019-08-22 stsp NULL) == -1)
7119 01073a5d 2019-08-22 stsp err(1, "pledge");
7122 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7123 01073a5d 2019-08-22 stsp switch (ch) {
7125 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7128 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7129 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7130 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7132 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7135 896e9b6f 2019-08-26 stsp force_path = 1;
7138 01073a5d 2019-08-22 stsp usage_cat();
7139 01073a5d 2019-08-22 stsp /* NOTREACHED */
7143 01073a5d 2019-08-22 stsp argc -= optind;
7144 01073a5d 2019-08-22 stsp argv += optind;
7146 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7147 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7148 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7149 01073a5d 2019-08-22 stsp goto done;
7151 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7152 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7153 01073a5d 2019-08-22 stsp goto done;
7154 01073a5d 2019-08-22 stsp if (worktree) {
7155 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7156 01073a5d 2019-08-22 stsp repo_path = strdup(
7157 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7158 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7159 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7160 01073a5d 2019-08-22 stsp goto done;
7165 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7166 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7167 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7168 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7171 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7172 01073a5d 2019-08-22 stsp free(repo_path);
7173 01073a5d 2019-08-22 stsp if (error != NULL)
7174 01073a5d 2019-08-22 stsp goto done;
7176 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7177 896e9b6f 2019-08-26 stsp if (error)
7178 896e9b6f 2019-08-26 stsp goto done;
7180 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7181 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7182 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7183 01073a5d 2019-08-22 stsp if (error)
7184 01073a5d 2019-08-22 stsp goto done;
7186 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7187 896e9b6f 2019-08-26 stsp if (force_path) {
7188 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7190 896e9b6f 2019-08-26 stsp if (error)
7193 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7194 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7195 896e9b6f 2019-08-26 stsp if (error) {
7196 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7197 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7199 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7200 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7201 896e9b6f 2019-08-26 stsp if (error)
7206 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7207 01073a5d 2019-08-22 stsp if (error)
7210 01073a5d 2019-08-22 stsp switch (obj_type) {
7211 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7212 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7214 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7215 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7217 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7218 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7220 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7221 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7224 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7227 01073a5d 2019-08-22 stsp if (error)
7229 01073a5d 2019-08-22 stsp free(label);
7230 01073a5d 2019-08-22 stsp label = NULL;
7232 01073a5d 2019-08-22 stsp id = NULL;
7236 01073a5d 2019-08-22 stsp free(label);
7238 896e9b6f 2019-08-26 stsp free(commit_id);
7239 01073a5d 2019-08-22 stsp if (worktree)
7240 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7241 01073a5d 2019-08-22 stsp if (repo) {
7242 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7243 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7244 01073a5d 2019-08-22 stsp if (error == NULL)
7245 01073a5d 2019-08-22 stsp error = repo_error;
7247 0ebf8283 2019-07-24 stsp return error;
