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 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
301 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
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);
361 2c7829a4 2019-06-17 stsp if (error != NULL)
365 3ce1b845 2019-07-15 stsp free(repo_path);
366 3ce1b845 2019-07-15 stsp return error;
369 3ce1b845 2019-07-15 stsp __dead static void
370 3ce1b845 2019-07-15 stsp usage_import(void)
372 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
373 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
378 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
381 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
382 3ce1b845 2019-07-15 stsp int st = -1;
384 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
385 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
386 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
388 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
390 3ce1b845 2019-07-15 stsp goto doneediting;
392 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
393 3ce1b845 2019-07-15 stsp _exit(127);
396 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
397 3ce1b845 2019-07-15 stsp if (errno != EINTR)
400 3ce1b845 2019-07-15 stsp doneediting:
401 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
402 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
403 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
405 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
406 3ce1b845 2019-07-15 stsp errno = EINTR;
410 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
413 3ce1b845 2019-07-15 stsp static const struct got_error *
414 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
415 3ce1b845 2019-07-15 stsp const char *initial_content)
417 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
418 3ce1b845 2019-07-15 stsp char buf[1024];
419 3ce1b845 2019-07-15 stsp struct stat st, st2;
421 3ce1b845 2019-07-15 stsp int content_changed = 0;
422 3ce1b845 2019-07-15 stsp size_t len;
424 3ce1b845 2019-07-15 stsp *logmsg = NULL;
426 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
427 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
429 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
430 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
432 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
433 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
435 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
436 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
437 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
439 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
440 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
441 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
442 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
445 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
446 3ce1b845 2019-07-15 stsp if (fp == NULL) {
447 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
450 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
451 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
452 3ce1b845 2019-07-15 stsp content_changed = 1;
453 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
454 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
455 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
457 3ce1b845 2019-07-15 stsp fclose(fp);
459 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
460 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
464 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
465 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
466 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
469 3ce1b845 2019-07-15 stsp free(*logmsg);
470 3ce1b845 2019-07-15 stsp *logmsg = NULL;
472 3ce1b845 2019-07-15 stsp return err;
475 3ce1b845 2019-07-15 stsp static const struct got_error *
476 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
477 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
479 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
480 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
483 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
484 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
485 3ce1b845 2019-07-15 stsp branch_name) == -1)
486 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
488 ef293bdd 2019-10-21 stsp err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
492 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
495 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
497 3ce1b845 2019-07-15 stsp free(initial_content);
498 3ce1b845 2019-07-15 stsp return err;
501 3ce1b845 2019-07-15 stsp static const struct got_error *
502 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
504 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
505 3ce1b845 2019-07-15 stsp return NULL;
508 3ce1b845 2019-07-15 stsp static const struct got_error *
509 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
511 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
512 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
514 84792843 2019-08-09 stsp *author = NULL;
516 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
517 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
518 c9956ddf 2019-09-08 stsp if (name && email) {
519 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
520 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
521 aba9c984 2019-09-08 stsp return NULL;
524 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
525 84792843 2019-08-09 stsp if (got_author == NULL) {
526 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
527 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
528 c9956ddf 2019-09-08 stsp if (name && email) {
529 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
530 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
531 c9956ddf 2019-09-08 stsp return NULL;
533 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
534 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
537 aba9c984 2019-09-08 stsp *author = strdup(got_author);
538 aba9c984 2019-09-08 stsp if (*author == NULL)
539 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
542 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
543 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
545 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
546 84792843 2019-08-09 stsp got_author++;
547 aba9c984 2019-09-08 stsp if (*got_author != '<') {
548 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
551 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
552 84792843 2019-08-09 stsp got_author++;
553 aba9c984 2019-09-08 stsp if (*got_author != '@') {
554 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
557 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
558 84792843 2019-08-09 stsp got_author++;
559 84792843 2019-08-09 stsp if (*got_author != '>')
560 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
563 aba9c984 2019-09-08 stsp free(*author);
564 aba9c984 2019-09-08 stsp *author = NULL;
566 aba9c984 2019-09-08 stsp return err;
569 c9956ddf 2019-09-08 stsp static const struct got_error *
570 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
572 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
574 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
575 c9956ddf 2019-09-08 stsp if (homedir) {
576 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
577 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
580 c9956ddf 2019-09-08 stsp return NULL;
583 84792843 2019-08-09 stsp static const struct got_error *
584 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
586 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
587 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
588 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
589 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
590 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
591 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
592 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
593 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
595 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
596 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
597 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
599 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
601 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
602 3ce1b845 2019-07-15 stsp switch (ch) {
604 3ce1b845 2019-07-15 stsp branch_name = optarg;
607 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
608 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
609 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
614 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
615 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
616 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
622 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
624 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
630 b2b65d18 2019-08-22 stsp usage_import();
631 3ce1b845 2019-07-15 stsp /* NOTREACHED */
635 3ce1b845 2019-07-15 stsp argc -= optind;
636 3ce1b845 2019-07-15 stsp argv += optind;
638 3ce1b845 2019-07-15 stsp #ifndef PROFILE
639 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
641 3ce1b845 2019-07-15 stsp NULL) == -1)
642 3ce1b845 2019-07-15 stsp err(1, "pledge");
644 3ce1b845 2019-07-15 stsp if (argc != 1)
645 3ce1b845 2019-07-15 stsp usage_import();
647 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
648 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
649 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
650 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
652 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
653 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
656 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
660 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
662 aba9c984 2019-09-08 stsp return error;
665 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
666 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
667 e560b7e0 2019-11-28 stsp * an unintended typo.
669 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
670 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
672 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
673 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
677 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
678 3ce1b845 2019-07-15 stsp if (error) {
679 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
682 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
683 3ce1b845 2019-07-15 stsp "import target branch already exists");
687 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
688 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
689 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
692 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
695 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
696 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
698 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
699 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
702 8e158b01 2019-09-22 stsp free(logmsg);
703 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
704 ef293bdd 2019-10-21 stsp path_dir, refname);
705 ef293bdd 2019-10-21 stsp if (error) {
706 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
707 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
708 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
713 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
714 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
715 ef293bdd 2019-10-21 stsp if (logmsg_path)
716 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
720 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
721 ef293bdd 2019-10-21 stsp if (error) {
722 ef293bdd 2019-10-21 stsp if (logmsg_path)
723 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
727 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
728 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
729 ef293bdd 2019-10-21 stsp if (error) {
730 ef293bdd 2019-10-21 stsp if (logmsg_path)
731 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
735 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
736 ef293bdd 2019-10-21 stsp if (error) {
737 ef293bdd 2019-10-21 stsp if (logmsg_path)
738 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
742 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
743 ef293bdd 2019-10-21 stsp if (error) {
744 ef293bdd 2019-10-21 stsp if (logmsg_path)
745 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
749 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
750 ef293bdd 2019-10-21 stsp if (error) {
751 ef293bdd 2019-10-21 stsp if (logmsg_path)
752 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
756 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
757 3ce1b845 2019-07-15 stsp if (error) {
758 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
759 ef293bdd 2019-10-21 stsp if (logmsg_path)
760 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
764 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
765 3ce1b845 2019-07-15 stsp branch_ref);
766 ef293bdd 2019-10-21 stsp if (error) {
767 ef293bdd 2019-10-21 stsp if (logmsg_path)
768 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
772 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
773 ef293bdd 2019-10-21 stsp if (error) {
774 ef293bdd 2019-10-21 stsp if (logmsg_path)
775 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
780 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
781 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
783 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
784 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
785 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
786 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
787 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
788 8e158b01 2019-09-22 stsp free(logmsg);
789 ef293bdd 2019-10-21 stsp free(logmsg_path);
790 2c7829a4 2019-06-17 stsp free(repo_path);
791 3ce1b845 2019-07-15 stsp free(editor);
792 3ce1b845 2019-07-15 stsp free(refname);
793 3ce1b845 2019-07-15 stsp free(new_commit_id);
794 3ce1b845 2019-07-15 stsp free(id_str);
795 aba9c984 2019-09-08 stsp free(author);
796 c9956ddf 2019-09-08 stsp free(gitconfig_path);
797 3ce1b845 2019-07-15 stsp if (branch_ref)
798 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
799 3ce1b845 2019-07-15 stsp if (head_ref)
800 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
801 2c7829a4 2019-06-17 stsp return error;
804 4ed7e80c 2018-05-20 stsp __dead static void
805 c09a553d 2018-03-12 stsp usage_checkout(void)
807 bb51a5b4 2020-01-13 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
808 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
812 7f47418f 2019-12-20 stsp static void
813 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning(void)
815 7f47418f 2019-12-20 stsp fprintf(stderr, "%s: warning: could not create a reference "
816 7f47418f 2019-12-20 stsp "to the work tree's base commit; the commit could be "
817 7f47418f 2019-12-20 stsp "garbage-collected by Git; making the repository "
818 7f47418f 2019-12-20 stsp "writable and running 'got update' will prevent this\n",
819 7f47418f 2019-12-20 stsp getprogname());
822 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg {
823 7f47418f 2019-12-20 stsp const char *worktree_path;
824 7f47418f 2019-12-20 stsp int had_base_commit_ref_error;
827 1ee397ad 2019-07-12 stsp static const struct got_error *
828 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
830 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg *a = arg;
832 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
833 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
834 7f47418f 2019-12-20 stsp return NULL;
836 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
837 7f47418f 2019-12-20 stsp a->had_base_commit_ref_error = 1;
838 1ee397ad 2019-07-12 stsp return NULL;
841 92a684f4 2018-03-12 stsp while (path[0] == '/')
844 7f47418f 2019-12-20 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
845 1ee397ad 2019-07-12 stsp return NULL;
848 99437157 2018-11-11 stsp static const struct got_error *
849 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
851 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
852 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
853 99437157 2018-11-11 stsp return NULL;
856 8069f636 2019-01-12 stsp static const struct got_error *
857 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
858 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
859 3aef623b 2019-10-15 stsp struct got_repository *repo)
861 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
862 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
864 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
865 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
867 36a38700 2019-05-10 stsp return err;
869 d5bea539 2019-05-13 stsp if (yca_id == NULL)
870 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
873 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
874 d5bea539 2019-05-13 stsp * and the work tree's base commit.
876 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
878 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
886 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
887 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
888 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
890 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
891 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
892 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
893 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
894 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
895 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
897 d5bea539 2019-05-13 stsp free(yca_id);
898 d5bea539 2019-05-13 stsp return NULL;
901 a367ff0f 2019-05-14 stsp static const struct got_error *
902 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
903 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
904 a51a74b3 2019-07-27 stsp struct got_repository *repo)
906 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
907 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
908 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
909 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
911 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
915 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
916 a51a74b3 2019-07-27 stsp is_same_branch = 1;
919 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
920 a51a74b3 2019-07-27 stsp is_same_branch = 1;
924 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
928 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
929 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
934 a367ff0f 2019-05-14 stsp struct got_object_id *id;
935 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
936 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
938 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
939 a367ff0f 2019-05-14 stsp err = NULL;
944 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
946 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
947 a367ff0f 2019-05-14 stsp is_same_branch = 1;
954 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
955 a367ff0f 2019-05-14 stsp free(head_commit_id);
956 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
957 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
958 04f57cb3 2019-07-25 stsp return err;
961 04f57cb3 2019-07-25 stsp static const struct got_error *
962 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
963 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
965 04f57cb3 2019-07-25 stsp const struct got_error *err;
966 04f57cb3 2019-07-25 stsp struct got_reference *ref;
967 303e2782 2019-08-09 stsp struct got_tag_object *tag;
969 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
970 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
971 303e2782 2019-08-09 stsp if (err == NULL) {
972 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
973 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
974 303e2782 2019-08-09 stsp if (*commit_id == NULL)
975 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
976 303e2782 2019-08-09 stsp got_object_tag_close(tag);
977 303e2782 2019-08-09 stsp return err;
978 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
979 303e2782 2019-08-09 stsp return err;
981 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
982 04f57cb3 2019-07-25 stsp if (err == NULL) {
983 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
984 04f57cb3 2019-07-25 stsp got_ref_close(ref);
986 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
987 04f57cb3 2019-07-25 stsp return err;
988 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
989 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
991 a367ff0f 2019-05-14 stsp return err;
994 4ed7e80c 2018-05-20 stsp static const struct got_error *
995 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
997 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
998 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
999 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
1000 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
1001 c09a553d 2018-03-12 stsp char *repo_path = NULL;
1002 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
1003 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
1004 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
1005 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
1006 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
1007 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1008 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
1010 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1012 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1013 0bb8a95e 2018-03-12 stsp switch (ch) {
1015 08573d5b 2019-05-14 stsp branch_name = optarg;
1018 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
1019 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
1020 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1023 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
1026 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1029 2deda0b9 2019-03-07 stsp usage_checkout();
1030 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1034 0bb8a95e 2018-03-12 stsp argc -= optind;
1035 0bb8a95e 2018-03-12 stsp argv += optind;
1037 6715a751 2018-03-16 stsp #ifndef PROFILE
1038 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1039 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1040 c09a553d 2018-03-12 stsp err(1, "pledge");
1042 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1043 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1044 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1045 76089277 2018-04-01 stsp if (repo_path == NULL)
1046 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1047 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1048 76089277 2018-04-01 stsp if (cwd == NULL) {
1049 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1050 76089277 2018-04-01 stsp goto done;
1052 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1053 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1054 230a42bd 2019-05-11 jcs if (base == NULL) {
1055 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1056 230a42bd 2019-05-11 jcs path_prefix);
1060 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1061 230a42bd 2019-05-11 jcs if (base == NULL) {
1062 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1063 230a42bd 2019-05-11 jcs repo_path);
1067 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1068 c09a553d 2018-03-12 stsp if (dotgit)
1069 c09a553d 2018-03-12 stsp *dotgit = '\0';
1070 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1071 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1072 c09a553d 2018-03-12 stsp free(cwd);
1073 76089277 2018-04-01 stsp goto done;
1075 c09a553d 2018-03-12 stsp free(cwd);
1076 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1077 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1078 76089277 2018-04-01 stsp if (repo_path == NULL) {
1079 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1080 76089277 2018-04-01 stsp goto done;
1082 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1083 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1084 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1085 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1087 b4b3a7dd 2019-07-22 stsp goto done;
1089 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1090 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1091 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1092 b4b3a7dd 2019-07-22 stsp goto done;
1096 c09a553d 2018-03-12 stsp usage_checkout();
1098 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1099 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1101 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1102 c09a553d 2018-03-12 stsp if (error != NULL)
1103 c02c541e 2019-03-29 stsp goto done;
1105 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1106 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1107 c530dc23 2019-07-23 stsp if (error) {
1108 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1109 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1110 c530dc23 2019-07-23 stsp goto done;
1111 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1112 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
1113 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1114 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1115 c530dc23 2019-07-23 stsp goto done;
1119 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1120 c02c541e 2019-03-29 stsp if (error)
1121 c09a553d 2018-03-12 stsp goto done;
1123 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1124 c09a553d 2018-03-12 stsp if (error != NULL)
1125 c09a553d 2018-03-12 stsp goto done;
1127 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1128 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1129 c09a553d 2018-03-12 stsp goto done;
1131 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1132 c09a553d 2018-03-12 stsp if (error != NULL)
1133 c09a553d 2018-03-12 stsp goto done;
1135 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1136 e5dc7198 2018-12-29 stsp path_prefix);
1137 e5dc7198 2018-12-29 stsp if (error != NULL)
1138 e5dc7198 2018-12-29 stsp goto done;
1139 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1140 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1141 49520a32 2018-12-29 stsp goto done;
1144 8069f636 2019-01-12 stsp if (commit_id_str) {
1145 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1146 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1147 30837e32 2019-07-25 stsp if (error)
1148 8069f636 2019-01-12 stsp goto done;
1149 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1150 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1151 8069f636 2019-01-12 stsp if (error != NULL) {
1152 8069f636 2019-01-12 stsp free(commit_id);
1153 8069f636 2019-01-12 stsp goto done;
1155 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1156 45d344f6 2019-05-14 stsp if (error)
1157 45d344f6 2019-05-14 stsp goto done;
1158 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1159 8069f636 2019-01-12 stsp commit_id);
1160 8069f636 2019-01-12 stsp free(commit_id);
1161 8069f636 2019-01-12 stsp if (error)
1162 8069f636 2019-01-12 stsp goto done;
1165 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1166 f2ea84fa 2019-07-27 stsp if (error)
1167 f2ea84fa 2019-07-27 stsp goto done;
1168 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1169 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1170 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1171 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1172 c09a553d 2018-03-12 stsp if (error != NULL)
1173 c09a553d 2018-03-12 stsp goto done;
1175 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1176 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1177 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1180 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1181 8069f636 2019-01-12 stsp free(commit_id_str);
1182 76089277 2018-04-01 stsp free(repo_path);
1183 507dc3bb 2018-12-29 stsp free(worktree_path);
1184 507dc3bb 2018-12-29 stsp return error;
1187 507dc3bb 2018-12-29 stsp __dead static void
1188 507dc3bb 2018-12-29 stsp usage_update(void)
1190 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1191 507dc3bb 2018-12-29 stsp getprogname());
1195 1ee397ad 2019-07-12 stsp static const struct got_error *
1196 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1198 784955db 2019-01-12 stsp int *did_something = arg;
1200 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1201 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1202 1ee397ad 2019-07-12 stsp return NULL;
1204 1545c615 2019-02-10 stsp *did_something = 1;
1206 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1207 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1208 1ee397ad 2019-07-12 stsp return NULL;
1210 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1212 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1213 1ee397ad 2019-07-12 stsp return NULL;
1216 be7061eb 2018-12-30 stsp static const struct got_error *
1217 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1218 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1219 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1221 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1222 a1fb16d8 2019-05-24 stsp char *base_id_str;
1223 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1225 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1226 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1227 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1228 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1229 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1230 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1231 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1234 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1235 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1236 a1fb16d8 2019-05-24 stsp if (err) {
1237 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1238 a1fb16d8 2019-05-24 stsp return err;
1239 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1241 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1242 a1fb16d8 2019-05-24 stsp return NULL;
1244 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1245 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1246 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1248 a1fb16d8 2019-05-24 stsp return err;
1249 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1250 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1251 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1252 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1253 0ebf8283 2019-07-24 stsp return NULL;
1256 0ebf8283 2019-07-24 stsp static const struct got_error *
1257 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1259 0ebf8283 2019-07-24 stsp const struct got_error *err;
1260 0ebf8283 2019-07-24 stsp int in_progress;
1262 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1264 0ebf8283 2019-07-24 stsp return err;
1265 0ebf8283 2019-07-24 stsp if (in_progress)
1266 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1268 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1270 0ebf8283 2019-07-24 stsp return err;
1271 0ebf8283 2019-07-24 stsp if (in_progress)
1272 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1274 a1fb16d8 2019-05-24 stsp return NULL;
1277 a5edda0a 2019-07-27 stsp static const struct got_error *
1278 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1279 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1281 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1282 a5edda0a 2019-07-27 stsp char *path;
1285 a5edda0a 2019-07-27 stsp if (argc == 0) {
1286 a5edda0a 2019-07-27 stsp path = strdup("");
1287 a5edda0a 2019-07-27 stsp if (path == NULL)
1288 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1289 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1292 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1293 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1296 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1297 a5edda0a 2019-07-27 stsp if (err) {
1298 a5edda0a 2019-07-27 stsp free(path);
1303 a5edda0a 2019-07-27 stsp return err;
1306 a1fb16d8 2019-05-24 stsp static const struct got_error *
1307 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1309 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1310 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1311 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1312 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1313 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1314 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1315 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1316 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1317 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1318 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1319 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1321 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1323 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1324 507dc3bb 2018-12-29 stsp switch (ch) {
1326 024e9686 2019-05-14 stsp branch_name = optarg;
1329 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1330 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1331 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1334 2deda0b9 2019-03-07 stsp usage_update();
1335 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1339 507dc3bb 2018-12-29 stsp argc -= optind;
1340 507dc3bb 2018-12-29 stsp argv += optind;
1342 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1343 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1344 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1345 507dc3bb 2018-12-29 stsp err(1, "pledge");
1347 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1348 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1349 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1350 c4cdcb68 2019-04-03 stsp goto done;
1352 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1353 7d5807f4 2019-07-11 stsp if (error)
1354 7d5807f4 2019-07-11 stsp goto done;
1356 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1357 f2ea84fa 2019-07-27 stsp if (error)
1358 f2ea84fa 2019-07-27 stsp goto done;
1360 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1362 507dc3bb 2018-12-29 stsp if (error != NULL)
1363 507dc3bb 2018-12-29 stsp goto done;
1365 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1366 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1367 087fb88c 2019-08-04 stsp if (error)
1368 087fb88c 2019-08-04 stsp goto done;
1370 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1371 0266afb7 2019-01-04 stsp if (error)
1372 0266afb7 2019-01-04 stsp goto done;
1374 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1375 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1376 024e9686 2019-05-14 stsp if (error != NULL)
1377 024e9686 2019-05-14 stsp goto done;
1378 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1379 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1380 9c4b8182 2019-01-02 stsp if (error != NULL)
1381 9c4b8182 2019-01-02 stsp goto done;
1382 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1383 507dc3bb 2018-12-29 stsp if (error != NULL)
1384 507dc3bb 2018-12-29 stsp goto done;
1386 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1387 04f57cb3 2019-07-25 stsp free(commit_id_str);
1388 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1389 30837e32 2019-07-25 stsp if (error)
1390 a297e751 2019-07-11 stsp goto done;
1391 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1392 a297e751 2019-07-11 stsp if (error)
1393 507dc3bb 2018-12-29 stsp goto done;
1396 a1fb16d8 2019-05-24 stsp if (branch_name) {
1397 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1398 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1399 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1401 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1402 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1403 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1404 024e9686 2019-05-14 stsp goto done;
1406 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1407 024e9686 2019-05-14 stsp if (error)
1408 024e9686 2019-05-14 stsp goto done;
1409 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1411 a367ff0f 2019-05-14 stsp free(head_commit_id);
1412 024e9686 2019-05-14 stsp if (error != NULL)
1413 024e9686 2019-05-14 stsp goto done;
1414 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1415 a367ff0f 2019-05-14 stsp if (error)
1416 a367ff0f 2019-05-14 stsp goto done;
1417 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1418 024e9686 2019-05-14 stsp if (error)
1419 024e9686 2019-05-14 stsp goto done;
1421 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1422 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1423 a367ff0f 2019-05-14 stsp if (error != NULL) {
1424 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1425 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1426 024e9686 2019-05-14 stsp goto done;
1428 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1429 a367ff0f 2019-05-14 stsp if (error)
1430 a367ff0f 2019-05-14 stsp goto done;
1433 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1434 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1435 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1436 507dc3bb 2018-12-29 stsp commit_id);
1437 507dc3bb 2018-12-29 stsp if (error)
1438 507dc3bb 2018-12-29 stsp goto done;
1441 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1442 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1443 507dc3bb 2018-12-29 stsp if (error != NULL)
1444 507dc3bb 2018-12-29 stsp goto done;
1446 784955db 2019-01-12 stsp if (did_something)
1447 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1449 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1451 c09a553d 2018-03-12 stsp free(worktree_path);
1452 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1453 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1454 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1455 507dc3bb 2018-12-29 stsp free(commit_id);
1456 9c4b8182 2019-01-02 stsp free(commit_id_str);
1457 c09a553d 2018-03-12 stsp return error;
1460 f42b1b34 2018-03-12 stsp static const struct got_error *
1461 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1462 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1463 63035f9f 2019-10-06 stsp struct got_repository *repo)
1465 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1466 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1468 44392932 2019-08-25 stsp if (blob_id1) {
1469 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1471 44392932 2019-08-25 stsp goto done;
1474 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1476 44392932 2019-08-25 stsp goto done;
1478 44392932 2019-08-25 stsp while (path[0] == '/')
1480 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1481 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1483 44392932 2019-08-25 stsp if (blob1)
1484 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1485 44392932 2019-08-25 stsp got_object_blob_close(blob2);
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 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1491 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1492 63035f9f 2019-10-06 stsp struct got_repository *repo)
1494 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1495 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1496 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1498 44392932 2019-08-25 stsp if (tree_id1) {
1499 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1501 44392932 2019-08-25 stsp goto done;
1504 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1506 0f2b3dca 2018-12-22 stsp goto done;
1508 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1509 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1510 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1511 44392932 2019-08-25 stsp while (path[0] == '/')
1513 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1514 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1516 79109fed 2018-03-27 stsp if (tree1)
1517 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1518 366e0a5f 2019-10-10 stsp if (tree2)
1519 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1520 44392932 2019-08-25 stsp return err;
1523 44392932 2019-08-25 stsp static const struct got_error *
1524 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1525 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1527 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1528 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1529 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1530 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1531 44392932 2019-08-25 stsp struct got_object_qid *qid;
1533 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1534 44392932 2019-08-25 stsp if (qid != NULL) {
1535 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1538 44392932 2019-08-25 stsp return err;
1541 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1542 44392932 2019-08-25 stsp int obj_type;
1543 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1545 44392932 2019-08-25 stsp goto done;
1546 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1547 44392932 2019-08-25 stsp if (err) {
1548 44392932 2019-08-25 stsp free(obj_id2);
1549 44392932 2019-08-25 stsp goto done;
1551 44392932 2019-08-25 stsp if (pcommit) {
1552 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1553 44392932 2019-08-25 stsp qid->id, path);
1554 44392932 2019-08-25 stsp if (err) {
1555 44392932 2019-08-25 stsp free(obj_id2);
1556 44392932 2019-08-25 stsp goto done;
1558 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1559 44392932 2019-08-25 stsp if (err) {
1560 44392932 2019-08-25 stsp free(obj_id2);
1561 44392932 2019-08-25 stsp goto done;
1564 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1565 44392932 2019-08-25 stsp if (err) {
1566 44392932 2019-08-25 stsp free(obj_id2);
1567 44392932 2019-08-25 stsp goto done;
1569 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1570 44392932 2019-08-25 stsp switch (obj_type) {
1571 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1572 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1575 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1576 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1580 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1583 44392932 2019-08-25 stsp free(obj_id1);
1584 44392932 2019-08-25 stsp free(obj_id2);
1586 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1587 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1589 44392932 2019-08-25 stsp goto done;
1590 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1591 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1593 44392932 2019-08-25 stsp goto done;
1594 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1595 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1599 0f2b3dca 2018-12-22 stsp free(id_str1);
1600 0f2b3dca 2018-12-22 stsp free(id_str2);
1601 44392932 2019-08-25 stsp if (pcommit)
1602 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1603 79109fed 2018-03-27 stsp return err;
1606 4bb494d5 2018-06-16 stsp static char *
1607 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1609 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1610 09867e48 2019-08-13 stsp char *p, *s;
1612 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1613 09867e48 2019-08-13 stsp if (tm == NULL)
1614 09867e48 2019-08-13 stsp return NULL;
1615 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1616 09867e48 2019-08-13 stsp if (s == NULL)
1617 09867e48 2019-08-13 stsp return NULL;
1618 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1620 6c281f94 2018-06-11 stsp *p = '\0';
1624 6841bf13 2019-11-29 kn static const struct got_error *
1625 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1626 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1628 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1629 6841bf13 2019-11-29 kn regmatch_t regmatch;
1630 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1632 6841bf13 2019-11-29 kn *have_match = 0;
1634 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1638 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1642 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1643 6841bf13 2019-11-29 kn *have_match = 1;
1645 6841bf13 2019-11-29 kn free(id_str);
1646 6841bf13 2019-11-29 kn free(logmsg);
1650 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1652 79109fed 2018-03-27 stsp static const struct got_error *
1653 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1654 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1655 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1657 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1658 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1659 6c281f94 2018-06-11 stsp char datebuf[26];
1660 45d799e2 2018-12-23 stsp time_t committer_time;
1661 45d799e2 2018-12-23 stsp const char *author, *committer;
1662 199a4027 2019-02-02 stsp char *refs_str = NULL;
1663 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1665 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1667 199a4027 2019-02-02 stsp const char *name;
1668 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1671 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1672 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1674 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1675 199a4027 2019-02-02 stsp name += 5;
1676 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1678 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1679 e34f9ed6 2019-02-02 stsp name += 6;
1680 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1681 141c2bff 2019-02-04 stsp name += 8;
1682 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1683 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1684 5d844a1e 2019-08-13 stsp if (err) {
1685 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1686 5d844a1e 2019-08-13 stsp return err;
1687 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1688 5d844a1e 2019-08-13 stsp err = NULL;
1689 5d844a1e 2019-08-13 stsp tag = NULL;
1692 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1693 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1695 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1696 a436ad14 2019-08-13 stsp if (cmp != 0)
1698 199a4027 2019-02-02 stsp s = refs_str;
1699 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1700 199a4027 2019-02-02 stsp name) == -1) {
1701 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1703 34ca4898 2019-08-13 stsp return err;
1707 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1709 8bf5b3c9 2018-03-17 stsp return err;
1711 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1712 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1713 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1714 832c249c 2018-06-10 stsp free(id_str);
1715 d3d493d7 2019-02-21 stsp id_str = NULL;
1716 d3d493d7 2019-02-21 stsp free(refs_str);
1717 d3d493d7 2019-02-21 stsp refs_str = NULL;
1718 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1719 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1720 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1721 09867e48 2019-08-13 stsp if (datestr)
1722 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1723 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1724 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1725 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1726 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1727 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1728 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1729 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1730 3fe1abad 2018-06-10 stsp int n = 1;
1731 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1732 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1733 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1735 a0603db2 2018-06-10 stsp return err;
1736 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1737 a0603db2 2018-06-10 stsp free(id_str);
1741 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1743 5943eee2 2019-08-13 stsp return err;
1745 621015ac 2018-07-23 stsp logmsg = logmsg0;
1747 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1749 832c249c 2018-06-10 stsp printf(" %s\n", line);
1750 832c249c 2018-06-10 stsp } while (line);
1751 621015ac 2018-07-23 stsp free(logmsg0);
1753 971751ac 2018-03-27 stsp if (show_patch) {
1754 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1755 971751ac 2018-03-27 stsp if (err == 0)
1756 971751ac 2018-03-27 stsp printf("\n");
1759 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1760 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1761 07862c20 2018-09-15 stsp return err;
1764 f42b1b34 2018-03-12 stsp static const struct got_error *
1765 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1766 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1767 463a997a 2019-12-08 kn int diff_context, int limit, int first_parent_traversal,
1768 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1770 f42b1b34 2018-03-12 stsp const struct got_error *err;
1771 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1772 6841bf13 2019-11-29 kn regex_t regex;
1773 6841bf13 2019-11-29 kn int have_match;
1775 6841bf13 2019-11-29 kn if (search_pattern &&
1776 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1777 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1779 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, path, first_parent_traversal);
1781 f42b1b34 2018-03-12 stsp return err;
1782 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1783 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1785 fcc85cad 2018-07-22 stsp goto done;
1787 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1788 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1790 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1793 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
1794 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
1795 372ccdbb 2018-06-10 stsp if (err) {
1796 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
1797 9ba79e04 2018-06-11 stsp err = NULL;
1800 b43fbaa0 2018-06-11 stsp if (id == NULL)
1803 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1807 6841bf13 2019-11-29 kn if (search_pattern) {
1808 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
1810 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1813 6841bf13 2019-11-29 kn if (have_match == 0) {
1814 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1819 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1820 44392932 2019-08-25 stsp diff_context, refs);
1821 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1822 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1826 6841bf13 2019-11-29 kn if (search_pattern)
1827 6841bf13 2019-11-29 kn regfree(®ex);
1828 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1829 f42b1b34 2018-03-12 stsp return err;
1832 4ed7e80c 2018-05-20 stsp __dead static void
1833 6f3d1eb0 2018-03-12 stsp usage_log(void)
1835 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1836 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1840 b1ebc001 2019-08-13 stsp static int
1841 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1843 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1844 b1ebc001 2019-08-13 stsp long long n;
1845 b1ebc001 2019-08-13 stsp const char *errstr;
1847 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1848 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1850 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1851 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1856 4ed7e80c 2018-05-20 stsp static const struct got_error *
1857 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1859 f42b1b34 2018-03-12 stsp const struct got_error *error;
1860 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1861 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1862 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1863 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1864 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1865 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
1866 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
1867 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1868 64a96a6d 2018-04-01 stsp const char *errstr;
1869 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1871 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1873 6715a751 2018-03-16 stsp #ifndef PROFILE
1874 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1877 f42b1b34 2018-03-12 stsp err(1, "pledge");
1880 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1882 6841bf13 2019-11-29 kn while ((ch = getopt(argc, argv, "b:pc:C:l:fr:s:")) != -1) {
1883 79109fed 2018-03-27 stsp switch (ch) {
1885 79109fed 2018-03-27 stsp show_patch = 1;
1888 d142fc45 2018-04-01 stsp start_commit = optarg;
1891 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1893 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1894 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1897 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1898 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1899 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1902 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1905 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1906 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1907 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1909 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1912 6841bf13 2019-11-29 kn search_pattern = optarg;
1915 2deda0b9 2019-03-07 stsp usage_log();
1916 79109fed 2018-03-27 stsp /* NOTREACHED */
1920 79109fed 2018-03-27 stsp argc -= optind;
1921 79109fed 2018-03-27 stsp argv += optind;
1923 dc1edbfa 2019-11-29 kn if (diff_context == -1)
1924 dc1edbfa 2019-11-29 kn diff_context = 3;
1925 dc1edbfa 2019-11-29 kn else if (!show_patch)
1926 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
1928 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1929 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1930 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1931 04ca23f4 2018-07-16 stsp goto done;
1934 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1935 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1936 cffc0aa4 2019-02-05 stsp goto done;
1937 cffc0aa4 2019-02-05 stsp error = NULL;
1939 e7301579 2019-03-18 stsp if (argc == 0) {
1940 cbd1af7a 2019-03-18 stsp path = strdup("");
1941 e7301579 2019-03-18 stsp if (path == NULL) {
1942 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1943 cbd1af7a 2019-03-18 stsp goto done;
1945 e7301579 2019-03-18 stsp } else if (argc == 1) {
1946 e7301579 2019-03-18 stsp if (worktree) {
1947 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1949 e7301579 2019-03-18 stsp if (error)
1950 e7301579 2019-03-18 stsp goto done;
1952 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1953 e7301579 2019-03-18 stsp if (path == NULL) {
1954 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1955 e7301579 2019-03-18 stsp goto done;
1959 cbd1af7a 2019-03-18 stsp usage_log();
1961 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1962 5486daa2 2019-05-11 stsp repo_path = worktree ?
1963 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1965 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1966 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1967 cffc0aa4 2019-02-05 stsp goto done;
1970 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1971 d7d4f210 2018-03-12 stsp if (error != NULL)
1972 04ca23f4 2018-07-16 stsp goto done;
1974 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1975 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1976 c02c541e 2019-03-29 stsp if (error)
1977 c02c541e 2019-03-29 stsp goto done;
1979 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1980 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1981 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1982 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1983 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1984 3235492e 2018-04-01 stsp if (error != NULL)
1985 3235492e 2018-04-01 stsp return error;
1986 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1987 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1988 3235492e 2018-04-01 stsp if (error != NULL)
1989 3235492e 2018-04-01 stsp return error;
1990 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1992 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1993 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1994 3235492e 2018-04-01 stsp if (error == NULL) {
1995 1caad61b 2019-02-01 stsp int obj_type;
1996 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1997 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1998 d1f2edc9 2018-06-13 stsp if (error != NULL)
1999 1caad61b 2019-02-01 stsp goto done;
2000 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
2001 1caad61b 2019-02-01 stsp if (error != NULL)
2002 1caad61b 2019-02-01 stsp goto done;
2003 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
2004 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
2005 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
2006 1caad61b 2019-02-01 stsp if (error != NULL)
2007 1caad61b 2019-02-01 stsp goto done;
2008 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
2009 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
2010 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2011 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2012 1caad61b 2019-02-01 stsp goto done;
2015 1caad61b 2019-02-01 stsp id = got_object_id_dup(
2016 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
2017 1caad61b 2019-02-01 stsp if (id == NULL)
2018 638f9024 2019-05-13 stsp error = got_error_from_errno(
2019 230a42bd 2019-05-11 jcs "got_object_id_dup");
2020 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2021 1caad61b 2019-02-01 stsp if (error)
2022 1caad61b 2019-02-01 stsp goto done;
2023 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2024 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2025 1caad61b 2019-02-01 stsp goto done;
2027 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2028 d1f2edc9 2018-06-13 stsp if (error != NULL)
2029 1caad61b 2019-02-01 stsp goto done;
2031 15a94983 2018-12-23 stsp if (commit == NULL) {
2032 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2033 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2034 d1f2edc9 2018-06-13 stsp if (error != NULL)
2035 d1f2edc9 2018-06-13 stsp return error;
2038 d7d4f210 2018-03-12 stsp if (error != NULL)
2039 04ca23f4 2018-07-16 stsp goto done;
2041 deeabeae 2019-08-27 stsp if (worktree) {
2042 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2044 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2045 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2046 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2047 deeabeae 2019-08-27 stsp goto done;
2049 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2052 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2053 04ca23f4 2018-07-16 stsp if (error != NULL)
2054 04ca23f4 2018-07-16 stsp goto done;
2055 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2056 04ca23f4 2018-07-16 stsp free(path);
2057 04ca23f4 2018-07-16 stsp path = in_repo_path;
2060 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2061 199a4027 2019-02-02 stsp if (error)
2062 199a4027 2019-02-02 stsp goto done;
2064 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2065 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
2067 04ca23f4 2018-07-16 stsp free(path);
2068 04ca23f4 2018-07-16 stsp free(repo_path);
2069 04ca23f4 2018-07-16 stsp free(cwd);
2071 cffc0aa4 2019-02-05 stsp if (worktree)
2072 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2073 ad242220 2018-09-08 stsp if (repo) {
2074 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2075 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2076 ad242220 2018-09-08 stsp if (error == NULL)
2077 ad242220 2018-09-08 stsp error = repo_error;
2079 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2080 8bf5b3c9 2018-03-17 stsp return error;
2083 4ed7e80c 2018-05-20 stsp __dead static void
2084 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2086 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2087 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2091 b72f483a 2019-02-05 stsp struct print_diff_arg {
2092 b72f483a 2019-02-05 stsp struct got_repository *repo;
2093 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2094 b72f483a 2019-02-05 stsp int diff_context;
2095 3fc0c068 2019-02-10 stsp const char *id_str;
2096 3fc0c068 2019-02-10 stsp int header_shown;
2097 98eaaa12 2019-08-03 stsp int diff_staged;
2098 63035f9f 2019-10-06 stsp int ignore_whitespace;
2101 4ed7e80c 2018-05-20 stsp static const struct got_error *
2102 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2103 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2104 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2105 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2107 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2108 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2109 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2110 12463d8b 2019-12-13 stsp int fd = -1;
2111 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2112 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2113 b72f483a 2019-02-05 stsp struct stat sb;
2115 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2116 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2117 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2118 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2119 98eaaa12 2019-08-03 stsp return NULL;
2121 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2122 98eaaa12 2019-08-03 stsp return NULL;
2123 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2124 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2125 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2126 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2127 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2128 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2129 98eaaa12 2019-08-03 stsp return NULL;
2132 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2133 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2134 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2135 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2136 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2139 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2140 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2141 98eaaa12 2019-08-03 stsp switch (staged_status) {
2142 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2143 98eaaa12 2019-08-03 stsp label1 = path;
2144 98eaaa12 2019-08-03 stsp label2 = path;
2146 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2147 98eaaa12 2019-08-03 stsp label2 = path;
2149 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2150 98eaaa12 2019-08-03 stsp label1 = path;
2153 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2155 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2156 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2157 63035f9f 2019-10-06 stsp a->repo, stdout);
2160 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2161 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2162 4ce46740 2019-08-08 stsp char *id_str;
2163 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2166 4ce46740 2019-08-08 stsp goto done;
2167 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2169 4ce46740 2019-08-08 stsp goto done;
2170 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2171 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2172 4ce46740 2019-08-08 stsp free(id_str);
2173 4ce46740 2019-08-08 stsp goto done;
2175 4ce46740 2019-08-08 stsp free(id_str);
2176 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2177 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2179 4ce46740 2019-08-08 stsp goto done;
2182 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2183 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2184 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2185 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2186 2ec1f75b 2019-03-26 stsp goto done;
2189 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2190 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2191 12463d8b 2019-12-13 stsp if (fd == -1) {
2192 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2193 12463d8b 2019-12-13 stsp goto done;
2196 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2197 12463d8b 2019-12-13 stsp if (fd == -1) {
2198 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2199 12463d8b 2019-12-13 stsp goto done;
2202 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2203 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2204 2ec1f75b 2019-03-26 stsp goto done;
2206 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2207 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2208 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2209 2ec1f75b 2019-03-26 stsp goto done;
2213 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2215 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2216 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2218 b72f483a 2019-02-05 stsp if (blob1)
2219 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2220 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2221 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2222 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2223 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2224 b72f483a 2019-02-05 stsp free(abspath);
2225 927df6b7 2019-02-10 stsp return err;
2228 927df6b7 2019-02-10 stsp static const struct got_error *
2229 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2230 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2231 01073a5d 2019-08-22 stsp struct got_repository *repo)
2233 0adb7196 2019-08-11 stsp const struct got_error *err;
2234 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2235 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2237 0adb7196 2019-08-11 stsp *id = NULL;
2238 0adb7196 2019-08-11 stsp *label = NULL;
2240 01073a5d 2019-08-22 stsp if (resolve_tags) {
2241 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2243 01073a5d 2019-08-22 stsp if (err == NULL) {
2244 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2245 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2246 01073a5d 2019-08-22 stsp if (*id == NULL)
2247 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2248 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2249 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2250 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2251 32f0ab81 2019-08-28 hiltjo free(*id);
2252 01073a5d 2019-08-22 stsp *id = NULL;
2254 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2255 01073a5d 2019-08-22 stsp return err;
2256 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2257 01073a5d 2019-08-22 stsp return err;
2260 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2261 0adb7196 2019-08-11 stsp if (err) {
2262 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2263 0adb7196 2019-08-11 stsp return err;
2264 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2265 0adb7196 2019-08-11 stsp if (err != NULL)
2266 0adb7196 2019-08-11 stsp goto done;
2267 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2268 0adb7196 2019-08-11 stsp if (*label == NULL) {
2269 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2270 0adb7196 2019-08-11 stsp goto done;
2272 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2274 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2275 0adb7196 2019-08-11 stsp if (*label == NULL) {
2276 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2277 0adb7196 2019-08-11 stsp goto done;
2282 0adb7196 2019-08-11 stsp got_ref_close(ref);
2283 0adb7196 2019-08-11 stsp return err;
2287 0adb7196 2019-08-11 stsp static const struct got_error *
2288 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2290 b00d56cd 2018-04-01 stsp const struct got_error *error;
2291 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2292 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2293 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2294 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2295 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2296 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2297 15a94983 2018-12-23 stsp int type1, type2;
2298 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2299 c0cc5c62 2018-10-18 stsp const char *errstr;
2300 927df6b7 2019-02-10 stsp char *path = NULL;
2302 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2303 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2304 25eccc22 2019-01-04 stsp NULL) == -1)
2305 b00d56cd 2018-04-01 stsp err(1, "pledge");
2308 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2309 b00d56cd 2018-04-01 stsp switch (ch) {
2311 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2313 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2314 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2317 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2318 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2319 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2321 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2324 98eaaa12 2019-08-03 stsp diff_staged = 1;
2327 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2330 2deda0b9 2019-03-07 stsp usage_diff();
2331 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2335 b00d56cd 2018-04-01 stsp argc -= optind;
2336 b00d56cd 2018-04-01 stsp argv += optind;
2338 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2339 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2340 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2341 b72f483a 2019-02-05 stsp goto done;
2343 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2344 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2345 927df6b7 2019-02-10 stsp goto done;
2346 927df6b7 2019-02-10 stsp if (argc <= 1) {
2347 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2348 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2349 927df6b7 2019-02-10 stsp goto done;
2351 b72f483a 2019-02-05 stsp if (repo_path)
2353 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2354 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2355 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2356 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2357 927df6b7 2019-02-10 stsp goto done;
2359 927df6b7 2019-02-10 stsp if (argc == 1) {
2360 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2362 927df6b7 2019-02-10 stsp if (error)
2363 927df6b7 2019-02-10 stsp goto done;
2365 927df6b7 2019-02-10 stsp path = strdup("");
2366 927df6b7 2019-02-10 stsp if (path == NULL) {
2367 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2368 927df6b7 2019-02-10 stsp goto done;
2371 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2372 98eaaa12 2019-08-03 stsp if (diff_staged)
2373 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2374 98eaaa12 2019-08-03 stsp "objects in repository");
2375 15a94983 2018-12-23 stsp id_str1 = argv[0];
2376 15a94983 2018-12-23 stsp id_str2 = argv[1];
2377 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2378 30db809c 2019-06-05 stsp repo_path =
2379 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2380 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2381 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2382 30db809c 2019-06-05 stsp goto done;
2386 b00d56cd 2018-04-01 stsp usage_diff();
2388 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2389 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2390 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2391 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2394 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2395 76089277 2018-04-01 stsp free(repo_path);
2396 b00d56cd 2018-04-01 stsp if (error != NULL)
2397 b00d56cd 2018-04-01 stsp goto done;
2399 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2400 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2401 c02c541e 2019-03-29 stsp if (error)
2402 c02c541e 2019-03-29 stsp goto done;
2404 30db809c 2019-06-05 stsp if (argc <= 1) {
2405 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2406 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2407 b72f483a 2019-02-05 stsp char *id_str;
2409 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2411 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2412 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2413 b72f483a 2019-02-05 stsp if (error)
2414 b72f483a 2019-02-05 stsp goto done;
2415 b72f483a 2019-02-05 stsp arg.repo = repo;
2416 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2417 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2418 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2419 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2420 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2421 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2423 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2424 72ea6654 2019-07-27 stsp if (error)
2425 72ea6654 2019-07-27 stsp goto done;
2427 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2428 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2429 b72f483a 2019-02-05 stsp free(id_str);
2430 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2431 b72f483a 2019-02-05 stsp goto done;
2434 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2436 0adb7196 2019-08-11 stsp if (error)
2437 0adb7196 2019-08-11 stsp goto done;
2439 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2441 0adb7196 2019-08-11 stsp if (error)
2442 0adb7196 2019-08-11 stsp goto done;
2444 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2445 15a94983 2018-12-23 stsp if (error)
2446 15a94983 2018-12-23 stsp goto done;
2448 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2449 15a94983 2018-12-23 stsp if (error)
2450 15a94983 2018-12-23 stsp goto done;
2452 15a94983 2018-12-23 stsp if (type1 != type2) {
2453 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2454 b00d56cd 2018-04-01 stsp goto done;
2457 15a94983 2018-12-23 stsp switch (type1) {
2458 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2459 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2460 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2462 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2463 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2464 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2466 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2467 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2468 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2469 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2472 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2476 5e70831e 2019-05-28 stsp free(label1);
2477 5e70831e 2019-05-28 stsp free(label2);
2478 15a94983 2018-12-23 stsp free(id1);
2479 15a94983 2018-12-23 stsp free(id2);
2480 927df6b7 2019-02-10 stsp free(path);
2481 b72f483a 2019-02-05 stsp if (worktree)
2482 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2483 ad242220 2018-09-08 stsp if (repo) {
2484 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2485 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2486 ad242220 2018-09-08 stsp if (error == NULL)
2487 ad242220 2018-09-08 stsp error = repo_error;
2489 b00d56cd 2018-04-01 stsp return error;
2492 404c43c4 2018-06-21 stsp __dead static void
2493 404c43c4 2018-06-21 stsp usage_blame(void)
2495 9270e621 2019-02-05 stsp fprintf(stderr,
2496 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2497 404c43c4 2018-06-21 stsp getprogname());
2501 28315671 2019-08-14 stsp struct blame_line {
2502 28315671 2019-08-14 stsp int annotated;
2503 28315671 2019-08-14 stsp char *id_str;
2504 82f6abb8 2019-08-14 stsp char *committer;
2505 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2508 28315671 2019-08-14 stsp struct blame_cb_args {
2509 28315671 2019-08-14 stsp struct blame_line *lines;
2510 28315671 2019-08-14 stsp int nlines;
2511 7ef28ff8 2019-08-14 stsp int nlines_prec;
2512 28315671 2019-08-14 stsp int lineno_cur;
2513 28315671 2019-08-14 stsp off_t *line_offsets;
2515 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2518 404c43c4 2018-06-21 stsp static const struct got_error *
2519 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2521 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2522 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2523 28315671 2019-08-14 stsp struct blame_line *bline;
2524 82f6abb8 2019-08-14 stsp char *line = NULL;
2525 28315671 2019-08-14 stsp size_t linesize = 0;
2526 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2527 28315671 2019-08-14 stsp off_t offset;
2528 bcb49d15 2019-08-14 stsp struct tm tm;
2529 bcb49d15 2019-08-14 stsp time_t committer_time;
2531 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2532 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2533 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2535 28315671 2019-08-14 stsp if (sigint_received)
2536 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2538 2839f8b9 2019-08-18 stsp if (lineno == -1)
2539 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2541 28315671 2019-08-14 stsp /* Annotate this line. */
2542 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2543 28315671 2019-08-14 stsp if (bline->annotated)
2544 28315671 2019-08-14 stsp return NULL;
2545 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2547 28315671 2019-08-14 stsp return err;
2549 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2551 82f6abb8 2019-08-14 stsp goto done;
2553 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2554 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2555 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2556 bcb49d15 2019-08-14 stsp goto done;
2559 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2560 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2561 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2562 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2563 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2564 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2565 82f6abb8 2019-08-14 stsp goto done;
2567 28315671 2019-08-14 stsp bline->annotated = 1;
2569 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2570 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2571 28315671 2019-08-14 stsp if (!bline->annotated)
2572 82f6abb8 2019-08-14 stsp goto done;
2574 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2575 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2576 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2577 82f6abb8 2019-08-14 stsp goto done;
2580 28315671 2019-08-14 stsp while (bline->annotated) {
2581 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2582 82f6abb8 2019-08-14 stsp size_t len;
2584 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2585 28315671 2019-08-14 stsp if (ferror(a->f))
2586 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2590 82f6abb8 2019-08-14 stsp committer = bline->committer;
2591 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2592 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2593 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2594 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2596 82f6abb8 2019-08-14 stsp *at = '\0';
2597 82f6abb8 2019-08-14 stsp len = strlen(committer);
2598 82f6abb8 2019-08-14 stsp if (len >= 9)
2599 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2601 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2603 28315671 2019-08-14 stsp *nl = '\0';
2604 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2605 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2607 28315671 2019-08-14 stsp a->lineno_cur++;
2608 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2611 82f6abb8 2019-08-14 stsp if (commit)
2612 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2613 28315671 2019-08-14 stsp free(line);
2614 28315671 2019-08-14 stsp return err;
2617 28315671 2019-08-14 stsp static const struct got_error *
2618 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2620 404c43c4 2018-06-21 stsp const struct got_error *error;
2621 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2622 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2623 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2624 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2625 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2626 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2627 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2628 28315671 2019-08-14 stsp struct blame_cb_args bca;
2629 28315671 2019-08-14 stsp int ch, obj_type, i;
2630 b02560ec 2019-08-19 stsp size_t filesize;
2632 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2634 404c43c4 2018-06-21 stsp #ifndef PROFILE
2635 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2636 36e2fb66 2019-01-04 stsp NULL) == -1)
2637 404c43c4 2018-06-21 stsp err(1, "pledge");
2640 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2641 404c43c4 2018-06-21 stsp switch (ch) {
2643 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2646 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2647 66bea077 2018-08-02 stsp if (repo_path == NULL)
2648 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2650 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2653 2deda0b9 2019-03-07 stsp usage_blame();
2654 404c43c4 2018-06-21 stsp /* NOTREACHED */
2658 404c43c4 2018-06-21 stsp argc -= optind;
2659 404c43c4 2018-06-21 stsp argv += optind;
2661 a39318fd 2018-08-02 stsp if (argc == 1)
2662 404c43c4 2018-06-21 stsp path = argv[0];
2664 404c43c4 2018-06-21 stsp usage_blame();
2666 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2667 66bea077 2018-08-02 stsp if (cwd == NULL) {
2668 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2669 66bea077 2018-08-02 stsp goto done;
2671 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2672 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2673 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2674 66bea077 2018-08-02 stsp goto done;
2676 0c06baac 2019-02-05 stsp error = NULL;
2677 0c06baac 2019-02-05 stsp if (worktree) {
2678 0c06baac 2019-02-05 stsp repo_path =
2679 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2680 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2681 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2682 0c06baac 2019-02-05 stsp if (error)
2683 0c06baac 2019-02-05 stsp goto done;
2685 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2686 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2687 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2688 0c06baac 2019-02-05 stsp goto done;
2693 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2694 c02c541e 2019-03-29 stsp if (error != NULL)
2695 36e2fb66 2019-01-04 stsp goto done;
2697 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2698 c02c541e 2019-03-29 stsp if (error)
2699 404c43c4 2018-06-21 stsp goto done;
2701 0c06baac 2019-02-05 stsp if (worktree) {
2702 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2703 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2704 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2705 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2706 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2707 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2708 6efaaa2d 2019-02-05 stsp path) == -1) {
2709 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2710 0c06baac 2019-02-05 stsp goto done;
2712 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2715 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2717 0c06baac 2019-02-05 stsp if (error)
2718 66bea077 2018-08-02 stsp goto done;
2720 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2721 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2722 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2723 404c43c4 2018-06-21 stsp if (error != NULL)
2724 66bea077 2018-08-02 stsp goto done;
2725 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2726 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2727 404c43c4 2018-06-21 stsp if (error != NULL)
2728 66bea077 2018-08-02 stsp goto done;
2730 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2731 30837e32 2019-07-25 stsp if (error)
2732 66bea077 2018-08-02 stsp goto done;
2735 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2736 28315671 2019-08-14 stsp if (error)
2737 28315671 2019-08-14 stsp goto done;
2738 28315671 2019-08-14 stsp if (obj_id == NULL) {
2739 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2740 28315671 2019-08-14 stsp goto done;
2743 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2744 28315671 2019-08-14 stsp if (error)
2745 28315671 2019-08-14 stsp goto done;
2747 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2748 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2749 28315671 2019-08-14 stsp goto done;
2752 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2753 28315671 2019-08-14 stsp if (error)
2754 28315671 2019-08-14 stsp goto done;
2755 28315671 2019-08-14 stsp bca.f = got_opentemp();
2756 28315671 2019-08-14 stsp if (bca.f == NULL) {
2757 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2758 28315671 2019-08-14 stsp goto done;
2760 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2761 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2762 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2763 28315671 2019-08-14 stsp goto done;
2765 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2766 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2767 b02560ec 2019-08-19 stsp bca.nlines--;
2769 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2770 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2771 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2772 28315671 2019-08-14 stsp goto done;
2774 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2775 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2776 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2777 7ef28ff8 2019-08-14 stsp while (i > 0) {
2779 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2781 82f6abb8 2019-08-14 stsp bca.repo = repo;
2783 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2784 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2785 28315671 2019-08-14 stsp if (error)
2786 28315671 2019-08-14 stsp goto done;
2788 66bea077 2018-08-02 stsp free(in_repo_path);
2789 66bea077 2018-08-02 stsp free(repo_path);
2790 66bea077 2018-08-02 stsp free(cwd);
2791 404c43c4 2018-06-21 stsp free(commit_id);
2792 28315671 2019-08-14 stsp free(obj_id);
2794 28315671 2019-08-14 stsp got_object_blob_close(blob);
2795 0c06baac 2019-02-05 stsp if (worktree)
2796 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2797 ad242220 2018-09-08 stsp if (repo) {
2798 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2799 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2800 ad242220 2018-09-08 stsp if (error == NULL)
2801 ad242220 2018-09-08 stsp error = repo_error;
2803 3affba96 2019-09-22 stsp if (bca.lines) {
2804 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2805 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2806 3affba96 2019-09-22 stsp free(bline->id_str);
2807 3affba96 2019-09-22 stsp free(bline->committer);
2809 3affba96 2019-09-22 stsp free(bca.lines);
2811 28315671 2019-08-14 stsp free(bca.line_offsets);
2812 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2813 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2814 404c43c4 2018-06-21 stsp return error;
2817 5de5890b 2018-10-18 stsp __dead static void
2818 5de5890b 2018-10-18 stsp usage_tree(void)
2820 c1669e2e 2019-01-09 stsp fprintf(stderr,
2821 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2822 5de5890b 2018-10-18 stsp getprogname());
2826 c1669e2e 2019-01-09 stsp static void
2827 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2828 c1669e2e 2019-01-09 stsp const char *root_path)
2830 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2831 848d6979 2019-08-12 stsp const char *modestr = "";
2832 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2834 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2835 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2838 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2839 63c5ca5d 2019-08-24 stsp modestr = "$";
2840 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2841 848d6979 2019-08-12 stsp modestr = "@";
2842 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2843 848d6979 2019-08-12 stsp modestr = "/";
2844 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2845 848d6979 2019-08-12 stsp modestr = "*";
2847 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2848 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2851 5de5890b 2018-10-18 stsp static const struct got_error *
2852 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2853 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2854 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2856 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2857 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2858 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2859 56e0773d 2019-11-28 stsp int nentries, i;
2861 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2863 5de5890b 2018-10-18 stsp goto done;
2865 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2867 5de5890b 2018-10-18 stsp goto done;
2868 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2869 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2870 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2871 5de5890b 2018-10-18 stsp char *id = NULL;
2873 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2876 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2877 5de5890b 2018-10-18 stsp if (show_ids) {
2878 5de5890b 2018-10-18 stsp char *id_str;
2879 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2880 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2882 5de5890b 2018-10-18 stsp goto done;
2883 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2884 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2885 5de5890b 2018-10-18 stsp free(id_str);
2886 5de5890b 2018-10-18 stsp goto done;
2888 5de5890b 2018-10-18 stsp free(id_str);
2890 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2893 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2894 c1669e2e 2019-01-09 stsp char *child_path;
2895 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2896 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2897 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2898 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2899 c1669e2e 2019-01-09 stsp goto done;
2901 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2902 c1669e2e 2019-01-09 stsp root_path, repo);
2903 c1669e2e 2019-01-09 stsp free(child_path);
2905 c1669e2e 2019-01-09 stsp goto done;
2910 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2911 5de5890b 2018-10-18 stsp free(tree_id);
2912 5de5890b 2018-10-18 stsp return err;
2915 5de5890b 2018-10-18 stsp static const struct got_error *
2916 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2918 5de5890b 2018-10-18 stsp const struct got_error *error;
2919 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2920 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2921 7a2c19d6 2019-02-05 stsp const char *path;
2922 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2923 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2924 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2925 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2928 5de5890b 2018-10-18 stsp #ifndef PROFILE
2929 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2930 0f8d269b 2019-01-04 stsp NULL) == -1)
2931 5de5890b 2018-10-18 stsp err(1, "pledge");
2934 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2935 5de5890b 2018-10-18 stsp switch (ch) {
2937 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2940 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2941 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2942 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2944 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2947 5de5890b 2018-10-18 stsp show_ids = 1;
2950 c1669e2e 2019-01-09 stsp recurse = 1;
2953 2deda0b9 2019-03-07 stsp usage_tree();
2954 5de5890b 2018-10-18 stsp /* NOTREACHED */
2958 5de5890b 2018-10-18 stsp argc -= optind;
2959 5de5890b 2018-10-18 stsp argv += optind;
2961 5de5890b 2018-10-18 stsp if (argc == 1)
2962 5de5890b 2018-10-18 stsp path = argv[0];
2963 5de5890b 2018-10-18 stsp else if (argc > 1)
2964 5de5890b 2018-10-18 stsp usage_tree();
2966 7a2c19d6 2019-02-05 stsp path = NULL;
2968 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2969 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2970 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2971 9bf7a39b 2019-02-05 stsp goto done;
2973 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2974 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2975 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2976 7a2c19d6 2019-02-05 stsp goto done;
2978 7a2c19d6 2019-02-05 stsp error = NULL;
2979 7a2c19d6 2019-02-05 stsp if (worktree) {
2980 7a2c19d6 2019-02-05 stsp repo_path =
2981 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2982 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2983 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2984 7a2c19d6 2019-02-05 stsp if (error)
2985 7a2c19d6 2019-02-05 stsp goto done;
2987 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2988 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2989 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2990 7a2c19d6 2019-02-05 stsp goto done;
2995 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2996 5de5890b 2018-10-18 stsp if (error != NULL)
2997 c02c541e 2019-03-29 stsp goto done;
2999 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3000 c02c541e 2019-03-29 stsp if (error)
3001 5de5890b 2018-10-18 stsp goto done;
3003 9bf7a39b 2019-02-05 stsp if (path == NULL) {
3004 9bf7a39b 2019-02-05 stsp if (worktree) {
3005 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3006 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3007 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
3008 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
3009 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
3010 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3011 9bf7a39b 2019-02-05 stsp goto done;
3013 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
3015 9bf7a39b 2019-02-05 stsp if (error)
3016 9bf7a39b 2019-02-05 stsp goto done;
3018 9bf7a39b 2019-02-05 stsp path = "/";
3020 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3021 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3022 9bf7a39b 2019-02-05 stsp if (error != NULL)
3023 9bf7a39b 2019-02-05 stsp goto done;
3026 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3027 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3028 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3029 5de5890b 2018-10-18 stsp if (error != NULL)
3030 5de5890b 2018-10-18 stsp goto done;
3031 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3032 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3033 5de5890b 2018-10-18 stsp if (error != NULL)
3034 5de5890b 2018-10-18 stsp goto done;
3036 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
3037 30837e32 2019-07-25 stsp if (error)
3038 5de5890b 2018-10-18 stsp goto done;
3041 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3042 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3044 5de5890b 2018-10-18 stsp free(in_repo_path);
3045 5de5890b 2018-10-18 stsp free(repo_path);
3046 5de5890b 2018-10-18 stsp free(cwd);
3047 5de5890b 2018-10-18 stsp free(commit_id);
3048 7a2c19d6 2019-02-05 stsp if (worktree)
3049 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3050 5de5890b 2018-10-18 stsp if (repo) {
3051 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3052 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3053 5de5890b 2018-10-18 stsp if (error == NULL)
3054 5de5890b 2018-10-18 stsp error = repo_error;
3056 5de5890b 2018-10-18 stsp return error;
3059 6bad629b 2019-02-04 stsp __dead static void
3060 6bad629b 2019-02-04 stsp usage_status(void)
3062 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3066 b72f483a 2019-02-05 stsp static const struct got_error *
3067 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3068 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3069 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3070 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3072 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3073 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3074 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3075 b72f483a 2019-02-05 stsp return NULL;
3078 6bad629b 2019-02-04 stsp static const struct got_error *
3079 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3081 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3082 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3083 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3084 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3085 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3086 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3089 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3091 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3092 6bad629b 2019-02-04 stsp switch (ch) {
3094 2deda0b9 2019-03-07 stsp usage_status();
3095 6bad629b 2019-02-04 stsp /* NOTREACHED */
3099 6bad629b 2019-02-04 stsp argc -= optind;
3100 6bad629b 2019-02-04 stsp argv += optind;
3102 6bad629b 2019-02-04 stsp #ifndef PROFILE
3103 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3104 6bad629b 2019-02-04 stsp NULL) == -1)
3105 6bad629b 2019-02-04 stsp err(1, "pledge");
3107 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3108 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3109 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3110 927df6b7 2019-02-10 stsp goto done;
3113 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3114 927df6b7 2019-02-10 stsp if (error != NULL)
3115 a5edda0a 2019-07-27 stsp goto done;
3117 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3119 6bad629b 2019-02-04 stsp if (error != NULL)
3120 6bad629b 2019-02-04 stsp goto done;
3122 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3123 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3124 087fb88c 2019-08-04 stsp if (error)
3125 087fb88c 2019-08-04 stsp goto done;
3127 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3128 6bad629b 2019-02-04 stsp if (error)
3129 6bad629b 2019-02-04 stsp goto done;
3131 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3132 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3134 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3135 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3136 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3137 927df6b7 2019-02-10 stsp free(cwd);
3138 d0eebce4 2019-03-11 stsp return error;
3141 d0eebce4 2019-03-11 stsp __dead static void
3142 d0eebce4 2019-03-11 stsp usage_ref(void)
3144 d0eebce4 2019-03-11 stsp fprintf(stderr,
3145 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3146 d0eebce4 2019-03-11 stsp getprogname());
3150 d0eebce4 2019-03-11 stsp static const struct got_error *
3151 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3153 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3154 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3155 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3157 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3158 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3160 d0eebce4 2019-03-11 stsp return err;
3162 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3163 d0eebce4 2019-03-11 stsp char *refstr;
3164 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3165 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3166 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3167 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3168 d0eebce4 2019-03-11 stsp free(refstr);
3171 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3172 d0eebce4 2019-03-11 stsp return NULL;
3175 d0eebce4 2019-03-11 stsp static const struct got_error *
3176 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3178 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3179 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3181 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3183 d0eebce4 2019-03-11 stsp return err;
3185 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3186 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3187 d0eebce4 2019-03-11 stsp return err;
3190 d0eebce4 2019-03-11 stsp static const struct got_error *
3191 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3193 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3194 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3195 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3198 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3199 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3200 d1644381 2019-07-14 stsp * an unintended typo.
3202 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3203 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3205 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3207 d83d9d5c 2019-05-13 stsp if (err) {
3208 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3210 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3211 d83d9d5c 2019-05-13 stsp return err;
3212 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3214 d83d9d5c 2019-05-13 stsp return err;
3215 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3216 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3218 d83d9d5c 2019-05-13 stsp return err;
3221 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3223 d0eebce4 2019-03-11 stsp goto done;
3225 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3228 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3230 d1c1ae5f 2019-08-12 stsp return err;
3233 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3234 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3236 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3237 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3238 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3241 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3242 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3243 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3245 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3246 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3248 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3250 d1c1ae5f 2019-08-12 stsp return err;
3252 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3254 d1c1ae5f 2019-08-12 stsp goto done;
3256 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3258 d1c1ae5f 2019-08-12 stsp if (target_ref)
3259 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3261 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3262 d0eebce4 2019-03-11 stsp return err;
3265 d0eebce4 2019-03-11 stsp static const struct got_error *
3266 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3268 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3269 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3270 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3271 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3272 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3273 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3275 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3276 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3277 d0eebce4 2019-03-11 stsp switch (ch) {
3279 d0eebce4 2019-03-11 stsp delref = optarg;
3282 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3283 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3284 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3286 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3289 d0eebce4 2019-03-11 stsp do_list = 1;
3292 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3295 d0eebce4 2019-03-11 stsp usage_ref();
3296 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3300 d0eebce4 2019-03-11 stsp if (do_list && delref)
3301 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3303 d0eebce4 2019-03-11 stsp argc -= optind;
3304 d0eebce4 2019-03-11 stsp argv += optind;
3306 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3307 d1c1ae5f 2019-08-12 stsp if (create_symref)
3308 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3309 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3310 d0eebce4 2019-03-11 stsp if (argc > 0)
3311 d0eebce4 2019-03-11 stsp usage_ref();
3312 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3313 d0eebce4 2019-03-11 stsp usage_ref();
3315 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3316 e0b57350 2019-03-12 stsp if (do_list) {
3317 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3318 e0b57350 2019-03-12 stsp NULL) == -1)
3319 e0b57350 2019-03-12 stsp err(1, "pledge");
3321 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3322 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3323 e0b57350 2019-03-12 stsp err(1, "pledge");
3326 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3327 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3328 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3329 d0eebce4 2019-03-11 stsp goto done;
3332 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3333 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3334 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3335 d0eebce4 2019-03-11 stsp goto done;
3337 d0eebce4 2019-03-11 stsp error = NULL;
3338 d0eebce4 2019-03-11 stsp if (worktree) {
3339 d0eebce4 2019-03-11 stsp repo_path =
3340 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3341 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3342 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3343 d0eebce4 2019-03-11 stsp if (error)
3344 d0eebce4 2019-03-11 stsp goto done;
3346 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3347 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3348 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3349 d0eebce4 2019-03-11 stsp goto done;
3354 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3355 d0eebce4 2019-03-11 stsp if (error != NULL)
3356 d0eebce4 2019-03-11 stsp goto done;
3358 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3359 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3360 c02c541e 2019-03-29 stsp if (error)
3361 c02c541e 2019-03-29 stsp goto done;
3363 d0eebce4 2019-03-11 stsp if (do_list)
3364 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3365 d0eebce4 2019-03-11 stsp else if (delref)
3366 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3367 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3368 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3370 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3373 4e759de4 2019-06-26 stsp got_repo_close(repo);
3374 4e759de4 2019-06-26 stsp if (worktree)
3375 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3376 4e759de4 2019-06-26 stsp free(cwd);
3377 4e759de4 2019-06-26 stsp free(repo_path);
3378 4e759de4 2019-06-26 stsp return error;
3381 4e759de4 2019-06-26 stsp __dead static void
3382 4e759de4 2019-06-26 stsp usage_branch(void)
3384 4e759de4 2019-06-26 stsp fprintf(stderr,
3385 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3386 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3390 4e759de4 2019-06-26 stsp static const struct got_error *
3391 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3392 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3394 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3395 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3396 4e99b47e 2019-10-04 stsp char *refstr;
3398 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3399 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3400 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3401 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3403 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3405 4e99b47e 2019-10-04 stsp return err;
3406 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3407 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3408 4e99b47e 2019-10-04 stsp marker = "* ";
3410 4e99b47e 2019-10-04 stsp marker = "~ ";
3414 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3415 4e99b47e 2019-10-04 stsp refname += 11;
3416 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3417 4e99b47e 2019-10-04 stsp refname += 18;
3419 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3420 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3421 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3423 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3424 4e99b47e 2019-10-04 stsp free(refstr);
3425 4e99b47e 2019-10-04 stsp return NULL;
3428 4e99b47e 2019-10-04 stsp static const struct got_error *
3429 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3431 ad89fa31 2019-10-04 stsp const char *refname;
3433 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3434 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3436 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3438 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3439 ad89fa31 2019-10-04 stsp refname += 11;
3440 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3441 ad89fa31 2019-10-04 stsp refname += 18;
3443 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3445 ad89fa31 2019-10-04 stsp return NULL;
3448 ad89fa31 2019-10-04 stsp static const struct got_error *
3449 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3451 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3452 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3453 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3454 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3455 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3457 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3459 4e99b47e 2019-10-04 stsp if (worktree) {
3460 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3461 4e99b47e 2019-10-04 stsp worktree);
3463 4e99b47e 2019-10-04 stsp return err;
3465 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3466 4e99b47e 2019-10-04 stsp worktree);
3468 4e99b47e 2019-10-04 stsp return err;
3470 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3471 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3472 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3474 4e99b47e 2019-10-04 stsp return err;
3475 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3476 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3480 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3481 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3483 4e759de4 2019-06-26 stsp return err;
3485 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3486 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3488 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3489 4e759de4 2019-06-26 stsp return NULL;
3492 4e759de4 2019-06-26 stsp static const struct got_error *
3493 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3494 45cd4e47 2019-08-25 stsp const char *branch_name)
3496 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3497 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3498 4e759de4 2019-06-26 stsp char *refname;
3500 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3501 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3503 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3505 4e759de4 2019-06-26 stsp goto done;
3507 45cd4e47 2019-08-25 stsp if (worktree &&
3508 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3509 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3510 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3511 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3512 45cd4e47 2019-08-25 stsp goto done;
3515 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3518 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3519 4e759de4 2019-06-26 stsp free(refname);
3520 4e759de4 2019-06-26 stsp return err;
3523 4e759de4 2019-06-26 stsp static const struct got_error *
3524 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3525 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3527 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3528 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3529 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3532 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3533 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3534 d3f84d51 2019-07-11 stsp * an unintended typo.
3536 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3537 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3539 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3540 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3541 4e759de4 2019-06-26 stsp goto done;
3544 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3545 4e759de4 2019-06-26 stsp if (err == NULL) {
3546 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3547 4e759de4 2019-06-26 stsp goto done;
3548 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3549 4e759de4 2019-06-26 stsp goto done;
3551 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3553 4e759de4 2019-06-26 stsp goto done;
3555 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3558 4e759de4 2019-06-26 stsp got_ref_close(ref);
3559 4e759de4 2019-06-26 stsp free(base_refname);
3560 4e759de4 2019-06-26 stsp free(refname);
3561 4e759de4 2019-06-26 stsp return err;
3564 4e759de4 2019-06-26 stsp static const struct got_error *
3565 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3567 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3568 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3569 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3570 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3571 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3572 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3574 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3575 4e759de4 2019-06-26 stsp switch (ch) {
3577 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3580 4e759de4 2019-06-26 stsp delref = optarg;
3583 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3584 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3585 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3587 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3590 4e759de4 2019-06-26 stsp do_list = 1;
3593 4e759de4 2019-06-26 stsp usage_branch();
3594 4e759de4 2019-06-26 stsp /* NOTREACHED */
3598 4e759de4 2019-06-26 stsp if (do_list && delref)
3599 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3601 4e759de4 2019-06-26 stsp argc -= optind;
3602 4e759de4 2019-06-26 stsp argv += optind;
3604 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3605 ad89fa31 2019-10-04 stsp do_show = 1;
3607 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3608 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3610 4e759de4 2019-06-26 stsp if (do_list || delref) {
3611 4e759de4 2019-06-26 stsp if (argc > 0)
3612 4e759de4 2019-06-26 stsp usage_branch();
3613 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3614 4e759de4 2019-06-26 stsp usage_branch();
3616 4e759de4 2019-06-26 stsp #ifndef PROFILE
3617 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3618 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3619 4e759de4 2019-06-26 stsp NULL) == -1)
3620 4e759de4 2019-06-26 stsp err(1, "pledge");
3622 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3623 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3624 4e759de4 2019-06-26 stsp err(1, "pledge");
3627 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3628 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3629 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3630 4e759de4 2019-06-26 stsp goto done;
3633 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3634 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3635 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3636 4e759de4 2019-06-26 stsp goto done;
3638 4e759de4 2019-06-26 stsp error = NULL;
3639 4e759de4 2019-06-26 stsp if (worktree) {
3640 4e759de4 2019-06-26 stsp repo_path =
3641 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3642 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3643 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3644 4e759de4 2019-06-26 stsp if (error)
3645 4e759de4 2019-06-26 stsp goto done;
3647 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3648 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3649 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3650 4e759de4 2019-06-26 stsp goto done;
3655 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3656 4e759de4 2019-06-26 stsp if (error != NULL)
3657 4e759de4 2019-06-26 stsp goto done;
3659 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3660 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3661 4e759de4 2019-06-26 stsp if (error)
3662 4e759de4 2019-06-26 stsp goto done;
3664 ad89fa31 2019-10-04 stsp if (do_show)
3665 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3666 ad89fa31 2019-10-04 stsp else if (do_list)
3667 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3668 4e759de4 2019-06-26 stsp else if (delref)
3669 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3671 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3672 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3673 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3674 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3675 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3676 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3677 a74f7e83 2019-11-10 stsp if (error)
3678 a74f7e83 2019-11-10 stsp goto done;
3679 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3680 a74f7e83 2019-11-10 stsp free(commit_id);
3684 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3685 d0eebce4 2019-03-11 stsp if (worktree)
3686 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3687 d0eebce4 2019-03-11 stsp free(cwd);
3688 d0eebce4 2019-03-11 stsp free(repo_path);
3689 d00136be 2019-03-26 stsp return error;
3693 d00136be 2019-03-26 stsp __dead static void
3694 8e7bd50a 2019-08-22 stsp usage_tag(void)
3696 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3697 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3698 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3703 b8bad2ba 2019-08-23 stsp static const struct got_error *
3704 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3706 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3707 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3708 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3709 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3710 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3712 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3713 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3714 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3715 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3717 b8bad2ba 2019-08-23 stsp return err;
3718 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3721 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3724 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3725 b8bad2ba 2019-08-23 stsp free(re_id);
3728 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3729 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3732 b8bad2ba 2019-08-23 stsp while (se) {
3733 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3736 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3737 b8bad2ba 2019-08-23 stsp free(se_id);
3740 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3741 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3743 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3744 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3746 b8bad2ba 2019-08-23 stsp return err;
3747 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3750 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3755 b8bad2ba 2019-08-23 stsp return err;
3759 8e7bd50a 2019-08-22 stsp static const struct got_error *
3760 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3761 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3763 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3764 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3765 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3766 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3767 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3771 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3773 b8bad2ba 2019-08-23 stsp return err;
3774 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3776 b8bad2ba 2019-08-23 stsp goto done;
3778 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3780 b8bad2ba 2019-08-23 stsp goto done;
3781 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3783 b8bad2ba 2019-08-23 stsp goto done;
3785 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3786 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3788 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3789 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3791 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3792 b8bad2ba 2019-08-23 stsp *cmp = -1;
3794 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3796 b8bad2ba 2019-08-23 stsp free(id1);
3797 b8bad2ba 2019-08-23 stsp free(id2);
3799 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3801 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3802 b8bad2ba 2019-08-23 stsp return err;
3805 b8bad2ba 2019-08-23 stsp static const struct got_error *
3806 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3808 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3809 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3810 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3812 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3814 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3816 8e7bd50a 2019-08-22 stsp return err;
3818 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3819 8e7bd50a 2019-08-22 stsp const char *refname;
3820 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3821 8e7bd50a 2019-08-22 stsp char datebuf[26];
3822 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3823 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3824 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3826 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3827 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3829 8e7bd50a 2019-08-22 stsp refname += 10;
3830 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3831 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3832 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3835 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3836 8e7bd50a 2019-08-22 stsp free(refstr);
3838 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3841 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3845 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3846 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3847 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3848 2417344c 2019-08-23 stsp if (datestr)
3849 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3850 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3851 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3854 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3855 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3856 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3858 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3859 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3861 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3862 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3864 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3865 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3870 8e7bd50a 2019-08-22 stsp free(id_str);
3871 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3872 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3873 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3874 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3878 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3880 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3882 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3883 8e7bd50a 2019-08-22 stsp } while (line);
3884 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3887 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3888 8e7bd50a 2019-08-22 stsp return NULL;
3891 8e7bd50a 2019-08-22 stsp static const struct got_error *
3892 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3893 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3895 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3896 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3897 f372d5cd 2019-10-21 stsp char *editor = NULL;
3898 8e7bd50a 2019-08-22 stsp int fd = -1;
3900 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3901 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3902 8e7bd50a 2019-08-22 stsp goto done;
3905 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3906 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3907 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3908 8e7bd50a 2019-08-22 stsp goto done;
3911 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3913 8e7bd50a 2019-08-22 stsp goto done;
3915 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3916 8e7bd50a 2019-08-22 stsp close(fd);
3918 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3920 8e7bd50a 2019-08-22 stsp goto done;
3921 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3923 8e7bd50a 2019-08-22 stsp free(initial_content);
3924 8e7bd50a 2019-08-22 stsp free(template);
3925 8e7bd50a 2019-08-22 stsp free(editor);
3927 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3928 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3929 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3930 8e7bd50a 2019-08-22 stsp if (err) {
3931 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3932 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3935 8e7bd50a 2019-08-22 stsp return err;
3938 8e7bd50a 2019-08-22 stsp static const struct got_error *
3939 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3940 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3942 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3943 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3944 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3945 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3946 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3947 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3948 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3951 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3952 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3953 8e7bd50a 2019-08-22 stsp * an unintended typo.
3955 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
3956 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3958 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3960 8e7bd50a 2019-08-22 stsp return err;
3962 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3963 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3965 8e7bd50a 2019-08-22 stsp goto done;
3967 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3969 8e7bd50a 2019-08-22 stsp goto done;
3971 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3972 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3973 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3974 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3975 8e7bd50a 2019-08-22 stsp goto done;
3977 8e7bd50a 2019-08-22 stsp tag_name += 10;
3978 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3979 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3980 8e7bd50a 2019-08-22 stsp goto done;
3983 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3984 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3985 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3986 8e7bd50a 2019-08-22 stsp goto done;
3987 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3988 8e7bd50a 2019-08-22 stsp goto done;
3990 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3991 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3992 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3993 f372d5cd 2019-10-21 stsp if (err) {
3994 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3995 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3996 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3997 8e7bd50a 2019-08-22 stsp goto done;
4001 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
4002 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
4003 f372d5cd 2019-10-21 stsp if (err) {
4004 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4005 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4006 8e7bd50a 2019-08-22 stsp goto done;
4009 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
4010 f372d5cd 2019-10-21 stsp if (err) {
4011 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4012 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4013 8e7bd50a 2019-08-22 stsp goto done;
4016 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
4017 f372d5cd 2019-10-21 stsp if (err) {
4018 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4019 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4020 f372d5cd 2019-10-21 stsp goto done;
4023 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
4024 f372d5cd 2019-10-21 stsp if (err) {
4025 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4026 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4027 f372d5cd 2019-10-21 stsp goto done;
4029 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4031 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4032 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4033 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4034 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4035 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4036 f372d5cd 2019-10-21 stsp free(tag_id_str);
4038 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4039 8e7bd50a 2019-08-22 stsp free(commit_id);
4040 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4041 8e7bd50a 2019-08-22 stsp free(refname);
4042 8e7bd50a 2019-08-22 stsp free(tagmsg);
4043 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4044 aba9c984 2019-09-08 stsp free(tagger);
4045 8e7bd50a 2019-08-22 stsp return err;
4048 8e7bd50a 2019-08-22 stsp static const struct got_error *
4049 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4051 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4052 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4053 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4054 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4055 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4056 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4057 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4059 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4060 8e7bd50a 2019-08-22 stsp switch (ch) {
4062 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4065 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4066 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4067 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4069 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4072 8e7bd50a 2019-08-22 stsp do_list = 1;
4075 8e7bd50a 2019-08-22 stsp usage_tag();
4076 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4080 8e7bd50a 2019-08-22 stsp argc -= optind;
4081 8e7bd50a 2019-08-22 stsp argv += optind;
4083 8e7bd50a 2019-08-22 stsp if (do_list) {
4084 8e7bd50a 2019-08-22 stsp if (tagmsg)
4085 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
4086 8e7bd50a 2019-08-22 stsp if (argc > 0)
4087 8e7bd50a 2019-08-22 stsp usage_tag();
4088 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
4089 8e7bd50a 2019-08-22 stsp usage_tag();
4090 a2887370 2019-08-23 stsp else if (argc > 1)
4091 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
4092 a2887370 2019-08-23 stsp tag_name = argv[0];
4094 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4095 8e7bd50a 2019-08-22 stsp if (do_list) {
4096 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4097 8e7bd50a 2019-08-22 stsp NULL) == -1)
4098 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4100 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4101 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4102 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4105 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4106 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4107 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4108 8e7bd50a 2019-08-22 stsp goto done;
4111 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4112 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4113 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4114 8e7bd50a 2019-08-22 stsp goto done;
4116 8e7bd50a 2019-08-22 stsp error = NULL;
4117 8e7bd50a 2019-08-22 stsp if (worktree) {
4118 8e7bd50a 2019-08-22 stsp repo_path =
4119 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4120 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4121 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4122 8e7bd50a 2019-08-22 stsp if (error)
4123 8e7bd50a 2019-08-22 stsp goto done;
4125 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4126 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4127 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4128 8e7bd50a 2019-08-22 stsp goto done;
4133 8e7bd50a 2019-08-22 stsp if (do_list) {
4134 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4135 c9956ddf 2019-09-08 stsp if (error != NULL)
4136 c9956ddf 2019-09-08 stsp goto done;
4137 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4138 8e7bd50a 2019-08-22 stsp if (error)
4139 8e7bd50a 2019-08-22 stsp goto done;
4140 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4142 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4143 c9956ddf 2019-09-08 stsp if (error)
4144 c9956ddf 2019-09-08 stsp goto done;
4145 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4146 c9956ddf 2019-09-08 stsp if (error != NULL)
4147 c9956ddf 2019-09-08 stsp goto done;
4149 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4150 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4151 8e7bd50a 2019-08-22 stsp if (error)
4152 8e7bd50a 2019-08-22 stsp goto done;
4155 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4156 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4157 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4158 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4159 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4160 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4161 8e7bd50a 2019-08-22 stsp if (error)
4162 8e7bd50a 2019-08-22 stsp goto done;
4163 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4164 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4165 8e7bd50a 2019-08-22 stsp if (error)
4166 8e7bd50a 2019-08-22 stsp goto done;
4167 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4168 8e7bd50a 2019-08-22 stsp free(commit_id);
4169 8e7bd50a 2019-08-22 stsp if (error)
4170 8e7bd50a 2019-08-22 stsp goto done;
4173 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4174 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4178 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4179 8e7bd50a 2019-08-22 stsp if (worktree)
4180 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4181 8e7bd50a 2019-08-22 stsp free(cwd);
4182 8e7bd50a 2019-08-22 stsp free(repo_path);
4183 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4184 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4185 8e7bd50a 2019-08-22 stsp return error;
4188 8e7bd50a 2019-08-22 stsp __dead static void
4189 d00136be 2019-03-26 stsp usage_add(void)
4191 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4192 022fae89 2019-12-06 tracey getprogname());
4196 d00136be 2019-03-26 stsp static const struct got_error *
4197 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4199 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4201 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4202 4e68cba3 2019-11-23 stsp return NULL;
4205 4e68cba3 2019-11-23 stsp static const struct got_error *
4206 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4208 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4209 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4210 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4211 1dd54920 2019-05-11 stsp char *cwd = NULL;
4212 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4213 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4214 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4216 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4218 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4219 d00136be 2019-03-26 stsp switch (ch) {
4220 022fae89 2019-12-06 tracey case 'I':
4221 022fae89 2019-12-06 tracey no_ignores = 1;
4224 4e68cba3 2019-11-23 stsp can_recurse = 1;
4227 d00136be 2019-03-26 stsp usage_add();
4228 d00136be 2019-03-26 stsp /* NOTREACHED */
4232 d00136be 2019-03-26 stsp argc -= optind;
4233 d00136be 2019-03-26 stsp argv += optind;
4235 43012d58 2019-07-14 stsp #ifndef PROFILE
4236 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4237 43012d58 2019-07-14 stsp NULL) == -1)
4238 43012d58 2019-07-14 stsp err(1, "pledge");
4240 723c305c 2019-05-11 jcs if (argc < 1)
4241 d00136be 2019-03-26 stsp usage_add();
4243 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4244 d00136be 2019-03-26 stsp if (cwd == NULL) {
4245 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4246 d00136be 2019-03-26 stsp goto done;
4249 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4250 d00136be 2019-03-26 stsp if (error)
4251 d00136be 2019-03-26 stsp goto done;
4253 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4255 031a5338 2019-03-26 stsp if (error != NULL)
4256 031a5338 2019-03-26 stsp goto done;
4258 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4259 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4260 d00136be 2019-03-26 stsp if (error)
4261 d00136be 2019-03-26 stsp goto done;
4263 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4264 6d022e97 2019-08-04 stsp if (error)
4265 022fae89 2019-12-06 tracey goto done;
4267 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4268 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4269 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4270 6d022e97 2019-08-04 stsp goto done;
4274 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4275 4e68cba3 2019-11-23 stsp char *ondisk_path;
4276 4e68cba3 2019-11-23 stsp struct stat sb;
4277 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4278 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4279 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4280 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4281 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4282 4e68cba3 2019-11-23 stsp goto done;
4284 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4285 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4286 4e68cba3 2019-11-23 stsp free(ondisk_path);
4289 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4290 4e68cba3 2019-11-23 stsp ondisk_path);
4291 4e68cba3 2019-11-23 stsp free(ondisk_path);
4292 4e68cba3 2019-11-23 stsp goto done;
4294 4e68cba3 2019-11-23 stsp free(ondisk_path);
4295 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4296 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4297 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4298 4e68cba3 2019-11-23 stsp goto done;
4303 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4304 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4307 031a5338 2019-03-26 stsp got_repo_close(repo);
4308 d00136be 2019-03-26 stsp if (worktree)
4309 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4310 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4311 1dd54920 2019-05-11 stsp free((char *)pe->path);
4312 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4313 2ec1f75b 2019-03-26 stsp free(cwd);
4314 2ec1f75b 2019-03-26 stsp return error;
4317 2ec1f75b 2019-03-26 stsp __dead static void
4318 648e4ef7 2019-07-09 stsp usage_remove(void)
4320 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4321 f2a9dc41 2019-12-13 tracey getprogname());
4325 2a06fe5f 2019-08-24 stsp static const struct got_error *
4326 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4327 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4329 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4331 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4332 2a06fe5f 2019-08-24 stsp return NULL;
4333 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4334 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4335 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4336 2a06fe5f 2019-08-24 stsp return NULL;
4339 2ec1f75b 2019-03-26 stsp static const struct got_error *
4340 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4342 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4343 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4344 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4345 17ed4618 2019-06-02 stsp char *cwd = NULL;
4346 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4347 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4348 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4350 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4352 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4353 2ec1f75b 2019-03-26 stsp switch (ch) {
4355 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4357 70e3e7f5 2019-12-13 tracey case 'k':
4358 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4360 f2a9dc41 2019-12-13 tracey case 'R':
4361 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4364 f2a9dc41 2019-12-13 tracey usage_remove();
4365 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4369 2ec1f75b 2019-03-26 stsp argc -= optind;
4370 2ec1f75b 2019-03-26 stsp argv += optind;
4372 43012d58 2019-07-14 stsp #ifndef PROFILE
4373 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4374 43012d58 2019-07-14 stsp NULL) == -1)
4375 43012d58 2019-07-14 stsp err(1, "pledge");
4377 17ed4618 2019-06-02 stsp if (argc < 1)
4378 648e4ef7 2019-07-09 stsp usage_remove();
4380 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4381 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4382 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4383 2ec1f75b 2019-03-26 stsp goto done;
4385 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4386 2ec1f75b 2019-03-26 stsp if (error)
4387 2ec1f75b 2019-03-26 stsp goto done;
4389 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4392 2ec1f75b 2019-03-26 stsp goto done;
4394 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4395 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4396 2ec1f75b 2019-03-26 stsp if (error)
4397 2ec1f75b 2019-03-26 stsp goto done;
4399 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4400 6d022e97 2019-08-04 stsp if (error)
4401 6d022e97 2019-08-04 stsp goto done;
4403 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4404 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4405 f2a9dc41 2019-12-13 tracey struct stat sb;
4406 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4407 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4408 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4409 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4410 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4411 f2a9dc41 2019-12-13 tracey goto done;
4413 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4414 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4415 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4416 f2a9dc41 2019-12-13 tracey continue;
4418 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4419 f2a9dc41 2019-12-13 tracey ondisk_path);
4420 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4421 f2a9dc41 2019-12-13 tracey goto done;
4423 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4424 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4425 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4426 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4427 f2a9dc41 2019-12-13 tracey goto done;
4432 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4433 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4434 a129376b 2019-03-28 stsp if (error)
4435 a129376b 2019-03-28 stsp goto done;
4438 a129376b 2019-03-28 stsp got_repo_close(repo);
4439 a129376b 2019-03-28 stsp if (worktree)
4440 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4441 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4442 17ed4618 2019-06-02 stsp free((char *)pe->path);
4443 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4444 a129376b 2019-03-28 stsp free(cwd);
4445 a129376b 2019-03-28 stsp return error;
4448 a129376b 2019-03-28 stsp __dead static void
4449 a129376b 2019-03-28 stsp usage_revert(void)
4451 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4452 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4456 1ee397ad 2019-07-12 stsp static const struct got_error *
4457 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4459 a129376b 2019-03-28 stsp while (path[0] == '/')
4461 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4462 33aa809d 2019-08-08 stsp return NULL;
4465 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4466 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4467 33aa809d 2019-08-08 stsp const char *action;
4470 33aa809d 2019-08-08 stsp static const struct got_error *
4471 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4472 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4474 33aa809d 2019-08-08 stsp char *line = NULL;
4475 33aa809d 2019-08-08 stsp size_t linesize = 0;
4476 33aa809d 2019-08-08 stsp ssize_t linelen;
4478 33aa809d 2019-08-08 stsp switch (status) {
4479 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4480 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4482 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4483 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4485 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4486 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4487 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4488 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4489 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4490 33aa809d 2019-08-08 stsp printf("%s", line);
4491 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4492 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4493 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4494 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4495 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4498 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4501 33aa809d 2019-08-08 stsp return NULL;
4504 33aa809d 2019-08-08 stsp static const struct got_error *
4505 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4506 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4508 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4509 33aa809d 2019-08-08 stsp char *line = NULL;
4510 33aa809d 2019-08-08 stsp size_t linesize = 0;
4511 33aa809d 2019-08-08 stsp ssize_t linelen;
4512 33aa809d 2019-08-08 stsp int resp = ' ';
4513 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4515 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4517 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4519 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4520 33aa809d 2019-08-08 stsp a->action);
4522 33aa809d 2019-08-08 stsp return err;
4523 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4524 33aa809d 2019-08-08 stsp if (linelen == -1) {
4525 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4526 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4527 33aa809d 2019-08-08 stsp return NULL;
4529 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4531 33aa809d 2019-08-08 stsp *nl = '\0';
4532 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4533 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4534 33aa809d 2019-08-08 stsp printf("y\n");
4535 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4536 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4537 33aa809d 2019-08-08 stsp printf("n\n");
4538 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4539 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4540 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4541 33aa809d 2019-08-08 stsp printf("q\n");
4543 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4544 33aa809d 2019-08-08 stsp free(line);
4545 33aa809d 2019-08-08 stsp return NULL;
4548 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4549 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4550 33aa809d 2019-08-08 stsp a->action);
4552 33aa809d 2019-08-08 stsp return err;
4553 33aa809d 2019-08-08 stsp resp = getchar();
4554 33aa809d 2019-08-08 stsp if (resp == '\n')
4555 33aa809d 2019-08-08 stsp resp = getchar();
4556 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4557 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4558 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4559 33aa809d 2019-08-08 stsp resp = ' ';
4561 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4562 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4563 33aa809d 2019-08-08 stsp resp = ' ';
4567 33aa809d 2019-08-08 stsp if (resp == 'y')
4568 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4569 33aa809d 2019-08-08 stsp else if (resp == 'n')
4570 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4571 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4572 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4574 1ee397ad 2019-07-12 stsp return NULL;
4578 a129376b 2019-03-28 stsp static const struct got_error *
4579 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4581 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4582 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4583 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4584 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4585 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4586 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4587 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4588 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4589 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4590 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4592 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4594 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4595 a129376b 2019-03-28 stsp switch (ch) {
4597 33aa809d 2019-08-08 stsp pflag = 1;
4600 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4603 0f6d7415 2019-08-08 stsp can_recurse = 1;
4606 a129376b 2019-03-28 stsp usage_revert();
4607 a129376b 2019-03-28 stsp /* NOTREACHED */
4611 a129376b 2019-03-28 stsp argc -= optind;
4612 a129376b 2019-03-28 stsp argv += optind;
4614 43012d58 2019-07-14 stsp #ifndef PROFILE
4615 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4616 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4617 43012d58 2019-07-14 stsp err(1, "pledge");
4619 e20a8b6f 2019-06-04 stsp if (argc < 1)
4620 a129376b 2019-03-28 stsp usage_revert();
4621 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4622 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4624 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4625 a129376b 2019-03-28 stsp if (cwd == NULL) {
4626 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4627 a129376b 2019-03-28 stsp goto done;
4629 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4630 2ec1f75b 2019-03-26 stsp if (error)
4631 2ec1f75b 2019-03-26 stsp goto done;
4633 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4635 a129376b 2019-03-28 stsp if (error != NULL)
4636 a129376b 2019-03-28 stsp goto done;
4638 33aa809d 2019-08-08 stsp if (patch_script_path) {
4639 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4640 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4641 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4642 33aa809d 2019-08-08 stsp patch_script_path);
4643 33aa809d 2019-08-08 stsp goto done;
4646 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4647 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4648 a129376b 2019-03-28 stsp if (error)
4649 a129376b 2019-03-28 stsp goto done;
4651 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4652 6d022e97 2019-08-04 stsp if (error)
4653 6d022e97 2019-08-04 stsp goto done;
4655 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4656 0f6d7415 2019-08-08 stsp char *ondisk_path;
4657 0f6d7415 2019-08-08 stsp struct stat sb;
4658 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4659 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4660 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4661 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4662 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4663 0f6d7415 2019-08-08 stsp goto done;
4665 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4666 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4667 0f6d7415 2019-08-08 stsp free(ondisk_path);
4670 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4671 0f6d7415 2019-08-08 stsp ondisk_path);
4672 0f6d7415 2019-08-08 stsp free(ondisk_path);
4673 0f6d7415 2019-08-08 stsp goto done;
4675 0f6d7415 2019-08-08 stsp free(ondisk_path);
4676 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4677 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4678 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4679 0f6d7415 2019-08-08 stsp goto done;
4684 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4685 33aa809d 2019-08-08 stsp cpa.action = "revert";
4686 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4687 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4688 a129376b 2019-03-28 stsp if (error)
4689 a129376b 2019-03-28 stsp goto done;
4691 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4692 33aa809d 2019-08-08 stsp error == NULL)
4693 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4695 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4696 2ec1f75b 2019-03-26 stsp if (worktree)
4697 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4698 2ec1f75b 2019-03-26 stsp free(path);
4699 d00136be 2019-03-26 stsp free(cwd);
4700 6bad629b 2019-02-04 stsp return error;
4703 c4296144 2019-05-09 stsp __dead static void
4704 c4296144 2019-05-09 stsp usage_commit(void)
4706 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4707 5c1e53bc 2019-07-28 stsp getprogname());
4711 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4712 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4713 e2ba3d07 2019-05-13 stsp const char *editor;
4714 e0870e44 2019-05-13 stsp const char *worktree_path;
4715 76d98825 2019-06-03 stsp const char *branch_name;
4716 314a6357 2019-05-13 stsp const char *repo_path;
4717 e0870e44 2019-05-13 stsp char *logmsg_path;
4721 33ad4cbe 2019-05-12 jcs static const struct got_error *
4722 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4725 76d98825 2019-06-03 stsp char *initial_content = NULL;
4726 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4727 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4728 e0870e44 2019-05-13 stsp char *template = NULL;
4729 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4731 33ad4cbe 2019-05-12 jcs size_t len;
4733 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4734 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4735 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4736 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4737 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4738 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4739 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4740 33ad4cbe 2019-05-12 jcs return NULL;
4743 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4744 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4746 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4747 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4748 76d98825 2019-06-03 stsp a->branch_name) == -1)
4749 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4751 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4753 e0870e44 2019-05-13 stsp goto done;
4755 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4757 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4758 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4759 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4760 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4761 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4765 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4767 76d98825 2019-06-03 stsp free(initial_content);
4768 e0870e44 2019-05-13 stsp free(template);
4770 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4771 3ce1b845 2019-07-15 stsp if (err == NULL) {
4772 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4773 3ce1b845 2019-07-15 stsp if (err) {
4774 3ce1b845 2019-07-15 stsp free(*logmsg);
4775 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4778 33ad4cbe 2019-05-12 jcs return err;
4781 c4296144 2019-05-09 stsp static const struct got_error *
4782 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4784 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4785 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4786 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4787 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4788 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4789 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4790 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4791 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4792 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4793 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4795 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4796 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4798 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4799 c4296144 2019-05-09 stsp switch (ch) {
4801 c4296144 2019-05-09 stsp logmsg = optarg;
4804 c4296144 2019-05-09 stsp usage_commit();
4805 c4296144 2019-05-09 stsp /* NOTREACHED */
4809 c4296144 2019-05-09 stsp argc -= optind;
4810 c4296144 2019-05-09 stsp argv += optind;
4812 43012d58 2019-07-14 stsp #ifndef PROFILE
4813 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4814 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4815 43012d58 2019-07-14 stsp err(1, "pledge");
4817 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4818 c4296144 2019-05-09 stsp if (cwd == NULL) {
4819 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4820 c4296144 2019-05-09 stsp goto done;
4822 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4823 7d5807f4 2019-07-11 stsp if (error)
4824 7d5807f4 2019-07-11 stsp goto done;
4826 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4827 c4296144 2019-05-09 stsp if (error)
4828 a698f62e 2019-07-25 stsp goto done;
4829 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4830 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4831 c4296144 2019-05-09 stsp goto done;
4834 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4835 916f288c 2019-07-30 stsp worktree);
4836 5c1e53bc 2019-07-28 stsp if (error)
4837 5c1e53bc 2019-07-28 stsp goto done;
4839 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4840 c9956ddf 2019-09-08 stsp if (error)
4841 c9956ddf 2019-09-08 stsp goto done;
4842 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4843 c9956ddf 2019-09-08 stsp gitconfig_path);
4844 c4296144 2019-05-09 stsp if (error != NULL)
4845 c4296144 2019-05-09 stsp goto done;
4847 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4848 aba9c984 2019-09-08 stsp if (error)
4849 aba9c984 2019-09-08 stsp return error;
4852 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4853 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4855 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4856 314a6357 2019-05-13 stsp error = get_editor(&editor);
4858 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4859 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4860 c4296144 2019-05-09 stsp if (error)
4861 c4296144 2019-05-09 stsp goto done;
4863 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4864 087fb88c 2019-08-04 stsp if (error)
4865 087fb88c 2019-08-04 stsp goto done;
4867 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4868 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4869 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4870 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4871 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4872 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4873 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4874 916f288c 2019-07-30 stsp goto done;
4876 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4878 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4879 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4880 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4881 e0870e44 2019-05-13 stsp if (error) {
4882 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4883 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4884 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4885 c4296144 2019-05-09 stsp goto done;
4888 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4889 c4296144 2019-05-09 stsp if (error)
4890 c4296144 2019-05-09 stsp goto done;
4891 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4893 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4894 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4895 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4896 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4897 7266f21f 2019-10-21 stsp error == NULL)
4898 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4899 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4901 c4296144 2019-05-09 stsp got_repo_close(repo);
4902 c4296144 2019-05-09 stsp if (worktree)
4903 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4904 c4296144 2019-05-09 stsp free(cwd);
4905 c4296144 2019-05-09 stsp free(id_str);
4906 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4907 e2ba3d07 2019-05-13 stsp free(editor);
4908 aba9c984 2019-09-08 stsp free(author);
4909 234035bc 2019-06-01 stsp return error;
4912 234035bc 2019-06-01 stsp __dead static void
4913 234035bc 2019-06-01 stsp usage_cherrypick(void)
4915 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4919 234035bc 2019-06-01 stsp static const struct got_error *
4920 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4922 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4923 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4924 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4925 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4926 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4927 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4928 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4929 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4930 234035bc 2019-06-01 stsp int ch, did_something = 0;
4932 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4933 234035bc 2019-06-01 stsp switch (ch) {
4935 234035bc 2019-06-01 stsp usage_cherrypick();
4936 234035bc 2019-06-01 stsp /* NOTREACHED */
4940 234035bc 2019-06-01 stsp argc -= optind;
4941 234035bc 2019-06-01 stsp argv += optind;
4943 43012d58 2019-07-14 stsp #ifndef PROFILE
4944 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4945 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4946 43012d58 2019-07-14 stsp err(1, "pledge");
4948 234035bc 2019-06-01 stsp if (argc != 1)
4949 234035bc 2019-06-01 stsp usage_cherrypick();
4951 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4952 234035bc 2019-06-01 stsp if (cwd == NULL) {
4953 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4954 234035bc 2019-06-01 stsp goto done;
4956 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4957 234035bc 2019-06-01 stsp if (error)
4958 234035bc 2019-06-01 stsp goto done;
4960 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4962 234035bc 2019-06-01 stsp if (error != NULL)
4963 234035bc 2019-06-01 stsp goto done;
4965 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4966 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4967 234035bc 2019-06-01 stsp if (error)
4968 234035bc 2019-06-01 stsp goto done;
4970 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4971 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4972 234035bc 2019-06-01 stsp if (error != NULL) {
4973 234035bc 2019-06-01 stsp struct got_reference *ref;
4974 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4975 234035bc 2019-06-01 stsp goto done;
4976 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4977 234035bc 2019-06-01 stsp if (error != NULL)
4978 234035bc 2019-06-01 stsp goto done;
4979 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4980 234035bc 2019-06-01 stsp got_ref_close(ref);
4981 234035bc 2019-06-01 stsp if (error != NULL)
4982 234035bc 2019-06-01 stsp goto done;
4984 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4985 234035bc 2019-06-01 stsp if (error)
4986 234035bc 2019-06-01 stsp goto done;
4988 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4989 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4990 234035bc 2019-06-01 stsp if (error != NULL)
4991 234035bc 2019-06-01 stsp goto done;
4993 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4994 234035bc 2019-06-01 stsp if (error) {
4995 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4996 234035bc 2019-06-01 stsp goto done;
4997 234035bc 2019-06-01 stsp error = NULL;
4999 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
5000 234035bc 2019-06-01 stsp goto done;
5003 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5004 234035bc 2019-06-01 stsp if (error)
5005 234035bc 2019-06-01 stsp goto done;
5006 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5007 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
5008 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
5010 234035bc 2019-06-01 stsp if (error != NULL)
5011 234035bc 2019-06-01 stsp goto done;
5013 234035bc 2019-06-01 stsp if (did_something)
5014 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
5016 234035bc 2019-06-01 stsp if (commit)
5017 234035bc 2019-06-01 stsp got_object_commit_close(commit);
5018 234035bc 2019-06-01 stsp free(commit_id_str);
5019 234035bc 2019-06-01 stsp if (head_ref)
5020 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5021 234035bc 2019-06-01 stsp if (worktree)
5022 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5024 234035bc 2019-06-01 stsp got_repo_close(repo);
5025 c4296144 2019-05-09 stsp return error;
5028 5ef14e63 2019-06-02 stsp __dead static void
5029 5ef14e63 2019-06-02 stsp usage_backout(void)
5031 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5035 5ef14e63 2019-06-02 stsp static const struct got_error *
5036 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5038 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5039 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5040 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5041 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5042 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5043 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5044 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5045 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5046 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5048 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5049 5ef14e63 2019-06-02 stsp switch (ch) {
5051 5ef14e63 2019-06-02 stsp usage_backout();
5052 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5056 5ef14e63 2019-06-02 stsp argc -= optind;
5057 5ef14e63 2019-06-02 stsp argv += optind;
5059 43012d58 2019-07-14 stsp #ifndef PROFILE
5060 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5061 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5062 43012d58 2019-07-14 stsp err(1, "pledge");
5064 5ef14e63 2019-06-02 stsp if (argc != 1)
5065 5ef14e63 2019-06-02 stsp usage_backout();
5067 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5068 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5069 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5070 5ef14e63 2019-06-02 stsp goto done;
5072 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5073 5ef14e63 2019-06-02 stsp if (error)
5074 5ef14e63 2019-06-02 stsp goto done;
5076 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5078 5ef14e63 2019-06-02 stsp if (error != NULL)
5079 5ef14e63 2019-06-02 stsp goto done;
5081 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5082 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5083 5ef14e63 2019-06-02 stsp if (error)
5084 5ef14e63 2019-06-02 stsp goto done;
5086 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5087 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5088 5ef14e63 2019-06-02 stsp if (error != NULL) {
5089 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5090 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5091 5ef14e63 2019-06-02 stsp goto done;
5092 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5093 5ef14e63 2019-06-02 stsp if (error != NULL)
5094 5ef14e63 2019-06-02 stsp goto done;
5095 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5096 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5097 5ef14e63 2019-06-02 stsp if (error != NULL)
5098 5ef14e63 2019-06-02 stsp goto done;
5100 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5101 5ef14e63 2019-06-02 stsp if (error)
5102 5ef14e63 2019-06-02 stsp goto done;
5104 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5105 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5106 5ef14e63 2019-06-02 stsp if (error != NULL)
5107 5ef14e63 2019-06-02 stsp goto done;
5109 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5110 5ef14e63 2019-06-02 stsp if (error)
5111 5ef14e63 2019-06-02 stsp goto done;
5113 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5114 5ef14e63 2019-06-02 stsp if (error)
5115 5ef14e63 2019-06-02 stsp goto done;
5116 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5117 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5118 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5119 5ef14e63 2019-06-02 stsp goto done;
5122 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5123 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5124 5ef14e63 2019-06-02 stsp if (error != NULL)
5125 5ef14e63 2019-06-02 stsp goto done;
5127 5ef14e63 2019-06-02 stsp if (did_something)
5128 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5130 5ef14e63 2019-06-02 stsp if (commit)
5131 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5132 5ef14e63 2019-06-02 stsp free(commit_id_str);
5133 5ef14e63 2019-06-02 stsp if (head_ref)
5134 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5135 818c7501 2019-07-11 stsp if (worktree)
5136 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5138 818c7501 2019-07-11 stsp got_repo_close(repo);
5139 818c7501 2019-07-11 stsp return error;
5142 818c7501 2019-07-11 stsp __dead static void
5143 818c7501 2019-07-11 stsp usage_rebase(void)
5145 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5146 af54c8f8 2019-07-11 stsp getprogname());
5151 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5154 0ebf8283 2019-07-24 stsp size_t len;
5156 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5157 0ebf8283 2019-07-24 stsp if (len > limit)
5158 0ebf8283 2019-07-24 stsp len = limit;
5159 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5160 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5162 0ebf8283 2019-07-24 stsp *nl = '\0';
5165 0ebf8283 2019-07-24 stsp static const struct got_error *
5166 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5168 5943eee2 2019-08-13 stsp const struct got_error *err;
5169 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5170 5943eee2 2019-08-13 stsp const char *s;
5172 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5174 5943eee2 2019-08-13 stsp return err;
5176 5943eee2 2019-08-13 stsp s = logmsg0;
5177 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5180 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5181 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5182 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5183 5943eee2 2019-08-13 stsp goto done;
5186 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5188 5943eee2 2019-08-13 stsp free(logmsg0);
5189 5943eee2 2019-08-13 stsp return err;
5192 818c7501 2019-07-11 stsp static const struct got_error *
5193 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5194 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5196 818c7501 2019-07-11 stsp const struct got_error *err;
5197 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5199 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5201 818c7501 2019-07-11 stsp goto done;
5203 ff0d2220 2019-07-11 stsp if (new_id) {
5204 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5206 ff0d2220 2019-07-11 stsp goto done;
5209 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5210 ff0d2220 2019-07-11 stsp if (new_id_str)
5211 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5213 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5215 0ebf8283 2019-07-24 stsp goto done;
5217 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5218 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5220 818c7501 2019-07-11 stsp free(old_id_str);
5221 818c7501 2019-07-11 stsp free(new_id_str);
5222 818c7501 2019-07-11 stsp return err;
5225 1ee397ad 2019-07-12 stsp static const struct got_error *
5226 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5228 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5230 818c7501 2019-07-11 stsp while (path[0] == '/')
5232 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5234 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5235 1ee397ad 2019-07-12 stsp return NULL;
5236 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5237 818c7501 2019-07-11 stsp *rebase_status = status;
5238 1ee397ad 2019-07-12 stsp return NULL;
5241 818c7501 2019-07-11 stsp static const struct got_error *
5242 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5243 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5244 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5246 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5247 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5248 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5251 818c7501 2019-07-11 stsp static const struct got_error *
5252 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5253 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5254 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5255 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5257 ff0d2220 2019-07-11 stsp const struct got_error *error;
5258 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5259 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5261 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5262 ff0d2220 2019-07-11 stsp if (error)
5263 ff0d2220 2019-07-11 stsp return error;
5265 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5266 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5267 ff0d2220 2019-07-11 stsp if (error) {
5268 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5269 ff0d2220 2019-07-11 stsp goto done;
5270 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5272 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5273 ff0d2220 2019-07-11 stsp free(new_commit_id);
5276 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5277 ff0d2220 2019-07-11 stsp return error;
5280 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5281 64c6d990 2019-07-11 stsp const char *path_prefix;
5282 64c6d990 2019-07-11 stsp size_t len;
5283 8ca9bd68 2019-07-25 stsp int errcode;
5286 64c6d990 2019-07-11 stsp static const struct got_error *
5287 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5288 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5289 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5290 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5292 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5294 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5295 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5296 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5298 64c6d990 2019-07-11 stsp return NULL;
5301 64c6d990 2019-07-11 stsp static const struct got_error *
5302 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5303 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5304 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5306 64c6d990 2019-07-11 stsp const struct got_error *err;
5307 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5308 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5309 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5311 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5312 64c6d990 2019-07-11 stsp return NULL;
5314 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5316 64c6d990 2019-07-11 stsp goto done;
5318 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5320 64c6d990 2019-07-11 stsp goto done;
5322 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5323 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5325 64c6d990 2019-07-11 stsp goto done;
5327 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5328 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5330 64c6d990 2019-07-11 stsp goto done;
5332 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5333 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5334 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5335 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5336 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5337 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5338 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5340 64c6d990 2019-07-11 stsp if (tree1)
5341 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5342 64c6d990 2019-07-11 stsp if (tree2)
5343 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5344 64c6d990 2019-07-11 stsp if (commit)
5345 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5346 64c6d990 2019-07-11 stsp if (parent_commit)
5347 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5348 64c6d990 2019-07-11 stsp return err;
5351 ff0d2220 2019-07-11 stsp static const struct got_error *
5352 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5353 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5354 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5355 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5356 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5358 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5359 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5360 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5361 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5362 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5364 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5366 af61c510 2019-07-19 stsp return err;
5368 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5369 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5371 af61c510 2019-07-19 stsp goto done;
5372 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5373 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5374 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5375 af61c510 2019-07-19 stsp if (err) {
5376 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5377 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5378 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5379 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5380 af61c510 2019-07-19 stsp "been reached?!?");
5382 ee780d5c 2020-01-04 stsp goto done;
5384 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5385 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5387 af61c510 2019-07-19 stsp goto done;
5389 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5391 af61c510 2019-07-19 stsp goto done;
5392 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5393 af61c510 2019-07-19 stsp commit_id = parent_id;
5397 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5398 af61c510 2019-07-19 stsp return err;
5401 af61c510 2019-07-19 stsp static const struct got_error *
5402 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5404 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5405 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5406 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5407 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5408 818c7501 2019-07-11 stsp char *cwd = NULL;
5409 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5410 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5411 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5412 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5413 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5414 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5415 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5416 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5417 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5418 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5419 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5420 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5422 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5423 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5425 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5426 818c7501 2019-07-11 stsp switch (ch) {
5428 818c7501 2019-07-11 stsp abort_rebase = 1;
5431 818c7501 2019-07-11 stsp continue_rebase = 1;
5434 818c7501 2019-07-11 stsp usage_rebase();
5435 818c7501 2019-07-11 stsp /* NOTREACHED */
5439 818c7501 2019-07-11 stsp argc -= optind;
5440 818c7501 2019-07-11 stsp argv += optind;
5442 43012d58 2019-07-14 stsp #ifndef PROFILE
5443 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5444 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5445 43012d58 2019-07-14 stsp err(1, "pledge");
5447 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5448 818c7501 2019-07-11 stsp usage_rebase();
5449 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5450 818c7501 2019-07-11 stsp if (argc != 0)
5451 818c7501 2019-07-11 stsp usage_rebase();
5452 818c7501 2019-07-11 stsp } else if (argc != 1)
5453 818c7501 2019-07-11 stsp usage_rebase();
5455 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5456 818c7501 2019-07-11 stsp if (cwd == NULL) {
5457 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5458 818c7501 2019-07-11 stsp goto done;
5460 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5461 818c7501 2019-07-11 stsp if (error)
5462 818c7501 2019-07-11 stsp goto done;
5464 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5466 818c7501 2019-07-11 stsp if (error != NULL)
5467 818c7501 2019-07-11 stsp goto done;
5469 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5470 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5471 818c7501 2019-07-11 stsp if (error)
5472 818c7501 2019-07-11 stsp goto done;
5474 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5475 818c7501 2019-07-11 stsp if (error)
5476 818c7501 2019-07-11 stsp goto done;
5478 f6794adc 2019-07-23 stsp if (abort_rebase) {
5479 818c7501 2019-07-11 stsp int did_something;
5480 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5481 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5482 f6794adc 2019-07-23 stsp goto done;
5484 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5485 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5486 3e3a69f1 2019-07-25 stsp worktree, repo);
5487 818c7501 2019-07-11 stsp if (error)
5488 818c7501 2019-07-11 stsp goto done;
5489 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5490 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5491 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5492 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5493 818c7501 2019-07-11 stsp if (error)
5494 818c7501 2019-07-11 stsp goto done;
5495 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5496 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5499 818c7501 2019-07-11 stsp if (continue_rebase) {
5500 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5501 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5502 f6794adc 2019-07-23 stsp goto done;
5504 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5505 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5506 3e3a69f1 2019-07-25 stsp worktree, repo);
5507 818c7501 2019-07-11 stsp if (error)
5508 818c7501 2019-07-11 stsp goto done;
5510 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5511 01757395 2019-07-12 stsp resume_commit_id, repo);
5512 818c7501 2019-07-11 stsp if (error)
5513 818c7501 2019-07-11 stsp goto done;
5515 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5516 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5517 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5518 818c7501 2019-07-11 stsp goto done;
5521 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5522 818c7501 2019-07-11 stsp if (error != NULL)
5523 818c7501 2019-07-11 stsp goto done;
5526 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5527 ff0d2220 2019-07-11 stsp if (error)
5528 ff0d2220 2019-07-11 stsp goto done;
5530 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5531 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5533 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5534 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5535 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5536 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5537 818c7501 2019-07-11 stsp if (error)
5538 818c7501 2019-07-11 stsp goto done;
5539 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5540 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5541 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5542 818c7501 2019-07-11 stsp "with work tree's branch");
5543 818c7501 2019-07-11 stsp goto done;
5546 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5547 a51a74b3 2019-07-27 stsp if (error) {
5548 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5549 a51a74b3 2019-07-27 stsp goto done;
5550 a51a74b3 2019-07-27 stsp error = NULL;
5552 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5553 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5554 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5555 a51a74b3 2019-07-27 stsp goto done;
5557 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5558 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5559 818c7501 2019-07-11 stsp if (error)
5560 818c7501 2019-07-11 stsp goto done;
5563 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5564 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5565 818c7501 2019-07-11 stsp if (error)
5566 818c7501 2019-07-11 stsp goto done;
5568 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5569 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5570 fc66b545 2019-08-12 stsp if (pid == NULL) {
5571 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5572 fc66b545 2019-08-12 stsp int did_something;
5573 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5574 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5575 fc66b545 2019-08-12 stsp &did_something);
5576 fc66b545 2019-08-12 stsp if (error)
5577 fc66b545 2019-08-12 stsp goto done;
5578 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5579 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5581 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5582 fc66b545 2019-08-12 stsp goto done;
5584 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5585 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5586 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5587 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5588 818c7501 2019-07-11 stsp commit = NULL;
5589 818c7501 2019-07-11 stsp if (error)
5590 818c7501 2019-07-11 stsp goto done;
5592 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5593 38b0338b 2019-11-29 stsp if (continue_rebase) {
5594 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5595 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5596 38b0338b 2019-11-29 stsp goto done;
5598 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5599 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5600 38b0338b 2019-11-29 stsp char *id_str;
5601 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5602 38b0338b 2019-11-29 stsp new_base_branch);
5603 38b0338b 2019-11-29 stsp if (error)
5604 38b0338b 2019-11-29 stsp goto done;
5605 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5606 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5607 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5608 38b0338b 2019-11-29 stsp free(id_str);
5609 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5610 38b0338b 2019-11-29 stsp new_head_commit_id);
5611 38b0338b 2019-11-29 stsp if (error)
5612 38b0338b 2019-11-29 stsp goto done;
5616 818c7501 2019-07-11 stsp pid = NULL;
5617 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5618 818c7501 2019-07-11 stsp commit_id = qid->id;
5619 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5620 818c7501 2019-07-11 stsp pid = qid;
5622 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5623 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5624 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5625 818c7501 2019-07-11 stsp if (error)
5626 818c7501 2019-07-11 stsp goto done;
5628 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5629 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5633 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5634 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5635 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5636 818c7501 2019-07-11 stsp if (error)
5637 818c7501 2019-07-11 stsp goto done;
5640 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5641 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5642 818c7501 2019-07-11 stsp if (error)
5643 818c7501 2019-07-11 stsp goto done;
5644 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5645 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5647 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5648 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5650 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5651 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5652 818c7501 2019-07-11 stsp free(resume_commit_id);
5653 818c7501 2019-07-11 stsp free(yca_id);
5654 818c7501 2019-07-11 stsp if (commit)
5655 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5656 818c7501 2019-07-11 stsp if (branch)
5657 818c7501 2019-07-11 stsp got_ref_close(branch);
5658 818c7501 2019-07-11 stsp if (new_base_branch)
5659 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5660 818c7501 2019-07-11 stsp if (tmp_branch)
5661 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5662 5ef14e63 2019-06-02 stsp if (worktree)
5663 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5665 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5666 5ef14e63 2019-06-02 stsp return error;
5669 0ebf8283 2019-07-24 stsp __dead static void
5670 0ebf8283 2019-07-24 stsp usage_histedit(void)
5672 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5673 0ebf8283 2019-07-24 stsp getprogname());
5677 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5678 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5679 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5680 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5681 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5683 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5684 0ebf8283 2019-07-24 stsp unsigned char code;
5685 0ebf8283 2019-07-24 stsp const char *name;
5686 0ebf8283 2019-07-24 stsp const char *desc;
5687 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5688 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5689 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5690 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5691 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5692 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5693 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5696 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5697 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5698 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5699 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5700 0ebf8283 2019-07-24 stsp char *logmsg;
5702 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5704 0ebf8283 2019-07-24 stsp static const struct got_error *
5705 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5706 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5708 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5709 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5710 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5713 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5715 0ebf8283 2019-07-24 stsp goto done;
5717 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5719 0ebf8283 2019-07-24 stsp goto done;
5721 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5723 0ebf8283 2019-07-24 stsp goto done;
5725 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5726 0ebf8283 2019-07-24 stsp if (n < 0)
5727 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5729 0ebf8283 2019-07-24 stsp if (commit)
5730 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5731 0ebf8283 2019-07-24 stsp free(id_str);
5732 0ebf8283 2019-07-24 stsp free(logmsg);
5733 0ebf8283 2019-07-24 stsp return err;
5736 0ebf8283 2019-07-24 stsp static const struct got_error *
5737 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5738 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5740 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5741 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5743 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5744 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5746 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5747 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5753 0ebf8283 2019-07-24 stsp return err;
5756 0ebf8283 2019-07-24 stsp static const struct got_error *
5757 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5759 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5762 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5763 0ebf8283 2019-07-24 stsp if (n < 0)
5764 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5766 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5767 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5768 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5769 0ebf8283 2019-07-24 stsp cmd->desc);
5770 0ebf8283 2019-07-24 stsp if (n < 0) {
5771 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5775 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5776 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5777 0ebf8283 2019-07-24 stsp if (n < 0)
5778 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5779 0ebf8283 2019-07-24 stsp return err;
5782 0ebf8283 2019-07-24 stsp static const struct got_error *
5783 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5785 0ebf8283 2019-07-24 stsp static char msg[42];
5788 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5790 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5791 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5793 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5796 0ebf8283 2019-07-24 stsp static const struct got_error *
5797 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5798 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5800 0ebf8283 2019-07-24 stsp const struct got_error *err;
5801 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5802 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5804 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5806 0ebf8283 2019-07-24 stsp return err;
5808 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5810 0ebf8283 2019-07-24 stsp goto done;
5812 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5814 5943eee2 2019-08-13 stsp goto done;
5815 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5816 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5817 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5818 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5819 0ebf8283 2019-07-24 stsp goto done;
5822 0ebf8283 2019-07-24 stsp if (folded_commit)
5823 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5824 0ebf8283 2019-07-24 stsp free(id_str);
5825 5943eee2 2019-08-13 stsp free(folded_logmsg);
5826 0ebf8283 2019-07-24 stsp return err;
5829 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5830 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5832 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5834 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5835 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5836 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5837 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5838 3f9de99f 2019-07-24 stsp folded = prev;
5839 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5842 0ebf8283 2019-07-24 stsp return folded;
5845 0ebf8283 2019-07-24 stsp static const struct got_error *
5846 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5847 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5849 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5850 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5851 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5852 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5854 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5856 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5858 0ebf8283 2019-07-24 stsp return err;
5860 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5861 0ebf8283 2019-07-24 stsp if (folded) {
5862 0ebf8283 2019-07-24 stsp while (folded != hle) {
5863 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5864 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5867 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5868 0ebf8283 2019-07-24 stsp logmsg, repo);
5870 0ebf8283 2019-07-24 stsp goto done;
5871 0ebf8283 2019-07-24 stsp free(logmsg);
5872 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5873 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5877 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5879 0ebf8283 2019-07-24 stsp goto done;
5880 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5882 5943eee2 2019-08-13 stsp goto done;
5883 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5884 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5885 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5886 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5887 0ebf8283 2019-07-24 stsp goto done;
5889 0ebf8283 2019-07-24 stsp free(logmsg);
5890 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5892 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5894 0ebf8283 2019-07-24 stsp goto done;
5896 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5898 0ebf8283 2019-07-24 stsp goto done;
5900 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5901 0ebf8283 2019-07-24 stsp close(fd);
5903 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5905 0ebf8283 2019-07-24 stsp goto done;
5907 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5908 0ebf8283 2019-07-24 stsp if (err) {
5909 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5910 0ebf8283 2019-07-24 stsp goto done;
5911 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5914 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5915 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5916 0ebf8283 2019-07-24 stsp free(logmsg_path);
5917 0ebf8283 2019-07-24 stsp free(logmsg);
5918 5943eee2 2019-08-13 stsp free(orig_logmsg);
5919 0ebf8283 2019-07-24 stsp free(editor);
5920 0ebf8283 2019-07-24 stsp if (commit)
5921 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5922 0ebf8283 2019-07-24 stsp return err;
5925 0ebf8283 2019-07-24 stsp static const struct got_error *
5926 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5927 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5929 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5930 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5931 0ebf8283 2019-07-24 stsp size_t size;
5932 0ebf8283 2019-07-24 stsp ssize_t len;
5933 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5934 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5935 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5936 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5938 0ebf8283 2019-07-24 stsp for (;;) {
5939 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5940 0ebf8283 2019-07-24 stsp if (len == -1) {
5941 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5942 0ebf8283 2019-07-24 stsp if (feof(f))
5944 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5945 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5950 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5952 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5953 0ebf8283 2019-07-24 stsp free(line);
5954 0ebf8283 2019-07-24 stsp line = NULL;
5957 0ebf8283 2019-07-24 stsp cmd = NULL;
5958 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5959 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5960 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5961 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5962 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5965 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5970 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5971 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5974 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5976 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5977 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5978 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5981 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5982 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5986 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5987 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5988 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5992 0ebf8283 2019-07-24 stsp free(line);
5993 0ebf8283 2019-07-24 stsp line = NULL;
5997 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5999 0ebf8283 2019-07-24 stsp *end = '\0';
6001 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
6002 0ebf8283 2019-07-24 stsp if (err) {
6003 0ebf8283 2019-07-24 stsp /* override error code */
6004 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6008 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
6009 0ebf8283 2019-07-24 stsp if (hle == NULL) {
6010 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
6013 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
6014 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
6015 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
6016 0ebf8283 2019-07-24 stsp commit_id = NULL;
6017 0ebf8283 2019-07-24 stsp free(line);
6018 0ebf8283 2019-07-24 stsp line = NULL;
6019 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6022 0ebf8283 2019-07-24 stsp free(line);
6023 0ebf8283 2019-07-24 stsp free(commit_id);
6024 0ebf8283 2019-07-24 stsp return err;
6027 0ebf8283 2019-07-24 stsp static const struct got_error *
6028 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6029 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6031 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6032 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6033 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6034 bfce7f83 2019-07-27 stsp static char msg[80];
6035 bfce7f83 2019-07-27 stsp char *id_str;
6037 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6038 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6039 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6040 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6041 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6043 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6044 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6045 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6048 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6049 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6051 bfce7f83 2019-07-27 stsp return err;
6052 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6053 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6054 bfce7f83 2019-07-27 stsp free(id_str);
6055 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6059 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6060 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6061 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6062 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6064 bfce7f83 2019-07-27 stsp return NULL;
6067 bfce7f83 2019-07-27 stsp static const struct got_error *
6068 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6069 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6070 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6072 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6073 0ebf8283 2019-07-24 stsp char *editor;
6074 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6076 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6078 0ebf8283 2019-07-24 stsp return err;
6080 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6081 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6082 0ebf8283 2019-07-24 stsp goto done;
6085 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6086 0ebf8283 2019-07-24 stsp if (f == NULL) {
6087 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6088 0ebf8283 2019-07-24 stsp goto done;
6090 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6092 bfce7f83 2019-07-27 stsp goto done;
6094 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6096 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6097 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6098 0ebf8283 2019-07-24 stsp free(editor);
6099 0ebf8283 2019-07-24 stsp return err;
6102 0ebf8283 2019-07-24 stsp static const struct got_error *
6103 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6104 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
6106 0ebf8283 2019-07-24 stsp static const struct got_error *
6107 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6108 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6110 0ebf8283 2019-07-24 stsp const struct got_error *err;
6111 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6112 0ebf8283 2019-07-24 stsp char *path = NULL;
6114 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6116 0ebf8283 2019-07-24 stsp return err;
6118 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
6120 0ebf8283 2019-07-24 stsp goto done;
6122 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6124 0ebf8283 2019-07-24 stsp goto done;
6126 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6127 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6128 0ebf8283 2019-07-24 stsp goto done;
6132 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6133 0ebf8283 2019-07-24 stsp if (err) {
6134 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6135 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6136 0ebf8283 2019-07-24 stsp goto done;
6137 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6138 0ebf8283 2019-07-24 stsp commits, path, repo);
6141 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6142 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6143 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6144 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6145 0ebf8283 2019-07-24 stsp free(path);
6146 0ebf8283 2019-07-24 stsp return err;
6149 0ebf8283 2019-07-24 stsp static const struct got_error *
6150 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6151 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6153 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6154 0ebf8283 2019-07-24 stsp char *path = NULL;
6155 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6156 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6157 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6159 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6161 0ebf8283 2019-07-24 stsp return err;
6163 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6164 0ebf8283 2019-07-24 stsp if (f == NULL) {
6165 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6166 0ebf8283 2019-07-24 stsp goto done;
6168 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6169 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6174 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6175 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6176 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6177 0ebf8283 2019-07-24 stsp if (n < 0) {
6178 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6184 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6185 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6186 0ebf8283 2019-07-24 stsp free(path);
6187 0ebf8283 2019-07-24 stsp if (commit)
6188 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6189 0ebf8283 2019-07-24 stsp return err;
6193 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6195 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6197 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6198 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6199 bfce7f83 2019-07-27 stsp free(hle);
6203 0ebf8283 2019-07-24 stsp static const struct got_error *
6204 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6205 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6207 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6208 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6210 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6211 0ebf8283 2019-07-24 stsp if (f == NULL) {
6212 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6213 0ebf8283 2019-07-24 stsp goto done;
6216 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6218 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6219 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6220 0ebf8283 2019-07-24 stsp return err;
6223 0ebf8283 2019-07-24 stsp static const struct got_error *
6224 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6225 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6226 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6228 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6229 0ebf8283 2019-07-24 stsp int resp = ' ';
6231 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6232 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6233 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6234 0ebf8283 2019-07-24 stsp resp = getchar();
6235 a61a4414 2019-08-07 stsp if (resp == '\n')
6236 a61a4414 2019-08-07 stsp resp = getchar();
6237 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6238 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6239 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6241 426ebf2e 2019-07-25 stsp if (err) {
6242 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6243 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6245 bfce7f83 2019-07-27 stsp prev_err = err;
6246 426ebf2e 2019-07-25 stsp resp = ' ';
6250 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6251 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6252 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6253 0ebf8283 2019-07-24 stsp commits, repo);
6254 426ebf2e 2019-07-25 stsp if (err) {
6255 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6256 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6258 bfce7f83 2019-07-27 stsp prev_err = err;
6259 426ebf2e 2019-07-25 stsp resp = ' ';
6263 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6264 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6267 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6270 0ebf8283 2019-07-24 stsp return err;
6273 0ebf8283 2019-07-24 stsp static const struct got_error *
6274 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6275 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6276 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6278 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6279 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6280 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6281 3e3a69f1 2019-07-25 stsp branch, repo);
6284 0ebf8283 2019-07-24 stsp static const struct got_error *
6285 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6286 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6288 0ebf8283 2019-07-24 stsp const struct got_error *err;
6289 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6291 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6293 0ebf8283 2019-07-24 stsp goto done;
6295 0ebf8283 2019-07-24 stsp if (new_id) {
6296 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6298 0ebf8283 2019-07-24 stsp goto done;
6301 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6302 0ebf8283 2019-07-24 stsp if (new_id_str)
6303 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6305 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6306 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6307 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6308 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6309 0ebf8283 2019-07-24 stsp goto done;
6311 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6313 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6315 0ebf8283 2019-07-24 stsp goto done;
6318 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6319 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6320 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6321 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6322 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6324 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6325 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6326 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6334 0ebf8283 2019-07-24 stsp free(old_id_str);
6335 0ebf8283 2019-07-24 stsp free(new_id_str);
6336 0ebf8283 2019-07-24 stsp return err;
6339 0ebf8283 2019-07-24 stsp static const struct got_error *
6340 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6341 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6342 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6343 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6345 0ebf8283 2019-07-24 stsp const struct got_error *err;
6346 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6347 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6349 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6350 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6351 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6353 0ebf8283 2019-07-24 stsp return err;
6356 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6358 0ebf8283 2019-07-24 stsp return err;
6360 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6361 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6362 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6363 0ebf8283 2019-07-24 stsp if (err) {
6364 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6365 0ebf8283 2019-07-24 stsp goto done;
6366 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6368 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6369 0ebf8283 2019-07-24 stsp free(new_commit_id);
6372 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6373 0ebf8283 2019-07-24 stsp return err;
6376 0ebf8283 2019-07-24 stsp static const struct got_error *
6377 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6378 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6380 0ebf8283 2019-07-24 stsp const struct got_error *error;
6381 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6383 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6385 0ebf8283 2019-07-24 stsp if (error)
6386 0ebf8283 2019-07-24 stsp return error;
6388 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6389 0ebf8283 2019-07-24 stsp if (error)
6390 0ebf8283 2019-07-24 stsp return error;
6392 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6393 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6394 0ebf8283 2019-07-24 stsp return error;
6397 0ebf8283 2019-07-24 stsp static const struct got_error *
6398 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6400 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6401 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6402 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6403 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6404 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6405 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6406 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6407 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6408 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6409 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6410 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6411 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6412 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6413 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6414 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6415 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6416 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6417 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6418 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6419 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6420 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6422 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6423 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6424 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6426 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6427 0ebf8283 2019-07-24 stsp switch (ch) {
6429 0ebf8283 2019-07-24 stsp abort_edit = 1;
6432 0ebf8283 2019-07-24 stsp continue_edit = 1;
6435 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6438 0ebf8283 2019-07-24 stsp usage_histedit();
6439 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6443 0ebf8283 2019-07-24 stsp argc -= optind;
6444 0ebf8283 2019-07-24 stsp argv += optind;
6446 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6447 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6448 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6449 0ebf8283 2019-07-24 stsp err(1, "pledge");
6451 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6452 0ebf8283 2019-07-24 stsp usage_histedit();
6453 0ebf8283 2019-07-24 stsp if (argc != 0)
6454 0ebf8283 2019-07-24 stsp usage_histedit();
6457 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6458 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6459 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6460 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6461 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6462 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6465 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6466 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6467 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6468 0ebf8283 2019-07-24 stsp goto done;
6470 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6471 0ebf8283 2019-07-24 stsp if (error)
6472 0ebf8283 2019-07-24 stsp goto done;
6474 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6476 0ebf8283 2019-07-24 stsp if (error != NULL)
6477 0ebf8283 2019-07-24 stsp goto done;
6479 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6480 0ebf8283 2019-07-24 stsp if (error)
6481 0ebf8283 2019-07-24 stsp goto done;
6482 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6483 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6484 0ebf8283 2019-07-24 stsp goto done;
6487 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6488 0ebf8283 2019-07-24 stsp if (error)
6489 0ebf8283 2019-07-24 stsp goto done;
6491 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6492 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6493 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6494 3e3a69f1 2019-07-25 stsp worktree, repo);
6495 0ebf8283 2019-07-24 stsp if (error)
6496 0ebf8283 2019-07-24 stsp goto done;
6497 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6498 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6499 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6500 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6501 0ebf8283 2019-07-24 stsp if (error)
6502 0ebf8283 2019-07-24 stsp goto done;
6503 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6504 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6505 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6506 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6507 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6508 0ebf8283 2019-07-24 stsp goto done;
6511 0ebf8283 2019-07-24 stsp if (continue_edit) {
6512 0ebf8283 2019-07-24 stsp char *path;
6514 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6515 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6516 0ebf8283 2019-07-24 stsp goto done;
6519 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6520 0ebf8283 2019-07-24 stsp if (error)
6521 0ebf8283 2019-07-24 stsp goto done;
6523 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6524 0ebf8283 2019-07-24 stsp free(path);
6525 0ebf8283 2019-07-24 stsp if (error)
6526 0ebf8283 2019-07-24 stsp goto done;
6528 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6529 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6530 3e3a69f1 2019-07-25 stsp worktree, repo);
6531 0ebf8283 2019-07-24 stsp if (error)
6532 0ebf8283 2019-07-24 stsp goto done;
6534 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6535 0ebf8283 2019-07-24 stsp if (error)
6536 0ebf8283 2019-07-24 stsp goto done;
6538 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6539 0ebf8283 2019-07-24 stsp head_commit_id);
6540 0ebf8283 2019-07-24 stsp if (error)
6541 0ebf8283 2019-07-24 stsp goto done;
6542 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6543 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6544 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6545 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6546 3aac7cf7 2019-07-25 stsp goto done;
6548 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6549 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6550 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6551 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6552 0ebf8283 2019-07-24 stsp commit = NULL;
6553 0ebf8283 2019-07-24 stsp if (error)
6554 0ebf8283 2019-07-24 stsp goto done;
6556 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6557 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6558 0ebf8283 2019-07-24 stsp goto done;
6561 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6562 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6563 0ebf8283 2019-07-24 stsp if (error != NULL)
6564 0ebf8283 2019-07-24 stsp goto done;
6566 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6567 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6568 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6569 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6570 c7d20a3f 2019-07-30 stsp goto done;
6573 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6574 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6575 bfce7f83 2019-07-27 stsp branch = NULL;
6576 0ebf8283 2019-07-24 stsp if (error)
6577 0ebf8283 2019-07-24 stsp goto done;
6579 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6580 0ebf8283 2019-07-24 stsp head_commit_id);
6581 0ebf8283 2019-07-24 stsp if (error)
6582 0ebf8283 2019-07-24 stsp goto done;
6583 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6584 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6585 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6586 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6587 3aac7cf7 2019-07-25 stsp goto done;
6589 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6590 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6591 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6592 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6593 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6594 0ebf8283 2019-07-24 stsp commit = NULL;
6595 0ebf8283 2019-07-24 stsp if (error)
6596 0ebf8283 2019-07-24 stsp goto done;
6598 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6599 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6600 bfce7f83 2019-07-27 stsp if (error)
6601 bfce7f83 2019-07-27 stsp goto done;
6603 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6604 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6605 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6606 6ba2bea2 2019-07-27 stsp if (error) {
6607 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6608 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6609 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6610 0ebf8283 2019-07-24 stsp goto done;
6613 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6615 6ba2bea2 2019-07-27 stsp if (error) {
6616 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6617 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6618 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6619 0ebf8283 2019-07-24 stsp goto done;
6624 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6626 6ba2bea2 2019-07-27 stsp if (error) {
6627 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6628 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6629 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6630 0ebf8283 2019-07-24 stsp goto done;
6635 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6636 4ec14e60 2019-08-28 hiltjo if (error)
6637 0ebf8283 2019-07-24 stsp goto done;
6639 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6640 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6641 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6642 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6645 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6646 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6647 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6648 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6651 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6652 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6654 0ebf8283 2019-07-24 stsp if (error)
6655 0ebf8283 2019-07-24 stsp goto done;
6659 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6660 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6661 0ebf8283 2019-07-24 stsp if (error)
6662 0ebf8283 2019-07-24 stsp goto done;
6666 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6667 0ebf8283 2019-07-24 stsp hle->commit_id);
6668 0ebf8283 2019-07-24 stsp if (error)
6669 0ebf8283 2019-07-24 stsp goto done;
6670 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6671 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6673 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6674 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6675 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6676 0ebf8283 2019-07-24 stsp if (error)
6677 0ebf8283 2019-07-24 stsp goto done;
6678 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6679 0ebf8283 2019-07-24 stsp commit = NULL;
6681 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6682 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6686 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6687 0ebf8283 2019-07-24 stsp char *id_str;
6688 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6689 0ebf8283 2019-07-24 stsp if (error)
6690 0ebf8283 2019-07-24 stsp goto done;
6691 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6693 0ebf8283 2019-07-24 stsp free(id_str);
6694 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6695 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6696 3e3a69f1 2019-07-25 stsp fileindex);
6697 0ebf8283 2019-07-24 stsp goto done;
6700 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6701 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6702 0ebf8283 2019-07-24 stsp if (error)
6703 0ebf8283 2019-07-24 stsp goto done;
6707 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6708 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6709 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6710 0ebf8283 2019-07-24 stsp if (error)
6711 0ebf8283 2019-07-24 stsp goto done;
6714 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6715 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6716 0ebf8283 2019-07-24 stsp if (error)
6717 0ebf8283 2019-07-24 stsp goto done;
6718 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6719 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6721 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6722 3e3a69f1 2019-07-25 stsp branch, repo);
6724 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6725 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6726 0ebf8283 2019-07-24 stsp free(head_commit_id);
6727 0ebf8283 2019-07-24 stsp free(base_commit_id);
6728 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6729 0ebf8283 2019-07-24 stsp if (commit)
6730 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6731 0ebf8283 2019-07-24 stsp if (branch)
6732 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6733 0ebf8283 2019-07-24 stsp if (tmp_branch)
6734 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6735 0ebf8283 2019-07-24 stsp if (worktree)
6736 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6738 2822a352 2019-10-15 stsp got_repo_close(repo);
6739 2822a352 2019-10-15 stsp return error;
6742 2822a352 2019-10-15 stsp __dead static void
6743 2822a352 2019-10-15 stsp usage_integrate(void)
6745 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6749 2822a352 2019-10-15 stsp static const struct got_error *
6750 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6752 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6753 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6754 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6755 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6756 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6757 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6758 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6759 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6760 2822a352 2019-10-15 stsp int ch, did_something = 0;
6762 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6763 2822a352 2019-10-15 stsp switch (ch) {
6765 2822a352 2019-10-15 stsp usage_integrate();
6766 2822a352 2019-10-15 stsp /* NOTREACHED */
6770 2822a352 2019-10-15 stsp argc -= optind;
6771 2822a352 2019-10-15 stsp argv += optind;
6773 2822a352 2019-10-15 stsp if (argc != 1)
6774 2822a352 2019-10-15 stsp usage_integrate();
6775 2822a352 2019-10-15 stsp branch_arg = argv[0];
6777 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6778 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6779 2822a352 2019-10-15 stsp err(1, "pledge");
6781 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6782 2822a352 2019-10-15 stsp if (cwd == NULL) {
6783 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6784 2822a352 2019-10-15 stsp goto done;
6787 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6788 2822a352 2019-10-15 stsp if (error)
6789 2822a352 2019-10-15 stsp goto done;
6791 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6792 2822a352 2019-10-15 stsp if (error)
6793 2822a352 2019-10-15 stsp goto done;
6795 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6797 2822a352 2019-10-15 stsp if (error != NULL)
6798 2822a352 2019-10-15 stsp goto done;
6800 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6801 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6802 2822a352 2019-10-15 stsp if (error)
6803 2822a352 2019-10-15 stsp goto done;
6805 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6806 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6807 2822a352 2019-10-15 stsp goto done;
6810 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6811 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6812 2822a352 2019-10-15 stsp if (error)
6813 2822a352 2019-10-15 stsp goto done;
6815 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6816 2822a352 2019-10-15 stsp if (refname == NULL) {
6817 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6818 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6819 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6820 2822a352 2019-10-15 stsp goto done;
6822 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6823 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6824 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6825 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6826 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6827 2822a352 2019-10-15 stsp goto done;
6830 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6831 2822a352 2019-10-15 stsp if (error)
6832 2822a352 2019-10-15 stsp goto done;
6834 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6835 2822a352 2019-10-15 stsp if (error)
6836 2822a352 2019-10-15 stsp goto done;
6838 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6839 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6840 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6841 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6842 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6843 2822a352 2019-10-15 stsp goto done;
6846 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6847 2822a352 2019-10-15 stsp if (error) {
6848 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6849 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6850 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6851 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6852 2822a352 2019-10-15 stsp goto done;
6855 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6856 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6857 2822a352 2019-10-15 stsp check_cancelled, NULL);
6858 2822a352 2019-10-15 stsp if (error)
6859 2822a352 2019-10-15 stsp goto done;
6861 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6864 715dc77e 2019-08-03 stsp got_repo_close(repo);
6865 2822a352 2019-10-15 stsp if (worktree)
6866 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6867 2822a352 2019-10-15 stsp free(cwd);
6868 2822a352 2019-10-15 stsp free(base_commit_id);
6869 2822a352 2019-10-15 stsp free(commit_id);
6870 2822a352 2019-10-15 stsp free(refname);
6871 2822a352 2019-10-15 stsp free(base_refname);
6872 715dc77e 2019-08-03 stsp return error;
6875 715dc77e 2019-08-03 stsp __dead static void
6876 715dc77e 2019-08-03 stsp usage_stage(void)
6878 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6879 f3055044 2019-08-07 stsp "[file-path ...]\n",
6880 715dc77e 2019-08-03 stsp getprogname());
6884 715dc77e 2019-08-03 stsp static const struct got_error *
6885 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6886 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6887 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6888 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6890 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6891 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6893 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6894 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6895 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6896 408b4ebc 2019-08-03 stsp return NULL;
6898 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6899 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6900 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6902 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6904 408b4ebc 2019-08-03 stsp return err;
6906 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6907 408b4ebc 2019-08-03 stsp free(id_str);
6908 dc424a06 2019-08-07 stsp return NULL;
6911 dc424a06 2019-08-07 stsp static const struct got_error *
6912 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6914 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6915 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6916 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6917 715dc77e 2019-08-03 stsp char *cwd = NULL;
6918 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6919 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6920 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6921 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6922 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6923 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6925 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6927 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6928 715dc77e 2019-08-03 stsp switch (ch) {
6930 408b4ebc 2019-08-03 stsp list_stage = 1;
6933 dc424a06 2019-08-07 stsp pflag = 1;
6936 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6939 715dc77e 2019-08-03 stsp usage_stage();
6940 715dc77e 2019-08-03 stsp /* NOTREACHED */
6944 715dc77e 2019-08-03 stsp argc -= optind;
6945 715dc77e 2019-08-03 stsp argv += optind;
6947 715dc77e 2019-08-03 stsp #ifndef PROFILE
6948 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6949 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6950 715dc77e 2019-08-03 stsp err(1, "pledge");
6952 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6953 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6954 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6955 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6957 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6958 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6959 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6960 715dc77e 2019-08-03 stsp goto done;
6963 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6964 715dc77e 2019-08-03 stsp if (error)
6965 715dc77e 2019-08-03 stsp goto done;
6967 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6969 715dc77e 2019-08-03 stsp if (error != NULL)
6970 715dc77e 2019-08-03 stsp goto done;
6972 dc424a06 2019-08-07 stsp if (patch_script_path) {
6973 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6974 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6975 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6976 dc424a06 2019-08-07 stsp patch_script_path);
6977 dc424a06 2019-08-07 stsp goto done;
6980 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6981 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6982 715dc77e 2019-08-03 stsp if (error)
6983 715dc77e 2019-08-03 stsp goto done;
6985 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6986 6d022e97 2019-08-04 stsp if (error)
6987 6d022e97 2019-08-04 stsp goto done;
6989 6d022e97 2019-08-04 stsp if (list_stage)
6990 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6991 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6993 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6994 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6995 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6996 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6997 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
7000 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7001 2e1f37b0 2019-08-08 stsp error == NULL)
7002 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7004 ad493afc 2019-08-03 stsp got_repo_close(repo);
7005 ad493afc 2019-08-03 stsp if (worktree)
7006 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
7007 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7008 ad493afc 2019-08-03 stsp free((char *)pe->path);
7009 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
7010 ad493afc 2019-08-03 stsp free(cwd);
7011 ad493afc 2019-08-03 stsp return error;
7014 ad493afc 2019-08-03 stsp __dead static void
7015 ad493afc 2019-08-03 stsp usage_unstage(void)
7017 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7018 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7019 ad493afc 2019-08-03 stsp getprogname());
7024 ad493afc 2019-08-03 stsp static const struct got_error *
7025 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7027 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7028 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7029 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7030 ad493afc 2019-08-03 stsp char *cwd = NULL;
7031 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7032 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7033 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7034 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7035 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7036 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7038 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7040 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7041 ad493afc 2019-08-03 stsp switch (ch) {
7043 2e1f37b0 2019-08-08 stsp pflag = 1;
7046 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7049 ad493afc 2019-08-03 stsp usage_unstage();
7050 ad493afc 2019-08-03 stsp /* NOTREACHED */
7054 ad493afc 2019-08-03 stsp argc -= optind;
7055 ad493afc 2019-08-03 stsp argv += optind;
7057 ad493afc 2019-08-03 stsp #ifndef PROFILE
7058 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7059 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7060 ad493afc 2019-08-03 stsp err(1, "pledge");
7062 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7063 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7065 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7066 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7067 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7068 ad493afc 2019-08-03 stsp goto done;
7071 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7072 ad493afc 2019-08-03 stsp if (error)
7073 ad493afc 2019-08-03 stsp goto done;
7075 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7077 ad493afc 2019-08-03 stsp if (error != NULL)
7078 ad493afc 2019-08-03 stsp goto done;
7080 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7081 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7082 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7083 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7084 2e1f37b0 2019-08-08 stsp patch_script_path);
7085 2e1f37b0 2019-08-08 stsp goto done;
7089 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7090 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7091 ad493afc 2019-08-03 stsp if (error)
7092 ad493afc 2019-08-03 stsp goto done;
7094 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7095 ad493afc 2019-08-03 stsp if (error)
7096 ad493afc 2019-08-03 stsp goto done;
7098 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7099 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7100 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7101 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7103 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7104 2e1f37b0 2019-08-08 stsp error == NULL)
7105 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7107 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7108 715dc77e 2019-08-03 stsp if (worktree)
7109 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7110 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7111 715dc77e 2019-08-03 stsp free((char *)pe->path);
7112 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7113 715dc77e 2019-08-03 stsp free(cwd);
7114 01073a5d 2019-08-22 stsp return error;
7117 01073a5d 2019-08-22 stsp __dead static void
7118 01073a5d 2019-08-22 stsp usage_cat(void)
7120 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7121 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7125 01073a5d 2019-08-22 stsp static const struct got_error *
7126 01073a5d 2019-08-22 stsp cat_blob(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_blob_object *blob;
7131 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7133 01073a5d 2019-08-22 stsp return err;
7135 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7136 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7137 01073a5d 2019-08-22 stsp return err;
7140 01073a5d 2019-08-22 stsp static const struct got_error *
7141 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7143 01073a5d 2019-08-22 stsp const struct got_error *err;
7144 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7145 56e0773d 2019-11-28 stsp int nentries, i;
7147 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7149 01073a5d 2019-08-22 stsp return err;
7151 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7152 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7153 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7154 01073a5d 2019-08-22 stsp char *id_str;
7155 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7157 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7158 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7161 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7162 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7163 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7164 01073a5d 2019-08-22 stsp free(id_str);
7167 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7168 01073a5d 2019-08-22 stsp return err;
7171 01073a5d 2019-08-22 stsp static const struct got_error *
7172 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7174 01073a5d 2019-08-22 stsp const struct got_error *err;
7175 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7176 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7177 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7178 01073a5d 2019-08-22 stsp char *id_str = NULL;
7179 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7181 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7183 01073a5d 2019-08-22 stsp return err;
7185 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7187 01073a5d 2019-08-22 stsp goto done;
7189 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7190 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7191 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7192 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7193 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7194 01073a5d 2019-08-22 stsp char *pid_str;
7195 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7197 01073a5d 2019-08-22 stsp goto done;
7198 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7199 01073a5d 2019-08-22 stsp free(pid_str);
7201 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7202 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7203 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7205 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7206 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7207 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7209 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7210 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7211 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7213 01073a5d 2019-08-22 stsp free(id_str);
7214 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7215 01073a5d 2019-08-22 stsp return err;
7218 01073a5d 2019-08-22 stsp static const struct got_error *
7219 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7221 01073a5d 2019-08-22 stsp const struct got_error *err;
7222 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7223 01073a5d 2019-08-22 stsp char *id_str = NULL;
7224 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7226 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7228 01073a5d 2019-08-22 stsp return err;
7230 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7232 01073a5d 2019-08-22 stsp goto done;
7234 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7236 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7237 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7238 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7239 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7241 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7242 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7243 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7245 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7246 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7247 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7249 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7250 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7251 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7257 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7258 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7260 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7261 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7262 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7264 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7265 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7266 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7268 01073a5d 2019-08-22 stsp free(id_str);
7269 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7270 01073a5d 2019-08-22 stsp return err;
7273 01073a5d 2019-08-22 stsp static const struct got_error *
7274 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7276 01073a5d 2019-08-22 stsp const struct got_error *error;
7277 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7278 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7279 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7280 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7281 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7282 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7284 01073a5d 2019-08-22 stsp #ifndef PROFILE
7285 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7286 01073a5d 2019-08-22 stsp NULL) == -1)
7287 01073a5d 2019-08-22 stsp err(1, "pledge");
7290 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7291 01073a5d 2019-08-22 stsp switch (ch) {
7293 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7296 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7297 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7298 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7300 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7303 896e9b6f 2019-08-26 stsp force_path = 1;
7306 01073a5d 2019-08-22 stsp usage_cat();
7307 01073a5d 2019-08-22 stsp /* NOTREACHED */
7311 01073a5d 2019-08-22 stsp argc -= optind;
7312 01073a5d 2019-08-22 stsp argv += optind;
7314 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7315 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7316 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7317 01073a5d 2019-08-22 stsp goto done;
7319 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7320 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7321 01073a5d 2019-08-22 stsp goto done;
7322 01073a5d 2019-08-22 stsp if (worktree) {
7323 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7324 01073a5d 2019-08-22 stsp repo_path = strdup(
7325 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7326 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7327 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7328 01073a5d 2019-08-22 stsp goto done;
7333 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7334 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7335 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7336 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7339 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7340 01073a5d 2019-08-22 stsp free(repo_path);
7341 01073a5d 2019-08-22 stsp if (error != NULL)
7342 01073a5d 2019-08-22 stsp goto done;
7344 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7345 896e9b6f 2019-08-26 stsp if (error)
7346 896e9b6f 2019-08-26 stsp goto done;
7348 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7349 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7350 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7351 01073a5d 2019-08-22 stsp if (error)
7352 01073a5d 2019-08-22 stsp goto done;
7354 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7355 896e9b6f 2019-08-26 stsp if (force_path) {
7356 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7358 896e9b6f 2019-08-26 stsp if (error)
7361 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7362 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7363 896e9b6f 2019-08-26 stsp if (error) {
7364 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7365 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7367 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7368 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7369 896e9b6f 2019-08-26 stsp if (error)
7374 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7375 01073a5d 2019-08-22 stsp if (error)
7378 01073a5d 2019-08-22 stsp switch (obj_type) {
7379 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7380 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7382 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7383 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7385 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7386 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7388 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7389 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7392 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7395 01073a5d 2019-08-22 stsp if (error)
7397 01073a5d 2019-08-22 stsp free(label);
7398 01073a5d 2019-08-22 stsp label = NULL;
7400 01073a5d 2019-08-22 stsp id = NULL;
7404 01073a5d 2019-08-22 stsp free(label);
7406 896e9b6f 2019-08-26 stsp free(commit_id);
7407 01073a5d 2019-08-22 stsp if (worktree)
7408 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7409 01073a5d 2019-08-22 stsp if (repo) {
7410 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7411 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7412 01073a5d 2019-08-22 stsp if (error == NULL)
7413 01073a5d 2019-08-22 stsp error = repo_error;
7415 0ebf8283 2019-07-24 stsp return error;
