2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 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 12463d8b 2019-12-13 stsp #include <fcntl.h>
27 12ce7a6c 2019-08-12 stsp #include <limits.h>
28 5c860e29 2018-03-12 stsp #include <locale.h>
29 818c7501 2019-07-11 stsp #include <ctype.h>
30 99437157 2018-11-11 stsp #include <signal.h>
31 5c860e29 2018-03-12 stsp #include <stdio.h>
32 5c860e29 2018-03-12 stsp #include <stdlib.h>
33 5c860e29 2018-03-12 stsp #include <string.h>
34 5c860e29 2018-03-12 stsp #include <unistd.h>
35 c09a553d 2018-03-12 stsp #include <libgen.h>
36 c0768b0f 2018-06-10 stsp #include <time.h>
37 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 6841bf13 2019-11-29 kn #include <regex.h>
39 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 53ccebc2 2019-07-30 stsp #include "got_version.h"
42 f42b1b34 2018-03-12 stsp #include "got_error.h"
43 f42b1b34 2018-03-12 stsp #include "got_object.h"
44 5261c201 2018-04-01 stsp #include "got_reference.h"
45 f42b1b34 2018-03-12 stsp #include "got_repository.h"
46 1dd54920 2019-05-11 stsp #include "got_path.h"
47 e6209546 2019-08-22 stsp #include "got_cancel.h"
48 c09a553d 2018-03-12 stsp #include "got_worktree.h"
49 79109fed 2018-03-27 stsp #include "got_diff.h"
50 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
51 404c43c4 2018-06-21 stsp #include "got_blame.h"
52 63219cd2 2019-01-04 stsp #include "got_privsep.h"
53 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
55 5c860e29 2018-03-12 stsp #ifndef nitems
56 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
59 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
60 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
63 99437157 2018-11-11 stsp catch_sigint(int signo)
65 99437157 2018-11-11 stsp sigint_received = 1;
69 99437157 2018-11-11 stsp catch_sigpipe(int signo)
71 99437157 2018-11-11 stsp sigpipe_received = 1;
75 8cfb4057 2019-07-09 stsp struct got_cmd {
76 5c860e29 2018-03-12 stsp const char *cmd_name;
77 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
78 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
79 97b3a7be 2019-07-09 stsp const char *cmd_alias;
82 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
83 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
84 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
85 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
86 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
87 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
88 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
89 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
90 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
91 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
92 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
93 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
94 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
95 d00136be 2019-03-26 stsp __dead static void usage_add(void);
96 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
97 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
98 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
99 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
100 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
101 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
102 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
103 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
104 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
105 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
106 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
108 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
109 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
110 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
111 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
112 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
113 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
114 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
115 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
116 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
117 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
118 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
119 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
120 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
121 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
122 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
123 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
124 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
125 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
126 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
127 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
128 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
129 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
130 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
131 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
133 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
134 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
135 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
136 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
137 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
138 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
139 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
140 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
141 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
142 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
143 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
144 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
145 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
146 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
147 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
148 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
149 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
150 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
151 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
152 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
153 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
154 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
155 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
156 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
157 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
160 ce5b7c56 2019-07-09 stsp static void
161 ce5b7c56 2019-07-09 stsp list_commands(void)
165 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
166 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
167 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
168 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
170 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
174 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
176 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
177 5c860e29 2018-03-12 stsp unsigned int i;
179 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
180 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
181 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
182 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
185 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
187 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
188 5c860e29 2018-03-12 stsp switch (ch) {
196 ce5b7c56 2019-07-09 stsp usage(hflag);
197 5c860e29 2018-03-12 stsp /* NOTREACHED */
201 5c860e29 2018-03-12 stsp argc -= optind;
202 5c860e29 2018-03-12 stsp argv += optind;
203 1e70621d 2018-03-27 stsp optind = 0;
205 53ccebc2 2019-07-30 stsp if (Vflag) {
206 53ccebc2 2019-07-30 stsp got_version_print_str();
210 5c860e29 2018-03-12 stsp if (argc <= 0)
211 ce5b7c56 2019-07-09 stsp usage(hflag);
213 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
214 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
216 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
217 d7d4f210 2018-03-12 stsp const struct got_error *error;
219 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
221 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
222 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
226 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
228 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
229 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
230 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
231 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
232 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
233 70015d7a 2019-11-08 stsp !(sigint_received &&
234 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
235 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
242 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
243 ce5b7c56 2019-07-09 stsp list_commands();
247 4ed7e80c 2018-05-20 stsp __dead static void
248 ce5b7c56 2019-07-09 stsp usage(int hflag)
250 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
251 53ccebc2 2019-07-30 stsp getprogname());
253 ce5b7c56 2019-07-09 stsp list_commands();
257 0266afb7 2019-01-04 stsp static const struct got_error *
258 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
260 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
261 e2ba3d07 2019-05-13 stsp const char *editor;
263 8920fa04 2019-08-18 stsp *abspath = NULL;
265 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
266 e2ba3d07 2019-05-13 stsp if (editor == NULL)
267 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
269 0ee7065d 2019-05-13 stsp if (editor) {
270 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
272 0ee7065d 2019-05-13 stsp return err;
275 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
276 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
277 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
278 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
281 e2ba3d07 2019-05-13 stsp return NULL;
284 e2ba3d07 2019-05-13 stsp static const struct got_error *
285 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
286 c530dc23 2019-07-23 stsp const char *worktree_path)
288 163ce85a 2019-05-13 stsp const struct got_error *err;
290 37c06ea4 2019-07-15 stsp #ifdef PROFILE
291 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
292 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
294 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
295 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
297 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
298 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
300 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
301 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
303 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
304 163ce85a 2019-05-13 stsp if (err != NULL)
305 163ce85a 2019-05-13 stsp return err;
307 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
308 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
310 0266afb7 2019-01-04 stsp return NULL;
313 2c7829a4 2019-06-17 stsp __dead static void
314 2c7829a4 2019-06-17 stsp usage_init(void)
316 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
320 2c7829a4 2019-06-17 stsp static const struct got_error *
321 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
323 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
324 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
327 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
328 2c7829a4 2019-06-17 stsp switch (ch) {
330 2c7829a4 2019-06-17 stsp usage_init();
331 2c7829a4 2019-06-17 stsp /* NOTREACHED */
335 2c7829a4 2019-06-17 stsp argc -= optind;
336 2c7829a4 2019-06-17 stsp argv += optind;
338 2c7829a4 2019-06-17 stsp #ifndef PROFILE
339 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
340 2c7829a4 2019-06-17 stsp err(1, "pledge");
342 2c7829a4 2019-06-17 stsp if (argc != 1)
343 bc20e173 2019-06-17 stsp usage_init();
345 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
346 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
347 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
349 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
351 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
352 2c7829a4 2019-06-17 stsp if (error &&
353 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
356 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
360 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
362 3ce1b845 2019-07-15 stsp free(repo_path);
363 3ce1b845 2019-07-15 stsp return error;
366 3ce1b845 2019-07-15 stsp __dead static void
367 3ce1b845 2019-07-15 stsp usage_import(void)
369 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
370 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
375 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
378 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
379 3ce1b845 2019-07-15 stsp int st = -1;
381 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
382 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
383 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
385 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
387 3ce1b845 2019-07-15 stsp goto doneediting;
389 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
390 3ce1b845 2019-07-15 stsp _exit(127);
393 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
394 3ce1b845 2019-07-15 stsp if (errno != EINTR)
397 3ce1b845 2019-07-15 stsp doneediting:
398 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
399 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
400 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
402 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
403 3ce1b845 2019-07-15 stsp errno = EINTR;
407 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
410 3ce1b845 2019-07-15 stsp static const struct got_error *
411 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
412 3ce1b845 2019-07-15 stsp const char *initial_content)
414 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
415 3ce1b845 2019-07-15 stsp char buf[1024];
416 3ce1b845 2019-07-15 stsp struct stat st, st2;
418 3ce1b845 2019-07-15 stsp int content_changed = 0;
419 3ce1b845 2019-07-15 stsp size_t len;
421 3ce1b845 2019-07-15 stsp *logmsg = NULL;
423 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
424 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
426 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
427 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
429 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
430 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
432 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
433 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
434 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
436 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
437 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
438 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
439 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
442 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
443 3ce1b845 2019-07-15 stsp if (fp == NULL) {
444 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
447 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
448 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
449 3ce1b845 2019-07-15 stsp content_changed = 1;
450 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
451 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
452 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
454 3ce1b845 2019-07-15 stsp fclose(fp);
456 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
457 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
461 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
462 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
463 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
466 3ce1b845 2019-07-15 stsp free(*logmsg);
467 3ce1b845 2019-07-15 stsp *logmsg = NULL;
469 3ce1b845 2019-07-15 stsp return err;
472 3ce1b845 2019-07-15 stsp static const struct got_error *
473 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
474 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
476 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
477 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
480 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
481 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
482 3ce1b845 2019-07-15 stsp branch_name) == -1)
483 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
485 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
486 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
490 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
493 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
495 3ce1b845 2019-07-15 stsp free(initial_content);
496 3ce1b845 2019-07-15 stsp return err;
499 3ce1b845 2019-07-15 stsp static const struct got_error *
500 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
502 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
503 3ce1b845 2019-07-15 stsp return NULL;
506 3ce1b845 2019-07-15 stsp static const struct got_error *
507 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
509 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
510 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
512 84792843 2019-08-09 stsp *author = NULL;
514 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
515 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
516 c9956ddf 2019-09-08 stsp if (name && email) {
517 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
518 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
519 aba9c984 2019-09-08 stsp return NULL;
522 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
523 84792843 2019-08-09 stsp if (got_author == NULL) {
524 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
525 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
526 c9956ddf 2019-09-08 stsp if (name && email) {
527 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
528 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
529 c9956ddf 2019-09-08 stsp return NULL;
531 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
532 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
535 aba9c984 2019-09-08 stsp *author = strdup(got_author);
536 aba9c984 2019-09-08 stsp if (*author == NULL)
537 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
540 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
541 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
543 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
544 84792843 2019-08-09 stsp got_author++;
545 aba9c984 2019-09-08 stsp if (*got_author != '<') {
546 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
549 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
550 84792843 2019-08-09 stsp got_author++;
551 aba9c984 2019-09-08 stsp if (*got_author != '@') {
552 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
555 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
556 84792843 2019-08-09 stsp got_author++;
557 84792843 2019-08-09 stsp if (*got_author != '>')
558 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
561 aba9c984 2019-09-08 stsp free(*author);
562 aba9c984 2019-09-08 stsp *author = NULL;
564 aba9c984 2019-09-08 stsp return err;
567 c9956ddf 2019-09-08 stsp static const struct got_error *
568 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
570 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
572 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
573 c9956ddf 2019-09-08 stsp if (homedir) {
574 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
575 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
578 c9956ddf 2019-09-08 stsp return NULL;
581 84792843 2019-08-09 stsp static const struct got_error *
582 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
584 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
585 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
586 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
587 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
588 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
589 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
590 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
591 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
593 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
594 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
595 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
597 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
599 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
600 3ce1b845 2019-07-15 stsp switch (ch) {
602 3ce1b845 2019-07-15 stsp branch_name = optarg;
605 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
606 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
607 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
612 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
613 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
614 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
620 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
622 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
628 b2b65d18 2019-08-22 stsp usage_import();
629 3ce1b845 2019-07-15 stsp /* NOTREACHED */
633 3ce1b845 2019-07-15 stsp argc -= optind;
634 3ce1b845 2019-07-15 stsp argv += optind;
636 3ce1b845 2019-07-15 stsp #ifndef PROFILE
637 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
639 3ce1b845 2019-07-15 stsp NULL) == -1)
640 3ce1b845 2019-07-15 stsp err(1, "pledge");
642 3ce1b845 2019-07-15 stsp if (argc != 1)
643 3ce1b845 2019-07-15 stsp usage_import();
645 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
646 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
647 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
648 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
650 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
651 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
654 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
658 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
660 aba9c984 2019-09-08 stsp return error;
663 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
664 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
665 e560b7e0 2019-11-28 stsp * an unintended typo.
667 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
668 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
670 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
671 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
675 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
676 3ce1b845 2019-07-15 stsp if (error) {
677 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
680 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
681 3ce1b845 2019-07-15 stsp "import target branch already exists");
685 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
686 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
687 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
690 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
693 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
694 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
696 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
697 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
700 8e158b01 2019-09-22 stsp free(logmsg);
701 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
702 ef293bdd 2019-10-21 stsp path_dir, refname);
703 ef293bdd 2019-10-21 stsp if (error) {
704 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
705 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
706 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
711 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
712 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
713 ef293bdd 2019-10-21 stsp if (logmsg_path)
714 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
718 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
719 ef293bdd 2019-10-21 stsp if (error) {
720 ef293bdd 2019-10-21 stsp if (logmsg_path)
721 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
725 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
726 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
727 ef293bdd 2019-10-21 stsp if (error) {
728 ef293bdd 2019-10-21 stsp if (logmsg_path)
729 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
733 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
734 ef293bdd 2019-10-21 stsp if (error) {
735 ef293bdd 2019-10-21 stsp if (logmsg_path)
736 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
740 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
741 ef293bdd 2019-10-21 stsp if (error) {
742 ef293bdd 2019-10-21 stsp if (logmsg_path)
743 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
747 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
748 ef293bdd 2019-10-21 stsp if (error) {
749 ef293bdd 2019-10-21 stsp if (logmsg_path)
750 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
754 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
755 3ce1b845 2019-07-15 stsp if (error) {
756 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
757 ef293bdd 2019-10-21 stsp if (logmsg_path)
758 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
762 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
763 3ce1b845 2019-07-15 stsp branch_ref);
764 ef293bdd 2019-10-21 stsp if (error) {
765 ef293bdd 2019-10-21 stsp if (logmsg_path)
766 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
770 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
771 ef293bdd 2019-10-21 stsp if (error) {
772 ef293bdd 2019-10-21 stsp if (logmsg_path)
773 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
778 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
779 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
781 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
782 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
783 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
784 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
785 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
786 8e158b01 2019-09-22 stsp free(logmsg);
787 ef293bdd 2019-10-21 stsp free(logmsg_path);
788 2c7829a4 2019-06-17 stsp free(repo_path);
789 3ce1b845 2019-07-15 stsp free(editor);
790 3ce1b845 2019-07-15 stsp free(refname);
791 3ce1b845 2019-07-15 stsp free(new_commit_id);
792 3ce1b845 2019-07-15 stsp free(id_str);
793 aba9c984 2019-09-08 stsp free(author);
794 c9956ddf 2019-09-08 stsp free(gitconfig_path);
795 3ce1b845 2019-07-15 stsp if (branch_ref)
796 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
797 3ce1b845 2019-07-15 stsp if (head_ref)
798 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
799 2c7829a4 2019-06-17 stsp return error;
802 4ed7e80c 2018-05-20 stsp __dead static void
803 c09a553d 2018-03-12 stsp usage_checkout(void)
805 bb51a5b4 2020-01-13 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
806 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
810 7f47418f 2019-12-20 stsp static void
811 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning(void)
813 7f47418f 2019-12-20 stsp fprintf(stderr, "%s: warning: could not create a reference "
814 7f47418f 2019-12-20 stsp "to the work tree's base commit; the commit could be "
815 7f47418f 2019-12-20 stsp "garbage-collected by Git; making the repository "
816 7f47418f 2019-12-20 stsp "writable and running 'got update' will prevent this\n",
817 7f47418f 2019-12-20 stsp getprogname());
820 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg {
821 7f47418f 2019-12-20 stsp const char *worktree_path;
822 7f47418f 2019-12-20 stsp int had_base_commit_ref_error;
825 1ee397ad 2019-07-12 stsp static const struct got_error *
826 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
828 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg *a = arg;
830 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
831 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
832 7f47418f 2019-12-20 stsp return NULL;
834 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
835 7f47418f 2019-12-20 stsp a->had_base_commit_ref_error = 1;
836 1ee397ad 2019-07-12 stsp return NULL;
839 92a684f4 2018-03-12 stsp while (path[0] == '/')
842 7f47418f 2019-12-20 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
843 1ee397ad 2019-07-12 stsp return NULL;
846 99437157 2018-11-11 stsp static const struct got_error *
847 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
849 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
850 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
851 99437157 2018-11-11 stsp return NULL;
854 8069f636 2019-01-12 stsp static const struct got_error *
855 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
856 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
857 3aef623b 2019-10-15 stsp struct got_repository *repo)
859 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
860 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
862 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
863 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
865 36a38700 2019-05-10 stsp return err;
867 d5bea539 2019-05-13 stsp if (yca_id == NULL)
868 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
871 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
872 d5bea539 2019-05-13 stsp * and the work tree's base commit.
874 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
876 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
884 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
885 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
886 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
888 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
889 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
890 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
891 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
892 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
893 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
895 d5bea539 2019-05-13 stsp free(yca_id);
896 d5bea539 2019-05-13 stsp return NULL;
899 a367ff0f 2019-05-14 stsp static const struct got_error *
900 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
901 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
902 a51a74b3 2019-07-27 stsp struct got_repository *repo)
904 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
905 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
906 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
907 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
909 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
913 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
914 a51a74b3 2019-07-27 stsp is_same_branch = 1;
917 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
918 a51a74b3 2019-07-27 stsp is_same_branch = 1;
922 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
926 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
927 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
932 a367ff0f 2019-05-14 stsp struct got_object_id *id;
933 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
934 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
936 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
937 a367ff0f 2019-05-14 stsp err = NULL;
942 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
944 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
945 a367ff0f 2019-05-14 stsp is_same_branch = 1;
952 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
953 a367ff0f 2019-05-14 stsp free(head_commit_id);
954 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
955 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
956 a367ff0f 2019-05-14 stsp return err;
959 4ed7e80c 2018-05-20 stsp static const struct got_error *
960 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
962 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
963 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
964 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
965 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
966 c09a553d 2018-03-12 stsp char *repo_path = NULL;
967 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
968 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
969 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
970 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
971 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
972 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
973 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
975 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
977 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
978 0bb8a95e 2018-03-12 stsp switch (ch) {
980 08573d5b 2019-05-14 stsp branch_name = optarg;
983 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
984 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
985 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
988 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
991 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
994 2deda0b9 2019-03-07 stsp usage_checkout();
995 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
999 0bb8a95e 2018-03-12 stsp argc -= optind;
1000 0bb8a95e 2018-03-12 stsp argv += optind;
1002 6715a751 2018-03-16 stsp #ifndef PROFILE
1003 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1004 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1005 c09a553d 2018-03-12 stsp err(1, "pledge");
1007 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1008 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1009 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1010 76089277 2018-04-01 stsp if (repo_path == NULL)
1011 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1012 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1013 76089277 2018-04-01 stsp if (cwd == NULL) {
1014 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1015 76089277 2018-04-01 stsp goto done;
1017 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1018 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1019 230a42bd 2019-05-11 jcs if (base == NULL) {
1020 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1021 230a42bd 2019-05-11 jcs path_prefix);
1025 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1026 230a42bd 2019-05-11 jcs if (base == NULL) {
1027 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1028 230a42bd 2019-05-11 jcs repo_path);
1032 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1033 c09a553d 2018-03-12 stsp if (dotgit)
1034 c09a553d 2018-03-12 stsp *dotgit = '\0';
1035 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1036 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1037 c09a553d 2018-03-12 stsp free(cwd);
1038 76089277 2018-04-01 stsp goto done;
1040 c09a553d 2018-03-12 stsp free(cwd);
1041 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1042 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1043 76089277 2018-04-01 stsp if (repo_path == NULL) {
1044 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1045 76089277 2018-04-01 stsp goto done;
1047 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1048 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1049 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1050 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1052 b4b3a7dd 2019-07-22 stsp goto done;
1054 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1055 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1056 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1057 b4b3a7dd 2019-07-22 stsp goto done;
1061 c09a553d 2018-03-12 stsp usage_checkout();
1063 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1064 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1066 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1067 c09a553d 2018-03-12 stsp if (error != NULL)
1068 c02c541e 2019-03-29 stsp goto done;
1070 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1071 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1072 c530dc23 2019-07-23 stsp if (error) {
1073 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1074 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1075 c530dc23 2019-07-23 stsp goto done;
1076 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1077 bb51a5b4 2020-01-13 stsp !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 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1112 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1113 30837e32 2019-07-25 stsp if (error)
1114 8069f636 2019-01-12 stsp goto done;
1115 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1116 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1117 8069f636 2019-01-12 stsp if (error != NULL) {
1118 8069f636 2019-01-12 stsp free(commit_id);
1119 8069f636 2019-01-12 stsp goto done;
1121 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1122 45d344f6 2019-05-14 stsp if (error)
1123 45d344f6 2019-05-14 stsp goto done;
1124 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1125 8069f636 2019-01-12 stsp commit_id);
1126 8069f636 2019-01-12 stsp free(commit_id);
1127 8069f636 2019-01-12 stsp if (error)
1128 8069f636 2019-01-12 stsp goto done;
1131 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1132 f2ea84fa 2019-07-27 stsp if (error)
1133 f2ea84fa 2019-07-27 stsp goto done;
1134 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1135 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1136 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1137 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1138 c09a553d 2018-03-12 stsp if (error != NULL)
1139 c09a553d 2018-03-12 stsp goto done;
1141 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1142 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1143 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1145 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1146 8069f636 2019-01-12 stsp free(commit_id_str);
1147 76089277 2018-04-01 stsp free(repo_path);
1148 507dc3bb 2018-12-29 stsp free(worktree_path);
1149 507dc3bb 2018-12-29 stsp return error;
1152 507dc3bb 2018-12-29 stsp __dead static void
1153 507dc3bb 2018-12-29 stsp usage_update(void)
1155 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1156 507dc3bb 2018-12-29 stsp getprogname());
1160 1ee397ad 2019-07-12 stsp static const struct got_error *
1161 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1163 784955db 2019-01-12 stsp int *did_something = arg;
1165 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1166 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1167 1ee397ad 2019-07-12 stsp return NULL;
1169 1545c615 2019-02-10 stsp *did_something = 1;
1171 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1172 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1173 1ee397ad 2019-07-12 stsp return NULL;
1175 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1177 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1178 1ee397ad 2019-07-12 stsp return NULL;
1181 be7061eb 2018-12-30 stsp static const struct got_error *
1182 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1183 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1184 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1186 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1187 a1fb16d8 2019-05-24 stsp char *base_id_str;
1188 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1190 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1191 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1192 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1193 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1194 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1195 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1196 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1199 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1200 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1201 a1fb16d8 2019-05-24 stsp if (err) {
1202 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1203 a1fb16d8 2019-05-24 stsp return err;
1204 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1206 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1207 a1fb16d8 2019-05-24 stsp return NULL;
1209 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1210 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1211 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1213 a1fb16d8 2019-05-24 stsp return err;
1214 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1215 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1216 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1217 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1218 0ebf8283 2019-07-24 stsp return NULL;
1221 0ebf8283 2019-07-24 stsp static const struct got_error *
1222 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1224 0ebf8283 2019-07-24 stsp const struct got_error *err;
1225 0ebf8283 2019-07-24 stsp int in_progress;
1227 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1229 0ebf8283 2019-07-24 stsp return err;
1230 0ebf8283 2019-07-24 stsp if (in_progress)
1231 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1233 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1235 0ebf8283 2019-07-24 stsp return err;
1236 0ebf8283 2019-07-24 stsp if (in_progress)
1237 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1239 a1fb16d8 2019-05-24 stsp return NULL;
1242 a5edda0a 2019-07-27 stsp static const struct got_error *
1243 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1244 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1246 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1247 a5edda0a 2019-07-27 stsp char *path;
1250 a5edda0a 2019-07-27 stsp if (argc == 0) {
1251 a5edda0a 2019-07-27 stsp path = strdup("");
1252 a5edda0a 2019-07-27 stsp if (path == NULL)
1253 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1254 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1257 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1258 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1261 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1262 a5edda0a 2019-07-27 stsp if (err) {
1263 a5edda0a 2019-07-27 stsp free(path);
1268 a5edda0a 2019-07-27 stsp return err;
1271 a1fb16d8 2019-05-24 stsp static const struct got_error *
1272 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1274 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1275 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1276 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1277 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1278 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1279 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1280 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1281 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1282 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1283 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1284 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1286 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1288 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1289 507dc3bb 2018-12-29 stsp switch (ch) {
1291 024e9686 2019-05-14 stsp branch_name = optarg;
1294 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1295 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1296 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1299 2deda0b9 2019-03-07 stsp usage_update();
1300 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1304 507dc3bb 2018-12-29 stsp argc -= optind;
1305 507dc3bb 2018-12-29 stsp argv += optind;
1307 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1308 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1309 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1310 507dc3bb 2018-12-29 stsp err(1, "pledge");
1312 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1313 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1314 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1315 c4cdcb68 2019-04-03 stsp goto done;
1317 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1318 7d5807f4 2019-07-11 stsp if (error)
1319 7d5807f4 2019-07-11 stsp goto done;
1321 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1322 f2ea84fa 2019-07-27 stsp if (error)
1323 f2ea84fa 2019-07-27 stsp goto done;
1325 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1327 507dc3bb 2018-12-29 stsp if (error != NULL)
1328 507dc3bb 2018-12-29 stsp goto done;
1330 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1331 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1332 087fb88c 2019-08-04 stsp if (error)
1333 087fb88c 2019-08-04 stsp goto done;
1335 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1336 0266afb7 2019-01-04 stsp if (error)
1337 0266afb7 2019-01-04 stsp goto done;
1339 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1340 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1341 024e9686 2019-05-14 stsp if (error != NULL)
1342 024e9686 2019-05-14 stsp goto done;
1343 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1344 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1345 9c4b8182 2019-01-02 stsp if (error != NULL)
1346 9c4b8182 2019-01-02 stsp goto done;
1347 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1348 507dc3bb 2018-12-29 stsp if (error != NULL)
1349 507dc3bb 2018-12-29 stsp goto done;
1351 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1352 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1353 04f57cb3 2019-07-25 stsp free(commit_id_str);
1354 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1355 30837e32 2019-07-25 stsp if (error)
1356 a297e751 2019-07-11 stsp goto done;
1357 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1358 a297e751 2019-07-11 stsp if (error)
1359 507dc3bb 2018-12-29 stsp goto done;
1362 a1fb16d8 2019-05-24 stsp if (branch_name) {
1363 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1364 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1365 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1367 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1368 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1369 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1370 024e9686 2019-05-14 stsp goto done;
1372 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1373 024e9686 2019-05-14 stsp if (error)
1374 024e9686 2019-05-14 stsp goto done;
1375 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1377 a367ff0f 2019-05-14 stsp free(head_commit_id);
1378 024e9686 2019-05-14 stsp if (error != NULL)
1379 024e9686 2019-05-14 stsp goto done;
1380 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1381 a367ff0f 2019-05-14 stsp if (error)
1382 a367ff0f 2019-05-14 stsp goto done;
1383 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1384 024e9686 2019-05-14 stsp if (error)
1385 024e9686 2019-05-14 stsp goto done;
1387 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1388 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1389 a367ff0f 2019-05-14 stsp if (error != NULL) {
1390 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1391 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1392 024e9686 2019-05-14 stsp goto done;
1394 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1395 a367ff0f 2019-05-14 stsp if (error)
1396 a367ff0f 2019-05-14 stsp goto done;
1399 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1400 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1401 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1402 507dc3bb 2018-12-29 stsp commit_id);
1403 507dc3bb 2018-12-29 stsp if (error)
1404 507dc3bb 2018-12-29 stsp goto done;
1407 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1408 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1409 507dc3bb 2018-12-29 stsp if (error != NULL)
1410 507dc3bb 2018-12-29 stsp goto done;
1412 784955db 2019-01-12 stsp if (did_something)
1413 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1415 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1417 c09a553d 2018-03-12 stsp free(worktree_path);
1418 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1419 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1420 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1421 507dc3bb 2018-12-29 stsp free(commit_id);
1422 9c4b8182 2019-01-02 stsp free(commit_id_str);
1423 c09a553d 2018-03-12 stsp return error;
1426 f42b1b34 2018-03-12 stsp static const struct got_error *
1427 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1428 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1429 63035f9f 2019-10-06 stsp struct got_repository *repo)
1431 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1432 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1434 44392932 2019-08-25 stsp if (blob_id1) {
1435 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1437 44392932 2019-08-25 stsp goto done;
1440 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1442 44392932 2019-08-25 stsp goto done;
1444 44392932 2019-08-25 stsp while (path[0] == '/')
1446 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1447 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1449 44392932 2019-08-25 stsp if (blob1)
1450 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1451 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1452 44392932 2019-08-25 stsp return err;
1455 44392932 2019-08-25 stsp static const struct got_error *
1456 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1457 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1458 63035f9f 2019-10-06 stsp struct got_repository *repo)
1460 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1461 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1462 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1464 44392932 2019-08-25 stsp if (tree_id1) {
1465 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1467 44392932 2019-08-25 stsp goto done;
1470 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1472 0f2b3dca 2018-12-22 stsp goto done;
1474 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1475 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1476 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1477 44392932 2019-08-25 stsp while (path[0] == '/')
1479 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1480 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1482 79109fed 2018-03-27 stsp if (tree1)
1483 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1484 366e0a5f 2019-10-10 stsp if (tree2)
1485 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1486 44392932 2019-08-25 stsp return err;
1489 44392932 2019-08-25 stsp static const struct got_error *
1490 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1491 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1493 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1494 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1495 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1496 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1497 44392932 2019-08-25 stsp struct got_object_qid *qid;
1499 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1500 44392932 2019-08-25 stsp if (qid != NULL) {
1501 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1504 44392932 2019-08-25 stsp return err;
1507 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1508 44392932 2019-08-25 stsp int obj_type;
1509 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1511 44392932 2019-08-25 stsp goto done;
1512 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1513 44392932 2019-08-25 stsp if (err) {
1514 44392932 2019-08-25 stsp free(obj_id2);
1515 44392932 2019-08-25 stsp goto done;
1517 44392932 2019-08-25 stsp if (pcommit) {
1518 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1519 44392932 2019-08-25 stsp qid->id, path);
1520 44392932 2019-08-25 stsp if (err) {
1521 44392932 2019-08-25 stsp free(obj_id2);
1522 44392932 2019-08-25 stsp goto done;
1524 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
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;
1530 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1531 44392932 2019-08-25 stsp if (err) {
1532 44392932 2019-08-25 stsp free(obj_id2);
1533 44392932 2019-08-25 stsp goto done;
1535 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1536 44392932 2019-08-25 stsp switch (obj_type) {
1537 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1538 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1541 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1542 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1546 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1549 44392932 2019-08-25 stsp free(obj_id1);
1550 44392932 2019-08-25 stsp free(obj_id2);
1552 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1553 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1555 44392932 2019-08-25 stsp goto done;
1556 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1557 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1559 44392932 2019-08-25 stsp goto done;
1560 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1561 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1564 0f2b3dca 2018-12-22 stsp free(id_str1);
1565 0f2b3dca 2018-12-22 stsp free(id_str2);
1566 44392932 2019-08-25 stsp if (pcommit)
1567 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1568 79109fed 2018-03-27 stsp return err;
1571 4bb494d5 2018-06-16 stsp static char *
1572 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1574 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1575 09867e48 2019-08-13 stsp char *p, *s;
1577 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1578 09867e48 2019-08-13 stsp if (tm == NULL)
1579 09867e48 2019-08-13 stsp return NULL;
1580 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1581 09867e48 2019-08-13 stsp if (s == NULL)
1582 09867e48 2019-08-13 stsp return NULL;
1583 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1585 6c281f94 2018-06-11 stsp *p = '\0';
1589 6841bf13 2019-11-29 kn static const struct got_error *
1590 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1591 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1593 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1594 6841bf13 2019-11-29 kn regmatch_t regmatch;
1595 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1597 6841bf13 2019-11-29 kn *have_match = 0;
1599 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1603 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1607 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1608 6841bf13 2019-11-29 kn *have_match = 1;
1610 6841bf13 2019-11-29 kn free(id_str);
1611 6841bf13 2019-11-29 kn free(logmsg);
1615 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1617 79109fed 2018-03-27 stsp static const struct got_error *
1618 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1619 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1620 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1622 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1623 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1624 6c281f94 2018-06-11 stsp char datebuf[26];
1625 45d799e2 2018-12-23 stsp time_t committer_time;
1626 45d799e2 2018-12-23 stsp const char *author, *committer;
1627 199a4027 2019-02-02 stsp char *refs_str = NULL;
1628 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1630 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1632 199a4027 2019-02-02 stsp const char *name;
1633 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1636 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1637 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1639 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1640 199a4027 2019-02-02 stsp name += 5;
1641 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1643 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1644 e34f9ed6 2019-02-02 stsp name += 6;
1645 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1646 141c2bff 2019-02-04 stsp name += 8;
1647 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1648 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1649 5d844a1e 2019-08-13 stsp if (err) {
1650 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1651 5d844a1e 2019-08-13 stsp return err;
1652 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1653 5d844a1e 2019-08-13 stsp err = NULL;
1654 5d844a1e 2019-08-13 stsp tag = NULL;
1657 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1658 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1660 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1661 a436ad14 2019-08-13 stsp if (cmp != 0)
1663 199a4027 2019-02-02 stsp s = refs_str;
1664 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1665 199a4027 2019-02-02 stsp name) == -1) {
1666 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1668 34ca4898 2019-08-13 stsp return err;
1672 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1674 8bf5b3c9 2018-03-17 stsp return err;
1676 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1677 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1678 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1679 832c249c 2018-06-10 stsp free(id_str);
1680 d3d493d7 2019-02-21 stsp id_str = NULL;
1681 d3d493d7 2019-02-21 stsp free(refs_str);
1682 d3d493d7 2019-02-21 stsp refs_str = NULL;
1683 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1684 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1685 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1686 09867e48 2019-08-13 stsp if (datestr)
1687 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1688 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1689 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1690 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1691 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1692 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1693 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1694 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1695 3fe1abad 2018-06-10 stsp int n = 1;
1696 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1697 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1698 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1700 a0603db2 2018-06-10 stsp return err;
1701 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1702 a0603db2 2018-06-10 stsp free(id_str);
1706 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1708 5943eee2 2019-08-13 stsp return err;
1710 621015ac 2018-07-23 stsp logmsg = logmsg0;
1712 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1714 832c249c 2018-06-10 stsp printf(" %s\n", line);
1715 832c249c 2018-06-10 stsp } while (line);
1716 621015ac 2018-07-23 stsp free(logmsg0);
1718 971751ac 2018-03-27 stsp if (show_patch) {
1719 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1720 971751ac 2018-03-27 stsp if (err == 0)
1721 971751ac 2018-03-27 stsp printf("\n");
1724 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1725 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1726 07862c20 2018-09-15 stsp return err;
1729 f42b1b34 2018-03-12 stsp static const struct got_error *
1730 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1731 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1732 48c8c60d 2020-01-27 stsp int diff_context, int limit, int log_branches,
1733 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1735 f42b1b34 2018-03-12 stsp const struct got_error *err;
1736 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1737 6841bf13 2019-11-29 kn regex_t regex;
1738 6841bf13 2019-11-29 kn int have_match;
1740 6841bf13 2019-11-29 kn if (search_pattern &&
1741 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1742 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1744 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
1746 f42b1b34 2018-03-12 stsp return err;
1747 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1748 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1750 fcc85cad 2018-07-22 stsp goto done;
1752 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1753 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1755 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1758 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
1759 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
1760 372ccdbb 2018-06-10 stsp if (err) {
1761 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
1762 9ba79e04 2018-06-11 stsp err = NULL;
1765 b43fbaa0 2018-06-11 stsp if (id == NULL)
1768 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1772 6841bf13 2019-11-29 kn if (search_pattern) {
1773 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
1775 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1778 6841bf13 2019-11-29 kn if (have_match == 0) {
1779 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1784 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1785 44392932 2019-08-25 stsp diff_context, refs);
1786 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1787 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1791 6841bf13 2019-11-29 kn if (search_pattern)
1792 6841bf13 2019-11-29 kn regfree(®ex);
1793 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1794 f42b1b34 2018-03-12 stsp return err;
1797 4ed7e80c 2018-05-20 stsp __dead static void
1798 6f3d1eb0 2018-03-12 stsp usage_log(void)
1800 48c8c60d 2020-01-27 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
1801 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1805 b1ebc001 2019-08-13 stsp static int
1806 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1808 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1809 b1ebc001 2019-08-13 stsp long long n;
1810 b1ebc001 2019-08-13 stsp const char *errstr;
1812 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1813 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1815 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1816 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1821 4ed7e80c 2018-05-20 stsp static const struct got_error *
1822 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1824 f42b1b34 2018-03-12 stsp const struct got_error *error;
1825 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1826 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1827 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1828 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1829 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1830 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
1831 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
1832 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
1833 64a96a6d 2018-04-01 stsp const char *errstr;
1834 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1836 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1838 6715a751 2018-03-16 stsp #ifndef PROFILE
1839 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1842 f42b1b34 2018-03-12 stsp err(1, "pledge");
1845 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1847 48c8c60d 2020-01-27 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
1848 79109fed 2018-03-27 stsp switch (ch) {
1850 79109fed 2018-03-27 stsp show_patch = 1;
1853 d142fc45 2018-04-01 stsp start_commit = optarg;
1856 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1858 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1859 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1862 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1863 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1864 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1867 48c8c60d 2020-01-27 stsp log_branches = 1;
1870 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1871 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1872 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1874 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1877 6841bf13 2019-11-29 kn search_pattern = optarg;
1880 2deda0b9 2019-03-07 stsp usage_log();
1881 79109fed 2018-03-27 stsp /* NOTREACHED */
1885 79109fed 2018-03-27 stsp argc -= optind;
1886 79109fed 2018-03-27 stsp argv += optind;
1888 dc1edbfa 2019-11-29 kn if (diff_context == -1)
1889 dc1edbfa 2019-11-29 kn diff_context = 3;
1890 dc1edbfa 2019-11-29 kn else if (!show_patch)
1891 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
1893 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1894 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1895 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1896 04ca23f4 2018-07-16 stsp goto done;
1899 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1900 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1901 cffc0aa4 2019-02-05 stsp goto done;
1902 cffc0aa4 2019-02-05 stsp error = NULL;
1904 e7301579 2019-03-18 stsp if (argc == 0) {
1905 cbd1af7a 2019-03-18 stsp path = strdup("");
1906 e7301579 2019-03-18 stsp if (path == NULL) {
1907 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1908 cbd1af7a 2019-03-18 stsp goto done;
1910 e7301579 2019-03-18 stsp } else if (argc == 1) {
1911 e7301579 2019-03-18 stsp if (worktree) {
1912 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1914 e7301579 2019-03-18 stsp if (error)
1915 e7301579 2019-03-18 stsp goto done;
1917 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1918 e7301579 2019-03-18 stsp if (path == NULL) {
1919 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1920 e7301579 2019-03-18 stsp goto done;
1924 cbd1af7a 2019-03-18 stsp usage_log();
1926 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1927 5486daa2 2019-05-11 stsp repo_path = worktree ?
1928 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1930 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1931 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1932 cffc0aa4 2019-02-05 stsp goto done;
1935 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1936 d7d4f210 2018-03-12 stsp if (error != NULL)
1937 04ca23f4 2018-07-16 stsp goto done;
1939 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1940 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1941 c02c541e 2019-03-29 stsp if (error)
1942 c02c541e 2019-03-29 stsp goto done;
1944 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1945 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1946 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1947 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1948 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1949 3235492e 2018-04-01 stsp if (error != NULL)
1950 3235492e 2018-04-01 stsp return error;
1951 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1952 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1953 3235492e 2018-04-01 stsp if (error != NULL)
1954 3235492e 2018-04-01 stsp return error;
1955 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1957 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1958 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1959 3235492e 2018-04-01 stsp if (error == NULL) {
1960 1caad61b 2019-02-01 stsp int obj_type;
1961 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1962 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1963 d1f2edc9 2018-06-13 stsp if (error != NULL)
1964 1caad61b 2019-02-01 stsp goto done;
1965 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1966 1caad61b 2019-02-01 stsp if (error != NULL)
1967 1caad61b 2019-02-01 stsp goto done;
1968 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1969 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1970 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1971 1caad61b 2019-02-01 stsp if (error != NULL)
1972 1caad61b 2019-02-01 stsp goto done;
1973 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1974 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1975 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1976 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1977 1caad61b 2019-02-01 stsp goto done;
1980 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1981 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1982 1caad61b 2019-02-01 stsp if (id == NULL)
1983 638f9024 2019-05-13 stsp error = got_error_from_errno(
1984 230a42bd 2019-05-11 jcs "got_object_id_dup");
1985 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1986 1caad61b 2019-02-01 stsp if (error)
1987 1caad61b 2019-02-01 stsp goto done;
1988 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1989 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1990 1caad61b 2019-02-01 stsp goto done;
1992 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1993 d1f2edc9 2018-06-13 stsp if (error != NULL)
1994 1caad61b 2019-02-01 stsp goto done;
1996 15a94983 2018-12-23 stsp if (commit == NULL) {
1997 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
1998 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1999 d1f2edc9 2018-06-13 stsp if (error != NULL)
2000 d1f2edc9 2018-06-13 stsp return error;
2003 d7d4f210 2018-03-12 stsp if (error != NULL)
2004 04ca23f4 2018-07-16 stsp goto done;
2006 deeabeae 2019-08-27 stsp if (worktree) {
2007 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2009 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2010 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2011 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2012 deeabeae 2019-08-27 stsp goto done;
2014 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2017 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2018 04ca23f4 2018-07-16 stsp if (error != NULL)
2019 04ca23f4 2018-07-16 stsp goto done;
2020 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2021 04ca23f4 2018-07-16 stsp free(path);
2022 04ca23f4 2018-07-16 stsp path = in_repo_path;
2025 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2026 199a4027 2019-02-02 stsp if (error)
2027 199a4027 2019-02-02 stsp goto done;
2029 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2030 48c8c60d 2020-01-27 stsp diff_context, limit, log_branches, &refs);
2032 04ca23f4 2018-07-16 stsp free(path);
2033 04ca23f4 2018-07-16 stsp free(repo_path);
2034 04ca23f4 2018-07-16 stsp free(cwd);
2036 cffc0aa4 2019-02-05 stsp if (worktree)
2037 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2038 ad242220 2018-09-08 stsp if (repo) {
2039 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2040 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2041 ad242220 2018-09-08 stsp if (error == NULL)
2042 ad242220 2018-09-08 stsp error = repo_error;
2044 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2045 8bf5b3c9 2018-03-17 stsp return error;
2048 4ed7e80c 2018-05-20 stsp __dead static void
2049 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2051 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2052 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2056 b72f483a 2019-02-05 stsp struct print_diff_arg {
2057 b72f483a 2019-02-05 stsp struct got_repository *repo;
2058 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2059 b72f483a 2019-02-05 stsp int diff_context;
2060 3fc0c068 2019-02-10 stsp const char *id_str;
2061 3fc0c068 2019-02-10 stsp int header_shown;
2062 98eaaa12 2019-08-03 stsp int diff_staged;
2063 63035f9f 2019-10-06 stsp int ignore_whitespace;
2066 4ed7e80c 2018-05-20 stsp static const struct got_error *
2067 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2068 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2069 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2070 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2072 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2073 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2074 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2075 12463d8b 2019-12-13 stsp int fd = -1;
2076 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2077 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2078 b72f483a 2019-02-05 stsp struct stat sb;
2080 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2081 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2082 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2083 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2084 98eaaa12 2019-08-03 stsp return NULL;
2086 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2087 98eaaa12 2019-08-03 stsp return NULL;
2088 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2089 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2090 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2091 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2092 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2093 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2094 98eaaa12 2019-08-03 stsp return NULL;
2097 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2098 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2099 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2100 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2101 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2104 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2105 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2106 98eaaa12 2019-08-03 stsp switch (staged_status) {
2107 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2108 98eaaa12 2019-08-03 stsp label1 = path;
2109 98eaaa12 2019-08-03 stsp label2 = path;
2111 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2112 98eaaa12 2019-08-03 stsp label2 = path;
2114 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2115 98eaaa12 2019-08-03 stsp label1 = path;
2118 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2120 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2121 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2122 63035f9f 2019-10-06 stsp a->repo, stdout);
2125 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2126 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2127 4ce46740 2019-08-08 stsp char *id_str;
2128 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2131 4ce46740 2019-08-08 stsp goto done;
2132 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2134 4ce46740 2019-08-08 stsp goto done;
2135 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2136 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2137 4ce46740 2019-08-08 stsp free(id_str);
2138 4ce46740 2019-08-08 stsp goto done;
2140 4ce46740 2019-08-08 stsp free(id_str);
2141 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2142 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2144 4ce46740 2019-08-08 stsp goto done;
2147 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2148 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2149 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2150 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2151 2ec1f75b 2019-03-26 stsp goto done;
2154 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2155 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2156 12463d8b 2019-12-13 stsp if (fd == -1) {
2157 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2158 12463d8b 2019-12-13 stsp goto done;
2161 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2162 12463d8b 2019-12-13 stsp if (fd == -1) {
2163 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2164 12463d8b 2019-12-13 stsp goto done;
2167 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2168 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2169 2ec1f75b 2019-03-26 stsp goto done;
2171 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2172 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2173 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2174 2ec1f75b 2019-03-26 stsp goto done;
2178 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2180 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2181 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2183 b72f483a 2019-02-05 stsp if (blob1)
2184 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2185 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2186 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2187 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2188 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2189 b72f483a 2019-02-05 stsp free(abspath);
2190 927df6b7 2019-02-10 stsp return err;
2193 927df6b7 2019-02-10 stsp static const struct got_error *
2194 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2196 b00d56cd 2018-04-01 stsp const struct got_error *error;
2197 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2198 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2199 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2200 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2201 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2202 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2203 15a94983 2018-12-23 stsp int type1, type2;
2204 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2205 c0cc5c62 2018-10-18 stsp const char *errstr;
2206 927df6b7 2019-02-10 stsp char *path = NULL;
2208 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2209 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2210 25eccc22 2019-01-04 stsp NULL) == -1)
2211 b00d56cd 2018-04-01 stsp err(1, "pledge");
2214 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2215 b00d56cd 2018-04-01 stsp switch (ch) {
2217 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2219 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2220 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2223 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2224 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2225 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2227 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2230 98eaaa12 2019-08-03 stsp diff_staged = 1;
2233 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2236 2deda0b9 2019-03-07 stsp usage_diff();
2237 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2241 b00d56cd 2018-04-01 stsp argc -= optind;
2242 b00d56cd 2018-04-01 stsp argv += optind;
2244 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2245 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2246 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2247 b72f483a 2019-02-05 stsp goto done;
2249 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2250 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2251 927df6b7 2019-02-10 stsp goto done;
2252 927df6b7 2019-02-10 stsp if (argc <= 1) {
2253 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2254 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2255 927df6b7 2019-02-10 stsp goto done;
2257 b72f483a 2019-02-05 stsp if (repo_path)
2259 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2260 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2261 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2262 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2263 927df6b7 2019-02-10 stsp goto done;
2265 927df6b7 2019-02-10 stsp if (argc == 1) {
2266 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2268 927df6b7 2019-02-10 stsp if (error)
2269 927df6b7 2019-02-10 stsp goto done;
2271 927df6b7 2019-02-10 stsp path = strdup("");
2272 927df6b7 2019-02-10 stsp if (path == NULL) {
2273 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2274 927df6b7 2019-02-10 stsp goto done;
2277 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2278 98eaaa12 2019-08-03 stsp if (diff_staged)
2279 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2280 98eaaa12 2019-08-03 stsp "objects in repository");
2281 15a94983 2018-12-23 stsp id_str1 = argv[0];
2282 15a94983 2018-12-23 stsp id_str2 = argv[1];
2283 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2284 30db809c 2019-06-05 stsp repo_path =
2285 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2286 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2287 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2288 30db809c 2019-06-05 stsp goto done;
2292 b00d56cd 2018-04-01 stsp usage_diff();
2294 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2295 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2296 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2297 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2300 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2301 76089277 2018-04-01 stsp free(repo_path);
2302 b00d56cd 2018-04-01 stsp if (error != NULL)
2303 b00d56cd 2018-04-01 stsp goto done;
2305 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2306 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2307 c02c541e 2019-03-29 stsp if (error)
2308 c02c541e 2019-03-29 stsp goto done;
2310 30db809c 2019-06-05 stsp if (argc <= 1) {
2311 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2312 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2313 b72f483a 2019-02-05 stsp char *id_str;
2315 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2317 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2318 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2319 b72f483a 2019-02-05 stsp if (error)
2320 b72f483a 2019-02-05 stsp goto done;
2321 b72f483a 2019-02-05 stsp arg.repo = repo;
2322 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2323 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2324 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2325 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2326 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2327 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2329 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2330 72ea6654 2019-07-27 stsp if (error)
2331 72ea6654 2019-07-27 stsp goto done;
2333 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2334 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2335 b72f483a 2019-02-05 stsp free(id_str);
2336 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2337 b72f483a 2019-02-05 stsp goto done;
2340 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
2341 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2342 0adb7196 2019-08-11 stsp if (error)
2343 0adb7196 2019-08-11 stsp goto done;
2345 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
2346 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2347 0adb7196 2019-08-11 stsp if (error)
2348 0adb7196 2019-08-11 stsp goto done;
2350 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2351 15a94983 2018-12-23 stsp if (error)
2352 15a94983 2018-12-23 stsp goto done;
2354 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2355 15a94983 2018-12-23 stsp if (error)
2356 15a94983 2018-12-23 stsp goto done;
2358 15a94983 2018-12-23 stsp if (type1 != type2) {
2359 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2360 b00d56cd 2018-04-01 stsp goto done;
2363 15a94983 2018-12-23 stsp switch (type1) {
2364 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2365 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2366 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2368 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2369 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2370 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2372 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2373 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2374 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2375 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2378 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2381 5e70831e 2019-05-28 stsp free(label1);
2382 5e70831e 2019-05-28 stsp free(label2);
2383 15a94983 2018-12-23 stsp free(id1);
2384 15a94983 2018-12-23 stsp free(id2);
2385 927df6b7 2019-02-10 stsp free(path);
2386 b72f483a 2019-02-05 stsp if (worktree)
2387 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2388 ad242220 2018-09-08 stsp if (repo) {
2389 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2390 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2391 ad242220 2018-09-08 stsp if (error == NULL)
2392 ad242220 2018-09-08 stsp error = repo_error;
2394 b00d56cd 2018-04-01 stsp return error;
2397 404c43c4 2018-06-21 stsp __dead static void
2398 404c43c4 2018-06-21 stsp usage_blame(void)
2400 9270e621 2019-02-05 stsp fprintf(stderr,
2401 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2402 404c43c4 2018-06-21 stsp getprogname());
2406 28315671 2019-08-14 stsp struct blame_line {
2407 28315671 2019-08-14 stsp int annotated;
2408 28315671 2019-08-14 stsp char *id_str;
2409 82f6abb8 2019-08-14 stsp char *committer;
2410 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2413 28315671 2019-08-14 stsp struct blame_cb_args {
2414 28315671 2019-08-14 stsp struct blame_line *lines;
2415 28315671 2019-08-14 stsp int nlines;
2416 7ef28ff8 2019-08-14 stsp int nlines_prec;
2417 28315671 2019-08-14 stsp int lineno_cur;
2418 28315671 2019-08-14 stsp off_t *line_offsets;
2420 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2423 404c43c4 2018-06-21 stsp static const struct got_error *
2424 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2426 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2427 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2428 28315671 2019-08-14 stsp struct blame_line *bline;
2429 82f6abb8 2019-08-14 stsp char *line = NULL;
2430 28315671 2019-08-14 stsp size_t linesize = 0;
2431 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2432 28315671 2019-08-14 stsp off_t offset;
2433 bcb49d15 2019-08-14 stsp struct tm tm;
2434 bcb49d15 2019-08-14 stsp time_t committer_time;
2436 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2437 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2438 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2440 28315671 2019-08-14 stsp if (sigint_received)
2441 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2443 2839f8b9 2019-08-18 stsp if (lineno == -1)
2444 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2446 28315671 2019-08-14 stsp /* Annotate this line. */
2447 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2448 28315671 2019-08-14 stsp if (bline->annotated)
2449 28315671 2019-08-14 stsp return NULL;
2450 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2452 28315671 2019-08-14 stsp return err;
2454 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2456 82f6abb8 2019-08-14 stsp goto done;
2458 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2459 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2460 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2461 bcb49d15 2019-08-14 stsp goto done;
2464 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2465 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2466 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2467 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2468 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2469 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2470 82f6abb8 2019-08-14 stsp goto done;
2472 28315671 2019-08-14 stsp bline->annotated = 1;
2474 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2475 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2476 28315671 2019-08-14 stsp if (!bline->annotated)
2477 82f6abb8 2019-08-14 stsp goto done;
2479 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2480 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2481 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2482 82f6abb8 2019-08-14 stsp goto done;
2485 28315671 2019-08-14 stsp while (bline->annotated) {
2486 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2487 82f6abb8 2019-08-14 stsp size_t len;
2489 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2490 28315671 2019-08-14 stsp if (ferror(a->f))
2491 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2495 82f6abb8 2019-08-14 stsp committer = bline->committer;
2496 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2497 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2498 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2499 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2501 82f6abb8 2019-08-14 stsp *at = '\0';
2502 82f6abb8 2019-08-14 stsp len = strlen(committer);
2503 82f6abb8 2019-08-14 stsp if (len >= 9)
2504 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2506 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2508 28315671 2019-08-14 stsp *nl = '\0';
2509 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2510 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2512 28315671 2019-08-14 stsp a->lineno_cur++;
2513 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2516 82f6abb8 2019-08-14 stsp if (commit)
2517 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2518 28315671 2019-08-14 stsp free(line);
2519 28315671 2019-08-14 stsp return err;
2522 28315671 2019-08-14 stsp static const struct got_error *
2523 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2525 404c43c4 2018-06-21 stsp const struct got_error *error;
2526 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2527 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2528 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2529 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2530 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2531 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2532 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2533 28315671 2019-08-14 stsp struct blame_cb_args bca;
2534 28315671 2019-08-14 stsp int ch, obj_type, i;
2535 b02560ec 2019-08-19 stsp size_t filesize;
2537 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2539 404c43c4 2018-06-21 stsp #ifndef PROFILE
2540 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2541 36e2fb66 2019-01-04 stsp NULL) == -1)
2542 404c43c4 2018-06-21 stsp err(1, "pledge");
2545 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2546 404c43c4 2018-06-21 stsp switch (ch) {
2548 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2551 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2552 66bea077 2018-08-02 stsp if (repo_path == NULL)
2553 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2555 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2558 2deda0b9 2019-03-07 stsp usage_blame();
2559 404c43c4 2018-06-21 stsp /* NOTREACHED */
2563 404c43c4 2018-06-21 stsp argc -= optind;
2564 404c43c4 2018-06-21 stsp argv += optind;
2566 a39318fd 2018-08-02 stsp if (argc == 1)
2567 404c43c4 2018-06-21 stsp path = argv[0];
2569 404c43c4 2018-06-21 stsp usage_blame();
2571 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2572 66bea077 2018-08-02 stsp if (cwd == NULL) {
2573 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2574 66bea077 2018-08-02 stsp goto done;
2576 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2577 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2578 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2579 66bea077 2018-08-02 stsp goto done;
2581 0c06baac 2019-02-05 stsp error = NULL;
2582 0c06baac 2019-02-05 stsp if (worktree) {
2583 0c06baac 2019-02-05 stsp repo_path =
2584 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2585 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2586 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2587 0c06baac 2019-02-05 stsp if (error)
2588 0c06baac 2019-02-05 stsp goto done;
2590 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2591 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2592 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2593 0c06baac 2019-02-05 stsp goto done;
2598 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2599 c02c541e 2019-03-29 stsp if (error != NULL)
2600 36e2fb66 2019-01-04 stsp goto done;
2602 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2603 c02c541e 2019-03-29 stsp if (error)
2604 404c43c4 2018-06-21 stsp goto done;
2606 0c06baac 2019-02-05 stsp if (worktree) {
2607 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2608 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2609 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2610 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2611 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2612 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2613 6efaaa2d 2019-02-05 stsp path) == -1) {
2614 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2615 0c06baac 2019-02-05 stsp goto done;
2617 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2620 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2622 0c06baac 2019-02-05 stsp if (error)
2623 66bea077 2018-08-02 stsp goto done;
2625 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2626 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2627 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
2628 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
2629 404c43c4 2018-06-21 stsp if (error != NULL)
2630 66bea077 2018-08-02 stsp goto done;
2631 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2632 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2633 404c43c4 2018-06-21 stsp if (error != NULL)
2634 66bea077 2018-08-02 stsp goto done;
2636 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2637 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2638 30837e32 2019-07-25 stsp if (error)
2639 66bea077 2018-08-02 stsp goto done;
2642 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2643 28315671 2019-08-14 stsp if (error)
2644 28315671 2019-08-14 stsp goto done;
2646 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2647 28315671 2019-08-14 stsp if (error)
2648 28315671 2019-08-14 stsp goto done;
2650 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2651 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2652 28315671 2019-08-14 stsp goto done;
2655 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2656 28315671 2019-08-14 stsp if (error)
2657 28315671 2019-08-14 stsp goto done;
2658 28315671 2019-08-14 stsp bca.f = got_opentemp();
2659 28315671 2019-08-14 stsp if (bca.f == NULL) {
2660 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2661 28315671 2019-08-14 stsp goto done;
2663 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2664 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2665 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2666 28315671 2019-08-14 stsp goto done;
2668 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2669 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2670 b02560ec 2019-08-19 stsp bca.nlines--;
2672 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2673 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2674 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2675 28315671 2019-08-14 stsp goto done;
2677 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2678 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2679 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2680 7ef28ff8 2019-08-14 stsp while (i > 0) {
2682 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2684 82f6abb8 2019-08-14 stsp bca.repo = repo;
2686 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2687 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2689 66bea077 2018-08-02 stsp free(in_repo_path);
2690 66bea077 2018-08-02 stsp free(repo_path);
2691 66bea077 2018-08-02 stsp free(cwd);
2692 404c43c4 2018-06-21 stsp free(commit_id);
2693 28315671 2019-08-14 stsp free(obj_id);
2695 28315671 2019-08-14 stsp got_object_blob_close(blob);
2696 0c06baac 2019-02-05 stsp if (worktree)
2697 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2698 ad242220 2018-09-08 stsp if (repo) {
2699 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2700 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2701 ad242220 2018-09-08 stsp if (error == NULL)
2702 ad242220 2018-09-08 stsp error = repo_error;
2704 3affba96 2019-09-22 stsp if (bca.lines) {
2705 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2706 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2707 3affba96 2019-09-22 stsp free(bline->id_str);
2708 3affba96 2019-09-22 stsp free(bline->committer);
2710 3affba96 2019-09-22 stsp free(bca.lines);
2712 28315671 2019-08-14 stsp free(bca.line_offsets);
2713 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2714 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2715 404c43c4 2018-06-21 stsp return error;
2718 5de5890b 2018-10-18 stsp __dead static void
2719 5de5890b 2018-10-18 stsp usage_tree(void)
2721 c1669e2e 2019-01-09 stsp fprintf(stderr,
2722 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2723 5de5890b 2018-10-18 stsp getprogname());
2727 c1669e2e 2019-01-09 stsp static void
2728 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2729 c1669e2e 2019-01-09 stsp const char *root_path)
2731 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2732 848d6979 2019-08-12 stsp const char *modestr = "";
2733 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2735 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2736 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2739 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2740 63c5ca5d 2019-08-24 stsp modestr = "$";
2741 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2742 848d6979 2019-08-12 stsp modestr = "@";
2743 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2744 848d6979 2019-08-12 stsp modestr = "/";
2745 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2746 848d6979 2019-08-12 stsp modestr = "*";
2748 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2749 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2752 5de5890b 2018-10-18 stsp static const struct got_error *
2753 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2754 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2755 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2757 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2758 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2759 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2760 56e0773d 2019-11-28 stsp int nentries, i;
2762 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2764 5de5890b 2018-10-18 stsp goto done;
2766 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2768 5de5890b 2018-10-18 stsp goto done;
2769 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2770 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2771 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2772 5de5890b 2018-10-18 stsp char *id = NULL;
2774 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2777 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2778 5de5890b 2018-10-18 stsp if (show_ids) {
2779 5de5890b 2018-10-18 stsp char *id_str;
2780 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2781 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2783 5de5890b 2018-10-18 stsp goto done;
2784 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2785 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2786 5de5890b 2018-10-18 stsp free(id_str);
2787 5de5890b 2018-10-18 stsp goto done;
2789 5de5890b 2018-10-18 stsp free(id_str);
2791 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2794 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2795 c1669e2e 2019-01-09 stsp char *child_path;
2796 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2797 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2798 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2799 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2800 c1669e2e 2019-01-09 stsp goto done;
2802 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2803 c1669e2e 2019-01-09 stsp root_path, repo);
2804 c1669e2e 2019-01-09 stsp free(child_path);
2806 c1669e2e 2019-01-09 stsp goto done;
2811 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2812 5de5890b 2018-10-18 stsp free(tree_id);
2813 5de5890b 2018-10-18 stsp return err;
2816 5de5890b 2018-10-18 stsp static const struct got_error *
2817 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2819 5de5890b 2018-10-18 stsp const struct got_error *error;
2820 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2821 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2822 7a2c19d6 2019-02-05 stsp const char *path;
2823 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2824 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2825 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2826 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2829 5de5890b 2018-10-18 stsp #ifndef PROFILE
2830 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2831 0f8d269b 2019-01-04 stsp NULL) == -1)
2832 5de5890b 2018-10-18 stsp err(1, "pledge");
2835 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2836 5de5890b 2018-10-18 stsp switch (ch) {
2838 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2841 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2842 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2843 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2845 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2848 5de5890b 2018-10-18 stsp show_ids = 1;
2851 c1669e2e 2019-01-09 stsp recurse = 1;
2854 2deda0b9 2019-03-07 stsp usage_tree();
2855 5de5890b 2018-10-18 stsp /* NOTREACHED */
2859 5de5890b 2018-10-18 stsp argc -= optind;
2860 5de5890b 2018-10-18 stsp argv += optind;
2862 5de5890b 2018-10-18 stsp if (argc == 1)
2863 5de5890b 2018-10-18 stsp path = argv[0];
2864 5de5890b 2018-10-18 stsp else if (argc > 1)
2865 5de5890b 2018-10-18 stsp usage_tree();
2867 7a2c19d6 2019-02-05 stsp path = NULL;
2869 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2870 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2871 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2872 9bf7a39b 2019-02-05 stsp goto done;
2874 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2875 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2876 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2877 7a2c19d6 2019-02-05 stsp goto done;
2879 7a2c19d6 2019-02-05 stsp error = NULL;
2880 7a2c19d6 2019-02-05 stsp if (worktree) {
2881 7a2c19d6 2019-02-05 stsp repo_path =
2882 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2883 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2884 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2885 7a2c19d6 2019-02-05 stsp if (error)
2886 7a2c19d6 2019-02-05 stsp goto done;
2888 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2889 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2890 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2891 7a2c19d6 2019-02-05 stsp goto done;
2896 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2897 5de5890b 2018-10-18 stsp if (error != NULL)
2898 c02c541e 2019-03-29 stsp goto done;
2900 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2901 c02c541e 2019-03-29 stsp if (error)
2902 5de5890b 2018-10-18 stsp goto done;
2904 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2905 9bf7a39b 2019-02-05 stsp if (worktree) {
2906 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2907 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2908 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2909 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2910 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2911 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2912 9bf7a39b 2019-02-05 stsp goto done;
2914 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2916 9bf7a39b 2019-02-05 stsp if (error)
2917 9bf7a39b 2019-02-05 stsp goto done;
2919 9bf7a39b 2019-02-05 stsp path = "/";
2921 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2922 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2923 9bf7a39b 2019-02-05 stsp if (error != NULL)
2924 9bf7a39b 2019-02-05 stsp goto done;
2927 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2928 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2929 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2930 5de5890b 2018-10-18 stsp if (error != NULL)
2931 5de5890b 2018-10-18 stsp goto done;
2932 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2933 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2934 5de5890b 2018-10-18 stsp if (error != NULL)
2935 5de5890b 2018-10-18 stsp goto done;
2937 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2938 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2939 30837e32 2019-07-25 stsp if (error)
2940 5de5890b 2018-10-18 stsp goto done;
2943 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2944 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2946 5de5890b 2018-10-18 stsp free(in_repo_path);
2947 5de5890b 2018-10-18 stsp free(repo_path);
2948 5de5890b 2018-10-18 stsp free(cwd);
2949 5de5890b 2018-10-18 stsp free(commit_id);
2950 7a2c19d6 2019-02-05 stsp if (worktree)
2951 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
2952 5de5890b 2018-10-18 stsp if (repo) {
2953 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
2954 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
2955 5de5890b 2018-10-18 stsp if (error == NULL)
2956 5de5890b 2018-10-18 stsp error = repo_error;
2958 5de5890b 2018-10-18 stsp return error;
2961 6bad629b 2019-02-04 stsp __dead static void
2962 6bad629b 2019-02-04 stsp usage_status(void)
2964 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2968 b72f483a 2019-02-05 stsp static const struct got_error *
2969 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
2970 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2971 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2972 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2974 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
2975 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
2976 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
2977 b72f483a 2019-02-05 stsp return NULL;
2980 6bad629b 2019-02-04 stsp static const struct got_error *
2981 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
2983 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
2984 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
2985 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
2986 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
2987 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2988 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
2991 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2993 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2994 6bad629b 2019-02-04 stsp switch (ch) {
2996 2deda0b9 2019-03-07 stsp usage_status();
2997 6bad629b 2019-02-04 stsp /* NOTREACHED */
3001 6bad629b 2019-02-04 stsp argc -= optind;
3002 6bad629b 2019-02-04 stsp argv += optind;
3004 6bad629b 2019-02-04 stsp #ifndef PROFILE
3005 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3006 6bad629b 2019-02-04 stsp NULL) == -1)
3007 6bad629b 2019-02-04 stsp err(1, "pledge");
3009 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3010 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3011 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3012 927df6b7 2019-02-10 stsp goto done;
3015 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3016 927df6b7 2019-02-10 stsp if (error != NULL)
3017 a5edda0a 2019-07-27 stsp goto done;
3019 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3021 6bad629b 2019-02-04 stsp if (error != NULL)
3022 6bad629b 2019-02-04 stsp goto done;
3024 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3025 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3026 087fb88c 2019-08-04 stsp if (error)
3027 087fb88c 2019-08-04 stsp goto done;
3029 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3030 6bad629b 2019-02-04 stsp if (error)
3031 6bad629b 2019-02-04 stsp goto done;
3033 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3034 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3036 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3037 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3038 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3039 927df6b7 2019-02-10 stsp free(cwd);
3040 d0eebce4 2019-03-11 stsp return error;
3043 d0eebce4 2019-03-11 stsp __dead static void
3044 d0eebce4 2019-03-11 stsp usage_ref(void)
3046 d0eebce4 2019-03-11 stsp fprintf(stderr,
3047 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3048 d0eebce4 2019-03-11 stsp getprogname());
3052 d0eebce4 2019-03-11 stsp static const struct got_error *
3053 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3055 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3056 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3057 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3059 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3060 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3062 d0eebce4 2019-03-11 stsp return err;
3064 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3065 d0eebce4 2019-03-11 stsp char *refstr;
3066 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3067 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3068 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3069 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3070 d0eebce4 2019-03-11 stsp free(refstr);
3073 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3074 d0eebce4 2019-03-11 stsp return NULL;
3077 d0eebce4 2019-03-11 stsp static const struct got_error *
3078 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3080 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3081 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3083 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3085 d0eebce4 2019-03-11 stsp return err;
3087 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3088 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3089 d0eebce4 2019-03-11 stsp return err;
3092 d0eebce4 2019-03-11 stsp static const struct got_error *
3093 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3095 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3096 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3097 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3100 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3101 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3102 d1644381 2019-07-14 stsp * an unintended typo.
3104 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3105 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3107 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3109 d83d9d5c 2019-05-13 stsp if (err) {
3110 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3112 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3113 d83d9d5c 2019-05-13 stsp return err;
3114 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3116 d83d9d5c 2019-05-13 stsp return err;
3117 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3118 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3120 d83d9d5c 2019-05-13 stsp return err;
3123 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3125 d0eebce4 2019-03-11 stsp goto done;
3127 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3130 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3132 d1c1ae5f 2019-08-12 stsp return err;
3135 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3136 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3138 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3139 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3140 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3143 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3144 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3145 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3147 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3148 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3150 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3152 d1c1ae5f 2019-08-12 stsp return err;
3154 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3156 d1c1ae5f 2019-08-12 stsp goto done;
3158 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3160 d1c1ae5f 2019-08-12 stsp if (target_ref)
3161 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3163 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3164 d0eebce4 2019-03-11 stsp return err;
3167 d0eebce4 2019-03-11 stsp static const struct got_error *
3168 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3170 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3171 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3172 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3173 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3174 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3175 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3177 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3178 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3179 d0eebce4 2019-03-11 stsp switch (ch) {
3181 d0eebce4 2019-03-11 stsp delref = optarg;
3184 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3185 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3186 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3188 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3191 d0eebce4 2019-03-11 stsp do_list = 1;
3194 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3197 d0eebce4 2019-03-11 stsp usage_ref();
3198 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3202 d0eebce4 2019-03-11 stsp if (do_list && delref)
3203 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3205 d0eebce4 2019-03-11 stsp argc -= optind;
3206 d0eebce4 2019-03-11 stsp argv += optind;
3208 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3209 d1c1ae5f 2019-08-12 stsp if (create_symref)
3210 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3211 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3212 d0eebce4 2019-03-11 stsp if (argc > 0)
3213 d0eebce4 2019-03-11 stsp usage_ref();
3214 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3215 d0eebce4 2019-03-11 stsp usage_ref();
3217 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3218 e0b57350 2019-03-12 stsp if (do_list) {
3219 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3220 e0b57350 2019-03-12 stsp NULL) == -1)
3221 e0b57350 2019-03-12 stsp err(1, "pledge");
3223 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3224 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3225 e0b57350 2019-03-12 stsp err(1, "pledge");
3228 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3229 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3230 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3231 d0eebce4 2019-03-11 stsp goto done;
3234 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3235 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3236 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3237 d0eebce4 2019-03-11 stsp goto done;
3239 d0eebce4 2019-03-11 stsp error = NULL;
3240 d0eebce4 2019-03-11 stsp if (worktree) {
3241 d0eebce4 2019-03-11 stsp repo_path =
3242 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3243 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3244 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3245 d0eebce4 2019-03-11 stsp if (error)
3246 d0eebce4 2019-03-11 stsp goto done;
3248 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3249 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3250 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3251 d0eebce4 2019-03-11 stsp goto done;
3256 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3257 d0eebce4 2019-03-11 stsp if (error != NULL)
3258 d0eebce4 2019-03-11 stsp goto done;
3260 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3261 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3262 c02c541e 2019-03-29 stsp if (error)
3263 c02c541e 2019-03-29 stsp goto done;
3265 d0eebce4 2019-03-11 stsp if (do_list)
3266 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3267 d0eebce4 2019-03-11 stsp else if (delref)
3268 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3269 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3270 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3272 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3275 4e759de4 2019-06-26 stsp got_repo_close(repo);
3276 4e759de4 2019-06-26 stsp if (worktree)
3277 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3278 4e759de4 2019-06-26 stsp free(cwd);
3279 4e759de4 2019-06-26 stsp free(repo_path);
3280 4e759de4 2019-06-26 stsp return error;
3283 4e759de4 2019-06-26 stsp __dead static void
3284 4e759de4 2019-06-26 stsp usage_branch(void)
3286 4e759de4 2019-06-26 stsp fprintf(stderr,
3287 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3288 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3292 4e759de4 2019-06-26 stsp static const struct got_error *
3293 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3294 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3296 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3297 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3298 4e99b47e 2019-10-04 stsp char *refstr;
3300 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3301 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3302 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3303 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3305 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3307 4e99b47e 2019-10-04 stsp return err;
3308 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3309 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3310 4e99b47e 2019-10-04 stsp marker = "* ";
3312 4e99b47e 2019-10-04 stsp marker = "~ ";
3316 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3317 4e99b47e 2019-10-04 stsp refname += 11;
3318 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3319 4e99b47e 2019-10-04 stsp refname += 18;
3321 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3322 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3323 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3325 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3326 4e99b47e 2019-10-04 stsp free(refstr);
3327 4e99b47e 2019-10-04 stsp return NULL;
3330 4e99b47e 2019-10-04 stsp static const struct got_error *
3331 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3333 ad89fa31 2019-10-04 stsp const char *refname;
3335 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3336 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3338 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3340 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3341 ad89fa31 2019-10-04 stsp refname += 11;
3342 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3343 ad89fa31 2019-10-04 stsp refname += 18;
3345 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3347 ad89fa31 2019-10-04 stsp return NULL;
3350 ad89fa31 2019-10-04 stsp static const struct got_error *
3351 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3353 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3354 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3355 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3356 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3357 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3359 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3361 4e99b47e 2019-10-04 stsp if (worktree) {
3362 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3363 4e99b47e 2019-10-04 stsp worktree);
3365 4e99b47e 2019-10-04 stsp return err;
3367 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3368 4e99b47e 2019-10-04 stsp worktree);
3370 4e99b47e 2019-10-04 stsp return err;
3372 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3373 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3374 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3376 4e99b47e 2019-10-04 stsp return err;
3377 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3378 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3382 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3383 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3385 4e759de4 2019-06-26 stsp return err;
3387 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3388 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3390 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3391 4e759de4 2019-06-26 stsp return NULL;
3394 4e759de4 2019-06-26 stsp static const struct got_error *
3395 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3396 45cd4e47 2019-08-25 stsp const char *branch_name)
3398 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3399 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3400 4e759de4 2019-06-26 stsp char *refname;
3402 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3403 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3405 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3407 4e759de4 2019-06-26 stsp goto done;
3409 45cd4e47 2019-08-25 stsp if (worktree &&
3410 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3411 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3412 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3413 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3414 45cd4e47 2019-08-25 stsp goto done;
3417 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3420 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3421 4e759de4 2019-06-26 stsp free(refname);
3422 4e759de4 2019-06-26 stsp return err;
3425 4e759de4 2019-06-26 stsp static const struct got_error *
3426 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3427 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3429 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3430 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3431 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3434 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3435 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3436 d3f84d51 2019-07-11 stsp * an unintended typo.
3438 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3439 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3441 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3442 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3443 4e759de4 2019-06-26 stsp goto done;
3446 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3447 4e759de4 2019-06-26 stsp if (err == NULL) {
3448 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3449 4e759de4 2019-06-26 stsp goto done;
3450 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3451 4e759de4 2019-06-26 stsp goto done;
3453 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3455 4e759de4 2019-06-26 stsp goto done;
3457 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3460 4e759de4 2019-06-26 stsp got_ref_close(ref);
3461 4e759de4 2019-06-26 stsp free(base_refname);
3462 4e759de4 2019-06-26 stsp free(refname);
3463 4e759de4 2019-06-26 stsp return err;
3466 4e759de4 2019-06-26 stsp static const struct got_error *
3467 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3469 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3470 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3471 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3472 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3473 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3474 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3476 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3477 4e759de4 2019-06-26 stsp switch (ch) {
3479 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3482 4e759de4 2019-06-26 stsp delref = optarg;
3485 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3486 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3487 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3489 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3492 4e759de4 2019-06-26 stsp do_list = 1;
3495 4e759de4 2019-06-26 stsp usage_branch();
3496 4e759de4 2019-06-26 stsp /* NOTREACHED */
3500 4e759de4 2019-06-26 stsp if (do_list && delref)
3501 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3503 4e759de4 2019-06-26 stsp argc -= optind;
3504 4e759de4 2019-06-26 stsp argv += optind;
3506 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3507 ad89fa31 2019-10-04 stsp do_show = 1;
3509 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3510 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3512 4e759de4 2019-06-26 stsp if (do_list || delref) {
3513 4e759de4 2019-06-26 stsp if (argc > 0)
3514 4e759de4 2019-06-26 stsp usage_branch();
3515 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3516 4e759de4 2019-06-26 stsp usage_branch();
3518 4e759de4 2019-06-26 stsp #ifndef PROFILE
3519 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3520 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3521 4e759de4 2019-06-26 stsp NULL) == -1)
3522 4e759de4 2019-06-26 stsp err(1, "pledge");
3524 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3525 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3526 4e759de4 2019-06-26 stsp err(1, "pledge");
3529 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3530 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3531 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3532 4e759de4 2019-06-26 stsp goto done;
3535 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3536 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3537 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3538 4e759de4 2019-06-26 stsp goto done;
3540 4e759de4 2019-06-26 stsp error = NULL;
3541 4e759de4 2019-06-26 stsp if (worktree) {
3542 4e759de4 2019-06-26 stsp repo_path =
3543 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3544 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3545 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3546 4e759de4 2019-06-26 stsp if (error)
3547 4e759de4 2019-06-26 stsp goto done;
3549 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3550 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3551 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3552 4e759de4 2019-06-26 stsp goto done;
3557 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3558 4e759de4 2019-06-26 stsp if (error != NULL)
3559 4e759de4 2019-06-26 stsp goto done;
3561 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3562 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3563 4e759de4 2019-06-26 stsp if (error)
3564 4e759de4 2019-06-26 stsp goto done;
3566 ad89fa31 2019-10-04 stsp if (do_show)
3567 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3568 ad89fa31 2019-10-04 stsp else if (do_list)
3569 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3570 4e759de4 2019-06-26 stsp else if (delref)
3571 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3573 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3574 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3575 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3576 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3577 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3578 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3579 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3580 a74f7e83 2019-11-10 stsp if (error)
3581 a74f7e83 2019-11-10 stsp goto done;
3582 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3583 a74f7e83 2019-11-10 stsp free(commit_id);
3587 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3588 d0eebce4 2019-03-11 stsp if (worktree)
3589 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3590 d0eebce4 2019-03-11 stsp free(cwd);
3591 d0eebce4 2019-03-11 stsp free(repo_path);
3592 d00136be 2019-03-26 stsp return error;
3596 d00136be 2019-03-26 stsp __dead static void
3597 8e7bd50a 2019-08-22 stsp usage_tag(void)
3599 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3600 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3601 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3606 b8bad2ba 2019-08-23 stsp static const struct got_error *
3607 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3609 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3610 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3611 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3612 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3613 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3615 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3616 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3617 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3618 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3620 b8bad2ba 2019-08-23 stsp return err;
3621 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3624 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3627 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3628 b8bad2ba 2019-08-23 stsp free(re_id);
3631 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3632 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3635 b8bad2ba 2019-08-23 stsp while (se) {
3636 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3639 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3640 b8bad2ba 2019-08-23 stsp free(se_id);
3643 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3644 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3646 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3647 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3649 b8bad2ba 2019-08-23 stsp return err;
3650 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3653 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3658 b8bad2ba 2019-08-23 stsp return err;
3662 b8bad2ba 2019-08-23 stsp static const struct got_error *
3663 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3665 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3666 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3667 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3669 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3671 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
3673 8e7bd50a 2019-08-22 stsp return err;
3675 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3676 8e7bd50a 2019-08-22 stsp const char *refname;
3677 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3678 8e7bd50a 2019-08-22 stsp char datebuf[26];
3679 d4efa91b 2020-01-14 stsp const char *tagger;
3680 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3681 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3682 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3683 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
3685 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3686 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3688 8e7bd50a 2019-08-22 stsp refname += 10;
3689 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3690 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3691 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3694 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3695 8e7bd50a 2019-08-22 stsp free(refstr);
3697 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3700 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3701 d4efa91b 2020-01-14 stsp if (err) {
3702 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3706 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
3707 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
3708 d4efa91b 2020-01-14 stsp if (err) {
3712 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
3713 d4efa91b 2020-01-14 stsp tagger_time =
3714 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
3715 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
3721 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
3722 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3723 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
3724 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
3728 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
3729 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3730 2417344c 2019-08-23 stsp if (datestr)
3731 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3732 d4efa91b 2020-01-14 stsp if (commit)
3733 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3735 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
3736 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
3737 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
3740 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
3741 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
3744 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
3745 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
3748 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
3749 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
3756 8e7bd50a 2019-08-22 stsp free(id_str);
3757 d4efa91b 2020-01-14 stsp if (commit) {
3758 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
3761 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
3763 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3764 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
3765 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
3766 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
3771 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3773 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3775 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3776 8e7bd50a 2019-08-22 stsp } while (line);
3777 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3780 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3781 8e7bd50a 2019-08-22 stsp return NULL;
3784 8e7bd50a 2019-08-22 stsp static const struct got_error *
3785 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3786 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3788 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3789 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3790 f372d5cd 2019-10-21 stsp char *editor = NULL;
3791 8e7bd50a 2019-08-22 stsp int fd = -1;
3793 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
3794 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3795 8e7bd50a 2019-08-22 stsp goto done;
3798 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3799 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3800 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3801 8e7bd50a 2019-08-22 stsp goto done;
3804 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3806 8e7bd50a 2019-08-22 stsp goto done;
3808 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3809 8e7bd50a 2019-08-22 stsp close(fd);
3811 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3813 8e7bd50a 2019-08-22 stsp goto done;
3814 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3816 8e7bd50a 2019-08-22 stsp free(initial_content);
3817 8e7bd50a 2019-08-22 stsp free(template);
3818 8e7bd50a 2019-08-22 stsp free(editor);
3820 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3821 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3822 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3823 8e7bd50a 2019-08-22 stsp if (err) {
3824 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3825 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3828 8e7bd50a 2019-08-22 stsp return err;
3831 8e7bd50a 2019-08-22 stsp static const struct got_error *
3832 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3833 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3835 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3836 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3837 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3838 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3839 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3840 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3841 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3844 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3845 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3846 8e7bd50a 2019-08-22 stsp * an unintended typo.
3848 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
3849 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3851 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3853 8e7bd50a 2019-08-22 stsp return err;
3855 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
3856 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3858 8e7bd50a 2019-08-22 stsp goto done;
3860 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3862 8e7bd50a 2019-08-22 stsp goto done;
3864 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3865 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3866 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3867 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3868 8e7bd50a 2019-08-22 stsp goto done;
3870 8e7bd50a 2019-08-22 stsp tag_name += 10;
3871 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3872 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3873 8e7bd50a 2019-08-22 stsp goto done;
3876 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3877 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3878 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3879 8e7bd50a 2019-08-22 stsp goto done;
3880 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3881 8e7bd50a 2019-08-22 stsp goto done;
3883 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3884 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3885 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3886 f372d5cd 2019-10-21 stsp if (err) {
3887 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3888 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3889 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3890 8e7bd50a 2019-08-22 stsp goto done;
3894 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3895 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3896 f372d5cd 2019-10-21 stsp if (err) {
3897 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3898 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3899 8e7bd50a 2019-08-22 stsp goto done;
3902 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3903 f372d5cd 2019-10-21 stsp if (err) {
3904 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3905 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3906 8e7bd50a 2019-08-22 stsp goto done;
3909 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3910 f372d5cd 2019-10-21 stsp if (err) {
3911 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3912 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3913 f372d5cd 2019-10-21 stsp goto done;
3916 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
3917 f372d5cd 2019-10-21 stsp if (err) {
3918 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3919 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3920 f372d5cd 2019-10-21 stsp goto done;
3922 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
3924 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
3925 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
3926 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
3927 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3928 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
3929 f372d5cd 2019-10-21 stsp free(tag_id_str);
3931 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3932 8e7bd50a 2019-08-22 stsp free(commit_id);
3933 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3934 8e7bd50a 2019-08-22 stsp free(refname);
3935 8e7bd50a 2019-08-22 stsp free(tagmsg);
3936 f372d5cd 2019-10-21 stsp free(tagmsg_path);
3937 aba9c984 2019-09-08 stsp free(tagger);
3938 8e7bd50a 2019-08-22 stsp return err;
3941 8e7bd50a 2019-08-22 stsp static const struct got_error *
3942 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
3944 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
3945 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
3946 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
3947 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3948 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
3949 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3950 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
3952 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3953 8e7bd50a 2019-08-22 stsp switch (ch) {
3955 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
3958 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
3959 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
3960 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3962 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
3965 8e7bd50a 2019-08-22 stsp do_list = 1;
3968 8e7bd50a 2019-08-22 stsp usage_tag();
3969 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
3973 8e7bd50a 2019-08-22 stsp argc -= optind;
3974 8e7bd50a 2019-08-22 stsp argv += optind;
3976 8e7bd50a 2019-08-22 stsp if (do_list) {
3977 8e7bd50a 2019-08-22 stsp if (tagmsg)
3978 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
3979 8e7bd50a 2019-08-22 stsp if (argc > 0)
3980 8e7bd50a 2019-08-22 stsp usage_tag();
3981 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
3982 8e7bd50a 2019-08-22 stsp usage_tag();
3983 a2887370 2019-08-23 stsp else if (argc > 1)
3984 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
3985 a2887370 2019-08-23 stsp tag_name = argv[0];
3987 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
3988 8e7bd50a 2019-08-22 stsp if (do_list) {
3989 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3990 8e7bd50a 2019-08-22 stsp NULL) == -1)
3991 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3993 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3994 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
3995 8e7bd50a 2019-08-22 stsp err(1, "pledge");
3998 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
3999 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4000 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4001 8e7bd50a 2019-08-22 stsp goto done;
4004 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4005 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4006 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4007 8e7bd50a 2019-08-22 stsp goto done;
4009 8e7bd50a 2019-08-22 stsp error = NULL;
4010 8e7bd50a 2019-08-22 stsp if (worktree) {
4011 8e7bd50a 2019-08-22 stsp repo_path =
4012 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4013 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4014 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4015 8e7bd50a 2019-08-22 stsp if (error)
4016 8e7bd50a 2019-08-22 stsp goto done;
4018 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4019 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4020 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4021 8e7bd50a 2019-08-22 stsp goto done;
4026 8e7bd50a 2019-08-22 stsp if (do_list) {
4027 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4028 c9956ddf 2019-09-08 stsp if (error != NULL)
4029 c9956ddf 2019-09-08 stsp goto done;
4030 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4031 8e7bd50a 2019-08-22 stsp if (error)
4032 8e7bd50a 2019-08-22 stsp goto done;
4033 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4035 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4036 c9956ddf 2019-09-08 stsp if (error)
4037 c9956ddf 2019-09-08 stsp goto done;
4038 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4039 c9956ddf 2019-09-08 stsp if (error != NULL)
4040 c9956ddf 2019-09-08 stsp goto done;
4042 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4043 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4044 8e7bd50a 2019-08-22 stsp if (error)
4045 8e7bd50a 2019-08-22 stsp goto done;
4048 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4049 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4050 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4051 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4052 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4053 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4054 8e7bd50a 2019-08-22 stsp if (error)
4055 8e7bd50a 2019-08-22 stsp goto done;
4056 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4057 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4058 8e7bd50a 2019-08-22 stsp if (error)
4059 8e7bd50a 2019-08-22 stsp goto done;
4060 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4061 8e7bd50a 2019-08-22 stsp free(commit_id);
4062 8e7bd50a 2019-08-22 stsp if (error)
4063 8e7bd50a 2019-08-22 stsp goto done;
4066 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4067 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4071 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4072 8e7bd50a 2019-08-22 stsp if (worktree)
4073 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4074 8e7bd50a 2019-08-22 stsp free(cwd);
4075 8e7bd50a 2019-08-22 stsp free(repo_path);
4076 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4077 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4078 8e7bd50a 2019-08-22 stsp return error;
4081 8e7bd50a 2019-08-22 stsp __dead static void
4082 d00136be 2019-03-26 stsp usage_add(void)
4084 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4085 022fae89 2019-12-06 tracey getprogname());
4089 d00136be 2019-03-26 stsp static const struct got_error *
4090 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4092 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4094 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4095 4e68cba3 2019-11-23 stsp return NULL;
4098 4e68cba3 2019-11-23 stsp static const struct got_error *
4099 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4101 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4102 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4103 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4104 1dd54920 2019-05-11 stsp char *cwd = NULL;
4105 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4106 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4107 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4109 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4111 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4112 d00136be 2019-03-26 stsp switch (ch) {
4113 022fae89 2019-12-06 tracey case 'I':
4114 022fae89 2019-12-06 tracey no_ignores = 1;
4117 4e68cba3 2019-11-23 stsp can_recurse = 1;
4120 d00136be 2019-03-26 stsp usage_add();
4121 d00136be 2019-03-26 stsp /* NOTREACHED */
4125 d00136be 2019-03-26 stsp argc -= optind;
4126 d00136be 2019-03-26 stsp argv += optind;
4128 43012d58 2019-07-14 stsp #ifndef PROFILE
4129 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4130 43012d58 2019-07-14 stsp NULL) == -1)
4131 43012d58 2019-07-14 stsp err(1, "pledge");
4133 723c305c 2019-05-11 jcs if (argc < 1)
4134 d00136be 2019-03-26 stsp usage_add();
4136 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4137 d00136be 2019-03-26 stsp if (cwd == NULL) {
4138 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4139 d00136be 2019-03-26 stsp goto done;
4142 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4143 d00136be 2019-03-26 stsp if (error)
4144 d00136be 2019-03-26 stsp goto done;
4146 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4148 031a5338 2019-03-26 stsp if (error != NULL)
4149 031a5338 2019-03-26 stsp goto done;
4151 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4152 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4153 d00136be 2019-03-26 stsp if (error)
4154 d00136be 2019-03-26 stsp goto done;
4156 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4157 6d022e97 2019-08-04 stsp if (error)
4158 022fae89 2019-12-06 tracey goto done;
4160 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4161 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4162 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4163 6d022e97 2019-08-04 stsp goto done;
4167 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4168 4e68cba3 2019-11-23 stsp char *ondisk_path;
4169 4e68cba3 2019-11-23 stsp struct stat sb;
4170 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4171 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4172 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4173 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4174 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4175 4e68cba3 2019-11-23 stsp goto done;
4177 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4178 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4179 4e68cba3 2019-11-23 stsp free(ondisk_path);
4182 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4183 4e68cba3 2019-11-23 stsp ondisk_path);
4184 4e68cba3 2019-11-23 stsp free(ondisk_path);
4185 4e68cba3 2019-11-23 stsp goto done;
4187 4e68cba3 2019-11-23 stsp free(ondisk_path);
4188 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4189 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4190 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4191 4e68cba3 2019-11-23 stsp goto done;
4196 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4197 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4200 031a5338 2019-03-26 stsp got_repo_close(repo);
4201 d00136be 2019-03-26 stsp if (worktree)
4202 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4203 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4204 1dd54920 2019-05-11 stsp free((char *)pe->path);
4205 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4206 2ec1f75b 2019-03-26 stsp free(cwd);
4207 2ec1f75b 2019-03-26 stsp return error;
4210 2ec1f75b 2019-03-26 stsp __dead static void
4211 648e4ef7 2019-07-09 stsp usage_remove(void)
4213 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4214 f2a9dc41 2019-12-13 tracey getprogname());
4218 2a06fe5f 2019-08-24 stsp static const struct got_error *
4219 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4220 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4222 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4224 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4225 2a06fe5f 2019-08-24 stsp return NULL;
4226 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4227 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4228 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4229 2a06fe5f 2019-08-24 stsp return NULL;
4232 2ec1f75b 2019-03-26 stsp static const struct got_error *
4233 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4235 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4236 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4237 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4238 17ed4618 2019-06-02 stsp char *cwd = NULL;
4239 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4240 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4241 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4243 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4245 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4246 2ec1f75b 2019-03-26 stsp switch (ch) {
4248 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4250 70e3e7f5 2019-12-13 tracey case 'k':
4251 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4253 f2a9dc41 2019-12-13 tracey case 'R':
4254 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4257 f2a9dc41 2019-12-13 tracey usage_remove();
4258 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4262 2ec1f75b 2019-03-26 stsp argc -= optind;
4263 2ec1f75b 2019-03-26 stsp argv += optind;
4265 43012d58 2019-07-14 stsp #ifndef PROFILE
4266 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4267 43012d58 2019-07-14 stsp NULL) == -1)
4268 43012d58 2019-07-14 stsp err(1, "pledge");
4270 17ed4618 2019-06-02 stsp if (argc < 1)
4271 648e4ef7 2019-07-09 stsp usage_remove();
4273 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4274 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4275 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4276 2ec1f75b 2019-03-26 stsp goto done;
4278 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4279 2ec1f75b 2019-03-26 stsp if (error)
4280 2ec1f75b 2019-03-26 stsp goto done;
4282 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4285 2ec1f75b 2019-03-26 stsp goto done;
4287 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4288 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4289 2ec1f75b 2019-03-26 stsp if (error)
4290 2ec1f75b 2019-03-26 stsp goto done;
4292 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4293 6d022e97 2019-08-04 stsp if (error)
4294 6d022e97 2019-08-04 stsp goto done;
4296 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4297 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4298 f2a9dc41 2019-12-13 tracey struct stat sb;
4299 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4300 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4301 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4302 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4303 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4304 f2a9dc41 2019-12-13 tracey goto done;
4306 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4307 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4308 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4309 f2a9dc41 2019-12-13 tracey continue;
4311 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4312 f2a9dc41 2019-12-13 tracey ondisk_path);
4313 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4314 f2a9dc41 2019-12-13 tracey goto done;
4316 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4317 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4318 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4319 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4320 f2a9dc41 2019-12-13 tracey goto done;
4325 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4326 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4329 a129376b 2019-03-28 stsp got_repo_close(repo);
4330 a129376b 2019-03-28 stsp if (worktree)
4331 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4332 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4333 17ed4618 2019-06-02 stsp free((char *)pe->path);
4334 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4335 a129376b 2019-03-28 stsp free(cwd);
4336 a129376b 2019-03-28 stsp return error;
4339 a129376b 2019-03-28 stsp __dead static void
4340 a129376b 2019-03-28 stsp usage_revert(void)
4342 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4343 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4347 1ee397ad 2019-07-12 stsp static const struct got_error *
4348 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4350 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
4351 fb9704af 2020-01-27 stsp return NULL;
4353 a129376b 2019-03-28 stsp while (path[0] == '/')
4355 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4356 33aa809d 2019-08-08 stsp return NULL;
4359 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4360 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4361 33aa809d 2019-08-08 stsp const char *action;
4364 33aa809d 2019-08-08 stsp static const struct got_error *
4365 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4366 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4368 33aa809d 2019-08-08 stsp char *line = NULL;
4369 33aa809d 2019-08-08 stsp size_t linesize = 0;
4370 33aa809d 2019-08-08 stsp ssize_t linelen;
4372 33aa809d 2019-08-08 stsp switch (status) {
4373 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4374 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4376 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4377 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4379 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4380 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4381 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4382 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4383 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4384 33aa809d 2019-08-08 stsp printf("%s", line);
4385 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4386 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4387 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4388 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4389 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4392 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4395 33aa809d 2019-08-08 stsp return NULL;
4398 33aa809d 2019-08-08 stsp static const struct got_error *
4399 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4400 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4402 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4403 33aa809d 2019-08-08 stsp char *line = NULL;
4404 33aa809d 2019-08-08 stsp size_t linesize = 0;
4405 33aa809d 2019-08-08 stsp ssize_t linelen;
4406 33aa809d 2019-08-08 stsp int resp = ' ';
4407 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4409 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4411 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4413 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4414 33aa809d 2019-08-08 stsp a->action);
4416 33aa809d 2019-08-08 stsp return err;
4417 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4418 33aa809d 2019-08-08 stsp if (linelen == -1) {
4419 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4420 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4421 33aa809d 2019-08-08 stsp return NULL;
4423 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4425 33aa809d 2019-08-08 stsp *nl = '\0';
4426 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4427 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4428 33aa809d 2019-08-08 stsp printf("y\n");
4429 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4430 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4431 33aa809d 2019-08-08 stsp printf("n\n");
4432 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4433 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4434 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4435 33aa809d 2019-08-08 stsp printf("q\n");
4437 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4438 33aa809d 2019-08-08 stsp free(line);
4439 33aa809d 2019-08-08 stsp return NULL;
4442 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4443 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4444 33aa809d 2019-08-08 stsp a->action);
4446 33aa809d 2019-08-08 stsp return err;
4447 33aa809d 2019-08-08 stsp resp = getchar();
4448 33aa809d 2019-08-08 stsp if (resp == '\n')
4449 33aa809d 2019-08-08 stsp resp = getchar();
4450 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4451 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4452 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4453 33aa809d 2019-08-08 stsp resp = ' ';
4455 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4456 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4457 33aa809d 2019-08-08 stsp resp = ' ';
4461 33aa809d 2019-08-08 stsp if (resp == 'y')
4462 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4463 33aa809d 2019-08-08 stsp else if (resp == 'n')
4464 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4465 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4466 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4468 1ee397ad 2019-07-12 stsp return NULL;
4472 a129376b 2019-03-28 stsp static const struct got_error *
4473 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4475 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4476 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4477 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4478 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4479 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4480 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4481 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4482 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4483 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4484 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4486 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4488 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4489 a129376b 2019-03-28 stsp switch (ch) {
4491 33aa809d 2019-08-08 stsp pflag = 1;
4494 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4497 0f6d7415 2019-08-08 stsp can_recurse = 1;
4500 a129376b 2019-03-28 stsp usage_revert();
4501 a129376b 2019-03-28 stsp /* NOTREACHED */
4505 a129376b 2019-03-28 stsp argc -= optind;
4506 a129376b 2019-03-28 stsp argv += optind;
4508 43012d58 2019-07-14 stsp #ifndef PROFILE
4509 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4510 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4511 43012d58 2019-07-14 stsp err(1, "pledge");
4513 e20a8b6f 2019-06-04 stsp if (argc < 1)
4514 a129376b 2019-03-28 stsp usage_revert();
4515 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4516 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4518 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4519 a129376b 2019-03-28 stsp if (cwd == NULL) {
4520 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4521 a129376b 2019-03-28 stsp goto done;
4523 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4524 2ec1f75b 2019-03-26 stsp if (error)
4525 2ec1f75b 2019-03-26 stsp goto done;
4527 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4529 a129376b 2019-03-28 stsp if (error != NULL)
4530 a129376b 2019-03-28 stsp goto done;
4532 33aa809d 2019-08-08 stsp if (patch_script_path) {
4533 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4534 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4535 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4536 33aa809d 2019-08-08 stsp patch_script_path);
4537 33aa809d 2019-08-08 stsp goto done;
4540 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4541 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4542 a129376b 2019-03-28 stsp if (error)
4543 a129376b 2019-03-28 stsp goto done;
4545 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4546 6d022e97 2019-08-04 stsp if (error)
4547 6d022e97 2019-08-04 stsp goto done;
4549 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4550 0f6d7415 2019-08-08 stsp char *ondisk_path;
4551 0f6d7415 2019-08-08 stsp struct stat sb;
4552 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4553 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4554 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4555 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4556 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4557 0f6d7415 2019-08-08 stsp goto done;
4559 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4560 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4561 0f6d7415 2019-08-08 stsp free(ondisk_path);
4564 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4565 0f6d7415 2019-08-08 stsp ondisk_path);
4566 0f6d7415 2019-08-08 stsp free(ondisk_path);
4567 0f6d7415 2019-08-08 stsp goto done;
4569 0f6d7415 2019-08-08 stsp free(ondisk_path);
4570 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4571 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4572 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4573 0f6d7415 2019-08-08 stsp goto done;
4578 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4579 33aa809d 2019-08-08 stsp cpa.action = "revert";
4580 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4581 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4583 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4584 33aa809d 2019-08-08 stsp error == NULL)
4585 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4587 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4588 2ec1f75b 2019-03-26 stsp if (worktree)
4589 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4590 2ec1f75b 2019-03-26 stsp free(path);
4591 d00136be 2019-03-26 stsp free(cwd);
4592 6bad629b 2019-02-04 stsp return error;
4595 c4296144 2019-05-09 stsp __dead static void
4596 c4296144 2019-05-09 stsp usage_commit(void)
4598 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4599 5c1e53bc 2019-07-28 stsp getprogname());
4603 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4604 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4605 e2ba3d07 2019-05-13 stsp const char *editor;
4606 e0870e44 2019-05-13 stsp const char *worktree_path;
4607 76d98825 2019-06-03 stsp const char *branch_name;
4608 314a6357 2019-05-13 stsp const char *repo_path;
4609 e0870e44 2019-05-13 stsp char *logmsg_path;
4613 33ad4cbe 2019-05-12 jcs static const struct got_error *
4614 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4617 76d98825 2019-06-03 stsp char *initial_content = NULL;
4618 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4619 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4620 e0870e44 2019-05-13 stsp char *template = NULL;
4621 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4623 33ad4cbe 2019-05-12 jcs size_t len;
4625 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4626 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4627 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4628 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4629 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4630 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4631 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4632 33ad4cbe 2019-05-12 jcs return NULL;
4635 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4636 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4638 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4639 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4640 76d98825 2019-06-03 stsp a->branch_name) == -1)
4641 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4643 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4645 e0870e44 2019-05-13 stsp goto done;
4647 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4649 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4650 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4651 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4652 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4653 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4657 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4659 76d98825 2019-06-03 stsp free(initial_content);
4660 e0870e44 2019-05-13 stsp free(template);
4662 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4663 3ce1b845 2019-07-15 stsp if (err == NULL) {
4664 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4665 3ce1b845 2019-07-15 stsp if (err) {
4666 3ce1b845 2019-07-15 stsp free(*logmsg);
4667 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4670 33ad4cbe 2019-05-12 jcs return err;
4673 c4296144 2019-05-09 stsp static const struct got_error *
4674 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4676 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4677 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4678 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4679 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4680 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4681 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4682 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4683 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4684 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4685 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4687 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4688 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4690 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4691 c4296144 2019-05-09 stsp switch (ch) {
4693 c4296144 2019-05-09 stsp logmsg = optarg;
4696 c4296144 2019-05-09 stsp usage_commit();
4697 c4296144 2019-05-09 stsp /* NOTREACHED */
4701 c4296144 2019-05-09 stsp argc -= optind;
4702 c4296144 2019-05-09 stsp argv += optind;
4704 43012d58 2019-07-14 stsp #ifndef PROFILE
4705 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4706 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4707 43012d58 2019-07-14 stsp err(1, "pledge");
4709 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4710 c4296144 2019-05-09 stsp if (cwd == NULL) {
4711 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4712 c4296144 2019-05-09 stsp goto done;
4714 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4715 7d5807f4 2019-07-11 stsp if (error)
4716 7d5807f4 2019-07-11 stsp goto done;
4718 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4719 c4296144 2019-05-09 stsp if (error)
4720 a698f62e 2019-07-25 stsp goto done;
4721 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4722 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4723 c4296144 2019-05-09 stsp goto done;
4726 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4727 916f288c 2019-07-30 stsp worktree);
4728 5c1e53bc 2019-07-28 stsp if (error)
4729 5c1e53bc 2019-07-28 stsp goto done;
4731 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4732 c9956ddf 2019-09-08 stsp if (error)
4733 c9956ddf 2019-09-08 stsp goto done;
4734 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4735 c9956ddf 2019-09-08 stsp gitconfig_path);
4736 c4296144 2019-05-09 stsp if (error != NULL)
4737 c4296144 2019-05-09 stsp goto done;
4739 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4740 aba9c984 2019-09-08 stsp if (error)
4741 aba9c984 2019-09-08 stsp return error;
4744 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4745 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4747 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4748 314a6357 2019-05-13 stsp error = get_editor(&editor);
4750 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4751 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4752 c4296144 2019-05-09 stsp if (error)
4753 c4296144 2019-05-09 stsp goto done;
4755 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4756 087fb88c 2019-08-04 stsp if (error)
4757 087fb88c 2019-08-04 stsp goto done;
4759 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4760 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4761 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4762 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4763 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4764 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4765 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4766 916f288c 2019-07-30 stsp goto done;
4768 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4770 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4771 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4772 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4773 e0870e44 2019-05-13 stsp if (error) {
4774 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4775 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4776 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4777 c4296144 2019-05-09 stsp goto done;
4780 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4781 c4296144 2019-05-09 stsp if (error)
4782 c4296144 2019-05-09 stsp goto done;
4783 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4785 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4786 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4787 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4788 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4789 7266f21f 2019-10-21 stsp error == NULL)
4790 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4791 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4793 c4296144 2019-05-09 stsp got_repo_close(repo);
4794 c4296144 2019-05-09 stsp if (worktree)
4795 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4796 c4296144 2019-05-09 stsp free(cwd);
4797 c4296144 2019-05-09 stsp free(id_str);
4798 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4799 e2ba3d07 2019-05-13 stsp free(editor);
4800 aba9c984 2019-09-08 stsp free(author);
4801 234035bc 2019-06-01 stsp return error;
4804 234035bc 2019-06-01 stsp __dead static void
4805 234035bc 2019-06-01 stsp usage_cherrypick(void)
4807 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4811 234035bc 2019-06-01 stsp static const struct got_error *
4812 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4814 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4815 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4816 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4817 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4818 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4819 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4820 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4821 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4822 234035bc 2019-06-01 stsp int ch, did_something = 0;
4824 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4825 234035bc 2019-06-01 stsp switch (ch) {
4827 234035bc 2019-06-01 stsp usage_cherrypick();
4828 234035bc 2019-06-01 stsp /* NOTREACHED */
4832 234035bc 2019-06-01 stsp argc -= optind;
4833 234035bc 2019-06-01 stsp argv += optind;
4835 43012d58 2019-07-14 stsp #ifndef PROFILE
4836 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4837 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4838 43012d58 2019-07-14 stsp err(1, "pledge");
4840 234035bc 2019-06-01 stsp if (argc != 1)
4841 234035bc 2019-06-01 stsp usage_cherrypick();
4843 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4844 234035bc 2019-06-01 stsp if (cwd == NULL) {
4845 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4846 234035bc 2019-06-01 stsp goto done;
4848 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4849 234035bc 2019-06-01 stsp if (error)
4850 234035bc 2019-06-01 stsp goto done;
4852 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4854 234035bc 2019-06-01 stsp if (error != NULL)
4855 234035bc 2019-06-01 stsp goto done;
4857 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4858 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4859 234035bc 2019-06-01 stsp if (error)
4860 234035bc 2019-06-01 stsp goto done;
4862 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4863 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4864 234035bc 2019-06-01 stsp if (error != NULL) {
4865 234035bc 2019-06-01 stsp struct got_reference *ref;
4866 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4867 234035bc 2019-06-01 stsp goto done;
4868 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4869 234035bc 2019-06-01 stsp if (error != NULL)
4870 234035bc 2019-06-01 stsp goto done;
4871 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4872 234035bc 2019-06-01 stsp got_ref_close(ref);
4873 234035bc 2019-06-01 stsp if (error != NULL)
4874 234035bc 2019-06-01 stsp goto done;
4876 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4877 234035bc 2019-06-01 stsp if (error)
4878 234035bc 2019-06-01 stsp goto done;
4880 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4881 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4882 234035bc 2019-06-01 stsp if (error != NULL)
4883 234035bc 2019-06-01 stsp goto done;
4885 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4886 234035bc 2019-06-01 stsp if (error) {
4887 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4888 234035bc 2019-06-01 stsp goto done;
4889 234035bc 2019-06-01 stsp error = NULL;
4891 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4892 234035bc 2019-06-01 stsp goto done;
4895 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4896 234035bc 2019-06-01 stsp if (error)
4897 234035bc 2019-06-01 stsp goto done;
4898 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4899 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4900 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4902 234035bc 2019-06-01 stsp if (error != NULL)
4903 234035bc 2019-06-01 stsp goto done;
4905 234035bc 2019-06-01 stsp if (did_something)
4906 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4908 234035bc 2019-06-01 stsp if (commit)
4909 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4910 234035bc 2019-06-01 stsp free(commit_id_str);
4911 234035bc 2019-06-01 stsp if (head_ref)
4912 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4913 234035bc 2019-06-01 stsp if (worktree)
4914 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4916 234035bc 2019-06-01 stsp got_repo_close(repo);
4917 c4296144 2019-05-09 stsp return error;
4920 5ef14e63 2019-06-02 stsp __dead static void
4921 5ef14e63 2019-06-02 stsp usage_backout(void)
4923 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4927 5ef14e63 2019-06-02 stsp static const struct got_error *
4928 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4930 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4931 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4932 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4933 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4934 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4935 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4936 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4937 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4938 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4940 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4941 5ef14e63 2019-06-02 stsp switch (ch) {
4943 5ef14e63 2019-06-02 stsp usage_backout();
4944 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4948 5ef14e63 2019-06-02 stsp argc -= optind;
4949 5ef14e63 2019-06-02 stsp argv += optind;
4951 43012d58 2019-07-14 stsp #ifndef PROFILE
4952 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4953 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4954 43012d58 2019-07-14 stsp err(1, "pledge");
4956 5ef14e63 2019-06-02 stsp if (argc != 1)
4957 5ef14e63 2019-06-02 stsp usage_backout();
4959 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4960 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4961 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4962 5ef14e63 2019-06-02 stsp goto done;
4964 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4965 5ef14e63 2019-06-02 stsp if (error)
4966 5ef14e63 2019-06-02 stsp goto done;
4968 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4970 5ef14e63 2019-06-02 stsp if (error != NULL)
4971 5ef14e63 2019-06-02 stsp goto done;
4973 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4974 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4975 5ef14e63 2019-06-02 stsp if (error)
4976 5ef14e63 2019-06-02 stsp goto done;
4978 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4979 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4980 5ef14e63 2019-06-02 stsp if (error != NULL) {
4981 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4982 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4983 5ef14e63 2019-06-02 stsp goto done;
4984 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4985 5ef14e63 2019-06-02 stsp if (error != NULL)
4986 5ef14e63 2019-06-02 stsp goto done;
4987 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
4988 5ef14e63 2019-06-02 stsp got_ref_close(ref);
4989 5ef14e63 2019-06-02 stsp if (error != NULL)
4990 5ef14e63 2019-06-02 stsp goto done;
4992 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
4993 5ef14e63 2019-06-02 stsp if (error)
4994 5ef14e63 2019-06-02 stsp goto done;
4996 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
4997 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
4998 5ef14e63 2019-06-02 stsp if (error != NULL)
4999 5ef14e63 2019-06-02 stsp goto done;
5001 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5002 5ef14e63 2019-06-02 stsp if (error)
5003 5ef14e63 2019-06-02 stsp goto done;
5005 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5006 5ef14e63 2019-06-02 stsp if (error)
5007 5ef14e63 2019-06-02 stsp goto done;
5008 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5009 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5010 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5011 5ef14e63 2019-06-02 stsp goto done;
5014 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5015 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5016 5ef14e63 2019-06-02 stsp if (error != NULL)
5017 5ef14e63 2019-06-02 stsp goto done;
5019 5ef14e63 2019-06-02 stsp if (did_something)
5020 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5022 5ef14e63 2019-06-02 stsp if (commit)
5023 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5024 5ef14e63 2019-06-02 stsp free(commit_id_str);
5025 5ef14e63 2019-06-02 stsp if (head_ref)
5026 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5027 818c7501 2019-07-11 stsp if (worktree)
5028 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5030 818c7501 2019-07-11 stsp got_repo_close(repo);
5031 818c7501 2019-07-11 stsp return error;
5034 818c7501 2019-07-11 stsp __dead static void
5035 818c7501 2019-07-11 stsp usage_rebase(void)
5037 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5038 af54c8f8 2019-07-11 stsp getprogname());
5043 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5046 0ebf8283 2019-07-24 stsp size_t len;
5048 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5049 0ebf8283 2019-07-24 stsp if (len > limit)
5050 0ebf8283 2019-07-24 stsp len = limit;
5051 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5052 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5054 0ebf8283 2019-07-24 stsp *nl = '\0';
5057 0ebf8283 2019-07-24 stsp static const struct got_error *
5058 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5060 5943eee2 2019-08-13 stsp const struct got_error *err;
5061 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5062 5943eee2 2019-08-13 stsp const char *s;
5064 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5066 5943eee2 2019-08-13 stsp return err;
5068 5943eee2 2019-08-13 stsp s = logmsg0;
5069 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5072 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5073 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5074 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5075 5943eee2 2019-08-13 stsp goto done;
5078 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5080 5943eee2 2019-08-13 stsp free(logmsg0);
5081 5943eee2 2019-08-13 stsp return err;
5084 818c7501 2019-07-11 stsp static const struct got_error *
5085 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5086 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5088 818c7501 2019-07-11 stsp const struct got_error *err;
5089 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5091 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5093 818c7501 2019-07-11 stsp goto done;
5095 ff0d2220 2019-07-11 stsp if (new_id) {
5096 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5098 ff0d2220 2019-07-11 stsp goto done;
5101 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5102 ff0d2220 2019-07-11 stsp if (new_id_str)
5103 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5105 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5107 0ebf8283 2019-07-24 stsp goto done;
5109 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5110 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5112 818c7501 2019-07-11 stsp free(old_id_str);
5113 818c7501 2019-07-11 stsp free(new_id_str);
5114 818c7501 2019-07-11 stsp return err;
5117 1ee397ad 2019-07-12 stsp static const struct got_error *
5118 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5120 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5122 818c7501 2019-07-11 stsp while (path[0] == '/')
5124 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5126 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5127 1ee397ad 2019-07-12 stsp return NULL;
5128 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5129 818c7501 2019-07-11 stsp *rebase_status = status;
5130 1ee397ad 2019-07-12 stsp return NULL;
5133 818c7501 2019-07-11 stsp static const struct got_error *
5134 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5135 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5136 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5138 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5139 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5140 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5143 818c7501 2019-07-11 stsp static const struct got_error *
5144 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5145 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5146 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5147 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5149 ff0d2220 2019-07-11 stsp const struct got_error *error;
5150 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5151 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5153 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5154 ff0d2220 2019-07-11 stsp if (error)
5155 ff0d2220 2019-07-11 stsp return error;
5157 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5158 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5159 ff0d2220 2019-07-11 stsp if (error) {
5160 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5161 ff0d2220 2019-07-11 stsp goto done;
5162 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5164 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5165 ff0d2220 2019-07-11 stsp free(new_commit_id);
5168 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5169 ff0d2220 2019-07-11 stsp return error;
5172 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5173 64c6d990 2019-07-11 stsp const char *path_prefix;
5174 64c6d990 2019-07-11 stsp size_t len;
5175 8ca9bd68 2019-07-25 stsp int errcode;
5178 64c6d990 2019-07-11 stsp static const struct got_error *
5179 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5180 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5181 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5182 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5184 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5186 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5187 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5188 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5190 64c6d990 2019-07-11 stsp return NULL;
5193 64c6d990 2019-07-11 stsp static const struct got_error *
5194 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5195 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5196 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5198 64c6d990 2019-07-11 stsp const struct got_error *err;
5199 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5200 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5201 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5203 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5204 64c6d990 2019-07-11 stsp return NULL;
5206 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5208 64c6d990 2019-07-11 stsp goto done;
5210 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5212 64c6d990 2019-07-11 stsp goto done;
5214 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5215 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5217 64c6d990 2019-07-11 stsp goto done;
5219 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5220 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5222 64c6d990 2019-07-11 stsp goto done;
5224 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5225 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5226 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5227 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5228 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5229 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5230 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5232 64c6d990 2019-07-11 stsp if (tree1)
5233 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5234 64c6d990 2019-07-11 stsp if (tree2)
5235 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5236 64c6d990 2019-07-11 stsp if (commit)
5237 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5238 64c6d990 2019-07-11 stsp if (parent_commit)
5239 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5240 64c6d990 2019-07-11 stsp return err;
5243 ff0d2220 2019-07-11 stsp static const struct got_error *
5244 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5245 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5246 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5247 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5248 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5250 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5251 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5252 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5253 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5254 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5256 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5258 af61c510 2019-07-19 stsp return err;
5260 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5261 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5263 af61c510 2019-07-19 stsp goto done;
5264 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5265 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5266 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5267 af61c510 2019-07-19 stsp if (err) {
5268 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5269 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5270 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5271 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5272 af61c510 2019-07-19 stsp "been reached?!?");
5274 ee780d5c 2020-01-04 stsp goto done;
5276 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5277 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5279 af61c510 2019-07-19 stsp goto done;
5281 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5283 af61c510 2019-07-19 stsp goto done;
5284 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5285 af61c510 2019-07-19 stsp commit_id = parent_id;
5289 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5290 af61c510 2019-07-19 stsp return err;
5293 af61c510 2019-07-19 stsp static const struct got_error *
5294 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5296 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5297 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5298 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5299 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5300 818c7501 2019-07-11 stsp char *cwd = NULL;
5301 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5302 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5303 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5304 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5305 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5306 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5307 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5308 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5309 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5310 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5311 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5312 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5314 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5315 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5317 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5318 818c7501 2019-07-11 stsp switch (ch) {
5320 818c7501 2019-07-11 stsp abort_rebase = 1;
5323 818c7501 2019-07-11 stsp continue_rebase = 1;
5326 818c7501 2019-07-11 stsp usage_rebase();
5327 818c7501 2019-07-11 stsp /* NOTREACHED */
5331 818c7501 2019-07-11 stsp argc -= optind;
5332 818c7501 2019-07-11 stsp argv += optind;
5334 43012d58 2019-07-14 stsp #ifndef PROFILE
5335 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5336 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5337 43012d58 2019-07-14 stsp err(1, "pledge");
5339 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5340 818c7501 2019-07-11 stsp usage_rebase();
5341 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5342 818c7501 2019-07-11 stsp if (argc != 0)
5343 818c7501 2019-07-11 stsp usage_rebase();
5344 818c7501 2019-07-11 stsp } else if (argc != 1)
5345 818c7501 2019-07-11 stsp usage_rebase();
5347 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5348 818c7501 2019-07-11 stsp if (cwd == NULL) {
5349 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5350 818c7501 2019-07-11 stsp goto done;
5352 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5353 818c7501 2019-07-11 stsp if (error)
5354 818c7501 2019-07-11 stsp goto done;
5356 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5358 818c7501 2019-07-11 stsp if (error != NULL)
5359 818c7501 2019-07-11 stsp goto done;
5361 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5362 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5363 818c7501 2019-07-11 stsp if (error)
5364 818c7501 2019-07-11 stsp goto done;
5366 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5367 818c7501 2019-07-11 stsp if (error)
5368 818c7501 2019-07-11 stsp goto done;
5370 f6794adc 2019-07-23 stsp if (abort_rebase) {
5371 818c7501 2019-07-11 stsp int did_something;
5372 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5373 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5374 f6794adc 2019-07-23 stsp goto done;
5376 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5377 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5378 3e3a69f1 2019-07-25 stsp worktree, repo);
5379 818c7501 2019-07-11 stsp if (error)
5380 818c7501 2019-07-11 stsp goto done;
5381 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5382 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5383 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5384 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5385 818c7501 2019-07-11 stsp if (error)
5386 818c7501 2019-07-11 stsp goto done;
5387 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5388 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5391 818c7501 2019-07-11 stsp if (continue_rebase) {
5392 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5393 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5394 f6794adc 2019-07-23 stsp goto done;
5396 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5397 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5398 3e3a69f1 2019-07-25 stsp worktree, repo);
5399 818c7501 2019-07-11 stsp if (error)
5400 818c7501 2019-07-11 stsp goto done;
5402 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5403 01757395 2019-07-12 stsp resume_commit_id, repo);
5404 818c7501 2019-07-11 stsp if (error)
5405 818c7501 2019-07-11 stsp goto done;
5407 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5408 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5409 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5410 818c7501 2019-07-11 stsp goto done;
5413 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5414 818c7501 2019-07-11 stsp if (error != NULL)
5415 818c7501 2019-07-11 stsp goto done;
5418 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5419 ff0d2220 2019-07-11 stsp if (error)
5420 ff0d2220 2019-07-11 stsp goto done;
5422 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5423 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5425 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5426 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5427 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5428 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5429 818c7501 2019-07-11 stsp if (error)
5430 818c7501 2019-07-11 stsp goto done;
5431 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5432 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5433 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5434 818c7501 2019-07-11 stsp "with work tree's branch");
5435 818c7501 2019-07-11 stsp goto done;
5438 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5439 a51a74b3 2019-07-27 stsp if (error) {
5440 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5441 a51a74b3 2019-07-27 stsp goto done;
5442 a51a74b3 2019-07-27 stsp error = NULL;
5444 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5445 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5446 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5447 a51a74b3 2019-07-27 stsp goto done;
5449 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5450 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5451 818c7501 2019-07-11 stsp if (error)
5452 818c7501 2019-07-11 stsp goto done;
5455 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5456 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5457 818c7501 2019-07-11 stsp if (error)
5458 818c7501 2019-07-11 stsp goto done;
5460 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5461 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5462 fc66b545 2019-08-12 stsp if (pid == NULL) {
5463 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5464 fc66b545 2019-08-12 stsp int did_something;
5465 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5466 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5467 fc66b545 2019-08-12 stsp &did_something);
5468 fc66b545 2019-08-12 stsp if (error)
5469 fc66b545 2019-08-12 stsp goto done;
5470 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5471 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5473 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5474 fc66b545 2019-08-12 stsp goto done;
5476 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5477 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5478 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5479 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5480 818c7501 2019-07-11 stsp commit = NULL;
5481 818c7501 2019-07-11 stsp if (error)
5482 818c7501 2019-07-11 stsp goto done;
5484 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5485 38b0338b 2019-11-29 stsp if (continue_rebase) {
5486 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5487 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5488 38b0338b 2019-11-29 stsp goto done;
5490 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5491 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5492 38b0338b 2019-11-29 stsp char *id_str;
5493 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5494 38b0338b 2019-11-29 stsp new_base_branch);
5495 38b0338b 2019-11-29 stsp if (error)
5496 38b0338b 2019-11-29 stsp goto done;
5497 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5498 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5499 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5500 38b0338b 2019-11-29 stsp free(id_str);
5501 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5502 38b0338b 2019-11-29 stsp new_head_commit_id);
5503 38b0338b 2019-11-29 stsp if (error)
5504 38b0338b 2019-11-29 stsp goto done;
5508 818c7501 2019-07-11 stsp pid = NULL;
5509 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5510 818c7501 2019-07-11 stsp commit_id = qid->id;
5511 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5512 818c7501 2019-07-11 stsp pid = qid;
5514 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5515 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5516 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5517 818c7501 2019-07-11 stsp if (error)
5518 818c7501 2019-07-11 stsp goto done;
5520 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5521 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5525 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5526 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5527 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5528 818c7501 2019-07-11 stsp if (error)
5529 818c7501 2019-07-11 stsp goto done;
5532 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5533 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5534 818c7501 2019-07-11 stsp if (error)
5535 818c7501 2019-07-11 stsp goto done;
5536 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5537 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5539 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5540 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5542 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5543 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5544 818c7501 2019-07-11 stsp free(resume_commit_id);
5545 818c7501 2019-07-11 stsp free(yca_id);
5546 818c7501 2019-07-11 stsp if (commit)
5547 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5548 818c7501 2019-07-11 stsp if (branch)
5549 818c7501 2019-07-11 stsp got_ref_close(branch);
5550 818c7501 2019-07-11 stsp if (new_base_branch)
5551 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5552 818c7501 2019-07-11 stsp if (tmp_branch)
5553 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5554 5ef14e63 2019-06-02 stsp if (worktree)
5555 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5557 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5558 5ef14e63 2019-06-02 stsp return error;
5561 0ebf8283 2019-07-24 stsp __dead static void
5562 0ebf8283 2019-07-24 stsp usage_histedit(void)
5564 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5565 0ebf8283 2019-07-24 stsp getprogname());
5569 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5570 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5571 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5572 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5573 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5575 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5576 0ebf8283 2019-07-24 stsp unsigned char code;
5577 0ebf8283 2019-07-24 stsp const char *name;
5578 0ebf8283 2019-07-24 stsp const char *desc;
5579 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5580 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5581 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5582 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
5583 82997472 2020-01-29 stsp "be used" },
5584 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5585 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5586 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5589 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5590 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5591 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5592 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5593 0ebf8283 2019-07-24 stsp char *logmsg;
5595 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5597 0ebf8283 2019-07-24 stsp static const struct got_error *
5598 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5599 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5601 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5602 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5603 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5606 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5608 0ebf8283 2019-07-24 stsp goto done;
5610 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5612 0ebf8283 2019-07-24 stsp goto done;
5614 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5616 0ebf8283 2019-07-24 stsp goto done;
5618 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5619 0ebf8283 2019-07-24 stsp if (n < 0)
5620 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5622 0ebf8283 2019-07-24 stsp if (commit)
5623 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5624 0ebf8283 2019-07-24 stsp free(id_str);
5625 0ebf8283 2019-07-24 stsp free(logmsg);
5626 0ebf8283 2019-07-24 stsp return err;
5629 0ebf8283 2019-07-24 stsp static const struct got_error *
5630 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5631 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5633 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5634 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5636 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5637 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5639 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5640 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5646 0ebf8283 2019-07-24 stsp return err;
5649 0ebf8283 2019-07-24 stsp static const struct got_error *
5650 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
5651 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
5653 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5655 514f2ffe 2020-01-29 stsp char *id_str;
5656 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
5658 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
5659 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
5661 514f2ffe 2020-01-29 stsp return err;
5663 514f2ffe 2020-01-29 stsp n = fprintf(f,
5664 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
5665 514f2ffe 2020-01-29 stsp "# commit %s\n"
5666 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
5667 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
5668 514f2ffe 2020-01-29 stsp if (n < 0) {
5669 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
5670 514f2ffe 2020-01-29 stsp goto done;
5673 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5674 514f2ffe 2020-01-29 stsp if (n < 0) {
5675 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
5676 514f2ffe 2020-01-29 stsp goto done;
5679 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5680 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5681 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5682 0ebf8283 2019-07-24 stsp cmd->desc);
5683 0ebf8283 2019-07-24 stsp if (n < 0) {
5684 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5689 514f2ffe 2020-01-29 stsp free(id_str);
5690 0ebf8283 2019-07-24 stsp return err;
5693 0ebf8283 2019-07-24 stsp static const struct got_error *
5694 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5696 0ebf8283 2019-07-24 stsp static char msg[42];
5699 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5701 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5702 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5704 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5707 0ebf8283 2019-07-24 stsp static const struct got_error *
5708 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5709 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5711 0ebf8283 2019-07-24 stsp const struct got_error *err;
5712 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5713 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5715 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5717 0ebf8283 2019-07-24 stsp return err;
5719 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5721 0ebf8283 2019-07-24 stsp goto done;
5723 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5725 5943eee2 2019-08-13 stsp goto done;
5726 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5727 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5728 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5729 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5732 0ebf8283 2019-07-24 stsp if (folded_commit)
5733 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5734 0ebf8283 2019-07-24 stsp free(id_str);
5735 5943eee2 2019-08-13 stsp free(folded_logmsg);
5736 0ebf8283 2019-07-24 stsp return err;
5739 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5740 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5742 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5744 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5745 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5746 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5747 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5748 3f9de99f 2019-07-24 stsp folded = prev;
5749 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5752 0ebf8283 2019-07-24 stsp return folded;
5755 0ebf8283 2019-07-24 stsp static const struct got_error *
5756 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5757 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5759 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5760 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5761 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5762 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5764 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5766 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5768 0ebf8283 2019-07-24 stsp return err;
5770 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5771 0ebf8283 2019-07-24 stsp if (folded) {
5772 0ebf8283 2019-07-24 stsp while (folded != hle) {
5773 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5774 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5777 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5778 0ebf8283 2019-07-24 stsp logmsg, repo);
5780 0ebf8283 2019-07-24 stsp goto done;
5781 0ebf8283 2019-07-24 stsp free(logmsg);
5782 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5783 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5787 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5789 0ebf8283 2019-07-24 stsp goto done;
5790 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5792 5943eee2 2019-08-13 stsp goto done;
5793 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5794 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5795 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5796 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5797 0ebf8283 2019-07-24 stsp goto done;
5799 0ebf8283 2019-07-24 stsp free(logmsg);
5800 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5802 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5804 0ebf8283 2019-07-24 stsp goto done;
5806 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
5807 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
5809 0ebf8283 2019-07-24 stsp goto done;
5811 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5812 0ebf8283 2019-07-24 stsp close(fd);
5814 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5816 0ebf8283 2019-07-24 stsp goto done;
5818 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5819 0ebf8283 2019-07-24 stsp if (err) {
5820 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5821 0ebf8283 2019-07-24 stsp goto done;
5822 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5825 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5826 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5827 0ebf8283 2019-07-24 stsp free(logmsg_path);
5828 0ebf8283 2019-07-24 stsp free(logmsg);
5829 5943eee2 2019-08-13 stsp free(orig_logmsg);
5830 0ebf8283 2019-07-24 stsp free(editor);
5831 0ebf8283 2019-07-24 stsp if (commit)
5832 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5833 0ebf8283 2019-07-24 stsp return err;
5836 0ebf8283 2019-07-24 stsp static const struct got_error *
5837 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5838 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5840 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5841 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5842 0ebf8283 2019-07-24 stsp size_t size;
5843 0ebf8283 2019-07-24 stsp ssize_t len;
5844 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5845 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5846 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5847 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5849 0ebf8283 2019-07-24 stsp for (;;) {
5850 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5851 0ebf8283 2019-07-24 stsp if (len == -1) {
5852 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5853 0ebf8283 2019-07-24 stsp if (feof(f))
5855 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5856 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5861 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5863 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5864 0ebf8283 2019-07-24 stsp free(line);
5865 0ebf8283 2019-07-24 stsp line = NULL;
5868 0ebf8283 2019-07-24 stsp cmd = NULL;
5869 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5870 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5871 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5872 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5873 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5876 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5881 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5882 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5885 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5887 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5888 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5889 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5892 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5893 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5897 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5898 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5899 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5903 0ebf8283 2019-07-24 stsp free(line);
5904 0ebf8283 2019-07-24 stsp line = NULL;
5908 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5910 0ebf8283 2019-07-24 stsp *end = '\0';
5912 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5913 0ebf8283 2019-07-24 stsp if (err) {
5914 0ebf8283 2019-07-24 stsp /* override error code */
5915 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5919 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5920 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5921 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5924 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5925 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5926 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5927 0ebf8283 2019-07-24 stsp commit_id = NULL;
5928 0ebf8283 2019-07-24 stsp free(line);
5929 0ebf8283 2019-07-24 stsp line = NULL;
5930 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5933 0ebf8283 2019-07-24 stsp free(line);
5934 0ebf8283 2019-07-24 stsp free(commit_id);
5935 0ebf8283 2019-07-24 stsp return err;
5938 0ebf8283 2019-07-24 stsp static const struct got_error *
5939 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5940 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5942 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5943 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5944 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5945 bfce7f83 2019-07-27 stsp static char msg[80];
5946 bfce7f83 2019-07-27 stsp char *id_str;
5948 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5949 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5950 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5951 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5952 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5954 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5955 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5956 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5959 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5960 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5962 bfce7f83 2019-07-27 stsp return err;
5963 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5964 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5965 bfce7f83 2019-07-27 stsp free(id_str);
5966 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5970 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5971 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5972 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5973 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5975 bfce7f83 2019-07-27 stsp return NULL;
5978 bfce7f83 2019-07-27 stsp static const struct got_error *
5979 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5980 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5981 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5983 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5984 0ebf8283 2019-07-24 stsp char *editor;
5985 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5987 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5989 0ebf8283 2019-07-24 stsp return err;
5991 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5992 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5993 0ebf8283 2019-07-24 stsp goto done;
5996 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5997 0ebf8283 2019-07-24 stsp if (f == NULL) {
5998 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5999 0ebf8283 2019-07-24 stsp goto done;
6001 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6003 bfce7f83 2019-07-27 stsp goto done;
6005 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6007 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6008 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6009 0ebf8283 2019-07-24 stsp free(editor);
6010 0ebf8283 2019-07-24 stsp return err;
6013 0ebf8283 2019-07-24 stsp static const struct got_error *
6014 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6015 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
6016 514f2ffe 2020-01-29 stsp struct got_repository *);
6018 0ebf8283 2019-07-24 stsp static const struct got_error *
6019 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6020 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
6021 514f2ffe 2020-01-29 stsp struct got_repository *repo)
6023 0ebf8283 2019-07-24 stsp const struct got_error *err;
6024 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6025 0ebf8283 2019-07-24 stsp char *path = NULL;
6027 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6029 0ebf8283 2019-07-24 stsp return err;
6031 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
6033 0ebf8283 2019-07-24 stsp goto done;
6035 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6037 0ebf8283 2019-07-24 stsp goto done;
6039 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6040 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6041 0ebf8283 2019-07-24 stsp goto done;
6045 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6046 0ebf8283 2019-07-24 stsp if (err) {
6047 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6048 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6049 0ebf8283 2019-07-24 stsp goto done;
6050 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6051 514f2ffe 2020-01-29 stsp commits, path, branch_name, repo);
6054 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6055 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6056 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6057 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6058 0ebf8283 2019-07-24 stsp free(path);
6059 0ebf8283 2019-07-24 stsp return err;
6062 0ebf8283 2019-07-24 stsp static const struct got_error *
6063 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6064 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6066 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6067 0ebf8283 2019-07-24 stsp char *path = NULL;
6068 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6069 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6070 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6072 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6074 0ebf8283 2019-07-24 stsp return err;
6076 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6077 0ebf8283 2019-07-24 stsp if (f == NULL) {
6078 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6079 0ebf8283 2019-07-24 stsp goto done;
6081 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6082 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6087 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6088 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6089 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6090 0ebf8283 2019-07-24 stsp if (n < 0) {
6091 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6097 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6098 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6099 0ebf8283 2019-07-24 stsp free(path);
6100 0ebf8283 2019-07-24 stsp if (commit)
6101 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6102 0ebf8283 2019-07-24 stsp return err;
6106 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6108 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6110 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6111 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6112 bfce7f83 2019-07-27 stsp free(hle);
6116 0ebf8283 2019-07-24 stsp static const struct got_error *
6117 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6118 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6120 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6121 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6123 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6124 0ebf8283 2019-07-24 stsp if (f == NULL) {
6125 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6126 0ebf8283 2019-07-24 stsp goto done;
6129 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6131 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6132 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6133 0ebf8283 2019-07-24 stsp return err;
6136 0ebf8283 2019-07-24 stsp static const struct got_error *
6137 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6138 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6139 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
6141 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6142 0ebf8283 2019-07-24 stsp int resp = ' ';
6144 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6145 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6146 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6147 0ebf8283 2019-07-24 stsp resp = getchar();
6148 a61a4414 2019-08-07 stsp if (resp == '\n')
6149 a61a4414 2019-08-07 stsp resp = getchar();
6150 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6151 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6152 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6154 426ebf2e 2019-07-25 stsp if (err) {
6155 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6156 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6158 bfce7f83 2019-07-27 stsp prev_err = err;
6159 426ebf2e 2019-07-25 stsp resp = ' ';
6163 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6164 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6165 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6166 514f2ffe 2020-01-29 stsp commits, branch_name, repo);
6167 426ebf2e 2019-07-25 stsp if (err) {
6168 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6169 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6171 bfce7f83 2019-07-27 stsp prev_err = err;
6172 426ebf2e 2019-07-25 stsp resp = ' ';
6176 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6177 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6180 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6183 0ebf8283 2019-07-24 stsp return err;
6186 0ebf8283 2019-07-24 stsp static const struct got_error *
6187 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6188 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6189 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6191 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6192 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6193 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6194 3e3a69f1 2019-07-25 stsp branch, repo);
6197 0ebf8283 2019-07-24 stsp static const struct got_error *
6198 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6199 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6201 0ebf8283 2019-07-24 stsp const struct got_error *err;
6202 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6204 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6206 0ebf8283 2019-07-24 stsp goto done;
6208 0ebf8283 2019-07-24 stsp if (new_id) {
6209 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6211 0ebf8283 2019-07-24 stsp goto done;
6214 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6215 0ebf8283 2019-07-24 stsp if (new_id_str)
6216 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6218 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6219 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6220 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6221 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6222 0ebf8283 2019-07-24 stsp goto done;
6224 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6226 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6228 0ebf8283 2019-07-24 stsp goto done;
6231 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6232 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6233 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6234 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6235 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6237 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6238 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6239 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6246 0ebf8283 2019-07-24 stsp free(old_id_str);
6247 0ebf8283 2019-07-24 stsp free(new_id_str);
6248 0ebf8283 2019-07-24 stsp return err;
6251 0ebf8283 2019-07-24 stsp static const struct got_error *
6252 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6253 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6254 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6255 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6257 0ebf8283 2019-07-24 stsp const struct got_error *err;
6258 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6259 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6261 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6262 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6263 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6265 0ebf8283 2019-07-24 stsp return err;
6268 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6270 0ebf8283 2019-07-24 stsp return err;
6272 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6273 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6274 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6275 0ebf8283 2019-07-24 stsp if (err) {
6276 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6277 0ebf8283 2019-07-24 stsp goto done;
6278 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6280 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6281 0ebf8283 2019-07-24 stsp free(new_commit_id);
6284 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6285 0ebf8283 2019-07-24 stsp return err;
6288 0ebf8283 2019-07-24 stsp static const struct got_error *
6289 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6290 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6292 0ebf8283 2019-07-24 stsp const struct got_error *error;
6293 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6295 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6297 0ebf8283 2019-07-24 stsp if (error)
6298 0ebf8283 2019-07-24 stsp return error;
6300 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6301 0ebf8283 2019-07-24 stsp if (error)
6302 0ebf8283 2019-07-24 stsp return error;
6304 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6305 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6306 0ebf8283 2019-07-24 stsp return error;
6309 ab20a43a 2020-01-29 stsp static const struct got_error *
6310 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
6311 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
6312 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6313 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6315 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
6317 ab20a43a 2020-01-29 stsp switch (status) {
6318 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6319 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6320 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6321 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
6322 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6323 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6328 ab20a43a 2020-01-29 stsp switch (staged_status) {
6329 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6330 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6331 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6332 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6333 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6338 ab20a43a 2020-01-29 stsp return NULL;
6341 0ebf8283 2019-07-24 stsp static const struct got_error *
6342 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6344 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6345 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6346 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6347 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6348 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6349 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6350 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6351 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6352 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6353 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6354 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6355 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6356 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6357 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6358 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6359 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6360 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6361 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6362 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6363 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6364 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6366 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6367 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6368 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6370 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6371 0ebf8283 2019-07-24 stsp switch (ch) {
6373 0ebf8283 2019-07-24 stsp abort_edit = 1;
6376 0ebf8283 2019-07-24 stsp continue_edit = 1;
6379 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6382 0ebf8283 2019-07-24 stsp usage_histedit();
6383 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6387 0ebf8283 2019-07-24 stsp argc -= optind;
6388 0ebf8283 2019-07-24 stsp argv += optind;
6390 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6391 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6392 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6393 0ebf8283 2019-07-24 stsp err(1, "pledge");
6395 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6396 0ebf8283 2019-07-24 stsp usage_histedit();
6397 0ebf8283 2019-07-24 stsp if (argc != 0)
6398 0ebf8283 2019-07-24 stsp usage_histedit();
6401 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6402 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6403 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6404 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6405 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6406 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6409 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6410 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6411 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6412 0ebf8283 2019-07-24 stsp goto done;
6414 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6415 0ebf8283 2019-07-24 stsp if (error)
6416 0ebf8283 2019-07-24 stsp goto done;
6418 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6420 0ebf8283 2019-07-24 stsp if (error != NULL)
6421 0ebf8283 2019-07-24 stsp goto done;
6423 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6424 0ebf8283 2019-07-24 stsp if (error)
6425 0ebf8283 2019-07-24 stsp goto done;
6426 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6427 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6428 0ebf8283 2019-07-24 stsp goto done;
6431 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6432 0ebf8283 2019-07-24 stsp if (error)
6433 0ebf8283 2019-07-24 stsp goto done;
6435 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6436 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6437 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6438 3e3a69f1 2019-07-25 stsp worktree, repo);
6439 0ebf8283 2019-07-24 stsp if (error)
6440 0ebf8283 2019-07-24 stsp goto done;
6441 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6442 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6443 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6444 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6445 0ebf8283 2019-07-24 stsp if (error)
6446 0ebf8283 2019-07-24 stsp goto done;
6447 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6448 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6449 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6450 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6451 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6452 0ebf8283 2019-07-24 stsp goto done;
6455 0ebf8283 2019-07-24 stsp if (continue_edit) {
6456 0ebf8283 2019-07-24 stsp char *path;
6458 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6459 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6460 0ebf8283 2019-07-24 stsp goto done;
6463 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6464 0ebf8283 2019-07-24 stsp if (error)
6465 0ebf8283 2019-07-24 stsp goto done;
6467 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6468 0ebf8283 2019-07-24 stsp free(path);
6469 0ebf8283 2019-07-24 stsp if (error)
6470 0ebf8283 2019-07-24 stsp goto done;
6472 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6473 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6474 3e3a69f1 2019-07-25 stsp worktree, repo);
6475 0ebf8283 2019-07-24 stsp if (error)
6476 0ebf8283 2019-07-24 stsp goto done;
6478 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6479 0ebf8283 2019-07-24 stsp if (error)
6480 0ebf8283 2019-07-24 stsp goto done;
6482 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6483 0ebf8283 2019-07-24 stsp head_commit_id);
6484 0ebf8283 2019-07-24 stsp if (error)
6485 0ebf8283 2019-07-24 stsp goto done;
6486 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6487 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6488 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6489 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6490 3aac7cf7 2019-07-25 stsp goto done;
6492 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6493 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6494 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6495 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6496 0ebf8283 2019-07-24 stsp commit = NULL;
6497 0ebf8283 2019-07-24 stsp if (error)
6498 0ebf8283 2019-07-24 stsp goto done;
6500 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6501 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6502 0ebf8283 2019-07-24 stsp goto done;
6505 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6506 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6507 0ebf8283 2019-07-24 stsp if (error != NULL)
6508 0ebf8283 2019-07-24 stsp goto done;
6510 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6511 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6512 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6513 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6514 c7d20a3f 2019-07-30 stsp goto done;
6517 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6518 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6519 bfce7f83 2019-07-27 stsp branch = NULL;
6520 0ebf8283 2019-07-24 stsp if (error)
6521 0ebf8283 2019-07-24 stsp goto done;
6523 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6524 0ebf8283 2019-07-24 stsp head_commit_id);
6525 0ebf8283 2019-07-24 stsp if (error)
6526 0ebf8283 2019-07-24 stsp goto done;
6527 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6528 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6529 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6530 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6531 3aac7cf7 2019-07-25 stsp goto done;
6533 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6534 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6535 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6536 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6537 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6538 0ebf8283 2019-07-24 stsp commit = NULL;
6539 0ebf8283 2019-07-24 stsp if (error)
6540 0ebf8283 2019-07-24 stsp goto done;
6542 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
6543 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6544 c5996fff 2020-01-29 stsp goto done;
6547 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6548 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6549 bfce7f83 2019-07-27 stsp if (error)
6550 bfce7f83 2019-07-27 stsp goto done;
6552 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6553 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6554 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6555 6ba2bea2 2019-07-27 stsp if (error) {
6556 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6557 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6558 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6559 0ebf8283 2019-07-24 stsp goto done;
6562 514f2ffe 2020-01-29 stsp const char *branch_name;
6563 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
6564 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
6565 514f2ffe 2020-01-29 stsp branch_name += 11;
6566 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6567 514f2ffe 2020-01-29 stsp branch_name, repo);
6568 6ba2bea2 2019-07-27 stsp if (error) {
6569 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6570 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6571 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6572 0ebf8283 2019-07-24 stsp goto done;
6577 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6579 6ba2bea2 2019-07-27 stsp if (error) {
6580 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6581 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6582 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6583 0ebf8283 2019-07-24 stsp goto done;
6588 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6589 4ec14e60 2019-08-28 hiltjo if (error)
6590 0ebf8283 2019-07-24 stsp goto done;
6592 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6593 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6594 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6595 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6598 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6599 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6600 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6601 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6603 ab20a43a 2020-01-29 stsp if (error)
6604 ab20a43a 2020-01-29 stsp goto done;
6606 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
6607 ab20a43a 2020-01-29 stsp int have_changes = 0;
6609 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
6610 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
6611 ab20a43a 2020-01-29 stsp if (error)
6612 ab20a43a 2020-01-29 stsp goto done;
6613 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
6614 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
6615 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
6616 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
6617 ab20a43a 2020-01-29 stsp if (error) {
6618 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
6619 ab20a43a 2020-01-29 stsp goto done;
6620 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
6621 ab20a43a 2020-01-29 stsp goto done;
6623 ab20a43a 2020-01-29 stsp if (have_changes) {
6624 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
6625 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
6626 ab20a43a 2020-01-29 stsp if (error)
6627 ab20a43a 2020-01-29 stsp goto done;
6629 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
6630 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
6631 ab20a43a 2020-01-29 stsp if (error)
6632 ab20a43a 2020-01-29 stsp goto done;
6633 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
6634 ab20a43a 2020-01-29 stsp hle, NULL);
6635 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
6636 ab20a43a 2020-01-29 stsp commit = NULL;
6637 ab20a43a 2020-01-29 stsp if (error)
6638 ab20a43a 2020-01-29 stsp goto done;
6644 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6645 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6646 0ebf8283 2019-07-24 stsp if (error)
6647 0ebf8283 2019-07-24 stsp goto done;
6651 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6652 0ebf8283 2019-07-24 stsp hle->commit_id);
6653 0ebf8283 2019-07-24 stsp if (error)
6654 0ebf8283 2019-07-24 stsp goto done;
6655 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6656 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6658 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6659 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6660 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6661 0ebf8283 2019-07-24 stsp if (error)
6662 0ebf8283 2019-07-24 stsp goto done;
6663 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6664 0ebf8283 2019-07-24 stsp commit = NULL;
6666 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6667 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6671 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6672 0ebf8283 2019-07-24 stsp char *id_str;
6673 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6674 0ebf8283 2019-07-24 stsp if (error)
6675 0ebf8283 2019-07-24 stsp goto done;
6676 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6678 0ebf8283 2019-07-24 stsp free(id_str);
6679 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6680 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6681 3e3a69f1 2019-07-25 stsp fileindex);
6682 0ebf8283 2019-07-24 stsp goto done;
6685 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6686 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6687 0ebf8283 2019-07-24 stsp if (error)
6688 0ebf8283 2019-07-24 stsp goto done;
6692 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6693 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6694 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6695 0ebf8283 2019-07-24 stsp if (error)
6696 0ebf8283 2019-07-24 stsp goto done;
6699 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6700 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6701 0ebf8283 2019-07-24 stsp if (error)
6702 0ebf8283 2019-07-24 stsp goto done;
6703 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6704 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6706 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6707 3e3a69f1 2019-07-25 stsp branch, repo);
6709 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6710 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6711 0ebf8283 2019-07-24 stsp free(head_commit_id);
6712 0ebf8283 2019-07-24 stsp free(base_commit_id);
6713 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6714 0ebf8283 2019-07-24 stsp if (commit)
6715 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6716 0ebf8283 2019-07-24 stsp if (branch)
6717 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6718 0ebf8283 2019-07-24 stsp if (tmp_branch)
6719 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6720 0ebf8283 2019-07-24 stsp if (worktree)
6721 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6723 2822a352 2019-10-15 stsp got_repo_close(repo);
6724 2822a352 2019-10-15 stsp return error;
6727 2822a352 2019-10-15 stsp __dead static void
6728 2822a352 2019-10-15 stsp usage_integrate(void)
6730 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6734 2822a352 2019-10-15 stsp static const struct got_error *
6735 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6737 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6738 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6739 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6740 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6741 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6742 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6743 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6744 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6745 2822a352 2019-10-15 stsp int ch, did_something = 0;
6747 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6748 2822a352 2019-10-15 stsp switch (ch) {
6750 2822a352 2019-10-15 stsp usage_integrate();
6751 2822a352 2019-10-15 stsp /* NOTREACHED */
6755 2822a352 2019-10-15 stsp argc -= optind;
6756 2822a352 2019-10-15 stsp argv += optind;
6758 2822a352 2019-10-15 stsp if (argc != 1)
6759 2822a352 2019-10-15 stsp usage_integrate();
6760 2822a352 2019-10-15 stsp branch_arg = argv[0];
6762 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6763 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6764 2822a352 2019-10-15 stsp err(1, "pledge");
6766 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6767 2822a352 2019-10-15 stsp if (cwd == NULL) {
6768 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6769 2822a352 2019-10-15 stsp goto done;
6772 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6773 2822a352 2019-10-15 stsp if (error)
6774 2822a352 2019-10-15 stsp goto done;
6776 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6777 2822a352 2019-10-15 stsp if (error)
6778 2822a352 2019-10-15 stsp goto done;
6780 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6782 2822a352 2019-10-15 stsp if (error != NULL)
6783 2822a352 2019-10-15 stsp goto done;
6785 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6786 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6787 2822a352 2019-10-15 stsp if (error)
6788 2822a352 2019-10-15 stsp goto done;
6790 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6791 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6792 2822a352 2019-10-15 stsp goto done;
6795 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6796 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6797 2822a352 2019-10-15 stsp if (error)
6798 2822a352 2019-10-15 stsp goto done;
6800 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6801 2822a352 2019-10-15 stsp if (refname == NULL) {
6802 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6803 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6804 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6805 2822a352 2019-10-15 stsp goto done;
6807 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6808 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6809 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6810 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6811 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6812 2822a352 2019-10-15 stsp goto done;
6815 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6816 2822a352 2019-10-15 stsp if (error)
6817 2822a352 2019-10-15 stsp goto done;
6819 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6820 2822a352 2019-10-15 stsp if (error)
6821 2822a352 2019-10-15 stsp goto done;
6823 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6824 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6825 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6826 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6827 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6828 2822a352 2019-10-15 stsp goto done;
6831 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6832 2822a352 2019-10-15 stsp if (error) {
6833 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6834 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6835 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6836 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6837 2822a352 2019-10-15 stsp goto done;
6840 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6841 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6842 2822a352 2019-10-15 stsp check_cancelled, NULL);
6843 2822a352 2019-10-15 stsp if (error)
6844 2822a352 2019-10-15 stsp goto done;
6846 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6849 715dc77e 2019-08-03 stsp got_repo_close(repo);
6850 2822a352 2019-10-15 stsp if (worktree)
6851 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6852 2822a352 2019-10-15 stsp free(cwd);
6853 2822a352 2019-10-15 stsp free(base_commit_id);
6854 2822a352 2019-10-15 stsp free(commit_id);
6855 2822a352 2019-10-15 stsp free(refname);
6856 2822a352 2019-10-15 stsp free(base_refname);
6857 715dc77e 2019-08-03 stsp return error;
6860 715dc77e 2019-08-03 stsp __dead static void
6861 715dc77e 2019-08-03 stsp usage_stage(void)
6863 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6864 f3055044 2019-08-07 stsp "[file-path ...]\n",
6865 715dc77e 2019-08-03 stsp getprogname());
6869 715dc77e 2019-08-03 stsp static const struct got_error *
6870 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6871 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6872 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6873 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6875 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6876 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6878 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6879 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6880 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6881 408b4ebc 2019-08-03 stsp return NULL;
6883 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6884 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6885 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6887 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6889 408b4ebc 2019-08-03 stsp return err;
6891 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6892 408b4ebc 2019-08-03 stsp free(id_str);
6893 dc424a06 2019-08-07 stsp return NULL;
6896 dc424a06 2019-08-07 stsp static const struct got_error *
6897 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6899 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6900 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6901 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6902 715dc77e 2019-08-03 stsp char *cwd = NULL;
6903 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6904 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6905 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6906 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6907 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6908 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6910 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6912 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6913 715dc77e 2019-08-03 stsp switch (ch) {
6915 408b4ebc 2019-08-03 stsp list_stage = 1;
6918 dc424a06 2019-08-07 stsp pflag = 1;
6921 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6924 715dc77e 2019-08-03 stsp usage_stage();
6925 715dc77e 2019-08-03 stsp /* NOTREACHED */
6929 715dc77e 2019-08-03 stsp argc -= optind;
6930 715dc77e 2019-08-03 stsp argv += optind;
6932 715dc77e 2019-08-03 stsp #ifndef PROFILE
6933 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6934 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6935 715dc77e 2019-08-03 stsp err(1, "pledge");
6937 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6938 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6939 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6940 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6942 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6943 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6944 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6945 715dc77e 2019-08-03 stsp goto done;
6948 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6949 715dc77e 2019-08-03 stsp if (error)
6950 715dc77e 2019-08-03 stsp goto done;
6952 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6954 715dc77e 2019-08-03 stsp if (error != NULL)
6955 715dc77e 2019-08-03 stsp goto done;
6957 dc424a06 2019-08-07 stsp if (patch_script_path) {
6958 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6959 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6960 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6961 dc424a06 2019-08-07 stsp patch_script_path);
6962 dc424a06 2019-08-07 stsp goto done;
6965 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6966 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6967 715dc77e 2019-08-03 stsp if (error)
6968 715dc77e 2019-08-03 stsp goto done;
6970 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6971 6d022e97 2019-08-04 stsp if (error)
6972 6d022e97 2019-08-04 stsp goto done;
6974 6d022e97 2019-08-04 stsp if (list_stage)
6975 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6976 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6978 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6979 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6980 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6981 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6982 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6985 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6986 2e1f37b0 2019-08-08 stsp error == NULL)
6987 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6989 ad493afc 2019-08-03 stsp got_repo_close(repo);
6990 ad493afc 2019-08-03 stsp if (worktree)
6991 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6992 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6993 ad493afc 2019-08-03 stsp free((char *)pe->path);
6994 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6995 ad493afc 2019-08-03 stsp free(cwd);
6996 ad493afc 2019-08-03 stsp return error;
6999 ad493afc 2019-08-03 stsp __dead static void
7000 ad493afc 2019-08-03 stsp usage_unstage(void)
7002 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7003 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7004 ad493afc 2019-08-03 stsp getprogname());
7009 ad493afc 2019-08-03 stsp static const struct got_error *
7010 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7012 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7013 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7014 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7015 ad493afc 2019-08-03 stsp char *cwd = NULL;
7016 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7017 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7018 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7019 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7020 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7021 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7023 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7025 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7026 ad493afc 2019-08-03 stsp switch (ch) {
7028 2e1f37b0 2019-08-08 stsp pflag = 1;
7031 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7034 ad493afc 2019-08-03 stsp usage_unstage();
7035 ad493afc 2019-08-03 stsp /* NOTREACHED */
7039 ad493afc 2019-08-03 stsp argc -= optind;
7040 ad493afc 2019-08-03 stsp argv += optind;
7042 ad493afc 2019-08-03 stsp #ifndef PROFILE
7043 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7044 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7045 ad493afc 2019-08-03 stsp err(1, "pledge");
7047 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7048 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7050 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7051 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7052 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7053 ad493afc 2019-08-03 stsp goto done;
7056 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7057 ad493afc 2019-08-03 stsp if (error)
7058 ad493afc 2019-08-03 stsp goto done;
7060 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7062 ad493afc 2019-08-03 stsp if (error != NULL)
7063 ad493afc 2019-08-03 stsp goto done;
7065 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7066 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7067 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7068 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7069 2e1f37b0 2019-08-08 stsp patch_script_path);
7070 2e1f37b0 2019-08-08 stsp goto done;
7074 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7075 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7076 ad493afc 2019-08-03 stsp if (error)
7077 ad493afc 2019-08-03 stsp goto done;
7079 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7080 ad493afc 2019-08-03 stsp if (error)
7081 ad493afc 2019-08-03 stsp goto done;
7083 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7084 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7085 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7086 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7088 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7089 2e1f37b0 2019-08-08 stsp error == NULL)
7090 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7092 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7093 715dc77e 2019-08-03 stsp if (worktree)
7094 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7095 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7096 715dc77e 2019-08-03 stsp free((char *)pe->path);
7097 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7098 715dc77e 2019-08-03 stsp free(cwd);
7099 01073a5d 2019-08-22 stsp return error;
7102 01073a5d 2019-08-22 stsp __dead static void
7103 01073a5d 2019-08-22 stsp usage_cat(void)
7105 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7106 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7110 01073a5d 2019-08-22 stsp static const struct got_error *
7111 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7113 01073a5d 2019-08-22 stsp const struct got_error *err;
7114 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7116 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7118 01073a5d 2019-08-22 stsp return err;
7120 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7121 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7122 01073a5d 2019-08-22 stsp return err;
7125 01073a5d 2019-08-22 stsp static const struct got_error *
7126 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7128 01073a5d 2019-08-22 stsp const struct got_error *err;
7129 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7130 56e0773d 2019-11-28 stsp int nentries, i;
7132 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7134 01073a5d 2019-08-22 stsp return err;
7136 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7137 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7138 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7139 01073a5d 2019-08-22 stsp char *id_str;
7140 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7142 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7143 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7146 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7147 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7148 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7149 01073a5d 2019-08-22 stsp free(id_str);
7152 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7153 01073a5d 2019-08-22 stsp return err;
7156 01073a5d 2019-08-22 stsp static const struct got_error *
7157 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7159 01073a5d 2019-08-22 stsp const struct got_error *err;
7160 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7161 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7162 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7163 01073a5d 2019-08-22 stsp char *id_str = NULL;
7164 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7166 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7168 01073a5d 2019-08-22 stsp return err;
7170 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7172 01073a5d 2019-08-22 stsp goto done;
7174 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7175 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7176 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7177 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7178 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7179 01073a5d 2019-08-22 stsp char *pid_str;
7180 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7182 01073a5d 2019-08-22 stsp goto done;
7183 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7184 01073a5d 2019-08-22 stsp free(pid_str);
7186 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7187 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7188 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7190 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7191 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7192 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7194 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7195 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7196 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7198 01073a5d 2019-08-22 stsp free(id_str);
7199 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7200 01073a5d 2019-08-22 stsp return err;
7203 01073a5d 2019-08-22 stsp static const struct got_error *
7204 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7206 01073a5d 2019-08-22 stsp const struct got_error *err;
7207 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7208 01073a5d 2019-08-22 stsp char *id_str = NULL;
7209 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7211 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7213 01073a5d 2019-08-22 stsp return err;
7215 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7217 01073a5d 2019-08-22 stsp goto done;
7219 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7221 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7222 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7223 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7224 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7226 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7227 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7228 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7230 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7231 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7232 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7234 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7235 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7236 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7242 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7243 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7245 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7246 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7247 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7249 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7250 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7251 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7253 01073a5d 2019-08-22 stsp free(id_str);
7254 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7255 01073a5d 2019-08-22 stsp return err;
7258 01073a5d 2019-08-22 stsp static const struct got_error *
7259 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7261 01073a5d 2019-08-22 stsp const struct got_error *error;
7262 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7263 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7264 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7265 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7266 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7267 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7269 01073a5d 2019-08-22 stsp #ifndef PROFILE
7270 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7271 01073a5d 2019-08-22 stsp NULL) == -1)
7272 01073a5d 2019-08-22 stsp err(1, "pledge");
7275 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7276 01073a5d 2019-08-22 stsp switch (ch) {
7278 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7281 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7282 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7283 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7285 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7288 896e9b6f 2019-08-26 stsp force_path = 1;
7291 01073a5d 2019-08-22 stsp usage_cat();
7292 01073a5d 2019-08-22 stsp /* NOTREACHED */
7296 01073a5d 2019-08-22 stsp argc -= optind;
7297 01073a5d 2019-08-22 stsp argv += optind;
7299 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7300 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7301 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7302 01073a5d 2019-08-22 stsp goto done;
7304 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7305 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7306 01073a5d 2019-08-22 stsp goto done;
7307 01073a5d 2019-08-22 stsp if (worktree) {
7308 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7309 01073a5d 2019-08-22 stsp repo_path = strdup(
7310 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7311 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7312 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7313 01073a5d 2019-08-22 stsp goto done;
7318 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7319 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7320 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7321 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7324 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7325 01073a5d 2019-08-22 stsp free(repo_path);
7326 01073a5d 2019-08-22 stsp if (error != NULL)
7327 01073a5d 2019-08-22 stsp goto done;
7329 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7330 896e9b6f 2019-08-26 stsp if (error)
7331 896e9b6f 2019-08-26 stsp goto done;
7333 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7334 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7335 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
7336 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7337 01073a5d 2019-08-22 stsp if (error)
7338 01073a5d 2019-08-22 stsp goto done;
7340 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7341 896e9b6f 2019-08-26 stsp if (force_path) {
7342 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7344 896e9b6f 2019-08-26 stsp if (error)
7347 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
7348 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7349 896e9b6f 2019-08-26 stsp if (error) {
7350 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7351 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7353 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7354 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7355 896e9b6f 2019-08-26 stsp if (error)
7360 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7361 01073a5d 2019-08-22 stsp if (error)
7364 01073a5d 2019-08-22 stsp switch (obj_type) {
7365 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7366 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7368 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7369 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7371 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7372 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7374 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7375 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7378 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7381 01073a5d 2019-08-22 stsp if (error)
7383 01073a5d 2019-08-22 stsp free(label);
7384 01073a5d 2019-08-22 stsp label = NULL;
7386 01073a5d 2019-08-22 stsp id = NULL;
7389 01073a5d 2019-08-22 stsp free(label);
7391 896e9b6f 2019-08-26 stsp free(commit_id);
7392 01073a5d 2019-08-22 stsp if (worktree)
7393 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7394 01073a5d 2019-08-22 stsp if (repo) {
7395 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7396 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7397 01073a5d 2019-08-22 stsp if (error == NULL)
7398 01073a5d 2019-08-22 stsp error = repo_error;
7400 0ebf8283 2019-07-24 stsp return error;
