2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 c0768b0f 2018-06-10 stsp #include <sys/types.h>
20 5de5890b 2018-10-18 stsp #include <sys/stat.h>
21 3c45a30a 2019-05-12 jcs #include <sys/param.h>
22 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
24 5c860e29 2018-03-12 stsp #include <err.h>
25 5c860e29 2018-03-12 stsp #include <errno.h>
26 12ce7a6c 2019-08-12 stsp #include <limits.h>
27 5c860e29 2018-03-12 stsp #include <locale.h>
28 818c7501 2019-07-11 stsp #include <ctype.h>
29 99437157 2018-11-11 stsp #include <signal.h>
30 5c860e29 2018-03-12 stsp #include <stdio.h>
31 5c860e29 2018-03-12 stsp #include <stdlib.h>
32 5c860e29 2018-03-12 stsp #include <string.h>
33 5c860e29 2018-03-12 stsp #include <unistd.h>
34 c09a553d 2018-03-12 stsp #include <libgen.h>
35 c0768b0f 2018-06-10 stsp #include <time.h>
36 33ad4cbe 2019-05-12 jcs #include <paths.h>
37 6841bf13 2019-11-29 kn #include <regex.h>
39 53ccebc2 2019-07-30 stsp #include "got_version.h"
40 f42b1b34 2018-03-12 stsp #include "got_error.h"
41 f42b1b34 2018-03-12 stsp #include "got_object.h"
42 5261c201 2018-04-01 stsp #include "got_reference.h"
43 f42b1b34 2018-03-12 stsp #include "got_repository.h"
44 1dd54920 2019-05-11 stsp #include "got_path.h"
45 e6209546 2019-08-22 stsp #include "got_cancel.h"
46 c09a553d 2018-03-12 stsp #include "got_worktree.h"
47 79109fed 2018-03-27 stsp #include "got_diff.h"
48 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
49 404c43c4 2018-06-21 stsp #include "got_blame.h"
50 63219cd2 2019-01-04 stsp #include "got_privsep.h"
51 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
53 5c860e29 2018-03-12 stsp #ifndef nitems
54 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
57 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
58 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
61 99437157 2018-11-11 stsp catch_sigint(int signo)
63 99437157 2018-11-11 stsp sigint_received = 1;
67 99437157 2018-11-11 stsp catch_sigpipe(int signo)
69 99437157 2018-11-11 stsp sigpipe_received = 1;
73 8cfb4057 2019-07-09 stsp struct got_cmd {
74 5c860e29 2018-03-12 stsp const char *cmd_name;
75 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
76 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
77 97b3a7be 2019-07-09 stsp const char *cmd_alias;
80 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
81 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
82 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
83 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
84 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
85 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
86 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
87 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
88 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
89 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
90 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
91 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
92 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
93 d00136be 2019-03-26 stsp __dead static void usage_add(void);
94 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
95 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
96 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
97 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
98 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
99 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
100 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
101 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
102 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
103 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
104 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
106 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
107 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
108 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
109 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
110 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
111 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
112 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
113 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
114 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
115 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
116 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
117 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
118 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
119 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
120 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
121 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
122 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
123 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
124 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
125 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
126 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
127 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
128 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
129 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
131 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
132 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
133 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
134 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
135 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
136 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
137 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
138 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
139 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
140 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
141 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
142 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
143 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
144 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
145 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
146 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
147 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
148 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
149 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
150 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
151 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
152 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
153 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
154 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
155 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
158 ce5b7c56 2019-07-09 stsp static void
159 ce5b7c56 2019-07-09 stsp list_commands(void)
163 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
164 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
165 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
166 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
168 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
172 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
174 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
175 5c860e29 2018-03-12 stsp unsigned int i;
177 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
179 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
181 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
182 5c860e29 2018-03-12 stsp switch (ch) {
190 ce5b7c56 2019-07-09 stsp usage(hflag);
191 5c860e29 2018-03-12 stsp /* NOTREACHED */
195 5c860e29 2018-03-12 stsp argc -= optind;
196 5c860e29 2018-03-12 stsp argv += optind;
197 1e70621d 2018-03-27 stsp optind = 0;
199 53ccebc2 2019-07-30 stsp if (Vflag) {
200 53ccebc2 2019-07-30 stsp got_version_print_str();
204 5c860e29 2018-03-12 stsp if (argc <= 0)
205 ce5b7c56 2019-07-09 stsp usage(hflag);
207 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
208 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
210 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
211 d7d4f210 2018-03-12 stsp const struct got_error *error;
213 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
215 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
216 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
220 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
222 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
223 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
224 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
225 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
226 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
227 70015d7a 2019-11-08 stsp !(sigint_received &&
228 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
229 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
236 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
237 ce5b7c56 2019-07-09 stsp list_commands();
241 4ed7e80c 2018-05-20 stsp __dead static void
242 ce5b7c56 2019-07-09 stsp usage(int hflag)
244 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
245 53ccebc2 2019-07-30 stsp getprogname());
247 ce5b7c56 2019-07-09 stsp list_commands();
251 0266afb7 2019-01-04 stsp static const struct got_error *
252 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
254 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
255 e2ba3d07 2019-05-13 stsp const char *editor;
257 8920fa04 2019-08-18 stsp *abspath = NULL;
259 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
260 e2ba3d07 2019-05-13 stsp if (editor == NULL)
261 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
263 0ee7065d 2019-05-13 stsp if (editor) {
264 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
266 0ee7065d 2019-05-13 stsp return err;
269 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
270 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
271 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
272 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
275 e2ba3d07 2019-05-13 stsp return NULL;
278 e2ba3d07 2019-05-13 stsp static const struct got_error *
279 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
280 c530dc23 2019-07-23 stsp const char *worktree_path)
282 163ce85a 2019-05-13 stsp const struct got_error *err;
284 37c06ea4 2019-07-15 stsp #ifdef PROFILE
285 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
286 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
288 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
289 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
291 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
292 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
294 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
295 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
297 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
298 163ce85a 2019-05-13 stsp if (err != NULL)
299 163ce85a 2019-05-13 stsp return err;
301 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
302 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
304 0266afb7 2019-01-04 stsp return NULL;
307 2c7829a4 2019-06-17 stsp __dead static void
308 2c7829a4 2019-06-17 stsp usage_init(void)
310 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
314 2c7829a4 2019-06-17 stsp static const struct got_error *
315 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
317 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
318 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
321 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
322 2c7829a4 2019-06-17 stsp switch (ch) {
324 2c7829a4 2019-06-17 stsp usage_init();
325 2c7829a4 2019-06-17 stsp /* NOTREACHED */
329 2c7829a4 2019-06-17 stsp argc -= optind;
330 2c7829a4 2019-06-17 stsp argv += optind;
332 2c7829a4 2019-06-17 stsp #ifndef PROFILE
333 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
334 2c7829a4 2019-06-17 stsp err(1, "pledge");
336 2c7829a4 2019-06-17 stsp if (argc != 1)
337 bc20e173 2019-06-17 stsp usage_init();
339 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
340 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
341 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
343 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
345 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
346 2c7829a4 2019-06-17 stsp if (error &&
347 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
350 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
354 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
355 2c7829a4 2019-06-17 stsp if (error != NULL)
359 3ce1b845 2019-07-15 stsp free(repo_path);
360 3ce1b845 2019-07-15 stsp return error;
363 3ce1b845 2019-07-15 stsp __dead static void
364 3ce1b845 2019-07-15 stsp usage_import(void)
366 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
367 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
372 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
375 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
376 3ce1b845 2019-07-15 stsp int st = -1;
378 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
379 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
380 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
382 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
384 3ce1b845 2019-07-15 stsp goto doneediting;
386 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
387 3ce1b845 2019-07-15 stsp _exit(127);
390 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
391 3ce1b845 2019-07-15 stsp if (errno != EINTR)
394 3ce1b845 2019-07-15 stsp doneediting:
395 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
396 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
397 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
399 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
400 3ce1b845 2019-07-15 stsp errno = EINTR;
404 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
407 3ce1b845 2019-07-15 stsp static const struct got_error *
408 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
409 3ce1b845 2019-07-15 stsp const char *initial_content)
411 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
412 3ce1b845 2019-07-15 stsp char buf[1024];
413 3ce1b845 2019-07-15 stsp struct stat st, st2;
415 3ce1b845 2019-07-15 stsp int content_changed = 0;
416 3ce1b845 2019-07-15 stsp size_t len;
418 3ce1b845 2019-07-15 stsp *logmsg = NULL;
420 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
421 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
423 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
424 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
426 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
427 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
429 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
430 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
431 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
433 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
434 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
435 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
436 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
439 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
440 3ce1b845 2019-07-15 stsp if (fp == NULL) {
441 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
444 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
445 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
446 3ce1b845 2019-07-15 stsp content_changed = 1;
447 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
448 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
449 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
451 3ce1b845 2019-07-15 stsp fclose(fp);
453 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
454 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
458 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
459 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
460 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
463 3ce1b845 2019-07-15 stsp free(*logmsg);
464 3ce1b845 2019-07-15 stsp *logmsg = NULL;
466 3ce1b845 2019-07-15 stsp return err;
469 3ce1b845 2019-07-15 stsp static const struct got_error *
470 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
471 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
473 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
474 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
477 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
478 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
479 3ce1b845 2019-07-15 stsp branch_name) == -1)
480 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
482 ef293bdd 2019-10-21 stsp err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
486 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
489 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
491 3ce1b845 2019-07-15 stsp free(initial_content);
492 3ce1b845 2019-07-15 stsp return err;
495 3ce1b845 2019-07-15 stsp static const struct got_error *
496 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
498 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
499 3ce1b845 2019-07-15 stsp return NULL;
502 3ce1b845 2019-07-15 stsp static const struct got_error *
503 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
505 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
506 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
508 84792843 2019-08-09 stsp *author = NULL;
510 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
511 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
512 c9956ddf 2019-09-08 stsp if (name && email) {
513 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
514 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
515 aba9c984 2019-09-08 stsp return NULL;
518 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
519 84792843 2019-08-09 stsp if (got_author == NULL) {
520 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
521 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
522 c9956ddf 2019-09-08 stsp if (name && email) {
523 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
524 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
525 c9956ddf 2019-09-08 stsp return NULL;
527 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
528 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
531 aba9c984 2019-09-08 stsp *author = strdup(got_author);
532 aba9c984 2019-09-08 stsp if (*author == NULL)
533 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
536 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
537 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
539 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
540 84792843 2019-08-09 stsp got_author++;
541 aba9c984 2019-09-08 stsp if (*got_author != '<') {
542 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
545 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
546 84792843 2019-08-09 stsp got_author++;
547 aba9c984 2019-09-08 stsp if (*got_author != '@') {
548 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
551 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
552 84792843 2019-08-09 stsp got_author++;
553 84792843 2019-08-09 stsp if (*got_author != '>')
554 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
557 aba9c984 2019-09-08 stsp free(*author);
558 aba9c984 2019-09-08 stsp *author = NULL;
560 aba9c984 2019-09-08 stsp return err;
563 c9956ddf 2019-09-08 stsp static const struct got_error *
564 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
566 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
568 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
569 c9956ddf 2019-09-08 stsp if (homedir) {
570 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
571 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
574 c9956ddf 2019-09-08 stsp return NULL;
577 84792843 2019-08-09 stsp static const struct got_error *
578 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
580 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
581 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
582 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
583 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
584 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
585 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
586 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
587 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
589 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
590 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
591 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
593 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
595 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
596 3ce1b845 2019-07-15 stsp switch (ch) {
598 3ce1b845 2019-07-15 stsp branch_name = optarg;
601 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
602 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
603 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
608 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
609 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
610 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
616 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
618 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
624 b2b65d18 2019-08-22 stsp usage_import();
625 3ce1b845 2019-07-15 stsp /* NOTREACHED */
629 3ce1b845 2019-07-15 stsp argc -= optind;
630 3ce1b845 2019-07-15 stsp argv += optind;
632 3ce1b845 2019-07-15 stsp #ifndef PROFILE
633 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
635 3ce1b845 2019-07-15 stsp NULL) == -1)
636 3ce1b845 2019-07-15 stsp err(1, "pledge");
638 3ce1b845 2019-07-15 stsp if (argc != 1)
639 3ce1b845 2019-07-15 stsp usage_import();
641 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
642 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
643 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
644 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
646 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
647 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
650 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
654 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
656 aba9c984 2019-09-08 stsp return error;
659 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
660 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
661 e560b7e0 2019-11-28 stsp * an unintended typo.
663 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
664 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
666 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
667 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
671 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
672 3ce1b845 2019-07-15 stsp if (error) {
673 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
676 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
677 3ce1b845 2019-07-15 stsp "import target branch already exists");
681 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
682 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
683 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
686 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
689 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
690 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
692 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
693 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
696 8e158b01 2019-09-22 stsp free(logmsg);
697 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
698 ef293bdd 2019-10-21 stsp path_dir, refname);
699 ef293bdd 2019-10-21 stsp if (error) {
700 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
701 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
702 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
707 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
708 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
709 ef293bdd 2019-10-21 stsp if (logmsg_path)
710 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
714 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
715 ef293bdd 2019-10-21 stsp if (error) {
716 ef293bdd 2019-10-21 stsp if (logmsg_path)
717 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
721 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
722 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
723 ef293bdd 2019-10-21 stsp if (error) {
724 ef293bdd 2019-10-21 stsp if (logmsg_path)
725 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
729 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
730 ef293bdd 2019-10-21 stsp if (error) {
731 ef293bdd 2019-10-21 stsp if (logmsg_path)
732 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
736 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
737 ef293bdd 2019-10-21 stsp if (error) {
738 ef293bdd 2019-10-21 stsp if (logmsg_path)
739 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
743 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
744 ef293bdd 2019-10-21 stsp if (error) {
745 ef293bdd 2019-10-21 stsp if (logmsg_path)
746 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
750 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
751 3ce1b845 2019-07-15 stsp if (error) {
752 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
753 ef293bdd 2019-10-21 stsp if (logmsg_path)
754 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
758 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
759 3ce1b845 2019-07-15 stsp branch_ref);
760 ef293bdd 2019-10-21 stsp if (error) {
761 ef293bdd 2019-10-21 stsp if (logmsg_path)
762 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
766 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
767 ef293bdd 2019-10-21 stsp if (error) {
768 ef293bdd 2019-10-21 stsp if (logmsg_path)
769 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
774 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
775 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
777 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
778 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
779 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
780 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
781 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
782 8e158b01 2019-09-22 stsp free(logmsg);
783 ef293bdd 2019-10-21 stsp free(logmsg_path);
784 2c7829a4 2019-06-17 stsp free(repo_path);
785 3ce1b845 2019-07-15 stsp free(editor);
786 3ce1b845 2019-07-15 stsp free(refname);
787 3ce1b845 2019-07-15 stsp free(new_commit_id);
788 3ce1b845 2019-07-15 stsp free(id_str);
789 aba9c984 2019-09-08 stsp free(author);
790 c9956ddf 2019-09-08 stsp free(gitconfig_path);
791 3ce1b845 2019-07-15 stsp if (branch_ref)
792 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
793 3ce1b845 2019-07-15 stsp if (head_ref)
794 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
795 2c7829a4 2019-06-17 stsp return error;
798 4ed7e80c 2018-05-20 stsp __dead static void
799 c09a553d 2018-03-12 stsp usage_checkout(void)
801 08573d5b 2019-05-14 stsp fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
802 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
806 1ee397ad 2019-07-12 stsp static const struct got_error *
807 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
809 92a684f4 2018-03-12 stsp char *worktree_path = arg;
811 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
812 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
813 1ee397ad 2019-07-12 stsp return NULL;
815 92a684f4 2018-03-12 stsp while (path[0] == '/')
818 d7b62c98 2018-12-27 stsp printf("%c %s/%s\n", status, worktree_path, path);
819 1ee397ad 2019-07-12 stsp return NULL;
822 99437157 2018-11-11 stsp static const struct got_error *
823 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
825 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
826 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
827 99437157 2018-11-11 stsp return NULL;
830 8069f636 2019-01-12 stsp static const struct got_error *
831 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
832 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
833 3aef623b 2019-10-15 stsp struct got_repository *repo)
835 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
836 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
838 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
839 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
841 36a38700 2019-05-10 stsp return err;
843 d5bea539 2019-05-13 stsp if (yca_id == NULL)
844 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
847 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
848 d5bea539 2019-05-13 stsp * and the work tree's base commit.
850 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
852 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
860 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
861 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
862 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
864 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
865 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
866 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
867 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
868 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
869 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
871 d5bea539 2019-05-13 stsp free(yca_id);
872 d5bea539 2019-05-13 stsp return NULL;
875 a367ff0f 2019-05-14 stsp static const struct got_error *
876 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
877 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
878 a51a74b3 2019-07-27 stsp struct got_repository *repo)
880 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
881 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
882 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
883 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
885 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
889 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
890 a51a74b3 2019-07-27 stsp is_same_branch = 1;
893 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
894 a51a74b3 2019-07-27 stsp is_same_branch = 1;
898 a367ff0f 2019-05-14 stsp err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
902 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
903 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
908 a367ff0f 2019-05-14 stsp struct got_object_id *id;
909 a367ff0f 2019-05-14 stsp err = got_commit_graph_iter_next(&id, graph);
911 a367ff0f 2019-05-14 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
912 a367ff0f 2019-05-14 stsp err = NULL;
914 a14c42fa 2019-07-15 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
916 a367ff0f 2019-05-14 stsp err = got_commit_graph_fetch_commits(graph, 1,
917 6fb7cd11 2019-08-22 stsp repo, check_cancelled, NULL);
923 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
925 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
926 a367ff0f 2019-05-14 stsp is_same_branch = 1;
933 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
934 a367ff0f 2019-05-14 stsp free(head_commit_id);
935 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
936 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
937 04f57cb3 2019-07-25 stsp return err;
940 04f57cb3 2019-07-25 stsp static const struct got_error *
941 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
942 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
944 04f57cb3 2019-07-25 stsp const struct got_error *err;
945 04f57cb3 2019-07-25 stsp struct got_reference *ref;
946 303e2782 2019-08-09 stsp struct got_tag_object *tag;
948 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
949 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
950 303e2782 2019-08-09 stsp if (err == NULL) {
951 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
952 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
953 303e2782 2019-08-09 stsp if (*commit_id == NULL)
954 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
955 303e2782 2019-08-09 stsp got_object_tag_close(tag);
956 303e2782 2019-08-09 stsp return err;
957 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
958 303e2782 2019-08-09 stsp return err;
960 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
961 04f57cb3 2019-07-25 stsp if (err == NULL) {
962 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
963 04f57cb3 2019-07-25 stsp got_ref_close(ref);
965 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
966 04f57cb3 2019-07-25 stsp return err;
967 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
968 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
970 a367ff0f 2019-05-14 stsp return err;
973 4ed7e80c 2018-05-20 stsp static const struct got_error *
974 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
976 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
977 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
978 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
979 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
980 c09a553d 2018-03-12 stsp char *repo_path = NULL;
981 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
982 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
983 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
984 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
985 72151b04 2019-05-11 stsp int ch, same_path_prefix;
986 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
988 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
990 08573d5b 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
991 0bb8a95e 2018-03-12 stsp switch (ch) {
993 08573d5b 2019-05-14 stsp branch_name = optarg;
996 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
997 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
998 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1001 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1004 2deda0b9 2019-03-07 stsp usage_checkout();
1005 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1009 0bb8a95e 2018-03-12 stsp argc -= optind;
1010 0bb8a95e 2018-03-12 stsp argv += optind;
1012 6715a751 2018-03-16 stsp #ifndef PROFILE
1013 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1014 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1015 c09a553d 2018-03-12 stsp err(1, "pledge");
1017 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1018 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1019 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1020 76089277 2018-04-01 stsp if (repo_path == NULL)
1021 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1022 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1023 76089277 2018-04-01 stsp if (cwd == NULL) {
1024 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1025 76089277 2018-04-01 stsp goto done;
1027 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1028 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1029 230a42bd 2019-05-11 jcs if (base == NULL) {
1030 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1031 230a42bd 2019-05-11 jcs path_prefix);
1035 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1036 230a42bd 2019-05-11 jcs if (base == NULL) {
1037 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1038 230a42bd 2019-05-11 jcs repo_path);
1042 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1043 c09a553d 2018-03-12 stsp if (dotgit)
1044 c09a553d 2018-03-12 stsp *dotgit = '\0';
1045 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1046 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1047 c09a553d 2018-03-12 stsp free(cwd);
1048 76089277 2018-04-01 stsp goto done;
1050 c09a553d 2018-03-12 stsp free(cwd);
1051 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1052 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1053 76089277 2018-04-01 stsp if (repo_path == NULL) {
1054 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1055 76089277 2018-04-01 stsp goto done;
1057 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1058 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1059 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1060 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1062 b4b3a7dd 2019-07-22 stsp goto done;
1064 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1065 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1066 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1067 b4b3a7dd 2019-07-22 stsp goto done;
1071 c09a553d 2018-03-12 stsp usage_checkout();
1073 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1074 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1076 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1077 c09a553d 2018-03-12 stsp if (error != NULL)
1078 c02c541e 2019-03-29 stsp goto done;
1080 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1081 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1082 c530dc23 2019-07-23 stsp if (error) {
1083 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1084 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1085 c530dc23 2019-07-23 stsp goto done;
1086 c530dc23 2019-07-23 stsp if (!got_path_dir_is_empty(worktree_path)) {
1087 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1088 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1089 c530dc23 2019-07-23 stsp goto done;
1093 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1094 c02c541e 2019-03-29 stsp if (error)
1095 c09a553d 2018-03-12 stsp goto done;
1097 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1098 c09a553d 2018-03-12 stsp if (error != NULL)
1099 c09a553d 2018-03-12 stsp goto done;
1101 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1102 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1103 c09a553d 2018-03-12 stsp goto done;
1105 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1106 c09a553d 2018-03-12 stsp if (error != NULL)
1107 c09a553d 2018-03-12 stsp goto done;
1109 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1110 e5dc7198 2018-12-29 stsp path_prefix);
1111 e5dc7198 2018-12-29 stsp if (error != NULL)
1112 e5dc7198 2018-12-29 stsp goto done;
1113 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1114 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1115 49520a32 2018-12-29 stsp goto done;
1118 8069f636 2019-01-12 stsp if (commit_id_str) {
1119 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1120 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1121 30837e32 2019-07-25 stsp if (error)
1122 8069f636 2019-01-12 stsp goto done;
1123 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1124 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1125 8069f636 2019-01-12 stsp if (error != NULL) {
1126 8069f636 2019-01-12 stsp free(commit_id);
1127 8069f636 2019-01-12 stsp goto done;
1129 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1130 45d344f6 2019-05-14 stsp if (error)
1131 45d344f6 2019-05-14 stsp goto done;
1132 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1133 8069f636 2019-01-12 stsp commit_id);
1134 8069f636 2019-01-12 stsp free(commit_id);
1135 8069f636 2019-01-12 stsp if (error)
1136 8069f636 2019-01-12 stsp goto done;
1139 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1140 f2ea84fa 2019-07-27 stsp if (error)
1141 f2ea84fa 2019-07-27 stsp goto done;
1142 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1143 6bad629b 2019-02-04 stsp checkout_progress, worktree_path, check_cancelled, NULL);
1144 c09a553d 2018-03-12 stsp if (error != NULL)
1145 c09a553d 2018-03-12 stsp goto done;
1147 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1150 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1151 8069f636 2019-01-12 stsp free(commit_id_str);
1152 76089277 2018-04-01 stsp free(repo_path);
1153 507dc3bb 2018-12-29 stsp free(worktree_path);
1154 507dc3bb 2018-12-29 stsp return error;
1157 507dc3bb 2018-12-29 stsp __dead static void
1158 507dc3bb 2018-12-29 stsp usage_update(void)
1160 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1161 507dc3bb 2018-12-29 stsp getprogname());
1165 1ee397ad 2019-07-12 stsp static const struct got_error *
1166 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1168 784955db 2019-01-12 stsp int *did_something = arg;
1170 507dc3bb 2018-12-29 stsp if (status == GOT_STATUS_EXISTS)
1171 1ee397ad 2019-07-12 stsp return NULL;
1173 1545c615 2019-02-10 stsp *did_something = 1;
1175 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1176 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1177 1ee397ad 2019-07-12 stsp return NULL;
1179 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1181 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1182 1ee397ad 2019-07-12 stsp return NULL;
1185 be7061eb 2018-12-30 stsp static const struct got_error *
1186 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1187 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1188 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1190 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1191 a1fb16d8 2019-05-24 stsp char *base_id_str;
1192 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1194 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1195 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1196 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1197 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1198 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1199 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1200 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1203 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1204 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1205 a1fb16d8 2019-05-24 stsp if (err) {
1206 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1207 a1fb16d8 2019-05-24 stsp return err;
1208 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1210 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1211 a1fb16d8 2019-05-24 stsp return NULL;
1213 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1214 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1215 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1217 a1fb16d8 2019-05-24 stsp return err;
1218 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1219 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1220 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1221 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1222 0ebf8283 2019-07-24 stsp return NULL;
1225 0ebf8283 2019-07-24 stsp static const struct got_error *
1226 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1228 0ebf8283 2019-07-24 stsp const struct got_error *err;
1229 0ebf8283 2019-07-24 stsp int in_progress;
1231 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1233 0ebf8283 2019-07-24 stsp return err;
1234 0ebf8283 2019-07-24 stsp if (in_progress)
1235 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1237 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1239 0ebf8283 2019-07-24 stsp return err;
1240 0ebf8283 2019-07-24 stsp if (in_progress)
1241 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1243 a1fb16d8 2019-05-24 stsp return NULL;
1246 a5edda0a 2019-07-27 stsp static const struct got_error *
1247 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1248 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1250 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1251 a5edda0a 2019-07-27 stsp char *path;
1254 a5edda0a 2019-07-27 stsp if (argc == 0) {
1255 a5edda0a 2019-07-27 stsp path = strdup("");
1256 a5edda0a 2019-07-27 stsp if (path == NULL)
1257 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1258 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1261 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1262 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1265 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1266 a5edda0a 2019-07-27 stsp if (err) {
1267 a5edda0a 2019-07-27 stsp free(path);
1272 a5edda0a 2019-07-27 stsp return err;
1275 a1fb16d8 2019-05-24 stsp static const struct got_error *
1276 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1278 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1279 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1280 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1281 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1282 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1283 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1284 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1285 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1286 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1287 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1288 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1290 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1292 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1293 507dc3bb 2018-12-29 stsp switch (ch) {
1295 024e9686 2019-05-14 stsp branch_name = optarg;
1298 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1299 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1300 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1303 2deda0b9 2019-03-07 stsp usage_update();
1304 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1308 507dc3bb 2018-12-29 stsp argc -= optind;
1309 507dc3bb 2018-12-29 stsp argv += optind;
1311 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1312 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1313 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1314 507dc3bb 2018-12-29 stsp err(1, "pledge");
1316 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1317 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1318 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1319 c4cdcb68 2019-04-03 stsp goto done;
1321 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1322 7d5807f4 2019-07-11 stsp if (error)
1323 7d5807f4 2019-07-11 stsp goto done;
1325 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1326 f2ea84fa 2019-07-27 stsp if (error)
1327 f2ea84fa 2019-07-27 stsp goto done;
1329 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1331 507dc3bb 2018-12-29 stsp if (error != NULL)
1332 507dc3bb 2018-12-29 stsp goto done;
1334 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1335 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1336 087fb88c 2019-08-04 stsp if (error)
1337 087fb88c 2019-08-04 stsp goto done;
1339 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1340 0266afb7 2019-01-04 stsp if (error)
1341 0266afb7 2019-01-04 stsp goto done;
1343 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1344 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1345 024e9686 2019-05-14 stsp if (error != NULL)
1346 024e9686 2019-05-14 stsp goto done;
1347 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1348 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1349 9c4b8182 2019-01-02 stsp if (error != NULL)
1350 9c4b8182 2019-01-02 stsp goto done;
1351 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1352 507dc3bb 2018-12-29 stsp if (error != NULL)
1353 507dc3bb 2018-12-29 stsp goto done;
1355 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1356 04f57cb3 2019-07-25 stsp free(commit_id_str);
1357 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1358 30837e32 2019-07-25 stsp if (error)
1359 a297e751 2019-07-11 stsp goto done;
1360 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1361 a297e751 2019-07-11 stsp if (error)
1362 507dc3bb 2018-12-29 stsp goto done;
1365 a1fb16d8 2019-05-24 stsp if (branch_name) {
1366 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1367 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1368 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1370 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1371 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1372 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1373 024e9686 2019-05-14 stsp goto done;
1375 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1376 024e9686 2019-05-14 stsp if (error)
1377 024e9686 2019-05-14 stsp goto done;
1378 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1380 a367ff0f 2019-05-14 stsp free(head_commit_id);
1381 024e9686 2019-05-14 stsp if (error != NULL)
1382 024e9686 2019-05-14 stsp goto done;
1383 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1384 a367ff0f 2019-05-14 stsp if (error)
1385 a367ff0f 2019-05-14 stsp goto done;
1386 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1387 024e9686 2019-05-14 stsp if (error)
1388 024e9686 2019-05-14 stsp goto done;
1390 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1391 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1392 a367ff0f 2019-05-14 stsp if (error != NULL) {
1393 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1394 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1395 024e9686 2019-05-14 stsp goto done;
1397 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1398 a367ff0f 2019-05-14 stsp if (error)
1399 a367ff0f 2019-05-14 stsp goto done;
1402 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1403 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1404 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1405 507dc3bb 2018-12-29 stsp commit_id);
1406 507dc3bb 2018-12-29 stsp if (error)
1407 507dc3bb 2018-12-29 stsp goto done;
1410 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1411 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1412 507dc3bb 2018-12-29 stsp if (error != NULL)
1413 507dc3bb 2018-12-29 stsp goto done;
1415 784955db 2019-01-12 stsp if (did_something)
1416 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1418 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1420 c09a553d 2018-03-12 stsp free(worktree_path);
1421 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1422 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1423 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1424 507dc3bb 2018-12-29 stsp free(commit_id);
1425 9c4b8182 2019-01-02 stsp free(commit_id_str);
1426 c09a553d 2018-03-12 stsp return error;
1429 f42b1b34 2018-03-12 stsp static const struct got_error *
1430 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1431 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1432 63035f9f 2019-10-06 stsp struct got_repository *repo)
1434 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1435 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1437 44392932 2019-08-25 stsp if (blob_id1) {
1438 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1440 44392932 2019-08-25 stsp goto done;
1443 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1445 44392932 2019-08-25 stsp goto done;
1447 44392932 2019-08-25 stsp while (path[0] == '/')
1449 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1450 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1452 44392932 2019-08-25 stsp if (blob1)
1453 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1454 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1455 44392932 2019-08-25 stsp return err;
1458 44392932 2019-08-25 stsp static const struct got_error *
1459 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1460 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1461 63035f9f 2019-10-06 stsp struct got_repository *repo)
1463 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1464 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1465 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1467 44392932 2019-08-25 stsp if (tree_id1) {
1468 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1470 44392932 2019-08-25 stsp goto done;
1473 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1475 0f2b3dca 2018-12-22 stsp goto done;
1477 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1478 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1479 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1480 44392932 2019-08-25 stsp while (path[0] == '/')
1482 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1483 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1485 79109fed 2018-03-27 stsp if (tree1)
1486 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1487 366e0a5f 2019-10-10 stsp if (tree2)
1488 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1489 44392932 2019-08-25 stsp return err;
1492 44392932 2019-08-25 stsp static const struct got_error *
1493 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1494 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1496 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1497 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1498 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1499 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1500 44392932 2019-08-25 stsp struct got_object_qid *qid;
1502 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1503 44392932 2019-08-25 stsp if (qid != NULL) {
1504 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1507 44392932 2019-08-25 stsp return err;
1510 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1511 44392932 2019-08-25 stsp int obj_type;
1512 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1514 44392932 2019-08-25 stsp goto done;
1515 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1516 44392932 2019-08-25 stsp if (err) {
1517 44392932 2019-08-25 stsp free(obj_id2);
1518 44392932 2019-08-25 stsp goto done;
1520 44392932 2019-08-25 stsp if (pcommit) {
1521 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1522 44392932 2019-08-25 stsp qid->id, path);
1523 44392932 2019-08-25 stsp if (err) {
1524 44392932 2019-08-25 stsp free(obj_id2);
1525 44392932 2019-08-25 stsp goto done;
1527 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1528 44392932 2019-08-25 stsp if (err) {
1529 44392932 2019-08-25 stsp free(obj_id2);
1530 44392932 2019-08-25 stsp goto done;
1533 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1534 44392932 2019-08-25 stsp if (err) {
1535 44392932 2019-08-25 stsp free(obj_id2);
1536 44392932 2019-08-25 stsp goto done;
1538 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1539 44392932 2019-08-25 stsp switch (obj_type) {
1540 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1541 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1544 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1545 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1549 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1552 44392932 2019-08-25 stsp free(obj_id1);
1553 44392932 2019-08-25 stsp free(obj_id2);
1555 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1556 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1558 44392932 2019-08-25 stsp goto done;
1559 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1560 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1562 44392932 2019-08-25 stsp goto done;
1563 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1564 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1568 0f2b3dca 2018-12-22 stsp free(id_str1);
1569 0f2b3dca 2018-12-22 stsp free(id_str2);
1570 44392932 2019-08-25 stsp if (pcommit)
1571 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1572 79109fed 2018-03-27 stsp return err;
1575 4bb494d5 2018-06-16 stsp static char *
1576 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1578 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1579 09867e48 2019-08-13 stsp char *p, *s;
1581 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1582 09867e48 2019-08-13 stsp if (tm == NULL)
1583 09867e48 2019-08-13 stsp return NULL;
1584 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1585 09867e48 2019-08-13 stsp if (s == NULL)
1586 09867e48 2019-08-13 stsp return NULL;
1587 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1589 6c281f94 2018-06-11 stsp *p = '\0';
1593 6841bf13 2019-11-29 kn static const struct got_error *
1594 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1595 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1597 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1598 6841bf13 2019-11-29 kn regmatch_t regmatch;
1599 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1601 6841bf13 2019-11-29 kn *have_match = 0;
1603 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1607 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1611 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1612 6841bf13 2019-11-29 kn *have_match = 1;
1614 6841bf13 2019-11-29 kn free(id_str);
1615 6841bf13 2019-11-29 kn free(logmsg);
1619 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1621 79109fed 2018-03-27 stsp static const struct got_error *
1622 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1623 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1624 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1626 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1627 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1628 6c281f94 2018-06-11 stsp char datebuf[26];
1629 45d799e2 2018-12-23 stsp time_t committer_time;
1630 45d799e2 2018-12-23 stsp const char *author, *committer;
1631 199a4027 2019-02-02 stsp char *refs_str = NULL;
1632 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1634 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1636 199a4027 2019-02-02 stsp const char *name;
1637 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1640 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1641 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1643 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1644 199a4027 2019-02-02 stsp name += 5;
1645 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1647 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1648 e34f9ed6 2019-02-02 stsp name += 6;
1649 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1650 141c2bff 2019-02-04 stsp name += 8;
1651 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1652 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1653 5d844a1e 2019-08-13 stsp if (err) {
1654 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1655 5d844a1e 2019-08-13 stsp return err;
1656 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1657 5d844a1e 2019-08-13 stsp err = NULL;
1658 5d844a1e 2019-08-13 stsp tag = NULL;
1661 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1662 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1664 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1665 a436ad14 2019-08-13 stsp if (cmp != 0)
1667 199a4027 2019-02-02 stsp s = refs_str;
1668 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1669 199a4027 2019-02-02 stsp name) == -1) {
1670 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1672 34ca4898 2019-08-13 stsp return err;
1676 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1678 8bf5b3c9 2018-03-17 stsp return err;
1680 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1681 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1682 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1683 832c249c 2018-06-10 stsp free(id_str);
1684 d3d493d7 2019-02-21 stsp id_str = NULL;
1685 d3d493d7 2019-02-21 stsp free(refs_str);
1686 d3d493d7 2019-02-21 stsp refs_str = NULL;
1687 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1688 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1689 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1690 09867e48 2019-08-13 stsp if (datestr)
1691 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1692 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1693 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1694 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1695 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1696 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1697 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1698 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1699 3fe1abad 2018-06-10 stsp int n = 1;
1700 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1701 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1702 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1704 a0603db2 2018-06-10 stsp return err;
1705 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1706 a0603db2 2018-06-10 stsp free(id_str);
1710 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1712 5943eee2 2019-08-13 stsp return err;
1714 621015ac 2018-07-23 stsp logmsg = logmsg0;
1716 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1718 832c249c 2018-06-10 stsp printf(" %s\n", line);
1719 832c249c 2018-06-10 stsp } while (line);
1720 621015ac 2018-07-23 stsp free(logmsg0);
1722 971751ac 2018-03-27 stsp if (show_patch) {
1723 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1724 971751ac 2018-03-27 stsp if (err == 0)
1725 971751ac 2018-03-27 stsp printf("\n");
1728 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1729 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1730 07862c20 2018-09-15 stsp return err;
1733 f42b1b34 2018-03-12 stsp static const struct got_error *
1734 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1735 a2687442 2019-11-30 kn char *path, int show_patch, char *search_pattern, int diff_context,
1736 a2687442 2019-11-30 kn int limit, int first_parent_traversal, struct got_reflist_head *refs)
1738 f42b1b34 2018-03-12 stsp const struct got_error *err;
1739 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1740 6841bf13 2019-11-29 kn regex_t regex;
1741 6841bf13 2019-11-29 kn int have_match;
1743 6841bf13 2019-11-29 kn if (search_pattern &&
1744 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1745 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1747 31cedeaf 2018-09-15 stsp err = got_commit_graph_open(&graph, root_id, path,
1748 31cedeaf 2018-09-15 stsp first_parent_traversal, repo);
1750 f42b1b34 2018-03-12 stsp return err;
1751 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1752 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1754 fcc85cad 2018-07-22 stsp goto done;
1756 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1757 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1759 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1762 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1763 372ccdbb 2018-06-10 stsp if (err) {
1764 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
1765 9ba79e04 2018-06-11 stsp err = NULL;
1768 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1770 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
1771 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1777 b43fbaa0 2018-06-11 stsp if (id == NULL)
1780 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1784 6841bf13 2019-11-29 kn if (search_pattern) {
1785 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
1787 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1790 6841bf13 2019-11-29 kn if (have_match == 0) {
1791 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1796 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1797 44392932 2019-08-25 stsp diff_context, refs);
1798 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1799 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1803 6841bf13 2019-11-29 kn if (search_pattern)
1804 6841bf13 2019-11-29 kn regfree(®ex);
1805 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1806 f42b1b34 2018-03-12 stsp return err;
1809 4ed7e80c 2018-05-20 stsp __dead static void
1810 6f3d1eb0 2018-03-12 stsp usage_log(void)
1812 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1813 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1817 b1ebc001 2019-08-13 stsp static int
1818 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1820 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1821 b1ebc001 2019-08-13 stsp long long n;
1822 b1ebc001 2019-08-13 stsp const char *errstr;
1824 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1825 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1827 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1828 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1833 4ed7e80c 2018-05-20 stsp static const struct got_error *
1834 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1836 f42b1b34 2018-03-12 stsp const struct got_error *error;
1837 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1838 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1839 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1840 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1841 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1842 a2687442 2019-11-30 kn char *start_commit = NULL, *search_pattern = NULL;
1843 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
1844 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1845 64a96a6d 2018-04-01 stsp const char *errstr;
1846 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1848 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1850 6715a751 2018-03-16 stsp #ifndef PROFILE
1851 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1854 f42b1b34 2018-03-12 stsp err(1, "pledge");
1857 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1859 6841bf13 2019-11-29 kn while ((ch = getopt(argc, argv, "b:pc:C:l:fr:s:")) != -1) {
1860 79109fed 2018-03-27 stsp switch (ch) {
1862 79109fed 2018-03-27 stsp show_patch = 1;
1865 d142fc45 2018-04-01 stsp start_commit = optarg;
1868 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1870 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1871 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1874 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1875 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1876 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1879 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1882 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1883 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1884 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1886 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1889 6841bf13 2019-11-29 kn search_pattern = optarg;
1892 2deda0b9 2019-03-07 stsp usage_log();
1893 79109fed 2018-03-27 stsp /* NOTREACHED */
1897 79109fed 2018-03-27 stsp argc -= optind;
1898 79109fed 2018-03-27 stsp argv += optind;
1900 dc1edbfa 2019-11-29 kn if (diff_context == -1)
1901 dc1edbfa 2019-11-29 kn diff_context = 3;
1902 dc1edbfa 2019-11-29 kn else if (!show_patch)
1903 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
1905 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1906 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1907 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1908 04ca23f4 2018-07-16 stsp goto done;
1911 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1912 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1913 cffc0aa4 2019-02-05 stsp goto done;
1914 cffc0aa4 2019-02-05 stsp error = NULL;
1916 e7301579 2019-03-18 stsp if (argc == 0) {
1917 cbd1af7a 2019-03-18 stsp path = strdup("");
1918 e7301579 2019-03-18 stsp if (path == NULL) {
1919 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1920 cbd1af7a 2019-03-18 stsp goto done;
1922 e7301579 2019-03-18 stsp } else if (argc == 1) {
1923 e7301579 2019-03-18 stsp if (worktree) {
1924 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1926 e7301579 2019-03-18 stsp if (error)
1927 e7301579 2019-03-18 stsp goto done;
1929 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1930 e7301579 2019-03-18 stsp if (path == NULL) {
1931 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1932 e7301579 2019-03-18 stsp goto done;
1936 cbd1af7a 2019-03-18 stsp usage_log();
1938 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1939 5486daa2 2019-05-11 stsp repo_path = worktree ?
1940 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1942 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1943 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1944 cffc0aa4 2019-02-05 stsp goto done;
1947 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1948 d7d4f210 2018-03-12 stsp if (error != NULL)
1949 04ca23f4 2018-07-16 stsp goto done;
1951 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1952 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1953 c02c541e 2019-03-29 stsp if (error)
1954 c02c541e 2019-03-29 stsp goto done;
1956 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1957 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1958 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1959 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1960 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1961 3235492e 2018-04-01 stsp if (error != NULL)
1962 3235492e 2018-04-01 stsp return error;
1963 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1964 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1965 3235492e 2018-04-01 stsp if (error != NULL)
1966 3235492e 2018-04-01 stsp return error;
1967 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1969 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1970 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1971 3235492e 2018-04-01 stsp if (error == NULL) {
1972 1caad61b 2019-02-01 stsp int obj_type;
1973 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1974 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1975 d1f2edc9 2018-06-13 stsp if (error != NULL)
1976 1caad61b 2019-02-01 stsp goto done;
1977 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1978 1caad61b 2019-02-01 stsp if (error != NULL)
1979 1caad61b 2019-02-01 stsp goto done;
1980 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1981 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1982 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
1983 1caad61b 2019-02-01 stsp if (error != NULL)
1984 1caad61b 2019-02-01 stsp goto done;
1985 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
1986 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1987 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1988 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1989 1caad61b 2019-02-01 stsp goto done;
1992 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1993 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1994 1caad61b 2019-02-01 stsp if (id == NULL)
1995 638f9024 2019-05-13 stsp error = got_error_from_errno(
1996 230a42bd 2019-05-11 jcs "got_object_id_dup");
1997 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1998 1caad61b 2019-02-01 stsp if (error)
1999 1caad61b 2019-02-01 stsp goto done;
2000 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2001 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2002 1caad61b 2019-02-01 stsp goto done;
2004 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2005 d1f2edc9 2018-06-13 stsp if (error != NULL)
2006 1caad61b 2019-02-01 stsp goto done;
2008 15a94983 2018-12-23 stsp if (commit == NULL) {
2009 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2010 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2011 d1f2edc9 2018-06-13 stsp if (error != NULL)
2012 d1f2edc9 2018-06-13 stsp return error;
2015 d7d4f210 2018-03-12 stsp if (error != NULL)
2016 04ca23f4 2018-07-16 stsp goto done;
2018 deeabeae 2019-08-27 stsp if (worktree) {
2019 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2021 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2022 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2023 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2024 deeabeae 2019-08-27 stsp goto done;
2026 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2029 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2030 04ca23f4 2018-07-16 stsp if (error != NULL)
2031 04ca23f4 2018-07-16 stsp goto done;
2032 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2033 04ca23f4 2018-07-16 stsp free(path);
2034 04ca23f4 2018-07-16 stsp path = in_repo_path;
2037 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2038 199a4027 2019-02-02 stsp if (error)
2039 199a4027 2019-02-02 stsp goto done;
2041 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2042 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
2044 04ca23f4 2018-07-16 stsp free(path);
2045 04ca23f4 2018-07-16 stsp free(repo_path);
2046 04ca23f4 2018-07-16 stsp free(cwd);
2048 cffc0aa4 2019-02-05 stsp if (worktree)
2049 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2050 ad242220 2018-09-08 stsp if (repo) {
2051 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2052 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2053 ad242220 2018-09-08 stsp if (error == NULL)
2054 ad242220 2018-09-08 stsp error = repo_error;
2056 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2057 8bf5b3c9 2018-03-17 stsp return error;
2060 4ed7e80c 2018-05-20 stsp __dead static void
2061 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2063 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2064 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2068 b72f483a 2019-02-05 stsp struct print_diff_arg {
2069 b72f483a 2019-02-05 stsp struct got_repository *repo;
2070 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2071 b72f483a 2019-02-05 stsp int diff_context;
2072 3fc0c068 2019-02-10 stsp const char *id_str;
2073 3fc0c068 2019-02-10 stsp int header_shown;
2074 98eaaa12 2019-08-03 stsp int diff_staged;
2075 63035f9f 2019-10-06 stsp int ignore_whitespace;
2078 4ed7e80c 2018-05-20 stsp static const struct got_error *
2079 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2080 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2081 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2083 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2084 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2085 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2086 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2087 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2088 b72f483a 2019-02-05 stsp struct stat sb;
2090 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2091 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2092 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2093 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2094 98eaaa12 2019-08-03 stsp return NULL;
2096 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2097 98eaaa12 2019-08-03 stsp return NULL;
2098 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2099 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2100 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2101 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2102 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2103 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2104 98eaaa12 2019-08-03 stsp return NULL;
2107 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2108 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2109 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2110 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2111 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2114 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2115 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2116 98eaaa12 2019-08-03 stsp switch (staged_status) {
2117 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2118 98eaaa12 2019-08-03 stsp label1 = path;
2119 98eaaa12 2019-08-03 stsp label2 = path;
2121 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2122 98eaaa12 2019-08-03 stsp label2 = path;
2124 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2125 98eaaa12 2019-08-03 stsp label1 = path;
2128 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2130 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2131 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2132 63035f9f 2019-10-06 stsp a->repo, stdout);
2135 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2136 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2137 4ce46740 2019-08-08 stsp char *id_str;
2138 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2141 4ce46740 2019-08-08 stsp goto done;
2142 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2144 4ce46740 2019-08-08 stsp goto done;
2145 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2146 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2147 4ce46740 2019-08-08 stsp free(id_str);
2148 4ce46740 2019-08-08 stsp goto done;
2150 4ce46740 2019-08-08 stsp free(id_str);
2151 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2152 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2154 4ce46740 2019-08-08 stsp goto done;
2157 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2158 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2159 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2160 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2161 2ec1f75b 2019-03-26 stsp goto done;
2164 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
2165 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
2166 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
2167 2ec1f75b 2019-03-26 stsp goto done;
2169 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
2170 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
2171 2ec1f75b 2019-03-26 stsp goto done;
2174 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2176 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2177 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2179 b72f483a 2019-02-05 stsp if (blob1)
2180 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2181 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
2182 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2183 b72f483a 2019-02-05 stsp free(abspath);
2184 927df6b7 2019-02-10 stsp return err;
2187 927df6b7 2019-02-10 stsp static const struct got_error *
2188 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2189 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2190 01073a5d 2019-08-22 stsp struct got_repository *repo)
2192 0adb7196 2019-08-11 stsp const struct got_error *err;
2193 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2194 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2196 0adb7196 2019-08-11 stsp *id = NULL;
2197 0adb7196 2019-08-11 stsp *label = NULL;
2199 01073a5d 2019-08-22 stsp if (resolve_tags) {
2200 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2202 01073a5d 2019-08-22 stsp if (err == NULL) {
2203 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2204 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2205 01073a5d 2019-08-22 stsp if (*id == NULL)
2206 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2207 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2208 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2209 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2210 32f0ab81 2019-08-28 hiltjo free(*id);
2211 01073a5d 2019-08-22 stsp *id = NULL;
2213 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2214 01073a5d 2019-08-22 stsp return err;
2215 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2216 01073a5d 2019-08-22 stsp return err;
2219 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2220 0adb7196 2019-08-11 stsp if (err) {
2221 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2222 0adb7196 2019-08-11 stsp return err;
2223 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2224 0adb7196 2019-08-11 stsp if (err != NULL)
2225 0adb7196 2019-08-11 stsp goto done;
2226 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2227 0adb7196 2019-08-11 stsp if (*label == NULL) {
2228 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2229 0adb7196 2019-08-11 stsp goto done;
2231 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2233 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2234 0adb7196 2019-08-11 stsp if (*label == NULL) {
2235 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2236 0adb7196 2019-08-11 stsp goto done;
2241 0adb7196 2019-08-11 stsp got_ref_close(ref);
2242 0adb7196 2019-08-11 stsp return err;
2246 0adb7196 2019-08-11 stsp static const struct got_error *
2247 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2249 b00d56cd 2018-04-01 stsp const struct got_error *error;
2250 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2251 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2252 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2253 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2254 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2255 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2256 15a94983 2018-12-23 stsp int type1, type2;
2257 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2258 c0cc5c62 2018-10-18 stsp const char *errstr;
2259 927df6b7 2019-02-10 stsp char *path = NULL;
2261 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2262 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2263 25eccc22 2019-01-04 stsp NULL) == -1)
2264 b00d56cd 2018-04-01 stsp err(1, "pledge");
2267 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2268 b00d56cd 2018-04-01 stsp switch (ch) {
2270 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2272 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2273 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2276 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2277 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2278 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2280 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2283 98eaaa12 2019-08-03 stsp diff_staged = 1;
2286 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2289 2deda0b9 2019-03-07 stsp usage_diff();
2290 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2294 b00d56cd 2018-04-01 stsp argc -= optind;
2295 b00d56cd 2018-04-01 stsp argv += optind;
2297 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2298 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2299 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2300 b72f483a 2019-02-05 stsp goto done;
2302 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2303 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2304 927df6b7 2019-02-10 stsp goto done;
2305 927df6b7 2019-02-10 stsp if (argc <= 1) {
2306 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2307 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2308 927df6b7 2019-02-10 stsp goto done;
2310 b72f483a 2019-02-05 stsp if (repo_path)
2312 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2313 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2314 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2315 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2316 927df6b7 2019-02-10 stsp goto done;
2318 927df6b7 2019-02-10 stsp if (argc == 1) {
2319 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2321 927df6b7 2019-02-10 stsp if (error)
2322 927df6b7 2019-02-10 stsp goto done;
2324 927df6b7 2019-02-10 stsp path = strdup("");
2325 927df6b7 2019-02-10 stsp if (path == NULL) {
2326 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2327 927df6b7 2019-02-10 stsp goto done;
2330 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2331 98eaaa12 2019-08-03 stsp if (diff_staged)
2332 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2333 98eaaa12 2019-08-03 stsp "objects in repository");
2334 15a94983 2018-12-23 stsp id_str1 = argv[0];
2335 15a94983 2018-12-23 stsp id_str2 = argv[1];
2336 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2337 30db809c 2019-06-05 stsp repo_path =
2338 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2339 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2340 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2341 30db809c 2019-06-05 stsp goto done;
2345 b00d56cd 2018-04-01 stsp usage_diff();
2347 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2348 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2349 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2350 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2353 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2354 76089277 2018-04-01 stsp free(repo_path);
2355 b00d56cd 2018-04-01 stsp if (error != NULL)
2356 b00d56cd 2018-04-01 stsp goto done;
2358 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2359 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2360 c02c541e 2019-03-29 stsp if (error)
2361 c02c541e 2019-03-29 stsp goto done;
2363 30db809c 2019-06-05 stsp if (argc <= 1) {
2364 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2365 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2366 b72f483a 2019-02-05 stsp char *id_str;
2368 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2370 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2371 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2372 b72f483a 2019-02-05 stsp if (error)
2373 b72f483a 2019-02-05 stsp goto done;
2374 b72f483a 2019-02-05 stsp arg.repo = repo;
2375 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2376 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2377 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2378 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2379 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2380 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2382 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2383 72ea6654 2019-07-27 stsp if (error)
2384 72ea6654 2019-07-27 stsp goto done;
2386 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2387 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2388 b72f483a 2019-02-05 stsp free(id_str);
2389 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2390 b72f483a 2019-02-05 stsp goto done;
2393 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2395 0adb7196 2019-08-11 stsp if (error)
2396 0adb7196 2019-08-11 stsp goto done;
2398 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2400 0adb7196 2019-08-11 stsp if (error)
2401 0adb7196 2019-08-11 stsp goto done;
2403 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2404 15a94983 2018-12-23 stsp if (error)
2405 15a94983 2018-12-23 stsp goto done;
2407 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2408 15a94983 2018-12-23 stsp if (error)
2409 15a94983 2018-12-23 stsp goto done;
2411 15a94983 2018-12-23 stsp if (type1 != type2) {
2412 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2413 b00d56cd 2018-04-01 stsp goto done;
2416 15a94983 2018-12-23 stsp switch (type1) {
2417 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2418 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2419 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2421 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2422 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2423 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2425 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2426 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2427 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2428 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2431 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2435 5e70831e 2019-05-28 stsp free(label1);
2436 5e70831e 2019-05-28 stsp free(label2);
2437 15a94983 2018-12-23 stsp free(id1);
2438 15a94983 2018-12-23 stsp free(id2);
2439 927df6b7 2019-02-10 stsp free(path);
2440 b72f483a 2019-02-05 stsp if (worktree)
2441 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2442 ad242220 2018-09-08 stsp if (repo) {
2443 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2444 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2445 ad242220 2018-09-08 stsp if (error == NULL)
2446 ad242220 2018-09-08 stsp error = repo_error;
2448 b00d56cd 2018-04-01 stsp return error;
2451 404c43c4 2018-06-21 stsp __dead static void
2452 404c43c4 2018-06-21 stsp usage_blame(void)
2454 9270e621 2019-02-05 stsp fprintf(stderr,
2455 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2456 404c43c4 2018-06-21 stsp getprogname());
2460 28315671 2019-08-14 stsp struct blame_line {
2461 28315671 2019-08-14 stsp int annotated;
2462 28315671 2019-08-14 stsp char *id_str;
2463 82f6abb8 2019-08-14 stsp char *committer;
2464 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2467 28315671 2019-08-14 stsp struct blame_cb_args {
2468 28315671 2019-08-14 stsp struct blame_line *lines;
2469 28315671 2019-08-14 stsp int nlines;
2470 7ef28ff8 2019-08-14 stsp int nlines_prec;
2471 28315671 2019-08-14 stsp int lineno_cur;
2472 28315671 2019-08-14 stsp off_t *line_offsets;
2474 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2477 404c43c4 2018-06-21 stsp static const struct got_error *
2478 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2480 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2481 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2482 28315671 2019-08-14 stsp struct blame_line *bline;
2483 82f6abb8 2019-08-14 stsp char *line = NULL;
2484 28315671 2019-08-14 stsp size_t linesize = 0;
2485 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2486 28315671 2019-08-14 stsp off_t offset;
2487 bcb49d15 2019-08-14 stsp struct tm tm;
2488 bcb49d15 2019-08-14 stsp time_t committer_time;
2490 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2491 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2492 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2494 28315671 2019-08-14 stsp if (sigint_received)
2495 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2497 2839f8b9 2019-08-18 stsp if (lineno == -1)
2498 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2500 28315671 2019-08-14 stsp /* Annotate this line. */
2501 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2502 28315671 2019-08-14 stsp if (bline->annotated)
2503 28315671 2019-08-14 stsp return NULL;
2504 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2506 28315671 2019-08-14 stsp return err;
2508 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2510 82f6abb8 2019-08-14 stsp goto done;
2512 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2513 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2514 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2515 bcb49d15 2019-08-14 stsp goto done;
2518 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2519 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2520 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2521 11db6024 2019-10-21 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G/%m/%d",
2522 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2523 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2524 82f6abb8 2019-08-14 stsp goto done;
2526 28315671 2019-08-14 stsp bline->annotated = 1;
2528 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2529 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2530 28315671 2019-08-14 stsp if (!bline->annotated)
2531 82f6abb8 2019-08-14 stsp goto done;
2533 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2534 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2535 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2536 82f6abb8 2019-08-14 stsp goto done;
2539 28315671 2019-08-14 stsp while (bline->annotated) {
2540 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2541 82f6abb8 2019-08-14 stsp size_t len;
2543 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2544 28315671 2019-08-14 stsp if (ferror(a->f))
2545 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2549 82f6abb8 2019-08-14 stsp committer = bline->committer;
2550 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2551 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2552 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2553 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2555 82f6abb8 2019-08-14 stsp *at = '\0';
2556 82f6abb8 2019-08-14 stsp len = strlen(committer);
2557 82f6abb8 2019-08-14 stsp if (len >= 9)
2558 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2560 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2562 28315671 2019-08-14 stsp *nl = '\0';
2563 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2564 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2566 28315671 2019-08-14 stsp a->lineno_cur++;
2567 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2570 82f6abb8 2019-08-14 stsp if (commit)
2571 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2572 28315671 2019-08-14 stsp free(line);
2573 28315671 2019-08-14 stsp return err;
2576 28315671 2019-08-14 stsp static const struct got_error *
2577 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2579 404c43c4 2018-06-21 stsp const struct got_error *error;
2580 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2581 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2582 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2583 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2584 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2585 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2586 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2587 28315671 2019-08-14 stsp struct blame_cb_args bca;
2588 28315671 2019-08-14 stsp int ch, obj_type, i;
2589 b02560ec 2019-08-19 stsp size_t filesize;
2591 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2593 404c43c4 2018-06-21 stsp #ifndef PROFILE
2594 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2595 36e2fb66 2019-01-04 stsp NULL) == -1)
2596 404c43c4 2018-06-21 stsp err(1, "pledge");
2599 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2600 404c43c4 2018-06-21 stsp switch (ch) {
2602 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2605 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2606 66bea077 2018-08-02 stsp if (repo_path == NULL)
2607 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2609 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2612 2deda0b9 2019-03-07 stsp usage_blame();
2613 404c43c4 2018-06-21 stsp /* NOTREACHED */
2617 404c43c4 2018-06-21 stsp argc -= optind;
2618 404c43c4 2018-06-21 stsp argv += optind;
2620 a39318fd 2018-08-02 stsp if (argc == 1)
2621 404c43c4 2018-06-21 stsp path = argv[0];
2623 404c43c4 2018-06-21 stsp usage_blame();
2625 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2626 66bea077 2018-08-02 stsp if (cwd == NULL) {
2627 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2628 66bea077 2018-08-02 stsp goto done;
2630 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2631 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2632 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2633 66bea077 2018-08-02 stsp goto done;
2635 0c06baac 2019-02-05 stsp error = NULL;
2636 0c06baac 2019-02-05 stsp if (worktree) {
2637 0c06baac 2019-02-05 stsp repo_path =
2638 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2639 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2640 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2641 0c06baac 2019-02-05 stsp if (error)
2642 0c06baac 2019-02-05 stsp goto done;
2644 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2645 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2646 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2647 0c06baac 2019-02-05 stsp goto done;
2652 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2653 c02c541e 2019-03-29 stsp if (error != NULL)
2654 36e2fb66 2019-01-04 stsp goto done;
2656 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2657 c02c541e 2019-03-29 stsp if (error)
2658 404c43c4 2018-06-21 stsp goto done;
2660 0c06baac 2019-02-05 stsp if (worktree) {
2661 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2662 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2663 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2664 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2665 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2666 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2667 6efaaa2d 2019-02-05 stsp path) == -1) {
2668 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2669 0c06baac 2019-02-05 stsp goto done;
2671 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2674 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2676 0c06baac 2019-02-05 stsp if (error)
2677 66bea077 2018-08-02 stsp goto done;
2679 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2680 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2681 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2682 404c43c4 2018-06-21 stsp if (error != NULL)
2683 66bea077 2018-08-02 stsp goto done;
2684 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2685 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2686 404c43c4 2018-06-21 stsp if (error != NULL)
2687 66bea077 2018-08-02 stsp goto done;
2689 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2690 30837e32 2019-07-25 stsp if (error)
2691 66bea077 2018-08-02 stsp goto done;
2694 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2695 28315671 2019-08-14 stsp if (error)
2696 28315671 2019-08-14 stsp goto done;
2697 28315671 2019-08-14 stsp if (obj_id == NULL) {
2698 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2699 28315671 2019-08-14 stsp goto done;
2702 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2703 28315671 2019-08-14 stsp if (error)
2704 28315671 2019-08-14 stsp goto done;
2706 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2707 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2708 28315671 2019-08-14 stsp goto done;
2711 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2712 28315671 2019-08-14 stsp if (error)
2713 28315671 2019-08-14 stsp goto done;
2714 28315671 2019-08-14 stsp bca.f = got_opentemp();
2715 28315671 2019-08-14 stsp if (bca.f == NULL) {
2716 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2717 28315671 2019-08-14 stsp goto done;
2719 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2720 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2721 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2722 28315671 2019-08-14 stsp goto done;
2724 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2725 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2726 b02560ec 2019-08-19 stsp bca.nlines--;
2728 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2729 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2730 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2731 28315671 2019-08-14 stsp goto done;
2733 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2734 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2735 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2736 7ef28ff8 2019-08-14 stsp while (i > 0) {
2738 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2740 82f6abb8 2019-08-14 stsp bca.repo = repo;
2742 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2743 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2744 28315671 2019-08-14 stsp if (error)
2745 28315671 2019-08-14 stsp goto done;
2747 66bea077 2018-08-02 stsp free(in_repo_path);
2748 66bea077 2018-08-02 stsp free(repo_path);
2749 66bea077 2018-08-02 stsp free(cwd);
2750 404c43c4 2018-06-21 stsp free(commit_id);
2751 28315671 2019-08-14 stsp free(obj_id);
2753 28315671 2019-08-14 stsp got_object_blob_close(blob);
2754 0c06baac 2019-02-05 stsp if (worktree)
2755 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2756 ad242220 2018-09-08 stsp if (repo) {
2757 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2758 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2759 ad242220 2018-09-08 stsp if (error == NULL)
2760 ad242220 2018-09-08 stsp error = repo_error;
2762 3affba96 2019-09-22 stsp if (bca.lines) {
2763 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2764 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2765 3affba96 2019-09-22 stsp free(bline->id_str);
2766 3affba96 2019-09-22 stsp free(bline->committer);
2768 3affba96 2019-09-22 stsp free(bca.lines);
2770 28315671 2019-08-14 stsp free(bca.line_offsets);
2771 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2772 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2773 404c43c4 2018-06-21 stsp return error;
2776 5de5890b 2018-10-18 stsp __dead static void
2777 5de5890b 2018-10-18 stsp usage_tree(void)
2779 c1669e2e 2019-01-09 stsp fprintf(stderr,
2780 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2781 5de5890b 2018-10-18 stsp getprogname());
2785 c1669e2e 2019-01-09 stsp static void
2786 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2787 c1669e2e 2019-01-09 stsp const char *root_path)
2789 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2790 848d6979 2019-08-12 stsp const char *modestr = "";
2791 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2793 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2794 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2797 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2798 63c5ca5d 2019-08-24 stsp modestr = "$";
2799 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2800 848d6979 2019-08-12 stsp modestr = "@";
2801 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2802 848d6979 2019-08-12 stsp modestr = "/";
2803 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2804 848d6979 2019-08-12 stsp modestr = "*";
2806 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2807 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2810 5de5890b 2018-10-18 stsp static const struct got_error *
2811 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2812 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2813 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2815 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2816 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2817 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2818 56e0773d 2019-11-28 stsp int nentries, i;
2820 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2822 5de5890b 2018-10-18 stsp goto done;
2824 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2826 5de5890b 2018-10-18 stsp goto done;
2827 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2828 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2829 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2830 5de5890b 2018-10-18 stsp char *id = NULL;
2832 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2835 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2836 5de5890b 2018-10-18 stsp if (show_ids) {
2837 5de5890b 2018-10-18 stsp char *id_str;
2838 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2839 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2841 5de5890b 2018-10-18 stsp goto done;
2842 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2843 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2844 5de5890b 2018-10-18 stsp free(id_str);
2845 5de5890b 2018-10-18 stsp goto done;
2847 5de5890b 2018-10-18 stsp free(id_str);
2849 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2852 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2853 c1669e2e 2019-01-09 stsp char *child_path;
2854 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2855 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2856 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2857 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2858 c1669e2e 2019-01-09 stsp goto done;
2860 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2861 c1669e2e 2019-01-09 stsp root_path, repo);
2862 c1669e2e 2019-01-09 stsp free(child_path);
2864 c1669e2e 2019-01-09 stsp goto done;
2869 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2870 5de5890b 2018-10-18 stsp free(tree_id);
2871 5de5890b 2018-10-18 stsp return err;
2874 5de5890b 2018-10-18 stsp static const struct got_error *
2875 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2877 5de5890b 2018-10-18 stsp const struct got_error *error;
2878 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2879 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2880 7a2c19d6 2019-02-05 stsp const char *path;
2881 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2882 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2883 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2884 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2887 5de5890b 2018-10-18 stsp #ifndef PROFILE
2888 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2889 0f8d269b 2019-01-04 stsp NULL) == -1)
2890 5de5890b 2018-10-18 stsp err(1, "pledge");
2893 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2894 5de5890b 2018-10-18 stsp switch (ch) {
2896 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2899 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2900 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2901 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2903 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2906 5de5890b 2018-10-18 stsp show_ids = 1;
2909 c1669e2e 2019-01-09 stsp recurse = 1;
2912 2deda0b9 2019-03-07 stsp usage_tree();
2913 5de5890b 2018-10-18 stsp /* NOTREACHED */
2917 5de5890b 2018-10-18 stsp argc -= optind;
2918 5de5890b 2018-10-18 stsp argv += optind;
2920 5de5890b 2018-10-18 stsp if (argc == 1)
2921 5de5890b 2018-10-18 stsp path = argv[0];
2922 5de5890b 2018-10-18 stsp else if (argc > 1)
2923 5de5890b 2018-10-18 stsp usage_tree();
2925 7a2c19d6 2019-02-05 stsp path = NULL;
2927 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2928 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2929 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2930 9bf7a39b 2019-02-05 stsp goto done;
2932 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2933 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2934 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2935 7a2c19d6 2019-02-05 stsp goto done;
2937 7a2c19d6 2019-02-05 stsp error = NULL;
2938 7a2c19d6 2019-02-05 stsp if (worktree) {
2939 7a2c19d6 2019-02-05 stsp repo_path =
2940 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2941 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2942 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2943 7a2c19d6 2019-02-05 stsp if (error)
2944 7a2c19d6 2019-02-05 stsp goto done;
2946 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2947 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2948 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2949 7a2c19d6 2019-02-05 stsp goto done;
2954 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2955 5de5890b 2018-10-18 stsp if (error != NULL)
2956 c02c541e 2019-03-29 stsp goto done;
2958 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2959 c02c541e 2019-03-29 stsp if (error)
2960 5de5890b 2018-10-18 stsp goto done;
2962 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2963 9bf7a39b 2019-02-05 stsp if (worktree) {
2964 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2965 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2966 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2967 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2968 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2969 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2970 9bf7a39b 2019-02-05 stsp goto done;
2972 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2974 9bf7a39b 2019-02-05 stsp if (error)
2975 9bf7a39b 2019-02-05 stsp goto done;
2977 9bf7a39b 2019-02-05 stsp path = "/";
2979 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2980 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2981 9bf7a39b 2019-02-05 stsp if (error != NULL)
2982 9bf7a39b 2019-02-05 stsp goto done;
2985 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2986 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2987 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2988 5de5890b 2018-10-18 stsp if (error != NULL)
2989 5de5890b 2018-10-18 stsp goto done;
2990 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2991 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2992 5de5890b 2018-10-18 stsp if (error != NULL)
2993 5de5890b 2018-10-18 stsp goto done;
2995 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2996 30837e32 2019-07-25 stsp if (error)
2997 5de5890b 2018-10-18 stsp goto done;
3000 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3001 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3003 5de5890b 2018-10-18 stsp free(in_repo_path);
3004 5de5890b 2018-10-18 stsp free(repo_path);
3005 5de5890b 2018-10-18 stsp free(cwd);
3006 5de5890b 2018-10-18 stsp free(commit_id);
3007 7a2c19d6 2019-02-05 stsp if (worktree)
3008 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3009 5de5890b 2018-10-18 stsp if (repo) {
3010 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3011 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3012 5de5890b 2018-10-18 stsp if (error == NULL)
3013 5de5890b 2018-10-18 stsp error = repo_error;
3015 5de5890b 2018-10-18 stsp return error;
3018 6bad629b 2019-02-04 stsp __dead static void
3019 6bad629b 2019-02-04 stsp usage_status(void)
3021 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3025 b72f483a 2019-02-05 stsp static const struct got_error *
3026 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3027 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3028 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3030 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3031 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3032 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3033 b72f483a 2019-02-05 stsp return NULL;
3036 6bad629b 2019-02-04 stsp static const struct got_error *
3037 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3039 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3040 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3041 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3042 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3043 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3044 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3047 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3049 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3050 6bad629b 2019-02-04 stsp switch (ch) {
3052 2deda0b9 2019-03-07 stsp usage_status();
3053 6bad629b 2019-02-04 stsp /* NOTREACHED */
3057 6bad629b 2019-02-04 stsp argc -= optind;
3058 6bad629b 2019-02-04 stsp argv += optind;
3060 6bad629b 2019-02-04 stsp #ifndef PROFILE
3061 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3062 6bad629b 2019-02-04 stsp NULL) == -1)
3063 6bad629b 2019-02-04 stsp err(1, "pledge");
3065 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3066 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3067 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3068 927df6b7 2019-02-10 stsp goto done;
3071 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3072 927df6b7 2019-02-10 stsp if (error != NULL)
3073 a5edda0a 2019-07-27 stsp goto done;
3075 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3077 6bad629b 2019-02-04 stsp if (error != NULL)
3078 6bad629b 2019-02-04 stsp goto done;
3080 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3081 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3082 087fb88c 2019-08-04 stsp if (error)
3083 087fb88c 2019-08-04 stsp goto done;
3085 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3086 6bad629b 2019-02-04 stsp if (error)
3087 6bad629b 2019-02-04 stsp goto done;
3089 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3090 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3092 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3093 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3094 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3095 927df6b7 2019-02-10 stsp free(cwd);
3096 d0eebce4 2019-03-11 stsp return error;
3099 d0eebce4 2019-03-11 stsp __dead static void
3100 d0eebce4 2019-03-11 stsp usage_ref(void)
3102 d0eebce4 2019-03-11 stsp fprintf(stderr,
3103 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3104 d0eebce4 2019-03-11 stsp getprogname());
3108 d0eebce4 2019-03-11 stsp static const struct got_error *
3109 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3111 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3112 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3113 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3115 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3116 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3118 d0eebce4 2019-03-11 stsp return err;
3120 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3121 d0eebce4 2019-03-11 stsp char *refstr;
3122 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3123 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3124 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3125 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3126 d0eebce4 2019-03-11 stsp free(refstr);
3129 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3130 d0eebce4 2019-03-11 stsp return NULL;
3133 d0eebce4 2019-03-11 stsp static const struct got_error *
3134 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3136 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3137 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3139 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3141 d0eebce4 2019-03-11 stsp return err;
3143 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3144 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3145 d0eebce4 2019-03-11 stsp return err;
3148 d0eebce4 2019-03-11 stsp static const struct got_error *
3149 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3151 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3152 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3153 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3156 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3157 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3158 d1644381 2019-07-14 stsp * an unintended typo.
3160 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3161 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3163 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3165 d83d9d5c 2019-05-13 stsp if (err) {
3166 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3168 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3169 d83d9d5c 2019-05-13 stsp return err;
3170 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3172 d83d9d5c 2019-05-13 stsp return err;
3173 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3174 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3176 d83d9d5c 2019-05-13 stsp return err;
3179 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3181 d0eebce4 2019-03-11 stsp goto done;
3183 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3186 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3188 d1c1ae5f 2019-08-12 stsp return err;
3191 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3192 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3194 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3195 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3196 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3199 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3200 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3201 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3203 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3204 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3206 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3208 d1c1ae5f 2019-08-12 stsp return err;
3210 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3212 d1c1ae5f 2019-08-12 stsp goto done;
3214 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3216 d1c1ae5f 2019-08-12 stsp if (target_ref)
3217 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3219 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3220 d0eebce4 2019-03-11 stsp return err;
3223 d0eebce4 2019-03-11 stsp static const struct got_error *
3224 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3226 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3227 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3228 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3229 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3230 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3231 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3233 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3234 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3235 d0eebce4 2019-03-11 stsp switch (ch) {
3237 d0eebce4 2019-03-11 stsp delref = optarg;
3240 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3241 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3242 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3244 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3247 d0eebce4 2019-03-11 stsp do_list = 1;
3250 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3253 d0eebce4 2019-03-11 stsp usage_ref();
3254 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3258 d0eebce4 2019-03-11 stsp if (do_list && delref)
3259 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3261 d0eebce4 2019-03-11 stsp argc -= optind;
3262 d0eebce4 2019-03-11 stsp argv += optind;
3264 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3265 d1c1ae5f 2019-08-12 stsp if (create_symref)
3266 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3267 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3268 d0eebce4 2019-03-11 stsp if (argc > 0)
3269 d0eebce4 2019-03-11 stsp usage_ref();
3270 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3271 d0eebce4 2019-03-11 stsp usage_ref();
3273 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3274 e0b57350 2019-03-12 stsp if (do_list) {
3275 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3276 e0b57350 2019-03-12 stsp NULL) == -1)
3277 e0b57350 2019-03-12 stsp err(1, "pledge");
3279 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3280 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3281 e0b57350 2019-03-12 stsp err(1, "pledge");
3284 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3285 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3286 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3287 d0eebce4 2019-03-11 stsp goto done;
3290 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3291 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3292 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3293 d0eebce4 2019-03-11 stsp goto done;
3295 d0eebce4 2019-03-11 stsp error = NULL;
3296 d0eebce4 2019-03-11 stsp if (worktree) {
3297 d0eebce4 2019-03-11 stsp repo_path =
3298 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3299 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3300 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3301 d0eebce4 2019-03-11 stsp if (error)
3302 d0eebce4 2019-03-11 stsp goto done;
3304 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3305 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3306 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3307 d0eebce4 2019-03-11 stsp goto done;
3312 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3313 d0eebce4 2019-03-11 stsp if (error != NULL)
3314 d0eebce4 2019-03-11 stsp goto done;
3316 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3317 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3318 c02c541e 2019-03-29 stsp if (error)
3319 c02c541e 2019-03-29 stsp goto done;
3321 d0eebce4 2019-03-11 stsp if (do_list)
3322 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3323 d0eebce4 2019-03-11 stsp else if (delref)
3324 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3325 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3326 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3328 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3331 4e759de4 2019-06-26 stsp got_repo_close(repo);
3332 4e759de4 2019-06-26 stsp if (worktree)
3333 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3334 4e759de4 2019-06-26 stsp free(cwd);
3335 4e759de4 2019-06-26 stsp free(repo_path);
3336 4e759de4 2019-06-26 stsp return error;
3339 4e759de4 2019-06-26 stsp __dead static void
3340 4e759de4 2019-06-26 stsp usage_branch(void)
3342 4e759de4 2019-06-26 stsp fprintf(stderr,
3343 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3344 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3348 4e759de4 2019-06-26 stsp static const struct got_error *
3349 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3350 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3352 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3353 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3354 4e99b47e 2019-10-04 stsp char *refstr;
3356 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3357 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3358 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3359 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3361 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3363 4e99b47e 2019-10-04 stsp return err;
3364 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3365 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3366 4e99b47e 2019-10-04 stsp marker = "* ";
3368 4e99b47e 2019-10-04 stsp marker = "~ ";
3372 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3373 4e99b47e 2019-10-04 stsp refname += 11;
3374 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3375 4e99b47e 2019-10-04 stsp refname += 18;
3377 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3378 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3379 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3381 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3382 4e99b47e 2019-10-04 stsp free(refstr);
3383 4e99b47e 2019-10-04 stsp return NULL;
3386 4e99b47e 2019-10-04 stsp static const struct got_error *
3387 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3389 ad89fa31 2019-10-04 stsp const char *refname;
3391 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3392 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3394 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3396 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3397 ad89fa31 2019-10-04 stsp refname += 11;
3398 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3399 ad89fa31 2019-10-04 stsp refname += 18;
3401 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3403 ad89fa31 2019-10-04 stsp return NULL;
3406 ad89fa31 2019-10-04 stsp static const struct got_error *
3407 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3409 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3410 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3411 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3412 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3413 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3415 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3417 4e99b47e 2019-10-04 stsp if (worktree) {
3418 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3419 4e99b47e 2019-10-04 stsp worktree);
3421 4e99b47e 2019-10-04 stsp return err;
3423 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3424 4e99b47e 2019-10-04 stsp worktree);
3426 4e99b47e 2019-10-04 stsp return err;
3428 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3429 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3430 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3432 4e99b47e 2019-10-04 stsp return err;
3433 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3434 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3438 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3439 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3441 4e759de4 2019-06-26 stsp return err;
3443 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3444 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3446 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3447 4e759de4 2019-06-26 stsp return NULL;
3450 4e759de4 2019-06-26 stsp static const struct got_error *
3451 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3452 45cd4e47 2019-08-25 stsp const char *branch_name)
3454 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3455 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3456 4e759de4 2019-06-26 stsp char *refname;
3458 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3459 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3461 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3463 4e759de4 2019-06-26 stsp goto done;
3465 45cd4e47 2019-08-25 stsp if (worktree &&
3466 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3467 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3468 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3469 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3470 45cd4e47 2019-08-25 stsp goto done;
3473 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3476 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3477 4e759de4 2019-06-26 stsp free(refname);
3478 4e759de4 2019-06-26 stsp return err;
3481 4e759de4 2019-06-26 stsp static const struct got_error *
3482 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3483 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3485 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3486 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3487 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3490 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3491 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3492 d3f84d51 2019-07-11 stsp * an unintended typo.
3494 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3495 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3497 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3498 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3499 4e759de4 2019-06-26 stsp goto done;
3502 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3503 4e759de4 2019-06-26 stsp if (err == NULL) {
3504 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3505 4e759de4 2019-06-26 stsp goto done;
3506 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3507 4e759de4 2019-06-26 stsp goto done;
3509 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3511 4e759de4 2019-06-26 stsp goto done;
3513 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3516 4e759de4 2019-06-26 stsp got_ref_close(ref);
3517 4e759de4 2019-06-26 stsp free(base_refname);
3518 4e759de4 2019-06-26 stsp free(refname);
3519 4e759de4 2019-06-26 stsp return err;
3522 4e759de4 2019-06-26 stsp static const struct got_error *
3523 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3525 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3526 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3527 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3528 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3529 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3530 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3532 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3533 4e759de4 2019-06-26 stsp switch (ch) {
3535 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3538 4e759de4 2019-06-26 stsp delref = optarg;
3541 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3542 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3543 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3545 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3548 4e759de4 2019-06-26 stsp do_list = 1;
3551 4e759de4 2019-06-26 stsp usage_branch();
3552 4e759de4 2019-06-26 stsp /* NOTREACHED */
3556 4e759de4 2019-06-26 stsp if (do_list && delref)
3557 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3559 4e759de4 2019-06-26 stsp argc -= optind;
3560 4e759de4 2019-06-26 stsp argv += optind;
3562 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3563 ad89fa31 2019-10-04 stsp do_show = 1;
3565 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3566 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3568 4e759de4 2019-06-26 stsp if (do_list || delref) {
3569 4e759de4 2019-06-26 stsp if (argc > 0)
3570 4e759de4 2019-06-26 stsp usage_branch();
3571 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3572 4e759de4 2019-06-26 stsp usage_branch();
3574 4e759de4 2019-06-26 stsp #ifndef PROFILE
3575 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3576 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3577 4e759de4 2019-06-26 stsp NULL) == -1)
3578 4e759de4 2019-06-26 stsp err(1, "pledge");
3580 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3581 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3582 4e759de4 2019-06-26 stsp err(1, "pledge");
3585 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3586 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3587 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3588 4e759de4 2019-06-26 stsp goto done;
3591 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3592 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3593 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3594 4e759de4 2019-06-26 stsp goto done;
3596 4e759de4 2019-06-26 stsp error = NULL;
3597 4e759de4 2019-06-26 stsp if (worktree) {
3598 4e759de4 2019-06-26 stsp repo_path =
3599 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3600 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3601 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3602 4e759de4 2019-06-26 stsp if (error)
3603 4e759de4 2019-06-26 stsp goto done;
3605 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3606 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3607 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3608 4e759de4 2019-06-26 stsp goto done;
3613 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3614 4e759de4 2019-06-26 stsp if (error != NULL)
3615 4e759de4 2019-06-26 stsp goto done;
3617 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3618 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3619 4e759de4 2019-06-26 stsp if (error)
3620 4e759de4 2019-06-26 stsp goto done;
3622 ad89fa31 2019-10-04 stsp if (do_show)
3623 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3624 ad89fa31 2019-10-04 stsp else if (do_list)
3625 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3626 4e759de4 2019-06-26 stsp else if (delref)
3627 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3629 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3630 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3631 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3632 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3633 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3634 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3635 a74f7e83 2019-11-10 stsp if (error)
3636 a74f7e83 2019-11-10 stsp goto done;
3637 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3638 a74f7e83 2019-11-10 stsp free(commit_id);
3642 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3643 d0eebce4 2019-03-11 stsp if (worktree)
3644 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3645 d0eebce4 2019-03-11 stsp free(cwd);
3646 d0eebce4 2019-03-11 stsp free(repo_path);
3647 d00136be 2019-03-26 stsp return error;
3651 d00136be 2019-03-26 stsp __dead static void
3652 8e7bd50a 2019-08-22 stsp usage_tag(void)
3654 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3655 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3656 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3661 b8bad2ba 2019-08-23 stsp static const struct got_error *
3662 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3664 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3665 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3666 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3667 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3668 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3670 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3671 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3672 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3673 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3675 b8bad2ba 2019-08-23 stsp return err;
3676 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3679 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3682 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3683 b8bad2ba 2019-08-23 stsp free(re_id);
3686 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3687 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3690 b8bad2ba 2019-08-23 stsp while (se) {
3691 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3694 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3695 b8bad2ba 2019-08-23 stsp free(se_id);
3698 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3699 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3701 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3702 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3704 b8bad2ba 2019-08-23 stsp return err;
3705 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3708 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3713 b8bad2ba 2019-08-23 stsp return err;
3717 8e7bd50a 2019-08-22 stsp static const struct got_error *
3718 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3719 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3721 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3722 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3723 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3724 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3725 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3729 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3731 b8bad2ba 2019-08-23 stsp return err;
3732 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3734 b8bad2ba 2019-08-23 stsp goto done;
3736 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3738 b8bad2ba 2019-08-23 stsp goto done;
3739 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3741 b8bad2ba 2019-08-23 stsp goto done;
3743 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3744 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3746 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3747 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3749 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3750 b8bad2ba 2019-08-23 stsp *cmp = -1;
3752 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3754 b8bad2ba 2019-08-23 stsp free(id1);
3755 b8bad2ba 2019-08-23 stsp free(id2);
3757 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3759 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3760 b8bad2ba 2019-08-23 stsp return err;
3763 b8bad2ba 2019-08-23 stsp static const struct got_error *
3764 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3766 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3767 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3768 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3770 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3772 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3774 8e7bd50a 2019-08-22 stsp return err;
3776 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3777 8e7bd50a 2019-08-22 stsp const char *refname;
3778 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3779 8e7bd50a 2019-08-22 stsp char datebuf[26];
3780 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3781 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3782 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3784 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3785 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3787 8e7bd50a 2019-08-22 stsp refname += 10;
3788 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3789 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3790 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3793 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3794 8e7bd50a 2019-08-22 stsp free(refstr);
3796 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3799 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3803 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3804 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3805 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3806 2417344c 2019-08-23 stsp if (datestr)
3807 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3808 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3809 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3812 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3813 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3814 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3816 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3817 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3819 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3820 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3822 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3823 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3828 8e7bd50a 2019-08-22 stsp free(id_str);
3829 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3830 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3831 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3832 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3836 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3838 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3840 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3841 8e7bd50a 2019-08-22 stsp } while (line);
3842 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3845 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3846 8e7bd50a 2019-08-22 stsp return NULL;
3849 8e7bd50a 2019-08-22 stsp static const struct got_error *
3850 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3851 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3853 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3854 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3855 f372d5cd 2019-10-21 stsp char *editor = NULL;
3856 8e7bd50a 2019-08-22 stsp int fd = -1;
3858 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3859 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3860 8e7bd50a 2019-08-22 stsp goto done;
3863 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3864 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3865 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3866 8e7bd50a 2019-08-22 stsp goto done;
3869 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3871 8e7bd50a 2019-08-22 stsp goto done;
3873 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3874 8e7bd50a 2019-08-22 stsp close(fd);
3876 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3878 8e7bd50a 2019-08-22 stsp goto done;
3879 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3881 8e7bd50a 2019-08-22 stsp free(initial_content);
3882 8e7bd50a 2019-08-22 stsp free(template);
3883 8e7bd50a 2019-08-22 stsp free(editor);
3885 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3886 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3887 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3888 8e7bd50a 2019-08-22 stsp if (err) {
3889 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3890 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3893 8e7bd50a 2019-08-22 stsp return err;
3896 8e7bd50a 2019-08-22 stsp static const struct got_error *
3897 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3898 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3900 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3901 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3902 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3903 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3904 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3905 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3906 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3909 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3910 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3911 8e7bd50a 2019-08-22 stsp * an unintended typo.
3913 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
3914 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3916 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3918 8e7bd50a 2019-08-22 stsp return err;
3920 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3921 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3923 8e7bd50a 2019-08-22 stsp goto done;
3925 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3927 8e7bd50a 2019-08-22 stsp goto done;
3929 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3930 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3931 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3932 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3933 8e7bd50a 2019-08-22 stsp goto done;
3935 8e7bd50a 2019-08-22 stsp tag_name += 10;
3936 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3937 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3938 8e7bd50a 2019-08-22 stsp goto done;
3941 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3942 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3943 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3944 8e7bd50a 2019-08-22 stsp goto done;
3945 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3946 8e7bd50a 2019-08-22 stsp goto done;
3948 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3949 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3950 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3951 f372d5cd 2019-10-21 stsp if (err) {
3952 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3953 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3954 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3955 8e7bd50a 2019-08-22 stsp goto done;
3959 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3960 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3961 f372d5cd 2019-10-21 stsp if (err) {
3962 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3963 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3964 8e7bd50a 2019-08-22 stsp goto done;
3967 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3968 f372d5cd 2019-10-21 stsp if (err) {
3969 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3970 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3971 8e7bd50a 2019-08-22 stsp goto done;
3974 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3975 f372d5cd 2019-10-21 stsp if (err) {
3976 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3977 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3978 f372d5cd 2019-10-21 stsp goto done;
3981 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
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 f372d5cd 2019-10-21 stsp goto done;
3987 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
3989 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
3990 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
3991 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
3992 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3993 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
3994 f372d5cd 2019-10-21 stsp free(tag_id_str);
3996 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3997 8e7bd50a 2019-08-22 stsp free(commit_id);
3998 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3999 8e7bd50a 2019-08-22 stsp free(refname);
4000 8e7bd50a 2019-08-22 stsp free(tagmsg);
4001 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4002 aba9c984 2019-09-08 stsp free(tagger);
4003 8e7bd50a 2019-08-22 stsp return err;
4006 8e7bd50a 2019-08-22 stsp static const struct got_error *
4007 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4009 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4010 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4011 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4012 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4013 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4014 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4015 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4017 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4018 8e7bd50a 2019-08-22 stsp switch (ch) {
4020 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4023 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4024 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4025 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4027 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4030 8e7bd50a 2019-08-22 stsp do_list = 1;
4033 8e7bd50a 2019-08-22 stsp usage_tag();
4034 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4038 8e7bd50a 2019-08-22 stsp argc -= optind;
4039 8e7bd50a 2019-08-22 stsp argv += optind;
4041 8e7bd50a 2019-08-22 stsp if (do_list) {
4042 8e7bd50a 2019-08-22 stsp if (tagmsg)
4043 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
4044 8e7bd50a 2019-08-22 stsp if (argc > 0)
4045 8e7bd50a 2019-08-22 stsp usage_tag();
4046 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
4047 8e7bd50a 2019-08-22 stsp usage_tag();
4048 a2887370 2019-08-23 stsp else if (argc > 1)
4049 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
4050 a2887370 2019-08-23 stsp tag_name = argv[0];
4052 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4053 8e7bd50a 2019-08-22 stsp if (do_list) {
4054 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4055 8e7bd50a 2019-08-22 stsp NULL) == -1)
4056 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4058 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4059 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4060 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4063 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4064 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4065 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4066 8e7bd50a 2019-08-22 stsp goto done;
4069 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4070 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4071 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4072 8e7bd50a 2019-08-22 stsp goto done;
4074 8e7bd50a 2019-08-22 stsp error = NULL;
4075 8e7bd50a 2019-08-22 stsp if (worktree) {
4076 8e7bd50a 2019-08-22 stsp repo_path =
4077 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4078 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4079 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4080 8e7bd50a 2019-08-22 stsp if (error)
4081 8e7bd50a 2019-08-22 stsp goto done;
4083 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4084 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4085 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4086 8e7bd50a 2019-08-22 stsp goto done;
4091 8e7bd50a 2019-08-22 stsp if (do_list) {
4092 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4093 c9956ddf 2019-09-08 stsp if (error != NULL)
4094 c9956ddf 2019-09-08 stsp goto done;
4095 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4096 8e7bd50a 2019-08-22 stsp if (error)
4097 8e7bd50a 2019-08-22 stsp goto done;
4098 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4100 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4101 c9956ddf 2019-09-08 stsp if (error)
4102 c9956ddf 2019-09-08 stsp goto done;
4103 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4104 c9956ddf 2019-09-08 stsp if (error != NULL)
4105 c9956ddf 2019-09-08 stsp goto done;
4107 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4108 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4109 8e7bd50a 2019-08-22 stsp if (error)
4110 8e7bd50a 2019-08-22 stsp goto done;
4113 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4114 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4115 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4116 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4117 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4118 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4119 8e7bd50a 2019-08-22 stsp if (error)
4120 8e7bd50a 2019-08-22 stsp goto done;
4121 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4122 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4123 8e7bd50a 2019-08-22 stsp if (error)
4124 8e7bd50a 2019-08-22 stsp goto done;
4125 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4126 8e7bd50a 2019-08-22 stsp free(commit_id);
4127 8e7bd50a 2019-08-22 stsp if (error)
4128 8e7bd50a 2019-08-22 stsp goto done;
4131 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4132 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4136 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4137 8e7bd50a 2019-08-22 stsp if (worktree)
4138 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4139 8e7bd50a 2019-08-22 stsp free(cwd);
4140 8e7bd50a 2019-08-22 stsp free(repo_path);
4141 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4142 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4143 8e7bd50a 2019-08-22 stsp return error;
4146 8e7bd50a 2019-08-22 stsp __dead static void
4147 d00136be 2019-03-26 stsp usage_add(void)
4149 022fae89 2019-12-06 tracey fprintf(stderr, "usage: %s add [-R] [-I] file-path ...\n",
4150 022fae89 2019-12-06 tracey getprogname());
4154 d00136be 2019-03-26 stsp static const struct got_error *
4155 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4157 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4159 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4160 4e68cba3 2019-11-23 stsp return NULL;
4163 4e68cba3 2019-11-23 stsp static const struct got_error *
4164 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4166 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4167 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4168 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4169 1dd54920 2019-05-11 stsp char *cwd = NULL;
4170 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4171 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4172 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4174 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4176 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4177 d00136be 2019-03-26 stsp switch (ch) {
4178 022fae89 2019-12-06 tracey case 'I':
4179 022fae89 2019-12-06 tracey no_ignores = 1;
4182 4e68cba3 2019-11-23 stsp can_recurse = 1;
4185 d00136be 2019-03-26 stsp usage_add();
4186 d00136be 2019-03-26 stsp /* NOTREACHED */
4190 d00136be 2019-03-26 stsp argc -= optind;
4191 d00136be 2019-03-26 stsp argv += optind;
4193 43012d58 2019-07-14 stsp #ifndef PROFILE
4194 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4195 43012d58 2019-07-14 stsp NULL) == -1)
4196 43012d58 2019-07-14 stsp err(1, "pledge");
4198 723c305c 2019-05-11 jcs if (argc < 1)
4199 d00136be 2019-03-26 stsp usage_add();
4201 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4202 d00136be 2019-03-26 stsp if (cwd == NULL) {
4203 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4204 d00136be 2019-03-26 stsp goto done;
4207 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4208 d00136be 2019-03-26 stsp if (error)
4209 d00136be 2019-03-26 stsp goto done;
4211 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4213 031a5338 2019-03-26 stsp if (error != NULL)
4214 031a5338 2019-03-26 stsp goto done;
4216 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4217 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4218 d00136be 2019-03-26 stsp if (error)
4219 d00136be 2019-03-26 stsp goto done;
4221 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4222 6d022e97 2019-08-04 stsp if (error)
4223 022fae89 2019-12-06 tracey goto done;
4225 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4226 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4227 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4228 6d022e97 2019-08-04 stsp goto done;
4232 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4233 4e68cba3 2019-11-23 stsp char *ondisk_path;
4234 4e68cba3 2019-11-23 stsp struct stat sb;
4235 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4236 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4237 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4238 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4239 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4240 4e68cba3 2019-11-23 stsp goto done;
4242 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4243 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4244 4e68cba3 2019-11-23 stsp free(ondisk_path);
4247 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4248 4e68cba3 2019-11-23 stsp ondisk_path);
4249 4e68cba3 2019-11-23 stsp free(ondisk_path);
4250 4e68cba3 2019-11-23 stsp goto done;
4252 4e68cba3 2019-11-23 stsp free(ondisk_path);
4253 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4254 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4255 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4256 4e68cba3 2019-11-23 stsp goto done;
4261 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4262 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4265 031a5338 2019-03-26 stsp got_repo_close(repo);
4266 d00136be 2019-03-26 stsp if (worktree)
4267 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4268 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4269 1dd54920 2019-05-11 stsp free((char *)pe->path);
4270 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4271 2ec1f75b 2019-03-26 stsp free(cwd);
4272 2ec1f75b 2019-03-26 stsp return error;
4275 2ec1f75b 2019-03-26 stsp __dead static void
4276 648e4ef7 2019-07-09 stsp usage_remove(void)
4278 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4282 2a06fe5f 2019-08-24 stsp static const struct got_error *
4283 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4284 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
4285 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4286 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
4288 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4289 2a06fe5f 2019-08-24 stsp return NULL;
4290 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4291 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4292 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4293 2a06fe5f 2019-08-24 stsp return NULL;
4296 2ec1f75b 2019-03-26 stsp static const struct got_error *
4297 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4299 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4300 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4301 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4302 17ed4618 2019-06-02 stsp char *cwd = NULL;
4303 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4304 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4305 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
4307 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4309 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
4310 2ec1f75b 2019-03-26 stsp switch (ch) {
4312 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4315 2ec1f75b 2019-03-26 stsp usage_add();
4316 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4320 2ec1f75b 2019-03-26 stsp argc -= optind;
4321 2ec1f75b 2019-03-26 stsp argv += optind;
4323 43012d58 2019-07-14 stsp #ifndef PROFILE
4324 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4325 43012d58 2019-07-14 stsp NULL) == -1)
4326 43012d58 2019-07-14 stsp err(1, "pledge");
4328 17ed4618 2019-06-02 stsp if (argc < 1)
4329 648e4ef7 2019-07-09 stsp usage_remove();
4331 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4332 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4333 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4334 2ec1f75b 2019-03-26 stsp goto done;
4336 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4337 2ec1f75b 2019-03-26 stsp if (error)
4338 2ec1f75b 2019-03-26 stsp goto done;
4340 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4343 2ec1f75b 2019-03-26 stsp goto done;
4345 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4346 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4347 2ec1f75b 2019-03-26 stsp if (error)
4348 2ec1f75b 2019-03-26 stsp goto done;
4350 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4351 6d022e97 2019-08-04 stsp if (error)
4352 6d022e97 2019-08-04 stsp goto done;
4354 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4355 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
4356 a129376b 2019-03-28 stsp if (error)
4357 a129376b 2019-03-28 stsp goto done;
4360 a129376b 2019-03-28 stsp got_repo_close(repo);
4361 a129376b 2019-03-28 stsp if (worktree)
4362 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4363 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4364 17ed4618 2019-06-02 stsp free((char *)pe->path);
4365 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4366 a129376b 2019-03-28 stsp free(cwd);
4367 a129376b 2019-03-28 stsp return error;
4370 a129376b 2019-03-28 stsp __dead static void
4371 a129376b 2019-03-28 stsp usage_revert(void)
4373 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4374 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4378 1ee397ad 2019-07-12 stsp static const struct got_error *
4379 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4381 a129376b 2019-03-28 stsp while (path[0] == '/')
4383 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4384 33aa809d 2019-08-08 stsp return NULL;
4387 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4388 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4389 33aa809d 2019-08-08 stsp const char *action;
4392 33aa809d 2019-08-08 stsp static const struct got_error *
4393 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4394 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4396 33aa809d 2019-08-08 stsp char *line = NULL;
4397 33aa809d 2019-08-08 stsp size_t linesize = 0;
4398 33aa809d 2019-08-08 stsp ssize_t linelen;
4400 33aa809d 2019-08-08 stsp switch (status) {
4401 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4402 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4404 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4405 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4407 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4408 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4409 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4410 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4411 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4412 33aa809d 2019-08-08 stsp printf("%s", line);
4413 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4414 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4415 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4416 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4417 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4420 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4423 33aa809d 2019-08-08 stsp return NULL;
4426 33aa809d 2019-08-08 stsp static const struct got_error *
4427 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4428 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4430 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4431 33aa809d 2019-08-08 stsp char *line = NULL;
4432 33aa809d 2019-08-08 stsp size_t linesize = 0;
4433 33aa809d 2019-08-08 stsp ssize_t linelen;
4434 33aa809d 2019-08-08 stsp int resp = ' ';
4435 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4437 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4439 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4441 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4442 33aa809d 2019-08-08 stsp a->action);
4444 33aa809d 2019-08-08 stsp return err;
4445 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4446 33aa809d 2019-08-08 stsp if (linelen == -1) {
4447 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4448 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4449 33aa809d 2019-08-08 stsp return NULL;
4451 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4453 33aa809d 2019-08-08 stsp *nl = '\0';
4454 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4455 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4456 33aa809d 2019-08-08 stsp printf("y\n");
4457 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4458 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4459 33aa809d 2019-08-08 stsp printf("n\n");
4460 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4461 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4462 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4463 33aa809d 2019-08-08 stsp printf("q\n");
4465 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4466 33aa809d 2019-08-08 stsp free(line);
4467 33aa809d 2019-08-08 stsp return NULL;
4470 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4471 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4472 33aa809d 2019-08-08 stsp a->action);
4474 33aa809d 2019-08-08 stsp return err;
4475 33aa809d 2019-08-08 stsp resp = getchar();
4476 33aa809d 2019-08-08 stsp if (resp == '\n')
4477 33aa809d 2019-08-08 stsp resp = getchar();
4478 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4479 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4480 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4481 33aa809d 2019-08-08 stsp resp = ' ';
4483 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4484 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4485 33aa809d 2019-08-08 stsp resp = ' ';
4489 33aa809d 2019-08-08 stsp if (resp == 'y')
4490 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4491 33aa809d 2019-08-08 stsp else if (resp == 'n')
4492 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4493 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4494 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4496 1ee397ad 2019-07-12 stsp return NULL;
4500 a129376b 2019-03-28 stsp static const struct got_error *
4501 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4503 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4504 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4505 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4506 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4507 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4508 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4509 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4510 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4511 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4512 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4514 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4516 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4517 a129376b 2019-03-28 stsp switch (ch) {
4519 33aa809d 2019-08-08 stsp pflag = 1;
4522 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4525 0f6d7415 2019-08-08 stsp can_recurse = 1;
4528 a129376b 2019-03-28 stsp usage_revert();
4529 a129376b 2019-03-28 stsp /* NOTREACHED */
4533 a129376b 2019-03-28 stsp argc -= optind;
4534 a129376b 2019-03-28 stsp argv += optind;
4536 43012d58 2019-07-14 stsp #ifndef PROFILE
4537 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4538 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4539 43012d58 2019-07-14 stsp err(1, "pledge");
4541 e20a8b6f 2019-06-04 stsp if (argc < 1)
4542 a129376b 2019-03-28 stsp usage_revert();
4543 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4544 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4546 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4547 a129376b 2019-03-28 stsp if (cwd == NULL) {
4548 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4549 a129376b 2019-03-28 stsp goto done;
4551 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4552 2ec1f75b 2019-03-26 stsp if (error)
4553 2ec1f75b 2019-03-26 stsp goto done;
4555 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4557 a129376b 2019-03-28 stsp if (error != NULL)
4558 a129376b 2019-03-28 stsp goto done;
4560 33aa809d 2019-08-08 stsp if (patch_script_path) {
4561 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4562 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4563 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4564 33aa809d 2019-08-08 stsp patch_script_path);
4565 33aa809d 2019-08-08 stsp goto done;
4568 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4569 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4570 a129376b 2019-03-28 stsp if (error)
4571 a129376b 2019-03-28 stsp goto done;
4573 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4574 6d022e97 2019-08-04 stsp if (error)
4575 6d022e97 2019-08-04 stsp goto done;
4577 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4578 0f6d7415 2019-08-08 stsp char *ondisk_path;
4579 0f6d7415 2019-08-08 stsp struct stat sb;
4580 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4581 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4582 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4583 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4584 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4585 0f6d7415 2019-08-08 stsp goto done;
4587 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4588 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4589 0f6d7415 2019-08-08 stsp free(ondisk_path);
4592 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4593 0f6d7415 2019-08-08 stsp ondisk_path);
4594 0f6d7415 2019-08-08 stsp free(ondisk_path);
4595 0f6d7415 2019-08-08 stsp goto done;
4597 0f6d7415 2019-08-08 stsp free(ondisk_path);
4598 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4599 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4600 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4601 0f6d7415 2019-08-08 stsp goto done;
4606 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4607 33aa809d 2019-08-08 stsp cpa.action = "revert";
4608 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4609 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4610 a129376b 2019-03-28 stsp if (error)
4611 a129376b 2019-03-28 stsp goto done;
4613 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4614 33aa809d 2019-08-08 stsp error == NULL)
4615 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4617 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4618 2ec1f75b 2019-03-26 stsp if (worktree)
4619 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4620 2ec1f75b 2019-03-26 stsp free(path);
4621 d00136be 2019-03-26 stsp free(cwd);
4622 6bad629b 2019-02-04 stsp return error;
4625 c4296144 2019-05-09 stsp __dead static void
4626 c4296144 2019-05-09 stsp usage_commit(void)
4628 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4629 5c1e53bc 2019-07-28 stsp getprogname());
4633 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4634 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4635 e2ba3d07 2019-05-13 stsp const char *editor;
4636 e0870e44 2019-05-13 stsp const char *worktree_path;
4637 76d98825 2019-06-03 stsp const char *branch_name;
4638 314a6357 2019-05-13 stsp const char *repo_path;
4639 e0870e44 2019-05-13 stsp char *logmsg_path;
4643 33ad4cbe 2019-05-12 jcs static const struct got_error *
4644 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4647 76d98825 2019-06-03 stsp char *initial_content = NULL;
4648 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4649 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4650 e0870e44 2019-05-13 stsp char *template = NULL;
4651 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4653 33ad4cbe 2019-05-12 jcs size_t len;
4655 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4656 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4657 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4658 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4659 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4660 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4661 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4662 33ad4cbe 2019-05-12 jcs return NULL;
4665 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4666 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4668 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4669 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4670 76d98825 2019-06-03 stsp a->branch_name) == -1)
4671 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4673 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4675 e0870e44 2019-05-13 stsp goto done;
4677 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4679 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4680 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4681 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4682 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4683 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4687 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4689 76d98825 2019-06-03 stsp free(initial_content);
4690 e0870e44 2019-05-13 stsp free(template);
4692 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4693 3ce1b845 2019-07-15 stsp if (err == NULL) {
4694 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4695 3ce1b845 2019-07-15 stsp if (err) {
4696 3ce1b845 2019-07-15 stsp free(*logmsg);
4697 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4700 33ad4cbe 2019-05-12 jcs return err;
4703 c4296144 2019-05-09 stsp static const struct got_error *
4704 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4706 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4707 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4708 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4709 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4710 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4711 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4712 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4713 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4714 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4715 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4717 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4718 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4720 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4721 c4296144 2019-05-09 stsp switch (ch) {
4723 c4296144 2019-05-09 stsp logmsg = optarg;
4726 c4296144 2019-05-09 stsp usage_commit();
4727 c4296144 2019-05-09 stsp /* NOTREACHED */
4731 c4296144 2019-05-09 stsp argc -= optind;
4732 c4296144 2019-05-09 stsp argv += optind;
4734 43012d58 2019-07-14 stsp #ifndef PROFILE
4735 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4736 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4737 43012d58 2019-07-14 stsp err(1, "pledge");
4739 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4740 c4296144 2019-05-09 stsp if (cwd == NULL) {
4741 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4742 c4296144 2019-05-09 stsp goto done;
4744 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4745 7d5807f4 2019-07-11 stsp if (error)
4746 7d5807f4 2019-07-11 stsp goto done;
4748 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4749 c4296144 2019-05-09 stsp if (error)
4750 a698f62e 2019-07-25 stsp goto done;
4751 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4752 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4753 c4296144 2019-05-09 stsp goto done;
4756 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4757 916f288c 2019-07-30 stsp worktree);
4758 5c1e53bc 2019-07-28 stsp if (error)
4759 5c1e53bc 2019-07-28 stsp goto done;
4761 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4762 c9956ddf 2019-09-08 stsp if (error)
4763 c9956ddf 2019-09-08 stsp goto done;
4764 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4765 c9956ddf 2019-09-08 stsp gitconfig_path);
4766 c4296144 2019-05-09 stsp if (error != NULL)
4767 c4296144 2019-05-09 stsp goto done;
4769 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4770 aba9c984 2019-09-08 stsp if (error)
4771 aba9c984 2019-09-08 stsp return error;
4774 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4775 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4777 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4778 314a6357 2019-05-13 stsp error = get_editor(&editor);
4780 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4781 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4782 c4296144 2019-05-09 stsp if (error)
4783 c4296144 2019-05-09 stsp goto done;
4785 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4786 087fb88c 2019-08-04 stsp if (error)
4787 087fb88c 2019-08-04 stsp goto done;
4789 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4790 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4791 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4792 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4793 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4794 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4795 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4796 916f288c 2019-07-30 stsp goto done;
4798 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4800 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4801 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4802 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4803 e0870e44 2019-05-13 stsp if (error) {
4804 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4805 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4806 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4807 c4296144 2019-05-09 stsp goto done;
4810 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4811 c4296144 2019-05-09 stsp if (error)
4812 c4296144 2019-05-09 stsp goto done;
4813 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4815 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4816 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4817 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4818 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4819 7266f21f 2019-10-21 stsp error == NULL)
4820 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4821 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4823 c4296144 2019-05-09 stsp got_repo_close(repo);
4824 c4296144 2019-05-09 stsp if (worktree)
4825 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4826 c4296144 2019-05-09 stsp free(cwd);
4827 c4296144 2019-05-09 stsp free(id_str);
4828 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4829 e2ba3d07 2019-05-13 stsp free(editor);
4830 aba9c984 2019-09-08 stsp free(author);
4831 234035bc 2019-06-01 stsp return error;
4834 234035bc 2019-06-01 stsp __dead static void
4835 234035bc 2019-06-01 stsp usage_cherrypick(void)
4837 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4841 234035bc 2019-06-01 stsp static const struct got_error *
4842 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4844 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4845 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4846 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4847 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4848 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4849 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4850 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4851 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4852 234035bc 2019-06-01 stsp int ch, did_something = 0;
4854 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4855 234035bc 2019-06-01 stsp switch (ch) {
4857 234035bc 2019-06-01 stsp usage_cherrypick();
4858 234035bc 2019-06-01 stsp /* NOTREACHED */
4862 234035bc 2019-06-01 stsp argc -= optind;
4863 234035bc 2019-06-01 stsp argv += optind;
4865 43012d58 2019-07-14 stsp #ifndef PROFILE
4866 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4867 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4868 43012d58 2019-07-14 stsp err(1, "pledge");
4870 234035bc 2019-06-01 stsp if (argc != 1)
4871 234035bc 2019-06-01 stsp usage_cherrypick();
4873 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4874 234035bc 2019-06-01 stsp if (cwd == NULL) {
4875 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4876 234035bc 2019-06-01 stsp goto done;
4878 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4879 234035bc 2019-06-01 stsp if (error)
4880 234035bc 2019-06-01 stsp goto done;
4882 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4884 234035bc 2019-06-01 stsp if (error != NULL)
4885 234035bc 2019-06-01 stsp goto done;
4887 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4888 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4889 234035bc 2019-06-01 stsp if (error)
4890 234035bc 2019-06-01 stsp goto done;
4892 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4893 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4894 234035bc 2019-06-01 stsp if (error != NULL) {
4895 234035bc 2019-06-01 stsp struct got_reference *ref;
4896 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4897 234035bc 2019-06-01 stsp goto done;
4898 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4899 234035bc 2019-06-01 stsp if (error != NULL)
4900 234035bc 2019-06-01 stsp goto done;
4901 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4902 234035bc 2019-06-01 stsp got_ref_close(ref);
4903 234035bc 2019-06-01 stsp if (error != NULL)
4904 234035bc 2019-06-01 stsp goto done;
4906 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4907 234035bc 2019-06-01 stsp if (error)
4908 234035bc 2019-06-01 stsp goto done;
4910 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4911 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4912 234035bc 2019-06-01 stsp if (error != NULL)
4913 234035bc 2019-06-01 stsp goto done;
4915 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4916 234035bc 2019-06-01 stsp if (error) {
4917 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4918 234035bc 2019-06-01 stsp goto done;
4919 234035bc 2019-06-01 stsp error = NULL;
4921 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4922 234035bc 2019-06-01 stsp goto done;
4925 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4926 234035bc 2019-06-01 stsp if (error)
4927 234035bc 2019-06-01 stsp goto done;
4928 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4929 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4930 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4932 234035bc 2019-06-01 stsp if (error != NULL)
4933 234035bc 2019-06-01 stsp goto done;
4935 234035bc 2019-06-01 stsp if (did_something)
4936 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4938 234035bc 2019-06-01 stsp if (commit)
4939 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4940 234035bc 2019-06-01 stsp free(commit_id_str);
4941 234035bc 2019-06-01 stsp if (head_ref)
4942 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4943 234035bc 2019-06-01 stsp if (worktree)
4944 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4946 234035bc 2019-06-01 stsp got_repo_close(repo);
4947 c4296144 2019-05-09 stsp return error;
4950 5ef14e63 2019-06-02 stsp __dead static void
4951 5ef14e63 2019-06-02 stsp usage_backout(void)
4953 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4957 5ef14e63 2019-06-02 stsp static const struct got_error *
4958 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4960 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4961 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4962 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4963 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4964 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4965 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4966 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4967 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4968 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4970 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4971 5ef14e63 2019-06-02 stsp switch (ch) {
4973 5ef14e63 2019-06-02 stsp usage_backout();
4974 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4978 5ef14e63 2019-06-02 stsp argc -= optind;
4979 5ef14e63 2019-06-02 stsp argv += optind;
4981 43012d58 2019-07-14 stsp #ifndef PROFILE
4982 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4983 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4984 43012d58 2019-07-14 stsp err(1, "pledge");
4986 5ef14e63 2019-06-02 stsp if (argc != 1)
4987 5ef14e63 2019-06-02 stsp usage_backout();
4989 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4990 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4991 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4992 5ef14e63 2019-06-02 stsp goto done;
4994 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4995 5ef14e63 2019-06-02 stsp if (error)
4996 5ef14e63 2019-06-02 stsp goto done;
4998 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5000 5ef14e63 2019-06-02 stsp if (error != NULL)
5001 5ef14e63 2019-06-02 stsp goto done;
5003 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5004 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5005 5ef14e63 2019-06-02 stsp if (error)
5006 5ef14e63 2019-06-02 stsp goto done;
5008 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5009 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5010 5ef14e63 2019-06-02 stsp if (error != NULL) {
5011 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5012 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5013 5ef14e63 2019-06-02 stsp goto done;
5014 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5015 5ef14e63 2019-06-02 stsp if (error != NULL)
5016 5ef14e63 2019-06-02 stsp goto done;
5017 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5018 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5019 5ef14e63 2019-06-02 stsp if (error != NULL)
5020 5ef14e63 2019-06-02 stsp goto done;
5022 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5023 5ef14e63 2019-06-02 stsp if (error)
5024 5ef14e63 2019-06-02 stsp goto done;
5026 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5027 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5028 5ef14e63 2019-06-02 stsp if (error != NULL)
5029 5ef14e63 2019-06-02 stsp goto done;
5031 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5032 5ef14e63 2019-06-02 stsp if (error)
5033 5ef14e63 2019-06-02 stsp goto done;
5035 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5036 5ef14e63 2019-06-02 stsp if (error)
5037 5ef14e63 2019-06-02 stsp goto done;
5038 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5039 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5040 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5041 5ef14e63 2019-06-02 stsp goto done;
5044 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5045 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5046 5ef14e63 2019-06-02 stsp if (error != NULL)
5047 5ef14e63 2019-06-02 stsp goto done;
5049 5ef14e63 2019-06-02 stsp if (did_something)
5050 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5052 5ef14e63 2019-06-02 stsp if (commit)
5053 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5054 5ef14e63 2019-06-02 stsp free(commit_id_str);
5055 5ef14e63 2019-06-02 stsp if (head_ref)
5056 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5057 818c7501 2019-07-11 stsp if (worktree)
5058 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5060 818c7501 2019-07-11 stsp got_repo_close(repo);
5061 818c7501 2019-07-11 stsp return error;
5064 818c7501 2019-07-11 stsp __dead static void
5065 818c7501 2019-07-11 stsp usage_rebase(void)
5067 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5068 af54c8f8 2019-07-11 stsp getprogname());
5073 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5076 0ebf8283 2019-07-24 stsp size_t len;
5078 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5079 0ebf8283 2019-07-24 stsp if (len > limit)
5080 0ebf8283 2019-07-24 stsp len = limit;
5081 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5082 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5084 0ebf8283 2019-07-24 stsp *nl = '\0';
5087 0ebf8283 2019-07-24 stsp static const struct got_error *
5088 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5090 5943eee2 2019-08-13 stsp const struct got_error *err;
5091 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5092 5943eee2 2019-08-13 stsp const char *s;
5094 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5096 5943eee2 2019-08-13 stsp return err;
5098 5943eee2 2019-08-13 stsp s = logmsg0;
5099 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5102 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5103 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5104 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5105 5943eee2 2019-08-13 stsp goto done;
5108 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5110 5943eee2 2019-08-13 stsp free(logmsg0);
5111 5943eee2 2019-08-13 stsp return err;
5114 818c7501 2019-07-11 stsp static const struct got_error *
5115 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5116 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5118 818c7501 2019-07-11 stsp const struct got_error *err;
5119 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5121 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5123 818c7501 2019-07-11 stsp goto done;
5125 ff0d2220 2019-07-11 stsp if (new_id) {
5126 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5128 ff0d2220 2019-07-11 stsp goto done;
5131 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5132 ff0d2220 2019-07-11 stsp if (new_id_str)
5133 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5135 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5137 0ebf8283 2019-07-24 stsp goto done;
5139 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5140 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5142 818c7501 2019-07-11 stsp free(old_id_str);
5143 818c7501 2019-07-11 stsp free(new_id_str);
5144 818c7501 2019-07-11 stsp return err;
5147 1ee397ad 2019-07-12 stsp static const struct got_error *
5148 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5150 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5152 818c7501 2019-07-11 stsp while (path[0] == '/')
5154 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5156 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5157 1ee397ad 2019-07-12 stsp return NULL;
5158 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5159 818c7501 2019-07-11 stsp *rebase_status = status;
5160 1ee397ad 2019-07-12 stsp return NULL;
5163 818c7501 2019-07-11 stsp static const struct got_error *
5164 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5165 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5166 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5168 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5169 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5170 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5173 818c7501 2019-07-11 stsp static const struct got_error *
5174 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5175 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5176 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5177 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5179 ff0d2220 2019-07-11 stsp const struct got_error *error;
5180 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5181 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5183 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5184 ff0d2220 2019-07-11 stsp if (error)
5185 ff0d2220 2019-07-11 stsp return error;
5187 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5188 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5189 ff0d2220 2019-07-11 stsp if (error) {
5190 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5191 ff0d2220 2019-07-11 stsp goto done;
5192 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5194 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5195 ff0d2220 2019-07-11 stsp free(new_commit_id);
5198 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5199 ff0d2220 2019-07-11 stsp return error;
5202 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5203 64c6d990 2019-07-11 stsp const char *path_prefix;
5204 64c6d990 2019-07-11 stsp size_t len;
5205 8ca9bd68 2019-07-25 stsp int errcode;
5208 64c6d990 2019-07-11 stsp static const struct got_error *
5209 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5210 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5211 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5212 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5214 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5216 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5217 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5218 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5220 64c6d990 2019-07-11 stsp return NULL;
5223 64c6d990 2019-07-11 stsp static const struct got_error *
5224 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5225 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5226 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5228 64c6d990 2019-07-11 stsp const struct got_error *err;
5229 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5230 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5231 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5233 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5234 64c6d990 2019-07-11 stsp return NULL;
5236 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5238 64c6d990 2019-07-11 stsp goto done;
5240 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5242 64c6d990 2019-07-11 stsp goto done;
5244 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5245 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5247 64c6d990 2019-07-11 stsp goto done;
5249 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5250 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5252 64c6d990 2019-07-11 stsp goto done;
5254 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5255 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5256 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5257 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5258 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5259 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5260 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5262 64c6d990 2019-07-11 stsp if (tree1)
5263 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5264 64c6d990 2019-07-11 stsp if (tree2)
5265 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5266 64c6d990 2019-07-11 stsp if (commit)
5267 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5268 64c6d990 2019-07-11 stsp if (parent_commit)
5269 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5270 64c6d990 2019-07-11 stsp return err;
5273 ff0d2220 2019-07-11 stsp static const struct got_error *
5274 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5275 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5276 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5277 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5278 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5280 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5281 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5282 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5283 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5284 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5286 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5288 af61c510 2019-07-19 stsp return err;
5290 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5291 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5293 af61c510 2019-07-19 stsp goto done;
5294 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5295 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5296 af61c510 2019-07-19 stsp if (err) {
5297 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5298 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5299 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5300 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5301 af61c510 2019-07-19 stsp "been reached?!?");
5302 af61c510 2019-07-19 stsp goto done;
5303 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5304 af61c510 2019-07-19 stsp goto done;
5305 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5306 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5308 af61c510 2019-07-19 stsp goto done;
5310 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5311 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5313 af61c510 2019-07-19 stsp goto done;
5315 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5317 af61c510 2019-07-19 stsp goto done;
5318 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5319 af61c510 2019-07-19 stsp commit_id = parent_id;
5323 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5324 af61c510 2019-07-19 stsp return err;
5327 af61c510 2019-07-19 stsp static const struct got_error *
5328 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5330 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5331 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5332 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5333 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5334 818c7501 2019-07-11 stsp char *cwd = NULL;
5335 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5336 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5337 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5338 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5339 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5340 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5341 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5342 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5343 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5344 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5345 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5346 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5348 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5349 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5351 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5352 818c7501 2019-07-11 stsp switch (ch) {
5354 818c7501 2019-07-11 stsp abort_rebase = 1;
5357 818c7501 2019-07-11 stsp continue_rebase = 1;
5360 818c7501 2019-07-11 stsp usage_rebase();
5361 818c7501 2019-07-11 stsp /* NOTREACHED */
5365 818c7501 2019-07-11 stsp argc -= optind;
5366 818c7501 2019-07-11 stsp argv += optind;
5368 43012d58 2019-07-14 stsp #ifndef PROFILE
5369 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5370 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5371 43012d58 2019-07-14 stsp err(1, "pledge");
5373 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5374 818c7501 2019-07-11 stsp usage_rebase();
5375 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5376 818c7501 2019-07-11 stsp if (argc != 0)
5377 818c7501 2019-07-11 stsp usage_rebase();
5378 818c7501 2019-07-11 stsp } else if (argc != 1)
5379 818c7501 2019-07-11 stsp usage_rebase();
5381 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5382 818c7501 2019-07-11 stsp if (cwd == NULL) {
5383 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5384 818c7501 2019-07-11 stsp goto done;
5386 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5387 818c7501 2019-07-11 stsp if (error)
5388 818c7501 2019-07-11 stsp goto done;
5390 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5392 818c7501 2019-07-11 stsp if (error != NULL)
5393 818c7501 2019-07-11 stsp goto done;
5395 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5396 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5397 818c7501 2019-07-11 stsp if (error)
5398 818c7501 2019-07-11 stsp goto done;
5400 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5401 818c7501 2019-07-11 stsp if (error)
5402 818c7501 2019-07-11 stsp goto done;
5404 f6794adc 2019-07-23 stsp if (abort_rebase) {
5405 818c7501 2019-07-11 stsp int did_something;
5406 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5407 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5408 f6794adc 2019-07-23 stsp goto done;
5410 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5411 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5412 3e3a69f1 2019-07-25 stsp worktree, repo);
5413 818c7501 2019-07-11 stsp if (error)
5414 818c7501 2019-07-11 stsp goto done;
5415 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5416 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5417 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5418 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5419 818c7501 2019-07-11 stsp if (error)
5420 818c7501 2019-07-11 stsp goto done;
5421 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5422 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5425 818c7501 2019-07-11 stsp if (continue_rebase) {
5426 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5427 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5428 f6794adc 2019-07-23 stsp goto done;
5430 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5431 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5432 3e3a69f1 2019-07-25 stsp worktree, repo);
5433 818c7501 2019-07-11 stsp if (error)
5434 818c7501 2019-07-11 stsp goto done;
5436 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5437 01757395 2019-07-12 stsp resume_commit_id, repo);
5438 818c7501 2019-07-11 stsp if (error)
5439 818c7501 2019-07-11 stsp goto done;
5441 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5442 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5443 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5444 818c7501 2019-07-11 stsp goto done;
5447 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5448 818c7501 2019-07-11 stsp if (error != NULL)
5449 818c7501 2019-07-11 stsp goto done;
5452 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5453 ff0d2220 2019-07-11 stsp if (error)
5454 ff0d2220 2019-07-11 stsp goto done;
5456 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5457 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5459 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5460 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5461 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5462 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5463 818c7501 2019-07-11 stsp if (error)
5464 818c7501 2019-07-11 stsp goto done;
5465 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5466 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5467 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5468 818c7501 2019-07-11 stsp "with work tree's branch");
5469 818c7501 2019-07-11 stsp goto done;
5472 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5473 a51a74b3 2019-07-27 stsp if (error) {
5474 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5475 a51a74b3 2019-07-27 stsp goto done;
5476 a51a74b3 2019-07-27 stsp error = NULL;
5478 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5479 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5480 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5481 a51a74b3 2019-07-27 stsp goto done;
5483 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5484 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5485 818c7501 2019-07-11 stsp if (error)
5486 818c7501 2019-07-11 stsp goto done;
5489 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5490 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5491 818c7501 2019-07-11 stsp if (error)
5492 818c7501 2019-07-11 stsp goto done;
5494 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5495 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5496 fc66b545 2019-08-12 stsp if (pid == NULL) {
5497 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5498 fc66b545 2019-08-12 stsp int did_something;
5499 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5500 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5501 fc66b545 2019-08-12 stsp &did_something);
5502 fc66b545 2019-08-12 stsp if (error)
5503 fc66b545 2019-08-12 stsp goto done;
5504 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5505 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5507 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5508 fc66b545 2019-08-12 stsp goto done;
5510 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5511 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5512 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5513 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5514 818c7501 2019-07-11 stsp commit = NULL;
5515 818c7501 2019-07-11 stsp if (error)
5516 818c7501 2019-07-11 stsp goto done;
5518 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5519 38b0338b 2019-11-29 stsp if (continue_rebase) {
5520 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5521 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5522 38b0338b 2019-11-29 stsp goto done;
5524 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5525 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5526 38b0338b 2019-11-29 stsp char *id_str;
5527 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5528 38b0338b 2019-11-29 stsp new_base_branch);
5529 38b0338b 2019-11-29 stsp if (error)
5530 38b0338b 2019-11-29 stsp goto done;
5531 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5532 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5533 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5534 38b0338b 2019-11-29 stsp free(id_str);
5535 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5536 38b0338b 2019-11-29 stsp new_head_commit_id);
5537 38b0338b 2019-11-29 stsp if (error)
5538 38b0338b 2019-11-29 stsp goto done;
5542 818c7501 2019-07-11 stsp pid = NULL;
5543 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5544 818c7501 2019-07-11 stsp commit_id = qid->id;
5545 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5546 818c7501 2019-07-11 stsp pid = qid;
5548 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5549 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5550 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5551 818c7501 2019-07-11 stsp if (error)
5552 818c7501 2019-07-11 stsp goto done;
5554 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5555 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5559 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5560 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5561 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5562 818c7501 2019-07-11 stsp if (error)
5563 818c7501 2019-07-11 stsp goto done;
5566 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5567 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5568 818c7501 2019-07-11 stsp if (error)
5569 818c7501 2019-07-11 stsp goto done;
5570 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5571 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5573 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5574 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5576 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5577 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5578 818c7501 2019-07-11 stsp free(resume_commit_id);
5579 818c7501 2019-07-11 stsp free(yca_id);
5580 818c7501 2019-07-11 stsp if (commit)
5581 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5582 818c7501 2019-07-11 stsp if (branch)
5583 818c7501 2019-07-11 stsp got_ref_close(branch);
5584 818c7501 2019-07-11 stsp if (new_base_branch)
5585 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5586 818c7501 2019-07-11 stsp if (tmp_branch)
5587 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5588 5ef14e63 2019-06-02 stsp if (worktree)
5589 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5591 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5592 5ef14e63 2019-06-02 stsp return error;
5595 0ebf8283 2019-07-24 stsp __dead static void
5596 0ebf8283 2019-07-24 stsp usage_histedit(void)
5598 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5599 0ebf8283 2019-07-24 stsp getprogname());
5603 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5604 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5605 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5606 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5607 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5609 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5610 0ebf8283 2019-07-24 stsp unsigned char code;
5611 0ebf8283 2019-07-24 stsp const char *name;
5612 0ebf8283 2019-07-24 stsp const char *desc;
5613 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5614 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5615 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5616 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5617 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5618 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5619 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5622 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5623 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5624 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5625 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5626 0ebf8283 2019-07-24 stsp char *logmsg;
5628 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5630 0ebf8283 2019-07-24 stsp static const struct got_error *
5631 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5632 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5634 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5635 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5636 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5639 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5641 0ebf8283 2019-07-24 stsp goto done;
5643 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5645 0ebf8283 2019-07-24 stsp goto done;
5647 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5649 0ebf8283 2019-07-24 stsp goto done;
5651 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5652 0ebf8283 2019-07-24 stsp if (n < 0)
5653 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5655 0ebf8283 2019-07-24 stsp if (commit)
5656 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5657 0ebf8283 2019-07-24 stsp free(id_str);
5658 0ebf8283 2019-07-24 stsp free(logmsg);
5659 0ebf8283 2019-07-24 stsp return err;
5662 0ebf8283 2019-07-24 stsp static const struct got_error *
5663 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5664 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5666 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5667 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5669 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5670 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5672 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5673 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5679 0ebf8283 2019-07-24 stsp return err;
5682 0ebf8283 2019-07-24 stsp static const struct got_error *
5683 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5685 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5688 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5689 0ebf8283 2019-07-24 stsp if (n < 0)
5690 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5692 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5693 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5694 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5695 0ebf8283 2019-07-24 stsp cmd->desc);
5696 0ebf8283 2019-07-24 stsp if (n < 0) {
5697 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5701 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5702 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5703 0ebf8283 2019-07-24 stsp if (n < 0)
5704 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5705 0ebf8283 2019-07-24 stsp return err;
5708 0ebf8283 2019-07-24 stsp static const struct got_error *
5709 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5711 0ebf8283 2019-07-24 stsp static char msg[42];
5714 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5716 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5717 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5719 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5722 0ebf8283 2019-07-24 stsp static const struct got_error *
5723 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5724 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5726 0ebf8283 2019-07-24 stsp const struct got_error *err;
5727 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5728 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5730 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5732 0ebf8283 2019-07-24 stsp return err;
5734 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5736 0ebf8283 2019-07-24 stsp goto done;
5738 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5740 5943eee2 2019-08-13 stsp goto done;
5741 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5742 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5743 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5744 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5745 0ebf8283 2019-07-24 stsp goto done;
5748 0ebf8283 2019-07-24 stsp if (folded_commit)
5749 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5750 0ebf8283 2019-07-24 stsp free(id_str);
5751 5943eee2 2019-08-13 stsp free(folded_logmsg);
5752 0ebf8283 2019-07-24 stsp return err;
5755 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5756 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5758 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5760 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5761 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5762 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5763 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5764 3f9de99f 2019-07-24 stsp folded = prev;
5765 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5768 0ebf8283 2019-07-24 stsp return folded;
5771 0ebf8283 2019-07-24 stsp static const struct got_error *
5772 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5773 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5775 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5776 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5777 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5778 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5780 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5782 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5784 0ebf8283 2019-07-24 stsp return err;
5786 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5787 0ebf8283 2019-07-24 stsp if (folded) {
5788 0ebf8283 2019-07-24 stsp while (folded != hle) {
5789 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5790 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5793 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5794 0ebf8283 2019-07-24 stsp logmsg, repo);
5796 0ebf8283 2019-07-24 stsp goto done;
5797 0ebf8283 2019-07-24 stsp free(logmsg);
5798 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5799 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5803 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5805 0ebf8283 2019-07-24 stsp goto done;
5806 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5808 5943eee2 2019-08-13 stsp goto done;
5809 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5810 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5811 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5812 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5813 0ebf8283 2019-07-24 stsp goto done;
5815 0ebf8283 2019-07-24 stsp free(logmsg);
5816 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5818 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5820 0ebf8283 2019-07-24 stsp goto done;
5822 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5824 0ebf8283 2019-07-24 stsp goto done;
5826 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5827 0ebf8283 2019-07-24 stsp close(fd);
5829 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5831 0ebf8283 2019-07-24 stsp goto done;
5833 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5834 0ebf8283 2019-07-24 stsp if (err) {
5835 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5836 0ebf8283 2019-07-24 stsp goto done;
5837 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5840 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5841 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5842 0ebf8283 2019-07-24 stsp free(logmsg_path);
5843 0ebf8283 2019-07-24 stsp free(logmsg);
5844 5943eee2 2019-08-13 stsp free(orig_logmsg);
5845 0ebf8283 2019-07-24 stsp free(editor);
5846 0ebf8283 2019-07-24 stsp if (commit)
5847 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5848 0ebf8283 2019-07-24 stsp return err;
5851 0ebf8283 2019-07-24 stsp static const struct got_error *
5852 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5853 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5855 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5856 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5857 0ebf8283 2019-07-24 stsp size_t size;
5858 0ebf8283 2019-07-24 stsp ssize_t len;
5859 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5860 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5861 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5862 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5864 0ebf8283 2019-07-24 stsp for (;;) {
5865 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5866 0ebf8283 2019-07-24 stsp if (len == -1) {
5867 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5868 0ebf8283 2019-07-24 stsp if (feof(f))
5870 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5871 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5876 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5878 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5879 0ebf8283 2019-07-24 stsp free(line);
5880 0ebf8283 2019-07-24 stsp line = NULL;
5883 0ebf8283 2019-07-24 stsp cmd = NULL;
5884 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5885 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5886 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5887 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5888 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5891 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5896 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5897 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5900 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5902 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5903 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5904 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5907 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5908 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5912 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5913 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5914 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5918 0ebf8283 2019-07-24 stsp free(line);
5919 0ebf8283 2019-07-24 stsp line = NULL;
5923 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5925 0ebf8283 2019-07-24 stsp *end = '\0';
5927 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5928 0ebf8283 2019-07-24 stsp if (err) {
5929 0ebf8283 2019-07-24 stsp /* override error code */
5930 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5934 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5935 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5936 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5939 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5940 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5941 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5942 0ebf8283 2019-07-24 stsp commit_id = NULL;
5943 0ebf8283 2019-07-24 stsp free(line);
5944 0ebf8283 2019-07-24 stsp line = NULL;
5945 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5948 0ebf8283 2019-07-24 stsp free(line);
5949 0ebf8283 2019-07-24 stsp free(commit_id);
5950 0ebf8283 2019-07-24 stsp return err;
5953 0ebf8283 2019-07-24 stsp static const struct got_error *
5954 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5955 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5957 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5958 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5959 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5960 bfce7f83 2019-07-27 stsp static char msg[80];
5961 bfce7f83 2019-07-27 stsp char *id_str;
5963 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5964 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5965 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5966 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5967 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5969 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5970 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5971 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5974 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5975 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5977 bfce7f83 2019-07-27 stsp return err;
5978 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5979 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5980 bfce7f83 2019-07-27 stsp free(id_str);
5981 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5985 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5986 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5987 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5988 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5990 bfce7f83 2019-07-27 stsp return NULL;
5993 bfce7f83 2019-07-27 stsp static const struct got_error *
5994 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5995 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5996 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5998 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5999 0ebf8283 2019-07-24 stsp char *editor;
6000 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6002 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6004 0ebf8283 2019-07-24 stsp return err;
6006 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6007 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6008 0ebf8283 2019-07-24 stsp goto done;
6011 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6012 0ebf8283 2019-07-24 stsp if (f == NULL) {
6013 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6014 0ebf8283 2019-07-24 stsp goto done;
6016 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6018 bfce7f83 2019-07-27 stsp goto done;
6020 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6022 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6023 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6024 0ebf8283 2019-07-24 stsp free(editor);
6025 0ebf8283 2019-07-24 stsp return err;
6028 0ebf8283 2019-07-24 stsp static const struct got_error *
6029 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6030 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
6032 0ebf8283 2019-07-24 stsp static const struct got_error *
6033 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6034 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6036 0ebf8283 2019-07-24 stsp const struct got_error *err;
6037 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6038 0ebf8283 2019-07-24 stsp char *path = NULL;
6040 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6042 0ebf8283 2019-07-24 stsp return err;
6044 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
6046 0ebf8283 2019-07-24 stsp goto done;
6048 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6050 0ebf8283 2019-07-24 stsp goto done;
6052 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6053 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6054 0ebf8283 2019-07-24 stsp goto done;
6058 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6059 0ebf8283 2019-07-24 stsp if (err) {
6060 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6061 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6062 0ebf8283 2019-07-24 stsp goto done;
6063 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6064 0ebf8283 2019-07-24 stsp commits, path, repo);
6067 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6068 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6069 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6070 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6071 0ebf8283 2019-07-24 stsp free(path);
6072 0ebf8283 2019-07-24 stsp return err;
6075 0ebf8283 2019-07-24 stsp static const struct got_error *
6076 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6077 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6079 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6080 0ebf8283 2019-07-24 stsp char *path = NULL;
6081 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6082 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6083 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6085 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6087 0ebf8283 2019-07-24 stsp return err;
6089 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6090 0ebf8283 2019-07-24 stsp if (f == NULL) {
6091 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6092 0ebf8283 2019-07-24 stsp goto done;
6094 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6095 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6100 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6101 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6102 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6103 0ebf8283 2019-07-24 stsp if (n < 0) {
6104 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6110 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6111 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6112 0ebf8283 2019-07-24 stsp free(path);
6113 0ebf8283 2019-07-24 stsp if (commit)
6114 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6115 0ebf8283 2019-07-24 stsp return err;
6119 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6121 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6123 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6124 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6125 bfce7f83 2019-07-27 stsp free(hle);
6129 0ebf8283 2019-07-24 stsp static const struct got_error *
6130 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6131 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6133 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6134 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6136 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6137 0ebf8283 2019-07-24 stsp if (f == NULL) {
6138 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6139 0ebf8283 2019-07-24 stsp goto done;
6142 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6144 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6145 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6146 0ebf8283 2019-07-24 stsp return err;
6149 0ebf8283 2019-07-24 stsp static const struct got_error *
6150 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6151 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6152 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6154 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6155 0ebf8283 2019-07-24 stsp int resp = ' ';
6157 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6158 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6159 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6160 0ebf8283 2019-07-24 stsp resp = getchar();
6161 a61a4414 2019-08-07 stsp if (resp == '\n')
6162 a61a4414 2019-08-07 stsp resp = getchar();
6163 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6164 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6165 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6167 426ebf2e 2019-07-25 stsp if (err) {
6168 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6169 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6171 bfce7f83 2019-07-27 stsp prev_err = err;
6172 426ebf2e 2019-07-25 stsp resp = ' ';
6176 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6177 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6178 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6179 0ebf8283 2019-07-24 stsp commits, repo);
6180 426ebf2e 2019-07-25 stsp if (err) {
6181 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6182 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6184 bfce7f83 2019-07-27 stsp prev_err = err;
6185 426ebf2e 2019-07-25 stsp resp = ' ';
6189 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6190 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6193 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6196 0ebf8283 2019-07-24 stsp return err;
6199 0ebf8283 2019-07-24 stsp static const struct got_error *
6200 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6201 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6202 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6204 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6205 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6206 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6207 3e3a69f1 2019-07-25 stsp branch, repo);
6210 0ebf8283 2019-07-24 stsp static const struct got_error *
6211 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6212 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6214 0ebf8283 2019-07-24 stsp const struct got_error *err;
6215 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6217 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6219 0ebf8283 2019-07-24 stsp goto done;
6221 0ebf8283 2019-07-24 stsp if (new_id) {
6222 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6224 0ebf8283 2019-07-24 stsp goto done;
6227 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6228 0ebf8283 2019-07-24 stsp if (new_id_str)
6229 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6231 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6232 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6233 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6234 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6235 0ebf8283 2019-07-24 stsp goto done;
6237 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6239 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6241 0ebf8283 2019-07-24 stsp goto done;
6244 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6245 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6246 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6247 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6248 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6250 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6251 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6252 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6260 0ebf8283 2019-07-24 stsp free(old_id_str);
6261 0ebf8283 2019-07-24 stsp free(new_id_str);
6262 0ebf8283 2019-07-24 stsp return err;
6265 0ebf8283 2019-07-24 stsp static const struct got_error *
6266 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6267 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6268 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6269 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6271 0ebf8283 2019-07-24 stsp const struct got_error *err;
6272 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6273 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6275 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6276 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6277 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6279 0ebf8283 2019-07-24 stsp return err;
6282 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6284 0ebf8283 2019-07-24 stsp return err;
6286 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6287 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6288 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6289 0ebf8283 2019-07-24 stsp if (err) {
6290 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6291 0ebf8283 2019-07-24 stsp goto done;
6292 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6294 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6295 0ebf8283 2019-07-24 stsp free(new_commit_id);
6298 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6299 0ebf8283 2019-07-24 stsp return err;
6302 0ebf8283 2019-07-24 stsp static const struct got_error *
6303 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6304 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6306 0ebf8283 2019-07-24 stsp const struct got_error *error;
6307 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6309 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6311 0ebf8283 2019-07-24 stsp if (error)
6312 0ebf8283 2019-07-24 stsp return error;
6314 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6315 0ebf8283 2019-07-24 stsp if (error)
6316 0ebf8283 2019-07-24 stsp return error;
6318 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6319 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6320 0ebf8283 2019-07-24 stsp return error;
6323 0ebf8283 2019-07-24 stsp static const struct got_error *
6324 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6326 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6327 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6328 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6329 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6330 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6331 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6332 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6333 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6334 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6335 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6336 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6337 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6338 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6339 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6340 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6341 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6342 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6343 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6344 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6345 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6346 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6348 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6349 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6350 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6352 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6353 0ebf8283 2019-07-24 stsp switch (ch) {
6355 0ebf8283 2019-07-24 stsp abort_edit = 1;
6358 0ebf8283 2019-07-24 stsp continue_edit = 1;
6361 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6364 0ebf8283 2019-07-24 stsp usage_histedit();
6365 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6369 0ebf8283 2019-07-24 stsp argc -= optind;
6370 0ebf8283 2019-07-24 stsp argv += optind;
6372 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6373 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6374 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6375 0ebf8283 2019-07-24 stsp err(1, "pledge");
6377 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6378 0ebf8283 2019-07-24 stsp usage_histedit();
6379 0ebf8283 2019-07-24 stsp if (argc != 0)
6380 0ebf8283 2019-07-24 stsp usage_histedit();
6383 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6384 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6385 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6386 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6387 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6388 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6391 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6392 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6393 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6394 0ebf8283 2019-07-24 stsp goto done;
6396 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6397 0ebf8283 2019-07-24 stsp if (error)
6398 0ebf8283 2019-07-24 stsp goto done;
6400 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6402 0ebf8283 2019-07-24 stsp if (error != NULL)
6403 0ebf8283 2019-07-24 stsp goto done;
6405 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6406 0ebf8283 2019-07-24 stsp if (error)
6407 0ebf8283 2019-07-24 stsp goto done;
6408 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6409 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6410 0ebf8283 2019-07-24 stsp goto done;
6413 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6414 0ebf8283 2019-07-24 stsp if (error)
6415 0ebf8283 2019-07-24 stsp goto done;
6417 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6418 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6419 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6420 3e3a69f1 2019-07-25 stsp worktree, repo);
6421 0ebf8283 2019-07-24 stsp if (error)
6422 0ebf8283 2019-07-24 stsp goto done;
6423 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6424 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6425 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6426 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6427 0ebf8283 2019-07-24 stsp if (error)
6428 0ebf8283 2019-07-24 stsp goto done;
6429 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6430 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6431 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6432 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6433 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6434 0ebf8283 2019-07-24 stsp goto done;
6437 0ebf8283 2019-07-24 stsp if (continue_edit) {
6438 0ebf8283 2019-07-24 stsp char *path;
6440 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6441 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6442 0ebf8283 2019-07-24 stsp goto done;
6445 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6446 0ebf8283 2019-07-24 stsp if (error)
6447 0ebf8283 2019-07-24 stsp goto done;
6449 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6450 0ebf8283 2019-07-24 stsp free(path);
6451 0ebf8283 2019-07-24 stsp if (error)
6452 0ebf8283 2019-07-24 stsp goto done;
6454 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6455 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6456 3e3a69f1 2019-07-25 stsp worktree, repo);
6457 0ebf8283 2019-07-24 stsp if (error)
6458 0ebf8283 2019-07-24 stsp goto done;
6460 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6461 0ebf8283 2019-07-24 stsp if (error)
6462 0ebf8283 2019-07-24 stsp goto done;
6464 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6465 0ebf8283 2019-07-24 stsp head_commit_id);
6466 0ebf8283 2019-07-24 stsp if (error)
6467 0ebf8283 2019-07-24 stsp goto done;
6468 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6469 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6470 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6471 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6472 3aac7cf7 2019-07-25 stsp goto done;
6474 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6475 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6476 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6477 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6478 0ebf8283 2019-07-24 stsp commit = NULL;
6479 0ebf8283 2019-07-24 stsp if (error)
6480 0ebf8283 2019-07-24 stsp goto done;
6482 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6483 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6484 0ebf8283 2019-07-24 stsp goto done;
6487 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6488 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6489 0ebf8283 2019-07-24 stsp if (error != NULL)
6490 0ebf8283 2019-07-24 stsp goto done;
6492 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6493 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6494 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6495 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6496 c7d20a3f 2019-07-30 stsp goto done;
6499 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6500 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6501 bfce7f83 2019-07-27 stsp branch = NULL;
6502 0ebf8283 2019-07-24 stsp if (error)
6503 0ebf8283 2019-07-24 stsp goto done;
6505 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6506 0ebf8283 2019-07-24 stsp head_commit_id);
6507 0ebf8283 2019-07-24 stsp if (error)
6508 0ebf8283 2019-07-24 stsp goto done;
6509 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6510 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6511 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6512 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6513 3aac7cf7 2019-07-25 stsp goto done;
6515 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6516 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6517 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6518 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6519 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6520 0ebf8283 2019-07-24 stsp commit = NULL;
6521 0ebf8283 2019-07-24 stsp if (error)
6522 0ebf8283 2019-07-24 stsp goto done;
6524 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6525 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6526 bfce7f83 2019-07-27 stsp if (error)
6527 bfce7f83 2019-07-27 stsp goto done;
6529 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6530 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6531 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6532 6ba2bea2 2019-07-27 stsp if (error) {
6533 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6534 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6535 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6536 0ebf8283 2019-07-24 stsp goto done;
6539 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6541 6ba2bea2 2019-07-27 stsp if (error) {
6542 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6543 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6544 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6545 0ebf8283 2019-07-24 stsp goto done;
6550 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6552 6ba2bea2 2019-07-27 stsp if (error) {
6553 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6554 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6555 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6556 0ebf8283 2019-07-24 stsp goto done;
6561 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6562 4ec14e60 2019-08-28 hiltjo if (error)
6563 0ebf8283 2019-07-24 stsp goto done;
6565 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6566 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6567 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6568 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6571 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6572 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6573 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6574 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6577 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6578 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6580 0ebf8283 2019-07-24 stsp if (error)
6581 0ebf8283 2019-07-24 stsp goto done;
6585 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6586 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6587 0ebf8283 2019-07-24 stsp if (error)
6588 0ebf8283 2019-07-24 stsp goto done;
6592 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6593 0ebf8283 2019-07-24 stsp hle->commit_id);
6594 0ebf8283 2019-07-24 stsp if (error)
6595 0ebf8283 2019-07-24 stsp goto done;
6596 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6597 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6599 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6600 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6601 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6602 0ebf8283 2019-07-24 stsp if (error)
6603 0ebf8283 2019-07-24 stsp goto done;
6604 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6605 0ebf8283 2019-07-24 stsp commit = NULL;
6607 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6608 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6612 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6613 0ebf8283 2019-07-24 stsp char *id_str;
6614 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6615 0ebf8283 2019-07-24 stsp if (error)
6616 0ebf8283 2019-07-24 stsp goto done;
6617 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6619 0ebf8283 2019-07-24 stsp free(id_str);
6620 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6621 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6622 3e3a69f1 2019-07-25 stsp fileindex);
6623 0ebf8283 2019-07-24 stsp goto done;
6626 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6627 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6628 0ebf8283 2019-07-24 stsp if (error)
6629 0ebf8283 2019-07-24 stsp goto done;
6633 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6634 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6635 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6636 0ebf8283 2019-07-24 stsp if (error)
6637 0ebf8283 2019-07-24 stsp goto done;
6640 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6641 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6642 0ebf8283 2019-07-24 stsp if (error)
6643 0ebf8283 2019-07-24 stsp goto done;
6644 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6645 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6647 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6648 3e3a69f1 2019-07-25 stsp branch, repo);
6650 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6651 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6652 0ebf8283 2019-07-24 stsp free(head_commit_id);
6653 0ebf8283 2019-07-24 stsp free(base_commit_id);
6654 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6655 0ebf8283 2019-07-24 stsp if (commit)
6656 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6657 0ebf8283 2019-07-24 stsp if (branch)
6658 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6659 0ebf8283 2019-07-24 stsp if (tmp_branch)
6660 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6661 0ebf8283 2019-07-24 stsp if (worktree)
6662 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6664 2822a352 2019-10-15 stsp got_repo_close(repo);
6665 2822a352 2019-10-15 stsp return error;
6668 2822a352 2019-10-15 stsp __dead static void
6669 2822a352 2019-10-15 stsp usage_integrate(void)
6671 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6675 2822a352 2019-10-15 stsp static const struct got_error *
6676 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6678 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6679 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6680 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6681 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6682 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6683 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6684 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6685 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6686 2822a352 2019-10-15 stsp int ch, did_something = 0;
6688 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6689 2822a352 2019-10-15 stsp switch (ch) {
6691 2822a352 2019-10-15 stsp usage_integrate();
6692 2822a352 2019-10-15 stsp /* NOTREACHED */
6696 2822a352 2019-10-15 stsp argc -= optind;
6697 2822a352 2019-10-15 stsp argv += optind;
6699 2822a352 2019-10-15 stsp if (argc != 1)
6700 2822a352 2019-10-15 stsp usage_integrate();
6701 2822a352 2019-10-15 stsp branch_arg = argv[0];
6703 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6704 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6705 2822a352 2019-10-15 stsp err(1, "pledge");
6707 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6708 2822a352 2019-10-15 stsp if (cwd == NULL) {
6709 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6710 2822a352 2019-10-15 stsp goto done;
6713 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6714 2822a352 2019-10-15 stsp if (error)
6715 2822a352 2019-10-15 stsp goto done;
6717 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6718 2822a352 2019-10-15 stsp if (error)
6719 2822a352 2019-10-15 stsp goto done;
6721 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6723 2822a352 2019-10-15 stsp if (error != NULL)
6724 2822a352 2019-10-15 stsp goto done;
6726 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6727 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6728 2822a352 2019-10-15 stsp if (error)
6729 2822a352 2019-10-15 stsp goto done;
6731 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6732 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6733 2822a352 2019-10-15 stsp goto done;
6736 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6737 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6738 2822a352 2019-10-15 stsp if (error)
6739 2822a352 2019-10-15 stsp goto done;
6741 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6742 2822a352 2019-10-15 stsp if (refname == NULL) {
6743 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6744 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6745 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6746 2822a352 2019-10-15 stsp goto done;
6748 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6749 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6750 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6751 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6752 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6753 2822a352 2019-10-15 stsp goto done;
6756 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6757 2822a352 2019-10-15 stsp if (error)
6758 2822a352 2019-10-15 stsp goto done;
6760 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6761 2822a352 2019-10-15 stsp if (error)
6762 2822a352 2019-10-15 stsp goto done;
6764 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6765 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6766 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6767 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6768 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6769 2822a352 2019-10-15 stsp goto done;
6772 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6773 2822a352 2019-10-15 stsp if (error) {
6774 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6775 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6776 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6777 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6778 2822a352 2019-10-15 stsp goto done;
6781 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6782 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6783 2822a352 2019-10-15 stsp check_cancelled, NULL);
6784 2822a352 2019-10-15 stsp if (error)
6785 2822a352 2019-10-15 stsp goto done;
6787 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6790 715dc77e 2019-08-03 stsp got_repo_close(repo);
6791 2822a352 2019-10-15 stsp if (worktree)
6792 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6793 2822a352 2019-10-15 stsp free(cwd);
6794 2822a352 2019-10-15 stsp free(base_commit_id);
6795 2822a352 2019-10-15 stsp free(commit_id);
6796 2822a352 2019-10-15 stsp free(refname);
6797 2822a352 2019-10-15 stsp free(base_refname);
6798 715dc77e 2019-08-03 stsp return error;
6801 715dc77e 2019-08-03 stsp __dead static void
6802 715dc77e 2019-08-03 stsp usage_stage(void)
6804 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6805 f3055044 2019-08-07 stsp "[file-path ...]\n",
6806 715dc77e 2019-08-03 stsp getprogname());
6810 715dc77e 2019-08-03 stsp static const struct got_error *
6811 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6812 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6813 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6815 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6816 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6818 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6819 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6820 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6821 408b4ebc 2019-08-03 stsp return NULL;
6823 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6824 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6825 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6827 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6829 408b4ebc 2019-08-03 stsp return err;
6831 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6832 408b4ebc 2019-08-03 stsp free(id_str);
6833 dc424a06 2019-08-07 stsp return NULL;
6836 dc424a06 2019-08-07 stsp static const struct got_error *
6837 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6839 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6840 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6841 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6842 715dc77e 2019-08-03 stsp char *cwd = NULL;
6843 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6844 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6845 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6846 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6847 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6848 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6850 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6852 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6853 715dc77e 2019-08-03 stsp switch (ch) {
6855 408b4ebc 2019-08-03 stsp list_stage = 1;
6858 dc424a06 2019-08-07 stsp pflag = 1;
6861 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6864 715dc77e 2019-08-03 stsp usage_stage();
6865 715dc77e 2019-08-03 stsp /* NOTREACHED */
6869 715dc77e 2019-08-03 stsp argc -= optind;
6870 715dc77e 2019-08-03 stsp argv += optind;
6872 715dc77e 2019-08-03 stsp #ifndef PROFILE
6873 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6874 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6875 715dc77e 2019-08-03 stsp err(1, "pledge");
6877 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6878 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6879 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6880 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6882 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6883 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6884 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6885 715dc77e 2019-08-03 stsp goto done;
6888 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6889 715dc77e 2019-08-03 stsp if (error)
6890 715dc77e 2019-08-03 stsp goto done;
6892 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6894 715dc77e 2019-08-03 stsp if (error != NULL)
6895 715dc77e 2019-08-03 stsp goto done;
6897 dc424a06 2019-08-07 stsp if (patch_script_path) {
6898 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6899 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6900 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6901 dc424a06 2019-08-07 stsp patch_script_path);
6902 dc424a06 2019-08-07 stsp goto done;
6905 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6906 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6907 715dc77e 2019-08-03 stsp if (error)
6908 715dc77e 2019-08-03 stsp goto done;
6910 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6911 6d022e97 2019-08-04 stsp if (error)
6912 6d022e97 2019-08-04 stsp goto done;
6914 6d022e97 2019-08-04 stsp if (list_stage)
6915 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6916 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6918 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6919 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6920 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6921 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6922 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6925 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6926 2e1f37b0 2019-08-08 stsp error == NULL)
6927 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6929 ad493afc 2019-08-03 stsp got_repo_close(repo);
6930 ad493afc 2019-08-03 stsp if (worktree)
6931 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6932 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6933 ad493afc 2019-08-03 stsp free((char *)pe->path);
6934 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6935 ad493afc 2019-08-03 stsp free(cwd);
6936 ad493afc 2019-08-03 stsp return error;
6939 ad493afc 2019-08-03 stsp __dead static void
6940 ad493afc 2019-08-03 stsp usage_unstage(void)
6942 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6943 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6944 ad493afc 2019-08-03 stsp getprogname());
6949 ad493afc 2019-08-03 stsp static const struct got_error *
6950 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6952 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6953 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6954 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6955 ad493afc 2019-08-03 stsp char *cwd = NULL;
6956 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6957 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6958 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6959 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6960 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6961 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6963 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6965 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6966 ad493afc 2019-08-03 stsp switch (ch) {
6968 2e1f37b0 2019-08-08 stsp pflag = 1;
6971 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6974 ad493afc 2019-08-03 stsp usage_unstage();
6975 ad493afc 2019-08-03 stsp /* NOTREACHED */
6979 ad493afc 2019-08-03 stsp argc -= optind;
6980 ad493afc 2019-08-03 stsp argv += optind;
6982 ad493afc 2019-08-03 stsp #ifndef PROFILE
6983 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6984 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6985 ad493afc 2019-08-03 stsp err(1, "pledge");
6987 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6988 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6990 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6991 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6992 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6993 ad493afc 2019-08-03 stsp goto done;
6996 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6997 ad493afc 2019-08-03 stsp if (error)
6998 ad493afc 2019-08-03 stsp goto done;
7000 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7002 ad493afc 2019-08-03 stsp if (error != NULL)
7003 ad493afc 2019-08-03 stsp goto done;
7005 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7006 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7007 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7008 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7009 2e1f37b0 2019-08-08 stsp patch_script_path);
7010 2e1f37b0 2019-08-08 stsp goto done;
7014 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7015 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7016 ad493afc 2019-08-03 stsp if (error)
7017 ad493afc 2019-08-03 stsp goto done;
7019 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7020 ad493afc 2019-08-03 stsp if (error)
7021 ad493afc 2019-08-03 stsp goto done;
7023 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7024 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7025 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7026 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7028 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7029 2e1f37b0 2019-08-08 stsp error == NULL)
7030 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7032 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7033 715dc77e 2019-08-03 stsp if (worktree)
7034 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7035 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7036 715dc77e 2019-08-03 stsp free((char *)pe->path);
7037 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7038 715dc77e 2019-08-03 stsp free(cwd);
7039 01073a5d 2019-08-22 stsp return error;
7042 01073a5d 2019-08-22 stsp __dead static void
7043 01073a5d 2019-08-22 stsp usage_cat(void)
7045 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7046 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7050 01073a5d 2019-08-22 stsp static const struct got_error *
7051 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7053 01073a5d 2019-08-22 stsp const struct got_error *err;
7054 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7056 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7058 01073a5d 2019-08-22 stsp return err;
7060 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7061 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7062 01073a5d 2019-08-22 stsp return err;
7065 01073a5d 2019-08-22 stsp static const struct got_error *
7066 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7068 01073a5d 2019-08-22 stsp const struct got_error *err;
7069 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7070 56e0773d 2019-11-28 stsp int nentries, i;
7072 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7074 01073a5d 2019-08-22 stsp return err;
7076 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7077 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7078 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7079 01073a5d 2019-08-22 stsp char *id_str;
7080 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7082 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7083 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7086 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7087 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7088 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7089 01073a5d 2019-08-22 stsp free(id_str);
7092 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7093 01073a5d 2019-08-22 stsp return err;
7096 01073a5d 2019-08-22 stsp static const struct got_error *
7097 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7099 01073a5d 2019-08-22 stsp const struct got_error *err;
7100 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7101 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7102 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7103 01073a5d 2019-08-22 stsp char *id_str = NULL;
7104 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7106 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7108 01073a5d 2019-08-22 stsp return err;
7110 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7112 01073a5d 2019-08-22 stsp goto done;
7114 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7115 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7116 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7117 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7118 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7119 01073a5d 2019-08-22 stsp char *pid_str;
7120 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7122 01073a5d 2019-08-22 stsp goto done;
7123 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7124 01073a5d 2019-08-22 stsp free(pid_str);
7126 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7127 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7128 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7130 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7131 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7132 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7134 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7135 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7136 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7138 01073a5d 2019-08-22 stsp free(id_str);
7139 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7140 01073a5d 2019-08-22 stsp return err;
7143 01073a5d 2019-08-22 stsp static const struct got_error *
7144 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7146 01073a5d 2019-08-22 stsp const struct got_error *err;
7147 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7148 01073a5d 2019-08-22 stsp char *id_str = NULL;
7149 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7151 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7153 01073a5d 2019-08-22 stsp return err;
7155 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7157 01073a5d 2019-08-22 stsp goto done;
7159 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7161 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7162 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7163 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7164 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7166 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7167 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7168 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7170 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7171 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7172 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7174 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7175 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7176 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7182 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7183 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7185 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7186 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7187 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7189 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7190 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7191 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7193 01073a5d 2019-08-22 stsp free(id_str);
7194 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7195 01073a5d 2019-08-22 stsp return err;
7198 01073a5d 2019-08-22 stsp static const struct got_error *
7199 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7201 01073a5d 2019-08-22 stsp const struct got_error *error;
7202 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7203 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7204 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7205 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7206 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7207 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7209 01073a5d 2019-08-22 stsp #ifndef PROFILE
7210 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7211 01073a5d 2019-08-22 stsp NULL) == -1)
7212 01073a5d 2019-08-22 stsp err(1, "pledge");
7215 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7216 01073a5d 2019-08-22 stsp switch (ch) {
7218 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7221 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7222 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7223 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7225 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7228 896e9b6f 2019-08-26 stsp force_path = 1;
7231 01073a5d 2019-08-22 stsp usage_cat();
7232 01073a5d 2019-08-22 stsp /* NOTREACHED */
7236 01073a5d 2019-08-22 stsp argc -= optind;
7237 01073a5d 2019-08-22 stsp argv += optind;
7239 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7240 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7241 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7242 01073a5d 2019-08-22 stsp goto done;
7244 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7245 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7246 01073a5d 2019-08-22 stsp goto done;
7247 01073a5d 2019-08-22 stsp if (worktree) {
7248 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7249 01073a5d 2019-08-22 stsp repo_path = strdup(
7250 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7251 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7252 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7253 01073a5d 2019-08-22 stsp goto done;
7258 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7259 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7260 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7261 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7264 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7265 01073a5d 2019-08-22 stsp free(repo_path);
7266 01073a5d 2019-08-22 stsp if (error != NULL)
7267 01073a5d 2019-08-22 stsp goto done;
7269 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7270 896e9b6f 2019-08-26 stsp if (error)
7271 896e9b6f 2019-08-26 stsp goto done;
7273 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7274 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7275 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7276 01073a5d 2019-08-22 stsp if (error)
7277 01073a5d 2019-08-22 stsp goto done;
7279 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7280 896e9b6f 2019-08-26 stsp if (force_path) {
7281 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7283 896e9b6f 2019-08-26 stsp if (error)
7286 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7287 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7288 896e9b6f 2019-08-26 stsp if (error) {
7289 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7290 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7292 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7293 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7294 896e9b6f 2019-08-26 stsp if (error)
7299 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7300 01073a5d 2019-08-22 stsp if (error)
7303 01073a5d 2019-08-22 stsp switch (obj_type) {
7304 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7305 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7307 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7308 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7310 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7311 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7313 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7314 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7317 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7320 01073a5d 2019-08-22 stsp if (error)
7322 01073a5d 2019-08-22 stsp free(label);
7323 01073a5d 2019-08-22 stsp label = NULL;
7325 01073a5d 2019-08-22 stsp id = NULL;
7329 01073a5d 2019-08-22 stsp free(label);
7331 896e9b6f 2019-08-26 stsp free(commit_id);
7332 01073a5d 2019-08-22 stsp if (worktree)
7333 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7334 01073a5d 2019-08-22 stsp if (repo) {
7335 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7336 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7337 01073a5d 2019-08-22 stsp if (error == NULL)
7338 01073a5d 2019-08-22 stsp error = repo_error;
7340 0ebf8283 2019-07-24 stsp return error;
