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 ad89fa31 2019-10-04 stsp "usage: %s branch [-r repository] [-l] | -d name | "
3279 ad89fa31 2019-10-04 stsp "[name [commit]]\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 4e759de4 2019-06-26 stsp const char *base_branch)
3420 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3421 4e759de4 2019-06-26 stsp struct got_object_id *id = NULL;
3422 a4f89d48 2019-08-25 stsp char *label;
3423 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3424 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3427 d3f84d51 2019-07-11 stsp * Don't let the user create a branch named '-'.
3428 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3429 d3f84d51 2019-07-11 stsp * an unintended typo.
3431 d3f84d51 2019-07-11 stsp if (branch_name[0] == '-' && branch_name[1] == '\0')
3432 24b5452a 2019-10-09 stsp return got_error_path(branch_name, GOT_ERR_BAD_REF_NAME);
3434 a4f89d48 2019-08-25 stsp err = match_object_id(&id, &label, base_branch,
3435 a4f89d48 2019-08-25 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3437 a4f89d48 2019-08-25 stsp return err;
3439 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3440 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3441 4e759de4 2019-06-26 stsp goto done;
3444 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3445 4e759de4 2019-06-26 stsp if (err == NULL) {
3446 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3447 4e759de4 2019-06-26 stsp goto done;
3448 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3449 4e759de4 2019-06-26 stsp goto done;
3451 4e759de4 2019-06-26 stsp err = got_ref_alloc(&ref, refname, id);
3453 4e759de4 2019-06-26 stsp goto done;
3455 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3458 4e759de4 2019-06-26 stsp got_ref_close(ref);
3460 4e759de4 2019-06-26 stsp free(base_refname);
3461 4e759de4 2019-06-26 stsp free(refname);
3462 4e759de4 2019-06-26 stsp return err;
3465 4e759de4 2019-06-26 stsp static const struct got_error *
3466 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3468 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3469 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3470 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3471 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3472 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3473 4e759de4 2019-06-26 stsp const char *delref = NULL;
3475 4e759de4 2019-06-26 stsp while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3476 4e759de4 2019-06-26 stsp switch (ch) {
3478 4e759de4 2019-06-26 stsp delref = optarg;
3481 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3482 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3483 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3485 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3488 4e759de4 2019-06-26 stsp do_list = 1;
3491 4e759de4 2019-06-26 stsp usage_branch();
3492 4e759de4 2019-06-26 stsp /* NOTREACHED */
3496 4e759de4 2019-06-26 stsp if (do_list && delref)
3497 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3499 4e759de4 2019-06-26 stsp argc -= optind;
3500 4e759de4 2019-06-26 stsp argv += optind;
3502 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3503 ad89fa31 2019-10-04 stsp do_show = 1;
3505 4e759de4 2019-06-26 stsp if (do_list || delref) {
3506 4e759de4 2019-06-26 stsp if (argc > 0)
3507 4e759de4 2019-06-26 stsp usage_branch();
3508 ad89fa31 2019-10-04 stsp } else if (!do_show && (argc < 1 || argc > 2))
3509 4e759de4 2019-06-26 stsp usage_branch();
3511 4e759de4 2019-06-26 stsp #ifndef PROFILE
3512 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3513 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3514 4e759de4 2019-06-26 stsp NULL) == -1)
3515 4e759de4 2019-06-26 stsp err(1, "pledge");
3517 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3518 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3519 4e759de4 2019-06-26 stsp err(1, "pledge");
3522 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3523 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3524 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3525 4e759de4 2019-06-26 stsp goto done;
3528 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3529 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3530 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3531 4e759de4 2019-06-26 stsp goto done;
3533 4e759de4 2019-06-26 stsp error = NULL;
3534 4e759de4 2019-06-26 stsp if (worktree) {
3535 4e759de4 2019-06-26 stsp repo_path =
3536 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3537 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3538 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3539 4e759de4 2019-06-26 stsp if (error)
3540 4e759de4 2019-06-26 stsp goto done;
3542 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3543 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3544 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3545 4e759de4 2019-06-26 stsp goto done;
3550 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3551 4e759de4 2019-06-26 stsp if (error != NULL)
3552 4e759de4 2019-06-26 stsp goto done;
3554 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3555 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3556 4e759de4 2019-06-26 stsp if (error)
3557 4e759de4 2019-06-26 stsp goto done;
3559 ad89fa31 2019-10-04 stsp if (do_show)
3560 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3561 ad89fa31 2019-10-04 stsp else if (do_list)
3562 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3563 4e759de4 2019-06-26 stsp else if (delref)
3564 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3566 4e759de4 2019-06-26 stsp const char *base_branch;
3567 4e759de4 2019-06-26 stsp if (argc == 1) {
3568 4e759de4 2019-06-26 stsp base_branch = worktree ?
3569 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3570 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3571 dc5351b4 2019-07-30 stsp if (strncmp(base_branch, "refs/heads/", 11) == 0)
3572 dc5351b4 2019-07-30 stsp base_branch += 11;
3574 4e759de4 2019-06-26 stsp base_branch = argv[1];
3575 4e759de4 2019-06-26 stsp error = add_branch(repo, argv[0], base_branch);
3579 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3580 d0eebce4 2019-03-11 stsp if (worktree)
3581 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3582 d0eebce4 2019-03-11 stsp free(cwd);
3583 d0eebce4 2019-03-11 stsp free(repo_path);
3584 d00136be 2019-03-26 stsp return error;
3588 d00136be 2019-03-26 stsp __dead static void
3589 8e7bd50a 2019-08-22 stsp usage_tag(void)
3591 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3592 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3593 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3598 b8bad2ba 2019-08-23 stsp static const struct got_error *
3599 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3601 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3602 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3603 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3604 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3605 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3607 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3608 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3609 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3610 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3612 b8bad2ba 2019-08-23 stsp return err;
3613 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3616 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3619 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3620 b8bad2ba 2019-08-23 stsp free(re_id);
3623 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3624 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3627 b8bad2ba 2019-08-23 stsp while (se) {
3628 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3631 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3632 b8bad2ba 2019-08-23 stsp free(se_id);
3635 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3636 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3638 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3639 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3641 b8bad2ba 2019-08-23 stsp return err;
3642 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3645 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3650 b8bad2ba 2019-08-23 stsp return err;
3654 8e7bd50a 2019-08-22 stsp static const struct got_error *
3655 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3656 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3658 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3659 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3660 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3661 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3662 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3666 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3668 b8bad2ba 2019-08-23 stsp return err;
3669 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3671 b8bad2ba 2019-08-23 stsp goto done;
3673 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3675 b8bad2ba 2019-08-23 stsp goto done;
3676 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3678 b8bad2ba 2019-08-23 stsp goto done;
3680 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3681 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3683 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3684 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3686 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3687 b8bad2ba 2019-08-23 stsp *cmp = -1;
3689 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3691 b8bad2ba 2019-08-23 stsp free(id1);
3692 b8bad2ba 2019-08-23 stsp free(id2);
3694 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3696 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3697 b8bad2ba 2019-08-23 stsp return err;
3700 b8bad2ba 2019-08-23 stsp static const struct got_error *
3701 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3703 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3704 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3705 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3707 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3709 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3711 8e7bd50a 2019-08-22 stsp return err;
3713 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3714 8e7bd50a 2019-08-22 stsp const char *refname;
3715 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3716 8e7bd50a 2019-08-22 stsp char datebuf[26];
3717 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3718 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3719 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3721 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3722 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3724 8e7bd50a 2019-08-22 stsp refname += 10;
3725 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3726 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3727 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3730 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3731 8e7bd50a 2019-08-22 stsp free(refstr);
3733 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3736 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3740 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3741 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3742 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3743 2417344c 2019-08-23 stsp if (datestr)
3744 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3745 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3746 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3749 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3750 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3751 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3753 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3754 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3756 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3757 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3759 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3760 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3765 8e7bd50a 2019-08-22 stsp free(id_str);
3766 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3767 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3768 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3769 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3773 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3775 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3777 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3778 8e7bd50a 2019-08-22 stsp } while (line);
3779 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3782 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3783 8e7bd50a 2019-08-22 stsp return NULL;
3786 8e7bd50a 2019-08-22 stsp static const struct got_error *
3787 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3788 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3790 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3791 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3792 f372d5cd 2019-10-21 stsp char *editor = NULL;
3793 8e7bd50a 2019-08-22 stsp int fd = -1;
3795 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3796 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3797 8e7bd50a 2019-08-22 stsp goto done;
3800 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3801 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3802 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3803 8e7bd50a 2019-08-22 stsp goto done;
3806 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3808 8e7bd50a 2019-08-22 stsp goto done;
3810 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3811 8e7bd50a 2019-08-22 stsp close(fd);
3813 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3815 8e7bd50a 2019-08-22 stsp goto done;
3816 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3818 8e7bd50a 2019-08-22 stsp free(initial_content);
3819 8e7bd50a 2019-08-22 stsp free(template);
3820 8e7bd50a 2019-08-22 stsp free(editor);
3822 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3823 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3824 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3825 8e7bd50a 2019-08-22 stsp if (err) {
3826 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3827 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3830 8e7bd50a 2019-08-22 stsp return err;
3833 8e7bd50a 2019-08-22 stsp static const struct got_error *
3834 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3835 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3837 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3838 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3839 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3840 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3841 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3842 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3843 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3846 8e7bd50a 2019-08-22 stsp * Don't let the user create a tag named '-'.
3847 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3848 8e7bd50a 2019-08-22 stsp * an unintended typo.
3850 8e7bd50a 2019-08-22 stsp if (tag_name[0] == '-' && tag_name[1] == '\0')
3851 24b5452a 2019-10-09 stsp return got_error_path(tag_name, GOT_ERR_BAD_REF_NAME);
3853 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3855 8e7bd50a 2019-08-22 stsp return err;
3857 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3858 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3860 8e7bd50a 2019-08-22 stsp goto done;
3862 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3864 8e7bd50a 2019-08-22 stsp goto done;
3866 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3867 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3868 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3869 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3870 8e7bd50a 2019-08-22 stsp goto done;
3872 8e7bd50a 2019-08-22 stsp tag_name += 10;
3873 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3874 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3875 8e7bd50a 2019-08-22 stsp goto done;
3878 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3879 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3880 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3881 8e7bd50a 2019-08-22 stsp goto done;
3882 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3883 8e7bd50a 2019-08-22 stsp goto done;
3885 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3886 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3887 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3888 f372d5cd 2019-10-21 stsp if (err) {
3889 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3890 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3891 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3892 8e7bd50a 2019-08-22 stsp goto done;
3896 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3897 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3898 f372d5cd 2019-10-21 stsp if (err) {
3899 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3900 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3901 8e7bd50a 2019-08-22 stsp goto done;
3904 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3905 f372d5cd 2019-10-21 stsp if (err) {
3906 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3907 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3908 8e7bd50a 2019-08-22 stsp goto done;
3911 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3912 f372d5cd 2019-10-21 stsp if (err) {
3913 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3914 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3915 f372d5cd 2019-10-21 stsp goto done;
3918 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
3919 f372d5cd 2019-10-21 stsp if (err) {
3920 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3921 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3922 f372d5cd 2019-10-21 stsp goto done;
3924 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
3926 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
3927 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
3928 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
3929 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3930 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
3931 f372d5cd 2019-10-21 stsp free(tag_id_str);
3933 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3934 8e7bd50a 2019-08-22 stsp free(commit_id);
3935 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3936 8e7bd50a 2019-08-22 stsp free(refname);
3937 8e7bd50a 2019-08-22 stsp free(tagmsg);
3938 f372d5cd 2019-10-21 stsp free(tagmsg_path);
3939 aba9c984 2019-09-08 stsp free(tagger);
3940 8e7bd50a 2019-08-22 stsp return err;
3943 8e7bd50a 2019-08-22 stsp static const struct got_error *
3944 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
3946 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
3947 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
3948 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
3949 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3950 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
3951 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3952 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
3954 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3955 8e7bd50a 2019-08-22 stsp switch (ch) {
3957 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
3960 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
3961 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3962 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3964 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
3967 8e7bd50a 2019-08-22 stsp do_list = 1;
3970 8e7bd50a 2019-08-22 stsp usage_tag();
3971 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
3975 8e7bd50a 2019-08-22 stsp argc -= optind;
3976 8e7bd50a 2019-08-22 stsp argv += optind;
3978 8e7bd50a 2019-08-22 stsp if (do_list) {
3979 8e7bd50a 2019-08-22 stsp if (tagmsg)
3980 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
3981 8e7bd50a 2019-08-22 stsp if (argc > 0)
3982 8e7bd50a 2019-08-22 stsp usage_tag();
3983 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
3984 8e7bd50a 2019-08-22 stsp usage_tag();
3985 a2887370 2019-08-23 stsp else if (argc > 1)
3986 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
3987 a2887370 2019-08-23 stsp tag_name = argv[0];
3989 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
3990 8e7bd50a 2019-08-22 stsp if (do_list) {
3991 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3992 8e7bd50a 2019-08-22 stsp NULL) == -1)
3993 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3995 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3996 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
3997 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4000 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4001 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4002 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4003 8e7bd50a 2019-08-22 stsp goto done;
4006 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4007 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4008 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4009 8e7bd50a 2019-08-22 stsp goto done;
4011 8e7bd50a 2019-08-22 stsp error = NULL;
4012 8e7bd50a 2019-08-22 stsp if (worktree) {
4013 8e7bd50a 2019-08-22 stsp repo_path =
4014 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4015 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4016 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4017 8e7bd50a 2019-08-22 stsp if (error)
4018 8e7bd50a 2019-08-22 stsp goto done;
4020 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4021 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4022 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4023 8e7bd50a 2019-08-22 stsp goto done;
4028 8e7bd50a 2019-08-22 stsp if (do_list) {
4029 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4030 c9956ddf 2019-09-08 stsp if (error != NULL)
4031 c9956ddf 2019-09-08 stsp goto done;
4032 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4033 8e7bd50a 2019-08-22 stsp if (error)
4034 8e7bd50a 2019-08-22 stsp goto done;
4035 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4037 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4038 c9956ddf 2019-09-08 stsp if (error)
4039 c9956ddf 2019-09-08 stsp goto done;
4040 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4041 c9956ddf 2019-09-08 stsp if (error != NULL)
4042 c9956ddf 2019-09-08 stsp goto done;
4044 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4045 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4046 8e7bd50a 2019-08-22 stsp if (error)
4047 8e7bd50a 2019-08-22 stsp goto done;
4050 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4051 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4052 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4053 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4054 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4055 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4056 8e7bd50a 2019-08-22 stsp if (error)
4057 8e7bd50a 2019-08-22 stsp goto done;
4058 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4059 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4060 8e7bd50a 2019-08-22 stsp if (error)
4061 8e7bd50a 2019-08-22 stsp goto done;
4062 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4063 8e7bd50a 2019-08-22 stsp free(commit_id);
4064 8e7bd50a 2019-08-22 stsp if (error)
4065 8e7bd50a 2019-08-22 stsp goto done;
4068 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4069 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4073 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4074 8e7bd50a 2019-08-22 stsp if (worktree)
4075 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4076 8e7bd50a 2019-08-22 stsp free(cwd);
4077 8e7bd50a 2019-08-22 stsp free(repo_path);
4078 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4079 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4080 8e7bd50a 2019-08-22 stsp return error;
4083 8e7bd50a 2019-08-22 stsp __dead static void
4084 d00136be 2019-03-26 stsp usage_add(void)
4086 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
4090 d00136be 2019-03-26 stsp static const struct got_error *
4091 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4093 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4094 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4095 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4096 1dd54920 2019-05-11 stsp char *cwd = NULL;
4097 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4098 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4101 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4103 d00136be 2019-03-26 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4104 d00136be 2019-03-26 stsp switch (ch) {
4106 d00136be 2019-03-26 stsp usage_add();
4107 d00136be 2019-03-26 stsp /* NOTREACHED */
4111 d00136be 2019-03-26 stsp argc -= optind;
4112 d00136be 2019-03-26 stsp argv += optind;
4114 43012d58 2019-07-14 stsp #ifndef PROFILE
4115 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4116 43012d58 2019-07-14 stsp NULL) == -1)
4117 43012d58 2019-07-14 stsp err(1, "pledge");
4119 723c305c 2019-05-11 jcs if (argc < 1)
4120 d00136be 2019-03-26 stsp usage_add();
4122 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4123 d00136be 2019-03-26 stsp if (cwd == NULL) {
4124 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4125 d00136be 2019-03-26 stsp goto done;
4128 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4129 d00136be 2019-03-26 stsp if (error)
4130 d00136be 2019-03-26 stsp goto done;
4132 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4134 031a5338 2019-03-26 stsp if (error != NULL)
4135 031a5338 2019-03-26 stsp goto done;
4137 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4138 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4139 d00136be 2019-03-26 stsp if (error)
4140 d00136be 2019-03-26 stsp goto done;
4142 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4143 6d022e97 2019-08-04 stsp if (error)
4144 6d022e97 2019-08-04 stsp goto done;
4146 1dd54920 2019-05-11 stsp error = got_worktree_schedule_add(worktree, &paths, print_status,
4147 1dd54920 2019-05-11 stsp NULL, repo);
4150 031a5338 2019-03-26 stsp got_repo_close(repo);
4151 d00136be 2019-03-26 stsp if (worktree)
4152 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4153 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4154 1dd54920 2019-05-11 stsp free((char *)pe->path);
4155 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4156 2ec1f75b 2019-03-26 stsp free(cwd);
4157 2ec1f75b 2019-03-26 stsp return error;
4160 2ec1f75b 2019-03-26 stsp __dead static void
4161 648e4ef7 2019-07-09 stsp usage_remove(void)
4163 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4167 2a06fe5f 2019-08-24 stsp static const struct got_error *
4168 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4169 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
4170 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4171 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
4173 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4174 2a06fe5f 2019-08-24 stsp return NULL;
4175 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4176 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4177 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4178 2a06fe5f 2019-08-24 stsp return NULL;
4181 2ec1f75b 2019-03-26 stsp static const struct got_error *
4182 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4184 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4185 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4186 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4187 17ed4618 2019-06-02 stsp char *cwd = NULL;
4188 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4189 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4190 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
4192 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4194 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
4195 2ec1f75b 2019-03-26 stsp switch (ch) {
4197 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4200 2ec1f75b 2019-03-26 stsp usage_add();
4201 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4205 2ec1f75b 2019-03-26 stsp argc -= optind;
4206 2ec1f75b 2019-03-26 stsp argv += optind;
4208 43012d58 2019-07-14 stsp #ifndef PROFILE
4209 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4210 43012d58 2019-07-14 stsp NULL) == -1)
4211 43012d58 2019-07-14 stsp err(1, "pledge");
4213 17ed4618 2019-06-02 stsp if (argc < 1)
4214 648e4ef7 2019-07-09 stsp usage_remove();
4216 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4217 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4218 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4219 2ec1f75b 2019-03-26 stsp goto done;
4221 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4222 2ec1f75b 2019-03-26 stsp if (error)
4223 2ec1f75b 2019-03-26 stsp goto done;
4225 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4228 2ec1f75b 2019-03-26 stsp goto done;
4230 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4231 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4232 2ec1f75b 2019-03-26 stsp if (error)
4233 2ec1f75b 2019-03-26 stsp goto done;
4235 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4236 6d022e97 2019-08-04 stsp if (error)
4237 6d022e97 2019-08-04 stsp goto done;
4239 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4240 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
4241 a129376b 2019-03-28 stsp if (error)
4242 a129376b 2019-03-28 stsp goto done;
4245 a129376b 2019-03-28 stsp got_repo_close(repo);
4246 a129376b 2019-03-28 stsp if (worktree)
4247 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4248 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4249 17ed4618 2019-06-02 stsp free((char *)pe->path);
4250 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4251 a129376b 2019-03-28 stsp free(cwd);
4252 a129376b 2019-03-28 stsp return error;
4255 a129376b 2019-03-28 stsp __dead static void
4256 a129376b 2019-03-28 stsp usage_revert(void)
4258 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4259 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4263 1ee397ad 2019-07-12 stsp static const struct got_error *
4264 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4266 a129376b 2019-03-28 stsp while (path[0] == '/')
4268 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4269 33aa809d 2019-08-08 stsp return NULL;
4272 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4273 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4274 33aa809d 2019-08-08 stsp const char *action;
4277 33aa809d 2019-08-08 stsp static const struct got_error *
4278 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4279 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4281 33aa809d 2019-08-08 stsp char *line = NULL;
4282 33aa809d 2019-08-08 stsp size_t linesize = 0;
4283 33aa809d 2019-08-08 stsp ssize_t linelen;
4285 33aa809d 2019-08-08 stsp switch (status) {
4286 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4287 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4289 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4290 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4292 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4293 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4294 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4295 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4296 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4297 33aa809d 2019-08-08 stsp printf("%s", line);
4298 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4299 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4300 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4301 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4302 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4305 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4308 33aa809d 2019-08-08 stsp return NULL;
4311 33aa809d 2019-08-08 stsp static const struct got_error *
4312 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4313 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4315 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4316 33aa809d 2019-08-08 stsp char *line = NULL;
4317 33aa809d 2019-08-08 stsp size_t linesize = 0;
4318 33aa809d 2019-08-08 stsp ssize_t linelen;
4319 33aa809d 2019-08-08 stsp int resp = ' ';
4320 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4322 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4324 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4326 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4327 33aa809d 2019-08-08 stsp a->action);
4329 33aa809d 2019-08-08 stsp return err;
4330 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4331 33aa809d 2019-08-08 stsp if (linelen == -1) {
4332 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4333 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4334 33aa809d 2019-08-08 stsp return NULL;
4336 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4338 33aa809d 2019-08-08 stsp *nl = '\0';
4339 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4340 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4341 33aa809d 2019-08-08 stsp printf("y\n");
4342 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4343 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4344 33aa809d 2019-08-08 stsp printf("n\n");
4345 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4346 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4347 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4348 33aa809d 2019-08-08 stsp printf("q\n");
4350 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4351 33aa809d 2019-08-08 stsp free(line);
4352 33aa809d 2019-08-08 stsp return NULL;
4355 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4356 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4357 33aa809d 2019-08-08 stsp a->action);
4359 33aa809d 2019-08-08 stsp return err;
4360 33aa809d 2019-08-08 stsp resp = getchar();
4361 33aa809d 2019-08-08 stsp if (resp == '\n')
4362 33aa809d 2019-08-08 stsp resp = getchar();
4363 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4364 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4365 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4366 33aa809d 2019-08-08 stsp resp = ' ';
4368 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4369 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4370 33aa809d 2019-08-08 stsp resp = ' ';
4374 33aa809d 2019-08-08 stsp if (resp == 'y')
4375 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4376 33aa809d 2019-08-08 stsp else if (resp == 'n')
4377 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4378 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4379 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4381 1ee397ad 2019-07-12 stsp return NULL;
4385 a129376b 2019-03-28 stsp static const struct got_error *
4386 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4388 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4389 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4390 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4391 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4392 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4393 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4394 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4395 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4396 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4397 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4399 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4401 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4402 a129376b 2019-03-28 stsp switch (ch) {
4404 33aa809d 2019-08-08 stsp pflag = 1;
4407 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4410 0f6d7415 2019-08-08 stsp can_recurse = 1;
4413 a129376b 2019-03-28 stsp usage_revert();
4414 a129376b 2019-03-28 stsp /* NOTREACHED */
4418 a129376b 2019-03-28 stsp argc -= optind;
4419 a129376b 2019-03-28 stsp argv += optind;
4421 43012d58 2019-07-14 stsp #ifndef PROFILE
4422 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4423 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4424 43012d58 2019-07-14 stsp err(1, "pledge");
4426 e20a8b6f 2019-06-04 stsp if (argc < 1)
4427 a129376b 2019-03-28 stsp usage_revert();
4428 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4429 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4431 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4432 a129376b 2019-03-28 stsp if (cwd == NULL) {
4433 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4434 a129376b 2019-03-28 stsp goto done;
4436 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4437 2ec1f75b 2019-03-26 stsp if (error)
4438 2ec1f75b 2019-03-26 stsp goto done;
4440 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4442 a129376b 2019-03-28 stsp if (error != NULL)
4443 a129376b 2019-03-28 stsp goto done;
4445 33aa809d 2019-08-08 stsp if (patch_script_path) {
4446 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4447 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4448 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4449 33aa809d 2019-08-08 stsp patch_script_path);
4450 33aa809d 2019-08-08 stsp goto done;
4453 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4454 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4455 a129376b 2019-03-28 stsp if (error)
4456 a129376b 2019-03-28 stsp goto done;
4458 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4459 6d022e97 2019-08-04 stsp if (error)
4460 6d022e97 2019-08-04 stsp goto done;
4462 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4463 0f6d7415 2019-08-08 stsp char *ondisk_path;
4464 0f6d7415 2019-08-08 stsp struct stat sb;
4465 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4466 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4467 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4468 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4469 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4470 0f6d7415 2019-08-08 stsp goto done;
4472 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4473 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4474 0f6d7415 2019-08-08 stsp free(ondisk_path);
4477 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4478 0f6d7415 2019-08-08 stsp ondisk_path);
4479 0f6d7415 2019-08-08 stsp free(ondisk_path);
4480 0f6d7415 2019-08-08 stsp goto done;
4482 0f6d7415 2019-08-08 stsp free(ondisk_path);
4483 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4484 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4485 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4486 0f6d7415 2019-08-08 stsp goto done;
4491 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4492 33aa809d 2019-08-08 stsp cpa.action = "revert";
4493 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4494 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4495 a129376b 2019-03-28 stsp if (error)
4496 a129376b 2019-03-28 stsp goto done;
4498 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4499 33aa809d 2019-08-08 stsp error == NULL)
4500 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4502 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4503 2ec1f75b 2019-03-26 stsp if (worktree)
4504 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4505 2ec1f75b 2019-03-26 stsp free(path);
4506 d00136be 2019-03-26 stsp free(cwd);
4507 6bad629b 2019-02-04 stsp return error;
4510 c4296144 2019-05-09 stsp __dead static void
4511 c4296144 2019-05-09 stsp usage_commit(void)
4513 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4514 5c1e53bc 2019-07-28 stsp getprogname());
4518 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4519 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4520 e2ba3d07 2019-05-13 stsp const char *editor;
4521 e0870e44 2019-05-13 stsp const char *worktree_path;
4522 76d98825 2019-06-03 stsp const char *branch_name;
4523 314a6357 2019-05-13 stsp const char *repo_path;
4524 e0870e44 2019-05-13 stsp char *logmsg_path;
4528 33ad4cbe 2019-05-12 jcs static const struct got_error *
4529 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4532 76d98825 2019-06-03 stsp char *initial_content = NULL;
4533 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4534 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4535 e0870e44 2019-05-13 stsp char *template = NULL;
4536 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4538 33ad4cbe 2019-05-12 jcs size_t len;
4540 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4541 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4542 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4543 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4544 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4545 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4546 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4547 33ad4cbe 2019-05-12 jcs return NULL;
4550 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4551 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4553 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4554 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4555 76d98825 2019-06-03 stsp a->branch_name) == -1)
4556 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4558 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4560 e0870e44 2019-05-13 stsp goto done;
4562 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4564 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4565 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4566 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4567 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4568 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4572 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4574 76d98825 2019-06-03 stsp free(initial_content);
4575 e0870e44 2019-05-13 stsp free(template);
4577 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4578 3ce1b845 2019-07-15 stsp if (err == NULL) {
4579 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4580 3ce1b845 2019-07-15 stsp if (err) {
4581 3ce1b845 2019-07-15 stsp free(*logmsg);
4582 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4585 33ad4cbe 2019-05-12 jcs return err;
4588 c4296144 2019-05-09 stsp static const struct got_error *
4589 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4591 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4592 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4593 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4594 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4595 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4596 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4597 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4598 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4599 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4600 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4602 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4603 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4605 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4606 c4296144 2019-05-09 stsp switch (ch) {
4608 c4296144 2019-05-09 stsp logmsg = optarg;
4611 c4296144 2019-05-09 stsp usage_commit();
4612 c4296144 2019-05-09 stsp /* NOTREACHED */
4616 c4296144 2019-05-09 stsp argc -= optind;
4617 c4296144 2019-05-09 stsp argv += optind;
4619 43012d58 2019-07-14 stsp #ifndef PROFILE
4620 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4621 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4622 43012d58 2019-07-14 stsp err(1, "pledge");
4624 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4625 c4296144 2019-05-09 stsp if (cwd == NULL) {
4626 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4627 c4296144 2019-05-09 stsp goto done;
4629 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4630 7d5807f4 2019-07-11 stsp if (error)
4631 7d5807f4 2019-07-11 stsp goto done;
4633 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4634 c4296144 2019-05-09 stsp if (error)
4635 a698f62e 2019-07-25 stsp goto done;
4636 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4637 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4638 c4296144 2019-05-09 stsp goto done;
4641 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4642 916f288c 2019-07-30 stsp worktree);
4643 5c1e53bc 2019-07-28 stsp if (error)
4644 5c1e53bc 2019-07-28 stsp goto done;
4646 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4647 c9956ddf 2019-09-08 stsp if (error)
4648 c9956ddf 2019-09-08 stsp goto done;
4649 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4650 c9956ddf 2019-09-08 stsp gitconfig_path);
4651 c4296144 2019-05-09 stsp if (error != NULL)
4652 c4296144 2019-05-09 stsp goto done;
4654 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4655 aba9c984 2019-09-08 stsp if (error)
4656 aba9c984 2019-09-08 stsp return error;
4659 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4660 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4662 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4663 314a6357 2019-05-13 stsp error = get_editor(&editor);
4665 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4666 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4667 c4296144 2019-05-09 stsp if (error)
4668 c4296144 2019-05-09 stsp goto done;
4670 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4671 087fb88c 2019-08-04 stsp if (error)
4672 087fb88c 2019-08-04 stsp goto done;
4674 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4675 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4676 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4677 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4678 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4679 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4680 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4681 916f288c 2019-07-30 stsp goto done;
4683 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4685 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4686 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4687 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4688 e0870e44 2019-05-13 stsp if (error) {
4689 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4690 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4691 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4692 c4296144 2019-05-09 stsp goto done;
4695 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4696 c4296144 2019-05-09 stsp if (error)
4697 c4296144 2019-05-09 stsp goto done;
4698 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4700 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4701 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4702 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4703 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4704 7266f21f 2019-10-21 stsp error == NULL)
4705 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4706 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4708 c4296144 2019-05-09 stsp got_repo_close(repo);
4709 c4296144 2019-05-09 stsp if (worktree)
4710 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4711 c4296144 2019-05-09 stsp free(cwd);
4712 c4296144 2019-05-09 stsp free(id_str);
4713 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4714 e2ba3d07 2019-05-13 stsp free(editor);
4715 aba9c984 2019-09-08 stsp free(author);
4716 234035bc 2019-06-01 stsp return error;
4719 234035bc 2019-06-01 stsp __dead static void
4720 234035bc 2019-06-01 stsp usage_cherrypick(void)
4722 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4726 234035bc 2019-06-01 stsp static const struct got_error *
4727 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4729 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4730 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4731 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4732 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4733 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4734 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4735 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4736 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4737 234035bc 2019-06-01 stsp int ch, did_something = 0;
4739 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4740 234035bc 2019-06-01 stsp switch (ch) {
4742 234035bc 2019-06-01 stsp usage_cherrypick();
4743 234035bc 2019-06-01 stsp /* NOTREACHED */
4747 234035bc 2019-06-01 stsp argc -= optind;
4748 234035bc 2019-06-01 stsp argv += optind;
4750 43012d58 2019-07-14 stsp #ifndef PROFILE
4751 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4752 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4753 43012d58 2019-07-14 stsp err(1, "pledge");
4755 234035bc 2019-06-01 stsp if (argc != 1)
4756 234035bc 2019-06-01 stsp usage_cherrypick();
4758 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4759 234035bc 2019-06-01 stsp if (cwd == NULL) {
4760 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4761 234035bc 2019-06-01 stsp goto done;
4763 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4764 234035bc 2019-06-01 stsp if (error)
4765 234035bc 2019-06-01 stsp goto done;
4767 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4769 234035bc 2019-06-01 stsp if (error != NULL)
4770 234035bc 2019-06-01 stsp goto done;
4772 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4773 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4774 234035bc 2019-06-01 stsp if (error)
4775 234035bc 2019-06-01 stsp goto done;
4777 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4778 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4779 234035bc 2019-06-01 stsp if (error != NULL) {
4780 234035bc 2019-06-01 stsp struct got_reference *ref;
4781 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4782 234035bc 2019-06-01 stsp goto done;
4783 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4784 234035bc 2019-06-01 stsp if (error != NULL)
4785 234035bc 2019-06-01 stsp goto done;
4786 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4787 234035bc 2019-06-01 stsp got_ref_close(ref);
4788 234035bc 2019-06-01 stsp if (error != NULL)
4789 234035bc 2019-06-01 stsp goto done;
4791 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4792 234035bc 2019-06-01 stsp if (error)
4793 234035bc 2019-06-01 stsp goto done;
4795 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4796 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4797 234035bc 2019-06-01 stsp if (error != NULL)
4798 234035bc 2019-06-01 stsp goto done;
4800 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4801 234035bc 2019-06-01 stsp if (error) {
4802 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4803 234035bc 2019-06-01 stsp goto done;
4804 234035bc 2019-06-01 stsp error = NULL;
4806 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4807 234035bc 2019-06-01 stsp goto done;
4810 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4811 234035bc 2019-06-01 stsp if (error)
4812 234035bc 2019-06-01 stsp goto done;
4813 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4814 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4815 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4817 234035bc 2019-06-01 stsp if (error != NULL)
4818 234035bc 2019-06-01 stsp goto done;
4820 234035bc 2019-06-01 stsp if (did_something)
4821 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4823 234035bc 2019-06-01 stsp if (commit)
4824 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4825 234035bc 2019-06-01 stsp free(commit_id_str);
4826 234035bc 2019-06-01 stsp if (head_ref)
4827 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4828 234035bc 2019-06-01 stsp if (worktree)
4829 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4831 234035bc 2019-06-01 stsp got_repo_close(repo);
4832 c4296144 2019-05-09 stsp return error;
4835 5ef14e63 2019-06-02 stsp __dead static void
4836 5ef14e63 2019-06-02 stsp usage_backout(void)
4838 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4842 5ef14e63 2019-06-02 stsp static const struct got_error *
4843 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4845 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4846 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4847 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4848 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4849 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4850 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4851 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4852 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4853 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4855 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4856 5ef14e63 2019-06-02 stsp switch (ch) {
4858 5ef14e63 2019-06-02 stsp usage_backout();
4859 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4863 5ef14e63 2019-06-02 stsp argc -= optind;
4864 5ef14e63 2019-06-02 stsp argv += optind;
4866 43012d58 2019-07-14 stsp #ifndef PROFILE
4867 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4868 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4869 43012d58 2019-07-14 stsp err(1, "pledge");
4871 5ef14e63 2019-06-02 stsp if (argc != 1)
4872 5ef14e63 2019-06-02 stsp usage_backout();
4874 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4875 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4876 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4877 5ef14e63 2019-06-02 stsp goto done;
4879 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4880 5ef14e63 2019-06-02 stsp if (error)
4881 5ef14e63 2019-06-02 stsp goto done;
4883 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4885 5ef14e63 2019-06-02 stsp if (error != NULL)
4886 5ef14e63 2019-06-02 stsp goto done;
4888 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4889 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4890 5ef14e63 2019-06-02 stsp if (error)
4891 5ef14e63 2019-06-02 stsp goto done;
4893 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4894 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4895 5ef14e63 2019-06-02 stsp if (error != NULL) {
4896 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4897 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4898 5ef14e63 2019-06-02 stsp goto done;
4899 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4900 5ef14e63 2019-06-02 stsp if (error != NULL)
4901 5ef14e63 2019-06-02 stsp goto done;
4902 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4903 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4904 5ef14e63 2019-06-02 stsp if (error != NULL)
4905 5ef14e63 2019-06-02 stsp goto done;
4907 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4908 5ef14e63 2019-06-02 stsp if (error)
4909 5ef14e63 2019-06-02 stsp goto done;
4911 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4912 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4913 5ef14e63 2019-06-02 stsp if (error != NULL)
4914 5ef14e63 2019-06-02 stsp goto done;
4916 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4917 5ef14e63 2019-06-02 stsp if (error)
4918 5ef14e63 2019-06-02 stsp goto done;
4920 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4921 5ef14e63 2019-06-02 stsp if (error)
4922 5ef14e63 2019-06-02 stsp goto done;
4923 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4924 5ef14e63 2019-06-02 stsp if (pid == NULL) {
4925 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
4926 5ef14e63 2019-06-02 stsp goto done;
4929 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4930 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
4931 5ef14e63 2019-06-02 stsp if (error != NULL)
4932 5ef14e63 2019-06-02 stsp goto done;
4934 5ef14e63 2019-06-02 stsp if (did_something)
4935 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
4937 5ef14e63 2019-06-02 stsp if (commit)
4938 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
4939 5ef14e63 2019-06-02 stsp free(commit_id_str);
4940 5ef14e63 2019-06-02 stsp if (head_ref)
4941 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
4942 818c7501 2019-07-11 stsp if (worktree)
4943 818c7501 2019-07-11 stsp got_worktree_close(worktree);
4945 818c7501 2019-07-11 stsp got_repo_close(repo);
4946 818c7501 2019-07-11 stsp return error;
4949 818c7501 2019-07-11 stsp __dead static void
4950 818c7501 2019-07-11 stsp usage_rebase(void)
4952 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4953 af54c8f8 2019-07-11 stsp getprogname());
4958 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
4961 0ebf8283 2019-07-24 stsp size_t len;
4963 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
4964 0ebf8283 2019-07-24 stsp if (len > limit)
4965 0ebf8283 2019-07-24 stsp len = limit;
4966 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
4967 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
4969 0ebf8283 2019-07-24 stsp *nl = '\0';
4972 0ebf8283 2019-07-24 stsp static const struct got_error *
4973 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4975 5943eee2 2019-08-13 stsp const struct got_error *err;
4976 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
4977 5943eee2 2019-08-13 stsp const char *s;
4979 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
4981 5943eee2 2019-08-13 stsp return err;
4983 5943eee2 2019-08-13 stsp s = logmsg0;
4984 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
4987 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
4988 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
4989 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4990 5943eee2 2019-08-13 stsp goto done;
4993 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
4995 5943eee2 2019-08-13 stsp free(logmsg0);
4996 5943eee2 2019-08-13 stsp return err;
4999 818c7501 2019-07-11 stsp static const struct got_error *
5000 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5001 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5003 818c7501 2019-07-11 stsp const struct got_error *err;
5004 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5006 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5008 818c7501 2019-07-11 stsp goto done;
5010 ff0d2220 2019-07-11 stsp if (new_id) {
5011 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5013 ff0d2220 2019-07-11 stsp goto done;
5016 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5017 ff0d2220 2019-07-11 stsp if (new_id_str)
5018 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5020 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5022 0ebf8283 2019-07-24 stsp goto done;
5024 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5025 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5027 818c7501 2019-07-11 stsp free(old_id_str);
5028 818c7501 2019-07-11 stsp free(new_id_str);
5029 818c7501 2019-07-11 stsp return err;
5032 1ee397ad 2019-07-12 stsp static const struct got_error *
5033 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5035 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5037 818c7501 2019-07-11 stsp while (path[0] == '/')
5039 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5041 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5042 1ee397ad 2019-07-12 stsp return NULL;
5043 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5044 818c7501 2019-07-11 stsp *rebase_status = status;
5045 1ee397ad 2019-07-12 stsp return NULL;
5048 818c7501 2019-07-11 stsp static const struct got_error *
5049 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5050 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5051 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5053 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5054 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5055 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5058 818c7501 2019-07-11 stsp static const struct got_error *
5059 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5060 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5061 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5062 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5064 ff0d2220 2019-07-11 stsp const struct got_error *error;
5065 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5066 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5068 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5069 ff0d2220 2019-07-11 stsp if (error)
5070 ff0d2220 2019-07-11 stsp return error;
5072 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5073 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5074 ff0d2220 2019-07-11 stsp if (error) {
5075 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5076 ff0d2220 2019-07-11 stsp goto done;
5077 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5079 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5080 ff0d2220 2019-07-11 stsp free(new_commit_id);
5083 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5084 ff0d2220 2019-07-11 stsp return error;
5087 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5088 64c6d990 2019-07-11 stsp const char *path_prefix;
5089 64c6d990 2019-07-11 stsp size_t len;
5090 8ca9bd68 2019-07-25 stsp int errcode;
5093 64c6d990 2019-07-11 stsp static const struct got_error *
5094 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5095 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5096 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5097 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5099 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5101 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5102 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5103 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5105 64c6d990 2019-07-11 stsp return NULL;
5108 64c6d990 2019-07-11 stsp static const struct got_error *
5109 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5110 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5111 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5113 64c6d990 2019-07-11 stsp const struct got_error *err;
5114 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5115 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5116 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5118 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5119 64c6d990 2019-07-11 stsp return NULL;
5121 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5123 64c6d990 2019-07-11 stsp goto done;
5125 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5127 64c6d990 2019-07-11 stsp goto done;
5129 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5130 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5132 64c6d990 2019-07-11 stsp goto done;
5134 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5135 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5137 64c6d990 2019-07-11 stsp goto done;
5139 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5140 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5141 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5142 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5143 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5144 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5145 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5147 64c6d990 2019-07-11 stsp if (tree1)
5148 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5149 64c6d990 2019-07-11 stsp if (tree2)
5150 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5151 64c6d990 2019-07-11 stsp if (commit)
5152 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5153 64c6d990 2019-07-11 stsp if (parent_commit)
5154 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5155 64c6d990 2019-07-11 stsp return err;
5158 ff0d2220 2019-07-11 stsp static const struct got_error *
5159 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5160 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5161 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5162 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5163 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5165 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5166 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5167 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5168 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5169 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5171 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5173 af61c510 2019-07-19 stsp return err;
5175 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5176 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5178 af61c510 2019-07-19 stsp goto done;
5179 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5180 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5181 af61c510 2019-07-19 stsp if (err) {
5182 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5183 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5184 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5185 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5186 af61c510 2019-07-19 stsp "been reached?!?");
5187 af61c510 2019-07-19 stsp goto done;
5188 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5189 af61c510 2019-07-19 stsp goto done;
5190 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5191 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5193 af61c510 2019-07-19 stsp goto done;
5195 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5196 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5198 af61c510 2019-07-19 stsp goto done;
5200 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5202 af61c510 2019-07-19 stsp goto done;
5203 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5204 af61c510 2019-07-19 stsp commit_id = parent_id;
5208 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5209 af61c510 2019-07-19 stsp return err;
5212 af61c510 2019-07-19 stsp static const struct got_error *
5213 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5215 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5216 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5217 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5218 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5219 818c7501 2019-07-11 stsp char *cwd = NULL;
5220 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5221 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5222 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5223 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5224 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5225 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5226 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5227 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5228 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5229 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5230 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5231 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5233 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5234 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5236 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5237 818c7501 2019-07-11 stsp switch (ch) {
5239 818c7501 2019-07-11 stsp abort_rebase = 1;
5242 818c7501 2019-07-11 stsp continue_rebase = 1;
5245 818c7501 2019-07-11 stsp usage_rebase();
5246 818c7501 2019-07-11 stsp /* NOTREACHED */
5250 818c7501 2019-07-11 stsp argc -= optind;
5251 818c7501 2019-07-11 stsp argv += optind;
5253 43012d58 2019-07-14 stsp #ifndef PROFILE
5254 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5255 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5256 43012d58 2019-07-14 stsp err(1, "pledge");
5258 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5259 818c7501 2019-07-11 stsp usage_rebase();
5260 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5261 818c7501 2019-07-11 stsp if (argc != 0)
5262 818c7501 2019-07-11 stsp usage_rebase();
5263 818c7501 2019-07-11 stsp } else if (argc != 1)
5264 818c7501 2019-07-11 stsp usage_rebase();
5266 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5267 818c7501 2019-07-11 stsp if (cwd == NULL) {
5268 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5269 818c7501 2019-07-11 stsp goto done;
5271 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5272 818c7501 2019-07-11 stsp if (error)
5273 818c7501 2019-07-11 stsp goto done;
5275 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5277 818c7501 2019-07-11 stsp if (error != NULL)
5278 818c7501 2019-07-11 stsp goto done;
5280 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5281 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5282 818c7501 2019-07-11 stsp if (error)
5283 818c7501 2019-07-11 stsp goto done;
5285 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5286 818c7501 2019-07-11 stsp if (error)
5287 818c7501 2019-07-11 stsp goto done;
5289 f6794adc 2019-07-23 stsp if (abort_rebase) {
5290 818c7501 2019-07-11 stsp int did_something;
5291 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5292 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5293 f6794adc 2019-07-23 stsp goto done;
5295 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5296 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5297 3e3a69f1 2019-07-25 stsp worktree, repo);
5298 818c7501 2019-07-11 stsp if (error)
5299 818c7501 2019-07-11 stsp goto done;
5300 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5301 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5302 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5303 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5304 818c7501 2019-07-11 stsp if (error)
5305 818c7501 2019-07-11 stsp goto done;
5306 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5307 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5310 818c7501 2019-07-11 stsp if (continue_rebase) {
5311 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5312 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5313 f6794adc 2019-07-23 stsp goto done;
5315 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5316 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5317 3e3a69f1 2019-07-25 stsp worktree, repo);
5318 818c7501 2019-07-11 stsp if (error)
5319 818c7501 2019-07-11 stsp goto done;
5321 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5322 01757395 2019-07-12 stsp resume_commit_id, repo);
5323 818c7501 2019-07-11 stsp if (error)
5324 818c7501 2019-07-11 stsp goto done;
5326 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5327 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5328 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5329 818c7501 2019-07-11 stsp goto done;
5332 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5333 818c7501 2019-07-11 stsp if (error != NULL)
5334 818c7501 2019-07-11 stsp goto done;
5337 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5338 ff0d2220 2019-07-11 stsp if (error)
5339 ff0d2220 2019-07-11 stsp goto done;
5341 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5342 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5344 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5345 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5346 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5347 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5348 818c7501 2019-07-11 stsp if (error)
5349 818c7501 2019-07-11 stsp goto done;
5350 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5351 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5352 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5353 818c7501 2019-07-11 stsp "with work tree's branch");
5354 818c7501 2019-07-11 stsp goto done;
5357 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5358 a51a74b3 2019-07-27 stsp if (error) {
5359 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5360 a51a74b3 2019-07-27 stsp goto done;
5361 a51a74b3 2019-07-27 stsp error = NULL;
5363 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5364 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5365 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5366 a51a74b3 2019-07-27 stsp goto done;
5368 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5369 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5370 818c7501 2019-07-11 stsp if (error)
5371 818c7501 2019-07-11 stsp goto done;
5374 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5375 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5376 818c7501 2019-07-11 stsp if (error)
5377 818c7501 2019-07-11 stsp goto done;
5379 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5380 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5381 fc66b545 2019-08-12 stsp if (pid == NULL) {
5382 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5383 fc66b545 2019-08-12 stsp int did_something;
5384 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5385 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5386 fc66b545 2019-08-12 stsp &did_something);
5387 fc66b545 2019-08-12 stsp if (error)
5388 fc66b545 2019-08-12 stsp goto done;
5389 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5390 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5392 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5393 fc66b545 2019-08-12 stsp goto done;
5395 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5396 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5397 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5398 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5399 818c7501 2019-07-11 stsp commit = NULL;
5400 818c7501 2019-07-11 stsp if (error)
5401 818c7501 2019-07-11 stsp goto done;
5403 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5404 ff0d2220 2019-07-11 stsp if (continue_rebase)
5405 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5406 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5408 ff0d2220 2019-07-11 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5409 818c7501 2019-07-11 stsp goto done;
5412 818c7501 2019-07-11 stsp pid = NULL;
5413 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5414 818c7501 2019-07-11 stsp commit_id = qid->id;
5415 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5416 818c7501 2019-07-11 stsp pid = qid;
5418 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5419 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5420 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5421 818c7501 2019-07-11 stsp if (error)
5422 818c7501 2019-07-11 stsp goto done;
5424 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5425 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5429 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5430 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5431 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5432 818c7501 2019-07-11 stsp if (error)
5433 818c7501 2019-07-11 stsp goto done;
5436 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5437 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5438 818c7501 2019-07-11 stsp if (error)
5439 818c7501 2019-07-11 stsp goto done;
5440 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5441 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5443 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5444 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5446 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5447 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5448 818c7501 2019-07-11 stsp free(resume_commit_id);
5449 818c7501 2019-07-11 stsp free(yca_id);
5450 818c7501 2019-07-11 stsp if (commit)
5451 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5452 818c7501 2019-07-11 stsp if (branch)
5453 818c7501 2019-07-11 stsp got_ref_close(branch);
5454 818c7501 2019-07-11 stsp if (new_base_branch)
5455 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5456 818c7501 2019-07-11 stsp if (tmp_branch)
5457 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5458 5ef14e63 2019-06-02 stsp if (worktree)
5459 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5461 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5462 5ef14e63 2019-06-02 stsp return error;
5465 0ebf8283 2019-07-24 stsp __dead static void
5466 0ebf8283 2019-07-24 stsp usage_histedit(void)
5468 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5469 0ebf8283 2019-07-24 stsp getprogname());
5473 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5474 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5475 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5476 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5477 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5479 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5480 0ebf8283 2019-07-24 stsp unsigned char code;
5481 0ebf8283 2019-07-24 stsp const char *name;
5482 0ebf8283 2019-07-24 stsp const char *desc;
5483 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5484 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5485 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5486 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5487 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5488 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5489 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5492 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5493 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5494 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5495 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5496 0ebf8283 2019-07-24 stsp char *logmsg;
5498 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5500 0ebf8283 2019-07-24 stsp static const struct got_error *
5501 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5502 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5504 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5505 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5506 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5509 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5511 0ebf8283 2019-07-24 stsp goto done;
5513 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5515 0ebf8283 2019-07-24 stsp goto done;
5517 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5519 0ebf8283 2019-07-24 stsp goto done;
5521 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5522 0ebf8283 2019-07-24 stsp if (n < 0)
5523 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5525 0ebf8283 2019-07-24 stsp if (commit)
5526 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5527 0ebf8283 2019-07-24 stsp free(id_str);
5528 0ebf8283 2019-07-24 stsp free(logmsg);
5529 0ebf8283 2019-07-24 stsp return err;
5532 0ebf8283 2019-07-24 stsp static const struct got_error *
5533 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5534 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5536 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5537 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5539 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5540 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5542 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5543 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5549 0ebf8283 2019-07-24 stsp return err;
5552 0ebf8283 2019-07-24 stsp static const struct got_error *
5553 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5555 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5558 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5559 0ebf8283 2019-07-24 stsp if (n < 0)
5560 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5562 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5563 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5564 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5565 0ebf8283 2019-07-24 stsp cmd->desc);
5566 0ebf8283 2019-07-24 stsp if (n < 0) {
5567 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5571 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5572 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5573 0ebf8283 2019-07-24 stsp if (n < 0)
5574 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5575 0ebf8283 2019-07-24 stsp return err;
5578 0ebf8283 2019-07-24 stsp static const struct got_error *
5579 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5581 0ebf8283 2019-07-24 stsp static char msg[42];
5584 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5586 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5587 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5589 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5592 0ebf8283 2019-07-24 stsp static const struct got_error *
5593 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5594 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5596 0ebf8283 2019-07-24 stsp const struct got_error *err;
5597 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5598 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5600 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5602 0ebf8283 2019-07-24 stsp return err;
5604 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5606 0ebf8283 2019-07-24 stsp goto done;
5608 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5610 5943eee2 2019-08-13 stsp goto done;
5611 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5612 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5613 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5614 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5615 0ebf8283 2019-07-24 stsp goto done;
5618 0ebf8283 2019-07-24 stsp if (folded_commit)
5619 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5620 0ebf8283 2019-07-24 stsp free(id_str);
5621 5943eee2 2019-08-13 stsp free(folded_logmsg);
5622 0ebf8283 2019-07-24 stsp return err;
5625 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5626 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5628 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5630 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5631 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5632 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5633 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5634 3f9de99f 2019-07-24 stsp folded = prev;
5635 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5638 0ebf8283 2019-07-24 stsp return folded;
5641 0ebf8283 2019-07-24 stsp static const struct got_error *
5642 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5643 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5645 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5646 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5647 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5648 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5650 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5652 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5654 0ebf8283 2019-07-24 stsp return err;
5656 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5657 0ebf8283 2019-07-24 stsp if (folded) {
5658 0ebf8283 2019-07-24 stsp while (folded != hle) {
5659 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5660 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5663 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5664 0ebf8283 2019-07-24 stsp logmsg, repo);
5666 0ebf8283 2019-07-24 stsp goto done;
5667 0ebf8283 2019-07-24 stsp free(logmsg);
5668 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5669 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5673 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5675 0ebf8283 2019-07-24 stsp goto done;
5676 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5678 5943eee2 2019-08-13 stsp goto done;
5679 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5680 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5681 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5682 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5683 0ebf8283 2019-07-24 stsp goto done;
5685 0ebf8283 2019-07-24 stsp free(logmsg);
5686 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5688 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5690 0ebf8283 2019-07-24 stsp goto done;
5692 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5694 0ebf8283 2019-07-24 stsp goto done;
5696 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5697 0ebf8283 2019-07-24 stsp close(fd);
5699 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5701 0ebf8283 2019-07-24 stsp goto done;
5703 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5704 0ebf8283 2019-07-24 stsp if (err) {
5705 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5706 0ebf8283 2019-07-24 stsp goto done;
5707 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5710 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5711 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5712 0ebf8283 2019-07-24 stsp free(logmsg_path);
5713 0ebf8283 2019-07-24 stsp free(logmsg);
5714 5943eee2 2019-08-13 stsp free(orig_logmsg);
5715 0ebf8283 2019-07-24 stsp free(editor);
5716 0ebf8283 2019-07-24 stsp if (commit)
5717 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5718 0ebf8283 2019-07-24 stsp return err;
5721 0ebf8283 2019-07-24 stsp static const struct got_error *
5722 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5723 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5725 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5726 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5727 0ebf8283 2019-07-24 stsp size_t size;
5728 0ebf8283 2019-07-24 stsp ssize_t len;
5729 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5730 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5731 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5732 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5734 0ebf8283 2019-07-24 stsp for (;;) {
5735 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5736 0ebf8283 2019-07-24 stsp if (len == -1) {
5737 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5738 0ebf8283 2019-07-24 stsp if (feof(f))
5740 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5741 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5746 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5748 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5749 0ebf8283 2019-07-24 stsp free(line);
5750 0ebf8283 2019-07-24 stsp line = NULL;
5753 0ebf8283 2019-07-24 stsp cmd = NULL;
5754 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5755 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5756 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5757 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5758 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5761 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5766 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5767 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5770 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5772 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5773 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5774 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5777 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5778 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5782 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5783 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5784 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5788 0ebf8283 2019-07-24 stsp free(line);
5789 0ebf8283 2019-07-24 stsp line = NULL;
5793 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5795 0ebf8283 2019-07-24 stsp *end = '\0';
5797 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5798 0ebf8283 2019-07-24 stsp if (err) {
5799 0ebf8283 2019-07-24 stsp /* override error code */
5800 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5804 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5805 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5806 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5809 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5810 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5811 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5812 0ebf8283 2019-07-24 stsp commit_id = NULL;
5813 0ebf8283 2019-07-24 stsp free(line);
5814 0ebf8283 2019-07-24 stsp line = NULL;
5815 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5818 0ebf8283 2019-07-24 stsp free(line);
5819 0ebf8283 2019-07-24 stsp free(commit_id);
5820 0ebf8283 2019-07-24 stsp return err;
5823 0ebf8283 2019-07-24 stsp static const struct got_error *
5824 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5825 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5827 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5828 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5829 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5830 bfce7f83 2019-07-27 stsp static char msg[80];
5831 bfce7f83 2019-07-27 stsp char *id_str;
5833 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5834 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5835 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5836 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5837 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5839 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5840 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5841 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5844 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5845 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5847 bfce7f83 2019-07-27 stsp return err;
5848 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5849 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5850 bfce7f83 2019-07-27 stsp free(id_str);
5851 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5855 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5856 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5857 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5858 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5860 bfce7f83 2019-07-27 stsp return NULL;
5863 bfce7f83 2019-07-27 stsp static const struct got_error *
5864 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5865 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5866 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5868 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5869 0ebf8283 2019-07-24 stsp char *editor;
5870 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5872 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5874 0ebf8283 2019-07-24 stsp return err;
5876 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5877 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5878 0ebf8283 2019-07-24 stsp goto done;
5881 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5882 0ebf8283 2019-07-24 stsp if (f == NULL) {
5883 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5884 0ebf8283 2019-07-24 stsp goto done;
5886 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
5888 bfce7f83 2019-07-27 stsp goto done;
5890 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
5892 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5893 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5894 0ebf8283 2019-07-24 stsp free(editor);
5895 0ebf8283 2019-07-24 stsp return err;
5898 0ebf8283 2019-07-24 stsp static const struct got_error *
5899 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5900 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
5902 0ebf8283 2019-07-24 stsp static const struct got_error *
5903 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
5904 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5906 0ebf8283 2019-07-24 stsp const struct got_error *err;
5907 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5908 0ebf8283 2019-07-24 stsp char *path = NULL;
5910 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
5912 0ebf8283 2019-07-24 stsp return err;
5914 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
5916 0ebf8283 2019-07-24 stsp goto done;
5918 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
5920 0ebf8283 2019-07-24 stsp goto done;
5922 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
5923 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5924 0ebf8283 2019-07-24 stsp goto done;
5928 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
5929 0ebf8283 2019-07-24 stsp if (err) {
5930 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5931 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
5932 0ebf8283 2019-07-24 stsp goto done;
5933 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
5934 0ebf8283 2019-07-24 stsp commits, path, repo);
5937 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5938 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5939 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
5940 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
5941 0ebf8283 2019-07-24 stsp free(path);
5942 0ebf8283 2019-07-24 stsp return err;
5945 0ebf8283 2019-07-24 stsp static const struct got_error *
5946 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
5947 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5949 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5950 0ebf8283 2019-07-24 stsp char *path = NULL;
5951 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5952 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
5953 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5955 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
5957 0ebf8283 2019-07-24 stsp return err;
5959 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
5960 0ebf8283 2019-07-24 stsp if (f == NULL) {
5961 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
5962 0ebf8283 2019-07-24 stsp goto done;
5964 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5965 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5970 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
5971 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
5972 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
5973 0ebf8283 2019-07-24 stsp if (n < 0) {
5974 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5980 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
5981 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
5982 0ebf8283 2019-07-24 stsp free(path);
5983 0ebf8283 2019-07-24 stsp if (commit)
5984 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5985 0ebf8283 2019-07-24 stsp return err;
5989 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
5991 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5993 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
5994 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
5995 bfce7f83 2019-07-27 stsp free(hle);
5999 0ebf8283 2019-07-24 stsp static const struct got_error *
6000 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6001 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6003 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6004 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6006 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6007 0ebf8283 2019-07-24 stsp if (f == NULL) {
6008 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6009 0ebf8283 2019-07-24 stsp goto done;
6012 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6014 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6015 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6016 0ebf8283 2019-07-24 stsp return err;
6019 0ebf8283 2019-07-24 stsp static const struct got_error *
6020 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6021 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6022 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6024 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6025 0ebf8283 2019-07-24 stsp int resp = ' ';
6027 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6028 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6029 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6030 0ebf8283 2019-07-24 stsp resp = getchar();
6031 a61a4414 2019-08-07 stsp if (resp == '\n')
6032 a61a4414 2019-08-07 stsp resp = getchar();
6033 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6034 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6035 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6037 426ebf2e 2019-07-25 stsp if (err) {
6038 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6039 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6041 bfce7f83 2019-07-27 stsp prev_err = err;
6042 426ebf2e 2019-07-25 stsp resp = ' ';
6046 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6047 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6048 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6049 0ebf8283 2019-07-24 stsp commits, repo);
6050 426ebf2e 2019-07-25 stsp if (err) {
6051 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6052 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6054 bfce7f83 2019-07-27 stsp prev_err = err;
6055 426ebf2e 2019-07-25 stsp resp = ' ';
6059 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6060 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6063 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6066 0ebf8283 2019-07-24 stsp return err;
6069 0ebf8283 2019-07-24 stsp static const struct got_error *
6070 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6071 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6072 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6074 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6075 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6076 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6077 3e3a69f1 2019-07-25 stsp branch, repo);
6080 0ebf8283 2019-07-24 stsp static const struct got_error *
6081 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6082 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6084 0ebf8283 2019-07-24 stsp const struct got_error *err;
6085 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6087 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6089 0ebf8283 2019-07-24 stsp goto done;
6091 0ebf8283 2019-07-24 stsp if (new_id) {
6092 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6094 0ebf8283 2019-07-24 stsp goto done;
6097 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6098 0ebf8283 2019-07-24 stsp if (new_id_str)
6099 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6101 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6102 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6103 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6104 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6105 0ebf8283 2019-07-24 stsp goto done;
6107 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6109 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6111 0ebf8283 2019-07-24 stsp goto done;
6114 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6115 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6116 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6117 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6118 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6120 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6121 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6122 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6130 0ebf8283 2019-07-24 stsp free(old_id_str);
6131 0ebf8283 2019-07-24 stsp free(new_id_str);
6132 0ebf8283 2019-07-24 stsp return err;
6135 0ebf8283 2019-07-24 stsp static const struct got_error *
6136 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6137 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6138 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6139 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6141 0ebf8283 2019-07-24 stsp const struct got_error *err;
6142 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6143 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6145 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6146 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6147 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6149 0ebf8283 2019-07-24 stsp return err;
6152 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6154 0ebf8283 2019-07-24 stsp return err;
6156 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6157 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6158 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6159 0ebf8283 2019-07-24 stsp if (err) {
6160 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6161 0ebf8283 2019-07-24 stsp goto done;
6162 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6164 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6165 0ebf8283 2019-07-24 stsp free(new_commit_id);
6168 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6169 0ebf8283 2019-07-24 stsp return err;
6172 0ebf8283 2019-07-24 stsp static const struct got_error *
6173 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6174 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6176 0ebf8283 2019-07-24 stsp const struct got_error *error;
6177 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6179 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6181 0ebf8283 2019-07-24 stsp if (error)
6182 0ebf8283 2019-07-24 stsp return error;
6184 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6185 0ebf8283 2019-07-24 stsp if (error)
6186 0ebf8283 2019-07-24 stsp return error;
6188 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6189 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6190 0ebf8283 2019-07-24 stsp return error;
6193 0ebf8283 2019-07-24 stsp static const struct got_error *
6194 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6196 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6197 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6198 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6199 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6200 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6201 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6202 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6203 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6204 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6205 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6206 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6207 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6208 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6209 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6210 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6211 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6212 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6213 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6214 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6215 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6216 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6218 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6219 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6220 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6222 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6223 0ebf8283 2019-07-24 stsp switch (ch) {
6225 0ebf8283 2019-07-24 stsp abort_edit = 1;
6228 0ebf8283 2019-07-24 stsp continue_edit = 1;
6231 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6234 0ebf8283 2019-07-24 stsp usage_histedit();
6235 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6239 0ebf8283 2019-07-24 stsp argc -= optind;
6240 0ebf8283 2019-07-24 stsp argv += optind;
6242 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6243 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6244 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6245 0ebf8283 2019-07-24 stsp err(1, "pledge");
6247 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6248 0ebf8283 2019-07-24 stsp usage_histedit();
6249 0ebf8283 2019-07-24 stsp if (argc != 0)
6250 0ebf8283 2019-07-24 stsp usage_histedit();
6253 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6254 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6255 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6256 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6257 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6258 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6261 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6262 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6263 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6264 0ebf8283 2019-07-24 stsp goto done;
6266 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6267 0ebf8283 2019-07-24 stsp if (error)
6268 0ebf8283 2019-07-24 stsp goto done;
6270 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6272 0ebf8283 2019-07-24 stsp if (error != NULL)
6273 0ebf8283 2019-07-24 stsp goto done;
6275 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6276 0ebf8283 2019-07-24 stsp if (error)
6277 0ebf8283 2019-07-24 stsp goto done;
6278 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6279 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6280 0ebf8283 2019-07-24 stsp goto done;
6283 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6284 0ebf8283 2019-07-24 stsp if (error)
6285 0ebf8283 2019-07-24 stsp goto done;
6287 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6288 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6289 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6290 3e3a69f1 2019-07-25 stsp worktree, repo);
6291 0ebf8283 2019-07-24 stsp if (error)
6292 0ebf8283 2019-07-24 stsp goto done;
6293 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6294 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6295 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6296 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6297 0ebf8283 2019-07-24 stsp if (error)
6298 0ebf8283 2019-07-24 stsp goto done;
6299 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6300 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6301 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6302 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6303 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6304 0ebf8283 2019-07-24 stsp goto done;
6307 0ebf8283 2019-07-24 stsp if (continue_edit) {
6308 0ebf8283 2019-07-24 stsp char *path;
6310 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6311 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6312 0ebf8283 2019-07-24 stsp goto done;
6315 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6316 0ebf8283 2019-07-24 stsp if (error)
6317 0ebf8283 2019-07-24 stsp goto done;
6319 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6320 0ebf8283 2019-07-24 stsp free(path);
6321 0ebf8283 2019-07-24 stsp if (error)
6322 0ebf8283 2019-07-24 stsp goto done;
6324 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6325 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6326 3e3a69f1 2019-07-25 stsp worktree, repo);
6327 0ebf8283 2019-07-24 stsp if (error)
6328 0ebf8283 2019-07-24 stsp goto done;
6330 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6331 0ebf8283 2019-07-24 stsp if (error)
6332 0ebf8283 2019-07-24 stsp goto done;
6334 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6335 0ebf8283 2019-07-24 stsp head_commit_id);
6336 0ebf8283 2019-07-24 stsp if (error)
6337 0ebf8283 2019-07-24 stsp goto done;
6338 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6339 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6340 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6341 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6342 3aac7cf7 2019-07-25 stsp goto done;
6344 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6345 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6346 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6347 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6348 0ebf8283 2019-07-24 stsp commit = NULL;
6349 0ebf8283 2019-07-24 stsp if (error)
6350 0ebf8283 2019-07-24 stsp goto done;
6352 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6353 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6354 0ebf8283 2019-07-24 stsp goto done;
6357 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6358 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6359 0ebf8283 2019-07-24 stsp if (error != NULL)
6360 0ebf8283 2019-07-24 stsp goto done;
6362 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6363 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6364 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6365 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6366 c7d20a3f 2019-07-30 stsp goto done;
6369 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6370 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6371 bfce7f83 2019-07-27 stsp branch = NULL;
6372 0ebf8283 2019-07-24 stsp if (error)
6373 0ebf8283 2019-07-24 stsp goto done;
6375 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6376 0ebf8283 2019-07-24 stsp head_commit_id);
6377 0ebf8283 2019-07-24 stsp if (error)
6378 0ebf8283 2019-07-24 stsp goto done;
6379 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6380 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6381 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6382 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6383 3aac7cf7 2019-07-25 stsp goto done;
6385 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6386 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6387 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6388 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6389 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6390 0ebf8283 2019-07-24 stsp commit = NULL;
6391 0ebf8283 2019-07-24 stsp if (error)
6392 0ebf8283 2019-07-24 stsp goto done;
6394 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6395 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6396 bfce7f83 2019-07-27 stsp if (error)
6397 bfce7f83 2019-07-27 stsp goto done;
6399 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6400 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6401 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6402 6ba2bea2 2019-07-27 stsp if (error) {
6403 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6404 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6405 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6406 0ebf8283 2019-07-24 stsp goto done;
6409 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6411 6ba2bea2 2019-07-27 stsp if (error) {
6412 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6413 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6414 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6415 0ebf8283 2019-07-24 stsp goto done;
6420 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6422 6ba2bea2 2019-07-27 stsp if (error) {
6423 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6424 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6425 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6426 0ebf8283 2019-07-24 stsp goto done;
6431 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6432 4ec14e60 2019-08-28 hiltjo if (error)
6433 0ebf8283 2019-07-24 stsp goto done;
6435 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6436 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6437 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6438 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6441 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6442 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6443 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6444 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6447 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6448 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6450 0ebf8283 2019-07-24 stsp if (error)
6451 0ebf8283 2019-07-24 stsp goto done;
6455 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6456 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6457 0ebf8283 2019-07-24 stsp if (error)
6458 0ebf8283 2019-07-24 stsp goto done;
6462 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6463 0ebf8283 2019-07-24 stsp hle->commit_id);
6464 0ebf8283 2019-07-24 stsp if (error)
6465 0ebf8283 2019-07-24 stsp goto done;
6466 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6467 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6469 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6470 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6471 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6472 0ebf8283 2019-07-24 stsp if (error)
6473 0ebf8283 2019-07-24 stsp goto done;
6474 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6475 0ebf8283 2019-07-24 stsp commit = NULL;
6477 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6478 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6482 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6483 0ebf8283 2019-07-24 stsp char *id_str;
6484 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6485 0ebf8283 2019-07-24 stsp if (error)
6486 0ebf8283 2019-07-24 stsp goto done;
6487 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6489 0ebf8283 2019-07-24 stsp free(id_str);
6490 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6491 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6492 3e3a69f1 2019-07-25 stsp fileindex);
6493 0ebf8283 2019-07-24 stsp goto done;
6496 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6497 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6498 0ebf8283 2019-07-24 stsp if (error)
6499 0ebf8283 2019-07-24 stsp goto done;
6503 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6504 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6505 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6506 0ebf8283 2019-07-24 stsp if (error)
6507 0ebf8283 2019-07-24 stsp goto done;
6510 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6511 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6512 0ebf8283 2019-07-24 stsp if (error)
6513 0ebf8283 2019-07-24 stsp goto done;
6514 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6515 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6517 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6518 3e3a69f1 2019-07-25 stsp branch, repo);
6520 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6521 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6522 0ebf8283 2019-07-24 stsp free(head_commit_id);
6523 0ebf8283 2019-07-24 stsp free(base_commit_id);
6524 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6525 0ebf8283 2019-07-24 stsp if (commit)
6526 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6527 0ebf8283 2019-07-24 stsp if (branch)
6528 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6529 0ebf8283 2019-07-24 stsp if (tmp_branch)
6530 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6531 0ebf8283 2019-07-24 stsp if (worktree)
6532 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6534 2822a352 2019-10-15 stsp got_repo_close(repo);
6535 2822a352 2019-10-15 stsp return error;
6538 2822a352 2019-10-15 stsp __dead static void
6539 2822a352 2019-10-15 stsp usage_integrate(void)
6541 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6545 2822a352 2019-10-15 stsp static const struct got_error *
6546 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6548 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6549 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6550 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6551 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6552 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6553 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6554 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6555 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6556 2822a352 2019-10-15 stsp int ch, did_something = 0;
6558 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6559 2822a352 2019-10-15 stsp switch (ch) {
6561 2822a352 2019-10-15 stsp usage_integrate();
6562 2822a352 2019-10-15 stsp /* NOTREACHED */
6566 2822a352 2019-10-15 stsp argc -= optind;
6567 2822a352 2019-10-15 stsp argv += optind;
6569 2822a352 2019-10-15 stsp if (argc != 1)
6570 2822a352 2019-10-15 stsp usage_integrate();
6571 2822a352 2019-10-15 stsp branch_arg = argv[0];
6573 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6574 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6575 2822a352 2019-10-15 stsp err(1, "pledge");
6577 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6578 2822a352 2019-10-15 stsp if (cwd == NULL) {
6579 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6580 2822a352 2019-10-15 stsp goto done;
6583 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6584 2822a352 2019-10-15 stsp if (error)
6585 2822a352 2019-10-15 stsp goto done;
6587 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6588 2822a352 2019-10-15 stsp if (error)
6589 2822a352 2019-10-15 stsp goto done;
6591 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6593 2822a352 2019-10-15 stsp if (error != NULL)
6594 2822a352 2019-10-15 stsp goto done;
6596 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6597 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6598 2822a352 2019-10-15 stsp if (error)
6599 2822a352 2019-10-15 stsp goto done;
6601 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6602 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6603 2822a352 2019-10-15 stsp goto done;
6606 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6607 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6608 2822a352 2019-10-15 stsp if (error)
6609 2822a352 2019-10-15 stsp goto done;
6611 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6612 2822a352 2019-10-15 stsp if (refname == NULL) {
6613 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6614 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6615 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6616 2822a352 2019-10-15 stsp goto done;
6618 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6619 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6620 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6621 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6622 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6623 2822a352 2019-10-15 stsp goto done;
6626 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6627 2822a352 2019-10-15 stsp if (error)
6628 2822a352 2019-10-15 stsp goto done;
6630 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6631 2822a352 2019-10-15 stsp if (error)
6632 2822a352 2019-10-15 stsp goto done;
6634 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6635 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6636 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6637 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6638 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6639 2822a352 2019-10-15 stsp goto done;
6642 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6643 2822a352 2019-10-15 stsp if (error) {
6644 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6645 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6646 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6647 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6648 2822a352 2019-10-15 stsp goto done;
6651 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6652 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6653 2822a352 2019-10-15 stsp check_cancelled, NULL);
6654 2822a352 2019-10-15 stsp if (error)
6655 2822a352 2019-10-15 stsp goto done;
6657 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6660 715dc77e 2019-08-03 stsp got_repo_close(repo);
6661 2822a352 2019-10-15 stsp if (worktree)
6662 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6663 2822a352 2019-10-15 stsp free(cwd);
6664 2822a352 2019-10-15 stsp free(base_commit_id);
6665 2822a352 2019-10-15 stsp free(commit_id);
6666 2822a352 2019-10-15 stsp free(refname);
6667 2822a352 2019-10-15 stsp free(base_refname);
6668 715dc77e 2019-08-03 stsp return error;
6671 715dc77e 2019-08-03 stsp __dead static void
6672 715dc77e 2019-08-03 stsp usage_stage(void)
6674 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6675 f3055044 2019-08-07 stsp "[file-path ...]\n",
6676 715dc77e 2019-08-03 stsp getprogname());
6680 715dc77e 2019-08-03 stsp static const struct got_error *
6681 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6682 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6683 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6685 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6686 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6688 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6689 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6690 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6691 408b4ebc 2019-08-03 stsp return NULL;
6693 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6694 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6695 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6697 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6699 408b4ebc 2019-08-03 stsp return err;
6701 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6702 408b4ebc 2019-08-03 stsp free(id_str);
6703 dc424a06 2019-08-07 stsp return NULL;
6706 dc424a06 2019-08-07 stsp static const struct got_error *
6707 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6709 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6710 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6711 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6712 715dc77e 2019-08-03 stsp char *cwd = NULL;
6713 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6714 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6715 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6716 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6717 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6718 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6720 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6722 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6723 715dc77e 2019-08-03 stsp switch (ch) {
6725 408b4ebc 2019-08-03 stsp list_stage = 1;
6728 dc424a06 2019-08-07 stsp pflag = 1;
6731 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6734 715dc77e 2019-08-03 stsp usage_stage();
6735 715dc77e 2019-08-03 stsp /* NOTREACHED */
6739 715dc77e 2019-08-03 stsp argc -= optind;
6740 715dc77e 2019-08-03 stsp argv += optind;
6742 715dc77e 2019-08-03 stsp #ifndef PROFILE
6743 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6744 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6745 715dc77e 2019-08-03 stsp err(1, "pledge");
6747 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6748 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6749 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6750 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6752 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6753 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6754 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6755 715dc77e 2019-08-03 stsp goto done;
6758 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6759 715dc77e 2019-08-03 stsp if (error)
6760 715dc77e 2019-08-03 stsp goto done;
6762 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6764 715dc77e 2019-08-03 stsp if (error != NULL)
6765 715dc77e 2019-08-03 stsp goto done;
6767 dc424a06 2019-08-07 stsp if (patch_script_path) {
6768 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6769 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6770 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6771 dc424a06 2019-08-07 stsp patch_script_path);
6772 dc424a06 2019-08-07 stsp goto done;
6775 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6776 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6777 715dc77e 2019-08-03 stsp if (error)
6778 715dc77e 2019-08-03 stsp goto done;
6780 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6781 6d022e97 2019-08-04 stsp if (error)
6782 6d022e97 2019-08-04 stsp goto done;
6784 6d022e97 2019-08-04 stsp if (list_stage)
6785 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6786 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6788 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6789 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6790 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6791 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6792 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6795 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6796 2e1f37b0 2019-08-08 stsp error == NULL)
6797 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6799 ad493afc 2019-08-03 stsp got_repo_close(repo);
6800 ad493afc 2019-08-03 stsp if (worktree)
6801 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6802 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6803 ad493afc 2019-08-03 stsp free((char *)pe->path);
6804 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6805 ad493afc 2019-08-03 stsp free(cwd);
6806 ad493afc 2019-08-03 stsp return error;
6809 ad493afc 2019-08-03 stsp __dead static void
6810 ad493afc 2019-08-03 stsp usage_unstage(void)
6812 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6813 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6814 ad493afc 2019-08-03 stsp getprogname());
6819 ad493afc 2019-08-03 stsp static const struct got_error *
6820 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6822 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6823 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6824 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6825 ad493afc 2019-08-03 stsp char *cwd = NULL;
6826 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6827 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6828 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6829 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6830 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6831 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6833 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6835 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6836 ad493afc 2019-08-03 stsp switch (ch) {
6838 2e1f37b0 2019-08-08 stsp pflag = 1;
6841 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6844 ad493afc 2019-08-03 stsp usage_unstage();
6845 ad493afc 2019-08-03 stsp /* NOTREACHED */
6849 ad493afc 2019-08-03 stsp argc -= optind;
6850 ad493afc 2019-08-03 stsp argv += optind;
6852 ad493afc 2019-08-03 stsp #ifndef PROFILE
6853 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6854 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6855 ad493afc 2019-08-03 stsp err(1, "pledge");
6857 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6858 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6860 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6861 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6862 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6863 ad493afc 2019-08-03 stsp goto done;
6866 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6867 ad493afc 2019-08-03 stsp if (error)
6868 ad493afc 2019-08-03 stsp goto done;
6870 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6872 ad493afc 2019-08-03 stsp if (error != NULL)
6873 ad493afc 2019-08-03 stsp goto done;
6875 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
6876 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6877 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
6878 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
6879 2e1f37b0 2019-08-08 stsp patch_script_path);
6880 2e1f37b0 2019-08-08 stsp goto done;
6884 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6885 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
6886 ad493afc 2019-08-03 stsp if (error)
6887 ad493afc 2019-08-03 stsp goto done;
6889 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6890 ad493afc 2019-08-03 stsp if (error)
6891 ad493afc 2019-08-03 stsp goto done;
6893 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6894 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
6895 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
6896 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6898 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6899 2e1f37b0 2019-08-08 stsp error == NULL)
6900 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6902 0ebf8283 2019-07-24 stsp got_repo_close(repo);
6903 715dc77e 2019-08-03 stsp if (worktree)
6904 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
6905 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6906 715dc77e 2019-08-03 stsp free((char *)pe->path);
6907 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
6908 715dc77e 2019-08-03 stsp free(cwd);
6909 01073a5d 2019-08-22 stsp return error;
6912 01073a5d 2019-08-22 stsp __dead static void
6913 01073a5d 2019-08-22 stsp usage_cat(void)
6915 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6916 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
6920 01073a5d 2019-08-22 stsp static const struct got_error *
6921 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6923 01073a5d 2019-08-22 stsp const struct got_error *err;
6924 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
6926 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
6928 01073a5d 2019-08-22 stsp return err;
6930 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6931 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
6932 01073a5d 2019-08-22 stsp return err;
6935 01073a5d 2019-08-22 stsp static const struct got_error *
6936 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6938 01073a5d 2019-08-22 stsp const struct got_error *err;
6939 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
6940 01073a5d 2019-08-22 stsp const struct got_tree_entries *entries;
6941 01073a5d 2019-08-22 stsp struct got_tree_entry *te;
6943 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
6945 01073a5d 2019-08-22 stsp return err;
6947 01073a5d 2019-08-22 stsp entries = got_object_tree_get_entries(tree);
6948 01073a5d 2019-08-22 stsp te = SIMPLEQ_FIRST(&entries->head);
6949 01073a5d 2019-08-22 stsp while (te) {
6950 01073a5d 2019-08-22 stsp char *id_str;
6951 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
6953 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, te->id);
6956 01073a5d 2019-08-22 stsp fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6957 01073a5d 2019-08-22 stsp free(id_str);
6958 01073a5d 2019-08-22 stsp te = SIMPLEQ_NEXT(te, entry);
6961 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
6962 01073a5d 2019-08-22 stsp return err;
6965 01073a5d 2019-08-22 stsp static const struct got_error *
6966 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6968 01073a5d 2019-08-22 stsp const struct got_error *err;
6969 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
6970 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
6971 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
6972 01073a5d 2019-08-22 stsp char *id_str = NULL;
6973 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
6975 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
6977 01073a5d 2019-08-22 stsp return err;
6979 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6981 01073a5d 2019-08-22 stsp goto done;
6983 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6984 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6985 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
6986 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
6987 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6988 01073a5d 2019-08-22 stsp char *pid_str;
6989 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
6991 01073a5d 2019-08-22 stsp goto done;
6992 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6993 01073a5d 2019-08-22 stsp free(pid_str);
6995 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6996 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
6997 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
6999 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7000 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7001 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7003 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7004 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7005 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7007 01073a5d 2019-08-22 stsp free(id_str);
7008 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7009 01073a5d 2019-08-22 stsp return err;
7012 01073a5d 2019-08-22 stsp static const struct got_error *
7013 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7015 01073a5d 2019-08-22 stsp const struct got_error *err;
7016 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7017 01073a5d 2019-08-22 stsp char *id_str = NULL;
7018 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7020 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7022 01073a5d 2019-08-22 stsp return err;
7024 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7026 01073a5d 2019-08-22 stsp goto done;
7028 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7030 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7031 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7032 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7033 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7035 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7036 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7037 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7039 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7040 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7041 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7043 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7044 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7045 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7051 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7052 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7054 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7055 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7056 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7058 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7059 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7060 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7062 01073a5d 2019-08-22 stsp free(id_str);
7063 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7064 01073a5d 2019-08-22 stsp return err;
7067 01073a5d 2019-08-22 stsp static const struct got_error *
7068 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7070 01073a5d 2019-08-22 stsp const struct got_error *error;
7071 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7072 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7073 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7074 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7075 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7076 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7078 01073a5d 2019-08-22 stsp #ifndef PROFILE
7079 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7080 01073a5d 2019-08-22 stsp NULL) == -1)
7081 01073a5d 2019-08-22 stsp err(1, "pledge");
7084 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7085 01073a5d 2019-08-22 stsp switch (ch) {
7087 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7090 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7091 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7092 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7094 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7097 896e9b6f 2019-08-26 stsp force_path = 1;
7100 01073a5d 2019-08-22 stsp usage_cat();
7101 01073a5d 2019-08-22 stsp /* NOTREACHED */
7105 01073a5d 2019-08-22 stsp argc -= optind;
7106 01073a5d 2019-08-22 stsp argv += optind;
7108 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7109 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7110 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7111 01073a5d 2019-08-22 stsp goto done;
7113 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7114 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7115 01073a5d 2019-08-22 stsp goto done;
7116 01073a5d 2019-08-22 stsp if (worktree) {
7117 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7118 01073a5d 2019-08-22 stsp repo_path = strdup(
7119 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7120 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7121 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7122 01073a5d 2019-08-22 stsp goto done;
7127 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7128 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7129 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7130 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7133 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7134 01073a5d 2019-08-22 stsp free(repo_path);
7135 01073a5d 2019-08-22 stsp if (error != NULL)
7136 01073a5d 2019-08-22 stsp goto done;
7138 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7139 896e9b6f 2019-08-26 stsp if (error)
7140 896e9b6f 2019-08-26 stsp goto done;
7142 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7143 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7144 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7145 01073a5d 2019-08-22 stsp if (error)
7146 01073a5d 2019-08-22 stsp goto done;
7148 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7149 896e9b6f 2019-08-26 stsp if (force_path) {
7150 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7152 896e9b6f 2019-08-26 stsp if (error)
7155 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7156 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7157 896e9b6f 2019-08-26 stsp if (error) {
7158 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7159 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7161 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7162 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7163 896e9b6f 2019-08-26 stsp if (error)
7168 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7169 01073a5d 2019-08-22 stsp if (error)
7172 01073a5d 2019-08-22 stsp switch (obj_type) {
7173 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7174 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7176 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7177 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7179 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7180 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7182 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7183 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7186 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7189 01073a5d 2019-08-22 stsp if (error)
7191 01073a5d 2019-08-22 stsp free(label);
7192 01073a5d 2019-08-22 stsp label = NULL;
7194 01073a5d 2019-08-22 stsp id = NULL;
7198 01073a5d 2019-08-22 stsp free(label);
7200 896e9b6f 2019-08-26 stsp free(commit_id);
7201 01073a5d 2019-08-22 stsp if (worktree)
7202 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7203 01073a5d 2019-08-22 stsp if (repo) {
7204 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7205 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7206 01073a5d 2019-08-22 stsp if (error == NULL)
7207 01073a5d 2019-08-22 stsp error = repo_error;
7209 0ebf8283 2019-07-24 stsp return error;
