2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 c0768b0f 2018-06-10 stsp #include <sys/types.h>
20 5de5890b 2018-10-18 stsp #include <sys/stat.h>
21 3c45a30a 2019-05-12 jcs #include <sys/param.h>
22 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
24 5c860e29 2018-03-12 stsp #include <err.h>
25 5c860e29 2018-03-12 stsp #include <errno.h>
26 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>
40 53ccebc2 2019-07-30 stsp #include "got_version.h"
41 f42b1b34 2018-03-12 stsp #include "got_error.h"
42 f42b1b34 2018-03-12 stsp #include "got_object.h"
43 5261c201 2018-04-01 stsp #include "got_reference.h"
44 f42b1b34 2018-03-12 stsp #include "got_repository.h"
45 1dd54920 2019-05-11 stsp #include "got_path.h"
46 e6209546 2019-08-22 stsp #include "got_cancel.h"
47 c09a553d 2018-03-12 stsp #include "got_worktree.h"
48 79109fed 2018-03-27 stsp #include "got_diff.h"
49 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
50 404c43c4 2018-06-21 stsp #include "got_blame.h"
51 63219cd2 2019-01-04 stsp #include "got_privsep.h"
52 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
54 5c860e29 2018-03-12 stsp #ifndef nitems
55 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
58 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
59 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
62 99437157 2018-11-11 stsp catch_sigint(int signo)
64 99437157 2018-11-11 stsp sigint_received = 1;
68 99437157 2018-11-11 stsp catch_sigpipe(int signo)
70 99437157 2018-11-11 stsp sigpipe_received = 1;
74 8cfb4057 2019-07-09 stsp struct got_cmd {
75 5c860e29 2018-03-12 stsp const char *cmd_name;
76 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
77 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
78 97b3a7be 2019-07-09 stsp const char *cmd_alias;
81 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
82 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
83 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
84 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
85 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
86 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
87 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
88 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
89 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
90 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
91 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
92 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
93 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
94 d00136be 2019-03-26 stsp __dead static void usage_add(void);
95 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
96 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
97 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
98 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
99 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
100 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
101 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
102 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
103 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
104 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
105 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
107 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
108 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
110 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
111 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
112 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
113 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
114 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
115 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
116 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
117 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
118 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
119 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
120 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
121 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
122 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
123 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
124 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
125 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
126 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
127 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
128 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
129 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
130 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
132 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
133 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
134 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
135 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
136 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
137 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
138 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
139 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
140 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
141 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
142 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
143 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
144 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
145 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
146 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
147 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
148 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
149 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
150 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
151 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
152 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
153 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
154 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
155 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
156 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
159 ce5b7c56 2019-07-09 stsp static void
160 ce5b7c56 2019-07-09 stsp list_commands(void)
164 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
165 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
166 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
167 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
169 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
173 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
175 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
176 5c860e29 2018-03-12 stsp unsigned int i;
178 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
180 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
182 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
183 5c860e29 2018-03-12 stsp switch (ch) {
191 ce5b7c56 2019-07-09 stsp usage(hflag);
192 5c860e29 2018-03-12 stsp /* NOTREACHED */
196 5c860e29 2018-03-12 stsp argc -= optind;
197 5c860e29 2018-03-12 stsp argv += optind;
198 1e70621d 2018-03-27 stsp optind = 0;
200 53ccebc2 2019-07-30 stsp if (Vflag) {
201 53ccebc2 2019-07-30 stsp got_version_print_str();
205 5c860e29 2018-03-12 stsp if (argc <= 0)
206 ce5b7c56 2019-07-09 stsp usage(hflag);
208 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
209 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
211 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
212 d7d4f210 2018-03-12 stsp const struct got_error *error;
214 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
216 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
217 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
221 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
223 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
224 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
225 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
226 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
227 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
228 70015d7a 2019-11-08 stsp !(sigint_received &&
229 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
230 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
237 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
238 ce5b7c56 2019-07-09 stsp list_commands();
242 4ed7e80c 2018-05-20 stsp __dead static void
243 ce5b7c56 2019-07-09 stsp usage(int hflag)
245 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
246 53ccebc2 2019-07-30 stsp getprogname());
248 ce5b7c56 2019-07-09 stsp list_commands();
252 0266afb7 2019-01-04 stsp static const struct got_error *
253 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
255 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
256 e2ba3d07 2019-05-13 stsp const char *editor;
258 8920fa04 2019-08-18 stsp *abspath = NULL;
260 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
261 e2ba3d07 2019-05-13 stsp if (editor == NULL)
262 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
264 0ee7065d 2019-05-13 stsp if (editor) {
265 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
267 0ee7065d 2019-05-13 stsp return err;
270 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
271 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
272 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
273 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
276 e2ba3d07 2019-05-13 stsp return NULL;
279 e2ba3d07 2019-05-13 stsp static const struct got_error *
280 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
281 c530dc23 2019-07-23 stsp const char *worktree_path)
283 163ce85a 2019-05-13 stsp const struct got_error *err;
285 37c06ea4 2019-07-15 stsp #ifdef PROFILE
286 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
287 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
289 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
290 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
292 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
293 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
295 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
296 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
298 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
299 163ce85a 2019-05-13 stsp if (err != NULL)
300 163ce85a 2019-05-13 stsp return err;
302 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
303 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
305 0266afb7 2019-01-04 stsp return NULL;
308 2c7829a4 2019-06-17 stsp __dead static void
309 2c7829a4 2019-06-17 stsp usage_init(void)
311 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
315 2c7829a4 2019-06-17 stsp static const struct got_error *
316 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
318 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
319 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
322 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
323 2c7829a4 2019-06-17 stsp switch (ch) {
325 2c7829a4 2019-06-17 stsp usage_init();
326 2c7829a4 2019-06-17 stsp /* NOTREACHED */
330 2c7829a4 2019-06-17 stsp argc -= optind;
331 2c7829a4 2019-06-17 stsp argv += optind;
333 2c7829a4 2019-06-17 stsp #ifndef PROFILE
334 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
335 2c7829a4 2019-06-17 stsp err(1, "pledge");
337 2c7829a4 2019-06-17 stsp if (argc != 1)
338 bc20e173 2019-06-17 stsp usage_init();
340 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
341 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
342 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
344 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
346 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
347 2c7829a4 2019-06-17 stsp if (error &&
348 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
351 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
355 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
356 2c7829a4 2019-06-17 stsp if (error != NULL)
360 3ce1b845 2019-07-15 stsp free(repo_path);
361 3ce1b845 2019-07-15 stsp return error;
364 3ce1b845 2019-07-15 stsp __dead static void
365 3ce1b845 2019-07-15 stsp usage_import(void)
367 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
368 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
373 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
376 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
377 3ce1b845 2019-07-15 stsp int st = -1;
379 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
380 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
381 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
383 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
385 3ce1b845 2019-07-15 stsp goto doneediting;
387 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
388 3ce1b845 2019-07-15 stsp _exit(127);
391 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
392 3ce1b845 2019-07-15 stsp if (errno != EINTR)
395 3ce1b845 2019-07-15 stsp doneediting:
396 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
397 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
398 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
400 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
401 3ce1b845 2019-07-15 stsp errno = EINTR;
405 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
408 3ce1b845 2019-07-15 stsp static const struct got_error *
409 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
410 3ce1b845 2019-07-15 stsp const char *initial_content)
412 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
413 3ce1b845 2019-07-15 stsp char buf[1024];
414 3ce1b845 2019-07-15 stsp struct stat st, st2;
416 3ce1b845 2019-07-15 stsp int content_changed = 0;
417 3ce1b845 2019-07-15 stsp size_t len;
419 3ce1b845 2019-07-15 stsp *logmsg = NULL;
421 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
422 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
424 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
425 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
427 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
428 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
430 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
431 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
432 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
434 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
435 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
437 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
440 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
441 3ce1b845 2019-07-15 stsp if (fp == NULL) {
442 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
445 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
446 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
447 3ce1b845 2019-07-15 stsp content_changed = 1;
448 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
449 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
450 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
452 3ce1b845 2019-07-15 stsp fclose(fp);
454 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
455 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
459 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
460 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
461 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
464 3ce1b845 2019-07-15 stsp free(*logmsg);
465 3ce1b845 2019-07-15 stsp *logmsg = NULL;
467 3ce1b845 2019-07-15 stsp return err;
470 3ce1b845 2019-07-15 stsp static const struct got_error *
471 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
472 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
474 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
475 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
478 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
479 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
480 3ce1b845 2019-07-15 stsp branch_name) == -1)
481 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
483 ef293bdd 2019-10-21 stsp err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
487 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
490 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
492 3ce1b845 2019-07-15 stsp free(initial_content);
493 3ce1b845 2019-07-15 stsp return err;
496 3ce1b845 2019-07-15 stsp static const struct got_error *
497 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
499 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
500 3ce1b845 2019-07-15 stsp return NULL;
503 3ce1b845 2019-07-15 stsp static const struct got_error *
504 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
506 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
507 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
509 84792843 2019-08-09 stsp *author = NULL;
511 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
512 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
513 c9956ddf 2019-09-08 stsp if (name && email) {
514 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
515 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
516 aba9c984 2019-09-08 stsp return NULL;
519 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
520 84792843 2019-08-09 stsp if (got_author == NULL) {
521 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
522 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
523 c9956ddf 2019-09-08 stsp if (name && email) {
524 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
525 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
526 c9956ddf 2019-09-08 stsp return NULL;
528 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
529 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
532 aba9c984 2019-09-08 stsp *author = strdup(got_author);
533 aba9c984 2019-09-08 stsp if (*author == NULL)
534 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
537 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
538 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
540 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
541 84792843 2019-08-09 stsp got_author++;
542 aba9c984 2019-09-08 stsp if (*got_author != '<') {
543 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
546 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
547 84792843 2019-08-09 stsp got_author++;
548 aba9c984 2019-09-08 stsp if (*got_author != '@') {
549 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
552 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
553 84792843 2019-08-09 stsp got_author++;
554 84792843 2019-08-09 stsp if (*got_author != '>')
555 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 aba9c984 2019-09-08 stsp free(*author);
559 aba9c984 2019-09-08 stsp *author = NULL;
561 aba9c984 2019-09-08 stsp return err;
564 c9956ddf 2019-09-08 stsp static const struct got_error *
565 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
567 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
569 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
570 c9956ddf 2019-09-08 stsp if (homedir) {
571 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
572 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
575 c9956ddf 2019-09-08 stsp return NULL;
578 84792843 2019-08-09 stsp static const struct got_error *
579 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
581 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
582 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
583 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
584 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
585 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
586 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
587 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
588 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
590 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
591 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
592 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
594 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
596 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
597 3ce1b845 2019-07-15 stsp switch (ch) {
599 3ce1b845 2019-07-15 stsp branch_name = optarg;
602 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
603 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
604 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
609 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
610 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
611 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
617 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
619 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
625 b2b65d18 2019-08-22 stsp usage_import();
626 3ce1b845 2019-07-15 stsp /* NOTREACHED */
630 3ce1b845 2019-07-15 stsp argc -= optind;
631 3ce1b845 2019-07-15 stsp argv += optind;
633 3ce1b845 2019-07-15 stsp #ifndef PROFILE
634 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
636 3ce1b845 2019-07-15 stsp NULL) == -1)
637 3ce1b845 2019-07-15 stsp err(1, "pledge");
639 3ce1b845 2019-07-15 stsp if (argc != 1)
640 3ce1b845 2019-07-15 stsp usage_import();
642 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
643 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
644 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
645 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
647 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
648 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
651 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
655 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
657 aba9c984 2019-09-08 stsp return error;
660 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
661 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
662 e560b7e0 2019-11-28 stsp * an unintended typo.
664 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
665 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
667 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
668 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
672 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
673 3ce1b845 2019-07-15 stsp if (error) {
674 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
677 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
678 3ce1b845 2019-07-15 stsp "import target branch already exists");
682 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
683 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
684 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
687 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
690 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
691 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
693 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
694 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
697 8e158b01 2019-09-22 stsp free(logmsg);
698 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
699 ef293bdd 2019-10-21 stsp path_dir, refname);
700 ef293bdd 2019-10-21 stsp if (error) {
701 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
702 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
703 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
708 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
709 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
710 ef293bdd 2019-10-21 stsp if (logmsg_path)
711 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
715 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
716 ef293bdd 2019-10-21 stsp if (error) {
717 ef293bdd 2019-10-21 stsp if (logmsg_path)
718 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
722 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
723 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
724 ef293bdd 2019-10-21 stsp if (error) {
725 ef293bdd 2019-10-21 stsp if (logmsg_path)
726 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
730 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
731 ef293bdd 2019-10-21 stsp if (error) {
732 ef293bdd 2019-10-21 stsp if (logmsg_path)
733 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
737 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
738 ef293bdd 2019-10-21 stsp if (error) {
739 ef293bdd 2019-10-21 stsp if (logmsg_path)
740 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
744 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
745 ef293bdd 2019-10-21 stsp if (error) {
746 ef293bdd 2019-10-21 stsp if (logmsg_path)
747 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
751 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
752 3ce1b845 2019-07-15 stsp if (error) {
753 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
754 ef293bdd 2019-10-21 stsp if (logmsg_path)
755 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
759 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
760 3ce1b845 2019-07-15 stsp branch_ref);
761 ef293bdd 2019-10-21 stsp if (error) {
762 ef293bdd 2019-10-21 stsp if (logmsg_path)
763 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
767 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
768 ef293bdd 2019-10-21 stsp if (error) {
769 ef293bdd 2019-10-21 stsp if (logmsg_path)
770 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
775 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
776 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
778 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
779 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
780 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
781 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
782 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
783 8e158b01 2019-09-22 stsp free(logmsg);
784 ef293bdd 2019-10-21 stsp free(logmsg_path);
785 2c7829a4 2019-06-17 stsp free(repo_path);
786 3ce1b845 2019-07-15 stsp free(editor);
787 3ce1b845 2019-07-15 stsp free(refname);
788 3ce1b845 2019-07-15 stsp free(new_commit_id);
789 3ce1b845 2019-07-15 stsp free(id_str);
790 aba9c984 2019-09-08 stsp free(author);
791 c9956ddf 2019-09-08 stsp free(gitconfig_path);
792 3ce1b845 2019-07-15 stsp if (branch_ref)
793 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
794 3ce1b845 2019-07-15 stsp if (head_ref)
795 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
796 2c7829a4 2019-06-17 stsp return error;
799 4ed7e80c 2018-05-20 stsp __dead static void
800 c09a553d 2018-03-12 stsp usage_checkout(void)
802 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
803 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
807 1ee397ad 2019-07-12 stsp static const struct got_error *
808 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
810 92a684f4 2018-03-12 stsp char *worktree_path = arg;
812 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
813 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
814 1ee397ad 2019-07-12 stsp return NULL;
816 92a684f4 2018-03-12 stsp while (path[0] == '/')
819 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
820 1ee397ad 2019-07-12 stsp return NULL;
823 99437157 2018-11-11 stsp static const struct got_error *
824 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
826 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
827 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
828 99437157 2018-11-11 stsp return NULL;
831 8069f636 2019-01-12 stsp static const struct got_error *
832 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
833 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
834 3aef623b 2019-10-15 stsp struct got_repository *repo)
836 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
837 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
839 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
840 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
842 36a38700 2019-05-10 stsp return err;
844 d5bea539 2019-05-13 stsp if (yca_id == NULL)
845 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
848 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
849 d5bea539 2019-05-13 stsp * and the work tree's base commit.
851 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
853 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
861 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
862 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
863 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
865 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
866 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
867 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
868 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
869 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
870 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
872 d5bea539 2019-05-13 stsp free(yca_id);
873 d5bea539 2019-05-13 stsp return NULL;
876 a367ff0f 2019-05-14 stsp static const struct got_error *
877 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
878 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
879 a51a74b3 2019-07-27 stsp struct got_repository *repo)
881 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
882 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
883 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
884 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
886 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
890 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
891 a51a74b3 2019-07-27 stsp is_same_branch = 1;
894 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
895 a51a74b3 2019-07-27 stsp is_same_branch = 1;
899 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
903 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
904 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
909 a367ff0f 2019-05-14 stsp struct got_object_id *id;
910 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
912 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
913 a367ff0f 2019-05-14 stsp err = NULL;
915 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
917 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
918 6fb7cd11 2019-08-22 stsp repo, check_cancelled, NULL);
924 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
926 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
927 a367ff0f 2019-05-14 stsp is_same_branch = 1;
934 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
935 a367ff0f 2019-05-14 stsp free(head_commit_id);
936 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
937 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
938 04f57cb3 2019-07-25 stsp return err;
941 04f57cb3 2019-07-25 stsp static const struct got_error *
942 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
943 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
945 04f57cb3 2019-07-25 stsp const struct got_error *err;
946 04f57cb3 2019-07-25 stsp struct got_reference *ref;
947 303e2782 2019-08-09 stsp struct got_tag_object *tag;
949 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
950 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
951 303e2782 2019-08-09 stsp if (err == NULL) {
952 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
953 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
954 303e2782 2019-08-09 stsp if (*commit_id == NULL)
955 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
956 303e2782 2019-08-09 stsp got_object_tag_close(tag);
957 303e2782 2019-08-09 stsp return err;
958 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
959 303e2782 2019-08-09 stsp return err;
961 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
962 04f57cb3 2019-07-25 stsp if (err == NULL) {
963 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
964 04f57cb3 2019-07-25 stsp got_ref_close(ref);
966 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
967 04f57cb3 2019-07-25 stsp return err;
968 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
969 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
971 a367ff0f 2019-05-14 stsp return err;
974 4ed7e80c 2018-05-20 stsp static const struct got_error *
975 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
977 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
978 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
979 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
980 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
981 c09a553d 2018-03-12 stsp char *repo_path = NULL;
982 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
983 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
984 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
985 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
986 72151b04 2019-05-11 stsp int ch, same_path_prefix;
987 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
989 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
991 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
992 0bb8a95e 2018-03-12 stsp switch (ch) {
994 08573d5b 2019-05-14 stsp branch_name = optarg;
997 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
998 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
999 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1002 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1005 2deda0b9 2019-03-07 stsp usage_checkout();
1006 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1010 0bb8a95e 2018-03-12 stsp argc -= optind;
1011 0bb8a95e 2018-03-12 stsp argv += optind;
1013 6715a751 2018-03-16 stsp #ifndef PROFILE
1014 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1015 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1016 c09a553d 2018-03-12 stsp err(1, "pledge");
1018 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1019 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1020 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1021 76089277 2018-04-01 stsp if (repo_path == NULL)
1022 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1023 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1024 76089277 2018-04-01 stsp if (cwd == NULL) {
1025 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1026 76089277 2018-04-01 stsp goto done;
1028 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1029 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1030 230a42bd 2019-05-11 jcs if (base == NULL) {
1031 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1032 230a42bd 2019-05-11 jcs path_prefix);
1036 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1037 230a42bd 2019-05-11 jcs if (base == NULL) {
1038 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1039 230a42bd 2019-05-11 jcs repo_path);
1043 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1044 c09a553d 2018-03-12 stsp if (dotgit)
1045 c09a553d 2018-03-12 stsp *dotgit = '\0';
1046 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1047 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1048 c09a553d 2018-03-12 stsp free(cwd);
1049 76089277 2018-04-01 stsp goto done;
1051 c09a553d 2018-03-12 stsp free(cwd);
1052 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1053 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1054 76089277 2018-04-01 stsp if (repo_path == NULL) {
1055 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1056 76089277 2018-04-01 stsp goto done;
1058 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1059 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1060 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1061 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1063 b4b3a7dd 2019-07-22 stsp goto done;
1065 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1066 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1067 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1068 b4b3a7dd 2019-07-22 stsp goto done;
1072 c09a553d 2018-03-12 stsp usage_checkout();
1074 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1075 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1077 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1078 c09a553d 2018-03-12 stsp if (error != NULL)
1079 c02c541e 2019-03-29 stsp goto done;
1081 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1082 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1083 c530dc23 2019-07-23 stsp if (error) {
1084 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1085 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1086 c530dc23 2019-07-23 stsp goto done;
1087 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
1088 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1089 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1090 c530dc23 2019-07-23 stsp goto done;
1094 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1095 c02c541e 2019-03-29 stsp if (error)
1096 c09a553d 2018-03-12 stsp goto done;
1098 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1099 c09a553d 2018-03-12 stsp if (error != NULL)
1100 c09a553d 2018-03-12 stsp goto done;
1102 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1103 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1104 c09a553d 2018-03-12 stsp goto done;
1106 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1107 c09a553d 2018-03-12 stsp if (error != NULL)
1108 c09a553d 2018-03-12 stsp goto done;
1110 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1111 e5dc7198 2018-12-29 stsp path_prefix);
1112 e5dc7198 2018-12-29 stsp if (error != NULL)
1113 e5dc7198 2018-12-29 stsp goto done;
1114 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1115 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1116 49520a32 2018-12-29 stsp goto done;
1119 8069f636 2019-01-12 stsp if (commit_id_str) {
1120 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1121 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1122 30837e32 2019-07-25 stsp if (error)
1123 8069f636 2019-01-12 stsp goto done;
1124 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1125 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1126 8069f636 2019-01-12 stsp if (error != NULL) {
1127 8069f636 2019-01-12 stsp free(commit_id);
1128 8069f636 2019-01-12 stsp goto done;
1130 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1131 45d344f6 2019-05-14 stsp if (error)
1132 45d344f6 2019-05-14 stsp goto done;
1133 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1134 8069f636 2019-01-12 stsp commit_id);
1135 8069f636 2019-01-12 stsp free(commit_id);
1136 8069f636 2019-01-12 stsp if (error)
1137 8069f636 2019-01-12 stsp goto done;
1140 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1141 f2ea84fa 2019-07-27 stsp if (error)
1142 f2ea84fa 2019-07-27 stsp goto done;
1143 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1144 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1145 c09a553d 2018-03-12 stsp if (error != NULL)
1146 c09a553d 2018-03-12 stsp goto done;
1148 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1151 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1152 8069f636 2019-01-12 stsp free(commit_id_str);
1153 76089277 2018-04-01 stsp free(repo_path);
1154 507dc3bb 2018-12-29 stsp free(worktree_path);
1155 507dc3bb 2018-12-29 stsp return error;
1158 507dc3bb 2018-12-29 stsp __dead static void
1159 507dc3bb 2018-12-29 stsp usage_update(void)
1161 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1162 507dc3bb 2018-12-29 stsp getprogname());
1166 1ee397ad 2019-07-12 stsp static const struct got_error *
1167 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1169 784955db 2019-01-12 stsp int *did_something = arg;
1171 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1172 1ee397ad 2019-07-12 stsp return NULL;
1174 1545c615 2019-02-10 stsp *did_something = 1;
1176 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1177 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1178 1ee397ad 2019-07-12 stsp return NULL;
1180 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1182 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1183 1ee397ad 2019-07-12 stsp return NULL;
1186 be7061eb 2018-12-30 stsp static const struct got_error *
1187 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1188 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1189 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1191 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1192 a1fb16d8 2019-05-24 stsp char *base_id_str;
1193 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1195 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1196 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1197 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1198 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1199 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1200 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1201 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1204 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1205 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1206 a1fb16d8 2019-05-24 stsp if (err) {
1207 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1208 a1fb16d8 2019-05-24 stsp return err;
1209 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1211 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1212 a1fb16d8 2019-05-24 stsp return NULL;
1214 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1215 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1216 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1218 a1fb16d8 2019-05-24 stsp return err;
1219 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1220 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1221 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1222 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1223 0ebf8283 2019-07-24 stsp return NULL;
1226 0ebf8283 2019-07-24 stsp static const struct got_error *
1227 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1229 0ebf8283 2019-07-24 stsp const struct got_error *err;
1230 0ebf8283 2019-07-24 stsp int in_progress;
1232 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1234 0ebf8283 2019-07-24 stsp return err;
1235 0ebf8283 2019-07-24 stsp if (in_progress)
1236 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1238 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1240 0ebf8283 2019-07-24 stsp return err;
1241 0ebf8283 2019-07-24 stsp if (in_progress)
1242 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1244 a1fb16d8 2019-05-24 stsp return NULL;
1247 a5edda0a 2019-07-27 stsp static const struct got_error *
1248 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1249 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1251 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1252 a5edda0a 2019-07-27 stsp char *path;
1255 a5edda0a 2019-07-27 stsp if (argc == 0) {
1256 a5edda0a 2019-07-27 stsp path = strdup("");
1257 a5edda0a 2019-07-27 stsp if (path == NULL)
1258 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1259 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1262 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1263 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1266 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1267 a5edda0a 2019-07-27 stsp if (err) {
1268 a5edda0a 2019-07-27 stsp free(path);
1273 a5edda0a 2019-07-27 stsp return err;
1276 a1fb16d8 2019-05-24 stsp static const struct got_error *
1277 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1279 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1280 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1281 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1282 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1283 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1284 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1285 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1286 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1287 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1288 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1289 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1291 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1293 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1294 507dc3bb 2018-12-29 stsp switch (ch) {
1296 024e9686 2019-05-14 stsp branch_name = optarg;
1299 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1300 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1301 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1304 2deda0b9 2019-03-07 stsp usage_update();
1305 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1309 507dc3bb 2018-12-29 stsp argc -= optind;
1310 507dc3bb 2018-12-29 stsp argv += optind;
1312 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1313 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1314 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1315 507dc3bb 2018-12-29 stsp err(1, "pledge");
1317 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1318 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1319 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1320 c4cdcb68 2019-04-03 stsp goto done;
1322 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1323 7d5807f4 2019-07-11 stsp if (error)
1324 7d5807f4 2019-07-11 stsp goto done;
1326 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1327 f2ea84fa 2019-07-27 stsp if (error)
1328 f2ea84fa 2019-07-27 stsp goto done;
1330 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1332 507dc3bb 2018-12-29 stsp if (error != NULL)
1333 507dc3bb 2018-12-29 stsp goto done;
1335 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1336 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1337 087fb88c 2019-08-04 stsp if (error)
1338 087fb88c 2019-08-04 stsp goto done;
1340 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1341 0266afb7 2019-01-04 stsp if (error)
1342 0266afb7 2019-01-04 stsp goto done;
1344 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1345 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1346 024e9686 2019-05-14 stsp if (error != NULL)
1347 024e9686 2019-05-14 stsp goto done;
1348 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1349 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1350 9c4b8182 2019-01-02 stsp if (error != NULL)
1351 9c4b8182 2019-01-02 stsp goto done;
1352 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1353 507dc3bb 2018-12-29 stsp if (error != NULL)
1354 507dc3bb 2018-12-29 stsp goto done;
1356 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1357 04f57cb3 2019-07-25 stsp free(commit_id_str);
1358 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1359 30837e32 2019-07-25 stsp if (error)
1360 a297e751 2019-07-11 stsp goto done;
1361 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1362 a297e751 2019-07-11 stsp if (error)
1363 507dc3bb 2018-12-29 stsp goto done;
1366 a1fb16d8 2019-05-24 stsp if (branch_name) {
1367 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1368 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1369 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1371 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1372 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1373 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1374 024e9686 2019-05-14 stsp goto done;
1376 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1377 024e9686 2019-05-14 stsp if (error)
1378 024e9686 2019-05-14 stsp goto done;
1379 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1381 a367ff0f 2019-05-14 stsp free(head_commit_id);
1382 024e9686 2019-05-14 stsp if (error != NULL)
1383 024e9686 2019-05-14 stsp goto done;
1384 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1385 a367ff0f 2019-05-14 stsp if (error)
1386 a367ff0f 2019-05-14 stsp goto done;
1387 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1388 024e9686 2019-05-14 stsp if (error)
1389 024e9686 2019-05-14 stsp goto done;
1391 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1392 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1393 a367ff0f 2019-05-14 stsp if (error != NULL) {
1394 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1395 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1396 024e9686 2019-05-14 stsp goto done;
1398 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1399 a367ff0f 2019-05-14 stsp if (error)
1400 a367ff0f 2019-05-14 stsp goto done;
1403 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1404 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1405 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1406 507dc3bb 2018-12-29 stsp commit_id);
1407 507dc3bb 2018-12-29 stsp if (error)
1408 507dc3bb 2018-12-29 stsp goto done;
1411 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1412 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1413 507dc3bb 2018-12-29 stsp if (error != NULL)
1414 507dc3bb 2018-12-29 stsp goto done;
1416 784955db 2019-01-12 stsp if (did_something)
1417 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1419 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1421 c09a553d 2018-03-12 stsp free(worktree_path);
1422 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1423 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1424 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1425 507dc3bb 2018-12-29 stsp free(commit_id);
1426 9c4b8182 2019-01-02 stsp free(commit_id_str);
1427 c09a553d 2018-03-12 stsp return error;
1430 f42b1b34 2018-03-12 stsp static const struct got_error *
1431 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1432 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1433 63035f9f 2019-10-06 stsp struct got_repository *repo)
1435 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1436 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1438 44392932 2019-08-25 stsp if (blob_id1) {
1439 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1441 44392932 2019-08-25 stsp goto done;
1444 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1446 44392932 2019-08-25 stsp goto done;
1448 44392932 2019-08-25 stsp while (path[0] == '/')
1450 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1451 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1453 44392932 2019-08-25 stsp if (blob1)
1454 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1455 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1456 44392932 2019-08-25 stsp return err;
1459 44392932 2019-08-25 stsp static const struct got_error *
1460 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1461 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1462 63035f9f 2019-10-06 stsp struct got_repository *repo)
1464 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1465 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1466 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1468 44392932 2019-08-25 stsp if (tree_id1) {
1469 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1471 44392932 2019-08-25 stsp goto done;
1474 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1476 0f2b3dca 2018-12-22 stsp goto done;
1478 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1479 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1480 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1481 44392932 2019-08-25 stsp while (path[0] == '/')
1483 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1484 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1486 79109fed 2018-03-27 stsp if (tree1)
1487 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1488 366e0a5f 2019-10-10 stsp if (tree2)
1489 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1490 44392932 2019-08-25 stsp return err;
1493 44392932 2019-08-25 stsp static const struct got_error *
1494 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1495 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1497 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1498 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1499 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1500 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1501 44392932 2019-08-25 stsp struct got_object_qid *qid;
1503 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1504 44392932 2019-08-25 stsp if (qid != NULL) {
1505 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1508 44392932 2019-08-25 stsp return err;
1511 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1512 44392932 2019-08-25 stsp int obj_type;
1513 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1515 44392932 2019-08-25 stsp goto done;
1516 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1517 44392932 2019-08-25 stsp if (err) {
1518 44392932 2019-08-25 stsp free(obj_id2);
1519 44392932 2019-08-25 stsp goto done;
1521 44392932 2019-08-25 stsp if (pcommit) {
1522 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1523 44392932 2019-08-25 stsp qid->id, path);
1524 44392932 2019-08-25 stsp if (err) {
1525 44392932 2019-08-25 stsp free(obj_id2);
1526 44392932 2019-08-25 stsp goto done;
1528 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1529 44392932 2019-08-25 stsp if (err) {
1530 44392932 2019-08-25 stsp free(obj_id2);
1531 44392932 2019-08-25 stsp goto done;
1534 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1535 44392932 2019-08-25 stsp if (err) {
1536 44392932 2019-08-25 stsp free(obj_id2);
1537 44392932 2019-08-25 stsp goto done;
1539 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1540 44392932 2019-08-25 stsp switch (obj_type) {
1541 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1542 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1545 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1546 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1550 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1553 44392932 2019-08-25 stsp free(obj_id1);
1554 44392932 2019-08-25 stsp free(obj_id2);
1556 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1557 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1559 44392932 2019-08-25 stsp goto done;
1560 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1561 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1563 44392932 2019-08-25 stsp goto done;
1564 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1565 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1569 0f2b3dca 2018-12-22 stsp free(id_str1);
1570 0f2b3dca 2018-12-22 stsp free(id_str2);
1571 44392932 2019-08-25 stsp if (pcommit)
1572 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1573 79109fed 2018-03-27 stsp return err;
1576 4bb494d5 2018-06-16 stsp static char *
1577 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1579 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1580 09867e48 2019-08-13 stsp char *p, *s;
1582 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1583 09867e48 2019-08-13 stsp if (tm == NULL)
1584 09867e48 2019-08-13 stsp return NULL;
1585 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1586 09867e48 2019-08-13 stsp if (s == NULL)
1587 09867e48 2019-08-13 stsp return NULL;
1588 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1590 6c281f94 2018-06-11 stsp *p = '\0';
1594 6841bf13 2019-11-29 kn static const struct got_error *
1595 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1596 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1598 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1599 6841bf13 2019-11-29 kn regmatch_t regmatch;
1600 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1602 6841bf13 2019-11-29 kn *have_match = 0;
1604 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1608 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1612 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1613 6841bf13 2019-11-29 kn *have_match = 1;
1615 6841bf13 2019-11-29 kn free(id_str);
1616 6841bf13 2019-11-29 kn free(logmsg);
1620 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1622 79109fed 2018-03-27 stsp static const struct got_error *
1623 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1624 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1625 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1627 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1628 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1629 6c281f94 2018-06-11 stsp char datebuf[26];
1630 45d799e2 2018-12-23 stsp time_t committer_time;
1631 45d799e2 2018-12-23 stsp const char *author, *committer;
1632 199a4027 2019-02-02 stsp char *refs_str = NULL;
1633 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1635 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1637 199a4027 2019-02-02 stsp const char *name;
1638 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1641 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1642 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1644 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1645 199a4027 2019-02-02 stsp name += 5;
1646 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1648 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1649 e34f9ed6 2019-02-02 stsp name += 6;
1650 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1651 141c2bff 2019-02-04 stsp name += 8;
1652 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1653 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1654 5d844a1e 2019-08-13 stsp if (err) {
1655 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1656 5d844a1e 2019-08-13 stsp return err;
1657 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1658 5d844a1e 2019-08-13 stsp err = NULL;
1659 5d844a1e 2019-08-13 stsp tag = NULL;
1662 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1663 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1665 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1666 a436ad14 2019-08-13 stsp if (cmp != 0)
1668 199a4027 2019-02-02 stsp s = refs_str;
1669 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1670 199a4027 2019-02-02 stsp name) == -1) {
1671 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1673 34ca4898 2019-08-13 stsp return err;
1677 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1679 8bf5b3c9 2018-03-17 stsp return err;
1681 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1682 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1683 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1684 832c249c 2018-06-10 stsp free(id_str);
1685 d3d493d7 2019-02-21 stsp id_str = NULL;
1686 d3d493d7 2019-02-21 stsp free(refs_str);
1687 d3d493d7 2019-02-21 stsp refs_str = NULL;
1688 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1689 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1690 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1691 09867e48 2019-08-13 stsp if (datestr)
1692 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1693 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1694 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1695 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1696 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1697 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1698 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1699 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1700 3fe1abad 2018-06-10 stsp int n = 1;
1701 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1702 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1703 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1705 a0603db2 2018-06-10 stsp return err;
1706 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1707 a0603db2 2018-06-10 stsp free(id_str);
1711 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1713 5943eee2 2019-08-13 stsp return err;
1715 621015ac 2018-07-23 stsp logmsg = logmsg0;
1717 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1719 832c249c 2018-06-10 stsp printf(" %s\n", line);
1720 832c249c 2018-06-10 stsp } while (line);
1721 621015ac 2018-07-23 stsp free(logmsg0);
1723 971751ac 2018-03-27 stsp if (show_patch) {
1724 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1725 971751ac 2018-03-27 stsp if (err == 0)
1726 971751ac 2018-03-27 stsp printf("\n");
1729 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1730 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1731 07862c20 2018-09-15 stsp return err;
1734 f42b1b34 2018-03-12 stsp static const struct got_error *
1735 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1736 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1737 463a997a 2019-12-08 kn int diff_context, int limit, int first_parent_traversal,
1738 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1740 f42b1b34 2018-03-12 stsp const struct got_error *err;
1741 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1742 6841bf13 2019-11-29 kn regex_t regex;
1743 6841bf13 2019-11-29 kn int have_match;
1745 6841bf13 2019-11-29 kn if (search_pattern &&
1746 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1747 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1749 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1750 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1752 f42b1b34 2018-03-12 stsp return err;
1753 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1754 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1756 fcc85cad 2018-07-22 stsp goto done;
1758 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1759 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1761 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1764 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1765 372ccdbb 2018-06-10 stsp if (err) {
1766 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1767 9ba79e04 2018-06-11 stsp err = NULL;
1770 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1772 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
1773 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1779 b43fbaa0 2018-06-11 stsp if (id == NULL)
1782 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1786 6841bf13 2019-11-29 kn if (search_pattern) {
1787 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
1789 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1792 6841bf13 2019-11-29 kn if (have_match == 0) {
1793 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1798 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1799 44392932 2019-08-25 stsp diff_context, refs);
1800 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1801 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1805 6841bf13 2019-11-29 kn if (search_pattern)
1806 6841bf13 2019-11-29 kn regfree(®ex);
1807 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1808 f42b1b34 2018-03-12 stsp return err;
1811 4ed7e80c 2018-05-20 stsp __dead static void
1812 6f3d1eb0 2018-03-12 stsp usage_log(void)
1814 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1815 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1819 b1ebc001 2019-08-13 stsp static int
1820 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1822 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1823 b1ebc001 2019-08-13 stsp long long n;
1824 b1ebc001 2019-08-13 stsp const char *errstr;
1826 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1827 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1829 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1830 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1835 4ed7e80c 2018-05-20 stsp static const struct got_error *
1836 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1838 f42b1b34 2018-03-12 stsp const struct got_error *error;
1839 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1840 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1841 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1842 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1843 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1844 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
1845 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
1846 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1847 64a96a6d 2018-04-01 stsp const char *errstr;
1848 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1850 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1852 6715a751 2018-03-16 stsp #ifndef PROFILE
1853 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1856 f42b1b34 2018-03-12 stsp err(1, "pledge");
1859 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1861 6841bf13 2019-11-29 kn while ((ch = getopt(argc, argv, "b:pc:C:l:fr:s:")) != -1) {
1862 79109fed 2018-03-27 stsp switch (ch) {
1864 79109fed 2018-03-27 stsp show_patch = 1;
1867 d142fc45 2018-04-01 stsp start_commit = optarg;
1870 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1872 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1873 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1876 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1877 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1878 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1881 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1884 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1885 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1886 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1888 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1891 6841bf13 2019-11-29 kn search_pattern = optarg;
1894 2deda0b9 2019-03-07 stsp usage_log();
1895 79109fed 2018-03-27 stsp /* NOTREACHED */
1899 79109fed 2018-03-27 stsp argc -= optind;
1900 79109fed 2018-03-27 stsp argv += optind;
1902 dc1edbfa 2019-11-29 kn if (diff_context == -1)
1903 dc1edbfa 2019-11-29 kn diff_context = 3;
1904 dc1edbfa 2019-11-29 kn else if (!show_patch)
1905 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
1907 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1908 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1909 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1910 04ca23f4 2018-07-16 stsp goto done;
1913 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1914 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1915 cffc0aa4 2019-02-05 stsp goto done;
1916 cffc0aa4 2019-02-05 stsp error = NULL;
1918 e7301579 2019-03-18 stsp if (argc == 0) {
1919 cbd1af7a 2019-03-18 stsp path = strdup("");
1920 e7301579 2019-03-18 stsp if (path == NULL) {
1921 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1922 cbd1af7a 2019-03-18 stsp goto done;
1924 e7301579 2019-03-18 stsp } else if (argc == 1) {
1925 e7301579 2019-03-18 stsp if (worktree) {
1926 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1928 e7301579 2019-03-18 stsp if (error)
1929 e7301579 2019-03-18 stsp goto done;
1931 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1932 e7301579 2019-03-18 stsp if (path == NULL) {
1933 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1934 e7301579 2019-03-18 stsp goto done;
1938 cbd1af7a 2019-03-18 stsp usage_log();
1940 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1941 5486daa2 2019-05-11 stsp repo_path = worktree ?
1942 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1944 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1945 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1946 cffc0aa4 2019-02-05 stsp goto done;
1949 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1950 d7d4f210 2018-03-12 stsp if (error != NULL)
1951 04ca23f4 2018-07-16 stsp goto done;
1953 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1954 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1955 c02c541e 2019-03-29 stsp if (error)
1956 c02c541e 2019-03-29 stsp goto done;
1958 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1959 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1960 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1961 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1962 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1963 3235492e 2018-04-01 stsp if (error != NULL)
1964 3235492e 2018-04-01 stsp return error;
1965 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1966 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1967 3235492e 2018-04-01 stsp if (error != NULL)
1968 3235492e 2018-04-01 stsp return error;
1969 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1971 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1972 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1973 3235492e 2018-04-01 stsp if (error == NULL) {
1974 1caad61b 2019-02-01 stsp int obj_type;
1975 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1976 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1977 d1f2edc9 2018-06-13 stsp if (error != NULL)
1978 1caad61b 2019-02-01 stsp goto done;
1979 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1980 1caad61b 2019-02-01 stsp if (error != NULL)
1981 1caad61b 2019-02-01 stsp goto done;
1982 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1983 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1984 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1985 1caad61b 2019-02-01 stsp if (error != NULL)
1986 1caad61b 2019-02-01 stsp goto done;
1987 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1988 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1989 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1990 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1991 1caad61b 2019-02-01 stsp goto done;
1994 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1995 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1996 1caad61b 2019-02-01 stsp if (id == NULL)
1997 638f9024 2019-05-13 stsp error = got_error_from_errno(
1998 230a42bd 2019-05-11 jcs "got_object_id_dup");
1999 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2000 1caad61b 2019-02-01 stsp if (error)
2001 1caad61b 2019-02-01 stsp goto done;
2002 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2003 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2004 1caad61b 2019-02-01 stsp goto done;
2006 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2007 d1f2edc9 2018-06-13 stsp if (error != NULL)
2008 1caad61b 2019-02-01 stsp goto done;
2010 15a94983 2018-12-23 stsp if (commit == NULL) {
2011 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2012 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2013 d1f2edc9 2018-06-13 stsp if (error != NULL)
2014 d1f2edc9 2018-06-13 stsp return error;
2017 d7d4f210 2018-03-12 stsp if (error != NULL)
2018 04ca23f4 2018-07-16 stsp goto done;
2020 deeabeae 2019-08-27 stsp if (worktree) {
2021 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2023 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2024 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2025 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2026 deeabeae 2019-08-27 stsp goto done;
2028 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2031 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2032 04ca23f4 2018-07-16 stsp if (error != NULL)
2033 04ca23f4 2018-07-16 stsp goto done;
2034 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2035 04ca23f4 2018-07-16 stsp free(path);
2036 04ca23f4 2018-07-16 stsp path = in_repo_path;
2039 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2040 199a4027 2019-02-02 stsp if (error)
2041 199a4027 2019-02-02 stsp goto done;
2043 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2044 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
2046 04ca23f4 2018-07-16 stsp free(path);
2047 04ca23f4 2018-07-16 stsp free(repo_path);
2048 04ca23f4 2018-07-16 stsp free(cwd);
2050 cffc0aa4 2019-02-05 stsp if (worktree)
2051 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2052 ad242220 2018-09-08 stsp if (repo) {
2053 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2054 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2055 ad242220 2018-09-08 stsp if (error == NULL)
2056 ad242220 2018-09-08 stsp error = repo_error;
2058 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2059 8bf5b3c9 2018-03-17 stsp return error;
2062 4ed7e80c 2018-05-20 stsp __dead static void
2063 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2065 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2066 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2070 b72f483a 2019-02-05 stsp struct print_diff_arg {
2071 b72f483a 2019-02-05 stsp struct got_repository *repo;
2072 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2073 b72f483a 2019-02-05 stsp int diff_context;
2074 3fc0c068 2019-02-10 stsp const char *id_str;
2075 3fc0c068 2019-02-10 stsp int header_shown;
2076 98eaaa12 2019-08-03 stsp int diff_staged;
2077 63035f9f 2019-10-06 stsp int ignore_whitespace;
2080 4ed7e80c 2018-05-20 stsp static const struct got_error *
2081 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2082 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2083 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2084 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2086 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2087 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2088 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2089 12463d8b 2019-12-13 stsp int fd = -1;
2090 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2091 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2092 b72f483a 2019-02-05 stsp struct stat sb;
2094 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2095 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2096 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2097 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2098 98eaaa12 2019-08-03 stsp return NULL;
2100 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2101 98eaaa12 2019-08-03 stsp return NULL;
2102 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2103 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2104 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2105 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2106 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2107 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2108 98eaaa12 2019-08-03 stsp return NULL;
2111 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2112 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2113 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2114 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2115 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2118 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2119 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2120 98eaaa12 2019-08-03 stsp switch (staged_status) {
2121 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2122 98eaaa12 2019-08-03 stsp label1 = path;
2123 98eaaa12 2019-08-03 stsp label2 = path;
2125 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2126 98eaaa12 2019-08-03 stsp label2 = path;
2128 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2129 98eaaa12 2019-08-03 stsp label1 = path;
2132 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2134 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2135 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2136 63035f9f 2019-10-06 stsp a->repo, stdout);
2139 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2140 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2141 4ce46740 2019-08-08 stsp char *id_str;
2142 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2145 4ce46740 2019-08-08 stsp goto done;
2146 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2148 4ce46740 2019-08-08 stsp goto done;
2149 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2150 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2151 4ce46740 2019-08-08 stsp free(id_str);
2152 4ce46740 2019-08-08 stsp goto done;
2154 4ce46740 2019-08-08 stsp free(id_str);
2155 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2156 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2158 4ce46740 2019-08-08 stsp goto done;
2161 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2162 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2163 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2164 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2165 2ec1f75b 2019-03-26 stsp goto done;
2168 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2169 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2170 12463d8b 2019-12-13 stsp if (fd == -1) {
2171 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2172 12463d8b 2019-12-13 stsp goto done;
2175 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2176 12463d8b 2019-12-13 stsp if (fd == -1) {
2177 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2178 12463d8b 2019-12-13 stsp goto done;
2181 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2182 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2183 2ec1f75b 2019-03-26 stsp goto done;
2185 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2186 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2187 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2188 2ec1f75b 2019-03-26 stsp goto done;
2192 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2194 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2195 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2197 b72f483a 2019-02-05 stsp if (blob1)
2198 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2199 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2200 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2201 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2202 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2203 b72f483a 2019-02-05 stsp free(abspath);
2204 927df6b7 2019-02-10 stsp return err;
2207 927df6b7 2019-02-10 stsp static const struct got_error *
2208 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2209 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2210 01073a5d 2019-08-22 stsp struct got_repository *repo)
2212 0adb7196 2019-08-11 stsp const struct got_error *err;
2213 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2214 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2216 0adb7196 2019-08-11 stsp *id = NULL;
2217 0adb7196 2019-08-11 stsp *label = NULL;
2219 01073a5d 2019-08-22 stsp if (resolve_tags) {
2220 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2222 01073a5d 2019-08-22 stsp if (err == NULL) {
2223 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2224 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2225 01073a5d 2019-08-22 stsp if (*id == NULL)
2226 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2227 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2228 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2229 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2230 32f0ab81 2019-08-28 hiltjo free(*id);
2231 01073a5d 2019-08-22 stsp *id = NULL;
2233 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2234 01073a5d 2019-08-22 stsp return err;
2235 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2236 01073a5d 2019-08-22 stsp return err;
2239 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2240 0adb7196 2019-08-11 stsp if (err) {
2241 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2242 0adb7196 2019-08-11 stsp return err;
2243 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2244 0adb7196 2019-08-11 stsp if (err != NULL)
2245 0adb7196 2019-08-11 stsp goto done;
2246 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2247 0adb7196 2019-08-11 stsp if (*label == NULL) {
2248 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2249 0adb7196 2019-08-11 stsp goto done;
2251 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2253 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2254 0adb7196 2019-08-11 stsp if (*label == NULL) {
2255 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2256 0adb7196 2019-08-11 stsp goto done;
2261 0adb7196 2019-08-11 stsp got_ref_close(ref);
2262 0adb7196 2019-08-11 stsp return err;
2266 0adb7196 2019-08-11 stsp static const struct got_error *
2267 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2269 b00d56cd 2018-04-01 stsp const struct got_error *error;
2270 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2271 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2272 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2273 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2274 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2275 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2276 15a94983 2018-12-23 stsp int type1, type2;
2277 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2278 c0cc5c62 2018-10-18 stsp const char *errstr;
2279 927df6b7 2019-02-10 stsp char *path = NULL;
2281 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2282 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2283 25eccc22 2019-01-04 stsp NULL) == -1)
2284 b00d56cd 2018-04-01 stsp err(1, "pledge");
2287 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2288 b00d56cd 2018-04-01 stsp switch (ch) {
2290 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2292 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2293 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2296 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2297 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2298 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2300 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2303 98eaaa12 2019-08-03 stsp diff_staged = 1;
2306 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2309 2deda0b9 2019-03-07 stsp usage_diff();
2310 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2314 b00d56cd 2018-04-01 stsp argc -= optind;
2315 b00d56cd 2018-04-01 stsp argv += optind;
2317 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2318 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2319 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2320 b72f483a 2019-02-05 stsp goto done;
2322 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2323 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2324 927df6b7 2019-02-10 stsp goto done;
2325 927df6b7 2019-02-10 stsp if (argc <= 1) {
2326 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2327 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2328 927df6b7 2019-02-10 stsp goto done;
2330 b72f483a 2019-02-05 stsp if (repo_path)
2332 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2333 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2334 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2335 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2336 927df6b7 2019-02-10 stsp goto done;
2338 927df6b7 2019-02-10 stsp if (argc == 1) {
2339 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2341 927df6b7 2019-02-10 stsp if (error)
2342 927df6b7 2019-02-10 stsp goto done;
2344 927df6b7 2019-02-10 stsp path = strdup("");
2345 927df6b7 2019-02-10 stsp if (path == NULL) {
2346 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2347 927df6b7 2019-02-10 stsp goto done;
2350 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2351 98eaaa12 2019-08-03 stsp if (diff_staged)
2352 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2353 98eaaa12 2019-08-03 stsp "objects in repository");
2354 15a94983 2018-12-23 stsp id_str1 = argv[0];
2355 15a94983 2018-12-23 stsp id_str2 = argv[1];
2356 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2357 30db809c 2019-06-05 stsp repo_path =
2358 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2359 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2360 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2361 30db809c 2019-06-05 stsp goto done;
2365 b00d56cd 2018-04-01 stsp usage_diff();
2367 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2368 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2369 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2370 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2373 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2374 76089277 2018-04-01 stsp free(repo_path);
2375 b00d56cd 2018-04-01 stsp if (error != NULL)
2376 b00d56cd 2018-04-01 stsp goto done;
2378 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2379 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2380 c02c541e 2019-03-29 stsp if (error)
2381 c02c541e 2019-03-29 stsp goto done;
2383 30db809c 2019-06-05 stsp if (argc <= 1) {
2384 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2385 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2386 b72f483a 2019-02-05 stsp char *id_str;
2388 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2390 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2391 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2392 b72f483a 2019-02-05 stsp if (error)
2393 b72f483a 2019-02-05 stsp goto done;
2394 b72f483a 2019-02-05 stsp arg.repo = repo;
2395 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2396 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2397 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2398 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2399 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2400 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2402 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2403 72ea6654 2019-07-27 stsp if (error)
2404 72ea6654 2019-07-27 stsp goto done;
2406 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2407 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2408 b72f483a 2019-02-05 stsp free(id_str);
2409 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2410 b72f483a 2019-02-05 stsp goto done;
2413 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2415 0adb7196 2019-08-11 stsp if (error)
2416 0adb7196 2019-08-11 stsp goto done;
2418 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2420 0adb7196 2019-08-11 stsp if (error)
2421 0adb7196 2019-08-11 stsp goto done;
2423 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2424 15a94983 2018-12-23 stsp if (error)
2425 15a94983 2018-12-23 stsp goto done;
2427 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2428 15a94983 2018-12-23 stsp if (error)
2429 15a94983 2018-12-23 stsp goto done;
2431 15a94983 2018-12-23 stsp if (type1 != type2) {
2432 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2433 b00d56cd 2018-04-01 stsp goto done;
2436 15a94983 2018-12-23 stsp switch (type1) {
2437 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2438 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2439 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2441 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2442 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2443 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2445 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2446 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2447 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2448 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2451 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2455 5e70831e 2019-05-28 stsp free(label1);
2456 5e70831e 2019-05-28 stsp free(label2);
2457 15a94983 2018-12-23 stsp free(id1);
2458 15a94983 2018-12-23 stsp free(id2);
2459 927df6b7 2019-02-10 stsp free(path);
2460 b72f483a 2019-02-05 stsp if (worktree)
2461 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2462 ad242220 2018-09-08 stsp if (repo) {
2463 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2464 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2465 ad242220 2018-09-08 stsp if (error == NULL)
2466 ad242220 2018-09-08 stsp error = repo_error;
2468 b00d56cd 2018-04-01 stsp return error;
2471 404c43c4 2018-06-21 stsp __dead static void
2472 404c43c4 2018-06-21 stsp usage_blame(void)
2474 9270e621 2019-02-05 stsp fprintf(stderr,
2475 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2476 404c43c4 2018-06-21 stsp getprogname());
2480 28315671 2019-08-14 stsp struct blame_line {
2481 28315671 2019-08-14 stsp int annotated;
2482 28315671 2019-08-14 stsp char *id_str;
2483 82f6abb8 2019-08-14 stsp char *committer;
2484 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2487 28315671 2019-08-14 stsp struct blame_cb_args {
2488 28315671 2019-08-14 stsp struct blame_line *lines;
2489 28315671 2019-08-14 stsp int nlines;
2490 7ef28ff8 2019-08-14 stsp int nlines_prec;
2491 28315671 2019-08-14 stsp int lineno_cur;
2492 28315671 2019-08-14 stsp off_t *line_offsets;
2494 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2497 404c43c4 2018-06-21 stsp static const struct got_error *
2498 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2500 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2501 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2502 28315671 2019-08-14 stsp struct blame_line *bline;
2503 82f6abb8 2019-08-14 stsp char *line = NULL;
2504 28315671 2019-08-14 stsp size_t linesize = 0;
2505 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2506 28315671 2019-08-14 stsp off_t offset;
2507 bcb49d15 2019-08-14 stsp struct tm tm;
2508 bcb49d15 2019-08-14 stsp time_t committer_time;
2510 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2511 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2512 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2514 28315671 2019-08-14 stsp if (sigint_received)
2515 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2517 2839f8b9 2019-08-18 stsp if (lineno == -1)
2518 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2520 28315671 2019-08-14 stsp /* Annotate this line. */
2521 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2522 28315671 2019-08-14 stsp if (bline->annotated)
2523 28315671 2019-08-14 stsp return NULL;
2524 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2526 28315671 2019-08-14 stsp return err;
2528 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2530 82f6abb8 2019-08-14 stsp goto done;
2532 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2533 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2534 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2535 bcb49d15 2019-08-14 stsp goto done;
2538 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2539 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2540 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2541 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2542 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2543 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2544 82f6abb8 2019-08-14 stsp goto done;
2546 28315671 2019-08-14 stsp bline->annotated = 1;
2548 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2549 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2550 28315671 2019-08-14 stsp if (!bline->annotated)
2551 82f6abb8 2019-08-14 stsp goto done;
2553 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2554 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2555 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2556 82f6abb8 2019-08-14 stsp goto done;
2559 28315671 2019-08-14 stsp while (bline->annotated) {
2560 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2561 82f6abb8 2019-08-14 stsp size_t len;
2563 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2564 28315671 2019-08-14 stsp if (ferror(a->f))
2565 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2569 82f6abb8 2019-08-14 stsp committer = bline->committer;
2570 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2571 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2572 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2573 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2575 82f6abb8 2019-08-14 stsp *at = '\0';
2576 82f6abb8 2019-08-14 stsp len = strlen(committer);
2577 82f6abb8 2019-08-14 stsp if (len >= 9)
2578 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2580 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2582 28315671 2019-08-14 stsp *nl = '\0';
2583 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2584 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2586 28315671 2019-08-14 stsp a->lineno_cur++;
2587 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2590 82f6abb8 2019-08-14 stsp if (commit)
2591 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2592 28315671 2019-08-14 stsp free(line);
2593 28315671 2019-08-14 stsp return err;
2596 28315671 2019-08-14 stsp static const struct got_error *
2597 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2599 404c43c4 2018-06-21 stsp const struct got_error *error;
2600 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2601 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2602 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2603 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2604 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2605 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2606 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2607 28315671 2019-08-14 stsp struct blame_cb_args bca;
2608 28315671 2019-08-14 stsp int ch, obj_type, i;
2609 b02560ec 2019-08-19 stsp size_t filesize;
2611 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2613 404c43c4 2018-06-21 stsp #ifndef PROFILE
2614 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2615 36e2fb66 2019-01-04 stsp NULL) == -1)
2616 404c43c4 2018-06-21 stsp err(1, "pledge");
2619 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2620 404c43c4 2018-06-21 stsp switch (ch) {
2622 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2625 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2626 66bea077 2018-08-02 stsp if (repo_path == NULL)
2627 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2629 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2632 2deda0b9 2019-03-07 stsp usage_blame();
2633 404c43c4 2018-06-21 stsp /* NOTREACHED */
2637 404c43c4 2018-06-21 stsp argc -= optind;
2638 404c43c4 2018-06-21 stsp argv += optind;
2640 a39318fd 2018-08-02 stsp if (argc == 1)
2641 404c43c4 2018-06-21 stsp path = argv[0];
2643 404c43c4 2018-06-21 stsp usage_blame();
2645 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2646 66bea077 2018-08-02 stsp if (cwd == NULL) {
2647 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2648 66bea077 2018-08-02 stsp goto done;
2650 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2651 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2652 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2653 66bea077 2018-08-02 stsp goto done;
2655 0c06baac 2019-02-05 stsp error = NULL;
2656 0c06baac 2019-02-05 stsp if (worktree) {
2657 0c06baac 2019-02-05 stsp repo_path =
2658 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2659 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2660 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2661 0c06baac 2019-02-05 stsp if (error)
2662 0c06baac 2019-02-05 stsp goto done;
2664 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2665 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2666 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2667 0c06baac 2019-02-05 stsp goto done;
2672 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2673 c02c541e 2019-03-29 stsp if (error != NULL)
2674 36e2fb66 2019-01-04 stsp goto done;
2676 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2677 c02c541e 2019-03-29 stsp if (error)
2678 404c43c4 2018-06-21 stsp goto done;
2680 0c06baac 2019-02-05 stsp if (worktree) {
2681 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2682 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2683 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2684 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2685 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2686 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2687 6efaaa2d 2019-02-05 stsp path) == -1) {
2688 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2689 0c06baac 2019-02-05 stsp goto done;
2691 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2694 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2696 0c06baac 2019-02-05 stsp if (error)
2697 66bea077 2018-08-02 stsp goto done;
2699 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2700 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2701 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2702 404c43c4 2018-06-21 stsp if (error != NULL)
2703 66bea077 2018-08-02 stsp goto done;
2704 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2705 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2706 404c43c4 2018-06-21 stsp if (error != NULL)
2707 66bea077 2018-08-02 stsp goto done;
2709 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2710 30837e32 2019-07-25 stsp if (error)
2711 66bea077 2018-08-02 stsp goto done;
2714 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2715 28315671 2019-08-14 stsp if (error)
2716 28315671 2019-08-14 stsp goto done;
2717 28315671 2019-08-14 stsp if (obj_id == NULL) {
2718 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2719 28315671 2019-08-14 stsp goto done;
2722 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2723 28315671 2019-08-14 stsp if (error)
2724 28315671 2019-08-14 stsp goto done;
2726 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2727 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2728 28315671 2019-08-14 stsp goto done;
2731 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2732 28315671 2019-08-14 stsp if (error)
2733 28315671 2019-08-14 stsp goto done;
2734 28315671 2019-08-14 stsp bca.f = got_opentemp();
2735 28315671 2019-08-14 stsp if (bca.f == NULL) {
2736 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2737 28315671 2019-08-14 stsp goto done;
2739 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2740 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2741 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2742 28315671 2019-08-14 stsp goto done;
2744 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2745 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2746 b02560ec 2019-08-19 stsp bca.nlines--;
2748 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2749 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2750 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2751 28315671 2019-08-14 stsp goto done;
2753 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2754 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2755 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2756 7ef28ff8 2019-08-14 stsp while (i > 0) {
2758 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2760 82f6abb8 2019-08-14 stsp bca.repo = repo;
2762 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2763 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2764 28315671 2019-08-14 stsp if (error)
2765 28315671 2019-08-14 stsp goto done;
2767 66bea077 2018-08-02 stsp free(in_repo_path);
2768 66bea077 2018-08-02 stsp free(repo_path);
2769 66bea077 2018-08-02 stsp free(cwd);
2770 404c43c4 2018-06-21 stsp free(commit_id);
2771 28315671 2019-08-14 stsp free(obj_id);
2773 28315671 2019-08-14 stsp got_object_blob_close(blob);
2774 0c06baac 2019-02-05 stsp if (worktree)
2775 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2776 ad242220 2018-09-08 stsp if (repo) {
2777 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2778 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2779 ad242220 2018-09-08 stsp if (error == NULL)
2780 ad242220 2018-09-08 stsp error = repo_error;
2782 3affba96 2019-09-22 stsp if (bca.lines) {
2783 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2784 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2785 3affba96 2019-09-22 stsp free(bline->id_str);
2786 3affba96 2019-09-22 stsp free(bline->committer);
2788 3affba96 2019-09-22 stsp free(bca.lines);
2790 28315671 2019-08-14 stsp free(bca.line_offsets);
2791 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2792 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2793 404c43c4 2018-06-21 stsp return error;
2796 5de5890b 2018-10-18 stsp __dead static void
2797 5de5890b 2018-10-18 stsp usage_tree(void)
2799 c1669e2e 2019-01-09 stsp fprintf(stderr,
2800 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2801 5de5890b 2018-10-18 stsp getprogname());
2805 c1669e2e 2019-01-09 stsp static void
2806 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2807 c1669e2e 2019-01-09 stsp const char *root_path)
2809 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2810 848d6979 2019-08-12 stsp const char *modestr = "";
2811 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2813 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2814 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2817 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2818 63c5ca5d 2019-08-24 stsp modestr = "$";
2819 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2820 848d6979 2019-08-12 stsp modestr = "@";
2821 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2822 848d6979 2019-08-12 stsp modestr = "/";
2823 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2824 848d6979 2019-08-12 stsp modestr = "*";
2826 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2827 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2830 5de5890b 2018-10-18 stsp static const struct got_error *
2831 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2832 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2833 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2835 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2836 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2837 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2838 56e0773d 2019-11-28 stsp int nentries, i;
2840 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2842 5de5890b 2018-10-18 stsp goto done;
2844 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2846 5de5890b 2018-10-18 stsp goto done;
2847 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2848 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2849 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2850 5de5890b 2018-10-18 stsp char *id = NULL;
2852 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2855 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2856 5de5890b 2018-10-18 stsp if (show_ids) {
2857 5de5890b 2018-10-18 stsp char *id_str;
2858 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2859 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2861 5de5890b 2018-10-18 stsp goto done;
2862 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2863 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2864 5de5890b 2018-10-18 stsp free(id_str);
2865 5de5890b 2018-10-18 stsp goto done;
2867 5de5890b 2018-10-18 stsp free(id_str);
2869 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2872 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2873 c1669e2e 2019-01-09 stsp char *child_path;
2874 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2875 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2876 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2877 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2878 c1669e2e 2019-01-09 stsp goto done;
2880 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2881 c1669e2e 2019-01-09 stsp root_path, repo);
2882 c1669e2e 2019-01-09 stsp free(child_path);
2884 c1669e2e 2019-01-09 stsp goto done;
2889 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2890 5de5890b 2018-10-18 stsp free(tree_id);
2891 5de5890b 2018-10-18 stsp return err;
2894 5de5890b 2018-10-18 stsp static const struct got_error *
2895 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2897 5de5890b 2018-10-18 stsp const struct got_error *error;
2898 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2899 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2900 7a2c19d6 2019-02-05 stsp const char *path;
2901 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2902 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2903 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2904 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2907 5de5890b 2018-10-18 stsp #ifndef PROFILE
2908 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2909 0f8d269b 2019-01-04 stsp NULL) == -1)
2910 5de5890b 2018-10-18 stsp err(1, "pledge");
2913 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2914 5de5890b 2018-10-18 stsp switch (ch) {
2916 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2919 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2920 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2921 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2923 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2926 5de5890b 2018-10-18 stsp show_ids = 1;
2929 c1669e2e 2019-01-09 stsp recurse = 1;
2932 2deda0b9 2019-03-07 stsp usage_tree();
2933 5de5890b 2018-10-18 stsp /* NOTREACHED */
2937 5de5890b 2018-10-18 stsp argc -= optind;
2938 5de5890b 2018-10-18 stsp argv += optind;
2940 5de5890b 2018-10-18 stsp if (argc == 1)
2941 5de5890b 2018-10-18 stsp path = argv[0];
2942 5de5890b 2018-10-18 stsp else if (argc > 1)
2943 5de5890b 2018-10-18 stsp usage_tree();
2945 7a2c19d6 2019-02-05 stsp path = NULL;
2947 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2948 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2949 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2950 9bf7a39b 2019-02-05 stsp goto done;
2952 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2953 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2954 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2955 7a2c19d6 2019-02-05 stsp goto done;
2957 7a2c19d6 2019-02-05 stsp error = NULL;
2958 7a2c19d6 2019-02-05 stsp if (worktree) {
2959 7a2c19d6 2019-02-05 stsp repo_path =
2960 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2961 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2962 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2963 7a2c19d6 2019-02-05 stsp if (error)
2964 7a2c19d6 2019-02-05 stsp goto done;
2966 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2967 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2968 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2969 7a2c19d6 2019-02-05 stsp goto done;
2974 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2975 5de5890b 2018-10-18 stsp if (error != NULL)
2976 c02c541e 2019-03-29 stsp goto done;
2978 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2979 c02c541e 2019-03-29 stsp if (error)
2980 5de5890b 2018-10-18 stsp goto done;
2982 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2983 9bf7a39b 2019-02-05 stsp if (worktree) {
2984 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2985 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2986 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2987 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2988 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2989 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2990 9bf7a39b 2019-02-05 stsp goto done;
2992 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2994 9bf7a39b 2019-02-05 stsp if (error)
2995 9bf7a39b 2019-02-05 stsp goto done;
2997 9bf7a39b 2019-02-05 stsp path = "/";
2999 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3000 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3001 9bf7a39b 2019-02-05 stsp if (error != NULL)
3002 9bf7a39b 2019-02-05 stsp goto done;
3005 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3006 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3007 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3008 5de5890b 2018-10-18 stsp if (error != NULL)
3009 5de5890b 2018-10-18 stsp goto done;
3010 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3011 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3012 5de5890b 2018-10-18 stsp if (error != NULL)
3013 5de5890b 2018-10-18 stsp goto done;
3015 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
3016 30837e32 2019-07-25 stsp if (error)
3017 5de5890b 2018-10-18 stsp goto done;
3020 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3021 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3023 5de5890b 2018-10-18 stsp free(in_repo_path);
3024 5de5890b 2018-10-18 stsp free(repo_path);
3025 5de5890b 2018-10-18 stsp free(cwd);
3026 5de5890b 2018-10-18 stsp free(commit_id);
3027 7a2c19d6 2019-02-05 stsp if (worktree)
3028 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3029 5de5890b 2018-10-18 stsp if (repo) {
3030 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3031 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3032 5de5890b 2018-10-18 stsp if (error == NULL)
3033 5de5890b 2018-10-18 stsp error = repo_error;
3035 5de5890b 2018-10-18 stsp return error;
3038 6bad629b 2019-02-04 stsp __dead static void
3039 6bad629b 2019-02-04 stsp usage_status(void)
3041 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3045 b72f483a 2019-02-05 stsp static const struct got_error *
3046 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3047 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3048 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3049 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3051 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3052 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3053 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3054 b72f483a 2019-02-05 stsp return NULL;
3057 6bad629b 2019-02-04 stsp static const struct got_error *
3058 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3060 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3061 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3062 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3063 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3064 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3065 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3068 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3070 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3071 6bad629b 2019-02-04 stsp switch (ch) {
3073 2deda0b9 2019-03-07 stsp usage_status();
3074 6bad629b 2019-02-04 stsp /* NOTREACHED */
3078 6bad629b 2019-02-04 stsp argc -= optind;
3079 6bad629b 2019-02-04 stsp argv += optind;
3081 6bad629b 2019-02-04 stsp #ifndef PROFILE
3082 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3083 6bad629b 2019-02-04 stsp NULL) == -1)
3084 6bad629b 2019-02-04 stsp err(1, "pledge");
3086 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3087 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3088 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3089 927df6b7 2019-02-10 stsp goto done;
3092 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3093 927df6b7 2019-02-10 stsp if (error != NULL)
3094 a5edda0a 2019-07-27 stsp goto done;
3096 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3098 6bad629b 2019-02-04 stsp if (error != NULL)
3099 6bad629b 2019-02-04 stsp goto done;
3101 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3102 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3103 087fb88c 2019-08-04 stsp if (error)
3104 087fb88c 2019-08-04 stsp goto done;
3106 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3107 6bad629b 2019-02-04 stsp if (error)
3108 6bad629b 2019-02-04 stsp goto done;
3110 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3111 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3113 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3114 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3115 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3116 927df6b7 2019-02-10 stsp free(cwd);
3117 d0eebce4 2019-03-11 stsp return error;
3120 d0eebce4 2019-03-11 stsp __dead static void
3121 d0eebce4 2019-03-11 stsp usage_ref(void)
3123 d0eebce4 2019-03-11 stsp fprintf(stderr,
3124 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3125 d0eebce4 2019-03-11 stsp getprogname());
3129 d0eebce4 2019-03-11 stsp static const struct got_error *
3130 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3132 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3133 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3134 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3136 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3137 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3139 d0eebce4 2019-03-11 stsp return err;
3141 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3142 d0eebce4 2019-03-11 stsp char *refstr;
3143 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3144 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3145 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3146 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3147 d0eebce4 2019-03-11 stsp free(refstr);
3150 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3151 d0eebce4 2019-03-11 stsp return NULL;
3154 d0eebce4 2019-03-11 stsp static const struct got_error *
3155 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3157 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3158 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3160 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3162 d0eebce4 2019-03-11 stsp return err;
3164 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3165 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3166 d0eebce4 2019-03-11 stsp return err;
3169 d0eebce4 2019-03-11 stsp static const struct got_error *
3170 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3172 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3173 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3174 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3177 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3178 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3179 d1644381 2019-07-14 stsp * an unintended typo.
3181 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3182 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3184 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3186 d83d9d5c 2019-05-13 stsp if (err) {
3187 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3189 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3190 d83d9d5c 2019-05-13 stsp return err;
3191 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3193 d83d9d5c 2019-05-13 stsp return err;
3194 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3195 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3197 d83d9d5c 2019-05-13 stsp return err;
3200 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3202 d0eebce4 2019-03-11 stsp goto done;
3204 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3207 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3209 d1c1ae5f 2019-08-12 stsp return err;
3212 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3213 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3215 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3216 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3217 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3220 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3221 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3222 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3224 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3225 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3227 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3229 d1c1ae5f 2019-08-12 stsp return err;
3231 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3233 d1c1ae5f 2019-08-12 stsp goto done;
3235 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3237 d1c1ae5f 2019-08-12 stsp if (target_ref)
3238 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3240 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3241 d0eebce4 2019-03-11 stsp return err;
3244 d0eebce4 2019-03-11 stsp static const struct got_error *
3245 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3247 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3248 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3249 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3250 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3251 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3252 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3254 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3255 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3256 d0eebce4 2019-03-11 stsp switch (ch) {
3258 d0eebce4 2019-03-11 stsp delref = optarg;
3261 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3262 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3263 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3265 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3268 d0eebce4 2019-03-11 stsp do_list = 1;
3271 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3274 d0eebce4 2019-03-11 stsp usage_ref();
3275 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3279 d0eebce4 2019-03-11 stsp if (do_list && delref)
3280 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3282 d0eebce4 2019-03-11 stsp argc -= optind;
3283 d0eebce4 2019-03-11 stsp argv += optind;
3285 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3286 d1c1ae5f 2019-08-12 stsp if (create_symref)
3287 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3288 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3289 d0eebce4 2019-03-11 stsp if (argc > 0)
3290 d0eebce4 2019-03-11 stsp usage_ref();
3291 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3292 d0eebce4 2019-03-11 stsp usage_ref();
3294 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3295 e0b57350 2019-03-12 stsp if (do_list) {
3296 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3297 e0b57350 2019-03-12 stsp NULL) == -1)
3298 e0b57350 2019-03-12 stsp err(1, "pledge");
3300 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3301 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3302 e0b57350 2019-03-12 stsp err(1, "pledge");
3305 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3306 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3307 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3308 d0eebce4 2019-03-11 stsp goto done;
3311 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3312 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3313 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3314 d0eebce4 2019-03-11 stsp goto done;
3316 d0eebce4 2019-03-11 stsp error = NULL;
3317 d0eebce4 2019-03-11 stsp if (worktree) {
3318 d0eebce4 2019-03-11 stsp repo_path =
3319 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3320 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3321 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3322 d0eebce4 2019-03-11 stsp if (error)
3323 d0eebce4 2019-03-11 stsp goto done;
3325 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3326 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3327 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3328 d0eebce4 2019-03-11 stsp goto done;
3333 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3334 d0eebce4 2019-03-11 stsp if (error != NULL)
3335 d0eebce4 2019-03-11 stsp goto done;
3337 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3338 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3339 c02c541e 2019-03-29 stsp if (error)
3340 c02c541e 2019-03-29 stsp goto done;
3342 d0eebce4 2019-03-11 stsp if (do_list)
3343 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3344 d0eebce4 2019-03-11 stsp else if (delref)
3345 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3346 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3347 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3349 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3352 4e759de4 2019-06-26 stsp got_repo_close(repo);
3353 4e759de4 2019-06-26 stsp if (worktree)
3354 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3355 4e759de4 2019-06-26 stsp free(cwd);
3356 4e759de4 2019-06-26 stsp free(repo_path);
3357 4e759de4 2019-06-26 stsp return error;
3360 4e759de4 2019-06-26 stsp __dead static void
3361 4e759de4 2019-06-26 stsp usage_branch(void)
3363 4e759de4 2019-06-26 stsp fprintf(stderr,
3364 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3365 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3369 4e759de4 2019-06-26 stsp static const struct got_error *
3370 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3371 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3373 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3374 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3375 4e99b47e 2019-10-04 stsp char *refstr;
3377 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3378 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3379 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3380 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3382 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3384 4e99b47e 2019-10-04 stsp return err;
3385 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3386 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3387 4e99b47e 2019-10-04 stsp marker = "* ";
3389 4e99b47e 2019-10-04 stsp marker = "~ ";
3393 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3394 4e99b47e 2019-10-04 stsp refname += 11;
3395 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3396 4e99b47e 2019-10-04 stsp refname += 18;
3398 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3399 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3400 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3402 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3403 4e99b47e 2019-10-04 stsp free(refstr);
3404 4e99b47e 2019-10-04 stsp return NULL;
3407 4e99b47e 2019-10-04 stsp static const struct got_error *
3408 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3410 ad89fa31 2019-10-04 stsp const char *refname;
3412 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3413 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3415 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3417 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3418 ad89fa31 2019-10-04 stsp refname += 11;
3419 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3420 ad89fa31 2019-10-04 stsp refname += 18;
3422 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3424 ad89fa31 2019-10-04 stsp return NULL;
3427 ad89fa31 2019-10-04 stsp static const struct got_error *
3428 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3430 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3431 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3432 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3433 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3434 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3436 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3438 4e99b47e 2019-10-04 stsp if (worktree) {
3439 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3440 4e99b47e 2019-10-04 stsp worktree);
3442 4e99b47e 2019-10-04 stsp return err;
3444 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3445 4e99b47e 2019-10-04 stsp worktree);
3447 4e99b47e 2019-10-04 stsp return err;
3449 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3450 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3451 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3453 4e99b47e 2019-10-04 stsp return err;
3454 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3455 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3459 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3460 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3462 4e759de4 2019-06-26 stsp return err;
3464 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3465 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3467 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3468 4e759de4 2019-06-26 stsp return NULL;
3471 4e759de4 2019-06-26 stsp static const struct got_error *
3472 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3473 45cd4e47 2019-08-25 stsp const char *branch_name)
3475 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3476 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3477 4e759de4 2019-06-26 stsp char *refname;
3479 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3480 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3482 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3484 4e759de4 2019-06-26 stsp goto done;
3486 45cd4e47 2019-08-25 stsp if (worktree &&
3487 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3488 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3489 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3490 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3491 45cd4e47 2019-08-25 stsp goto done;
3494 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3497 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3498 4e759de4 2019-06-26 stsp free(refname);
3499 4e759de4 2019-06-26 stsp return err;
3502 4e759de4 2019-06-26 stsp static const struct got_error *
3503 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3504 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3506 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3507 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3508 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3511 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3512 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3513 d3f84d51 2019-07-11 stsp * an unintended typo.
3515 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3516 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3518 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3519 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3520 4e759de4 2019-06-26 stsp goto done;
3523 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3524 4e759de4 2019-06-26 stsp if (err == NULL) {
3525 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3526 4e759de4 2019-06-26 stsp goto done;
3527 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3528 4e759de4 2019-06-26 stsp goto done;
3530 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3532 4e759de4 2019-06-26 stsp goto done;
3534 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3537 4e759de4 2019-06-26 stsp got_ref_close(ref);
3538 4e759de4 2019-06-26 stsp free(base_refname);
3539 4e759de4 2019-06-26 stsp free(refname);
3540 4e759de4 2019-06-26 stsp return err;
3543 4e759de4 2019-06-26 stsp static const struct got_error *
3544 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3546 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3547 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3548 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3549 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3550 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3551 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3553 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3554 4e759de4 2019-06-26 stsp switch (ch) {
3556 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3559 4e759de4 2019-06-26 stsp delref = optarg;
3562 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3563 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3564 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3566 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3569 4e759de4 2019-06-26 stsp do_list = 1;
3572 4e759de4 2019-06-26 stsp usage_branch();
3573 4e759de4 2019-06-26 stsp /* NOTREACHED */
3577 4e759de4 2019-06-26 stsp if (do_list && delref)
3578 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3580 4e759de4 2019-06-26 stsp argc -= optind;
3581 4e759de4 2019-06-26 stsp argv += optind;
3583 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3584 ad89fa31 2019-10-04 stsp do_show = 1;
3586 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3587 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3589 4e759de4 2019-06-26 stsp if (do_list || delref) {
3590 4e759de4 2019-06-26 stsp if (argc > 0)
3591 4e759de4 2019-06-26 stsp usage_branch();
3592 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3593 4e759de4 2019-06-26 stsp usage_branch();
3595 4e759de4 2019-06-26 stsp #ifndef PROFILE
3596 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3597 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3598 4e759de4 2019-06-26 stsp NULL) == -1)
3599 4e759de4 2019-06-26 stsp err(1, "pledge");
3601 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3602 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3603 4e759de4 2019-06-26 stsp err(1, "pledge");
3606 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3607 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3608 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3609 4e759de4 2019-06-26 stsp goto done;
3612 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3613 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3614 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3615 4e759de4 2019-06-26 stsp goto done;
3617 4e759de4 2019-06-26 stsp error = NULL;
3618 4e759de4 2019-06-26 stsp if (worktree) {
3619 4e759de4 2019-06-26 stsp repo_path =
3620 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3621 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3622 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3623 4e759de4 2019-06-26 stsp if (error)
3624 4e759de4 2019-06-26 stsp goto done;
3626 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3627 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3628 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3629 4e759de4 2019-06-26 stsp goto done;
3634 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3635 4e759de4 2019-06-26 stsp if (error != NULL)
3636 4e759de4 2019-06-26 stsp goto done;
3638 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3639 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3640 4e759de4 2019-06-26 stsp if (error)
3641 4e759de4 2019-06-26 stsp goto done;
3643 ad89fa31 2019-10-04 stsp if (do_show)
3644 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3645 ad89fa31 2019-10-04 stsp else if (do_list)
3646 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3647 4e759de4 2019-06-26 stsp else if (delref)
3648 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3650 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3651 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3652 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3653 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3654 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3655 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3656 a74f7e83 2019-11-10 stsp if (error)
3657 a74f7e83 2019-11-10 stsp goto done;
3658 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3659 a74f7e83 2019-11-10 stsp free(commit_id);
3663 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3664 d0eebce4 2019-03-11 stsp if (worktree)
3665 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3666 d0eebce4 2019-03-11 stsp free(cwd);
3667 d0eebce4 2019-03-11 stsp free(repo_path);
3668 d00136be 2019-03-26 stsp return error;
3672 d00136be 2019-03-26 stsp __dead static void
3673 8e7bd50a 2019-08-22 stsp usage_tag(void)
3675 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3676 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3677 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3682 b8bad2ba 2019-08-23 stsp static const struct got_error *
3683 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3685 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3686 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3687 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3688 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3689 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3691 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3692 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3693 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3694 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3696 b8bad2ba 2019-08-23 stsp return err;
3697 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3700 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3703 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3704 b8bad2ba 2019-08-23 stsp free(re_id);
3707 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3708 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3711 b8bad2ba 2019-08-23 stsp while (se) {
3712 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3715 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3716 b8bad2ba 2019-08-23 stsp free(se_id);
3719 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3720 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3722 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3723 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3725 b8bad2ba 2019-08-23 stsp return err;
3726 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3729 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3734 b8bad2ba 2019-08-23 stsp return err;
3738 8e7bd50a 2019-08-22 stsp static const struct got_error *
3739 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3740 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3742 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3743 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3744 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3745 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3746 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3750 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3752 b8bad2ba 2019-08-23 stsp return err;
3753 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3755 b8bad2ba 2019-08-23 stsp goto done;
3757 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3759 b8bad2ba 2019-08-23 stsp goto done;
3760 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3762 b8bad2ba 2019-08-23 stsp goto done;
3764 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3765 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3767 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3768 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3770 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3771 b8bad2ba 2019-08-23 stsp *cmp = -1;
3773 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3775 b8bad2ba 2019-08-23 stsp free(id1);
3776 b8bad2ba 2019-08-23 stsp free(id2);
3778 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3780 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3781 b8bad2ba 2019-08-23 stsp return err;
3784 b8bad2ba 2019-08-23 stsp static const struct got_error *
3785 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3787 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3788 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3789 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3791 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3793 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3795 8e7bd50a 2019-08-22 stsp return err;
3797 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3798 8e7bd50a 2019-08-22 stsp const char *refname;
3799 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3800 8e7bd50a 2019-08-22 stsp char datebuf[26];
3801 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3802 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3803 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3805 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3806 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3808 8e7bd50a 2019-08-22 stsp refname += 10;
3809 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3810 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3811 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3814 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3815 8e7bd50a 2019-08-22 stsp free(refstr);
3817 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3820 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3824 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3825 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3826 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3827 2417344c 2019-08-23 stsp if (datestr)
3828 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3829 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3830 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3833 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3834 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3835 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3837 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3838 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3840 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3841 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3843 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3844 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3849 8e7bd50a 2019-08-22 stsp free(id_str);
3850 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3851 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3852 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3853 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3857 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3859 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3861 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3862 8e7bd50a 2019-08-22 stsp } while (line);
3863 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3866 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3867 8e7bd50a 2019-08-22 stsp return NULL;
3870 8e7bd50a 2019-08-22 stsp static const struct got_error *
3871 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3872 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3874 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3875 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3876 f372d5cd 2019-10-21 stsp char *editor = NULL;
3877 8e7bd50a 2019-08-22 stsp int fd = -1;
3879 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3880 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3881 8e7bd50a 2019-08-22 stsp goto done;
3884 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3885 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3886 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3887 8e7bd50a 2019-08-22 stsp goto done;
3890 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3892 8e7bd50a 2019-08-22 stsp goto done;
3894 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3895 8e7bd50a 2019-08-22 stsp close(fd);
3897 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3899 8e7bd50a 2019-08-22 stsp goto done;
3900 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3902 8e7bd50a 2019-08-22 stsp free(initial_content);
3903 8e7bd50a 2019-08-22 stsp free(template);
3904 8e7bd50a 2019-08-22 stsp free(editor);
3906 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3907 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3908 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3909 8e7bd50a 2019-08-22 stsp if (err) {
3910 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3911 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3914 8e7bd50a 2019-08-22 stsp return err;
3917 8e7bd50a 2019-08-22 stsp static const struct got_error *
3918 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3919 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3921 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3922 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3923 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3924 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3925 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3926 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3927 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3930 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3931 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3932 8e7bd50a 2019-08-22 stsp * an unintended typo.
3934 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
3935 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3937 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3939 8e7bd50a 2019-08-22 stsp return err;
3941 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3942 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3944 8e7bd50a 2019-08-22 stsp goto done;
3946 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3948 8e7bd50a 2019-08-22 stsp goto done;
3950 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3951 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3952 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3953 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3954 8e7bd50a 2019-08-22 stsp goto done;
3956 8e7bd50a 2019-08-22 stsp tag_name += 10;
3957 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3958 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3959 8e7bd50a 2019-08-22 stsp goto done;
3962 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3963 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3964 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3965 8e7bd50a 2019-08-22 stsp goto done;
3966 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3967 8e7bd50a 2019-08-22 stsp goto done;
3969 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3970 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3971 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3972 f372d5cd 2019-10-21 stsp if (err) {
3973 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3974 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3975 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3976 8e7bd50a 2019-08-22 stsp goto done;
3980 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3981 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3982 f372d5cd 2019-10-21 stsp if (err) {
3983 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3984 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3985 8e7bd50a 2019-08-22 stsp goto done;
3988 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3989 f372d5cd 2019-10-21 stsp if (err) {
3990 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3991 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3992 8e7bd50a 2019-08-22 stsp goto done;
3995 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3996 f372d5cd 2019-10-21 stsp if (err) {
3997 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3998 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3999 f372d5cd 2019-10-21 stsp goto done;
4002 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
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 f372d5cd 2019-10-21 stsp goto done;
4008 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4010 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4011 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4012 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4013 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4014 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4015 f372d5cd 2019-10-21 stsp free(tag_id_str);
4017 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4018 8e7bd50a 2019-08-22 stsp free(commit_id);
4019 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4020 8e7bd50a 2019-08-22 stsp free(refname);
4021 8e7bd50a 2019-08-22 stsp free(tagmsg);
4022 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4023 aba9c984 2019-09-08 stsp free(tagger);
4024 8e7bd50a 2019-08-22 stsp return err;
4027 8e7bd50a 2019-08-22 stsp static const struct got_error *
4028 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4030 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4031 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4032 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4033 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4034 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4035 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4036 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4038 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4039 8e7bd50a 2019-08-22 stsp switch (ch) {
4041 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4044 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4045 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4046 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4048 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4051 8e7bd50a 2019-08-22 stsp do_list = 1;
4054 8e7bd50a 2019-08-22 stsp usage_tag();
4055 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4059 8e7bd50a 2019-08-22 stsp argc -= optind;
4060 8e7bd50a 2019-08-22 stsp argv += optind;
4062 8e7bd50a 2019-08-22 stsp if (do_list) {
4063 8e7bd50a 2019-08-22 stsp if (tagmsg)
4064 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
4065 8e7bd50a 2019-08-22 stsp if (argc > 0)
4066 8e7bd50a 2019-08-22 stsp usage_tag();
4067 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
4068 8e7bd50a 2019-08-22 stsp usage_tag();
4069 a2887370 2019-08-23 stsp else if (argc > 1)
4070 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
4071 a2887370 2019-08-23 stsp tag_name = argv[0];
4073 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4074 8e7bd50a 2019-08-22 stsp if (do_list) {
4075 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4076 8e7bd50a 2019-08-22 stsp NULL) == -1)
4077 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4079 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4080 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4081 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4084 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4085 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4086 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4087 8e7bd50a 2019-08-22 stsp goto done;
4090 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4091 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4092 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4093 8e7bd50a 2019-08-22 stsp goto done;
4095 8e7bd50a 2019-08-22 stsp error = NULL;
4096 8e7bd50a 2019-08-22 stsp if (worktree) {
4097 8e7bd50a 2019-08-22 stsp repo_path =
4098 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4099 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4100 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4101 8e7bd50a 2019-08-22 stsp if (error)
4102 8e7bd50a 2019-08-22 stsp goto done;
4104 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4105 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4106 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4107 8e7bd50a 2019-08-22 stsp goto done;
4112 8e7bd50a 2019-08-22 stsp if (do_list) {
4113 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4114 c9956ddf 2019-09-08 stsp if (error != NULL)
4115 c9956ddf 2019-09-08 stsp goto done;
4116 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4117 8e7bd50a 2019-08-22 stsp if (error)
4118 8e7bd50a 2019-08-22 stsp goto done;
4119 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4121 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4122 c9956ddf 2019-09-08 stsp if (error)
4123 c9956ddf 2019-09-08 stsp goto done;
4124 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4125 c9956ddf 2019-09-08 stsp if (error != NULL)
4126 c9956ddf 2019-09-08 stsp goto done;
4128 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4129 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4130 8e7bd50a 2019-08-22 stsp if (error)
4131 8e7bd50a 2019-08-22 stsp goto done;
4134 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4135 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4136 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4137 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4138 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4139 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4140 8e7bd50a 2019-08-22 stsp if (error)
4141 8e7bd50a 2019-08-22 stsp goto done;
4142 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4143 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4144 8e7bd50a 2019-08-22 stsp if (error)
4145 8e7bd50a 2019-08-22 stsp goto done;
4146 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4147 8e7bd50a 2019-08-22 stsp free(commit_id);
4148 8e7bd50a 2019-08-22 stsp if (error)
4149 8e7bd50a 2019-08-22 stsp goto done;
4152 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4153 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4157 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4158 8e7bd50a 2019-08-22 stsp if (worktree)
4159 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4160 8e7bd50a 2019-08-22 stsp free(cwd);
4161 8e7bd50a 2019-08-22 stsp free(repo_path);
4162 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4163 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4164 8e7bd50a 2019-08-22 stsp return error;
4167 8e7bd50a 2019-08-22 stsp __dead static void
4168 d00136be 2019-03-26 stsp usage_add(void)
4170 022fae89 2019-12-06 tracey fprintf(stderr, "usage: %s add [-R] [-I] file-path ...\n",
4171 022fae89 2019-12-06 tracey getprogname());
4175 d00136be 2019-03-26 stsp static const struct got_error *
4176 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4178 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4180 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4181 4e68cba3 2019-11-23 stsp return NULL;
4184 4e68cba3 2019-11-23 stsp static const struct got_error *
4185 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4187 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4188 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4189 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4190 1dd54920 2019-05-11 stsp char *cwd = NULL;
4191 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4192 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4193 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4195 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4197 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4198 d00136be 2019-03-26 stsp switch (ch) {
4199 022fae89 2019-12-06 tracey case 'I':
4200 022fae89 2019-12-06 tracey no_ignores = 1;
4203 4e68cba3 2019-11-23 stsp can_recurse = 1;
4206 d00136be 2019-03-26 stsp usage_add();
4207 d00136be 2019-03-26 stsp /* NOTREACHED */
4211 d00136be 2019-03-26 stsp argc -= optind;
4212 d00136be 2019-03-26 stsp argv += optind;
4214 43012d58 2019-07-14 stsp #ifndef PROFILE
4215 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4216 43012d58 2019-07-14 stsp NULL) == -1)
4217 43012d58 2019-07-14 stsp err(1, "pledge");
4219 723c305c 2019-05-11 jcs if (argc < 1)
4220 d00136be 2019-03-26 stsp usage_add();
4222 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4223 d00136be 2019-03-26 stsp if (cwd == NULL) {
4224 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4225 d00136be 2019-03-26 stsp goto done;
4228 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4229 d00136be 2019-03-26 stsp if (error)
4230 d00136be 2019-03-26 stsp goto done;
4232 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4234 031a5338 2019-03-26 stsp if (error != NULL)
4235 031a5338 2019-03-26 stsp goto done;
4237 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4238 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4239 d00136be 2019-03-26 stsp if (error)
4240 d00136be 2019-03-26 stsp goto done;
4242 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4243 6d022e97 2019-08-04 stsp if (error)
4244 022fae89 2019-12-06 tracey goto done;
4246 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4247 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4248 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4249 6d022e97 2019-08-04 stsp goto done;
4253 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4254 4e68cba3 2019-11-23 stsp char *ondisk_path;
4255 4e68cba3 2019-11-23 stsp struct stat sb;
4256 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4257 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4258 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4259 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4260 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4261 4e68cba3 2019-11-23 stsp goto done;
4263 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4264 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4265 4e68cba3 2019-11-23 stsp free(ondisk_path);
4268 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4269 4e68cba3 2019-11-23 stsp ondisk_path);
4270 4e68cba3 2019-11-23 stsp free(ondisk_path);
4271 4e68cba3 2019-11-23 stsp goto done;
4273 4e68cba3 2019-11-23 stsp free(ondisk_path);
4274 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4275 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4276 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4277 4e68cba3 2019-11-23 stsp goto done;
4282 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4283 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4286 031a5338 2019-03-26 stsp got_repo_close(repo);
4287 d00136be 2019-03-26 stsp if (worktree)
4288 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4289 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4290 1dd54920 2019-05-11 stsp free((char *)pe->path);
4291 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4292 2ec1f75b 2019-03-26 stsp free(cwd);
4293 2ec1f75b 2019-03-26 stsp return error;
4296 2ec1f75b 2019-03-26 stsp __dead static void
4297 648e4ef7 2019-07-09 stsp usage_remove(void)
4299 70e3e7f5 2019-12-13 tracey fprintf(stderr, "usage: %s remove [-f] [-k] [-R] file-path ...\n",
4300 f2a9dc41 2019-12-13 tracey getprogname());
4304 2a06fe5f 2019-08-24 stsp static const struct got_error *
4305 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4306 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4308 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4310 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4311 2a06fe5f 2019-08-24 stsp return NULL;
4312 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4313 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4314 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4315 2a06fe5f 2019-08-24 stsp return NULL;
4318 2ec1f75b 2019-03-26 stsp static const struct got_error *
4319 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4321 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4322 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4323 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4324 17ed4618 2019-06-02 stsp char *cwd = NULL;
4325 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4326 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4327 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4329 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4331 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4332 2ec1f75b 2019-03-26 stsp switch (ch) {
4334 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4336 70e3e7f5 2019-12-13 tracey case 'k':
4337 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4339 f2a9dc41 2019-12-13 tracey case 'R':
4340 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4343 f2a9dc41 2019-12-13 tracey usage_remove();
4344 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4348 2ec1f75b 2019-03-26 stsp argc -= optind;
4349 2ec1f75b 2019-03-26 stsp argv += optind;
4351 43012d58 2019-07-14 stsp #ifndef PROFILE
4352 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4353 43012d58 2019-07-14 stsp NULL) == -1)
4354 43012d58 2019-07-14 stsp err(1, "pledge");
4356 17ed4618 2019-06-02 stsp if (argc < 1)
4357 648e4ef7 2019-07-09 stsp usage_remove();
4359 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4360 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4361 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4362 2ec1f75b 2019-03-26 stsp goto done;
4364 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4365 2ec1f75b 2019-03-26 stsp if (error)
4366 2ec1f75b 2019-03-26 stsp goto done;
4368 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4371 2ec1f75b 2019-03-26 stsp goto done;
4373 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4374 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4375 2ec1f75b 2019-03-26 stsp if (error)
4376 2ec1f75b 2019-03-26 stsp goto done;
4378 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4379 6d022e97 2019-08-04 stsp if (error)
4380 6d022e97 2019-08-04 stsp goto done;
4382 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4383 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4384 f2a9dc41 2019-12-13 tracey struct stat sb;
4385 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4386 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4387 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4388 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4389 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4390 f2a9dc41 2019-12-13 tracey goto done;
4392 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4393 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4394 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4395 f2a9dc41 2019-12-13 tracey continue;
4397 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4398 f2a9dc41 2019-12-13 tracey ondisk_path);
4399 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4400 f2a9dc41 2019-12-13 tracey goto done;
4402 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4403 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4404 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4405 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4406 f2a9dc41 2019-12-13 tracey goto done;
4411 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4412 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4413 a129376b 2019-03-28 stsp if (error)
4414 a129376b 2019-03-28 stsp goto done;
4417 a129376b 2019-03-28 stsp got_repo_close(repo);
4418 a129376b 2019-03-28 stsp if (worktree)
4419 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4420 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4421 17ed4618 2019-06-02 stsp free((char *)pe->path);
4422 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4423 a129376b 2019-03-28 stsp free(cwd);
4424 a129376b 2019-03-28 stsp return error;
4427 a129376b 2019-03-28 stsp __dead static void
4428 a129376b 2019-03-28 stsp usage_revert(void)
4430 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4431 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4435 1ee397ad 2019-07-12 stsp static const struct got_error *
4436 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4438 a129376b 2019-03-28 stsp while (path[0] == '/')
4440 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4441 33aa809d 2019-08-08 stsp return NULL;
4444 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4445 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4446 33aa809d 2019-08-08 stsp const char *action;
4449 33aa809d 2019-08-08 stsp static const struct got_error *
4450 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4451 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4453 33aa809d 2019-08-08 stsp char *line = NULL;
4454 33aa809d 2019-08-08 stsp size_t linesize = 0;
4455 33aa809d 2019-08-08 stsp ssize_t linelen;
4457 33aa809d 2019-08-08 stsp switch (status) {
4458 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4459 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4461 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4462 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4464 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4465 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4466 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4467 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4468 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4469 33aa809d 2019-08-08 stsp printf("%s", line);
4470 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4471 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4472 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4473 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4474 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4477 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4480 33aa809d 2019-08-08 stsp return NULL;
4483 33aa809d 2019-08-08 stsp static const struct got_error *
4484 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4485 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4487 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4488 33aa809d 2019-08-08 stsp char *line = NULL;
4489 33aa809d 2019-08-08 stsp size_t linesize = 0;
4490 33aa809d 2019-08-08 stsp ssize_t linelen;
4491 33aa809d 2019-08-08 stsp int resp = ' ';
4492 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4494 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4496 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4498 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4499 33aa809d 2019-08-08 stsp a->action);
4501 33aa809d 2019-08-08 stsp return err;
4502 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4503 33aa809d 2019-08-08 stsp if (linelen == -1) {
4504 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4505 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4506 33aa809d 2019-08-08 stsp return NULL;
4508 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4510 33aa809d 2019-08-08 stsp *nl = '\0';
4511 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4512 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4513 33aa809d 2019-08-08 stsp printf("y\n");
4514 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4515 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4516 33aa809d 2019-08-08 stsp printf("n\n");
4517 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4518 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4519 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4520 33aa809d 2019-08-08 stsp printf("q\n");
4522 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4523 33aa809d 2019-08-08 stsp free(line);
4524 33aa809d 2019-08-08 stsp return NULL;
4527 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4528 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4529 33aa809d 2019-08-08 stsp a->action);
4531 33aa809d 2019-08-08 stsp return err;
4532 33aa809d 2019-08-08 stsp resp = getchar();
4533 33aa809d 2019-08-08 stsp if (resp == '\n')
4534 33aa809d 2019-08-08 stsp resp = getchar();
4535 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4536 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4537 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4538 33aa809d 2019-08-08 stsp resp = ' ';
4540 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4541 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4542 33aa809d 2019-08-08 stsp resp = ' ';
4546 33aa809d 2019-08-08 stsp if (resp == 'y')
4547 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4548 33aa809d 2019-08-08 stsp else if (resp == 'n')
4549 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4550 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4551 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4553 1ee397ad 2019-07-12 stsp return NULL;
4557 a129376b 2019-03-28 stsp static const struct got_error *
4558 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4560 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4561 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4562 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4563 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4564 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4565 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4566 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4567 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4568 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4569 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4571 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4573 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4574 a129376b 2019-03-28 stsp switch (ch) {
4576 33aa809d 2019-08-08 stsp pflag = 1;
4579 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4582 0f6d7415 2019-08-08 stsp can_recurse = 1;
4585 a129376b 2019-03-28 stsp usage_revert();
4586 a129376b 2019-03-28 stsp /* NOTREACHED */
4590 a129376b 2019-03-28 stsp argc -= optind;
4591 a129376b 2019-03-28 stsp argv += optind;
4593 43012d58 2019-07-14 stsp #ifndef PROFILE
4594 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4595 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4596 43012d58 2019-07-14 stsp err(1, "pledge");
4598 e20a8b6f 2019-06-04 stsp if (argc < 1)
4599 a129376b 2019-03-28 stsp usage_revert();
4600 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4601 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4603 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4604 a129376b 2019-03-28 stsp if (cwd == NULL) {
4605 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4606 a129376b 2019-03-28 stsp goto done;
4608 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4609 2ec1f75b 2019-03-26 stsp if (error)
4610 2ec1f75b 2019-03-26 stsp goto done;
4612 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4614 a129376b 2019-03-28 stsp if (error != NULL)
4615 a129376b 2019-03-28 stsp goto done;
4617 33aa809d 2019-08-08 stsp if (patch_script_path) {
4618 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4619 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4620 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4621 33aa809d 2019-08-08 stsp patch_script_path);
4622 33aa809d 2019-08-08 stsp goto done;
4625 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4626 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4627 a129376b 2019-03-28 stsp if (error)
4628 a129376b 2019-03-28 stsp goto done;
4630 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4631 6d022e97 2019-08-04 stsp if (error)
4632 6d022e97 2019-08-04 stsp goto done;
4634 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4635 0f6d7415 2019-08-08 stsp char *ondisk_path;
4636 0f6d7415 2019-08-08 stsp struct stat sb;
4637 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4638 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4639 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4640 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4641 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4642 0f6d7415 2019-08-08 stsp goto done;
4644 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4645 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4646 0f6d7415 2019-08-08 stsp free(ondisk_path);
4649 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4650 0f6d7415 2019-08-08 stsp ondisk_path);
4651 0f6d7415 2019-08-08 stsp free(ondisk_path);
4652 0f6d7415 2019-08-08 stsp goto done;
4654 0f6d7415 2019-08-08 stsp free(ondisk_path);
4655 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4656 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4657 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4658 0f6d7415 2019-08-08 stsp goto done;
4663 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4664 33aa809d 2019-08-08 stsp cpa.action = "revert";
4665 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4666 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4667 a129376b 2019-03-28 stsp if (error)
4668 a129376b 2019-03-28 stsp goto done;
4670 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4671 33aa809d 2019-08-08 stsp error == NULL)
4672 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4674 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4675 2ec1f75b 2019-03-26 stsp if (worktree)
4676 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4677 2ec1f75b 2019-03-26 stsp free(path);
4678 d00136be 2019-03-26 stsp free(cwd);
4679 6bad629b 2019-02-04 stsp return error;
4682 c4296144 2019-05-09 stsp __dead static void
4683 c4296144 2019-05-09 stsp usage_commit(void)
4685 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4686 5c1e53bc 2019-07-28 stsp getprogname());
4690 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4691 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4692 e2ba3d07 2019-05-13 stsp const char *editor;
4693 e0870e44 2019-05-13 stsp const char *worktree_path;
4694 76d98825 2019-06-03 stsp const char *branch_name;
4695 314a6357 2019-05-13 stsp const char *repo_path;
4696 e0870e44 2019-05-13 stsp char *logmsg_path;
4700 33ad4cbe 2019-05-12 jcs static const struct got_error *
4701 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4704 76d98825 2019-06-03 stsp char *initial_content = NULL;
4705 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4706 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4707 e0870e44 2019-05-13 stsp char *template = NULL;
4708 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4710 33ad4cbe 2019-05-12 jcs size_t len;
4712 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4713 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4714 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4715 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4716 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4717 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4718 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4719 33ad4cbe 2019-05-12 jcs return NULL;
4722 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4723 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4725 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4726 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4727 76d98825 2019-06-03 stsp a->branch_name) == -1)
4728 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4730 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4732 e0870e44 2019-05-13 stsp goto done;
4734 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4736 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4737 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4738 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4739 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4740 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4744 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4746 76d98825 2019-06-03 stsp free(initial_content);
4747 e0870e44 2019-05-13 stsp free(template);
4749 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4750 3ce1b845 2019-07-15 stsp if (err == NULL) {
4751 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4752 3ce1b845 2019-07-15 stsp if (err) {
4753 3ce1b845 2019-07-15 stsp free(*logmsg);
4754 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4757 33ad4cbe 2019-05-12 jcs return err;
4760 c4296144 2019-05-09 stsp static const struct got_error *
4761 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4763 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4764 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4765 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4766 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4767 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4768 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4769 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4770 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4771 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4772 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4774 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4775 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4777 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4778 c4296144 2019-05-09 stsp switch (ch) {
4780 c4296144 2019-05-09 stsp logmsg = optarg;
4783 c4296144 2019-05-09 stsp usage_commit();
4784 c4296144 2019-05-09 stsp /* NOTREACHED */
4788 c4296144 2019-05-09 stsp argc -= optind;
4789 c4296144 2019-05-09 stsp argv += optind;
4791 43012d58 2019-07-14 stsp #ifndef PROFILE
4792 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4793 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4794 43012d58 2019-07-14 stsp err(1, "pledge");
4796 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4797 c4296144 2019-05-09 stsp if (cwd == NULL) {
4798 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4799 c4296144 2019-05-09 stsp goto done;
4801 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4802 7d5807f4 2019-07-11 stsp if (error)
4803 7d5807f4 2019-07-11 stsp goto done;
4805 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4806 c4296144 2019-05-09 stsp if (error)
4807 a698f62e 2019-07-25 stsp goto done;
4808 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4809 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4810 c4296144 2019-05-09 stsp goto done;
4813 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4814 916f288c 2019-07-30 stsp worktree);
4815 5c1e53bc 2019-07-28 stsp if (error)
4816 5c1e53bc 2019-07-28 stsp goto done;
4818 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4819 c9956ddf 2019-09-08 stsp if (error)
4820 c9956ddf 2019-09-08 stsp goto done;
4821 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4822 c9956ddf 2019-09-08 stsp gitconfig_path);
4823 c4296144 2019-05-09 stsp if (error != NULL)
4824 c4296144 2019-05-09 stsp goto done;
4826 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4827 aba9c984 2019-09-08 stsp if (error)
4828 aba9c984 2019-09-08 stsp return error;
4831 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4832 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4834 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4835 314a6357 2019-05-13 stsp error = get_editor(&editor);
4837 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4838 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4839 c4296144 2019-05-09 stsp if (error)
4840 c4296144 2019-05-09 stsp goto done;
4842 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4843 087fb88c 2019-08-04 stsp if (error)
4844 087fb88c 2019-08-04 stsp goto done;
4846 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4847 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4848 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4849 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4850 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4851 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4852 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4853 916f288c 2019-07-30 stsp goto done;
4855 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4857 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4858 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4859 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4860 e0870e44 2019-05-13 stsp if (error) {
4861 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4862 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4863 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4864 c4296144 2019-05-09 stsp goto done;
4867 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4868 c4296144 2019-05-09 stsp if (error)
4869 c4296144 2019-05-09 stsp goto done;
4870 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4872 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4873 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4874 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4875 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4876 7266f21f 2019-10-21 stsp error == NULL)
4877 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4878 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4880 c4296144 2019-05-09 stsp got_repo_close(repo);
4881 c4296144 2019-05-09 stsp if (worktree)
4882 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4883 c4296144 2019-05-09 stsp free(cwd);
4884 c4296144 2019-05-09 stsp free(id_str);
4885 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4886 e2ba3d07 2019-05-13 stsp free(editor);
4887 aba9c984 2019-09-08 stsp free(author);
4888 234035bc 2019-06-01 stsp return error;
4891 234035bc 2019-06-01 stsp __dead static void
4892 234035bc 2019-06-01 stsp usage_cherrypick(void)
4894 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4898 234035bc 2019-06-01 stsp static const struct got_error *
4899 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4901 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4902 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4903 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4904 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4905 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4906 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4907 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4908 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4909 234035bc 2019-06-01 stsp int ch, did_something = 0;
4911 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4912 234035bc 2019-06-01 stsp switch (ch) {
4914 234035bc 2019-06-01 stsp usage_cherrypick();
4915 234035bc 2019-06-01 stsp /* NOTREACHED */
4919 234035bc 2019-06-01 stsp argc -= optind;
4920 234035bc 2019-06-01 stsp argv += optind;
4922 43012d58 2019-07-14 stsp #ifndef PROFILE
4923 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4924 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4925 43012d58 2019-07-14 stsp err(1, "pledge");
4927 234035bc 2019-06-01 stsp if (argc != 1)
4928 234035bc 2019-06-01 stsp usage_cherrypick();
4930 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4931 234035bc 2019-06-01 stsp if (cwd == NULL) {
4932 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4933 234035bc 2019-06-01 stsp goto done;
4935 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4936 234035bc 2019-06-01 stsp if (error)
4937 234035bc 2019-06-01 stsp goto done;
4939 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4941 234035bc 2019-06-01 stsp if (error != NULL)
4942 234035bc 2019-06-01 stsp goto done;
4944 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4945 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4946 234035bc 2019-06-01 stsp if (error)
4947 234035bc 2019-06-01 stsp goto done;
4949 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4950 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4951 234035bc 2019-06-01 stsp if (error != NULL) {
4952 234035bc 2019-06-01 stsp struct got_reference *ref;
4953 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4954 234035bc 2019-06-01 stsp goto done;
4955 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4956 234035bc 2019-06-01 stsp if (error != NULL)
4957 234035bc 2019-06-01 stsp goto done;
4958 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4959 234035bc 2019-06-01 stsp got_ref_close(ref);
4960 234035bc 2019-06-01 stsp if (error != NULL)
4961 234035bc 2019-06-01 stsp goto done;
4963 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4964 234035bc 2019-06-01 stsp if (error)
4965 234035bc 2019-06-01 stsp goto done;
4967 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4968 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4969 234035bc 2019-06-01 stsp if (error != NULL)
4970 234035bc 2019-06-01 stsp goto done;
4972 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4973 234035bc 2019-06-01 stsp if (error) {
4974 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4975 234035bc 2019-06-01 stsp goto done;
4976 234035bc 2019-06-01 stsp error = NULL;
4978 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4979 234035bc 2019-06-01 stsp goto done;
4982 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4983 234035bc 2019-06-01 stsp if (error)
4984 234035bc 2019-06-01 stsp goto done;
4985 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4986 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4987 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4989 234035bc 2019-06-01 stsp if (error != NULL)
4990 234035bc 2019-06-01 stsp goto done;
4992 234035bc 2019-06-01 stsp if (did_something)
4993 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4995 234035bc 2019-06-01 stsp if (commit)
4996 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4997 234035bc 2019-06-01 stsp free(commit_id_str);
4998 234035bc 2019-06-01 stsp if (head_ref)
4999 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5000 234035bc 2019-06-01 stsp if (worktree)
5001 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5003 234035bc 2019-06-01 stsp got_repo_close(repo);
5004 c4296144 2019-05-09 stsp return error;
5007 5ef14e63 2019-06-02 stsp __dead static void
5008 5ef14e63 2019-06-02 stsp usage_backout(void)
5010 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5014 5ef14e63 2019-06-02 stsp static const struct got_error *
5015 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5017 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5018 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5019 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5020 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5021 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5022 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5023 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5024 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5025 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5027 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5028 5ef14e63 2019-06-02 stsp switch (ch) {
5030 5ef14e63 2019-06-02 stsp usage_backout();
5031 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5035 5ef14e63 2019-06-02 stsp argc -= optind;
5036 5ef14e63 2019-06-02 stsp argv += optind;
5038 43012d58 2019-07-14 stsp #ifndef PROFILE
5039 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5040 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5041 43012d58 2019-07-14 stsp err(1, "pledge");
5043 5ef14e63 2019-06-02 stsp if (argc != 1)
5044 5ef14e63 2019-06-02 stsp usage_backout();
5046 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5047 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5048 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5049 5ef14e63 2019-06-02 stsp goto done;
5051 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5052 5ef14e63 2019-06-02 stsp if (error)
5053 5ef14e63 2019-06-02 stsp goto done;
5055 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5057 5ef14e63 2019-06-02 stsp if (error != NULL)
5058 5ef14e63 2019-06-02 stsp goto done;
5060 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5061 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5062 5ef14e63 2019-06-02 stsp if (error)
5063 5ef14e63 2019-06-02 stsp goto done;
5065 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5066 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5067 5ef14e63 2019-06-02 stsp if (error != NULL) {
5068 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5069 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5070 5ef14e63 2019-06-02 stsp goto done;
5071 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5072 5ef14e63 2019-06-02 stsp if (error != NULL)
5073 5ef14e63 2019-06-02 stsp goto done;
5074 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5075 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5076 5ef14e63 2019-06-02 stsp if (error != NULL)
5077 5ef14e63 2019-06-02 stsp goto done;
5079 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5080 5ef14e63 2019-06-02 stsp if (error)
5081 5ef14e63 2019-06-02 stsp goto done;
5083 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5084 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5085 5ef14e63 2019-06-02 stsp if (error != NULL)
5086 5ef14e63 2019-06-02 stsp goto done;
5088 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5089 5ef14e63 2019-06-02 stsp if (error)
5090 5ef14e63 2019-06-02 stsp goto done;
5092 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5093 5ef14e63 2019-06-02 stsp if (error)
5094 5ef14e63 2019-06-02 stsp goto done;
5095 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5096 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5097 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5098 5ef14e63 2019-06-02 stsp goto done;
5101 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5102 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5103 5ef14e63 2019-06-02 stsp if (error != NULL)
5104 5ef14e63 2019-06-02 stsp goto done;
5106 5ef14e63 2019-06-02 stsp if (did_something)
5107 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5109 5ef14e63 2019-06-02 stsp if (commit)
5110 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5111 5ef14e63 2019-06-02 stsp free(commit_id_str);
5112 5ef14e63 2019-06-02 stsp if (head_ref)
5113 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5114 818c7501 2019-07-11 stsp if (worktree)
5115 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5117 818c7501 2019-07-11 stsp got_repo_close(repo);
5118 818c7501 2019-07-11 stsp return error;
5121 818c7501 2019-07-11 stsp __dead static void
5122 818c7501 2019-07-11 stsp usage_rebase(void)
5124 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5125 af54c8f8 2019-07-11 stsp getprogname());
5130 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5133 0ebf8283 2019-07-24 stsp size_t len;
5135 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5136 0ebf8283 2019-07-24 stsp if (len > limit)
5137 0ebf8283 2019-07-24 stsp len = limit;
5138 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5139 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5141 0ebf8283 2019-07-24 stsp *nl = '\0';
5144 0ebf8283 2019-07-24 stsp static const struct got_error *
5145 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5147 5943eee2 2019-08-13 stsp const struct got_error *err;
5148 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5149 5943eee2 2019-08-13 stsp const char *s;
5151 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5153 5943eee2 2019-08-13 stsp return err;
5155 5943eee2 2019-08-13 stsp s = logmsg0;
5156 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5159 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5160 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5161 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5162 5943eee2 2019-08-13 stsp goto done;
5165 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5167 5943eee2 2019-08-13 stsp free(logmsg0);
5168 5943eee2 2019-08-13 stsp return err;
5171 818c7501 2019-07-11 stsp static const struct got_error *
5172 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5173 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5175 818c7501 2019-07-11 stsp const struct got_error *err;
5176 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5178 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5180 818c7501 2019-07-11 stsp goto done;
5182 ff0d2220 2019-07-11 stsp if (new_id) {
5183 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5185 ff0d2220 2019-07-11 stsp goto done;
5188 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5189 ff0d2220 2019-07-11 stsp if (new_id_str)
5190 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5192 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5194 0ebf8283 2019-07-24 stsp goto done;
5196 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5197 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5199 818c7501 2019-07-11 stsp free(old_id_str);
5200 818c7501 2019-07-11 stsp free(new_id_str);
5201 818c7501 2019-07-11 stsp return err;
5204 1ee397ad 2019-07-12 stsp static const struct got_error *
5205 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5207 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5209 818c7501 2019-07-11 stsp while (path[0] == '/')
5211 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5213 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5214 1ee397ad 2019-07-12 stsp return NULL;
5215 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5216 818c7501 2019-07-11 stsp *rebase_status = status;
5217 1ee397ad 2019-07-12 stsp return NULL;
5220 818c7501 2019-07-11 stsp static const struct got_error *
5221 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5222 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5223 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5225 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5226 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5227 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5230 818c7501 2019-07-11 stsp static const struct got_error *
5231 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5232 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5233 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5234 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5236 ff0d2220 2019-07-11 stsp const struct got_error *error;
5237 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5238 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5240 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5241 ff0d2220 2019-07-11 stsp if (error)
5242 ff0d2220 2019-07-11 stsp return error;
5244 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5245 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5246 ff0d2220 2019-07-11 stsp if (error) {
5247 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5248 ff0d2220 2019-07-11 stsp goto done;
5249 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5251 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5252 ff0d2220 2019-07-11 stsp free(new_commit_id);
5255 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5256 ff0d2220 2019-07-11 stsp return error;
5259 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5260 64c6d990 2019-07-11 stsp const char *path_prefix;
5261 64c6d990 2019-07-11 stsp size_t len;
5262 8ca9bd68 2019-07-25 stsp int errcode;
5265 64c6d990 2019-07-11 stsp static const struct got_error *
5266 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5267 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5268 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5269 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5271 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5273 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5274 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5275 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5277 64c6d990 2019-07-11 stsp return NULL;
5280 64c6d990 2019-07-11 stsp static const struct got_error *
5281 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5282 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5283 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5285 64c6d990 2019-07-11 stsp const struct got_error *err;
5286 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5287 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5288 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5290 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5291 64c6d990 2019-07-11 stsp return NULL;
5293 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5295 64c6d990 2019-07-11 stsp goto done;
5297 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5299 64c6d990 2019-07-11 stsp goto done;
5301 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5302 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5304 64c6d990 2019-07-11 stsp goto done;
5306 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5307 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5309 64c6d990 2019-07-11 stsp goto done;
5311 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5312 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5313 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5314 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5315 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5316 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5317 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5319 64c6d990 2019-07-11 stsp if (tree1)
5320 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5321 64c6d990 2019-07-11 stsp if (tree2)
5322 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5323 64c6d990 2019-07-11 stsp if (commit)
5324 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5325 64c6d990 2019-07-11 stsp if (parent_commit)
5326 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5327 64c6d990 2019-07-11 stsp return err;
5330 ff0d2220 2019-07-11 stsp static const struct got_error *
5331 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5332 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5333 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5334 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5335 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5337 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5338 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5339 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5340 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5341 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5343 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5345 af61c510 2019-07-19 stsp return err;
5347 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5348 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5350 af61c510 2019-07-19 stsp goto done;
5351 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5352 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5353 af61c510 2019-07-19 stsp if (err) {
5354 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5355 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5356 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5357 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5358 af61c510 2019-07-19 stsp "been reached?!?");
5359 af61c510 2019-07-19 stsp goto done;
5360 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5361 af61c510 2019-07-19 stsp goto done;
5362 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5363 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5365 af61c510 2019-07-19 stsp goto done;
5367 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5368 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5370 af61c510 2019-07-19 stsp goto done;
5372 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5374 af61c510 2019-07-19 stsp goto done;
5375 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5376 af61c510 2019-07-19 stsp commit_id = parent_id;
5380 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5381 af61c510 2019-07-19 stsp return err;
5384 af61c510 2019-07-19 stsp static const struct got_error *
5385 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5387 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5388 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5389 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5390 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5391 818c7501 2019-07-11 stsp char *cwd = NULL;
5392 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5393 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5394 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5395 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5396 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5397 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5398 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5399 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5400 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5401 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5402 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5403 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5405 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5406 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5408 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5409 818c7501 2019-07-11 stsp switch (ch) {
5411 818c7501 2019-07-11 stsp abort_rebase = 1;
5414 818c7501 2019-07-11 stsp continue_rebase = 1;
5417 818c7501 2019-07-11 stsp usage_rebase();
5418 818c7501 2019-07-11 stsp /* NOTREACHED */
5422 818c7501 2019-07-11 stsp argc -= optind;
5423 818c7501 2019-07-11 stsp argv += optind;
5425 43012d58 2019-07-14 stsp #ifndef PROFILE
5426 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5427 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5428 43012d58 2019-07-14 stsp err(1, "pledge");
5430 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5431 818c7501 2019-07-11 stsp usage_rebase();
5432 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5433 818c7501 2019-07-11 stsp if (argc != 0)
5434 818c7501 2019-07-11 stsp usage_rebase();
5435 818c7501 2019-07-11 stsp } else if (argc != 1)
5436 818c7501 2019-07-11 stsp usage_rebase();
5438 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5439 818c7501 2019-07-11 stsp if (cwd == NULL) {
5440 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5441 818c7501 2019-07-11 stsp goto done;
5443 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5444 818c7501 2019-07-11 stsp if (error)
5445 818c7501 2019-07-11 stsp goto done;
5447 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5449 818c7501 2019-07-11 stsp if (error != NULL)
5450 818c7501 2019-07-11 stsp goto done;
5452 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5453 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5454 818c7501 2019-07-11 stsp if (error)
5455 818c7501 2019-07-11 stsp goto done;
5457 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5458 818c7501 2019-07-11 stsp if (error)
5459 818c7501 2019-07-11 stsp goto done;
5461 f6794adc 2019-07-23 stsp if (abort_rebase) {
5462 818c7501 2019-07-11 stsp int did_something;
5463 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5464 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5465 f6794adc 2019-07-23 stsp goto done;
5467 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5468 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5469 3e3a69f1 2019-07-25 stsp worktree, repo);
5470 818c7501 2019-07-11 stsp if (error)
5471 818c7501 2019-07-11 stsp goto done;
5472 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5473 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5474 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5475 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5476 818c7501 2019-07-11 stsp if (error)
5477 818c7501 2019-07-11 stsp goto done;
5478 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5479 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5482 818c7501 2019-07-11 stsp if (continue_rebase) {
5483 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5484 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5485 f6794adc 2019-07-23 stsp goto done;
5487 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5488 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5489 3e3a69f1 2019-07-25 stsp worktree, repo);
5490 818c7501 2019-07-11 stsp if (error)
5491 818c7501 2019-07-11 stsp goto done;
5493 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5494 01757395 2019-07-12 stsp resume_commit_id, repo);
5495 818c7501 2019-07-11 stsp if (error)
5496 818c7501 2019-07-11 stsp goto done;
5498 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5499 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5500 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5501 818c7501 2019-07-11 stsp goto done;
5504 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5505 818c7501 2019-07-11 stsp if (error != NULL)
5506 818c7501 2019-07-11 stsp goto done;
5509 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5510 ff0d2220 2019-07-11 stsp if (error)
5511 ff0d2220 2019-07-11 stsp goto done;
5513 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5514 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5516 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5517 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5518 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5519 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5520 818c7501 2019-07-11 stsp if (error)
5521 818c7501 2019-07-11 stsp goto done;
5522 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5523 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5524 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5525 818c7501 2019-07-11 stsp "with work tree's branch");
5526 818c7501 2019-07-11 stsp goto done;
5529 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5530 a51a74b3 2019-07-27 stsp if (error) {
5531 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5532 a51a74b3 2019-07-27 stsp goto done;
5533 a51a74b3 2019-07-27 stsp error = NULL;
5535 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5536 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5537 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5538 a51a74b3 2019-07-27 stsp goto done;
5540 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5541 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5542 818c7501 2019-07-11 stsp if (error)
5543 818c7501 2019-07-11 stsp goto done;
5546 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5547 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5548 818c7501 2019-07-11 stsp if (error)
5549 818c7501 2019-07-11 stsp goto done;
5551 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5552 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5553 fc66b545 2019-08-12 stsp if (pid == NULL) {
5554 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5555 fc66b545 2019-08-12 stsp int did_something;
5556 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5557 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5558 fc66b545 2019-08-12 stsp &did_something);
5559 fc66b545 2019-08-12 stsp if (error)
5560 fc66b545 2019-08-12 stsp goto done;
5561 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5562 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5564 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5565 fc66b545 2019-08-12 stsp goto done;
5567 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5568 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5569 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5570 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5571 818c7501 2019-07-11 stsp commit = NULL;
5572 818c7501 2019-07-11 stsp if (error)
5573 818c7501 2019-07-11 stsp goto done;
5575 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5576 38b0338b 2019-11-29 stsp if (continue_rebase) {
5577 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5578 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5579 38b0338b 2019-11-29 stsp goto done;
5581 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5582 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5583 38b0338b 2019-11-29 stsp char *id_str;
5584 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5585 38b0338b 2019-11-29 stsp new_base_branch);
5586 38b0338b 2019-11-29 stsp if (error)
5587 38b0338b 2019-11-29 stsp goto done;
5588 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5589 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5590 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5591 38b0338b 2019-11-29 stsp free(id_str);
5592 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5593 38b0338b 2019-11-29 stsp new_head_commit_id);
5594 38b0338b 2019-11-29 stsp if (error)
5595 38b0338b 2019-11-29 stsp goto done;
5599 818c7501 2019-07-11 stsp pid = NULL;
5600 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5601 818c7501 2019-07-11 stsp commit_id = qid->id;
5602 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5603 818c7501 2019-07-11 stsp pid = qid;
5605 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5606 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5607 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5608 818c7501 2019-07-11 stsp if (error)
5609 818c7501 2019-07-11 stsp goto done;
5611 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5612 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5616 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5617 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5618 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5619 818c7501 2019-07-11 stsp if (error)
5620 818c7501 2019-07-11 stsp goto done;
5623 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5624 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5625 818c7501 2019-07-11 stsp if (error)
5626 818c7501 2019-07-11 stsp goto done;
5627 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5628 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5630 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5631 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5633 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5634 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5635 818c7501 2019-07-11 stsp free(resume_commit_id);
5636 818c7501 2019-07-11 stsp free(yca_id);
5637 818c7501 2019-07-11 stsp if (commit)
5638 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5639 818c7501 2019-07-11 stsp if (branch)
5640 818c7501 2019-07-11 stsp got_ref_close(branch);
5641 818c7501 2019-07-11 stsp if (new_base_branch)
5642 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5643 818c7501 2019-07-11 stsp if (tmp_branch)
5644 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5645 5ef14e63 2019-06-02 stsp if (worktree)
5646 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5648 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5649 5ef14e63 2019-06-02 stsp return error;
5652 0ebf8283 2019-07-24 stsp __dead static void
5653 0ebf8283 2019-07-24 stsp usage_histedit(void)
5655 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5656 0ebf8283 2019-07-24 stsp getprogname());
5660 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5661 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5662 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5663 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5664 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5666 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5667 0ebf8283 2019-07-24 stsp unsigned char code;
5668 0ebf8283 2019-07-24 stsp const char *name;
5669 0ebf8283 2019-07-24 stsp const char *desc;
5670 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5671 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5672 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5673 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5674 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5675 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5676 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5679 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5680 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5681 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5682 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5683 0ebf8283 2019-07-24 stsp char *logmsg;
5685 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5687 0ebf8283 2019-07-24 stsp static const struct got_error *
5688 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5689 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5691 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5692 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5693 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5696 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5698 0ebf8283 2019-07-24 stsp goto done;
5700 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5702 0ebf8283 2019-07-24 stsp goto done;
5704 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5706 0ebf8283 2019-07-24 stsp goto done;
5708 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5709 0ebf8283 2019-07-24 stsp if (n < 0)
5710 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5712 0ebf8283 2019-07-24 stsp if (commit)
5713 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5714 0ebf8283 2019-07-24 stsp free(id_str);
5715 0ebf8283 2019-07-24 stsp free(logmsg);
5716 0ebf8283 2019-07-24 stsp return err;
5719 0ebf8283 2019-07-24 stsp static const struct got_error *
5720 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5721 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5723 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5724 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5726 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5727 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5729 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5730 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5736 0ebf8283 2019-07-24 stsp return err;
5739 0ebf8283 2019-07-24 stsp static const struct got_error *
5740 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5742 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5745 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5746 0ebf8283 2019-07-24 stsp if (n < 0)
5747 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5749 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5750 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5751 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5752 0ebf8283 2019-07-24 stsp cmd->desc);
5753 0ebf8283 2019-07-24 stsp if (n < 0) {
5754 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5758 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5759 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5760 0ebf8283 2019-07-24 stsp if (n < 0)
5761 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5762 0ebf8283 2019-07-24 stsp return err;
5765 0ebf8283 2019-07-24 stsp static const struct got_error *
5766 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5768 0ebf8283 2019-07-24 stsp static char msg[42];
5771 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5773 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5774 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5776 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5779 0ebf8283 2019-07-24 stsp static const struct got_error *
5780 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5781 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5783 0ebf8283 2019-07-24 stsp const struct got_error *err;
5784 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5785 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5787 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5789 0ebf8283 2019-07-24 stsp return err;
5791 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5793 0ebf8283 2019-07-24 stsp goto done;
5795 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5797 5943eee2 2019-08-13 stsp goto done;
5798 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5799 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5800 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5801 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5802 0ebf8283 2019-07-24 stsp goto done;
5805 0ebf8283 2019-07-24 stsp if (folded_commit)
5806 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5807 0ebf8283 2019-07-24 stsp free(id_str);
5808 5943eee2 2019-08-13 stsp free(folded_logmsg);
5809 0ebf8283 2019-07-24 stsp return err;
5812 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5813 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5815 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5817 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5818 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5819 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5820 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5821 3f9de99f 2019-07-24 stsp folded = prev;
5822 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5825 0ebf8283 2019-07-24 stsp return folded;
5828 0ebf8283 2019-07-24 stsp static const struct got_error *
5829 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5830 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5832 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5833 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5834 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5835 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5837 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5839 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5841 0ebf8283 2019-07-24 stsp return err;
5843 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5844 0ebf8283 2019-07-24 stsp if (folded) {
5845 0ebf8283 2019-07-24 stsp while (folded != hle) {
5846 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5847 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5850 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5851 0ebf8283 2019-07-24 stsp logmsg, repo);
5853 0ebf8283 2019-07-24 stsp goto done;
5854 0ebf8283 2019-07-24 stsp free(logmsg);
5855 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5856 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5860 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5862 0ebf8283 2019-07-24 stsp goto done;
5863 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5865 5943eee2 2019-08-13 stsp goto done;
5866 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5867 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5868 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5869 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5870 0ebf8283 2019-07-24 stsp goto done;
5872 0ebf8283 2019-07-24 stsp free(logmsg);
5873 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5875 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5877 0ebf8283 2019-07-24 stsp goto done;
5879 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5881 0ebf8283 2019-07-24 stsp goto done;
5883 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5884 0ebf8283 2019-07-24 stsp close(fd);
5886 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5888 0ebf8283 2019-07-24 stsp goto done;
5890 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5891 0ebf8283 2019-07-24 stsp if (err) {
5892 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5893 0ebf8283 2019-07-24 stsp goto done;
5894 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5897 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5898 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5899 0ebf8283 2019-07-24 stsp free(logmsg_path);
5900 0ebf8283 2019-07-24 stsp free(logmsg);
5901 5943eee2 2019-08-13 stsp free(orig_logmsg);
5902 0ebf8283 2019-07-24 stsp free(editor);
5903 0ebf8283 2019-07-24 stsp if (commit)
5904 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5905 0ebf8283 2019-07-24 stsp return err;
5908 0ebf8283 2019-07-24 stsp static const struct got_error *
5909 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5910 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5912 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5913 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5914 0ebf8283 2019-07-24 stsp size_t size;
5915 0ebf8283 2019-07-24 stsp ssize_t len;
5916 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5917 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5918 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5919 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5921 0ebf8283 2019-07-24 stsp for (;;) {
5922 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5923 0ebf8283 2019-07-24 stsp if (len == -1) {
5924 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5925 0ebf8283 2019-07-24 stsp if (feof(f))
5927 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5928 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5933 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5935 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5936 0ebf8283 2019-07-24 stsp free(line);
5937 0ebf8283 2019-07-24 stsp line = NULL;
5940 0ebf8283 2019-07-24 stsp cmd = NULL;
5941 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5942 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5943 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5944 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5945 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5948 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5953 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5954 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5957 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5959 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5960 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5961 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5964 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5965 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5969 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5970 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5971 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5975 0ebf8283 2019-07-24 stsp free(line);
5976 0ebf8283 2019-07-24 stsp line = NULL;
5980 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5982 0ebf8283 2019-07-24 stsp *end = '\0';
5984 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5985 0ebf8283 2019-07-24 stsp if (err) {
5986 0ebf8283 2019-07-24 stsp /* override error code */
5987 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5991 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5992 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5993 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5996 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5997 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5998 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5999 0ebf8283 2019-07-24 stsp commit_id = NULL;
6000 0ebf8283 2019-07-24 stsp free(line);
6001 0ebf8283 2019-07-24 stsp line = NULL;
6002 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6005 0ebf8283 2019-07-24 stsp free(line);
6006 0ebf8283 2019-07-24 stsp free(commit_id);
6007 0ebf8283 2019-07-24 stsp return err;
6010 0ebf8283 2019-07-24 stsp static const struct got_error *
6011 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6012 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6014 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6015 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6016 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6017 bfce7f83 2019-07-27 stsp static char msg[80];
6018 bfce7f83 2019-07-27 stsp char *id_str;
6020 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6021 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6022 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6023 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6024 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6026 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6027 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6028 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6031 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6032 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6034 bfce7f83 2019-07-27 stsp return err;
6035 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6036 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6037 bfce7f83 2019-07-27 stsp free(id_str);
6038 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6042 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6043 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6044 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6045 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6047 bfce7f83 2019-07-27 stsp return NULL;
6050 bfce7f83 2019-07-27 stsp static const struct got_error *
6051 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6052 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6053 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6055 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6056 0ebf8283 2019-07-24 stsp char *editor;
6057 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6059 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6061 0ebf8283 2019-07-24 stsp return err;
6063 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6064 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6065 0ebf8283 2019-07-24 stsp goto done;
6068 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6069 0ebf8283 2019-07-24 stsp if (f == NULL) {
6070 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6071 0ebf8283 2019-07-24 stsp goto done;
6073 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6075 bfce7f83 2019-07-27 stsp goto done;
6077 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6079 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6080 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6081 0ebf8283 2019-07-24 stsp free(editor);
6082 0ebf8283 2019-07-24 stsp return err;
6085 0ebf8283 2019-07-24 stsp static const struct got_error *
6086 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6087 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
6089 0ebf8283 2019-07-24 stsp static const struct got_error *
6090 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6091 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6093 0ebf8283 2019-07-24 stsp const struct got_error *err;
6094 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6095 0ebf8283 2019-07-24 stsp char *path = NULL;
6097 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6099 0ebf8283 2019-07-24 stsp return err;
6101 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
6103 0ebf8283 2019-07-24 stsp goto done;
6105 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6107 0ebf8283 2019-07-24 stsp goto done;
6109 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6110 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6111 0ebf8283 2019-07-24 stsp goto done;
6115 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6116 0ebf8283 2019-07-24 stsp if (err) {
6117 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6118 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6119 0ebf8283 2019-07-24 stsp goto done;
6120 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6121 0ebf8283 2019-07-24 stsp commits, path, repo);
6124 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6125 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6126 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6127 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6128 0ebf8283 2019-07-24 stsp free(path);
6129 0ebf8283 2019-07-24 stsp return err;
6132 0ebf8283 2019-07-24 stsp static const struct got_error *
6133 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6134 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6136 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6137 0ebf8283 2019-07-24 stsp char *path = NULL;
6138 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6139 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6140 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6142 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6144 0ebf8283 2019-07-24 stsp return err;
6146 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6147 0ebf8283 2019-07-24 stsp if (f == NULL) {
6148 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6149 0ebf8283 2019-07-24 stsp goto done;
6151 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6152 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6157 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6158 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6159 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6160 0ebf8283 2019-07-24 stsp if (n < 0) {
6161 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6167 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6168 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6169 0ebf8283 2019-07-24 stsp free(path);
6170 0ebf8283 2019-07-24 stsp if (commit)
6171 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6172 0ebf8283 2019-07-24 stsp return err;
6176 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6178 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6180 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6181 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6182 bfce7f83 2019-07-27 stsp free(hle);
6186 0ebf8283 2019-07-24 stsp static const struct got_error *
6187 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6188 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6190 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6191 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6193 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6194 0ebf8283 2019-07-24 stsp if (f == NULL) {
6195 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6196 0ebf8283 2019-07-24 stsp goto done;
6199 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6201 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6202 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6203 0ebf8283 2019-07-24 stsp return err;
6206 0ebf8283 2019-07-24 stsp static const struct got_error *
6207 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6208 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6209 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6211 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6212 0ebf8283 2019-07-24 stsp int resp = ' ';
6214 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6215 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6216 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6217 0ebf8283 2019-07-24 stsp resp = getchar();
6218 a61a4414 2019-08-07 stsp if (resp == '\n')
6219 a61a4414 2019-08-07 stsp resp = getchar();
6220 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6221 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6222 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6224 426ebf2e 2019-07-25 stsp if (err) {
6225 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6226 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6228 bfce7f83 2019-07-27 stsp prev_err = err;
6229 426ebf2e 2019-07-25 stsp resp = ' ';
6233 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6234 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6235 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6236 0ebf8283 2019-07-24 stsp commits, repo);
6237 426ebf2e 2019-07-25 stsp if (err) {
6238 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6239 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6241 bfce7f83 2019-07-27 stsp prev_err = err;
6242 426ebf2e 2019-07-25 stsp resp = ' ';
6246 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6247 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6250 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6253 0ebf8283 2019-07-24 stsp return err;
6256 0ebf8283 2019-07-24 stsp static const struct got_error *
6257 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6258 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6259 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6261 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6262 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6263 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6264 3e3a69f1 2019-07-25 stsp branch, repo);
6267 0ebf8283 2019-07-24 stsp static const struct got_error *
6268 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6269 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6271 0ebf8283 2019-07-24 stsp const struct got_error *err;
6272 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6274 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6276 0ebf8283 2019-07-24 stsp goto done;
6278 0ebf8283 2019-07-24 stsp if (new_id) {
6279 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6281 0ebf8283 2019-07-24 stsp goto done;
6284 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6285 0ebf8283 2019-07-24 stsp if (new_id_str)
6286 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6288 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6289 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6290 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6291 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6292 0ebf8283 2019-07-24 stsp goto done;
6294 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6296 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6298 0ebf8283 2019-07-24 stsp goto done;
6301 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6302 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6303 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6304 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6305 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6307 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6308 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6309 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6317 0ebf8283 2019-07-24 stsp free(old_id_str);
6318 0ebf8283 2019-07-24 stsp free(new_id_str);
6319 0ebf8283 2019-07-24 stsp return err;
6322 0ebf8283 2019-07-24 stsp static const struct got_error *
6323 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6324 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6325 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6326 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6328 0ebf8283 2019-07-24 stsp const struct got_error *err;
6329 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6330 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6332 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6333 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6334 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6336 0ebf8283 2019-07-24 stsp return err;
6339 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6341 0ebf8283 2019-07-24 stsp return err;
6343 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6344 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6345 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6346 0ebf8283 2019-07-24 stsp if (err) {
6347 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6348 0ebf8283 2019-07-24 stsp goto done;
6349 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6351 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6352 0ebf8283 2019-07-24 stsp free(new_commit_id);
6355 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6356 0ebf8283 2019-07-24 stsp return err;
6359 0ebf8283 2019-07-24 stsp static const struct got_error *
6360 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6361 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6363 0ebf8283 2019-07-24 stsp const struct got_error *error;
6364 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6366 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6368 0ebf8283 2019-07-24 stsp if (error)
6369 0ebf8283 2019-07-24 stsp return error;
6371 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6372 0ebf8283 2019-07-24 stsp if (error)
6373 0ebf8283 2019-07-24 stsp return error;
6375 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6376 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6377 0ebf8283 2019-07-24 stsp return error;
6380 0ebf8283 2019-07-24 stsp static const struct got_error *
6381 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6383 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6384 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6385 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6386 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6387 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6388 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6389 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6390 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6391 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6392 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6393 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6394 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6395 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6396 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6397 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6398 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6399 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6400 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6401 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6402 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6403 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6405 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6406 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6407 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6409 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6410 0ebf8283 2019-07-24 stsp switch (ch) {
6412 0ebf8283 2019-07-24 stsp abort_edit = 1;
6415 0ebf8283 2019-07-24 stsp continue_edit = 1;
6418 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6421 0ebf8283 2019-07-24 stsp usage_histedit();
6422 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6426 0ebf8283 2019-07-24 stsp argc -= optind;
6427 0ebf8283 2019-07-24 stsp argv += optind;
6429 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6430 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6431 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6432 0ebf8283 2019-07-24 stsp err(1, "pledge");
6434 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6435 0ebf8283 2019-07-24 stsp usage_histedit();
6436 0ebf8283 2019-07-24 stsp if (argc != 0)
6437 0ebf8283 2019-07-24 stsp usage_histedit();
6440 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6441 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6442 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6443 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6444 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6445 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6448 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6449 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6450 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6451 0ebf8283 2019-07-24 stsp goto done;
6453 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6454 0ebf8283 2019-07-24 stsp if (error)
6455 0ebf8283 2019-07-24 stsp goto done;
6457 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6459 0ebf8283 2019-07-24 stsp if (error != NULL)
6460 0ebf8283 2019-07-24 stsp goto done;
6462 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6463 0ebf8283 2019-07-24 stsp if (error)
6464 0ebf8283 2019-07-24 stsp goto done;
6465 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6466 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6467 0ebf8283 2019-07-24 stsp goto done;
6470 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6471 0ebf8283 2019-07-24 stsp if (error)
6472 0ebf8283 2019-07-24 stsp goto done;
6474 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6475 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6476 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6477 3e3a69f1 2019-07-25 stsp worktree, repo);
6478 0ebf8283 2019-07-24 stsp if (error)
6479 0ebf8283 2019-07-24 stsp goto done;
6480 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6481 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6482 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6483 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6484 0ebf8283 2019-07-24 stsp if (error)
6485 0ebf8283 2019-07-24 stsp goto done;
6486 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6487 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6488 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6489 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6490 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6491 0ebf8283 2019-07-24 stsp goto done;
6494 0ebf8283 2019-07-24 stsp if (continue_edit) {
6495 0ebf8283 2019-07-24 stsp char *path;
6497 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6498 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6499 0ebf8283 2019-07-24 stsp goto done;
6502 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6503 0ebf8283 2019-07-24 stsp if (error)
6504 0ebf8283 2019-07-24 stsp goto done;
6506 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6507 0ebf8283 2019-07-24 stsp free(path);
6508 0ebf8283 2019-07-24 stsp if (error)
6509 0ebf8283 2019-07-24 stsp goto done;
6511 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6512 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6513 3e3a69f1 2019-07-25 stsp worktree, repo);
6514 0ebf8283 2019-07-24 stsp if (error)
6515 0ebf8283 2019-07-24 stsp goto done;
6517 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6518 0ebf8283 2019-07-24 stsp if (error)
6519 0ebf8283 2019-07-24 stsp goto done;
6521 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6522 0ebf8283 2019-07-24 stsp head_commit_id);
6523 0ebf8283 2019-07-24 stsp if (error)
6524 0ebf8283 2019-07-24 stsp goto done;
6525 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6526 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6527 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6528 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6529 3aac7cf7 2019-07-25 stsp goto done;
6531 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6532 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6533 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6534 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6535 0ebf8283 2019-07-24 stsp commit = NULL;
6536 0ebf8283 2019-07-24 stsp if (error)
6537 0ebf8283 2019-07-24 stsp goto done;
6539 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6540 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6541 0ebf8283 2019-07-24 stsp goto done;
6544 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6545 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6546 0ebf8283 2019-07-24 stsp if (error != NULL)
6547 0ebf8283 2019-07-24 stsp goto done;
6549 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6550 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6551 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6552 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6553 c7d20a3f 2019-07-30 stsp goto done;
6556 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6557 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6558 bfce7f83 2019-07-27 stsp branch = NULL;
6559 0ebf8283 2019-07-24 stsp if (error)
6560 0ebf8283 2019-07-24 stsp goto done;
6562 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6563 0ebf8283 2019-07-24 stsp head_commit_id);
6564 0ebf8283 2019-07-24 stsp if (error)
6565 0ebf8283 2019-07-24 stsp goto done;
6566 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6567 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6568 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6569 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6570 3aac7cf7 2019-07-25 stsp goto done;
6572 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6573 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6574 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6575 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6576 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6577 0ebf8283 2019-07-24 stsp commit = NULL;
6578 0ebf8283 2019-07-24 stsp if (error)
6579 0ebf8283 2019-07-24 stsp goto done;
6581 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6582 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6583 bfce7f83 2019-07-27 stsp if (error)
6584 bfce7f83 2019-07-27 stsp goto done;
6586 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6587 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6588 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6589 6ba2bea2 2019-07-27 stsp if (error) {
6590 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6591 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6592 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6593 0ebf8283 2019-07-24 stsp goto done;
6596 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6598 6ba2bea2 2019-07-27 stsp if (error) {
6599 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6600 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6601 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6602 0ebf8283 2019-07-24 stsp goto done;
6607 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6609 6ba2bea2 2019-07-27 stsp if (error) {
6610 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6611 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6612 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6613 0ebf8283 2019-07-24 stsp goto done;
6618 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6619 4ec14e60 2019-08-28 hiltjo if (error)
6620 0ebf8283 2019-07-24 stsp goto done;
6622 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6623 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6624 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6625 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6628 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6629 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6630 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6631 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6634 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6635 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6637 0ebf8283 2019-07-24 stsp if (error)
6638 0ebf8283 2019-07-24 stsp goto done;
6642 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6643 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6644 0ebf8283 2019-07-24 stsp if (error)
6645 0ebf8283 2019-07-24 stsp goto done;
6649 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6650 0ebf8283 2019-07-24 stsp hle->commit_id);
6651 0ebf8283 2019-07-24 stsp if (error)
6652 0ebf8283 2019-07-24 stsp goto done;
6653 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6654 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6656 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6657 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6658 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6659 0ebf8283 2019-07-24 stsp if (error)
6660 0ebf8283 2019-07-24 stsp goto done;
6661 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6662 0ebf8283 2019-07-24 stsp commit = NULL;
6664 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6665 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6669 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6670 0ebf8283 2019-07-24 stsp char *id_str;
6671 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6672 0ebf8283 2019-07-24 stsp if (error)
6673 0ebf8283 2019-07-24 stsp goto done;
6674 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6676 0ebf8283 2019-07-24 stsp free(id_str);
6677 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6678 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6679 3e3a69f1 2019-07-25 stsp fileindex);
6680 0ebf8283 2019-07-24 stsp goto done;
6683 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6684 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6685 0ebf8283 2019-07-24 stsp if (error)
6686 0ebf8283 2019-07-24 stsp goto done;
6690 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6691 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6692 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6693 0ebf8283 2019-07-24 stsp if (error)
6694 0ebf8283 2019-07-24 stsp goto done;
6697 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6698 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6699 0ebf8283 2019-07-24 stsp if (error)
6700 0ebf8283 2019-07-24 stsp goto done;
6701 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6702 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6704 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6705 3e3a69f1 2019-07-25 stsp branch, repo);
6707 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6708 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6709 0ebf8283 2019-07-24 stsp free(head_commit_id);
6710 0ebf8283 2019-07-24 stsp free(base_commit_id);
6711 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6712 0ebf8283 2019-07-24 stsp if (commit)
6713 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6714 0ebf8283 2019-07-24 stsp if (branch)
6715 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6716 0ebf8283 2019-07-24 stsp if (tmp_branch)
6717 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6718 0ebf8283 2019-07-24 stsp if (worktree)
6719 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6721 2822a352 2019-10-15 stsp got_repo_close(repo);
6722 2822a352 2019-10-15 stsp return error;
6725 2822a352 2019-10-15 stsp __dead static void
6726 2822a352 2019-10-15 stsp usage_integrate(void)
6728 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6732 2822a352 2019-10-15 stsp static const struct got_error *
6733 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6735 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6736 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6737 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6738 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6739 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6740 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6741 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6742 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6743 2822a352 2019-10-15 stsp int ch, did_something = 0;
6745 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6746 2822a352 2019-10-15 stsp switch (ch) {
6748 2822a352 2019-10-15 stsp usage_integrate();
6749 2822a352 2019-10-15 stsp /* NOTREACHED */
6753 2822a352 2019-10-15 stsp argc -= optind;
6754 2822a352 2019-10-15 stsp argv += optind;
6756 2822a352 2019-10-15 stsp if (argc != 1)
6757 2822a352 2019-10-15 stsp usage_integrate();
6758 2822a352 2019-10-15 stsp branch_arg = argv[0];
6760 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6761 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6762 2822a352 2019-10-15 stsp err(1, "pledge");
6764 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6765 2822a352 2019-10-15 stsp if (cwd == NULL) {
6766 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6767 2822a352 2019-10-15 stsp goto done;
6770 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6771 2822a352 2019-10-15 stsp if (error)
6772 2822a352 2019-10-15 stsp goto done;
6774 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6775 2822a352 2019-10-15 stsp if (error)
6776 2822a352 2019-10-15 stsp goto done;
6778 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6780 2822a352 2019-10-15 stsp if (error != NULL)
6781 2822a352 2019-10-15 stsp goto done;
6783 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6784 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6785 2822a352 2019-10-15 stsp if (error)
6786 2822a352 2019-10-15 stsp goto done;
6788 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6789 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6790 2822a352 2019-10-15 stsp goto done;
6793 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6794 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6795 2822a352 2019-10-15 stsp if (error)
6796 2822a352 2019-10-15 stsp goto done;
6798 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6799 2822a352 2019-10-15 stsp if (refname == NULL) {
6800 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6801 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6802 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6803 2822a352 2019-10-15 stsp goto done;
6805 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6806 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6807 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6808 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6809 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6810 2822a352 2019-10-15 stsp goto done;
6813 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6814 2822a352 2019-10-15 stsp if (error)
6815 2822a352 2019-10-15 stsp goto done;
6817 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6818 2822a352 2019-10-15 stsp if (error)
6819 2822a352 2019-10-15 stsp goto done;
6821 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6822 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6823 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6824 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6825 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6826 2822a352 2019-10-15 stsp goto done;
6829 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6830 2822a352 2019-10-15 stsp if (error) {
6831 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6832 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6833 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6834 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6835 2822a352 2019-10-15 stsp goto done;
6838 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6839 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6840 2822a352 2019-10-15 stsp check_cancelled, NULL);
6841 2822a352 2019-10-15 stsp if (error)
6842 2822a352 2019-10-15 stsp goto done;
6844 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6847 715dc77e 2019-08-03 stsp got_repo_close(repo);
6848 2822a352 2019-10-15 stsp if (worktree)
6849 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6850 2822a352 2019-10-15 stsp free(cwd);
6851 2822a352 2019-10-15 stsp free(base_commit_id);
6852 2822a352 2019-10-15 stsp free(commit_id);
6853 2822a352 2019-10-15 stsp free(refname);
6854 2822a352 2019-10-15 stsp free(base_refname);
6855 715dc77e 2019-08-03 stsp return error;
6858 715dc77e 2019-08-03 stsp __dead static void
6859 715dc77e 2019-08-03 stsp usage_stage(void)
6861 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6862 f3055044 2019-08-07 stsp "[file-path ...]\n",
6863 715dc77e 2019-08-03 stsp getprogname());
6867 715dc77e 2019-08-03 stsp static const struct got_error *
6868 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6869 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6870 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6871 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6873 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6874 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6876 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6877 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6878 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6879 408b4ebc 2019-08-03 stsp return NULL;
6881 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6882 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6883 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6885 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6887 408b4ebc 2019-08-03 stsp return err;
6889 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6890 408b4ebc 2019-08-03 stsp free(id_str);
6891 dc424a06 2019-08-07 stsp return NULL;
6894 dc424a06 2019-08-07 stsp static const struct got_error *
6895 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6897 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6898 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6899 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6900 715dc77e 2019-08-03 stsp char *cwd = NULL;
6901 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6902 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6903 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6904 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6905 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6906 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6908 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6910 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6911 715dc77e 2019-08-03 stsp switch (ch) {
6913 408b4ebc 2019-08-03 stsp list_stage = 1;
6916 dc424a06 2019-08-07 stsp pflag = 1;
6919 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6922 715dc77e 2019-08-03 stsp usage_stage();
6923 715dc77e 2019-08-03 stsp /* NOTREACHED */
6927 715dc77e 2019-08-03 stsp argc -= optind;
6928 715dc77e 2019-08-03 stsp argv += optind;
6930 715dc77e 2019-08-03 stsp #ifndef PROFILE
6931 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6932 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6933 715dc77e 2019-08-03 stsp err(1, "pledge");
6935 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6936 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6937 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6938 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6940 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6941 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6942 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6943 715dc77e 2019-08-03 stsp goto done;
6946 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6947 715dc77e 2019-08-03 stsp if (error)
6948 715dc77e 2019-08-03 stsp goto done;
6950 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6952 715dc77e 2019-08-03 stsp if (error != NULL)
6953 715dc77e 2019-08-03 stsp goto done;
6955 dc424a06 2019-08-07 stsp if (patch_script_path) {
6956 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6957 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6958 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6959 dc424a06 2019-08-07 stsp patch_script_path);
6960 dc424a06 2019-08-07 stsp goto done;
6963 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6964 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6965 715dc77e 2019-08-03 stsp if (error)
6966 715dc77e 2019-08-03 stsp goto done;
6968 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6969 6d022e97 2019-08-04 stsp if (error)
6970 6d022e97 2019-08-04 stsp goto done;
6972 6d022e97 2019-08-04 stsp if (list_stage)
6973 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6974 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6976 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6977 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6978 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6979 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6980 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6983 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6984 2e1f37b0 2019-08-08 stsp error == NULL)
6985 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6987 ad493afc 2019-08-03 stsp got_repo_close(repo);
6988 ad493afc 2019-08-03 stsp if (worktree)
6989 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6990 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6991 ad493afc 2019-08-03 stsp free((char *)pe->path);
6992 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6993 ad493afc 2019-08-03 stsp free(cwd);
6994 ad493afc 2019-08-03 stsp return error;
6997 ad493afc 2019-08-03 stsp __dead static void
6998 ad493afc 2019-08-03 stsp usage_unstage(void)
7000 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7001 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7002 ad493afc 2019-08-03 stsp getprogname());
7007 ad493afc 2019-08-03 stsp static const struct got_error *
7008 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7010 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7011 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7012 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7013 ad493afc 2019-08-03 stsp char *cwd = NULL;
7014 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7015 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7016 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7017 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7018 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7019 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7021 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7023 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7024 ad493afc 2019-08-03 stsp switch (ch) {
7026 2e1f37b0 2019-08-08 stsp pflag = 1;
7029 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7032 ad493afc 2019-08-03 stsp usage_unstage();
7033 ad493afc 2019-08-03 stsp /* NOTREACHED */
7037 ad493afc 2019-08-03 stsp argc -= optind;
7038 ad493afc 2019-08-03 stsp argv += optind;
7040 ad493afc 2019-08-03 stsp #ifndef PROFILE
7041 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7042 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7043 ad493afc 2019-08-03 stsp err(1, "pledge");
7045 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7046 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7048 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7049 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7050 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7051 ad493afc 2019-08-03 stsp goto done;
7054 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7055 ad493afc 2019-08-03 stsp if (error)
7056 ad493afc 2019-08-03 stsp goto done;
7058 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7060 ad493afc 2019-08-03 stsp if (error != NULL)
7061 ad493afc 2019-08-03 stsp goto done;
7063 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7064 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7065 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7066 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7067 2e1f37b0 2019-08-08 stsp patch_script_path);
7068 2e1f37b0 2019-08-08 stsp goto done;
7072 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7073 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7074 ad493afc 2019-08-03 stsp if (error)
7075 ad493afc 2019-08-03 stsp goto done;
7077 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7078 ad493afc 2019-08-03 stsp if (error)
7079 ad493afc 2019-08-03 stsp goto done;
7081 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7082 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7083 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7084 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7086 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7087 2e1f37b0 2019-08-08 stsp error == NULL)
7088 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7090 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7091 715dc77e 2019-08-03 stsp if (worktree)
7092 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7093 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7094 715dc77e 2019-08-03 stsp free((char *)pe->path);
7095 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7096 715dc77e 2019-08-03 stsp free(cwd);
7097 01073a5d 2019-08-22 stsp return error;
7100 01073a5d 2019-08-22 stsp __dead static void
7101 01073a5d 2019-08-22 stsp usage_cat(void)
7103 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7104 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7108 01073a5d 2019-08-22 stsp static const struct got_error *
7109 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7111 01073a5d 2019-08-22 stsp const struct got_error *err;
7112 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7114 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7116 01073a5d 2019-08-22 stsp return err;
7118 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7119 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7120 01073a5d 2019-08-22 stsp return err;
7123 01073a5d 2019-08-22 stsp static const struct got_error *
7124 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7126 01073a5d 2019-08-22 stsp const struct got_error *err;
7127 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7128 56e0773d 2019-11-28 stsp int nentries, i;
7130 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7132 01073a5d 2019-08-22 stsp return err;
7134 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7135 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7136 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7137 01073a5d 2019-08-22 stsp char *id_str;
7138 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7140 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7141 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7144 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7145 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7146 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7147 01073a5d 2019-08-22 stsp free(id_str);
7150 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7151 01073a5d 2019-08-22 stsp return err;
7154 01073a5d 2019-08-22 stsp static const struct got_error *
7155 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7157 01073a5d 2019-08-22 stsp const struct got_error *err;
7158 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7159 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7160 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7161 01073a5d 2019-08-22 stsp char *id_str = NULL;
7162 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7164 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7166 01073a5d 2019-08-22 stsp return err;
7168 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7170 01073a5d 2019-08-22 stsp goto done;
7172 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7173 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7174 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7175 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7176 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7177 01073a5d 2019-08-22 stsp char *pid_str;
7178 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7180 01073a5d 2019-08-22 stsp goto done;
7181 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7182 01073a5d 2019-08-22 stsp free(pid_str);
7184 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7185 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7186 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7188 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7189 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7190 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7192 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7193 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7194 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7196 01073a5d 2019-08-22 stsp free(id_str);
7197 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7198 01073a5d 2019-08-22 stsp return err;
7201 01073a5d 2019-08-22 stsp static const struct got_error *
7202 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7204 01073a5d 2019-08-22 stsp const struct got_error *err;
7205 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7206 01073a5d 2019-08-22 stsp char *id_str = NULL;
7207 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7209 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7211 01073a5d 2019-08-22 stsp return err;
7213 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7215 01073a5d 2019-08-22 stsp goto done;
7217 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7219 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7220 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7221 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7222 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7224 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7225 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7226 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7228 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7229 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7230 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7232 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7233 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7234 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7240 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7241 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7243 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7244 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7245 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7247 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7248 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7249 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7251 01073a5d 2019-08-22 stsp free(id_str);
7252 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7253 01073a5d 2019-08-22 stsp return err;
7256 01073a5d 2019-08-22 stsp static const struct got_error *
7257 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7259 01073a5d 2019-08-22 stsp const struct got_error *error;
7260 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7261 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7262 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7263 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7264 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7265 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7267 01073a5d 2019-08-22 stsp #ifndef PROFILE
7268 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7269 01073a5d 2019-08-22 stsp NULL) == -1)
7270 01073a5d 2019-08-22 stsp err(1, "pledge");
7273 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7274 01073a5d 2019-08-22 stsp switch (ch) {
7276 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7279 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7280 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7281 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7283 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7286 896e9b6f 2019-08-26 stsp force_path = 1;
7289 01073a5d 2019-08-22 stsp usage_cat();
7290 01073a5d 2019-08-22 stsp /* NOTREACHED */
7294 01073a5d 2019-08-22 stsp argc -= optind;
7295 01073a5d 2019-08-22 stsp argv += optind;
7297 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7298 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7299 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7300 01073a5d 2019-08-22 stsp goto done;
7302 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7303 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7304 01073a5d 2019-08-22 stsp goto done;
7305 01073a5d 2019-08-22 stsp if (worktree) {
7306 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7307 01073a5d 2019-08-22 stsp repo_path = strdup(
7308 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7309 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7310 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7311 01073a5d 2019-08-22 stsp goto done;
7316 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7317 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7318 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7319 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7322 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7323 01073a5d 2019-08-22 stsp free(repo_path);
7324 01073a5d 2019-08-22 stsp if (error != NULL)
7325 01073a5d 2019-08-22 stsp goto done;
7327 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7328 896e9b6f 2019-08-26 stsp if (error)
7329 896e9b6f 2019-08-26 stsp goto done;
7331 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7332 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7333 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7334 01073a5d 2019-08-22 stsp if (error)
7335 01073a5d 2019-08-22 stsp goto done;
7337 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7338 896e9b6f 2019-08-26 stsp if (force_path) {
7339 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7341 896e9b6f 2019-08-26 stsp if (error)
7344 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7345 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7346 896e9b6f 2019-08-26 stsp if (error) {
7347 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7348 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7350 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7351 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7352 896e9b6f 2019-08-26 stsp if (error)
7357 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7358 01073a5d 2019-08-22 stsp if (error)
7361 01073a5d 2019-08-22 stsp switch (obj_type) {
7362 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7363 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7365 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7366 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7368 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7369 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7371 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7372 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7375 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7378 01073a5d 2019-08-22 stsp if (error)
7380 01073a5d 2019-08-22 stsp free(label);
7381 01073a5d 2019-08-22 stsp label = NULL;
7383 01073a5d 2019-08-22 stsp id = NULL;
7387 01073a5d 2019-08-22 stsp free(label);
7389 896e9b6f 2019-08-26 stsp free(commit_id);
7390 01073a5d 2019-08-22 stsp if (worktree)
7391 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7392 01073a5d 2019-08-22 stsp if (repo) {
7393 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7394 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7395 01073a5d 2019-08-22 stsp if (error == NULL)
7396 01073a5d 2019-08-22 stsp error = repo_error;
7398 0ebf8283 2019-07-24 stsp return error;
