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 6841bf13 2019-11-29 kn char *path, int show_patch, char *search_pattern, int diff_context,
1736 6841bf13 2019-11-29 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 6841bf13 2019-11-29 kn char *start_commit = NULL, *search_pattern = NULL;
1843 c0cc5c62 2018-10-18 stsp int diff_context = 3, 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 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1901 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1902 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1903 04ca23f4 2018-07-16 stsp goto done;
1906 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1907 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1908 cffc0aa4 2019-02-05 stsp goto done;
1909 cffc0aa4 2019-02-05 stsp error = NULL;
1911 e7301579 2019-03-18 stsp if (argc == 0) {
1912 cbd1af7a 2019-03-18 stsp path = strdup("");
1913 e7301579 2019-03-18 stsp if (path == NULL) {
1914 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1915 cbd1af7a 2019-03-18 stsp goto done;
1917 e7301579 2019-03-18 stsp } else if (argc == 1) {
1918 e7301579 2019-03-18 stsp if (worktree) {
1919 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1921 e7301579 2019-03-18 stsp if (error)
1922 e7301579 2019-03-18 stsp goto done;
1924 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1925 e7301579 2019-03-18 stsp if (path == NULL) {
1926 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1927 e7301579 2019-03-18 stsp goto done;
1931 cbd1af7a 2019-03-18 stsp usage_log();
1933 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1934 5486daa2 2019-05-11 stsp repo_path = worktree ?
1935 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1937 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1938 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1939 cffc0aa4 2019-02-05 stsp goto done;
1942 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1943 d7d4f210 2018-03-12 stsp if (error != NULL)
1944 04ca23f4 2018-07-16 stsp goto done;
1946 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1947 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1948 c02c541e 2019-03-29 stsp if (error)
1949 c02c541e 2019-03-29 stsp goto done;
1951 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1952 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1953 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1954 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1955 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1956 3235492e 2018-04-01 stsp if (error != NULL)
1957 3235492e 2018-04-01 stsp return error;
1958 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1959 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1960 3235492e 2018-04-01 stsp if (error != NULL)
1961 3235492e 2018-04-01 stsp return error;
1962 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1964 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1965 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1966 3235492e 2018-04-01 stsp if (error == NULL) {
1967 1caad61b 2019-02-01 stsp int obj_type;
1968 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1969 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1970 d1f2edc9 2018-06-13 stsp if (error != NULL)
1971 1caad61b 2019-02-01 stsp goto done;
1972 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1973 1caad61b 2019-02-01 stsp if (error != NULL)
1974 1caad61b 2019-02-01 stsp goto done;
1975 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1976 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
1977 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, 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 (got_object_tag_get_object_type(tag) !=
1981 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
1982 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1983 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1984 1caad61b 2019-02-01 stsp goto done;
1987 1caad61b 2019-02-01 stsp id = got_object_id_dup(
1988 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
1989 1caad61b 2019-02-01 stsp if (id == NULL)
1990 638f9024 2019-05-13 stsp error = got_error_from_errno(
1991 230a42bd 2019-05-11 jcs "got_object_id_dup");
1992 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
1993 1caad61b 2019-02-01 stsp if (error)
1994 1caad61b 2019-02-01 stsp goto done;
1995 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1996 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
1997 1caad61b 2019-02-01 stsp goto done;
1999 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2000 d1f2edc9 2018-06-13 stsp if (error != NULL)
2001 1caad61b 2019-02-01 stsp goto done;
2003 15a94983 2018-12-23 stsp if (commit == NULL) {
2004 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2005 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2006 d1f2edc9 2018-06-13 stsp if (error != NULL)
2007 d1f2edc9 2018-06-13 stsp return error;
2010 d7d4f210 2018-03-12 stsp if (error != NULL)
2011 04ca23f4 2018-07-16 stsp goto done;
2013 deeabeae 2019-08-27 stsp if (worktree) {
2014 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2016 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2017 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2018 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2019 deeabeae 2019-08-27 stsp goto done;
2021 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2024 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2025 04ca23f4 2018-07-16 stsp if (error != NULL)
2026 04ca23f4 2018-07-16 stsp goto done;
2027 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2028 04ca23f4 2018-07-16 stsp free(path);
2029 04ca23f4 2018-07-16 stsp path = in_repo_path;
2032 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2033 199a4027 2019-02-02 stsp if (error)
2034 199a4027 2019-02-02 stsp goto done;
2036 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2037 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
2039 04ca23f4 2018-07-16 stsp free(path);
2040 04ca23f4 2018-07-16 stsp free(repo_path);
2041 04ca23f4 2018-07-16 stsp free(cwd);
2043 cffc0aa4 2019-02-05 stsp if (worktree)
2044 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2045 ad242220 2018-09-08 stsp if (repo) {
2046 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2047 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2048 ad242220 2018-09-08 stsp if (error == NULL)
2049 ad242220 2018-09-08 stsp error = repo_error;
2051 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2052 8bf5b3c9 2018-03-17 stsp return error;
2055 4ed7e80c 2018-05-20 stsp __dead static void
2056 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2058 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2059 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2063 b72f483a 2019-02-05 stsp struct print_diff_arg {
2064 b72f483a 2019-02-05 stsp struct got_repository *repo;
2065 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2066 b72f483a 2019-02-05 stsp int diff_context;
2067 3fc0c068 2019-02-10 stsp const char *id_str;
2068 3fc0c068 2019-02-10 stsp int header_shown;
2069 98eaaa12 2019-08-03 stsp int diff_staged;
2070 63035f9f 2019-10-06 stsp int ignore_whitespace;
2073 4ed7e80c 2018-05-20 stsp static const struct got_error *
2074 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2075 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2076 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2078 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2079 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2080 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2081 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2082 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2083 b72f483a 2019-02-05 stsp struct stat sb;
2085 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2086 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2087 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2088 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2089 98eaaa12 2019-08-03 stsp return NULL;
2091 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2092 98eaaa12 2019-08-03 stsp return NULL;
2093 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2094 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2095 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2096 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2097 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2098 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2099 98eaaa12 2019-08-03 stsp return NULL;
2102 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2103 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2104 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2105 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2106 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2109 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2110 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2111 98eaaa12 2019-08-03 stsp switch (staged_status) {
2112 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2113 98eaaa12 2019-08-03 stsp label1 = path;
2114 98eaaa12 2019-08-03 stsp label2 = path;
2116 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2117 98eaaa12 2019-08-03 stsp label2 = path;
2119 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2120 98eaaa12 2019-08-03 stsp label1 = path;
2123 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2125 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2126 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2127 63035f9f 2019-10-06 stsp a->repo, stdout);
2130 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2131 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2132 4ce46740 2019-08-08 stsp char *id_str;
2133 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2136 4ce46740 2019-08-08 stsp goto done;
2137 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2139 4ce46740 2019-08-08 stsp goto done;
2140 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2141 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2142 4ce46740 2019-08-08 stsp free(id_str);
2143 4ce46740 2019-08-08 stsp goto done;
2145 4ce46740 2019-08-08 stsp free(id_str);
2146 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2147 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2149 4ce46740 2019-08-08 stsp goto done;
2152 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2153 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2154 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2155 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2156 2ec1f75b 2019-03-26 stsp goto done;
2159 2ec1f75b 2019-03-26 stsp f2 = fopen(abspath, "r");
2160 2ec1f75b 2019-03-26 stsp if (f2 == NULL) {
2161 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
2162 2ec1f75b 2019-03-26 stsp goto done;
2164 2ec1f75b 2019-03-26 stsp if (lstat(abspath, &sb) == -1) {
2165 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
2166 2ec1f75b 2019-03-26 stsp goto done;
2169 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2171 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2172 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2174 b72f483a 2019-02-05 stsp if (blob1)
2175 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2176 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
2177 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2178 b72f483a 2019-02-05 stsp free(abspath);
2179 927df6b7 2019-02-10 stsp return err;
2182 927df6b7 2019-02-10 stsp static const struct got_error *
2183 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2184 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2185 01073a5d 2019-08-22 stsp struct got_repository *repo)
2187 0adb7196 2019-08-11 stsp const struct got_error *err;
2188 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2189 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2191 0adb7196 2019-08-11 stsp *id = NULL;
2192 0adb7196 2019-08-11 stsp *label = NULL;
2194 01073a5d 2019-08-22 stsp if (resolve_tags) {
2195 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2197 01073a5d 2019-08-22 stsp if (err == NULL) {
2198 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2199 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2200 01073a5d 2019-08-22 stsp if (*id == NULL)
2201 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2202 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2203 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2204 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2205 32f0ab81 2019-08-28 hiltjo free(*id);
2206 01073a5d 2019-08-22 stsp *id = NULL;
2208 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2209 01073a5d 2019-08-22 stsp return err;
2210 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2211 01073a5d 2019-08-22 stsp return err;
2214 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2215 0adb7196 2019-08-11 stsp if (err) {
2216 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2217 0adb7196 2019-08-11 stsp return err;
2218 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2219 0adb7196 2019-08-11 stsp if (err != NULL)
2220 0adb7196 2019-08-11 stsp goto done;
2221 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2222 0adb7196 2019-08-11 stsp if (*label == NULL) {
2223 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2224 0adb7196 2019-08-11 stsp goto done;
2226 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2228 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2229 0adb7196 2019-08-11 stsp if (*label == NULL) {
2230 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2231 0adb7196 2019-08-11 stsp goto done;
2236 0adb7196 2019-08-11 stsp got_ref_close(ref);
2237 0adb7196 2019-08-11 stsp return err;
2241 0adb7196 2019-08-11 stsp static const struct got_error *
2242 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2244 b00d56cd 2018-04-01 stsp const struct got_error *error;
2245 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2246 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2247 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2248 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2249 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2250 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2251 15a94983 2018-12-23 stsp int type1, type2;
2252 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2253 c0cc5c62 2018-10-18 stsp const char *errstr;
2254 927df6b7 2019-02-10 stsp char *path = NULL;
2256 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2257 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2258 25eccc22 2019-01-04 stsp NULL) == -1)
2259 b00d56cd 2018-04-01 stsp err(1, "pledge");
2262 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2263 b00d56cd 2018-04-01 stsp switch (ch) {
2265 c0cc5c62 2018-10-18 stsp diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
2266 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2267 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2270 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2271 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2272 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2274 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2277 98eaaa12 2019-08-03 stsp diff_staged = 1;
2280 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2283 2deda0b9 2019-03-07 stsp usage_diff();
2284 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2288 b00d56cd 2018-04-01 stsp argc -= optind;
2289 b00d56cd 2018-04-01 stsp argv += optind;
2291 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2292 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2293 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2294 b72f483a 2019-02-05 stsp goto done;
2296 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2297 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2298 927df6b7 2019-02-10 stsp goto done;
2299 927df6b7 2019-02-10 stsp if (argc <= 1) {
2300 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2301 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2302 927df6b7 2019-02-10 stsp goto done;
2304 b72f483a 2019-02-05 stsp if (repo_path)
2306 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2307 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2308 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2309 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2310 927df6b7 2019-02-10 stsp goto done;
2312 927df6b7 2019-02-10 stsp if (argc == 1) {
2313 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2315 927df6b7 2019-02-10 stsp if (error)
2316 927df6b7 2019-02-10 stsp goto done;
2318 927df6b7 2019-02-10 stsp path = strdup("");
2319 927df6b7 2019-02-10 stsp if (path == NULL) {
2320 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2321 927df6b7 2019-02-10 stsp goto done;
2324 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2325 98eaaa12 2019-08-03 stsp if (diff_staged)
2326 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2327 98eaaa12 2019-08-03 stsp "objects in repository");
2328 15a94983 2018-12-23 stsp id_str1 = argv[0];
2329 15a94983 2018-12-23 stsp id_str2 = argv[1];
2330 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2331 30db809c 2019-06-05 stsp repo_path =
2332 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2333 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2334 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2335 30db809c 2019-06-05 stsp goto done;
2339 b00d56cd 2018-04-01 stsp usage_diff();
2341 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2342 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2343 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2344 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2347 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2348 76089277 2018-04-01 stsp free(repo_path);
2349 b00d56cd 2018-04-01 stsp if (error != NULL)
2350 b00d56cd 2018-04-01 stsp goto done;
2352 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2353 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2354 c02c541e 2019-03-29 stsp if (error)
2355 c02c541e 2019-03-29 stsp goto done;
2357 30db809c 2019-06-05 stsp if (argc <= 1) {
2358 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2359 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2360 b72f483a 2019-02-05 stsp char *id_str;
2362 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2364 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2365 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2366 b72f483a 2019-02-05 stsp if (error)
2367 b72f483a 2019-02-05 stsp goto done;
2368 b72f483a 2019-02-05 stsp arg.repo = repo;
2369 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2370 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2371 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2372 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2373 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2374 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2376 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2377 72ea6654 2019-07-27 stsp if (error)
2378 72ea6654 2019-07-27 stsp goto done;
2380 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2381 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2382 b72f483a 2019-02-05 stsp free(id_str);
2383 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2384 b72f483a 2019-02-05 stsp goto done;
2387 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2389 0adb7196 2019-08-11 stsp if (error)
2390 0adb7196 2019-08-11 stsp goto done;
2392 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2394 0adb7196 2019-08-11 stsp if (error)
2395 0adb7196 2019-08-11 stsp goto done;
2397 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2398 15a94983 2018-12-23 stsp if (error)
2399 15a94983 2018-12-23 stsp goto done;
2401 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2402 15a94983 2018-12-23 stsp if (error)
2403 15a94983 2018-12-23 stsp goto done;
2405 15a94983 2018-12-23 stsp if (type1 != type2) {
2406 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2407 b00d56cd 2018-04-01 stsp goto done;
2410 15a94983 2018-12-23 stsp switch (type1) {
2411 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2412 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2413 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2415 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2416 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2417 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2419 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2420 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2421 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2422 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2425 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2429 5e70831e 2019-05-28 stsp free(label1);
2430 5e70831e 2019-05-28 stsp free(label2);
2431 15a94983 2018-12-23 stsp free(id1);
2432 15a94983 2018-12-23 stsp free(id2);
2433 927df6b7 2019-02-10 stsp free(path);
2434 b72f483a 2019-02-05 stsp if (worktree)
2435 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2436 ad242220 2018-09-08 stsp if (repo) {
2437 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2438 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2439 ad242220 2018-09-08 stsp if (error == NULL)
2440 ad242220 2018-09-08 stsp error = repo_error;
2442 b00d56cd 2018-04-01 stsp return error;
2445 404c43c4 2018-06-21 stsp __dead static void
2446 404c43c4 2018-06-21 stsp usage_blame(void)
2448 9270e621 2019-02-05 stsp fprintf(stderr,
2449 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2450 404c43c4 2018-06-21 stsp getprogname());
2454 28315671 2019-08-14 stsp struct blame_line {
2455 28315671 2019-08-14 stsp int annotated;
2456 28315671 2019-08-14 stsp char *id_str;
2457 82f6abb8 2019-08-14 stsp char *committer;
2458 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2461 28315671 2019-08-14 stsp struct blame_cb_args {
2462 28315671 2019-08-14 stsp struct blame_line *lines;
2463 28315671 2019-08-14 stsp int nlines;
2464 7ef28ff8 2019-08-14 stsp int nlines_prec;
2465 28315671 2019-08-14 stsp int lineno_cur;
2466 28315671 2019-08-14 stsp off_t *line_offsets;
2468 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2471 404c43c4 2018-06-21 stsp static const struct got_error *
2472 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2474 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2475 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2476 28315671 2019-08-14 stsp struct blame_line *bline;
2477 82f6abb8 2019-08-14 stsp char *line = NULL;
2478 28315671 2019-08-14 stsp size_t linesize = 0;
2479 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2480 28315671 2019-08-14 stsp off_t offset;
2481 bcb49d15 2019-08-14 stsp struct tm tm;
2482 bcb49d15 2019-08-14 stsp time_t committer_time;
2484 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2485 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2486 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2488 28315671 2019-08-14 stsp if (sigint_received)
2489 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2491 2839f8b9 2019-08-18 stsp if (lineno == -1)
2492 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2494 28315671 2019-08-14 stsp /* Annotate this line. */
2495 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2496 28315671 2019-08-14 stsp if (bline->annotated)
2497 28315671 2019-08-14 stsp return NULL;
2498 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2500 28315671 2019-08-14 stsp return err;
2502 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2504 82f6abb8 2019-08-14 stsp goto done;
2506 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2507 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2508 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2509 bcb49d15 2019-08-14 stsp goto done;
2512 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2513 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2514 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2515 11db6024 2019-10-21 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G/%m/%d",
2516 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2517 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2518 82f6abb8 2019-08-14 stsp goto done;
2520 28315671 2019-08-14 stsp bline->annotated = 1;
2522 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2523 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2524 28315671 2019-08-14 stsp if (!bline->annotated)
2525 82f6abb8 2019-08-14 stsp goto done;
2527 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2528 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2529 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2530 82f6abb8 2019-08-14 stsp goto done;
2533 28315671 2019-08-14 stsp while (bline->annotated) {
2534 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2535 82f6abb8 2019-08-14 stsp size_t len;
2537 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2538 28315671 2019-08-14 stsp if (ferror(a->f))
2539 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2543 82f6abb8 2019-08-14 stsp committer = bline->committer;
2544 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2545 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2546 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2547 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2549 82f6abb8 2019-08-14 stsp *at = '\0';
2550 82f6abb8 2019-08-14 stsp len = strlen(committer);
2551 82f6abb8 2019-08-14 stsp if (len >= 9)
2552 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2554 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2556 28315671 2019-08-14 stsp *nl = '\0';
2557 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2558 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2560 28315671 2019-08-14 stsp a->lineno_cur++;
2561 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2564 82f6abb8 2019-08-14 stsp if (commit)
2565 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2566 28315671 2019-08-14 stsp free(line);
2567 28315671 2019-08-14 stsp return err;
2570 28315671 2019-08-14 stsp static const struct got_error *
2571 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2573 404c43c4 2018-06-21 stsp const struct got_error *error;
2574 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2575 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2576 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2577 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2578 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2579 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2580 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2581 28315671 2019-08-14 stsp struct blame_cb_args bca;
2582 28315671 2019-08-14 stsp int ch, obj_type, i;
2583 b02560ec 2019-08-19 stsp size_t filesize;
2585 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2587 404c43c4 2018-06-21 stsp #ifndef PROFILE
2588 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2589 36e2fb66 2019-01-04 stsp NULL) == -1)
2590 404c43c4 2018-06-21 stsp err(1, "pledge");
2593 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2594 404c43c4 2018-06-21 stsp switch (ch) {
2596 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2599 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2600 66bea077 2018-08-02 stsp if (repo_path == NULL)
2601 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2603 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2606 2deda0b9 2019-03-07 stsp usage_blame();
2607 404c43c4 2018-06-21 stsp /* NOTREACHED */
2611 404c43c4 2018-06-21 stsp argc -= optind;
2612 404c43c4 2018-06-21 stsp argv += optind;
2614 a39318fd 2018-08-02 stsp if (argc == 1)
2615 404c43c4 2018-06-21 stsp path = argv[0];
2617 404c43c4 2018-06-21 stsp usage_blame();
2619 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2620 66bea077 2018-08-02 stsp if (cwd == NULL) {
2621 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2622 66bea077 2018-08-02 stsp goto done;
2624 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2625 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2626 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2627 66bea077 2018-08-02 stsp goto done;
2629 0c06baac 2019-02-05 stsp error = NULL;
2630 0c06baac 2019-02-05 stsp if (worktree) {
2631 0c06baac 2019-02-05 stsp repo_path =
2632 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2633 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2634 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2635 0c06baac 2019-02-05 stsp if (error)
2636 0c06baac 2019-02-05 stsp goto done;
2638 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
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 goto done;
2646 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2647 c02c541e 2019-03-29 stsp if (error != NULL)
2648 36e2fb66 2019-01-04 stsp goto done;
2650 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2651 c02c541e 2019-03-29 stsp if (error)
2652 404c43c4 2018-06-21 stsp goto done;
2654 0c06baac 2019-02-05 stsp if (worktree) {
2655 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2656 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2657 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2658 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2659 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2660 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2661 6efaaa2d 2019-02-05 stsp path) == -1) {
2662 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2663 0c06baac 2019-02-05 stsp goto done;
2665 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2668 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2670 0c06baac 2019-02-05 stsp if (error)
2671 66bea077 2018-08-02 stsp goto done;
2673 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2674 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2675 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2676 404c43c4 2018-06-21 stsp if (error != NULL)
2677 66bea077 2018-08-02 stsp goto done;
2678 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2679 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2680 404c43c4 2018-06-21 stsp if (error != NULL)
2681 66bea077 2018-08-02 stsp goto done;
2683 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2684 30837e32 2019-07-25 stsp if (error)
2685 66bea077 2018-08-02 stsp goto done;
2688 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2689 28315671 2019-08-14 stsp if (error)
2690 28315671 2019-08-14 stsp goto done;
2691 28315671 2019-08-14 stsp if (obj_id == NULL) {
2692 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2693 28315671 2019-08-14 stsp goto done;
2696 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2697 28315671 2019-08-14 stsp if (error)
2698 28315671 2019-08-14 stsp goto done;
2700 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2701 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2702 28315671 2019-08-14 stsp goto done;
2705 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2706 28315671 2019-08-14 stsp if (error)
2707 28315671 2019-08-14 stsp goto done;
2708 28315671 2019-08-14 stsp bca.f = got_opentemp();
2709 28315671 2019-08-14 stsp if (bca.f == NULL) {
2710 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2711 28315671 2019-08-14 stsp goto done;
2713 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2714 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2715 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2716 28315671 2019-08-14 stsp goto done;
2718 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2719 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2720 b02560ec 2019-08-19 stsp bca.nlines--;
2722 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2723 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2724 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2725 28315671 2019-08-14 stsp goto done;
2727 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2728 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2729 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2730 7ef28ff8 2019-08-14 stsp while (i > 0) {
2732 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2734 82f6abb8 2019-08-14 stsp bca.repo = repo;
2736 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2737 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2738 28315671 2019-08-14 stsp if (error)
2739 28315671 2019-08-14 stsp goto done;
2741 66bea077 2018-08-02 stsp free(in_repo_path);
2742 66bea077 2018-08-02 stsp free(repo_path);
2743 66bea077 2018-08-02 stsp free(cwd);
2744 404c43c4 2018-06-21 stsp free(commit_id);
2745 28315671 2019-08-14 stsp free(obj_id);
2747 28315671 2019-08-14 stsp got_object_blob_close(blob);
2748 0c06baac 2019-02-05 stsp if (worktree)
2749 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2750 ad242220 2018-09-08 stsp if (repo) {
2751 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2752 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2753 ad242220 2018-09-08 stsp if (error == NULL)
2754 ad242220 2018-09-08 stsp error = repo_error;
2756 3affba96 2019-09-22 stsp if (bca.lines) {
2757 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2758 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2759 3affba96 2019-09-22 stsp free(bline->id_str);
2760 3affba96 2019-09-22 stsp free(bline->committer);
2762 3affba96 2019-09-22 stsp free(bca.lines);
2764 28315671 2019-08-14 stsp free(bca.line_offsets);
2765 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2766 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2767 404c43c4 2018-06-21 stsp return error;
2770 5de5890b 2018-10-18 stsp __dead static void
2771 5de5890b 2018-10-18 stsp usage_tree(void)
2773 c1669e2e 2019-01-09 stsp fprintf(stderr,
2774 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2775 5de5890b 2018-10-18 stsp getprogname());
2779 c1669e2e 2019-01-09 stsp static void
2780 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2781 c1669e2e 2019-01-09 stsp const char *root_path)
2783 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2784 848d6979 2019-08-12 stsp const char *modestr = "";
2785 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2787 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2788 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2791 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2792 63c5ca5d 2019-08-24 stsp modestr = "$";
2793 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2794 848d6979 2019-08-12 stsp modestr = "@";
2795 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2796 848d6979 2019-08-12 stsp modestr = "/";
2797 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2798 848d6979 2019-08-12 stsp modestr = "*";
2800 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2801 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2804 5de5890b 2018-10-18 stsp static const struct got_error *
2805 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2806 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2807 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2809 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2810 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2811 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2812 56e0773d 2019-11-28 stsp int nentries, i;
2814 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2816 5de5890b 2018-10-18 stsp goto done;
2818 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2820 5de5890b 2018-10-18 stsp goto done;
2821 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2822 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2823 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2824 5de5890b 2018-10-18 stsp char *id = NULL;
2826 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2829 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2830 5de5890b 2018-10-18 stsp if (show_ids) {
2831 5de5890b 2018-10-18 stsp char *id_str;
2832 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2833 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2835 5de5890b 2018-10-18 stsp goto done;
2836 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2837 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2838 5de5890b 2018-10-18 stsp free(id_str);
2839 5de5890b 2018-10-18 stsp goto done;
2841 5de5890b 2018-10-18 stsp free(id_str);
2843 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2846 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2847 c1669e2e 2019-01-09 stsp char *child_path;
2848 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2849 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2850 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2851 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2852 c1669e2e 2019-01-09 stsp goto done;
2854 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2855 c1669e2e 2019-01-09 stsp root_path, repo);
2856 c1669e2e 2019-01-09 stsp free(child_path);
2858 c1669e2e 2019-01-09 stsp goto done;
2863 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2864 5de5890b 2018-10-18 stsp free(tree_id);
2865 5de5890b 2018-10-18 stsp return err;
2868 5de5890b 2018-10-18 stsp static const struct got_error *
2869 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2871 5de5890b 2018-10-18 stsp const struct got_error *error;
2872 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2873 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2874 7a2c19d6 2019-02-05 stsp const char *path;
2875 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2876 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2877 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2878 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2881 5de5890b 2018-10-18 stsp #ifndef PROFILE
2882 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2883 0f8d269b 2019-01-04 stsp NULL) == -1)
2884 5de5890b 2018-10-18 stsp err(1, "pledge");
2887 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2888 5de5890b 2018-10-18 stsp switch (ch) {
2890 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2893 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2894 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2895 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2897 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2900 5de5890b 2018-10-18 stsp show_ids = 1;
2903 c1669e2e 2019-01-09 stsp recurse = 1;
2906 2deda0b9 2019-03-07 stsp usage_tree();
2907 5de5890b 2018-10-18 stsp /* NOTREACHED */
2911 5de5890b 2018-10-18 stsp argc -= optind;
2912 5de5890b 2018-10-18 stsp argv += optind;
2914 5de5890b 2018-10-18 stsp if (argc == 1)
2915 5de5890b 2018-10-18 stsp path = argv[0];
2916 5de5890b 2018-10-18 stsp else if (argc > 1)
2917 5de5890b 2018-10-18 stsp usage_tree();
2919 7a2c19d6 2019-02-05 stsp path = NULL;
2921 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2922 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2923 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2924 9bf7a39b 2019-02-05 stsp goto done;
2926 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2927 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2928 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2929 7a2c19d6 2019-02-05 stsp goto done;
2931 7a2c19d6 2019-02-05 stsp error = NULL;
2932 7a2c19d6 2019-02-05 stsp if (worktree) {
2933 7a2c19d6 2019-02-05 stsp repo_path =
2934 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2935 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2936 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2937 7a2c19d6 2019-02-05 stsp if (error)
2938 7a2c19d6 2019-02-05 stsp goto done;
2940 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
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 goto done;
2948 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2949 5de5890b 2018-10-18 stsp if (error != NULL)
2950 c02c541e 2019-03-29 stsp goto done;
2952 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2953 c02c541e 2019-03-29 stsp if (error)
2954 5de5890b 2018-10-18 stsp goto done;
2956 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2957 9bf7a39b 2019-02-05 stsp if (worktree) {
2958 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2959 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2960 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
2961 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
2962 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
2963 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2964 9bf7a39b 2019-02-05 stsp goto done;
2966 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2968 9bf7a39b 2019-02-05 stsp if (error)
2969 9bf7a39b 2019-02-05 stsp goto done;
2971 9bf7a39b 2019-02-05 stsp path = "/";
2973 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
2974 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2975 9bf7a39b 2019-02-05 stsp if (error != NULL)
2976 9bf7a39b 2019-02-05 stsp goto done;
2979 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
2980 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
2981 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2982 5de5890b 2018-10-18 stsp if (error != NULL)
2983 5de5890b 2018-10-18 stsp goto done;
2984 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2985 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
2986 5de5890b 2018-10-18 stsp if (error != NULL)
2987 5de5890b 2018-10-18 stsp goto done;
2989 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2990 30837e32 2019-07-25 stsp if (error)
2991 5de5890b 2018-10-18 stsp goto done;
2994 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2995 c1669e2e 2019-01-09 stsp in_repo_path, repo);
2997 5de5890b 2018-10-18 stsp free(in_repo_path);
2998 5de5890b 2018-10-18 stsp free(repo_path);
2999 5de5890b 2018-10-18 stsp free(cwd);
3000 5de5890b 2018-10-18 stsp free(commit_id);
3001 7a2c19d6 2019-02-05 stsp if (worktree)
3002 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3003 5de5890b 2018-10-18 stsp if (repo) {
3004 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3005 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3006 5de5890b 2018-10-18 stsp if (error == NULL)
3007 5de5890b 2018-10-18 stsp error = repo_error;
3009 5de5890b 2018-10-18 stsp return error;
3012 6bad629b 2019-02-04 stsp __dead static void
3013 6bad629b 2019-02-04 stsp usage_status(void)
3015 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3019 b72f483a 2019-02-05 stsp static const struct got_error *
3020 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3021 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3022 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3024 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3025 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3026 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3027 b72f483a 2019-02-05 stsp return NULL;
3030 6bad629b 2019-02-04 stsp static const struct got_error *
3031 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3033 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3034 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3035 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3036 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3037 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3038 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3041 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3043 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3044 6bad629b 2019-02-04 stsp switch (ch) {
3046 2deda0b9 2019-03-07 stsp usage_status();
3047 6bad629b 2019-02-04 stsp /* NOTREACHED */
3051 6bad629b 2019-02-04 stsp argc -= optind;
3052 6bad629b 2019-02-04 stsp argv += optind;
3054 6bad629b 2019-02-04 stsp #ifndef PROFILE
3055 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3056 6bad629b 2019-02-04 stsp NULL) == -1)
3057 6bad629b 2019-02-04 stsp err(1, "pledge");
3059 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3060 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3061 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3062 927df6b7 2019-02-10 stsp goto done;
3065 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3066 927df6b7 2019-02-10 stsp if (error != NULL)
3067 a5edda0a 2019-07-27 stsp goto done;
3069 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3071 6bad629b 2019-02-04 stsp if (error != NULL)
3072 6bad629b 2019-02-04 stsp goto done;
3074 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3075 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3076 087fb88c 2019-08-04 stsp if (error)
3077 087fb88c 2019-08-04 stsp goto done;
3079 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3080 6bad629b 2019-02-04 stsp if (error)
3081 6bad629b 2019-02-04 stsp goto done;
3083 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3084 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3086 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3087 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3088 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3089 927df6b7 2019-02-10 stsp free(cwd);
3090 d0eebce4 2019-03-11 stsp return error;
3093 d0eebce4 2019-03-11 stsp __dead static void
3094 d0eebce4 2019-03-11 stsp usage_ref(void)
3096 d0eebce4 2019-03-11 stsp fprintf(stderr,
3097 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3098 d0eebce4 2019-03-11 stsp getprogname());
3102 d0eebce4 2019-03-11 stsp static const struct got_error *
3103 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3105 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3106 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3107 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3109 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3110 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3112 d0eebce4 2019-03-11 stsp return err;
3114 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3115 d0eebce4 2019-03-11 stsp char *refstr;
3116 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3117 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3118 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3119 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3120 d0eebce4 2019-03-11 stsp free(refstr);
3123 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3124 d0eebce4 2019-03-11 stsp return NULL;
3127 d0eebce4 2019-03-11 stsp static const struct got_error *
3128 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3130 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3131 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3133 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3135 d0eebce4 2019-03-11 stsp return err;
3137 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3138 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3139 d0eebce4 2019-03-11 stsp return err;
3142 d0eebce4 2019-03-11 stsp static const struct got_error *
3143 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3145 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3146 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3147 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3150 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3151 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3152 d1644381 2019-07-14 stsp * an unintended typo.
3154 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3155 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3157 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3159 d83d9d5c 2019-05-13 stsp if (err) {
3160 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3162 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3163 d83d9d5c 2019-05-13 stsp return err;
3164 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3166 d83d9d5c 2019-05-13 stsp return err;
3167 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3168 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3170 d83d9d5c 2019-05-13 stsp return err;
3173 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3175 d0eebce4 2019-03-11 stsp goto done;
3177 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3180 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3182 d1c1ae5f 2019-08-12 stsp return err;
3185 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3186 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3188 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3189 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3190 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3193 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3194 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3195 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3197 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3198 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3200 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3202 d1c1ae5f 2019-08-12 stsp return err;
3204 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3206 d1c1ae5f 2019-08-12 stsp goto done;
3208 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3210 d1c1ae5f 2019-08-12 stsp if (target_ref)
3211 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3213 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3214 d0eebce4 2019-03-11 stsp return err;
3217 d0eebce4 2019-03-11 stsp static const struct got_error *
3218 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3220 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3221 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3222 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3223 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3224 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3225 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3227 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3228 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3229 d0eebce4 2019-03-11 stsp switch (ch) {
3231 d0eebce4 2019-03-11 stsp delref = optarg;
3234 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3235 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3236 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3238 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3241 d0eebce4 2019-03-11 stsp do_list = 1;
3244 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3247 d0eebce4 2019-03-11 stsp usage_ref();
3248 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3252 d0eebce4 2019-03-11 stsp if (do_list && delref)
3253 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3255 d0eebce4 2019-03-11 stsp argc -= optind;
3256 d0eebce4 2019-03-11 stsp argv += optind;
3258 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3259 d1c1ae5f 2019-08-12 stsp if (create_symref)
3260 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3261 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3262 d0eebce4 2019-03-11 stsp if (argc > 0)
3263 d0eebce4 2019-03-11 stsp usage_ref();
3264 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3265 d0eebce4 2019-03-11 stsp usage_ref();
3267 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3268 e0b57350 2019-03-12 stsp if (do_list) {
3269 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3270 e0b57350 2019-03-12 stsp NULL) == -1)
3271 e0b57350 2019-03-12 stsp err(1, "pledge");
3273 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3274 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3275 e0b57350 2019-03-12 stsp err(1, "pledge");
3278 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3279 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3280 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3281 d0eebce4 2019-03-11 stsp goto done;
3284 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3285 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3286 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3287 d0eebce4 2019-03-11 stsp goto done;
3289 d0eebce4 2019-03-11 stsp error = NULL;
3290 d0eebce4 2019-03-11 stsp if (worktree) {
3291 d0eebce4 2019-03-11 stsp repo_path =
3292 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3293 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3294 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3295 d0eebce4 2019-03-11 stsp if (error)
3296 d0eebce4 2019-03-11 stsp goto done;
3298 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
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 goto done;
3306 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3307 d0eebce4 2019-03-11 stsp if (error != NULL)
3308 d0eebce4 2019-03-11 stsp goto done;
3310 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3311 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3312 c02c541e 2019-03-29 stsp if (error)
3313 c02c541e 2019-03-29 stsp goto done;
3315 d0eebce4 2019-03-11 stsp if (do_list)
3316 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3317 d0eebce4 2019-03-11 stsp else if (delref)
3318 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3319 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3320 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3322 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3325 4e759de4 2019-06-26 stsp got_repo_close(repo);
3326 4e759de4 2019-06-26 stsp if (worktree)
3327 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3328 4e759de4 2019-06-26 stsp free(cwd);
3329 4e759de4 2019-06-26 stsp free(repo_path);
3330 4e759de4 2019-06-26 stsp return error;
3333 4e759de4 2019-06-26 stsp __dead static void
3334 4e759de4 2019-06-26 stsp usage_branch(void)
3336 4e759de4 2019-06-26 stsp fprintf(stderr,
3337 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3338 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3342 4e759de4 2019-06-26 stsp static const struct got_error *
3343 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3344 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3346 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3347 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3348 4e99b47e 2019-10-04 stsp char *refstr;
3350 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3351 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3352 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3353 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3355 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3357 4e99b47e 2019-10-04 stsp return err;
3358 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3359 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3360 4e99b47e 2019-10-04 stsp marker = "* ";
3362 4e99b47e 2019-10-04 stsp marker = "~ ";
3366 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3367 4e99b47e 2019-10-04 stsp refname += 11;
3368 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3369 4e99b47e 2019-10-04 stsp refname += 18;
3371 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3372 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3373 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3375 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3376 4e99b47e 2019-10-04 stsp free(refstr);
3377 4e99b47e 2019-10-04 stsp return NULL;
3380 4e99b47e 2019-10-04 stsp static const struct got_error *
3381 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3383 ad89fa31 2019-10-04 stsp const char *refname;
3385 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3386 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3388 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3390 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3391 ad89fa31 2019-10-04 stsp refname += 11;
3392 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3393 ad89fa31 2019-10-04 stsp refname += 18;
3395 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3397 ad89fa31 2019-10-04 stsp return NULL;
3400 ad89fa31 2019-10-04 stsp static const struct got_error *
3401 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3403 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3404 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3405 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3406 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3407 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3409 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3411 4e99b47e 2019-10-04 stsp if (worktree) {
3412 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3413 4e99b47e 2019-10-04 stsp worktree);
3415 4e99b47e 2019-10-04 stsp return err;
3417 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3418 4e99b47e 2019-10-04 stsp worktree);
3420 4e99b47e 2019-10-04 stsp return err;
3422 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3423 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3424 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3426 4e99b47e 2019-10-04 stsp return err;
3427 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3428 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3432 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3433 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3435 4e759de4 2019-06-26 stsp return err;
3437 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3438 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3440 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3441 4e759de4 2019-06-26 stsp return NULL;
3444 4e759de4 2019-06-26 stsp static const struct got_error *
3445 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3446 45cd4e47 2019-08-25 stsp const char *branch_name)
3448 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3449 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3450 4e759de4 2019-06-26 stsp char *refname;
3452 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3453 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3455 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3457 4e759de4 2019-06-26 stsp goto done;
3459 45cd4e47 2019-08-25 stsp if (worktree &&
3460 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3461 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3462 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3463 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3464 45cd4e47 2019-08-25 stsp goto done;
3467 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3470 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3471 4e759de4 2019-06-26 stsp free(refname);
3472 4e759de4 2019-06-26 stsp return err;
3475 4e759de4 2019-06-26 stsp static const struct got_error *
3476 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3477 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3479 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3480 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3481 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3484 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3485 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3486 d3f84d51 2019-07-11 stsp * an unintended typo.
3488 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3489 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3491 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3492 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3493 4e759de4 2019-06-26 stsp goto done;
3496 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3497 4e759de4 2019-06-26 stsp if (err == NULL) {
3498 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3499 4e759de4 2019-06-26 stsp goto done;
3500 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3501 4e759de4 2019-06-26 stsp goto done;
3503 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3505 4e759de4 2019-06-26 stsp goto done;
3507 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3510 4e759de4 2019-06-26 stsp got_ref_close(ref);
3511 4e759de4 2019-06-26 stsp free(base_refname);
3512 4e759de4 2019-06-26 stsp free(refname);
3513 4e759de4 2019-06-26 stsp return err;
3516 4e759de4 2019-06-26 stsp static const struct got_error *
3517 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3519 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3520 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3521 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3522 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3523 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3524 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3526 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3527 4e759de4 2019-06-26 stsp switch (ch) {
3529 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3532 4e759de4 2019-06-26 stsp delref = optarg;
3535 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3536 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3537 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3539 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3542 4e759de4 2019-06-26 stsp do_list = 1;
3545 4e759de4 2019-06-26 stsp usage_branch();
3546 4e759de4 2019-06-26 stsp /* NOTREACHED */
3550 4e759de4 2019-06-26 stsp if (do_list && delref)
3551 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3553 4e759de4 2019-06-26 stsp argc -= optind;
3554 4e759de4 2019-06-26 stsp argv += optind;
3556 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3557 ad89fa31 2019-10-04 stsp do_show = 1;
3559 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3560 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3562 4e759de4 2019-06-26 stsp if (do_list || delref) {
3563 4e759de4 2019-06-26 stsp if (argc > 0)
3564 4e759de4 2019-06-26 stsp usage_branch();
3565 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3566 4e759de4 2019-06-26 stsp usage_branch();
3568 4e759de4 2019-06-26 stsp #ifndef PROFILE
3569 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3570 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3571 4e759de4 2019-06-26 stsp NULL) == -1)
3572 4e759de4 2019-06-26 stsp err(1, "pledge");
3574 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3575 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3576 4e759de4 2019-06-26 stsp err(1, "pledge");
3579 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3580 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3581 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3582 4e759de4 2019-06-26 stsp goto done;
3585 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3586 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3587 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3588 4e759de4 2019-06-26 stsp goto done;
3590 4e759de4 2019-06-26 stsp error = NULL;
3591 4e759de4 2019-06-26 stsp if (worktree) {
3592 4e759de4 2019-06-26 stsp repo_path =
3593 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3594 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3595 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3596 4e759de4 2019-06-26 stsp if (error)
3597 4e759de4 2019-06-26 stsp goto done;
3599 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
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 goto done;
3607 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3608 4e759de4 2019-06-26 stsp if (error != NULL)
3609 4e759de4 2019-06-26 stsp goto done;
3611 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3612 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3613 4e759de4 2019-06-26 stsp if (error)
3614 4e759de4 2019-06-26 stsp goto done;
3616 ad89fa31 2019-10-04 stsp if (do_show)
3617 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3618 ad89fa31 2019-10-04 stsp else if (do_list)
3619 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3620 4e759de4 2019-06-26 stsp else if (delref)
3621 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3623 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3624 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3625 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3626 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3627 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3628 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3629 a74f7e83 2019-11-10 stsp if (error)
3630 a74f7e83 2019-11-10 stsp goto done;
3631 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3632 a74f7e83 2019-11-10 stsp free(commit_id);
3636 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3637 d0eebce4 2019-03-11 stsp if (worktree)
3638 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3639 d0eebce4 2019-03-11 stsp free(cwd);
3640 d0eebce4 2019-03-11 stsp free(repo_path);
3641 d00136be 2019-03-26 stsp return error;
3645 d00136be 2019-03-26 stsp __dead static void
3646 8e7bd50a 2019-08-22 stsp usage_tag(void)
3648 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3649 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3650 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3655 b8bad2ba 2019-08-23 stsp static const struct got_error *
3656 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3658 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3659 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3660 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3661 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3662 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3664 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3665 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3666 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3667 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3669 b8bad2ba 2019-08-23 stsp return err;
3670 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3673 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3676 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3677 b8bad2ba 2019-08-23 stsp free(re_id);
3680 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3681 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3684 b8bad2ba 2019-08-23 stsp while (se) {
3685 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3688 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3689 b8bad2ba 2019-08-23 stsp free(se_id);
3692 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3693 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3695 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3696 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3698 b8bad2ba 2019-08-23 stsp return err;
3699 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3702 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3707 b8bad2ba 2019-08-23 stsp return err;
3711 8e7bd50a 2019-08-22 stsp static const struct got_error *
3712 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3713 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3715 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3716 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3717 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3718 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3719 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3723 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3725 b8bad2ba 2019-08-23 stsp return err;
3726 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3728 b8bad2ba 2019-08-23 stsp goto done;
3730 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3732 b8bad2ba 2019-08-23 stsp goto done;
3733 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3735 b8bad2ba 2019-08-23 stsp goto done;
3737 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3738 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3740 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3741 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3743 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3744 b8bad2ba 2019-08-23 stsp *cmp = -1;
3746 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3748 b8bad2ba 2019-08-23 stsp free(id1);
3749 b8bad2ba 2019-08-23 stsp free(id2);
3751 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3753 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3754 b8bad2ba 2019-08-23 stsp return err;
3757 b8bad2ba 2019-08-23 stsp static const struct got_error *
3758 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3760 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3761 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3762 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3764 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3766 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3768 8e7bd50a 2019-08-22 stsp return err;
3770 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3771 8e7bd50a 2019-08-22 stsp const char *refname;
3772 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3773 8e7bd50a 2019-08-22 stsp char datebuf[26];
3774 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3775 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3776 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3778 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3779 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3781 8e7bd50a 2019-08-22 stsp refname += 10;
3782 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3783 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3784 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3787 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3788 8e7bd50a 2019-08-22 stsp free(refstr);
3790 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3793 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3797 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3798 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3799 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3800 2417344c 2019-08-23 stsp if (datestr)
3801 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3802 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3803 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3806 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3807 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3808 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3810 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3811 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3813 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3814 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3816 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3817 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3822 8e7bd50a 2019-08-22 stsp free(id_str);
3823 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3824 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3825 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3826 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3830 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3832 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3834 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3835 8e7bd50a 2019-08-22 stsp } while (line);
3836 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3839 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3840 8e7bd50a 2019-08-22 stsp return NULL;
3843 8e7bd50a 2019-08-22 stsp static const struct got_error *
3844 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3845 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3847 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3848 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3849 f372d5cd 2019-10-21 stsp char *editor = NULL;
3850 8e7bd50a 2019-08-22 stsp int fd = -1;
3852 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3853 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3854 8e7bd50a 2019-08-22 stsp goto done;
3857 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3858 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3859 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3860 8e7bd50a 2019-08-22 stsp goto done;
3863 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3865 8e7bd50a 2019-08-22 stsp goto done;
3867 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3868 8e7bd50a 2019-08-22 stsp close(fd);
3870 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3872 8e7bd50a 2019-08-22 stsp goto done;
3873 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3875 8e7bd50a 2019-08-22 stsp free(initial_content);
3876 8e7bd50a 2019-08-22 stsp free(template);
3877 8e7bd50a 2019-08-22 stsp free(editor);
3879 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3880 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3881 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3882 8e7bd50a 2019-08-22 stsp if (err) {
3883 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3884 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3887 8e7bd50a 2019-08-22 stsp return err;
3890 8e7bd50a 2019-08-22 stsp static const struct got_error *
3891 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3892 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3894 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3895 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3896 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3897 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3898 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3899 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3900 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3903 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3904 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3905 8e7bd50a 2019-08-22 stsp * an unintended typo.
3907 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
3908 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3910 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3912 8e7bd50a 2019-08-22 stsp return err;
3914 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3915 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3917 8e7bd50a 2019-08-22 stsp goto done;
3919 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3921 8e7bd50a 2019-08-22 stsp goto done;
3923 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3924 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3925 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3926 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3927 8e7bd50a 2019-08-22 stsp goto done;
3929 8e7bd50a 2019-08-22 stsp tag_name += 10;
3930 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3931 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3932 8e7bd50a 2019-08-22 stsp goto done;
3935 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3936 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3937 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3938 8e7bd50a 2019-08-22 stsp goto done;
3939 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3940 8e7bd50a 2019-08-22 stsp goto done;
3942 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3943 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3944 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3945 f372d5cd 2019-10-21 stsp if (err) {
3946 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3947 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3948 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3949 8e7bd50a 2019-08-22 stsp goto done;
3953 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3954 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3955 f372d5cd 2019-10-21 stsp if (err) {
3956 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3957 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3958 8e7bd50a 2019-08-22 stsp goto done;
3961 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
3962 f372d5cd 2019-10-21 stsp if (err) {
3963 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3964 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3965 8e7bd50a 2019-08-22 stsp goto done;
3968 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
3969 f372d5cd 2019-10-21 stsp if (err) {
3970 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3971 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3972 f372d5cd 2019-10-21 stsp goto done;
3975 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
3976 f372d5cd 2019-10-21 stsp if (err) {
3977 f372d5cd 2019-10-21 stsp if (tagmsg_path)
3978 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3979 f372d5cd 2019-10-21 stsp goto done;
3981 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
3983 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
3984 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
3985 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
3986 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3987 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
3988 f372d5cd 2019-10-21 stsp free(tag_id_str);
3990 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
3991 8e7bd50a 2019-08-22 stsp free(commit_id);
3992 8e7bd50a 2019-08-22 stsp free(commit_id_str);
3993 8e7bd50a 2019-08-22 stsp free(refname);
3994 8e7bd50a 2019-08-22 stsp free(tagmsg);
3995 f372d5cd 2019-10-21 stsp free(tagmsg_path);
3996 aba9c984 2019-09-08 stsp free(tagger);
3997 8e7bd50a 2019-08-22 stsp return err;
4000 8e7bd50a 2019-08-22 stsp static const struct got_error *
4001 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4003 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4004 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4005 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4006 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4007 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4008 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4009 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4011 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4012 8e7bd50a 2019-08-22 stsp switch (ch) {
4014 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4017 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4018 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4019 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4021 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4024 8e7bd50a 2019-08-22 stsp do_list = 1;
4027 8e7bd50a 2019-08-22 stsp usage_tag();
4028 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4032 8e7bd50a 2019-08-22 stsp argc -= optind;
4033 8e7bd50a 2019-08-22 stsp argv += optind;
4035 8e7bd50a 2019-08-22 stsp if (do_list) {
4036 8e7bd50a 2019-08-22 stsp if (tagmsg)
4037 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
4038 8e7bd50a 2019-08-22 stsp if (argc > 0)
4039 8e7bd50a 2019-08-22 stsp usage_tag();
4040 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
4041 8e7bd50a 2019-08-22 stsp usage_tag();
4042 a2887370 2019-08-23 stsp else if (argc > 1)
4043 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
4044 a2887370 2019-08-23 stsp tag_name = argv[0];
4046 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4047 8e7bd50a 2019-08-22 stsp if (do_list) {
4048 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4049 8e7bd50a 2019-08-22 stsp NULL) == -1)
4050 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4052 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4053 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4054 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4057 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4058 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4059 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4060 8e7bd50a 2019-08-22 stsp goto done;
4063 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4064 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4065 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4066 8e7bd50a 2019-08-22 stsp goto done;
4068 8e7bd50a 2019-08-22 stsp error = NULL;
4069 8e7bd50a 2019-08-22 stsp if (worktree) {
4070 8e7bd50a 2019-08-22 stsp repo_path =
4071 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4072 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4073 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4074 8e7bd50a 2019-08-22 stsp if (error)
4075 8e7bd50a 2019-08-22 stsp goto done;
4077 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
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 goto done;
4085 8e7bd50a 2019-08-22 stsp if (do_list) {
4086 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4087 c9956ddf 2019-09-08 stsp if (error != NULL)
4088 c9956ddf 2019-09-08 stsp goto done;
4089 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4090 8e7bd50a 2019-08-22 stsp if (error)
4091 8e7bd50a 2019-08-22 stsp goto done;
4092 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4094 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4095 c9956ddf 2019-09-08 stsp if (error)
4096 c9956ddf 2019-09-08 stsp goto done;
4097 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4098 c9956ddf 2019-09-08 stsp if (error != NULL)
4099 c9956ddf 2019-09-08 stsp goto done;
4101 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4102 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4103 8e7bd50a 2019-08-22 stsp if (error)
4104 8e7bd50a 2019-08-22 stsp goto done;
4107 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4108 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4109 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4110 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4111 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4112 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4113 8e7bd50a 2019-08-22 stsp if (error)
4114 8e7bd50a 2019-08-22 stsp goto done;
4115 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4116 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4117 8e7bd50a 2019-08-22 stsp if (error)
4118 8e7bd50a 2019-08-22 stsp goto done;
4119 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4120 8e7bd50a 2019-08-22 stsp free(commit_id);
4121 8e7bd50a 2019-08-22 stsp if (error)
4122 8e7bd50a 2019-08-22 stsp goto done;
4125 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4126 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4130 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4131 8e7bd50a 2019-08-22 stsp if (worktree)
4132 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4133 8e7bd50a 2019-08-22 stsp free(cwd);
4134 8e7bd50a 2019-08-22 stsp free(repo_path);
4135 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4136 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4137 8e7bd50a 2019-08-22 stsp return error;
4140 8e7bd50a 2019-08-22 stsp __dead static void
4141 d00136be 2019-03-26 stsp usage_add(void)
4143 fbb7e5c7 2019-05-11 stsp fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
4147 d00136be 2019-03-26 stsp static const struct got_error *
4148 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4150 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4152 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4153 4e68cba3 2019-11-23 stsp return NULL;
4156 4e68cba3 2019-11-23 stsp static const struct got_error *
4157 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4159 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4160 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4161 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4162 1dd54920 2019-05-11 stsp char *cwd = NULL;
4163 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4164 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4165 4e68cba3 2019-11-23 stsp int ch, can_recurse = 0;
4167 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4169 4e68cba3 2019-11-23 stsp while ((ch = getopt(argc, argv, "R")) != -1) {
4170 d00136be 2019-03-26 stsp switch (ch) {
4172 4e68cba3 2019-11-23 stsp can_recurse = 1;
4175 d00136be 2019-03-26 stsp usage_add();
4176 d00136be 2019-03-26 stsp /* NOTREACHED */
4180 d00136be 2019-03-26 stsp argc -= optind;
4181 d00136be 2019-03-26 stsp argv += optind;
4183 43012d58 2019-07-14 stsp #ifndef PROFILE
4184 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4185 43012d58 2019-07-14 stsp NULL) == -1)
4186 43012d58 2019-07-14 stsp err(1, "pledge");
4188 723c305c 2019-05-11 jcs if (argc < 1)
4189 d00136be 2019-03-26 stsp usage_add();
4191 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4192 d00136be 2019-03-26 stsp if (cwd == NULL) {
4193 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4194 d00136be 2019-03-26 stsp goto done;
4197 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4198 d00136be 2019-03-26 stsp if (error)
4199 d00136be 2019-03-26 stsp goto done;
4201 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4203 031a5338 2019-03-26 stsp if (error != NULL)
4204 031a5338 2019-03-26 stsp goto done;
4206 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4207 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4208 d00136be 2019-03-26 stsp if (error)
4209 d00136be 2019-03-26 stsp goto done;
4211 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4212 6d022e97 2019-08-04 stsp if (error)
4213 6d022e97 2019-08-04 stsp goto done;
4215 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4216 4e68cba3 2019-11-23 stsp char *ondisk_path;
4217 4e68cba3 2019-11-23 stsp struct stat sb;
4218 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4219 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4220 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4221 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4222 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4223 4e68cba3 2019-11-23 stsp goto done;
4225 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4226 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4227 4e68cba3 2019-11-23 stsp free(ondisk_path);
4230 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4231 4e68cba3 2019-11-23 stsp ondisk_path);
4232 4e68cba3 2019-11-23 stsp free(ondisk_path);
4233 4e68cba3 2019-11-23 stsp goto done;
4235 4e68cba3 2019-11-23 stsp free(ondisk_path);
4236 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4237 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4238 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4239 4e68cba3 2019-11-23 stsp goto done;
4243 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4244 1dd54920 2019-05-11 stsp NULL, repo);
4247 031a5338 2019-03-26 stsp got_repo_close(repo);
4248 d00136be 2019-03-26 stsp if (worktree)
4249 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4250 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4251 1dd54920 2019-05-11 stsp free((char *)pe->path);
4252 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4253 2ec1f75b 2019-03-26 stsp free(cwd);
4254 2ec1f75b 2019-03-26 stsp return error;
4257 2ec1f75b 2019-03-26 stsp __dead static void
4258 648e4ef7 2019-07-09 stsp usage_remove(void)
4260 648e4ef7 2019-07-09 stsp fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4264 2a06fe5f 2019-08-24 stsp static const struct got_error *
4265 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4266 2a06fe5f 2019-08-24 stsp unsigned char staged_status, const char *path,
4267 2a06fe5f 2019-08-24 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4268 2a06fe5f 2019-08-24 stsp struct got_object_id *commit_id)
4270 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4271 2a06fe5f 2019-08-24 stsp return NULL;
4272 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4273 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4274 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4275 2a06fe5f 2019-08-24 stsp return NULL;
4278 2ec1f75b 2019-03-26 stsp static const struct got_error *
4279 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4281 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4282 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4283 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4284 17ed4618 2019-06-02 stsp char *cwd = NULL;
4285 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4286 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4287 6d022e97 2019-08-04 stsp int ch, delete_local_mods = 0;
4289 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4291 2ec1f75b 2019-03-26 stsp while ((ch = getopt(argc, argv, "f")) != -1) {
4292 2ec1f75b 2019-03-26 stsp switch (ch) {
4294 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4297 2ec1f75b 2019-03-26 stsp usage_add();
4298 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4302 2ec1f75b 2019-03-26 stsp argc -= optind;
4303 2ec1f75b 2019-03-26 stsp argv += optind;
4305 43012d58 2019-07-14 stsp #ifndef PROFILE
4306 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4307 43012d58 2019-07-14 stsp NULL) == -1)
4308 43012d58 2019-07-14 stsp err(1, "pledge");
4310 17ed4618 2019-06-02 stsp if (argc < 1)
4311 648e4ef7 2019-07-09 stsp usage_remove();
4313 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4314 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4315 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4316 2ec1f75b 2019-03-26 stsp goto done;
4318 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4319 2ec1f75b 2019-03-26 stsp if (error)
4320 2ec1f75b 2019-03-26 stsp goto done;
4322 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4325 2ec1f75b 2019-03-26 stsp goto done;
4327 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4328 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4329 2ec1f75b 2019-03-26 stsp if (error)
4330 2ec1f75b 2019-03-26 stsp goto done;
4332 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4333 6d022e97 2019-08-04 stsp if (error)
4334 6d022e97 2019-08-04 stsp goto done;
4336 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4337 2a06fe5f 2019-08-24 stsp delete_local_mods, print_remove_status, NULL, repo);
4338 a129376b 2019-03-28 stsp if (error)
4339 a129376b 2019-03-28 stsp goto done;
4342 a129376b 2019-03-28 stsp got_repo_close(repo);
4343 a129376b 2019-03-28 stsp if (worktree)
4344 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4345 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4346 17ed4618 2019-06-02 stsp free((char *)pe->path);
4347 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4348 a129376b 2019-03-28 stsp free(cwd);
4349 a129376b 2019-03-28 stsp return error;
4352 a129376b 2019-03-28 stsp __dead static void
4353 a129376b 2019-03-28 stsp usage_revert(void)
4355 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4356 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4360 1ee397ad 2019-07-12 stsp static const struct got_error *
4361 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4363 a129376b 2019-03-28 stsp while (path[0] == '/')
4365 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4366 33aa809d 2019-08-08 stsp return NULL;
4369 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4370 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4371 33aa809d 2019-08-08 stsp const char *action;
4374 33aa809d 2019-08-08 stsp static const struct got_error *
4375 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4376 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4378 33aa809d 2019-08-08 stsp char *line = NULL;
4379 33aa809d 2019-08-08 stsp size_t linesize = 0;
4380 33aa809d 2019-08-08 stsp ssize_t linelen;
4382 33aa809d 2019-08-08 stsp switch (status) {
4383 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4384 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4386 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4387 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4389 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4390 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4391 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4392 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4393 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4394 33aa809d 2019-08-08 stsp printf("%s", line);
4395 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4396 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4397 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4398 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4399 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4402 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4405 33aa809d 2019-08-08 stsp return NULL;
4408 33aa809d 2019-08-08 stsp static const struct got_error *
4409 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4410 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4412 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4413 33aa809d 2019-08-08 stsp char *line = NULL;
4414 33aa809d 2019-08-08 stsp size_t linesize = 0;
4415 33aa809d 2019-08-08 stsp ssize_t linelen;
4416 33aa809d 2019-08-08 stsp int resp = ' ';
4417 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4419 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4421 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4423 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4424 33aa809d 2019-08-08 stsp a->action);
4426 33aa809d 2019-08-08 stsp return err;
4427 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4428 33aa809d 2019-08-08 stsp if (linelen == -1) {
4429 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4430 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4431 33aa809d 2019-08-08 stsp return NULL;
4433 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4435 33aa809d 2019-08-08 stsp *nl = '\0';
4436 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4437 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4438 33aa809d 2019-08-08 stsp printf("y\n");
4439 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4440 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4441 33aa809d 2019-08-08 stsp printf("n\n");
4442 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4443 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4444 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4445 33aa809d 2019-08-08 stsp printf("q\n");
4447 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4448 33aa809d 2019-08-08 stsp free(line);
4449 33aa809d 2019-08-08 stsp return NULL;
4452 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4453 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4454 33aa809d 2019-08-08 stsp a->action);
4456 33aa809d 2019-08-08 stsp return err;
4457 33aa809d 2019-08-08 stsp resp = getchar();
4458 33aa809d 2019-08-08 stsp if (resp == '\n')
4459 33aa809d 2019-08-08 stsp resp = getchar();
4460 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4461 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4462 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4463 33aa809d 2019-08-08 stsp resp = ' ';
4465 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4466 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4467 33aa809d 2019-08-08 stsp resp = ' ';
4471 33aa809d 2019-08-08 stsp if (resp == 'y')
4472 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4473 33aa809d 2019-08-08 stsp else if (resp == 'n')
4474 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4475 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4476 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4478 1ee397ad 2019-07-12 stsp return NULL;
4482 a129376b 2019-03-28 stsp static const struct got_error *
4483 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4485 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4486 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4487 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4488 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4489 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4490 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4491 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4492 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4493 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4494 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4496 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4498 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4499 a129376b 2019-03-28 stsp switch (ch) {
4501 33aa809d 2019-08-08 stsp pflag = 1;
4504 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4507 0f6d7415 2019-08-08 stsp can_recurse = 1;
4510 a129376b 2019-03-28 stsp usage_revert();
4511 a129376b 2019-03-28 stsp /* NOTREACHED */
4515 a129376b 2019-03-28 stsp argc -= optind;
4516 a129376b 2019-03-28 stsp argv += optind;
4518 43012d58 2019-07-14 stsp #ifndef PROFILE
4519 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4520 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4521 43012d58 2019-07-14 stsp err(1, "pledge");
4523 e20a8b6f 2019-06-04 stsp if (argc < 1)
4524 a129376b 2019-03-28 stsp usage_revert();
4525 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4526 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4528 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4529 a129376b 2019-03-28 stsp if (cwd == NULL) {
4530 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4531 a129376b 2019-03-28 stsp goto done;
4533 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4534 2ec1f75b 2019-03-26 stsp if (error)
4535 2ec1f75b 2019-03-26 stsp goto done;
4537 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4539 a129376b 2019-03-28 stsp if (error != NULL)
4540 a129376b 2019-03-28 stsp goto done;
4542 33aa809d 2019-08-08 stsp if (patch_script_path) {
4543 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4544 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4545 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4546 33aa809d 2019-08-08 stsp patch_script_path);
4547 33aa809d 2019-08-08 stsp goto done;
4550 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4551 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4552 a129376b 2019-03-28 stsp if (error)
4553 a129376b 2019-03-28 stsp goto done;
4555 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4556 6d022e97 2019-08-04 stsp if (error)
4557 6d022e97 2019-08-04 stsp goto done;
4559 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4560 0f6d7415 2019-08-08 stsp char *ondisk_path;
4561 0f6d7415 2019-08-08 stsp struct stat sb;
4562 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4563 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4564 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4565 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4566 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4567 0f6d7415 2019-08-08 stsp goto done;
4569 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4570 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4571 0f6d7415 2019-08-08 stsp free(ondisk_path);
4574 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4575 0f6d7415 2019-08-08 stsp ondisk_path);
4576 0f6d7415 2019-08-08 stsp free(ondisk_path);
4577 0f6d7415 2019-08-08 stsp goto done;
4579 0f6d7415 2019-08-08 stsp free(ondisk_path);
4580 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4581 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4582 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4583 0f6d7415 2019-08-08 stsp goto done;
4588 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4589 33aa809d 2019-08-08 stsp cpa.action = "revert";
4590 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4591 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4592 a129376b 2019-03-28 stsp if (error)
4593 a129376b 2019-03-28 stsp goto done;
4595 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4596 33aa809d 2019-08-08 stsp error == NULL)
4597 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4599 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4600 2ec1f75b 2019-03-26 stsp if (worktree)
4601 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4602 2ec1f75b 2019-03-26 stsp free(path);
4603 d00136be 2019-03-26 stsp free(cwd);
4604 6bad629b 2019-02-04 stsp return error;
4607 c4296144 2019-05-09 stsp __dead static void
4608 c4296144 2019-05-09 stsp usage_commit(void)
4610 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4611 5c1e53bc 2019-07-28 stsp getprogname());
4615 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4616 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4617 e2ba3d07 2019-05-13 stsp const char *editor;
4618 e0870e44 2019-05-13 stsp const char *worktree_path;
4619 76d98825 2019-06-03 stsp const char *branch_name;
4620 314a6357 2019-05-13 stsp const char *repo_path;
4621 e0870e44 2019-05-13 stsp char *logmsg_path;
4625 33ad4cbe 2019-05-12 jcs static const struct got_error *
4626 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4629 76d98825 2019-06-03 stsp char *initial_content = NULL;
4630 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4631 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4632 e0870e44 2019-05-13 stsp char *template = NULL;
4633 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4635 33ad4cbe 2019-05-12 jcs size_t len;
4637 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4638 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4639 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4640 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4641 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4642 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4643 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4644 33ad4cbe 2019-05-12 jcs return NULL;
4647 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4648 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4650 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4651 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4652 76d98825 2019-06-03 stsp a->branch_name) == -1)
4653 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4655 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4657 e0870e44 2019-05-13 stsp goto done;
4659 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4661 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4662 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4663 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4664 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4665 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4669 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4671 76d98825 2019-06-03 stsp free(initial_content);
4672 e0870e44 2019-05-13 stsp free(template);
4674 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4675 3ce1b845 2019-07-15 stsp if (err == NULL) {
4676 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4677 3ce1b845 2019-07-15 stsp if (err) {
4678 3ce1b845 2019-07-15 stsp free(*logmsg);
4679 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4682 33ad4cbe 2019-05-12 jcs return err;
4685 c4296144 2019-05-09 stsp static const struct got_error *
4686 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4688 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4689 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4690 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4691 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4692 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4693 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4694 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4695 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4696 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4697 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4699 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4700 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4702 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4703 c4296144 2019-05-09 stsp switch (ch) {
4705 c4296144 2019-05-09 stsp logmsg = optarg;
4708 c4296144 2019-05-09 stsp usage_commit();
4709 c4296144 2019-05-09 stsp /* NOTREACHED */
4713 c4296144 2019-05-09 stsp argc -= optind;
4714 c4296144 2019-05-09 stsp argv += optind;
4716 43012d58 2019-07-14 stsp #ifndef PROFILE
4717 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4718 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4719 43012d58 2019-07-14 stsp err(1, "pledge");
4721 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4722 c4296144 2019-05-09 stsp if (cwd == NULL) {
4723 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4724 c4296144 2019-05-09 stsp goto done;
4726 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4727 7d5807f4 2019-07-11 stsp if (error)
4728 7d5807f4 2019-07-11 stsp goto done;
4730 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4731 c4296144 2019-05-09 stsp if (error)
4732 a698f62e 2019-07-25 stsp goto done;
4733 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4734 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4735 c4296144 2019-05-09 stsp goto done;
4738 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4739 916f288c 2019-07-30 stsp worktree);
4740 5c1e53bc 2019-07-28 stsp if (error)
4741 5c1e53bc 2019-07-28 stsp goto done;
4743 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4744 c9956ddf 2019-09-08 stsp if (error)
4745 c9956ddf 2019-09-08 stsp goto done;
4746 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4747 c9956ddf 2019-09-08 stsp gitconfig_path);
4748 c4296144 2019-05-09 stsp if (error != NULL)
4749 c4296144 2019-05-09 stsp goto done;
4751 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4752 aba9c984 2019-09-08 stsp if (error)
4753 aba9c984 2019-09-08 stsp return error;
4756 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4757 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4759 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4760 314a6357 2019-05-13 stsp error = get_editor(&editor);
4762 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4763 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4764 c4296144 2019-05-09 stsp if (error)
4765 c4296144 2019-05-09 stsp goto done;
4767 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4768 087fb88c 2019-08-04 stsp if (error)
4769 087fb88c 2019-08-04 stsp goto done;
4771 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4772 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4773 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4774 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4775 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4776 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4777 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4778 916f288c 2019-07-30 stsp goto done;
4780 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4782 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4783 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4784 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4785 e0870e44 2019-05-13 stsp if (error) {
4786 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4787 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4788 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4789 c4296144 2019-05-09 stsp goto done;
4792 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4793 c4296144 2019-05-09 stsp if (error)
4794 c4296144 2019-05-09 stsp goto done;
4795 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4797 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4798 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4799 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4800 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4801 7266f21f 2019-10-21 stsp error == NULL)
4802 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4803 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4805 c4296144 2019-05-09 stsp got_repo_close(repo);
4806 c4296144 2019-05-09 stsp if (worktree)
4807 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4808 c4296144 2019-05-09 stsp free(cwd);
4809 c4296144 2019-05-09 stsp free(id_str);
4810 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4811 e2ba3d07 2019-05-13 stsp free(editor);
4812 aba9c984 2019-09-08 stsp free(author);
4813 234035bc 2019-06-01 stsp return error;
4816 234035bc 2019-06-01 stsp __dead static void
4817 234035bc 2019-06-01 stsp usage_cherrypick(void)
4819 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4823 234035bc 2019-06-01 stsp static const struct got_error *
4824 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4826 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4827 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4828 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4829 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4830 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4831 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4832 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4833 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4834 234035bc 2019-06-01 stsp int ch, did_something = 0;
4836 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4837 234035bc 2019-06-01 stsp switch (ch) {
4839 234035bc 2019-06-01 stsp usage_cherrypick();
4840 234035bc 2019-06-01 stsp /* NOTREACHED */
4844 234035bc 2019-06-01 stsp argc -= optind;
4845 234035bc 2019-06-01 stsp argv += optind;
4847 43012d58 2019-07-14 stsp #ifndef PROFILE
4848 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4849 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4850 43012d58 2019-07-14 stsp err(1, "pledge");
4852 234035bc 2019-06-01 stsp if (argc != 1)
4853 234035bc 2019-06-01 stsp usage_cherrypick();
4855 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4856 234035bc 2019-06-01 stsp if (cwd == NULL) {
4857 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4858 234035bc 2019-06-01 stsp goto done;
4860 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4861 234035bc 2019-06-01 stsp if (error)
4862 234035bc 2019-06-01 stsp goto done;
4864 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4866 234035bc 2019-06-01 stsp if (error != NULL)
4867 234035bc 2019-06-01 stsp goto done;
4869 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4870 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4871 234035bc 2019-06-01 stsp if (error)
4872 234035bc 2019-06-01 stsp goto done;
4874 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4875 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4876 234035bc 2019-06-01 stsp if (error != NULL) {
4877 234035bc 2019-06-01 stsp struct got_reference *ref;
4878 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4879 234035bc 2019-06-01 stsp goto done;
4880 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4881 234035bc 2019-06-01 stsp if (error != NULL)
4882 234035bc 2019-06-01 stsp goto done;
4883 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4884 234035bc 2019-06-01 stsp got_ref_close(ref);
4885 234035bc 2019-06-01 stsp if (error != NULL)
4886 234035bc 2019-06-01 stsp goto done;
4888 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4889 234035bc 2019-06-01 stsp if (error)
4890 234035bc 2019-06-01 stsp goto done;
4892 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4893 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4894 234035bc 2019-06-01 stsp if (error != NULL)
4895 234035bc 2019-06-01 stsp goto done;
4897 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4898 234035bc 2019-06-01 stsp if (error) {
4899 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4900 234035bc 2019-06-01 stsp goto done;
4901 234035bc 2019-06-01 stsp error = NULL;
4903 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4904 234035bc 2019-06-01 stsp goto done;
4907 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4908 234035bc 2019-06-01 stsp if (error)
4909 234035bc 2019-06-01 stsp goto done;
4910 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4911 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4912 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
4914 234035bc 2019-06-01 stsp if (error != NULL)
4915 234035bc 2019-06-01 stsp goto done;
4917 234035bc 2019-06-01 stsp if (did_something)
4918 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
4920 234035bc 2019-06-01 stsp if (commit)
4921 234035bc 2019-06-01 stsp got_object_commit_close(commit);
4922 234035bc 2019-06-01 stsp free(commit_id_str);
4923 234035bc 2019-06-01 stsp if (head_ref)
4924 234035bc 2019-06-01 stsp got_ref_close(head_ref);
4925 234035bc 2019-06-01 stsp if (worktree)
4926 234035bc 2019-06-01 stsp got_worktree_close(worktree);
4928 234035bc 2019-06-01 stsp got_repo_close(repo);
4929 c4296144 2019-05-09 stsp return error;
4932 5ef14e63 2019-06-02 stsp __dead static void
4933 5ef14e63 2019-06-02 stsp usage_backout(void)
4935 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4939 5ef14e63 2019-06-02 stsp static const struct got_error *
4940 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
4942 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
4943 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
4944 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
4945 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
4946 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
4947 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
4948 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
4949 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
4950 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
4952 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4953 5ef14e63 2019-06-02 stsp switch (ch) {
4955 5ef14e63 2019-06-02 stsp usage_backout();
4956 5ef14e63 2019-06-02 stsp /* NOTREACHED */
4960 5ef14e63 2019-06-02 stsp argc -= optind;
4961 5ef14e63 2019-06-02 stsp argv += optind;
4963 43012d58 2019-07-14 stsp #ifndef PROFILE
4964 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4965 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4966 43012d58 2019-07-14 stsp err(1, "pledge");
4968 5ef14e63 2019-06-02 stsp if (argc != 1)
4969 5ef14e63 2019-06-02 stsp usage_backout();
4971 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
4972 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
4973 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
4974 5ef14e63 2019-06-02 stsp goto done;
4976 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
4977 5ef14e63 2019-06-02 stsp if (error)
4978 5ef14e63 2019-06-02 stsp goto done;
4980 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4982 5ef14e63 2019-06-02 stsp if (error != NULL)
4983 5ef14e63 2019-06-02 stsp goto done;
4985 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4986 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4987 5ef14e63 2019-06-02 stsp if (error)
4988 5ef14e63 2019-06-02 stsp goto done;
4990 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4991 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4992 5ef14e63 2019-06-02 stsp if (error != NULL) {
4993 5ef14e63 2019-06-02 stsp struct got_reference *ref;
4994 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4995 5ef14e63 2019-06-02 stsp goto done;
4996 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4997 5ef14e63 2019-06-02 stsp if (error != NULL)
4998 5ef14e63 2019-06-02 stsp goto done;
4999 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5000 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5001 5ef14e63 2019-06-02 stsp if (error != NULL)
5002 5ef14e63 2019-06-02 stsp goto done;
5004 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5005 5ef14e63 2019-06-02 stsp if (error)
5006 5ef14e63 2019-06-02 stsp goto done;
5008 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5009 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5010 5ef14e63 2019-06-02 stsp if (error != NULL)
5011 5ef14e63 2019-06-02 stsp goto done;
5013 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5014 5ef14e63 2019-06-02 stsp if (error)
5015 5ef14e63 2019-06-02 stsp goto done;
5017 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5018 5ef14e63 2019-06-02 stsp if (error)
5019 5ef14e63 2019-06-02 stsp goto done;
5020 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5021 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5022 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5023 5ef14e63 2019-06-02 stsp goto done;
5026 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5027 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5028 5ef14e63 2019-06-02 stsp if (error != NULL)
5029 5ef14e63 2019-06-02 stsp goto done;
5031 5ef14e63 2019-06-02 stsp if (did_something)
5032 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5034 5ef14e63 2019-06-02 stsp if (commit)
5035 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5036 5ef14e63 2019-06-02 stsp free(commit_id_str);
5037 5ef14e63 2019-06-02 stsp if (head_ref)
5038 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5039 818c7501 2019-07-11 stsp if (worktree)
5040 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5042 818c7501 2019-07-11 stsp got_repo_close(repo);
5043 818c7501 2019-07-11 stsp return error;
5046 818c7501 2019-07-11 stsp __dead static void
5047 818c7501 2019-07-11 stsp usage_rebase(void)
5049 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5050 af54c8f8 2019-07-11 stsp getprogname());
5055 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5058 0ebf8283 2019-07-24 stsp size_t len;
5060 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5061 0ebf8283 2019-07-24 stsp if (len > limit)
5062 0ebf8283 2019-07-24 stsp len = limit;
5063 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5064 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5066 0ebf8283 2019-07-24 stsp *nl = '\0';
5069 0ebf8283 2019-07-24 stsp static const struct got_error *
5070 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5072 5943eee2 2019-08-13 stsp const struct got_error *err;
5073 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5074 5943eee2 2019-08-13 stsp const char *s;
5076 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5078 5943eee2 2019-08-13 stsp return err;
5080 5943eee2 2019-08-13 stsp s = logmsg0;
5081 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5084 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5085 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5086 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5087 5943eee2 2019-08-13 stsp goto done;
5090 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5092 5943eee2 2019-08-13 stsp free(logmsg0);
5093 5943eee2 2019-08-13 stsp return err;
5096 818c7501 2019-07-11 stsp static const struct got_error *
5097 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5098 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5100 818c7501 2019-07-11 stsp const struct got_error *err;
5101 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5103 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5105 818c7501 2019-07-11 stsp goto done;
5107 ff0d2220 2019-07-11 stsp if (new_id) {
5108 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5110 ff0d2220 2019-07-11 stsp goto done;
5113 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5114 ff0d2220 2019-07-11 stsp if (new_id_str)
5115 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5117 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5119 0ebf8283 2019-07-24 stsp goto done;
5121 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5122 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5124 818c7501 2019-07-11 stsp free(old_id_str);
5125 818c7501 2019-07-11 stsp free(new_id_str);
5126 818c7501 2019-07-11 stsp return err;
5129 1ee397ad 2019-07-12 stsp static const struct got_error *
5130 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5132 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5134 818c7501 2019-07-11 stsp while (path[0] == '/')
5136 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5138 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5139 1ee397ad 2019-07-12 stsp return NULL;
5140 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5141 818c7501 2019-07-11 stsp *rebase_status = status;
5142 1ee397ad 2019-07-12 stsp return NULL;
5145 818c7501 2019-07-11 stsp static const struct got_error *
5146 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5147 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5148 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5150 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5151 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5152 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5155 818c7501 2019-07-11 stsp static const struct got_error *
5156 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5157 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5158 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5159 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5161 ff0d2220 2019-07-11 stsp const struct got_error *error;
5162 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5163 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5165 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5166 ff0d2220 2019-07-11 stsp if (error)
5167 ff0d2220 2019-07-11 stsp return error;
5169 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5170 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5171 ff0d2220 2019-07-11 stsp if (error) {
5172 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5173 ff0d2220 2019-07-11 stsp goto done;
5174 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5176 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5177 ff0d2220 2019-07-11 stsp free(new_commit_id);
5180 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5181 ff0d2220 2019-07-11 stsp return error;
5184 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5185 64c6d990 2019-07-11 stsp const char *path_prefix;
5186 64c6d990 2019-07-11 stsp size_t len;
5187 8ca9bd68 2019-07-25 stsp int errcode;
5190 64c6d990 2019-07-11 stsp static const struct got_error *
5191 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5192 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5193 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5194 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5196 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5198 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5199 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5200 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5202 64c6d990 2019-07-11 stsp return NULL;
5205 64c6d990 2019-07-11 stsp static const struct got_error *
5206 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5207 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5208 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5210 64c6d990 2019-07-11 stsp const struct got_error *err;
5211 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5212 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5213 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5215 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5216 64c6d990 2019-07-11 stsp return NULL;
5218 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5220 64c6d990 2019-07-11 stsp goto done;
5222 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5224 64c6d990 2019-07-11 stsp goto done;
5226 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5227 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5229 64c6d990 2019-07-11 stsp goto done;
5231 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5232 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5234 64c6d990 2019-07-11 stsp goto done;
5236 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5237 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5238 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5239 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5240 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5241 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5242 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5244 64c6d990 2019-07-11 stsp if (tree1)
5245 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5246 64c6d990 2019-07-11 stsp if (tree2)
5247 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5248 64c6d990 2019-07-11 stsp if (commit)
5249 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5250 64c6d990 2019-07-11 stsp if (parent_commit)
5251 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5252 64c6d990 2019-07-11 stsp return err;
5255 ff0d2220 2019-07-11 stsp static const struct got_error *
5256 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5257 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5258 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5259 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5260 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5262 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5263 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5264 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5265 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5266 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5268 af61c510 2019-07-19 stsp err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5270 af61c510 2019-07-19 stsp return err;
5272 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5273 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5275 af61c510 2019-07-19 stsp goto done;
5276 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5277 af61c510 2019-07-19 stsp err = got_commit_graph_iter_next(&parent_id, graph);
5278 af61c510 2019-07-19 stsp if (err) {
5279 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5280 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5281 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5282 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5283 af61c510 2019-07-19 stsp "been reached?!?");
5284 af61c510 2019-07-19 stsp goto done;
5285 af61c510 2019-07-19 stsp } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5286 af61c510 2019-07-19 stsp goto done;
5287 6fb7cd11 2019-08-22 stsp err = got_commit_graph_fetch_commits(graph, 1, repo,
5288 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5290 af61c510 2019-07-19 stsp goto done;
5292 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5293 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5295 af61c510 2019-07-19 stsp goto done;
5297 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5299 af61c510 2019-07-19 stsp goto done;
5300 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5301 af61c510 2019-07-19 stsp commit_id = parent_id;
5305 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5306 af61c510 2019-07-19 stsp return err;
5309 af61c510 2019-07-19 stsp static const struct got_error *
5310 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5312 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5313 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5314 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5315 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5316 818c7501 2019-07-11 stsp char *cwd = NULL;
5317 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5318 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5319 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5320 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5321 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5322 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5323 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5324 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5325 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5326 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5327 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5328 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5330 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5331 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5333 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5334 818c7501 2019-07-11 stsp switch (ch) {
5336 818c7501 2019-07-11 stsp abort_rebase = 1;
5339 818c7501 2019-07-11 stsp continue_rebase = 1;
5342 818c7501 2019-07-11 stsp usage_rebase();
5343 818c7501 2019-07-11 stsp /* NOTREACHED */
5347 818c7501 2019-07-11 stsp argc -= optind;
5348 818c7501 2019-07-11 stsp argv += optind;
5350 43012d58 2019-07-14 stsp #ifndef PROFILE
5351 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5352 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5353 43012d58 2019-07-14 stsp err(1, "pledge");
5355 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5356 818c7501 2019-07-11 stsp usage_rebase();
5357 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5358 818c7501 2019-07-11 stsp if (argc != 0)
5359 818c7501 2019-07-11 stsp usage_rebase();
5360 818c7501 2019-07-11 stsp } else if (argc != 1)
5361 818c7501 2019-07-11 stsp usage_rebase();
5363 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5364 818c7501 2019-07-11 stsp if (cwd == NULL) {
5365 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5366 818c7501 2019-07-11 stsp goto done;
5368 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5369 818c7501 2019-07-11 stsp if (error)
5370 818c7501 2019-07-11 stsp goto done;
5372 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5374 818c7501 2019-07-11 stsp if (error != NULL)
5375 818c7501 2019-07-11 stsp goto done;
5377 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5378 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5379 818c7501 2019-07-11 stsp if (error)
5380 818c7501 2019-07-11 stsp goto done;
5382 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5383 818c7501 2019-07-11 stsp if (error)
5384 818c7501 2019-07-11 stsp goto done;
5386 f6794adc 2019-07-23 stsp if (abort_rebase) {
5387 818c7501 2019-07-11 stsp int did_something;
5388 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5389 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5390 f6794adc 2019-07-23 stsp goto done;
5392 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5393 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5394 3e3a69f1 2019-07-25 stsp worktree, repo);
5395 818c7501 2019-07-11 stsp if (error)
5396 818c7501 2019-07-11 stsp goto done;
5397 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5398 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5399 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5400 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5401 818c7501 2019-07-11 stsp if (error)
5402 818c7501 2019-07-11 stsp goto done;
5403 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5404 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5407 818c7501 2019-07-11 stsp if (continue_rebase) {
5408 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5409 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5410 f6794adc 2019-07-23 stsp goto done;
5412 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5413 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5414 3e3a69f1 2019-07-25 stsp worktree, repo);
5415 818c7501 2019-07-11 stsp if (error)
5416 818c7501 2019-07-11 stsp goto done;
5418 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5419 01757395 2019-07-12 stsp resume_commit_id, repo);
5420 818c7501 2019-07-11 stsp if (error)
5421 818c7501 2019-07-11 stsp goto done;
5423 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5424 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5425 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5426 818c7501 2019-07-11 stsp goto done;
5429 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5430 818c7501 2019-07-11 stsp if (error != NULL)
5431 818c7501 2019-07-11 stsp goto done;
5434 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5435 ff0d2220 2019-07-11 stsp if (error)
5436 ff0d2220 2019-07-11 stsp goto done;
5438 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5439 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5441 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5442 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5443 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5444 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5445 818c7501 2019-07-11 stsp if (error)
5446 818c7501 2019-07-11 stsp goto done;
5447 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5448 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5449 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5450 818c7501 2019-07-11 stsp "with work tree's branch");
5451 818c7501 2019-07-11 stsp goto done;
5454 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5455 a51a74b3 2019-07-27 stsp if (error) {
5456 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5457 a51a74b3 2019-07-27 stsp goto done;
5458 a51a74b3 2019-07-27 stsp error = NULL;
5460 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5461 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5462 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5463 a51a74b3 2019-07-27 stsp goto done;
5465 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5466 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5467 818c7501 2019-07-11 stsp if (error)
5468 818c7501 2019-07-11 stsp goto done;
5471 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5472 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5473 818c7501 2019-07-11 stsp if (error)
5474 818c7501 2019-07-11 stsp goto done;
5476 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5477 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5478 fc66b545 2019-08-12 stsp if (pid == NULL) {
5479 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5480 fc66b545 2019-08-12 stsp int did_something;
5481 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5482 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5483 fc66b545 2019-08-12 stsp &did_something);
5484 fc66b545 2019-08-12 stsp if (error)
5485 fc66b545 2019-08-12 stsp goto done;
5486 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5487 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5489 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5490 fc66b545 2019-08-12 stsp goto done;
5492 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5493 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5494 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5495 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5496 818c7501 2019-07-11 stsp commit = NULL;
5497 818c7501 2019-07-11 stsp if (error)
5498 818c7501 2019-07-11 stsp goto done;
5500 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5501 38b0338b 2019-11-29 stsp if (continue_rebase) {
5502 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5503 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5504 38b0338b 2019-11-29 stsp goto done;
5506 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5507 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5508 38b0338b 2019-11-29 stsp char *id_str;
5509 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5510 38b0338b 2019-11-29 stsp new_base_branch);
5511 38b0338b 2019-11-29 stsp if (error)
5512 38b0338b 2019-11-29 stsp goto done;
5513 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5514 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5515 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5516 38b0338b 2019-11-29 stsp free(id_str);
5517 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5518 38b0338b 2019-11-29 stsp new_head_commit_id);
5519 38b0338b 2019-11-29 stsp if (error)
5520 38b0338b 2019-11-29 stsp goto done;
5524 818c7501 2019-07-11 stsp pid = NULL;
5525 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5526 818c7501 2019-07-11 stsp commit_id = qid->id;
5527 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5528 818c7501 2019-07-11 stsp pid = qid;
5530 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5531 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5532 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5533 818c7501 2019-07-11 stsp if (error)
5534 818c7501 2019-07-11 stsp goto done;
5536 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5537 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5541 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5542 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5543 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5544 818c7501 2019-07-11 stsp if (error)
5545 818c7501 2019-07-11 stsp goto done;
5548 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5549 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5550 818c7501 2019-07-11 stsp if (error)
5551 818c7501 2019-07-11 stsp goto done;
5552 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5553 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5555 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5556 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5558 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5559 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5560 818c7501 2019-07-11 stsp free(resume_commit_id);
5561 818c7501 2019-07-11 stsp free(yca_id);
5562 818c7501 2019-07-11 stsp if (commit)
5563 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5564 818c7501 2019-07-11 stsp if (branch)
5565 818c7501 2019-07-11 stsp got_ref_close(branch);
5566 818c7501 2019-07-11 stsp if (new_base_branch)
5567 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5568 818c7501 2019-07-11 stsp if (tmp_branch)
5569 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5570 5ef14e63 2019-06-02 stsp if (worktree)
5571 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5573 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5574 5ef14e63 2019-06-02 stsp return error;
5577 0ebf8283 2019-07-24 stsp __dead static void
5578 0ebf8283 2019-07-24 stsp usage_histedit(void)
5580 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5581 0ebf8283 2019-07-24 stsp getprogname());
5585 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5586 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5587 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5588 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5589 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5591 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5592 0ebf8283 2019-07-24 stsp unsigned char code;
5593 0ebf8283 2019-07-24 stsp const char *name;
5594 0ebf8283 2019-07-24 stsp const char *desc;
5595 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5596 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5597 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5598 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5599 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5600 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5601 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5604 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5605 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5606 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5607 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5608 0ebf8283 2019-07-24 stsp char *logmsg;
5610 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5612 0ebf8283 2019-07-24 stsp static const struct got_error *
5613 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5614 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5616 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5617 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5618 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5621 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5623 0ebf8283 2019-07-24 stsp goto done;
5625 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5627 0ebf8283 2019-07-24 stsp goto done;
5629 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5631 0ebf8283 2019-07-24 stsp goto done;
5633 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5634 0ebf8283 2019-07-24 stsp if (n < 0)
5635 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5637 0ebf8283 2019-07-24 stsp if (commit)
5638 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5639 0ebf8283 2019-07-24 stsp free(id_str);
5640 0ebf8283 2019-07-24 stsp free(logmsg);
5641 0ebf8283 2019-07-24 stsp return err;
5644 0ebf8283 2019-07-24 stsp static const struct got_error *
5645 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5646 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5648 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5649 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5651 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5652 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5654 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5655 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5661 0ebf8283 2019-07-24 stsp return err;
5664 0ebf8283 2019-07-24 stsp static const struct got_error *
5665 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5667 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5670 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5671 0ebf8283 2019-07-24 stsp if (n < 0)
5672 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5674 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5675 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5676 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5677 0ebf8283 2019-07-24 stsp cmd->desc);
5678 0ebf8283 2019-07-24 stsp if (n < 0) {
5679 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5683 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5684 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5685 0ebf8283 2019-07-24 stsp if (n < 0)
5686 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5687 0ebf8283 2019-07-24 stsp return err;
5690 0ebf8283 2019-07-24 stsp static const struct got_error *
5691 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5693 0ebf8283 2019-07-24 stsp static char msg[42];
5696 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5698 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5699 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5701 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5704 0ebf8283 2019-07-24 stsp static const struct got_error *
5705 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5706 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5708 0ebf8283 2019-07-24 stsp const struct got_error *err;
5709 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5710 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5712 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5714 0ebf8283 2019-07-24 stsp return err;
5716 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5718 0ebf8283 2019-07-24 stsp goto done;
5720 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5722 5943eee2 2019-08-13 stsp goto done;
5723 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5724 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5725 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5726 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5727 0ebf8283 2019-07-24 stsp goto done;
5730 0ebf8283 2019-07-24 stsp if (folded_commit)
5731 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5732 0ebf8283 2019-07-24 stsp free(id_str);
5733 5943eee2 2019-08-13 stsp free(folded_logmsg);
5734 0ebf8283 2019-07-24 stsp return err;
5737 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5738 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5740 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5742 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5743 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5744 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5745 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5746 3f9de99f 2019-07-24 stsp folded = prev;
5747 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5750 0ebf8283 2019-07-24 stsp return folded;
5753 0ebf8283 2019-07-24 stsp static const struct got_error *
5754 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5755 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5757 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5758 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5759 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5760 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5762 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5764 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5766 0ebf8283 2019-07-24 stsp return err;
5768 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5769 0ebf8283 2019-07-24 stsp if (folded) {
5770 0ebf8283 2019-07-24 stsp while (folded != hle) {
5771 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5772 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5775 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5776 0ebf8283 2019-07-24 stsp logmsg, repo);
5778 0ebf8283 2019-07-24 stsp goto done;
5779 0ebf8283 2019-07-24 stsp free(logmsg);
5780 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5781 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5785 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5787 0ebf8283 2019-07-24 stsp goto done;
5788 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5790 5943eee2 2019-08-13 stsp goto done;
5791 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5792 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5793 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5794 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5795 0ebf8283 2019-07-24 stsp goto done;
5797 0ebf8283 2019-07-24 stsp free(logmsg);
5798 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5800 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5802 0ebf8283 2019-07-24 stsp goto done;
5804 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5806 0ebf8283 2019-07-24 stsp goto done;
5808 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5809 0ebf8283 2019-07-24 stsp close(fd);
5811 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5813 0ebf8283 2019-07-24 stsp goto done;
5815 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5816 0ebf8283 2019-07-24 stsp if (err) {
5817 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5818 0ebf8283 2019-07-24 stsp goto done;
5819 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5822 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5823 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5824 0ebf8283 2019-07-24 stsp free(logmsg_path);
5825 0ebf8283 2019-07-24 stsp free(logmsg);
5826 5943eee2 2019-08-13 stsp free(orig_logmsg);
5827 0ebf8283 2019-07-24 stsp free(editor);
5828 0ebf8283 2019-07-24 stsp if (commit)
5829 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5830 0ebf8283 2019-07-24 stsp return err;
5833 0ebf8283 2019-07-24 stsp static const struct got_error *
5834 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5835 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5837 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5838 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5839 0ebf8283 2019-07-24 stsp size_t size;
5840 0ebf8283 2019-07-24 stsp ssize_t len;
5841 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5842 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5843 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5844 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5846 0ebf8283 2019-07-24 stsp for (;;) {
5847 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5848 0ebf8283 2019-07-24 stsp if (len == -1) {
5849 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5850 0ebf8283 2019-07-24 stsp if (feof(f))
5852 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5853 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5858 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5860 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5861 0ebf8283 2019-07-24 stsp free(line);
5862 0ebf8283 2019-07-24 stsp line = NULL;
5865 0ebf8283 2019-07-24 stsp cmd = NULL;
5866 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5867 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5868 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5869 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5870 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5873 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5878 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5879 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5882 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5884 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5885 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5886 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5889 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5890 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5894 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5895 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5896 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5900 0ebf8283 2019-07-24 stsp free(line);
5901 0ebf8283 2019-07-24 stsp line = NULL;
5905 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5907 0ebf8283 2019-07-24 stsp *end = '\0';
5909 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5910 0ebf8283 2019-07-24 stsp if (err) {
5911 0ebf8283 2019-07-24 stsp /* override error code */
5912 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5916 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
5917 0ebf8283 2019-07-24 stsp if (hle == NULL) {
5918 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
5921 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
5922 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
5923 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
5924 0ebf8283 2019-07-24 stsp commit_id = NULL;
5925 0ebf8283 2019-07-24 stsp free(line);
5926 0ebf8283 2019-07-24 stsp line = NULL;
5927 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5930 0ebf8283 2019-07-24 stsp free(line);
5931 0ebf8283 2019-07-24 stsp free(commit_id);
5932 0ebf8283 2019-07-24 stsp return err;
5935 0ebf8283 2019-07-24 stsp static const struct got_error *
5936 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
5937 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
5939 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
5940 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
5941 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
5942 bfce7f83 2019-07-27 stsp static char msg[80];
5943 bfce7f83 2019-07-27 stsp char *id_str;
5945 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
5946 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5947 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
5948 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
5949 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5951 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5952 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
5953 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5956 bfce7f83 2019-07-27 stsp if (hle == NULL) {
5957 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
5959 bfce7f83 2019-07-27 stsp return err;
5960 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
5961 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
5962 bfce7f83 2019-07-27 stsp free(id_str);
5963 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5967 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5968 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5969 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5970 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
5972 bfce7f83 2019-07-27 stsp return NULL;
5975 bfce7f83 2019-07-27 stsp static const struct got_error *
5976 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
5977 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
5978 bfce7f83 2019-07-27 stsp struct got_repository *repo)
5980 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5981 0ebf8283 2019-07-24 stsp char *editor;
5982 0ebf8283 2019-07-24 stsp FILE *f = NULL;
5984 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5986 0ebf8283 2019-07-24 stsp return err;
5988 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
5989 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
5990 0ebf8283 2019-07-24 stsp goto done;
5993 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
5994 0ebf8283 2019-07-24 stsp if (f == NULL) {
5995 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
5996 0ebf8283 2019-07-24 stsp goto done;
5998 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6000 bfce7f83 2019-07-27 stsp goto done;
6002 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6004 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6005 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6006 0ebf8283 2019-07-24 stsp free(editor);
6007 0ebf8283 2019-07-24 stsp return err;
6010 0ebf8283 2019-07-24 stsp static const struct got_error *
6011 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6012 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
6014 0ebf8283 2019-07-24 stsp static const struct got_error *
6015 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6016 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6018 0ebf8283 2019-07-24 stsp const struct got_error *err;
6019 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6020 0ebf8283 2019-07-24 stsp char *path = NULL;
6022 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6024 0ebf8283 2019-07-24 stsp return err;
6026 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
6028 0ebf8283 2019-07-24 stsp goto done;
6030 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6032 0ebf8283 2019-07-24 stsp goto done;
6034 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6035 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6036 0ebf8283 2019-07-24 stsp goto done;
6040 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6041 0ebf8283 2019-07-24 stsp if (err) {
6042 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6043 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6044 0ebf8283 2019-07-24 stsp goto done;
6045 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6046 0ebf8283 2019-07-24 stsp commits, path, repo);
6049 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6050 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6051 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6052 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6053 0ebf8283 2019-07-24 stsp free(path);
6054 0ebf8283 2019-07-24 stsp return err;
6057 0ebf8283 2019-07-24 stsp static const struct got_error *
6058 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6059 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6061 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6062 0ebf8283 2019-07-24 stsp char *path = NULL;
6063 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6064 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6065 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6067 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6069 0ebf8283 2019-07-24 stsp return err;
6071 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6072 0ebf8283 2019-07-24 stsp if (f == NULL) {
6073 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6074 0ebf8283 2019-07-24 stsp goto done;
6076 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6077 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6082 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6083 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6084 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6085 0ebf8283 2019-07-24 stsp if (n < 0) {
6086 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6092 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6093 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6094 0ebf8283 2019-07-24 stsp free(path);
6095 0ebf8283 2019-07-24 stsp if (commit)
6096 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6097 0ebf8283 2019-07-24 stsp return err;
6101 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6103 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6105 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6106 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6107 bfce7f83 2019-07-27 stsp free(hle);
6111 0ebf8283 2019-07-24 stsp static const struct got_error *
6112 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6113 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6115 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6116 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6118 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6119 0ebf8283 2019-07-24 stsp if (f == NULL) {
6120 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6121 0ebf8283 2019-07-24 stsp goto done;
6124 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6126 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6127 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6128 0ebf8283 2019-07-24 stsp return err;
6131 0ebf8283 2019-07-24 stsp static const struct got_error *
6132 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6133 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6134 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6136 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6137 0ebf8283 2019-07-24 stsp int resp = ' ';
6139 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6140 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6141 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6142 0ebf8283 2019-07-24 stsp resp = getchar();
6143 a61a4414 2019-08-07 stsp if (resp == '\n')
6144 a61a4414 2019-08-07 stsp resp = getchar();
6145 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6146 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6147 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6149 426ebf2e 2019-07-25 stsp if (err) {
6150 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6151 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6153 bfce7f83 2019-07-27 stsp prev_err = err;
6154 426ebf2e 2019-07-25 stsp resp = ' ';
6158 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6159 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6160 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6161 0ebf8283 2019-07-24 stsp commits, repo);
6162 426ebf2e 2019-07-25 stsp if (err) {
6163 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6164 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6166 bfce7f83 2019-07-27 stsp prev_err = err;
6167 426ebf2e 2019-07-25 stsp resp = ' ';
6171 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6172 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6175 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6178 0ebf8283 2019-07-24 stsp return err;
6181 0ebf8283 2019-07-24 stsp static const struct got_error *
6182 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6183 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6184 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6186 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6187 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6188 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6189 3e3a69f1 2019-07-25 stsp branch, repo);
6192 0ebf8283 2019-07-24 stsp static const struct got_error *
6193 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6194 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6196 0ebf8283 2019-07-24 stsp const struct got_error *err;
6197 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6199 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6201 0ebf8283 2019-07-24 stsp goto done;
6203 0ebf8283 2019-07-24 stsp if (new_id) {
6204 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6206 0ebf8283 2019-07-24 stsp goto done;
6209 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6210 0ebf8283 2019-07-24 stsp if (new_id_str)
6211 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6213 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6214 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6215 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6216 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6217 0ebf8283 2019-07-24 stsp goto done;
6219 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6221 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6223 0ebf8283 2019-07-24 stsp goto done;
6226 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6227 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6228 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6229 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6230 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6232 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6233 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6234 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6242 0ebf8283 2019-07-24 stsp free(old_id_str);
6243 0ebf8283 2019-07-24 stsp free(new_id_str);
6244 0ebf8283 2019-07-24 stsp return err;
6247 0ebf8283 2019-07-24 stsp static const struct got_error *
6248 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6249 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6250 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6251 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6253 0ebf8283 2019-07-24 stsp const struct got_error *err;
6254 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6255 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6257 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6258 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6259 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6261 0ebf8283 2019-07-24 stsp return err;
6264 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6266 0ebf8283 2019-07-24 stsp return err;
6268 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6269 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6270 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6271 0ebf8283 2019-07-24 stsp if (err) {
6272 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6273 0ebf8283 2019-07-24 stsp goto done;
6274 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6276 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6277 0ebf8283 2019-07-24 stsp free(new_commit_id);
6280 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6281 0ebf8283 2019-07-24 stsp return err;
6284 0ebf8283 2019-07-24 stsp static const struct got_error *
6285 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6286 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6288 0ebf8283 2019-07-24 stsp const struct got_error *error;
6289 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6291 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6293 0ebf8283 2019-07-24 stsp if (error)
6294 0ebf8283 2019-07-24 stsp return error;
6296 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6297 0ebf8283 2019-07-24 stsp if (error)
6298 0ebf8283 2019-07-24 stsp return error;
6300 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6301 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6302 0ebf8283 2019-07-24 stsp return error;
6305 0ebf8283 2019-07-24 stsp static const struct got_error *
6306 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6308 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6309 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6310 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6311 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6312 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6313 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6314 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6315 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6316 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6317 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6318 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6319 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6320 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6321 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6322 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6323 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6324 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6325 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6326 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6327 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6328 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6330 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6331 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6332 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6334 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6335 0ebf8283 2019-07-24 stsp switch (ch) {
6337 0ebf8283 2019-07-24 stsp abort_edit = 1;
6340 0ebf8283 2019-07-24 stsp continue_edit = 1;
6343 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6346 0ebf8283 2019-07-24 stsp usage_histedit();
6347 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6351 0ebf8283 2019-07-24 stsp argc -= optind;
6352 0ebf8283 2019-07-24 stsp argv += optind;
6354 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6355 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6356 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6357 0ebf8283 2019-07-24 stsp err(1, "pledge");
6359 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6360 0ebf8283 2019-07-24 stsp usage_histedit();
6361 0ebf8283 2019-07-24 stsp if (argc != 0)
6362 0ebf8283 2019-07-24 stsp usage_histedit();
6365 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6366 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6367 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6368 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6369 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6370 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6373 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6374 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6375 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6376 0ebf8283 2019-07-24 stsp goto done;
6378 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6379 0ebf8283 2019-07-24 stsp if (error)
6380 0ebf8283 2019-07-24 stsp goto done;
6382 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6384 0ebf8283 2019-07-24 stsp if (error != NULL)
6385 0ebf8283 2019-07-24 stsp goto done;
6387 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6388 0ebf8283 2019-07-24 stsp if (error)
6389 0ebf8283 2019-07-24 stsp goto done;
6390 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6391 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6392 0ebf8283 2019-07-24 stsp goto done;
6395 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6396 0ebf8283 2019-07-24 stsp if (error)
6397 0ebf8283 2019-07-24 stsp goto done;
6399 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6400 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6401 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6402 3e3a69f1 2019-07-25 stsp worktree, repo);
6403 0ebf8283 2019-07-24 stsp if (error)
6404 0ebf8283 2019-07-24 stsp goto done;
6405 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6406 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6407 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6408 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6409 0ebf8283 2019-07-24 stsp if (error)
6410 0ebf8283 2019-07-24 stsp goto done;
6411 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6412 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6413 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6414 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6415 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6416 0ebf8283 2019-07-24 stsp goto done;
6419 0ebf8283 2019-07-24 stsp if (continue_edit) {
6420 0ebf8283 2019-07-24 stsp char *path;
6422 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6423 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6424 0ebf8283 2019-07-24 stsp goto done;
6427 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6428 0ebf8283 2019-07-24 stsp if (error)
6429 0ebf8283 2019-07-24 stsp goto done;
6431 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6432 0ebf8283 2019-07-24 stsp free(path);
6433 0ebf8283 2019-07-24 stsp if (error)
6434 0ebf8283 2019-07-24 stsp goto done;
6436 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6437 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6438 3e3a69f1 2019-07-25 stsp worktree, repo);
6439 0ebf8283 2019-07-24 stsp if (error)
6440 0ebf8283 2019-07-24 stsp goto done;
6442 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6443 0ebf8283 2019-07-24 stsp if (error)
6444 0ebf8283 2019-07-24 stsp goto done;
6446 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6447 0ebf8283 2019-07-24 stsp head_commit_id);
6448 0ebf8283 2019-07-24 stsp if (error)
6449 0ebf8283 2019-07-24 stsp goto done;
6450 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6451 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6452 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6453 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6454 3aac7cf7 2019-07-25 stsp goto done;
6456 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6457 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6458 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6459 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6460 0ebf8283 2019-07-24 stsp commit = NULL;
6461 0ebf8283 2019-07-24 stsp if (error)
6462 0ebf8283 2019-07-24 stsp goto done;
6464 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6465 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6466 0ebf8283 2019-07-24 stsp goto done;
6469 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6470 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6471 0ebf8283 2019-07-24 stsp if (error != NULL)
6472 0ebf8283 2019-07-24 stsp goto done;
6474 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6475 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6476 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6477 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6478 c7d20a3f 2019-07-30 stsp goto done;
6481 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6482 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6483 bfce7f83 2019-07-27 stsp branch = NULL;
6484 0ebf8283 2019-07-24 stsp if (error)
6485 0ebf8283 2019-07-24 stsp goto done;
6487 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6488 0ebf8283 2019-07-24 stsp head_commit_id);
6489 0ebf8283 2019-07-24 stsp if (error)
6490 0ebf8283 2019-07-24 stsp goto done;
6491 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6492 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6493 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6494 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6495 3aac7cf7 2019-07-25 stsp goto done;
6497 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6498 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6499 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6500 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6501 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6502 0ebf8283 2019-07-24 stsp commit = NULL;
6503 0ebf8283 2019-07-24 stsp if (error)
6504 0ebf8283 2019-07-24 stsp goto done;
6506 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6507 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6508 bfce7f83 2019-07-27 stsp if (error)
6509 bfce7f83 2019-07-27 stsp goto done;
6511 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6512 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6513 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6514 6ba2bea2 2019-07-27 stsp if (error) {
6515 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6516 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6517 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6518 0ebf8283 2019-07-24 stsp goto done;
6521 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6523 6ba2bea2 2019-07-27 stsp if (error) {
6524 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6525 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6526 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6527 0ebf8283 2019-07-24 stsp goto done;
6532 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6534 6ba2bea2 2019-07-27 stsp if (error) {
6535 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6536 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6537 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6538 0ebf8283 2019-07-24 stsp goto done;
6543 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6544 4ec14e60 2019-08-28 hiltjo if (error)
6545 0ebf8283 2019-07-24 stsp goto done;
6547 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6548 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6549 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6550 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6553 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6554 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6555 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6556 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6559 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6560 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6562 0ebf8283 2019-07-24 stsp if (error)
6563 0ebf8283 2019-07-24 stsp goto done;
6567 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6568 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6569 0ebf8283 2019-07-24 stsp if (error)
6570 0ebf8283 2019-07-24 stsp goto done;
6574 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6575 0ebf8283 2019-07-24 stsp hle->commit_id);
6576 0ebf8283 2019-07-24 stsp if (error)
6577 0ebf8283 2019-07-24 stsp goto done;
6578 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6579 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6581 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6582 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6583 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6584 0ebf8283 2019-07-24 stsp if (error)
6585 0ebf8283 2019-07-24 stsp goto done;
6586 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6587 0ebf8283 2019-07-24 stsp commit = NULL;
6589 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6590 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6594 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6595 0ebf8283 2019-07-24 stsp char *id_str;
6596 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6597 0ebf8283 2019-07-24 stsp if (error)
6598 0ebf8283 2019-07-24 stsp goto done;
6599 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6601 0ebf8283 2019-07-24 stsp free(id_str);
6602 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6603 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6604 3e3a69f1 2019-07-25 stsp fileindex);
6605 0ebf8283 2019-07-24 stsp goto done;
6608 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6609 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6610 0ebf8283 2019-07-24 stsp if (error)
6611 0ebf8283 2019-07-24 stsp goto done;
6615 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6616 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6617 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6618 0ebf8283 2019-07-24 stsp if (error)
6619 0ebf8283 2019-07-24 stsp goto done;
6622 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6623 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6624 0ebf8283 2019-07-24 stsp if (error)
6625 0ebf8283 2019-07-24 stsp goto done;
6626 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6627 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6629 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6630 3e3a69f1 2019-07-25 stsp branch, repo);
6632 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6633 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6634 0ebf8283 2019-07-24 stsp free(head_commit_id);
6635 0ebf8283 2019-07-24 stsp free(base_commit_id);
6636 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6637 0ebf8283 2019-07-24 stsp if (commit)
6638 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6639 0ebf8283 2019-07-24 stsp if (branch)
6640 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6641 0ebf8283 2019-07-24 stsp if (tmp_branch)
6642 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6643 0ebf8283 2019-07-24 stsp if (worktree)
6644 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6646 2822a352 2019-10-15 stsp got_repo_close(repo);
6647 2822a352 2019-10-15 stsp return error;
6650 2822a352 2019-10-15 stsp __dead static void
6651 2822a352 2019-10-15 stsp usage_integrate(void)
6653 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6657 2822a352 2019-10-15 stsp static const struct got_error *
6658 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6660 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6661 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6662 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6663 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6664 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6665 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6666 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6667 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6668 2822a352 2019-10-15 stsp int ch, did_something = 0;
6670 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6671 2822a352 2019-10-15 stsp switch (ch) {
6673 2822a352 2019-10-15 stsp usage_integrate();
6674 2822a352 2019-10-15 stsp /* NOTREACHED */
6678 2822a352 2019-10-15 stsp argc -= optind;
6679 2822a352 2019-10-15 stsp argv += optind;
6681 2822a352 2019-10-15 stsp if (argc != 1)
6682 2822a352 2019-10-15 stsp usage_integrate();
6683 2822a352 2019-10-15 stsp branch_arg = argv[0];
6685 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6686 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6687 2822a352 2019-10-15 stsp err(1, "pledge");
6689 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6690 2822a352 2019-10-15 stsp if (cwd == NULL) {
6691 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6692 2822a352 2019-10-15 stsp goto done;
6695 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6696 2822a352 2019-10-15 stsp if (error)
6697 2822a352 2019-10-15 stsp goto done;
6699 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6700 2822a352 2019-10-15 stsp if (error)
6701 2822a352 2019-10-15 stsp goto done;
6703 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6705 2822a352 2019-10-15 stsp if (error != NULL)
6706 2822a352 2019-10-15 stsp goto done;
6708 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6709 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6710 2822a352 2019-10-15 stsp if (error)
6711 2822a352 2019-10-15 stsp goto done;
6713 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6714 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6715 2822a352 2019-10-15 stsp goto done;
6718 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6719 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6720 2822a352 2019-10-15 stsp if (error)
6721 2822a352 2019-10-15 stsp goto done;
6723 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6724 2822a352 2019-10-15 stsp if (refname == NULL) {
6725 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6726 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6727 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6728 2822a352 2019-10-15 stsp goto done;
6730 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6731 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6732 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6733 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6734 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6735 2822a352 2019-10-15 stsp goto done;
6738 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6739 2822a352 2019-10-15 stsp if (error)
6740 2822a352 2019-10-15 stsp goto done;
6742 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6743 2822a352 2019-10-15 stsp if (error)
6744 2822a352 2019-10-15 stsp goto done;
6746 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6747 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6748 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6749 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6750 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6751 2822a352 2019-10-15 stsp goto done;
6754 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6755 2822a352 2019-10-15 stsp if (error) {
6756 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6757 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6758 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6759 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6760 2822a352 2019-10-15 stsp goto done;
6763 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6764 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6765 2822a352 2019-10-15 stsp check_cancelled, NULL);
6766 2822a352 2019-10-15 stsp if (error)
6767 2822a352 2019-10-15 stsp goto done;
6769 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6772 715dc77e 2019-08-03 stsp got_repo_close(repo);
6773 2822a352 2019-10-15 stsp if (worktree)
6774 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6775 2822a352 2019-10-15 stsp free(cwd);
6776 2822a352 2019-10-15 stsp free(base_commit_id);
6777 2822a352 2019-10-15 stsp free(commit_id);
6778 2822a352 2019-10-15 stsp free(refname);
6779 2822a352 2019-10-15 stsp free(base_refname);
6780 715dc77e 2019-08-03 stsp return error;
6783 715dc77e 2019-08-03 stsp __dead static void
6784 715dc77e 2019-08-03 stsp usage_stage(void)
6786 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6787 f3055044 2019-08-07 stsp "[file-path ...]\n",
6788 715dc77e 2019-08-03 stsp getprogname());
6792 715dc77e 2019-08-03 stsp static const struct got_error *
6793 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6794 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6795 408b4ebc 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6797 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6798 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6800 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6801 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6802 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6803 408b4ebc 2019-08-03 stsp return NULL;
6805 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6806 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6807 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6809 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6811 408b4ebc 2019-08-03 stsp return err;
6813 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6814 408b4ebc 2019-08-03 stsp free(id_str);
6815 dc424a06 2019-08-07 stsp return NULL;
6818 dc424a06 2019-08-07 stsp static const struct got_error *
6819 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6821 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6822 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6823 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6824 715dc77e 2019-08-03 stsp char *cwd = NULL;
6825 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6826 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6827 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6828 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6829 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6830 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6832 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6834 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6835 715dc77e 2019-08-03 stsp switch (ch) {
6837 408b4ebc 2019-08-03 stsp list_stage = 1;
6840 dc424a06 2019-08-07 stsp pflag = 1;
6843 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6846 715dc77e 2019-08-03 stsp usage_stage();
6847 715dc77e 2019-08-03 stsp /* NOTREACHED */
6851 715dc77e 2019-08-03 stsp argc -= optind;
6852 715dc77e 2019-08-03 stsp argv += optind;
6854 715dc77e 2019-08-03 stsp #ifndef PROFILE
6855 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6856 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6857 715dc77e 2019-08-03 stsp err(1, "pledge");
6859 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6860 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6861 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6862 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6864 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6865 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6866 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6867 715dc77e 2019-08-03 stsp goto done;
6870 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6871 715dc77e 2019-08-03 stsp if (error)
6872 715dc77e 2019-08-03 stsp goto done;
6874 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6876 715dc77e 2019-08-03 stsp if (error != NULL)
6877 715dc77e 2019-08-03 stsp goto done;
6879 dc424a06 2019-08-07 stsp if (patch_script_path) {
6880 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6881 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6882 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6883 dc424a06 2019-08-07 stsp patch_script_path);
6884 dc424a06 2019-08-07 stsp goto done;
6887 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6888 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6889 715dc77e 2019-08-03 stsp if (error)
6890 715dc77e 2019-08-03 stsp goto done;
6892 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6893 6d022e97 2019-08-04 stsp if (error)
6894 6d022e97 2019-08-04 stsp goto done;
6896 6d022e97 2019-08-04 stsp if (list_stage)
6897 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6898 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6900 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6901 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6902 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6903 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6904 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6907 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6908 2e1f37b0 2019-08-08 stsp error == NULL)
6909 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6911 ad493afc 2019-08-03 stsp got_repo_close(repo);
6912 ad493afc 2019-08-03 stsp if (worktree)
6913 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
6914 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
6915 ad493afc 2019-08-03 stsp free((char *)pe->path);
6916 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
6917 ad493afc 2019-08-03 stsp free(cwd);
6918 ad493afc 2019-08-03 stsp return error;
6921 ad493afc 2019-08-03 stsp __dead static void
6922 ad493afc 2019-08-03 stsp usage_unstage(void)
6924 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6925 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
6926 ad493afc 2019-08-03 stsp getprogname());
6931 ad493afc 2019-08-03 stsp static const struct got_error *
6932 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
6934 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
6935 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
6936 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
6937 ad493afc 2019-08-03 stsp char *cwd = NULL;
6938 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
6939 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6940 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
6941 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
6942 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6943 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6945 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
6947 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
6948 ad493afc 2019-08-03 stsp switch (ch) {
6950 2e1f37b0 2019-08-08 stsp pflag = 1;
6953 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
6956 ad493afc 2019-08-03 stsp usage_unstage();
6957 ad493afc 2019-08-03 stsp /* NOTREACHED */
6961 ad493afc 2019-08-03 stsp argc -= optind;
6962 ad493afc 2019-08-03 stsp argv += optind;
6964 ad493afc 2019-08-03 stsp #ifndef PROFILE
6965 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6966 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
6967 ad493afc 2019-08-03 stsp err(1, "pledge");
6969 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
6970 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6972 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
6973 ad493afc 2019-08-03 stsp if (cwd == NULL) {
6974 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
6975 ad493afc 2019-08-03 stsp goto done;
6978 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6979 ad493afc 2019-08-03 stsp if (error)
6980 ad493afc 2019-08-03 stsp goto done;
6982 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6984 ad493afc 2019-08-03 stsp if (error != NULL)
6985 ad493afc 2019-08-03 stsp goto done;
6987 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
6988 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6989 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
6990 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
6991 2e1f37b0 2019-08-08 stsp patch_script_path);
6992 2e1f37b0 2019-08-08 stsp goto done;
6996 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6997 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
6998 ad493afc 2019-08-03 stsp if (error)
6999 ad493afc 2019-08-03 stsp goto done;
7001 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7002 ad493afc 2019-08-03 stsp if (error)
7003 ad493afc 2019-08-03 stsp goto done;
7005 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7006 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7007 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7008 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7010 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7011 2e1f37b0 2019-08-08 stsp error == NULL)
7012 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7014 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7015 715dc77e 2019-08-03 stsp if (worktree)
7016 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7017 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7018 715dc77e 2019-08-03 stsp free((char *)pe->path);
7019 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7020 715dc77e 2019-08-03 stsp free(cwd);
7021 01073a5d 2019-08-22 stsp return error;
7024 01073a5d 2019-08-22 stsp __dead static void
7025 01073a5d 2019-08-22 stsp usage_cat(void)
7027 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7028 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7032 01073a5d 2019-08-22 stsp static const struct got_error *
7033 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7035 01073a5d 2019-08-22 stsp const struct got_error *err;
7036 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7038 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7040 01073a5d 2019-08-22 stsp return err;
7042 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7043 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7044 01073a5d 2019-08-22 stsp return err;
7047 01073a5d 2019-08-22 stsp static const struct got_error *
7048 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7050 01073a5d 2019-08-22 stsp const struct got_error *err;
7051 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7052 56e0773d 2019-11-28 stsp int nentries, i;
7054 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7056 01073a5d 2019-08-22 stsp return err;
7058 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7059 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7060 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7061 01073a5d 2019-08-22 stsp char *id_str;
7062 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7064 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7065 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7068 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7069 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7070 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7071 01073a5d 2019-08-22 stsp free(id_str);
7074 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7075 01073a5d 2019-08-22 stsp return err;
7078 01073a5d 2019-08-22 stsp static const struct got_error *
7079 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7081 01073a5d 2019-08-22 stsp const struct got_error *err;
7082 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7083 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7084 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7085 01073a5d 2019-08-22 stsp char *id_str = NULL;
7086 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7088 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7090 01073a5d 2019-08-22 stsp return err;
7092 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7094 01073a5d 2019-08-22 stsp goto done;
7096 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7097 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7098 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7099 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7100 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7101 01073a5d 2019-08-22 stsp char *pid_str;
7102 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7104 01073a5d 2019-08-22 stsp goto done;
7105 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7106 01073a5d 2019-08-22 stsp free(pid_str);
7108 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7109 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7110 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7112 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7113 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7114 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7116 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7117 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7118 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7120 01073a5d 2019-08-22 stsp free(id_str);
7121 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7122 01073a5d 2019-08-22 stsp return err;
7125 01073a5d 2019-08-22 stsp static const struct got_error *
7126 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7128 01073a5d 2019-08-22 stsp const struct got_error *err;
7129 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7130 01073a5d 2019-08-22 stsp char *id_str = NULL;
7131 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7133 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7135 01073a5d 2019-08-22 stsp return err;
7137 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7139 01073a5d 2019-08-22 stsp goto done;
7141 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7143 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7144 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7145 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7146 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7148 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7149 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7150 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7152 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7153 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7154 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7156 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7157 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7158 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7164 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7165 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7167 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7168 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7169 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7171 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7172 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7173 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7175 01073a5d 2019-08-22 stsp free(id_str);
7176 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7177 01073a5d 2019-08-22 stsp return err;
7180 01073a5d 2019-08-22 stsp static const struct got_error *
7181 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7183 01073a5d 2019-08-22 stsp const struct got_error *error;
7184 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7185 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7186 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7187 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7188 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7189 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7191 01073a5d 2019-08-22 stsp #ifndef PROFILE
7192 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7193 01073a5d 2019-08-22 stsp NULL) == -1)
7194 01073a5d 2019-08-22 stsp err(1, "pledge");
7197 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7198 01073a5d 2019-08-22 stsp switch (ch) {
7200 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7203 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7204 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7205 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7207 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7210 896e9b6f 2019-08-26 stsp force_path = 1;
7213 01073a5d 2019-08-22 stsp usage_cat();
7214 01073a5d 2019-08-22 stsp /* NOTREACHED */
7218 01073a5d 2019-08-22 stsp argc -= optind;
7219 01073a5d 2019-08-22 stsp argv += optind;
7221 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7222 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7223 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7224 01073a5d 2019-08-22 stsp goto done;
7226 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7227 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7228 01073a5d 2019-08-22 stsp goto done;
7229 01073a5d 2019-08-22 stsp if (worktree) {
7230 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7231 01073a5d 2019-08-22 stsp repo_path = strdup(
7232 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7233 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7234 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7235 01073a5d 2019-08-22 stsp goto done;
7240 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7241 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7242 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7243 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7246 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7247 01073a5d 2019-08-22 stsp free(repo_path);
7248 01073a5d 2019-08-22 stsp if (error != NULL)
7249 01073a5d 2019-08-22 stsp goto done;
7251 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7252 896e9b6f 2019-08-26 stsp if (error)
7253 896e9b6f 2019-08-26 stsp goto done;
7255 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7256 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7257 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7258 01073a5d 2019-08-22 stsp if (error)
7259 01073a5d 2019-08-22 stsp goto done;
7261 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7262 896e9b6f 2019-08-26 stsp if (force_path) {
7263 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7265 896e9b6f 2019-08-26 stsp if (error)
7268 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7269 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7270 896e9b6f 2019-08-26 stsp if (error) {
7271 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7272 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7274 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7275 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7276 896e9b6f 2019-08-26 stsp if (error)
7281 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7282 01073a5d 2019-08-22 stsp if (error)
7285 01073a5d 2019-08-22 stsp switch (obj_type) {
7286 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7287 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7289 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7290 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7292 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7293 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7295 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7296 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7299 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7302 01073a5d 2019-08-22 stsp if (error)
7304 01073a5d 2019-08-22 stsp free(label);
7305 01073a5d 2019-08-22 stsp label = NULL;
7307 01073a5d 2019-08-22 stsp id = NULL;
7311 01073a5d 2019-08-22 stsp free(label);
7313 896e9b6f 2019-08-26 stsp free(commit_id);
7314 01073a5d 2019-08-22 stsp if (worktree)
7315 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7316 01073a5d 2019-08-22 stsp if (repo) {
7317 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7318 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7319 01073a5d 2019-08-22 stsp if (error == NULL)
7320 01073a5d 2019-08-22 stsp error = repo_error;
7322 0ebf8283 2019-07-24 stsp return error;
