2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 c0768b0f 2018-06-10 stsp #include <sys/types.h>
20 5de5890b 2018-10-18 stsp #include <sys/stat.h>
21 3c45a30a 2019-05-12 jcs #include <sys/param.h>
22 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
24 5c860e29 2018-03-12 stsp #include <err.h>
25 5c860e29 2018-03-12 stsp #include <errno.h>
26 12463d8b 2019-12-13 stsp #include <fcntl.h>
27 12ce7a6c 2019-08-12 stsp #include <limits.h>
28 5c860e29 2018-03-12 stsp #include <locale.h>
29 818c7501 2019-07-11 stsp #include <ctype.h>
30 99437157 2018-11-11 stsp #include <signal.h>
31 5c860e29 2018-03-12 stsp #include <stdio.h>
32 5c860e29 2018-03-12 stsp #include <stdlib.h>
33 5c860e29 2018-03-12 stsp #include <string.h>
34 5c860e29 2018-03-12 stsp #include <unistd.h>
35 c09a553d 2018-03-12 stsp #include <libgen.h>
36 c0768b0f 2018-06-10 stsp #include <time.h>
37 33ad4cbe 2019-05-12 jcs #include <paths.h>
38 6841bf13 2019-11-29 kn #include <regex.h>
40 53ccebc2 2019-07-30 stsp #include "got_version.h"
41 f42b1b34 2018-03-12 stsp #include "got_error.h"
42 f42b1b34 2018-03-12 stsp #include "got_object.h"
43 5261c201 2018-04-01 stsp #include "got_reference.h"
44 f42b1b34 2018-03-12 stsp #include "got_repository.h"
45 1dd54920 2019-05-11 stsp #include "got_path.h"
46 e6209546 2019-08-22 stsp #include "got_cancel.h"
47 c09a553d 2018-03-12 stsp #include "got_worktree.h"
48 79109fed 2018-03-27 stsp #include "got_diff.h"
49 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
50 404c43c4 2018-06-21 stsp #include "got_blame.h"
51 63219cd2 2019-01-04 stsp #include "got_privsep.h"
52 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
54 5c860e29 2018-03-12 stsp #ifndef nitems
55 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
58 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
59 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
62 99437157 2018-11-11 stsp catch_sigint(int signo)
64 99437157 2018-11-11 stsp sigint_received = 1;
68 99437157 2018-11-11 stsp catch_sigpipe(int signo)
70 99437157 2018-11-11 stsp sigpipe_received = 1;
74 8cfb4057 2019-07-09 stsp struct got_cmd {
75 5c860e29 2018-03-12 stsp const char *cmd_name;
76 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
77 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
78 97b3a7be 2019-07-09 stsp const char *cmd_alias;
81 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
82 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
83 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
84 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
85 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
86 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
87 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
88 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
89 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
90 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
91 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
92 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
93 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
94 d00136be 2019-03-26 stsp __dead static void usage_add(void);
95 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
96 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
97 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
98 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
99 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
100 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
101 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
102 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
103 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
104 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
105 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
107 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
108 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
109 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
110 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
111 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
112 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
113 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
114 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
115 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
116 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
117 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
118 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
119 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
120 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
121 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
122 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
123 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
124 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
125 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
126 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
127 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
128 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
129 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
130 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
132 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
133 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
134 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
135 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
136 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
137 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
138 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
139 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
140 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
141 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
142 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
143 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
144 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
145 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
146 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
147 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
148 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
149 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
150 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
151 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
152 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
153 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
154 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
155 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
156 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
159 ce5b7c56 2019-07-09 stsp static void
160 ce5b7c56 2019-07-09 stsp list_commands(void)
164 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
165 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
166 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
167 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
169 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
173 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
175 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
176 5c860e29 2018-03-12 stsp unsigned int i;
178 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
180 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
182 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
183 5c860e29 2018-03-12 stsp switch (ch) {
191 ce5b7c56 2019-07-09 stsp usage(hflag);
192 5c860e29 2018-03-12 stsp /* NOTREACHED */
196 5c860e29 2018-03-12 stsp argc -= optind;
197 5c860e29 2018-03-12 stsp argv += optind;
198 1e70621d 2018-03-27 stsp optind = 0;
200 53ccebc2 2019-07-30 stsp if (Vflag) {
201 53ccebc2 2019-07-30 stsp got_version_print_str();
205 5c860e29 2018-03-12 stsp if (argc <= 0)
206 ce5b7c56 2019-07-09 stsp usage(hflag);
208 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
209 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
211 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
212 d7d4f210 2018-03-12 stsp const struct got_error *error;
214 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
216 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
217 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
221 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
223 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
224 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
225 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
226 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
227 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
228 70015d7a 2019-11-08 stsp !(sigint_received &&
229 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
230 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
237 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
238 ce5b7c56 2019-07-09 stsp list_commands();
242 4ed7e80c 2018-05-20 stsp __dead static void
243 ce5b7c56 2019-07-09 stsp usage(int hflag)
245 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
246 53ccebc2 2019-07-30 stsp getprogname());
248 ce5b7c56 2019-07-09 stsp list_commands();
252 0266afb7 2019-01-04 stsp static const struct got_error *
253 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
255 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
256 e2ba3d07 2019-05-13 stsp const char *editor;
258 8920fa04 2019-08-18 stsp *abspath = NULL;
260 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
261 e2ba3d07 2019-05-13 stsp if (editor == NULL)
262 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
264 0ee7065d 2019-05-13 stsp if (editor) {
265 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
267 0ee7065d 2019-05-13 stsp return err;
270 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
271 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
272 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
273 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
276 e2ba3d07 2019-05-13 stsp return NULL;
279 e2ba3d07 2019-05-13 stsp static const struct got_error *
280 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
281 c530dc23 2019-07-23 stsp const char *worktree_path)
283 163ce85a 2019-05-13 stsp const struct got_error *err;
285 37c06ea4 2019-07-15 stsp #ifdef PROFILE
286 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
287 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
289 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
290 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
292 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
293 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
295 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
296 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
298 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
299 163ce85a 2019-05-13 stsp if (err != NULL)
300 163ce85a 2019-05-13 stsp return err;
302 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
303 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
305 0266afb7 2019-01-04 stsp return NULL;
308 2c7829a4 2019-06-17 stsp __dead static void
309 2c7829a4 2019-06-17 stsp usage_init(void)
311 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
315 2c7829a4 2019-06-17 stsp static const struct got_error *
316 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
318 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
319 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
322 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
323 2c7829a4 2019-06-17 stsp switch (ch) {
325 2c7829a4 2019-06-17 stsp usage_init();
326 2c7829a4 2019-06-17 stsp /* NOTREACHED */
330 2c7829a4 2019-06-17 stsp argc -= optind;
331 2c7829a4 2019-06-17 stsp argv += optind;
333 2c7829a4 2019-06-17 stsp #ifndef PROFILE
334 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
335 2c7829a4 2019-06-17 stsp err(1, "pledge");
337 2c7829a4 2019-06-17 stsp if (argc != 1)
338 bc20e173 2019-06-17 stsp usage_init();
340 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
341 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
342 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
344 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
346 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
347 2c7829a4 2019-06-17 stsp if (error &&
348 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
351 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
355 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
356 2c7829a4 2019-06-17 stsp if (error != NULL)
360 3ce1b845 2019-07-15 stsp free(repo_path);
361 3ce1b845 2019-07-15 stsp return error;
364 3ce1b845 2019-07-15 stsp __dead static void
365 3ce1b845 2019-07-15 stsp usage_import(void)
367 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
368 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
373 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
376 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
377 3ce1b845 2019-07-15 stsp int st = -1;
379 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
380 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
381 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
383 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
385 3ce1b845 2019-07-15 stsp goto doneediting;
387 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
388 3ce1b845 2019-07-15 stsp _exit(127);
391 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
392 3ce1b845 2019-07-15 stsp if (errno != EINTR)
395 3ce1b845 2019-07-15 stsp doneediting:
396 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
397 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
398 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
400 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
401 3ce1b845 2019-07-15 stsp errno = EINTR;
405 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
408 3ce1b845 2019-07-15 stsp static const struct got_error *
409 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
410 3ce1b845 2019-07-15 stsp const char *initial_content)
412 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
413 3ce1b845 2019-07-15 stsp char buf[1024];
414 3ce1b845 2019-07-15 stsp struct stat st, st2;
416 3ce1b845 2019-07-15 stsp int content_changed = 0;
417 3ce1b845 2019-07-15 stsp size_t len;
419 3ce1b845 2019-07-15 stsp *logmsg = NULL;
421 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
422 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
424 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
425 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
427 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
428 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
430 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
431 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
432 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
434 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
435 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
437 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
440 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
441 3ce1b845 2019-07-15 stsp if (fp == NULL) {
442 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
445 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
446 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
447 3ce1b845 2019-07-15 stsp content_changed = 1;
448 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
449 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
450 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
452 3ce1b845 2019-07-15 stsp fclose(fp);
454 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
455 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
459 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
460 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
461 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
464 3ce1b845 2019-07-15 stsp free(*logmsg);
465 3ce1b845 2019-07-15 stsp *logmsg = NULL;
467 3ce1b845 2019-07-15 stsp return err;
470 3ce1b845 2019-07-15 stsp static const struct got_error *
471 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
472 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
474 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
475 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
478 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
479 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
480 3ce1b845 2019-07-15 stsp branch_name) == -1)
481 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
483 ef293bdd 2019-10-21 stsp err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
487 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
490 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
492 3ce1b845 2019-07-15 stsp free(initial_content);
493 3ce1b845 2019-07-15 stsp return err;
496 3ce1b845 2019-07-15 stsp static const struct got_error *
497 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
499 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
500 3ce1b845 2019-07-15 stsp return NULL;
503 3ce1b845 2019-07-15 stsp static const struct got_error *
504 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
506 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
507 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
509 84792843 2019-08-09 stsp *author = NULL;
511 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
512 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
513 c9956ddf 2019-09-08 stsp if (name && email) {
514 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
515 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
516 aba9c984 2019-09-08 stsp return NULL;
519 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
520 84792843 2019-08-09 stsp if (got_author == NULL) {
521 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
522 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
523 c9956ddf 2019-09-08 stsp if (name && email) {
524 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
525 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
526 c9956ddf 2019-09-08 stsp return NULL;
528 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
529 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
532 aba9c984 2019-09-08 stsp *author = strdup(got_author);
533 aba9c984 2019-09-08 stsp if (*author == NULL)
534 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
537 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
538 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
540 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
541 84792843 2019-08-09 stsp got_author++;
542 aba9c984 2019-09-08 stsp if (*got_author != '<') {
543 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
546 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
547 84792843 2019-08-09 stsp got_author++;
548 aba9c984 2019-09-08 stsp if (*got_author != '@') {
549 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
552 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
553 84792843 2019-08-09 stsp got_author++;
554 84792843 2019-08-09 stsp if (*got_author != '>')
555 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 aba9c984 2019-09-08 stsp free(*author);
559 aba9c984 2019-09-08 stsp *author = NULL;
561 aba9c984 2019-09-08 stsp return err;
564 c9956ddf 2019-09-08 stsp static const struct got_error *
565 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
567 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
569 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
570 c9956ddf 2019-09-08 stsp if (homedir) {
571 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
572 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
575 c9956ddf 2019-09-08 stsp return NULL;
578 84792843 2019-08-09 stsp static const struct got_error *
579 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
581 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
582 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
583 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
584 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
585 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
586 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
587 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
588 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
590 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
591 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
592 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
594 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
596 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
597 3ce1b845 2019-07-15 stsp switch (ch) {
599 3ce1b845 2019-07-15 stsp branch_name = optarg;
602 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
603 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
604 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
609 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
610 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
611 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
617 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
619 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
625 b2b65d18 2019-08-22 stsp usage_import();
626 3ce1b845 2019-07-15 stsp /* NOTREACHED */
630 3ce1b845 2019-07-15 stsp argc -= optind;
631 3ce1b845 2019-07-15 stsp argv += optind;
633 3ce1b845 2019-07-15 stsp #ifndef PROFILE
634 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
636 3ce1b845 2019-07-15 stsp NULL) == -1)
637 3ce1b845 2019-07-15 stsp err(1, "pledge");
639 3ce1b845 2019-07-15 stsp if (argc != 1)
640 3ce1b845 2019-07-15 stsp usage_import();
642 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
643 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
644 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
645 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
647 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
648 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
651 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
655 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
657 aba9c984 2019-09-08 stsp return error;
660 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
661 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
662 e560b7e0 2019-11-28 stsp * an unintended typo.
664 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
665 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
667 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
668 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
672 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
673 3ce1b845 2019-07-15 stsp if (error) {
674 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
677 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
678 3ce1b845 2019-07-15 stsp "import target branch already exists");
682 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
683 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
684 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
687 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
690 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
691 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
693 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
694 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
697 8e158b01 2019-09-22 stsp free(logmsg);
698 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
699 ef293bdd 2019-10-21 stsp path_dir, refname);
700 ef293bdd 2019-10-21 stsp if (error) {
701 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
702 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
703 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
708 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
709 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
710 ef293bdd 2019-10-21 stsp if (logmsg_path)
711 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
715 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
716 ef293bdd 2019-10-21 stsp if (error) {
717 ef293bdd 2019-10-21 stsp if (logmsg_path)
718 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
722 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
723 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
724 ef293bdd 2019-10-21 stsp if (error) {
725 ef293bdd 2019-10-21 stsp if (logmsg_path)
726 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
730 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
731 ef293bdd 2019-10-21 stsp if (error) {
732 ef293bdd 2019-10-21 stsp if (logmsg_path)
733 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
737 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
738 ef293bdd 2019-10-21 stsp if (error) {
739 ef293bdd 2019-10-21 stsp if (logmsg_path)
740 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
744 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
745 ef293bdd 2019-10-21 stsp if (error) {
746 ef293bdd 2019-10-21 stsp if (logmsg_path)
747 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
751 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
752 3ce1b845 2019-07-15 stsp if (error) {
753 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
754 ef293bdd 2019-10-21 stsp if (logmsg_path)
755 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
759 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
760 3ce1b845 2019-07-15 stsp branch_ref);
761 ef293bdd 2019-10-21 stsp if (error) {
762 ef293bdd 2019-10-21 stsp if (logmsg_path)
763 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
767 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
768 ef293bdd 2019-10-21 stsp if (error) {
769 ef293bdd 2019-10-21 stsp if (logmsg_path)
770 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
775 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
776 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
778 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
779 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
780 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
781 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
782 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
783 8e158b01 2019-09-22 stsp free(logmsg);
784 ef293bdd 2019-10-21 stsp free(logmsg_path);
785 2c7829a4 2019-06-17 stsp free(repo_path);
786 3ce1b845 2019-07-15 stsp free(editor);
787 3ce1b845 2019-07-15 stsp free(refname);
788 3ce1b845 2019-07-15 stsp free(new_commit_id);
789 3ce1b845 2019-07-15 stsp free(id_str);
790 aba9c984 2019-09-08 stsp free(author);
791 c9956ddf 2019-09-08 stsp free(gitconfig_path);
792 3ce1b845 2019-07-15 stsp if (branch_ref)
793 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
794 3ce1b845 2019-07-15 stsp if (head_ref)
795 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
796 2c7829a4 2019-06-17 stsp return error;
799 4ed7e80c 2018-05-20 stsp __dead static void
800 c09a553d 2018-03-12 stsp usage_checkout(void)
802 bb51a5b4 2020-01-13 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
803 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
807 7f47418f 2019-12-20 stsp static void
808 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning(void)
810 7f47418f 2019-12-20 stsp fprintf(stderr, "%s: warning: could not create a reference "
811 7f47418f 2019-12-20 stsp "to the work tree's base commit; the commit could be "
812 7f47418f 2019-12-20 stsp "garbage-collected by Git; making the repository "
813 7f47418f 2019-12-20 stsp "writable and running 'got update' will prevent this\n",
814 7f47418f 2019-12-20 stsp getprogname());
817 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg {
818 7f47418f 2019-12-20 stsp const char *worktree_path;
819 7f47418f 2019-12-20 stsp int had_base_commit_ref_error;
822 1ee397ad 2019-07-12 stsp static const struct got_error *
823 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
825 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg *a = arg;
827 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
828 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
829 7f47418f 2019-12-20 stsp return NULL;
831 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
832 7f47418f 2019-12-20 stsp a->had_base_commit_ref_error = 1;
833 1ee397ad 2019-07-12 stsp return NULL;
836 92a684f4 2018-03-12 stsp while (path[0] == '/')
839 7f47418f 2019-12-20 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
840 1ee397ad 2019-07-12 stsp return NULL;
843 99437157 2018-11-11 stsp static const struct got_error *
844 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
846 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
847 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
848 99437157 2018-11-11 stsp return NULL;
851 8069f636 2019-01-12 stsp static const struct got_error *
852 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
853 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
854 3aef623b 2019-10-15 stsp struct got_repository *repo)
856 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
857 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
859 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
860 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
862 36a38700 2019-05-10 stsp return err;
864 d5bea539 2019-05-13 stsp if (yca_id == NULL)
865 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
868 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
869 d5bea539 2019-05-13 stsp * and the work tree's base commit.
871 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
873 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
881 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
882 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
883 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
885 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
886 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
887 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
888 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
889 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
890 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
892 d5bea539 2019-05-13 stsp free(yca_id);
893 d5bea539 2019-05-13 stsp return NULL;
896 a367ff0f 2019-05-14 stsp static const struct got_error *
897 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
898 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
899 a51a74b3 2019-07-27 stsp struct got_repository *repo)
901 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
902 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
903 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
904 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
906 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
910 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
911 a51a74b3 2019-07-27 stsp is_same_branch = 1;
914 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
915 a51a74b3 2019-07-27 stsp is_same_branch = 1;
919 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
923 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
924 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
929 a367ff0f 2019-05-14 stsp struct got_object_id *id;
930 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
931 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
933 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
934 a367ff0f 2019-05-14 stsp err = NULL;
939 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
941 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
942 a367ff0f 2019-05-14 stsp is_same_branch = 1;
949 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
950 a367ff0f 2019-05-14 stsp free(head_commit_id);
951 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
952 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
953 04f57cb3 2019-07-25 stsp return err;
956 04f57cb3 2019-07-25 stsp static const struct got_error *
957 04f57cb3 2019-07-25 stsp resolve_commit_arg(struct got_object_id **commit_id,
958 04f57cb3 2019-07-25 stsp const char *commit_id_arg, struct got_repository *repo)
960 04f57cb3 2019-07-25 stsp const struct got_error *err;
961 04f57cb3 2019-07-25 stsp struct got_reference *ref;
962 303e2782 2019-08-09 stsp struct got_tag_object *tag;
964 303e2782 2019-08-09 stsp err = got_repo_object_match_tag(&tag, commit_id_arg,
965 303e2782 2019-08-09 stsp GOT_OBJ_TYPE_COMMIT, repo);
966 303e2782 2019-08-09 stsp if (err == NULL) {
967 303e2782 2019-08-09 stsp *commit_id = got_object_id_dup(
968 303e2782 2019-08-09 stsp got_object_tag_get_object_id(tag));
969 303e2782 2019-08-09 stsp if (*commit_id == NULL)
970 303e2782 2019-08-09 stsp err = got_error_from_errno("got_object_id_dup");
971 303e2782 2019-08-09 stsp got_object_tag_close(tag);
972 303e2782 2019-08-09 stsp return err;
973 303e2782 2019-08-09 stsp } else if (err->code != GOT_ERR_NO_OBJ)
974 303e2782 2019-08-09 stsp return err;
976 04f57cb3 2019-07-25 stsp err = got_ref_open(&ref, repo, commit_id_arg, 0);
977 04f57cb3 2019-07-25 stsp if (err == NULL) {
978 04f57cb3 2019-07-25 stsp err = got_ref_resolve(commit_id, repo, ref);
979 04f57cb3 2019-07-25 stsp got_ref_close(ref);
981 04f57cb3 2019-07-25 stsp if (err->code != GOT_ERR_NOT_REF)
982 04f57cb3 2019-07-25 stsp return err;
983 04f57cb3 2019-07-25 stsp err = got_repo_match_object_id_prefix(commit_id,
984 04f57cb3 2019-07-25 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
986 a367ff0f 2019-05-14 stsp return err;
989 4ed7e80c 2018-05-20 stsp static const struct got_error *
990 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
992 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
993 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
994 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
995 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
996 c09a553d 2018-03-12 stsp char *repo_path = NULL;
997 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
998 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
999 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
1000 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
1001 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
1002 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1003 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
1005 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1007 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1008 0bb8a95e 2018-03-12 stsp switch (ch) {
1010 08573d5b 2019-05-14 stsp branch_name = optarg;
1013 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
1014 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
1015 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1018 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
1021 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1024 2deda0b9 2019-03-07 stsp usage_checkout();
1025 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1029 0bb8a95e 2018-03-12 stsp argc -= optind;
1030 0bb8a95e 2018-03-12 stsp argv += optind;
1032 6715a751 2018-03-16 stsp #ifndef PROFILE
1033 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1034 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1035 c09a553d 2018-03-12 stsp err(1, "pledge");
1037 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1038 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1039 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1040 76089277 2018-04-01 stsp if (repo_path == NULL)
1041 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1042 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1043 76089277 2018-04-01 stsp if (cwd == NULL) {
1044 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1045 76089277 2018-04-01 stsp goto done;
1047 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1048 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1049 230a42bd 2019-05-11 jcs if (base == NULL) {
1050 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1051 230a42bd 2019-05-11 jcs path_prefix);
1055 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1056 230a42bd 2019-05-11 jcs if (base == NULL) {
1057 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1058 230a42bd 2019-05-11 jcs repo_path);
1062 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1063 c09a553d 2018-03-12 stsp if (dotgit)
1064 c09a553d 2018-03-12 stsp *dotgit = '\0';
1065 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1066 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1067 c09a553d 2018-03-12 stsp free(cwd);
1068 76089277 2018-04-01 stsp goto done;
1070 c09a553d 2018-03-12 stsp free(cwd);
1071 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1072 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1073 76089277 2018-04-01 stsp if (repo_path == NULL) {
1074 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1075 76089277 2018-04-01 stsp goto done;
1077 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1078 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1079 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1080 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1082 b4b3a7dd 2019-07-22 stsp goto done;
1084 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1085 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1086 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1087 b4b3a7dd 2019-07-22 stsp goto done;
1091 c09a553d 2018-03-12 stsp usage_checkout();
1093 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1094 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1096 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1097 c09a553d 2018-03-12 stsp if (error != NULL)
1098 c02c541e 2019-03-29 stsp goto done;
1100 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1101 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1102 c530dc23 2019-07-23 stsp if (error) {
1103 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1104 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1105 c530dc23 2019-07-23 stsp goto done;
1106 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1107 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
1108 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1109 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1110 c530dc23 2019-07-23 stsp goto done;
1114 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1115 c02c541e 2019-03-29 stsp if (error)
1116 c09a553d 2018-03-12 stsp goto done;
1118 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1119 c09a553d 2018-03-12 stsp if (error != NULL)
1120 c09a553d 2018-03-12 stsp goto done;
1122 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1123 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1124 c09a553d 2018-03-12 stsp goto done;
1126 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1127 c09a553d 2018-03-12 stsp if (error != NULL)
1128 c09a553d 2018-03-12 stsp goto done;
1130 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1131 e5dc7198 2018-12-29 stsp path_prefix);
1132 e5dc7198 2018-12-29 stsp if (error != NULL)
1133 e5dc7198 2018-12-29 stsp goto done;
1134 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1135 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1136 49520a32 2018-12-29 stsp goto done;
1139 8069f636 2019-01-12 stsp if (commit_id_str) {
1140 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1141 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1142 30837e32 2019-07-25 stsp if (error)
1143 8069f636 2019-01-12 stsp goto done;
1144 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1145 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1146 8069f636 2019-01-12 stsp if (error != NULL) {
1147 8069f636 2019-01-12 stsp free(commit_id);
1148 8069f636 2019-01-12 stsp goto done;
1150 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1151 45d344f6 2019-05-14 stsp if (error)
1152 45d344f6 2019-05-14 stsp goto done;
1153 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1154 8069f636 2019-01-12 stsp commit_id);
1155 8069f636 2019-01-12 stsp free(commit_id);
1156 8069f636 2019-01-12 stsp if (error)
1157 8069f636 2019-01-12 stsp goto done;
1160 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1161 f2ea84fa 2019-07-27 stsp if (error)
1162 f2ea84fa 2019-07-27 stsp goto done;
1163 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1164 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1165 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1166 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1167 c09a553d 2018-03-12 stsp if (error != NULL)
1168 c09a553d 2018-03-12 stsp goto done;
1170 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1171 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1172 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1175 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1176 8069f636 2019-01-12 stsp free(commit_id_str);
1177 76089277 2018-04-01 stsp free(repo_path);
1178 507dc3bb 2018-12-29 stsp free(worktree_path);
1179 507dc3bb 2018-12-29 stsp return error;
1182 507dc3bb 2018-12-29 stsp __dead static void
1183 507dc3bb 2018-12-29 stsp usage_update(void)
1185 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1186 507dc3bb 2018-12-29 stsp getprogname());
1190 1ee397ad 2019-07-12 stsp static const struct got_error *
1191 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1193 784955db 2019-01-12 stsp int *did_something = arg;
1195 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1196 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1197 1ee397ad 2019-07-12 stsp return NULL;
1199 1545c615 2019-02-10 stsp *did_something = 1;
1201 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1202 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1203 1ee397ad 2019-07-12 stsp return NULL;
1205 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1207 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1208 1ee397ad 2019-07-12 stsp return NULL;
1211 be7061eb 2018-12-30 stsp static const struct got_error *
1212 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1213 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1214 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1216 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1217 a1fb16d8 2019-05-24 stsp char *base_id_str;
1218 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1220 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1221 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1222 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1223 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1224 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1225 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1226 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1229 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1230 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1231 a1fb16d8 2019-05-24 stsp if (err) {
1232 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1233 a1fb16d8 2019-05-24 stsp return err;
1234 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1236 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1237 a1fb16d8 2019-05-24 stsp return NULL;
1239 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1240 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1241 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1243 a1fb16d8 2019-05-24 stsp return err;
1244 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1245 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1246 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1247 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1248 0ebf8283 2019-07-24 stsp return NULL;
1251 0ebf8283 2019-07-24 stsp static const struct got_error *
1252 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1254 0ebf8283 2019-07-24 stsp const struct got_error *err;
1255 0ebf8283 2019-07-24 stsp int in_progress;
1257 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1259 0ebf8283 2019-07-24 stsp return err;
1260 0ebf8283 2019-07-24 stsp if (in_progress)
1261 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1263 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1265 0ebf8283 2019-07-24 stsp return err;
1266 0ebf8283 2019-07-24 stsp if (in_progress)
1267 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1269 a1fb16d8 2019-05-24 stsp return NULL;
1272 a5edda0a 2019-07-27 stsp static const struct got_error *
1273 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1274 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1276 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1277 a5edda0a 2019-07-27 stsp char *path;
1280 a5edda0a 2019-07-27 stsp if (argc == 0) {
1281 a5edda0a 2019-07-27 stsp path = strdup("");
1282 a5edda0a 2019-07-27 stsp if (path == NULL)
1283 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1284 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1287 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1288 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1291 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1292 a5edda0a 2019-07-27 stsp if (err) {
1293 a5edda0a 2019-07-27 stsp free(path);
1298 a5edda0a 2019-07-27 stsp return err;
1301 a1fb16d8 2019-05-24 stsp static const struct got_error *
1302 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1304 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1305 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1306 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1307 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1308 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1309 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1310 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1311 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1312 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1313 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1314 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1316 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1318 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1319 507dc3bb 2018-12-29 stsp switch (ch) {
1321 024e9686 2019-05-14 stsp branch_name = optarg;
1324 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1325 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1326 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1329 2deda0b9 2019-03-07 stsp usage_update();
1330 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1334 507dc3bb 2018-12-29 stsp argc -= optind;
1335 507dc3bb 2018-12-29 stsp argv += optind;
1337 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1338 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1339 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1340 507dc3bb 2018-12-29 stsp err(1, "pledge");
1342 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1343 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1344 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1345 c4cdcb68 2019-04-03 stsp goto done;
1347 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1348 7d5807f4 2019-07-11 stsp if (error)
1349 7d5807f4 2019-07-11 stsp goto done;
1351 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1352 f2ea84fa 2019-07-27 stsp if (error)
1353 f2ea84fa 2019-07-27 stsp goto done;
1355 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1357 507dc3bb 2018-12-29 stsp if (error != NULL)
1358 507dc3bb 2018-12-29 stsp goto done;
1360 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1361 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1362 087fb88c 2019-08-04 stsp if (error)
1363 087fb88c 2019-08-04 stsp goto done;
1365 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1366 0266afb7 2019-01-04 stsp if (error)
1367 0266afb7 2019-01-04 stsp goto done;
1369 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1370 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1371 024e9686 2019-05-14 stsp if (error != NULL)
1372 024e9686 2019-05-14 stsp goto done;
1373 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1374 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1375 9c4b8182 2019-01-02 stsp if (error != NULL)
1376 9c4b8182 2019-01-02 stsp goto done;
1377 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1378 507dc3bb 2018-12-29 stsp if (error != NULL)
1379 507dc3bb 2018-12-29 stsp goto done;
1381 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1382 04f57cb3 2019-07-25 stsp free(commit_id_str);
1383 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1384 30837e32 2019-07-25 stsp if (error)
1385 a297e751 2019-07-11 stsp goto done;
1386 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1387 a297e751 2019-07-11 stsp if (error)
1388 507dc3bb 2018-12-29 stsp goto done;
1391 a1fb16d8 2019-05-24 stsp if (branch_name) {
1392 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1393 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1394 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1396 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1397 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1398 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1399 024e9686 2019-05-14 stsp goto done;
1401 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1402 024e9686 2019-05-14 stsp if (error)
1403 024e9686 2019-05-14 stsp goto done;
1404 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1406 a367ff0f 2019-05-14 stsp free(head_commit_id);
1407 024e9686 2019-05-14 stsp if (error != NULL)
1408 024e9686 2019-05-14 stsp goto done;
1409 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1410 a367ff0f 2019-05-14 stsp if (error)
1411 a367ff0f 2019-05-14 stsp goto done;
1412 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1413 024e9686 2019-05-14 stsp if (error)
1414 024e9686 2019-05-14 stsp goto done;
1416 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1417 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1418 a367ff0f 2019-05-14 stsp if (error != NULL) {
1419 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1420 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1421 024e9686 2019-05-14 stsp goto done;
1423 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1424 a367ff0f 2019-05-14 stsp if (error)
1425 a367ff0f 2019-05-14 stsp goto done;
1428 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1429 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1430 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1431 507dc3bb 2018-12-29 stsp commit_id);
1432 507dc3bb 2018-12-29 stsp if (error)
1433 507dc3bb 2018-12-29 stsp goto done;
1436 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1437 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1438 507dc3bb 2018-12-29 stsp if (error != NULL)
1439 507dc3bb 2018-12-29 stsp goto done;
1441 784955db 2019-01-12 stsp if (did_something)
1442 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1444 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1446 c09a553d 2018-03-12 stsp free(worktree_path);
1447 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1448 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1449 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1450 507dc3bb 2018-12-29 stsp free(commit_id);
1451 9c4b8182 2019-01-02 stsp free(commit_id_str);
1452 c09a553d 2018-03-12 stsp return error;
1455 f42b1b34 2018-03-12 stsp static const struct got_error *
1456 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1457 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1458 63035f9f 2019-10-06 stsp struct got_repository *repo)
1460 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1461 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1463 44392932 2019-08-25 stsp if (blob_id1) {
1464 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1466 44392932 2019-08-25 stsp goto done;
1469 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1471 44392932 2019-08-25 stsp goto done;
1473 44392932 2019-08-25 stsp while (path[0] == '/')
1475 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1476 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1478 44392932 2019-08-25 stsp if (blob1)
1479 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1480 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1481 44392932 2019-08-25 stsp return err;
1484 44392932 2019-08-25 stsp static const struct got_error *
1485 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1486 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1487 63035f9f 2019-10-06 stsp struct got_repository *repo)
1489 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1490 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1491 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1493 44392932 2019-08-25 stsp if (tree_id1) {
1494 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1496 44392932 2019-08-25 stsp goto done;
1499 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1501 0f2b3dca 2018-12-22 stsp goto done;
1503 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1504 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1505 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1506 44392932 2019-08-25 stsp while (path[0] == '/')
1508 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1509 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1511 79109fed 2018-03-27 stsp if (tree1)
1512 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1513 366e0a5f 2019-10-10 stsp if (tree2)
1514 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1515 44392932 2019-08-25 stsp return err;
1518 44392932 2019-08-25 stsp static const struct got_error *
1519 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1520 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1522 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1523 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1524 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1525 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1526 44392932 2019-08-25 stsp struct got_object_qid *qid;
1528 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1529 44392932 2019-08-25 stsp if (qid != NULL) {
1530 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1533 44392932 2019-08-25 stsp return err;
1536 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1537 44392932 2019-08-25 stsp int obj_type;
1538 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1540 44392932 2019-08-25 stsp goto done;
1541 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1542 44392932 2019-08-25 stsp if (err) {
1543 44392932 2019-08-25 stsp free(obj_id2);
1544 44392932 2019-08-25 stsp goto done;
1546 44392932 2019-08-25 stsp if (pcommit) {
1547 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1548 44392932 2019-08-25 stsp qid->id, path);
1549 44392932 2019-08-25 stsp if (err) {
1550 44392932 2019-08-25 stsp free(obj_id2);
1551 44392932 2019-08-25 stsp goto done;
1553 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1554 44392932 2019-08-25 stsp if (err) {
1555 44392932 2019-08-25 stsp free(obj_id2);
1556 44392932 2019-08-25 stsp goto done;
1559 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1560 44392932 2019-08-25 stsp if (err) {
1561 44392932 2019-08-25 stsp free(obj_id2);
1562 44392932 2019-08-25 stsp goto done;
1564 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1565 44392932 2019-08-25 stsp switch (obj_type) {
1566 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1567 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1570 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1571 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1575 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1578 44392932 2019-08-25 stsp free(obj_id1);
1579 44392932 2019-08-25 stsp free(obj_id2);
1581 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1582 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1584 44392932 2019-08-25 stsp goto done;
1585 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1586 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1588 44392932 2019-08-25 stsp goto done;
1589 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1590 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1594 0f2b3dca 2018-12-22 stsp free(id_str1);
1595 0f2b3dca 2018-12-22 stsp free(id_str2);
1596 44392932 2019-08-25 stsp if (pcommit)
1597 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1598 79109fed 2018-03-27 stsp return err;
1601 4bb494d5 2018-06-16 stsp static char *
1602 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1604 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1605 09867e48 2019-08-13 stsp char *p, *s;
1607 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1608 09867e48 2019-08-13 stsp if (tm == NULL)
1609 09867e48 2019-08-13 stsp return NULL;
1610 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1611 09867e48 2019-08-13 stsp if (s == NULL)
1612 09867e48 2019-08-13 stsp return NULL;
1613 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1615 6c281f94 2018-06-11 stsp *p = '\0';
1619 6841bf13 2019-11-29 kn static const struct got_error *
1620 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1621 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1623 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1624 6841bf13 2019-11-29 kn regmatch_t regmatch;
1625 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1627 6841bf13 2019-11-29 kn *have_match = 0;
1629 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1633 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1637 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1638 6841bf13 2019-11-29 kn *have_match = 1;
1640 6841bf13 2019-11-29 kn free(id_str);
1641 6841bf13 2019-11-29 kn free(logmsg);
1645 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1647 79109fed 2018-03-27 stsp static const struct got_error *
1648 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1649 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1650 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1652 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1653 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1654 6c281f94 2018-06-11 stsp char datebuf[26];
1655 45d799e2 2018-12-23 stsp time_t committer_time;
1656 45d799e2 2018-12-23 stsp const char *author, *committer;
1657 199a4027 2019-02-02 stsp char *refs_str = NULL;
1658 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1660 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1662 199a4027 2019-02-02 stsp const char *name;
1663 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1666 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1667 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1669 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1670 199a4027 2019-02-02 stsp name += 5;
1671 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1673 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1674 e34f9ed6 2019-02-02 stsp name += 6;
1675 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1676 141c2bff 2019-02-04 stsp name += 8;
1677 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1678 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1679 5d844a1e 2019-08-13 stsp if (err) {
1680 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1681 5d844a1e 2019-08-13 stsp return err;
1682 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1683 5d844a1e 2019-08-13 stsp err = NULL;
1684 5d844a1e 2019-08-13 stsp tag = NULL;
1687 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1688 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1690 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1691 a436ad14 2019-08-13 stsp if (cmp != 0)
1693 199a4027 2019-02-02 stsp s = refs_str;
1694 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1695 199a4027 2019-02-02 stsp name) == -1) {
1696 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1698 34ca4898 2019-08-13 stsp return err;
1702 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1704 8bf5b3c9 2018-03-17 stsp return err;
1706 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1707 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1708 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1709 832c249c 2018-06-10 stsp free(id_str);
1710 d3d493d7 2019-02-21 stsp id_str = NULL;
1711 d3d493d7 2019-02-21 stsp free(refs_str);
1712 d3d493d7 2019-02-21 stsp refs_str = NULL;
1713 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1714 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1715 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1716 09867e48 2019-08-13 stsp if (datestr)
1717 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1718 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1719 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1720 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1721 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1722 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1723 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1724 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1725 3fe1abad 2018-06-10 stsp int n = 1;
1726 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1727 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1728 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1730 a0603db2 2018-06-10 stsp return err;
1731 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1732 a0603db2 2018-06-10 stsp free(id_str);
1736 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1738 5943eee2 2019-08-13 stsp return err;
1740 621015ac 2018-07-23 stsp logmsg = logmsg0;
1742 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1744 832c249c 2018-06-10 stsp printf(" %s\n", line);
1745 832c249c 2018-06-10 stsp } while (line);
1746 621015ac 2018-07-23 stsp free(logmsg0);
1748 971751ac 2018-03-27 stsp if (show_patch) {
1749 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1750 971751ac 2018-03-27 stsp if (err == 0)
1751 971751ac 2018-03-27 stsp printf("\n");
1754 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1755 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1756 07862c20 2018-09-15 stsp return err;
1759 f42b1b34 2018-03-12 stsp static const struct got_error *
1760 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1761 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1762 463a997a 2019-12-08 kn int diff_context, int limit, int first_parent_traversal,
1763 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1765 f42b1b34 2018-03-12 stsp const struct got_error *err;
1766 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1767 6841bf13 2019-11-29 kn regex_t regex;
1768 6841bf13 2019-11-29 kn int have_match;
1770 6841bf13 2019-11-29 kn if (search_pattern &&
1771 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1772 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1774 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, path, first_parent_traversal);
1776 f42b1b34 2018-03-12 stsp return err;
1777 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1778 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1780 fcc85cad 2018-07-22 stsp goto done;
1782 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1783 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1785 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1788 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
1789 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
1790 372ccdbb 2018-06-10 stsp if (err) {
1791 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
1792 9ba79e04 2018-06-11 stsp err = NULL;
1795 b43fbaa0 2018-06-11 stsp if (id == NULL)
1798 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1802 6841bf13 2019-11-29 kn if (search_pattern) {
1803 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
1805 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1808 6841bf13 2019-11-29 kn if (have_match == 0) {
1809 6841bf13 2019-11-29 kn got_object_commit_close(commit);
1814 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
1815 44392932 2019-08-25 stsp diff_context, refs);
1816 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
1817 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
1821 6841bf13 2019-11-29 kn if (search_pattern)
1822 6841bf13 2019-11-29 kn regfree(®ex);
1823 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
1824 f42b1b34 2018-03-12 stsp return err;
1827 4ed7e80c 2018-05-20 stsp __dead static void
1828 6f3d1eb0 2018-03-12 stsp usage_log(void)
1830 cc54c501 2019-07-15 stsp fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1831 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1835 b1ebc001 2019-08-13 stsp static int
1836 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
1838 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
1839 b1ebc001 2019-08-13 stsp long long n;
1840 b1ebc001 2019-08-13 stsp const char *errstr;
1842 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1843 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
1845 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1846 b1ebc001 2019-08-13 stsp if (errstr != NULL)
1851 4ed7e80c 2018-05-20 stsp static const struct got_error *
1852 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
1854 f42b1b34 2018-03-12 stsp const struct got_error *error;
1855 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
1856 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
1857 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
1858 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
1859 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1860 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
1861 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
1862 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
1863 64a96a6d 2018-04-01 stsp const char *errstr;
1864 199a4027 2019-02-02 stsp struct got_reflist_head refs;
1866 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
1868 6715a751 2018-03-16 stsp #ifndef PROFILE
1869 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1872 f42b1b34 2018-03-12 stsp err(1, "pledge");
1875 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
1877 6841bf13 2019-11-29 kn while ((ch = getopt(argc, argv, "b:pc:C:l:fr:s:")) != -1) {
1878 79109fed 2018-03-27 stsp switch (ch) {
1880 79109fed 2018-03-27 stsp show_patch = 1;
1883 d142fc45 2018-04-01 stsp start_commit = optarg;
1886 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1888 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
1889 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
1892 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
1893 64a96a6d 2018-04-01 stsp if (errstr != NULL)
1894 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
1897 cc54c501 2019-07-15 stsp first_parent_traversal = 1;
1900 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1901 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
1902 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
1904 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1907 6841bf13 2019-11-29 kn search_pattern = optarg;
1910 2deda0b9 2019-03-07 stsp usage_log();
1911 79109fed 2018-03-27 stsp /* NOTREACHED */
1915 79109fed 2018-03-27 stsp argc -= optind;
1916 79109fed 2018-03-27 stsp argv += optind;
1918 dc1edbfa 2019-11-29 kn if (diff_context == -1)
1919 dc1edbfa 2019-11-29 kn diff_context = 3;
1920 dc1edbfa 2019-11-29 kn else if (!show_patch)
1921 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
1923 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
1924 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
1925 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1926 04ca23f4 2018-07-16 stsp goto done;
1929 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1930 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1931 cffc0aa4 2019-02-05 stsp goto done;
1932 cffc0aa4 2019-02-05 stsp error = NULL;
1934 e7301579 2019-03-18 stsp if (argc == 0) {
1935 cbd1af7a 2019-03-18 stsp path = strdup("");
1936 e7301579 2019-03-18 stsp if (path == NULL) {
1937 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1938 cbd1af7a 2019-03-18 stsp goto done;
1940 e7301579 2019-03-18 stsp } else if (argc == 1) {
1941 e7301579 2019-03-18 stsp if (worktree) {
1942 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1944 e7301579 2019-03-18 stsp if (error)
1945 e7301579 2019-03-18 stsp goto done;
1947 e7301579 2019-03-18 stsp path = strdup(argv[0]);
1948 e7301579 2019-03-18 stsp if (path == NULL) {
1949 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1950 e7301579 2019-03-18 stsp goto done;
1954 cbd1af7a 2019-03-18 stsp usage_log();
1956 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
1957 5486daa2 2019-05-11 stsp repo_path = worktree ?
1958 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1960 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
1961 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1962 cffc0aa4 2019-02-05 stsp goto done;
1965 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1966 d7d4f210 2018-03-12 stsp if (error != NULL)
1967 04ca23f4 2018-07-16 stsp goto done;
1969 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
1970 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1971 c02c541e 2019-03-29 stsp if (error)
1972 c02c541e 2019-03-29 stsp goto done;
1974 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
1975 3235492e 2018-04-01 stsp struct got_reference *head_ref;
1976 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
1977 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
1978 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
1979 3235492e 2018-04-01 stsp if (error != NULL)
1980 3235492e 2018-04-01 stsp return error;
1981 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
1982 3235492e 2018-04-01 stsp got_ref_close(head_ref);
1983 3235492e 2018-04-01 stsp if (error != NULL)
1984 3235492e 2018-04-01 stsp return error;
1985 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
1987 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
1988 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
1989 3235492e 2018-04-01 stsp if (error == NULL) {
1990 1caad61b 2019-02-01 stsp int obj_type;
1991 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
1992 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
1993 d1f2edc9 2018-06-13 stsp if (error != NULL)
1994 1caad61b 2019-02-01 stsp goto done;
1995 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
1996 1caad61b 2019-02-01 stsp if (error != NULL)
1997 1caad61b 2019-02-01 stsp goto done;
1998 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
1999 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
2000 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
2001 1caad61b 2019-02-01 stsp if (error != NULL)
2002 1caad61b 2019-02-01 stsp goto done;
2003 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
2004 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
2005 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2006 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2007 1caad61b 2019-02-01 stsp goto done;
2010 1caad61b 2019-02-01 stsp id = got_object_id_dup(
2011 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
2012 1caad61b 2019-02-01 stsp if (id == NULL)
2013 638f9024 2019-05-13 stsp error = got_error_from_errno(
2014 230a42bd 2019-05-11 jcs "got_object_id_dup");
2015 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2016 1caad61b 2019-02-01 stsp if (error)
2017 1caad61b 2019-02-01 stsp goto done;
2018 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2019 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2020 1caad61b 2019-02-01 stsp goto done;
2022 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2023 d1f2edc9 2018-06-13 stsp if (error != NULL)
2024 1caad61b 2019-02-01 stsp goto done;
2026 15a94983 2018-12-23 stsp if (commit == NULL) {
2027 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2028 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2029 d1f2edc9 2018-06-13 stsp if (error != NULL)
2030 d1f2edc9 2018-06-13 stsp return error;
2033 d7d4f210 2018-03-12 stsp if (error != NULL)
2034 04ca23f4 2018-07-16 stsp goto done;
2036 deeabeae 2019-08-27 stsp if (worktree) {
2037 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2039 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2040 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2041 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2042 deeabeae 2019-08-27 stsp goto done;
2044 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
2047 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2048 04ca23f4 2018-07-16 stsp if (error != NULL)
2049 04ca23f4 2018-07-16 stsp goto done;
2050 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2051 04ca23f4 2018-07-16 stsp free(path);
2052 04ca23f4 2018-07-16 stsp path = in_repo_path;
2055 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2056 199a4027 2019-02-02 stsp if (error)
2057 199a4027 2019-02-02 stsp goto done;
2059 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2060 199a4027 2019-02-02 stsp diff_context, limit, first_parent_traversal, &refs);
2062 04ca23f4 2018-07-16 stsp free(path);
2063 04ca23f4 2018-07-16 stsp free(repo_path);
2064 04ca23f4 2018-07-16 stsp free(cwd);
2066 cffc0aa4 2019-02-05 stsp if (worktree)
2067 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2068 ad242220 2018-09-08 stsp if (repo) {
2069 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2070 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2071 ad242220 2018-09-08 stsp if (error == NULL)
2072 ad242220 2018-09-08 stsp error = repo_error;
2074 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2075 8bf5b3c9 2018-03-17 stsp return error;
2078 4ed7e80c 2018-05-20 stsp __dead static void
2079 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2081 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2082 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2086 b72f483a 2019-02-05 stsp struct print_diff_arg {
2087 b72f483a 2019-02-05 stsp struct got_repository *repo;
2088 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2089 b72f483a 2019-02-05 stsp int diff_context;
2090 3fc0c068 2019-02-10 stsp const char *id_str;
2091 3fc0c068 2019-02-10 stsp int header_shown;
2092 98eaaa12 2019-08-03 stsp int diff_staged;
2093 63035f9f 2019-10-06 stsp int ignore_whitespace;
2096 4ed7e80c 2018-05-20 stsp static const struct got_error *
2097 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2098 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2099 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2100 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2102 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2103 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2104 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2105 12463d8b 2019-12-13 stsp int fd = -1;
2106 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2107 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2108 b72f483a 2019-02-05 stsp struct stat sb;
2110 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2111 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2112 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2113 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2114 98eaaa12 2019-08-03 stsp return NULL;
2116 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2117 98eaaa12 2019-08-03 stsp return NULL;
2118 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2119 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2120 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2121 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2122 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2123 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2124 98eaaa12 2019-08-03 stsp return NULL;
2127 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2128 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2129 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2130 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2131 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2134 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2135 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2136 98eaaa12 2019-08-03 stsp switch (staged_status) {
2137 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2138 98eaaa12 2019-08-03 stsp label1 = path;
2139 98eaaa12 2019-08-03 stsp label2 = path;
2141 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2142 98eaaa12 2019-08-03 stsp label2 = path;
2144 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2145 98eaaa12 2019-08-03 stsp label1 = path;
2148 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2150 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2151 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2152 63035f9f 2019-10-06 stsp a->repo, stdout);
2155 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2156 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2157 4ce46740 2019-08-08 stsp char *id_str;
2158 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2161 4ce46740 2019-08-08 stsp goto done;
2162 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2164 4ce46740 2019-08-08 stsp goto done;
2165 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2166 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2167 4ce46740 2019-08-08 stsp free(id_str);
2168 4ce46740 2019-08-08 stsp goto done;
2170 4ce46740 2019-08-08 stsp free(id_str);
2171 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2172 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2174 4ce46740 2019-08-08 stsp goto done;
2177 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2178 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2179 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2180 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2181 2ec1f75b 2019-03-26 stsp goto done;
2184 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2185 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2186 12463d8b 2019-12-13 stsp if (fd == -1) {
2187 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2188 12463d8b 2019-12-13 stsp goto done;
2191 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2192 12463d8b 2019-12-13 stsp if (fd == -1) {
2193 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2194 12463d8b 2019-12-13 stsp goto done;
2197 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2198 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2199 2ec1f75b 2019-03-26 stsp goto done;
2201 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2202 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2203 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2204 2ec1f75b 2019-03-26 stsp goto done;
2208 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2210 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2211 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2213 b72f483a 2019-02-05 stsp if (blob1)
2214 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2215 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2216 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2217 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2218 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2219 b72f483a 2019-02-05 stsp free(abspath);
2220 927df6b7 2019-02-10 stsp return err;
2223 927df6b7 2019-02-10 stsp static const struct got_error *
2224 0adb7196 2019-08-11 stsp match_object_id(struct got_object_id **id, char **label,
2225 01073a5d 2019-08-22 stsp const char *id_str, int obj_type, int resolve_tags,
2226 01073a5d 2019-08-22 stsp struct got_repository *repo)
2228 0adb7196 2019-08-11 stsp const struct got_error *err;
2229 d24820bf 2019-08-11 stsp struct got_tag_object *tag;
2230 0adb7196 2019-08-11 stsp struct got_reference *ref = NULL;
2232 0adb7196 2019-08-11 stsp *id = NULL;
2233 0adb7196 2019-08-11 stsp *label = NULL;
2235 01073a5d 2019-08-22 stsp if (resolve_tags) {
2236 01073a5d 2019-08-22 stsp err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2238 01073a5d 2019-08-22 stsp if (err == NULL) {
2239 01073a5d 2019-08-22 stsp *id = got_object_id_dup(
2240 01073a5d 2019-08-22 stsp got_object_tag_get_object_id(tag));
2241 01073a5d 2019-08-22 stsp if (*id == NULL)
2242 01073a5d 2019-08-22 stsp err = got_error_from_errno("got_object_id_dup");
2243 01073a5d 2019-08-22 stsp else if (asprintf(label, "refs/tags/%s",
2244 01073a5d 2019-08-22 stsp got_object_tag_get_name(tag)) == -1) {
2245 01073a5d 2019-08-22 stsp err = got_error_from_errno("asprintf");
2246 32f0ab81 2019-08-28 hiltjo free(*id);
2247 01073a5d 2019-08-22 stsp *id = NULL;
2249 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
2250 01073a5d 2019-08-22 stsp return err;
2251 01073a5d 2019-08-22 stsp } else if (err->code != GOT_ERR_NO_OBJ)
2252 01073a5d 2019-08-22 stsp return err;
2255 0adb7196 2019-08-11 stsp err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2256 0adb7196 2019-08-11 stsp if (err) {
2257 0adb7196 2019-08-11 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2258 0adb7196 2019-08-11 stsp return err;
2259 0adb7196 2019-08-11 stsp err = got_ref_open(&ref, repo, id_str, 0);
2260 0adb7196 2019-08-11 stsp if (err != NULL)
2261 0adb7196 2019-08-11 stsp goto done;
2262 0adb7196 2019-08-11 stsp *label = strdup(got_ref_get_name(ref));
2263 0adb7196 2019-08-11 stsp if (*label == NULL) {
2264 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2265 0adb7196 2019-08-11 stsp goto done;
2267 0adb7196 2019-08-11 stsp err = got_ref_resolve(id, repo, ref);
2269 0adb7196 2019-08-11 stsp err = got_object_id_str(label, *id);
2270 0adb7196 2019-08-11 stsp if (*label == NULL) {
2271 0adb7196 2019-08-11 stsp err = got_error_from_errno("strdup");
2272 0adb7196 2019-08-11 stsp goto done;
2277 0adb7196 2019-08-11 stsp got_ref_close(ref);
2278 0adb7196 2019-08-11 stsp return err;
2282 0adb7196 2019-08-11 stsp static const struct got_error *
2283 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2285 b00d56cd 2018-04-01 stsp const struct got_error *error;
2286 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2287 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2288 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2289 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2290 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2291 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2292 15a94983 2018-12-23 stsp int type1, type2;
2293 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2294 c0cc5c62 2018-10-18 stsp const char *errstr;
2295 927df6b7 2019-02-10 stsp char *path = NULL;
2297 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2298 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2299 25eccc22 2019-01-04 stsp NULL) == -1)
2300 b00d56cd 2018-04-01 stsp err(1, "pledge");
2303 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2304 b00d56cd 2018-04-01 stsp switch (ch) {
2306 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2308 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2309 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2312 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2313 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2314 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2316 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2319 98eaaa12 2019-08-03 stsp diff_staged = 1;
2322 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2325 2deda0b9 2019-03-07 stsp usage_diff();
2326 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2330 b00d56cd 2018-04-01 stsp argc -= optind;
2331 b00d56cd 2018-04-01 stsp argv += optind;
2333 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2334 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2335 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2336 b72f483a 2019-02-05 stsp goto done;
2338 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2339 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2340 927df6b7 2019-02-10 stsp goto done;
2341 927df6b7 2019-02-10 stsp if (argc <= 1) {
2342 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2343 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2344 927df6b7 2019-02-10 stsp goto done;
2346 b72f483a 2019-02-05 stsp if (repo_path)
2348 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2349 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2350 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2351 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2352 927df6b7 2019-02-10 stsp goto done;
2354 927df6b7 2019-02-10 stsp if (argc == 1) {
2355 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2357 927df6b7 2019-02-10 stsp if (error)
2358 927df6b7 2019-02-10 stsp goto done;
2360 927df6b7 2019-02-10 stsp path = strdup("");
2361 927df6b7 2019-02-10 stsp if (path == NULL) {
2362 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2363 927df6b7 2019-02-10 stsp goto done;
2366 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2367 98eaaa12 2019-08-03 stsp if (diff_staged)
2368 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2369 98eaaa12 2019-08-03 stsp "objects in repository");
2370 15a94983 2018-12-23 stsp id_str1 = argv[0];
2371 15a94983 2018-12-23 stsp id_str2 = argv[1];
2372 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2373 30db809c 2019-06-05 stsp repo_path =
2374 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2375 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2376 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2377 30db809c 2019-06-05 stsp goto done;
2381 b00d56cd 2018-04-01 stsp usage_diff();
2383 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2384 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2385 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2386 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2389 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2390 76089277 2018-04-01 stsp free(repo_path);
2391 b00d56cd 2018-04-01 stsp if (error != NULL)
2392 b00d56cd 2018-04-01 stsp goto done;
2394 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2395 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2396 c02c541e 2019-03-29 stsp if (error)
2397 c02c541e 2019-03-29 stsp goto done;
2399 30db809c 2019-06-05 stsp if (argc <= 1) {
2400 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2401 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2402 b72f483a 2019-02-05 stsp char *id_str;
2404 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2406 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2407 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2408 b72f483a 2019-02-05 stsp if (error)
2409 b72f483a 2019-02-05 stsp goto done;
2410 b72f483a 2019-02-05 stsp arg.repo = repo;
2411 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2412 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2413 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2414 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2415 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2416 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2418 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2419 72ea6654 2019-07-27 stsp if (error)
2420 72ea6654 2019-07-27 stsp goto done;
2422 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2423 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2424 b72f483a 2019-02-05 stsp free(id_str);
2425 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2426 b72f483a 2019-02-05 stsp goto done;
2429 01073a5d 2019-08-22 stsp error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2431 0adb7196 2019-08-11 stsp if (error)
2432 0adb7196 2019-08-11 stsp goto done;
2434 01073a5d 2019-08-22 stsp error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2436 0adb7196 2019-08-11 stsp if (error)
2437 0adb7196 2019-08-11 stsp goto done;
2439 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2440 15a94983 2018-12-23 stsp if (error)
2441 15a94983 2018-12-23 stsp goto done;
2443 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2444 15a94983 2018-12-23 stsp if (error)
2445 15a94983 2018-12-23 stsp goto done;
2447 15a94983 2018-12-23 stsp if (type1 != type2) {
2448 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2449 b00d56cd 2018-04-01 stsp goto done;
2452 15a94983 2018-12-23 stsp switch (type1) {
2453 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2454 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2455 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2457 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2458 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2459 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2461 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2462 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2463 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2464 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2467 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2471 5e70831e 2019-05-28 stsp free(label1);
2472 5e70831e 2019-05-28 stsp free(label2);
2473 15a94983 2018-12-23 stsp free(id1);
2474 15a94983 2018-12-23 stsp free(id2);
2475 927df6b7 2019-02-10 stsp free(path);
2476 b72f483a 2019-02-05 stsp if (worktree)
2477 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2478 ad242220 2018-09-08 stsp if (repo) {
2479 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2480 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2481 ad242220 2018-09-08 stsp if (error == NULL)
2482 ad242220 2018-09-08 stsp error = repo_error;
2484 b00d56cd 2018-04-01 stsp return error;
2487 404c43c4 2018-06-21 stsp __dead static void
2488 404c43c4 2018-06-21 stsp usage_blame(void)
2490 9270e621 2019-02-05 stsp fprintf(stderr,
2491 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2492 404c43c4 2018-06-21 stsp getprogname());
2496 28315671 2019-08-14 stsp struct blame_line {
2497 28315671 2019-08-14 stsp int annotated;
2498 28315671 2019-08-14 stsp char *id_str;
2499 82f6abb8 2019-08-14 stsp char *committer;
2500 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2503 28315671 2019-08-14 stsp struct blame_cb_args {
2504 28315671 2019-08-14 stsp struct blame_line *lines;
2505 28315671 2019-08-14 stsp int nlines;
2506 7ef28ff8 2019-08-14 stsp int nlines_prec;
2507 28315671 2019-08-14 stsp int lineno_cur;
2508 28315671 2019-08-14 stsp off_t *line_offsets;
2510 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2513 404c43c4 2018-06-21 stsp static const struct got_error *
2514 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2516 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2517 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2518 28315671 2019-08-14 stsp struct blame_line *bline;
2519 82f6abb8 2019-08-14 stsp char *line = NULL;
2520 28315671 2019-08-14 stsp size_t linesize = 0;
2521 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2522 28315671 2019-08-14 stsp off_t offset;
2523 bcb49d15 2019-08-14 stsp struct tm tm;
2524 bcb49d15 2019-08-14 stsp time_t committer_time;
2526 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2527 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2528 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2530 28315671 2019-08-14 stsp if (sigint_received)
2531 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2533 2839f8b9 2019-08-18 stsp if (lineno == -1)
2534 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2536 28315671 2019-08-14 stsp /* Annotate this line. */
2537 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2538 28315671 2019-08-14 stsp if (bline->annotated)
2539 28315671 2019-08-14 stsp return NULL;
2540 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2542 28315671 2019-08-14 stsp return err;
2544 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2546 82f6abb8 2019-08-14 stsp goto done;
2548 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2549 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2550 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2551 bcb49d15 2019-08-14 stsp goto done;
2554 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2555 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2556 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2557 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2558 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2559 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2560 82f6abb8 2019-08-14 stsp goto done;
2562 28315671 2019-08-14 stsp bline->annotated = 1;
2564 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2565 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2566 28315671 2019-08-14 stsp if (!bline->annotated)
2567 82f6abb8 2019-08-14 stsp goto done;
2569 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2570 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2571 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2572 82f6abb8 2019-08-14 stsp goto done;
2575 28315671 2019-08-14 stsp while (bline->annotated) {
2576 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2577 82f6abb8 2019-08-14 stsp size_t len;
2579 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2580 28315671 2019-08-14 stsp if (ferror(a->f))
2581 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2585 82f6abb8 2019-08-14 stsp committer = bline->committer;
2586 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2587 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2588 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2589 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2591 82f6abb8 2019-08-14 stsp *at = '\0';
2592 82f6abb8 2019-08-14 stsp len = strlen(committer);
2593 82f6abb8 2019-08-14 stsp if (len >= 9)
2594 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2596 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2598 28315671 2019-08-14 stsp *nl = '\0';
2599 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2600 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2602 28315671 2019-08-14 stsp a->lineno_cur++;
2603 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2606 82f6abb8 2019-08-14 stsp if (commit)
2607 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2608 28315671 2019-08-14 stsp free(line);
2609 28315671 2019-08-14 stsp return err;
2612 28315671 2019-08-14 stsp static const struct got_error *
2613 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2615 404c43c4 2018-06-21 stsp const struct got_error *error;
2616 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2617 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2618 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2619 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2620 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2621 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2622 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2623 28315671 2019-08-14 stsp struct blame_cb_args bca;
2624 28315671 2019-08-14 stsp int ch, obj_type, i;
2625 b02560ec 2019-08-19 stsp size_t filesize;
2627 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2629 404c43c4 2018-06-21 stsp #ifndef PROFILE
2630 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2631 36e2fb66 2019-01-04 stsp NULL) == -1)
2632 404c43c4 2018-06-21 stsp err(1, "pledge");
2635 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2636 404c43c4 2018-06-21 stsp switch (ch) {
2638 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2641 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2642 66bea077 2018-08-02 stsp if (repo_path == NULL)
2643 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2645 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2648 2deda0b9 2019-03-07 stsp usage_blame();
2649 404c43c4 2018-06-21 stsp /* NOTREACHED */
2653 404c43c4 2018-06-21 stsp argc -= optind;
2654 404c43c4 2018-06-21 stsp argv += optind;
2656 a39318fd 2018-08-02 stsp if (argc == 1)
2657 404c43c4 2018-06-21 stsp path = argv[0];
2659 404c43c4 2018-06-21 stsp usage_blame();
2661 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2662 66bea077 2018-08-02 stsp if (cwd == NULL) {
2663 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2664 66bea077 2018-08-02 stsp goto done;
2666 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2667 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2668 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2669 66bea077 2018-08-02 stsp goto done;
2671 0c06baac 2019-02-05 stsp error = NULL;
2672 0c06baac 2019-02-05 stsp if (worktree) {
2673 0c06baac 2019-02-05 stsp repo_path =
2674 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2675 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2676 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2677 0c06baac 2019-02-05 stsp if (error)
2678 0c06baac 2019-02-05 stsp goto done;
2680 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2681 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2682 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2683 0c06baac 2019-02-05 stsp goto done;
2688 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2689 c02c541e 2019-03-29 stsp if (error != NULL)
2690 36e2fb66 2019-01-04 stsp goto done;
2692 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2693 c02c541e 2019-03-29 stsp if (error)
2694 404c43c4 2018-06-21 stsp goto done;
2696 0c06baac 2019-02-05 stsp if (worktree) {
2697 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2698 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2699 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2700 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2701 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2702 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2703 6efaaa2d 2019-02-05 stsp path) == -1) {
2704 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2705 0c06baac 2019-02-05 stsp goto done;
2707 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2710 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2712 0c06baac 2019-02-05 stsp if (error)
2713 66bea077 2018-08-02 stsp goto done;
2715 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2716 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2717 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2718 404c43c4 2018-06-21 stsp if (error != NULL)
2719 66bea077 2018-08-02 stsp goto done;
2720 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2721 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2722 404c43c4 2018-06-21 stsp if (error != NULL)
2723 66bea077 2018-08-02 stsp goto done;
2725 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2726 30837e32 2019-07-25 stsp if (error)
2727 66bea077 2018-08-02 stsp goto done;
2730 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2731 28315671 2019-08-14 stsp if (error)
2732 28315671 2019-08-14 stsp goto done;
2733 28315671 2019-08-14 stsp if (obj_id == NULL) {
2734 28315671 2019-08-14 stsp error = got_error(GOT_ERR_NO_OBJ);
2735 28315671 2019-08-14 stsp goto done;
2738 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2739 28315671 2019-08-14 stsp if (error)
2740 28315671 2019-08-14 stsp goto done;
2742 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2743 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2744 28315671 2019-08-14 stsp goto done;
2747 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2748 28315671 2019-08-14 stsp if (error)
2749 28315671 2019-08-14 stsp goto done;
2750 28315671 2019-08-14 stsp bca.f = got_opentemp();
2751 28315671 2019-08-14 stsp if (bca.f == NULL) {
2752 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2753 28315671 2019-08-14 stsp goto done;
2755 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2756 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2757 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2758 28315671 2019-08-14 stsp goto done;
2760 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2761 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2762 b02560ec 2019-08-19 stsp bca.nlines--;
2764 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2765 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2766 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2767 28315671 2019-08-14 stsp goto done;
2769 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2770 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2771 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2772 7ef28ff8 2019-08-14 stsp while (i > 0) {
2774 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2776 82f6abb8 2019-08-14 stsp bca.repo = repo;
2778 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2779 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2780 28315671 2019-08-14 stsp if (error)
2781 28315671 2019-08-14 stsp goto done;
2783 66bea077 2018-08-02 stsp free(in_repo_path);
2784 66bea077 2018-08-02 stsp free(repo_path);
2785 66bea077 2018-08-02 stsp free(cwd);
2786 404c43c4 2018-06-21 stsp free(commit_id);
2787 28315671 2019-08-14 stsp free(obj_id);
2789 28315671 2019-08-14 stsp got_object_blob_close(blob);
2790 0c06baac 2019-02-05 stsp if (worktree)
2791 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2792 ad242220 2018-09-08 stsp if (repo) {
2793 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2794 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2795 ad242220 2018-09-08 stsp if (error == NULL)
2796 ad242220 2018-09-08 stsp error = repo_error;
2798 3affba96 2019-09-22 stsp if (bca.lines) {
2799 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2800 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2801 3affba96 2019-09-22 stsp free(bline->id_str);
2802 3affba96 2019-09-22 stsp free(bline->committer);
2804 3affba96 2019-09-22 stsp free(bca.lines);
2806 28315671 2019-08-14 stsp free(bca.line_offsets);
2807 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2808 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2809 404c43c4 2018-06-21 stsp return error;
2812 5de5890b 2018-10-18 stsp __dead static void
2813 5de5890b 2018-10-18 stsp usage_tree(void)
2815 c1669e2e 2019-01-09 stsp fprintf(stderr,
2816 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2817 5de5890b 2018-10-18 stsp getprogname());
2821 c1669e2e 2019-01-09 stsp static void
2822 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2823 c1669e2e 2019-01-09 stsp const char *root_path)
2825 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2826 848d6979 2019-08-12 stsp const char *modestr = "";
2827 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2829 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2830 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2833 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2834 63c5ca5d 2019-08-24 stsp modestr = "$";
2835 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2836 848d6979 2019-08-12 stsp modestr = "@";
2837 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2838 848d6979 2019-08-12 stsp modestr = "/";
2839 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2840 848d6979 2019-08-12 stsp modestr = "*";
2842 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2843 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2846 5de5890b 2018-10-18 stsp static const struct got_error *
2847 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2848 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2849 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2851 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2852 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2853 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2854 56e0773d 2019-11-28 stsp int nentries, i;
2856 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2858 5de5890b 2018-10-18 stsp goto done;
2860 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2862 5de5890b 2018-10-18 stsp goto done;
2863 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
2864 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
2865 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2866 5de5890b 2018-10-18 stsp char *id = NULL;
2868 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2871 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
2872 5de5890b 2018-10-18 stsp if (show_ids) {
2873 5de5890b 2018-10-18 stsp char *id_str;
2874 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
2875 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
2877 5de5890b 2018-10-18 stsp goto done;
2878 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
2879 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2880 5de5890b 2018-10-18 stsp free(id_str);
2881 5de5890b 2018-10-18 stsp goto done;
2883 5de5890b 2018-10-18 stsp free(id_str);
2885 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
2888 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2889 c1669e2e 2019-01-09 stsp char *child_path;
2890 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
2891 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
2892 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
2893 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2894 c1669e2e 2019-01-09 stsp goto done;
2896 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
2897 c1669e2e 2019-01-09 stsp root_path, repo);
2898 c1669e2e 2019-01-09 stsp free(child_path);
2900 c1669e2e 2019-01-09 stsp goto done;
2905 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
2906 5de5890b 2018-10-18 stsp free(tree_id);
2907 5de5890b 2018-10-18 stsp return err;
2910 5de5890b 2018-10-18 stsp static const struct got_error *
2911 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
2913 5de5890b 2018-10-18 stsp const struct got_error *error;
2914 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
2915 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
2916 7a2c19d6 2019-02-05 stsp const char *path;
2917 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2918 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
2919 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
2920 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
2923 5de5890b 2018-10-18 stsp #ifndef PROFILE
2924 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2925 0f8d269b 2019-01-04 stsp NULL) == -1)
2926 5de5890b 2018-10-18 stsp err(1, "pledge");
2929 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2930 5de5890b 2018-10-18 stsp switch (ch) {
2932 5de5890b 2018-10-18 stsp commit_id_str = optarg;
2935 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
2936 5de5890b 2018-10-18 stsp if (repo_path == NULL)
2937 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2939 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2942 5de5890b 2018-10-18 stsp show_ids = 1;
2945 c1669e2e 2019-01-09 stsp recurse = 1;
2948 2deda0b9 2019-03-07 stsp usage_tree();
2949 5de5890b 2018-10-18 stsp /* NOTREACHED */
2953 5de5890b 2018-10-18 stsp argc -= optind;
2954 5de5890b 2018-10-18 stsp argv += optind;
2956 5de5890b 2018-10-18 stsp if (argc == 1)
2957 5de5890b 2018-10-18 stsp path = argv[0];
2958 5de5890b 2018-10-18 stsp else if (argc > 1)
2959 5de5890b 2018-10-18 stsp usage_tree();
2961 7a2c19d6 2019-02-05 stsp path = NULL;
2963 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
2964 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
2965 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2966 9bf7a39b 2019-02-05 stsp goto done;
2968 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
2969 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2970 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2971 7a2c19d6 2019-02-05 stsp goto done;
2973 7a2c19d6 2019-02-05 stsp error = NULL;
2974 7a2c19d6 2019-02-05 stsp if (worktree) {
2975 7a2c19d6 2019-02-05 stsp repo_path =
2976 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2977 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
2978 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2979 7a2c19d6 2019-02-05 stsp if (error)
2980 7a2c19d6 2019-02-05 stsp goto done;
2982 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
2983 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
2984 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2985 7a2c19d6 2019-02-05 stsp goto done;
2990 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2991 5de5890b 2018-10-18 stsp if (error != NULL)
2992 c02c541e 2019-03-29 stsp goto done;
2994 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2995 c02c541e 2019-03-29 stsp if (error)
2996 5de5890b 2018-10-18 stsp goto done;
2998 9bf7a39b 2019-02-05 stsp if (path == NULL) {
2999 9bf7a39b 2019-02-05 stsp if (worktree) {
3000 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3001 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3002 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
3003 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
3004 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
3005 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3006 9bf7a39b 2019-02-05 stsp goto done;
3008 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 1);
3010 9bf7a39b 2019-02-05 stsp if (error)
3011 9bf7a39b 2019-02-05 stsp goto done;
3013 9bf7a39b 2019-02-05 stsp path = "/";
3015 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3016 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3017 9bf7a39b 2019-02-05 stsp if (error != NULL)
3018 9bf7a39b 2019-02-05 stsp goto done;
3021 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3022 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3023 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3024 5de5890b 2018-10-18 stsp if (error != NULL)
3025 5de5890b 2018-10-18 stsp goto done;
3026 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3027 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3028 5de5890b 2018-10-18 stsp if (error != NULL)
3029 5de5890b 2018-10-18 stsp goto done;
3031 04f57cb3 2019-07-25 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
3032 30837e32 2019-07-25 stsp if (error)
3033 5de5890b 2018-10-18 stsp goto done;
3036 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3037 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3039 5de5890b 2018-10-18 stsp free(in_repo_path);
3040 5de5890b 2018-10-18 stsp free(repo_path);
3041 5de5890b 2018-10-18 stsp free(cwd);
3042 5de5890b 2018-10-18 stsp free(commit_id);
3043 7a2c19d6 2019-02-05 stsp if (worktree)
3044 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3045 5de5890b 2018-10-18 stsp if (repo) {
3046 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3047 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3048 5de5890b 2018-10-18 stsp if (error == NULL)
3049 5de5890b 2018-10-18 stsp error = repo_error;
3051 5de5890b 2018-10-18 stsp return error;
3054 6bad629b 2019-02-04 stsp __dead static void
3055 6bad629b 2019-02-04 stsp usage_status(void)
3057 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3061 b72f483a 2019-02-05 stsp static const struct got_error *
3062 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3063 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3064 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3065 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3067 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3068 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3069 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3070 b72f483a 2019-02-05 stsp return NULL;
3073 6bad629b 2019-02-04 stsp static const struct got_error *
3074 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3076 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3077 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3078 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3079 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3080 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3081 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3084 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3086 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3087 6bad629b 2019-02-04 stsp switch (ch) {
3089 2deda0b9 2019-03-07 stsp usage_status();
3090 6bad629b 2019-02-04 stsp /* NOTREACHED */
3094 6bad629b 2019-02-04 stsp argc -= optind;
3095 6bad629b 2019-02-04 stsp argv += optind;
3097 6bad629b 2019-02-04 stsp #ifndef PROFILE
3098 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3099 6bad629b 2019-02-04 stsp NULL) == -1)
3100 6bad629b 2019-02-04 stsp err(1, "pledge");
3102 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3103 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3104 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3105 927df6b7 2019-02-10 stsp goto done;
3108 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3109 927df6b7 2019-02-10 stsp if (error != NULL)
3110 a5edda0a 2019-07-27 stsp goto done;
3112 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3114 6bad629b 2019-02-04 stsp if (error != NULL)
3115 6bad629b 2019-02-04 stsp goto done;
3117 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3118 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3119 087fb88c 2019-08-04 stsp if (error)
3120 087fb88c 2019-08-04 stsp goto done;
3122 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3123 6bad629b 2019-02-04 stsp if (error)
3124 6bad629b 2019-02-04 stsp goto done;
3126 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3127 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3129 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3130 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3131 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3132 927df6b7 2019-02-10 stsp free(cwd);
3133 d0eebce4 2019-03-11 stsp return error;
3136 d0eebce4 2019-03-11 stsp __dead static void
3137 d0eebce4 2019-03-11 stsp usage_ref(void)
3139 d0eebce4 2019-03-11 stsp fprintf(stderr,
3140 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3141 d0eebce4 2019-03-11 stsp getprogname());
3145 d0eebce4 2019-03-11 stsp static const struct got_error *
3146 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3148 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3149 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3150 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3152 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3153 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3155 d0eebce4 2019-03-11 stsp return err;
3157 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3158 d0eebce4 2019-03-11 stsp char *refstr;
3159 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3160 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3161 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3162 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3163 d0eebce4 2019-03-11 stsp free(refstr);
3166 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3167 d0eebce4 2019-03-11 stsp return NULL;
3170 d0eebce4 2019-03-11 stsp static const struct got_error *
3171 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3173 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3174 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3176 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3178 d0eebce4 2019-03-11 stsp return err;
3180 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3181 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3182 d0eebce4 2019-03-11 stsp return err;
3185 d0eebce4 2019-03-11 stsp static const struct got_error *
3186 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3188 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3189 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3190 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3193 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3194 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3195 d1644381 2019-07-14 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 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3202 d83d9d5c 2019-05-13 stsp if (err) {
3203 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3205 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3206 d83d9d5c 2019-05-13 stsp return err;
3207 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3209 d83d9d5c 2019-05-13 stsp return err;
3210 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3211 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3213 d83d9d5c 2019-05-13 stsp return err;
3216 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3218 d0eebce4 2019-03-11 stsp goto done;
3220 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3223 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3225 d1c1ae5f 2019-08-12 stsp return err;
3228 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3229 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3231 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3232 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3233 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3236 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3237 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3238 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3240 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3241 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3243 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3245 d1c1ae5f 2019-08-12 stsp return err;
3247 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3249 d1c1ae5f 2019-08-12 stsp goto done;
3251 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3253 d1c1ae5f 2019-08-12 stsp if (target_ref)
3254 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3256 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3257 d0eebce4 2019-03-11 stsp return err;
3260 d0eebce4 2019-03-11 stsp static const struct got_error *
3261 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3263 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3264 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3265 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3266 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3267 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3268 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3270 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3271 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3272 d0eebce4 2019-03-11 stsp switch (ch) {
3274 d0eebce4 2019-03-11 stsp delref = optarg;
3277 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3278 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3279 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3281 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3284 d0eebce4 2019-03-11 stsp do_list = 1;
3287 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3290 d0eebce4 2019-03-11 stsp usage_ref();
3291 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3295 d0eebce4 2019-03-11 stsp if (do_list && delref)
3296 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3298 d0eebce4 2019-03-11 stsp argc -= optind;
3299 d0eebce4 2019-03-11 stsp argv += optind;
3301 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3302 d1c1ae5f 2019-08-12 stsp if (create_symref)
3303 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3304 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3305 d0eebce4 2019-03-11 stsp if (argc > 0)
3306 d0eebce4 2019-03-11 stsp usage_ref();
3307 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3308 d0eebce4 2019-03-11 stsp usage_ref();
3310 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3311 e0b57350 2019-03-12 stsp if (do_list) {
3312 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3313 e0b57350 2019-03-12 stsp NULL) == -1)
3314 e0b57350 2019-03-12 stsp err(1, "pledge");
3316 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3317 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3318 e0b57350 2019-03-12 stsp err(1, "pledge");
3321 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3322 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3323 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3324 d0eebce4 2019-03-11 stsp goto done;
3327 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3328 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3329 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3330 d0eebce4 2019-03-11 stsp goto done;
3332 d0eebce4 2019-03-11 stsp error = NULL;
3333 d0eebce4 2019-03-11 stsp if (worktree) {
3334 d0eebce4 2019-03-11 stsp repo_path =
3335 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3336 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3337 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3338 d0eebce4 2019-03-11 stsp if (error)
3339 d0eebce4 2019-03-11 stsp goto done;
3341 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3342 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3343 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3344 d0eebce4 2019-03-11 stsp goto done;
3349 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3350 d0eebce4 2019-03-11 stsp if (error != NULL)
3351 d0eebce4 2019-03-11 stsp goto done;
3353 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3354 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3355 c02c541e 2019-03-29 stsp if (error)
3356 c02c541e 2019-03-29 stsp goto done;
3358 d0eebce4 2019-03-11 stsp if (do_list)
3359 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3360 d0eebce4 2019-03-11 stsp else if (delref)
3361 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3362 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3363 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3365 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3368 4e759de4 2019-06-26 stsp got_repo_close(repo);
3369 4e759de4 2019-06-26 stsp if (worktree)
3370 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3371 4e759de4 2019-06-26 stsp free(cwd);
3372 4e759de4 2019-06-26 stsp free(repo_path);
3373 4e759de4 2019-06-26 stsp return error;
3376 4e759de4 2019-06-26 stsp __dead static void
3377 4e759de4 2019-06-26 stsp usage_branch(void)
3379 4e759de4 2019-06-26 stsp fprintf(stderr,
3380 a74f7e83 2019-11-10 stsp "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3381 a74f7e83 2019-11-10 stsp "[name]\n", getprogname());
3385 4e759de4 2019-06-26 stsp static const struct got_error *
3386 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3387 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3389 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3390 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3391 4e99b47e 2019-10-04 stsp char *refstr;
3393 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3394 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3395 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3396 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3398 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3400 4e99b47e 2019-10-04 stsp return err;
3401 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3402 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3403 4e99b47e 2019-10-04 stsp marker = "* ";
3405 4e99b47e 2019-10-04 stsp marker = "~ ";
3409 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3410 4e99b47e 2019-10-04 stsp refname += 11;
3411 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3412 4e99b47e 2019-10-04 stsp refname += 18;
3414 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3415 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3416 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3418 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3419 4e99b47e 2019-10-04 stsp free(refstr);
3420 4e99b47e 2019-10-04 stsp return NULL;
3423 4e99b47e 2019-10-04 stsp static const struct got_error *
3424 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3426 ad89fa31 2019-10-04 stsp const char *refname;
3428 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3429 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3431 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3433 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3434 ad89fa31 2019-10-04 stsp refname += 11;
3435 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3436 ad89fa31 2019-10-04 stsp refname += 18;
3438 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3440 ad89fa31 2019-10-04 stsp return NULL;
3443 ad89fa31 2019-10-04 stsp static const struct got_error *
3444 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3446 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3447 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3448 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3449 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3450 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3452 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3454 4e99b47e 2019-10-04 stsp if (worktree) {
3455 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3456 4e99b47e 2019-10-04 stsp worktree);
3458 4e99b47e 2019-10-04 stsp return err;
3460 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3461 4e99b47e 2019-10-04 stsp worktree);
3463 4e99b47e 2019-10-04 stsp return err;
3465 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3466 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3467 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3469 4e99b47e 2019-10-04 stsp return err;
3470 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3471 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3475 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3476 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3478 4e759de4 2019-06-26 stsp return err;
3480 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3481 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3483 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3484 4e759de4 2019-06-26 stsp return NULL;
3487 4e759de4 2019-06-26 stsp static const struct got_error *
3488 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3489 45cd4e47 2019-08-25 stsp const char *branch_name)
3491 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3492 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3493 4e759de4 2019-06-26 stsp char *refname;
3495 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3496 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3498 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3500 4e759de4 2019-06-26 stsp goto done;
3502 45cd4e47 2019-08-25 stsp if (worktree &&
3503 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3504 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3505 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3506 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3507 45cd4e47 2019-08-25 stsp goto done;
3510 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3513 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3514 4e759de4 2019-06-26 stsp free(refname);
3515 4e759de4 2019-06-26 stsp return err;
3518 4e759de4 2019-06-26 stsp static const struct got_error *
3519 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3520 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3522 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3523 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3524 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3527 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3528 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3529 d3f84d51 2019-07-11 stsp * an unintended typo.
3531 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3532 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3534 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3535 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3536 4e759de4 2019-06-26 stsp goto done;
3539 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3540 4e759de4 2019-06-26 stsp if (err == NULL) {
3541 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3542 4e759de4 2019-06-26 stsp goto done;
3543 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3544 4e759de4 2019-06-26 stsp goto done;
3546 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3548 4e759de4 2019-06-26 stsp goto done;
3550 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3553 4e759de4 2019-06-26 stsp got_ref_close(ref);
3554 4e759de4 2019-06-26 stsp free(base_refname);
3555 4e759de4 2019-06-26 stsp free(refname);
3556 4e759de4 2019-06-26 stsp return err;
3559 4e759de4 2019-06-26 stsp static const struct got_error *
3560 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3562 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3563 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3564 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3565 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3566 ad89fa31 2019-10-04 stsp int ch, do_list = 0, do_show = 0;
3567 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3569 a74f7e83 2019-11-10 stsp while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3570 4e759de4 2019-06-26 stsp switch (ch) {
3572 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3575 4e759de4 2019-06-26 stsp delref = optarg;
3578 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3579 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3580 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3582 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3585 4e759de4 2019-06-26 stsp do_list = 1;
3588 4e759de4 2019-06-26 stsp usage_branch();
3589 4e759de4 2019-06-26 stsp /* NOTREACHED */
3593 4e759de4 2019-06-26 stsp if (do_list && delref)
3594 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3596 4e759de4 2019-06-26 stsp argc -= optind;
3597 4e759de4 2019-06-26 stsp argv += optind;
3599 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3600 ad89fa31 2019-10-04 stsp do_show = 1;
3602 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3603 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3605 4e759de4 2019-06-26 stsp if (do_list || delref) {
3606 4e759de4 2019-06-26 stsp if (argc > 0)
3607 4e759de4 2019-06-26 stsp usage_branch();
3608 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3609 4e759de4 2019-06-26 stsp usage_branch();
3611 4e759de4 2019-06-26 stsp #ifndef PROFILE
3612 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3613 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3614 4e759de4 2019-06-26 stsp NULL) == -1)
3615 4e759de4 2019-06-26 stsp err(1, "pledge");
3617 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3618 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3619 4e759de4 2019-06-26 stsp err(1, "pledge");
3622 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3623 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3624 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3625 4e759de4 2019-06-26 stsp goto done;
3628 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3629 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3630 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3631 4e759de4 2019-06-26 stsp goto done;
3633 4e759de4 2019-06-26 stsp error = NULL;
3634 4e759de4 2019-06-26 stsp if (worktree) {
3635 4e759de4 2019-06-26 stsp repo_path =
3636 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3637 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3638 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3639 4e759de4 2019-06-26 stsp if (error)
3640 4e759de4 2019-06-26 stsp goto done;
3642 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3643 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3644 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3645 4e759de4 2019-06-26 stsp goto done;
3650 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3651 4e759de4 2019-06-26 stsp if (error != NULL)
3652 4e759de4 2019-06-26 stsp goto done;
3654 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3655 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3656 4e759de4 2019-06-26 stsp if (error)
3657 4e759de4 2019-06-26 stsp goto done;
3659 ad89fa31 2019-10-04 stsp if (do_show)
3660 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3661 ad89fa31 2019-10-04 stsp else if (do_list)
3662 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3663 4e759de4 2019-06-26 stsp else if (delref)
3664 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3666 a74f7e83 2019-11-10 stsp struct got_object_id *commit_id;
3667 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3668 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3669 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3670 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3671 a74f7e83 2019-11-10 stsp error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3672 a74f7e83 2019-11-10 stsp if (error)
3673 a74f7e83 2019-11-10 stsp goto done;
3674 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3675 a74f7e83 2019-11-10 stsp free(commit_id);
3679 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3680 d0eebce4 2019-03-11 stsp if (worktree)
3681 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3682 d0eebce4 2019-03-11 stsp free(cwd);
3683 d0eebce4 2019-03-11 stsp free(repo_path);
3684 d00136be 2019-03-26 stsp return error;
3688 d00136be 2019-03-26 stsp __dead static void
3689 8e7bd50a 2019-08-22 stsp usage_tag(void)
3691 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3692 c904c63e 2019-08-22 stsp "usage: %s tag [-r repository] | -l | "
3693 8e7bd50a 2019-08-22 stsp "[-m message] name [commit]\n", getprogname());
3698 b8bad2ba 2019-08-23 stsp static const struct got_error *
3699 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3701 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3702 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3703 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3704 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3705 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3707 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3708 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3709 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3710 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3712 b8bad2ba 2019-08-23 stsp return err;
3713 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3716 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3719 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3720 b8bad2ba 2019-08-23 stsp free(re_id);
3723 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3724 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3727 b8bad2ba 2019-08-23 stsp while (se) {
3728 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3731 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3732 b8bad2ba 2019-08-23 stsp free(se_id);
3735 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3736 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3738 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3739 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3741 b8bad2ba 2019-08-23 stsp return err;
3742 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3745 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3750 b8bad2ba 2019-08-23 stsp return err;
3754 8e7bd50a 2019-08-22 stsp static const struct got_error *
3755 b8bad2ba 2019-08-23 stsp cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3756 b8bad2ba 2019-08-23 stsp struct got_reference *ref2)
3758 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3759 b8bad2ba 2019-08-23 stsp struct got_repository *repo = arg;
3760 b8bad2ba 2019-08-23 stsp struct got_object_id *id1, *id2 = NULL;
3761 b8bad2ba 2019-08-23 stsp struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3762 b8bad2ba 2019-08-23 stsp time_t time1, time2;
3766 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id1, repo, ref1);
3768 b8bad2ba 2019-08-23 stsp return err;
3769 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag1, repo, id1);
3771 b8bad2ba 2019-08-23 stsp goto done;
3773 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&id2, repo, ref2);
3775 b8bad2ba 2019-08-23 stsp goto done;
3776 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&tag2, repo, id2);
3778 b8bad2ba 2019-08-23 stsp goto done;
3780 b8bad2ba 2019-08-23 stsp time1 = got_object_tag_get_tagger_time(tag1);
3781 b8bad2ba 2019-08-23 stsp time2 = got_object_tag_get_tagger_time(tag2);
3783 b8bad2ba 2019-08-23 stsp /* Put latest tags first. */
3784 b8bad2ba 2019-08-23 stsp if (time1 < time2)
3786 b8bad2ba 2019-08-23 stsp else if (time1 > time2)
3787 b8bad2ba 2019-08-23 stsp *cmp = -1;
3789 b8bad2ba 2019-08-23 stsp err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3791 b8bad2ba 2019-08-23 stsp free(id1);
3792 b8bad2ba 2019-08-23 stsp free(id2);
3794 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag1);
3796 b8bad2ba 2019-08-23 stsp got_object_tag_close(tag2);
3797 b8bad2ba 2019-08-23 stsp return err;
3800 b8bad2ba 2019-08-23 stsp static const struct got_error *
3801 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3803 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3804 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3805 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3807 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3809 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3811 8e7bd50a 2019-08-22 stsp return err;
3813 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3814 8e7bd50a 2019-08-22 stsp const char *refname;
3815 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3816 8e7bd50a 2019-08-22 stsp char datebuf[26];
3817 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3818 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3819 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3821 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3822 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3824 8e7bd50a 2019-08-22 stsp refname += 10;
3825 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3826 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3827 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3830 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3831 8e7bd50a 2019-08-22 stsp free(refstr);
3833 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3836 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3840 2417344c 2019-08-23 stsp printf("from: %s\n", got_object_tag_get_tagger(tag));
3841 2417344c 2019-08-23 stsp tagger_time = got_object_tag_get_tagger_time(tag);
3842 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
3843 2417344c 2019-08-23 stsp if (datestr)
3844 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
3845 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&id_str,
3846 8e7bd50a 2019-08-22 stsp got_object_tag_get_object_id(tag));
3849 8e7bd50a 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
3850 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
3851 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3853 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
3854 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3856 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
3857 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3859 8e7bd50a 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
3860 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3865 8e7bd50a 2019-08-22 stsp free(id_str);
3866 8e7bd50a 2019-08-22 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
3867 8e7bd50a 2019-08-22 stsp got_object_tag_close(tag);
3868 8e7bd50a 2019-08-22 stsp if (tagmsg0 == NULL) {
3869 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3873 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
3875 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
3877 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
3878 8e7bd50a 2019-08-22 stsp } while (line);
3879 8e7bd50a 2019-08-22 stsp free(tagmsg0);
3882 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
3883 8e7bd50a 2019-08-22 stsp return NULL;
3886 8e7bd50a 2019-08-22 stsp static const struct got_error *
3887 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3888 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
3890 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3891 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
3892 f372d5cd 2019-10-21 stsp char *editor = NULL;
3893 8e7bd50a 2019-08-22 stsp int fd = -1;
3895 8e7bd50a 2019-08-22 stsp if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3896 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3897 8e7bd50a 2019-08-22 stsp goto done;
3900 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3901 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
3902 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3903 8e7bd50a 2019-08-22 stsp goto done;
3906 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3908 8e7bd50a 2019-08-22 stsp goto done;
3910 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
3911 8e7bd50a 2019-08-22 stsp close(fd);
3913 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
3915 8e7bd50a 2019-08-22 stsp goto done;
3916 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3918 8e7bd50a 2019-08-22 stsp free(initial_content);
3919 8e7bd50a 2019-08-22 stsp free(template);
3920 8e7bd50a 2019-08-22 stsp free(editor);
3922 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
3923 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3924 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
3925 8e7bd50a 2019-08-22 stsp if (err) {
3926 8e7bd50a 2019-08-22 stsp free(*tagmsg);
3927 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
3930 8e7bd50a 2019-08-22 stsp return err;
3933 8e7bd50a 2019-08-22 stsp static const struct got_error *
3934 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
3935 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
3937 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
3938 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
3939 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
3940 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
3941 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3942 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
3943 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
3946 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
3947 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
3948 8e7bd50a 2019-08-22 stsp * an unintended typo.
3950 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
3951 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3953 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
3955 8e7bd50a 2019-08-22 stsp return err;
3957 8e7bd50a 2019-08-22 stsp err = match_object_id(&commit_id, &label, commit_arg,
3958 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
3960 8e7bd50a 2019-08-22 stsp goto done;
3962 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
3964 8e7bd50a 2019-08-22 stsp goto done;
3966 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
3967 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
3968 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
3969 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
3970 8e7bd50a 2019-08-22 stsp goto done;
3972 8e7bd50a 2019-08-22 stsp tag_name += 10;
3973 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3974 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
3975 8e7bd50a 2019-08-22 stsp goto done;
3978 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
3979 8e7bd50a 2019-08-22 stsp if (err == NULL) {
3980 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
3981 8e7bd50a 2019-08-22 stsp goto done;
3982 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
3983 8e7bd50a 2019-08-22 stsp goto done;
3985 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
3986 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3987 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
3988 f372d5cd 2019-10-21 stsp if (err) {
3989 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3990 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
3991 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
3992 8e7bd50a 2019-08-22 stsp goto done;
3996 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
3997 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3998 f372d5cd 2019-10-21 stsp if (err) {
3999 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4000 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4001 8e7bd50a 2019-08-22 stsp goto done;
4004 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
4005 f372d5cd 2019-10-21 stsp if (err) {
4006 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4007 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4008 8e7bd50a 2019-08-22 stsp goto done;
4011 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
4012 f372d5cd 2019-10-21 stsp if (err) {
4013 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4014 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4015 f372d5cd 2019-10-21 stsp goto done;
4018 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
4019 f372d5cd 2019-10-21 stsp if (err) {
4020 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4021 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4022 f372d5cd 2019-10-21 stsp goto done;
4024 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4026 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4027 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4028 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4029 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4030 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4031 f372d5cd 2019-10-21 stsp free(tag_id_str);
4033 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4034 8e7bd50a 2019-08-22 stsp free(commit_id);
4035 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4036 8e7bd50a 2019-08-22 stsp free(refname);
4037 8e7bd50a 2019-08-22 stsp free(tagmsg);
4038 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4039 aba9c984 2019-09-08 stsp free(tagger);
4040 8e7bd50a 2019-08-22 stsp return err;
4043 8e7bd50a 2019-08-22 stsp static const struct got_error *
4044 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4046 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4047 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4048 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4049 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4050 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4051 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4052 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4054 8e7bd50a 2019-08-22 stsp while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4055 8e7bd50a 2019-08-22 stsp switch (ch) {
4057 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4060 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4061 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4062 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4064 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4067 8e7bd50a 2019-08-22 stsp do_list = 1;
4070 8e7bd50a 2019-08-22 stsp usage_tag();
4071 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4075 8e7bd50a 2019-08-22 stsp argc -= optind;
4076 8e7bd50a 2019-08-22 stsp argv += optind;
4078 8e7bd50a 2019-08-22 stsp if (do_list) {
4079 8e7bd50a 2019-08-22 stsp if (tagmsg)
4080 8e7bd50a 2019-08-22 stsp errx(1, "-l and -m options are mutually exclusive\n");
4081 8e7bd50a 2019-08-22 stsp if (argc > 0)
4082 8e7bd50a 2019-08-22 stsp usage_tag();
4083 8e7bd50a 2019-08-22 stsp } else if (argc < 1 || argc > 2)
4084 8e7bd50a 2019-08-22 stsp usage_tag();
4085 a2887370 2019-08-23 stsp else if (argc > 1)
4086 a2887370 2019-08-23 stsp commit_id_arg = argv[1];
4087 a2887370 2019-08-23 stsp tag_name = argv[0];
4089 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4090 8e7bd50a 2019-08-22 stsp if (do_list) {
4091 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4092 8e7bd50a 2019-08-22 stsp NULL) == -1)
4093 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4095 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4096 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4097 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4100 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4101 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4102 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4103 8e7bd50a 2019-08-22 stsp goto done;
4106 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4107 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4108 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4109 8e7bd50a 2019-08-22 stsp goto done;
4111 8e7bd50a 2019-08-22 stsp error = NULL;
4112 8e7bd50a 2019-08-22 stsp if (worktree) {
4113 8e7bd50a 2019-08-22 stsp repo_path =
4114 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4115 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4116 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4117 8e7bd50a 2019-08-22 stsp if (error)
4118 8e7bd50a 2019-08-22 stsp goto done;
4120 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4121 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4122 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4123 8e7bd50a 2019-08-22 stsp goto done;
4128 8e7bd50a 2019-08-22 stsp if (do_list) {
4129 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4130 c9956ddf 2019-09-08 stsp if (error != NULL)
4131 c9956ddf 2019-09-08 stsp goto done;
4132 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4133 8e7bd50a 2019-08-22 stsp if (error)
4134 8e7bd50a 2019-08-22 stsp goto done;
4135 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4137 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4138 c9956ddf 2019-09-08 stsp if (error)
4139 c9956ddf 2019-09-08 stsp goto done;
4140 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4141 c9956ddf 2019-09-08 stsp if (error != NULL)
4142 c9956ddf 2019-09-08 stsp goto done;
4144 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4145 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4146 8e7bd50a 2019-08-22 stsp if (error)
4147 8e7bd50a 2019-08-22 stsp goto done;
4150 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4151 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4152 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4153 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4154 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4155 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4156 8e7bd50a 2019-08-22 stsp if (error)
4157 8e7bd50a 2019-08-22 stsp goto done;
4158 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4159 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4160 8e7bd50a 2019-08-22 stsp if (error)
4161 8e7bd50a 2019-08-22 stsp goto done;
4162 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4163 8e7bd50a 2019-08-22 stsp free(commit_id);
4164 8e7bd50a 2019-08-22 stsp if (error)
4165 8e7bd50a 2019-08-22 stsp goto done;
4168 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4169 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4173 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4174 8e7bd50a 2019-08-22 stsp if (worktree)
4175 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4176 8e7bd50a 2019-08-22 stsp free(cwd);
4177 8e7bd50a 2019-08-22 stsp free(repo_path);
4178 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4179 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4180 8e7bd50a 2019-08-22 stsp return error;
4183 8e7bd50a 2019-08-22 stsp __dead static void
4184 d00136be 2019-03-26 stsp usage_add(void)
4186 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4187 022fae89 2019-12-06 tracey getprogname());
4191 d00136be 2019-03-26 stsp static const struct got_error *
4192 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4194 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4196 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4197 4e68cba3 2019-11-23 stsp return NULL;
4200 4e68cba3 2019-11-23 stsp static const struct got_error *
4201 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4203 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4204 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4205 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4206 1dd54920 2019-05-11 stsp char *cwd = NULL;
4207 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4208 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4209 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4211 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4213 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4214 d00136be 2019-03-26 stsp switch (ch) {
4215 022fae89 2019-12-06 tracey case 'I':
4216 022fae89 2019-12-06 tracey no_ignores = 1;
4219 4e68cba3 2019-11-23 stsp can_recurse = 1;
4222 d00136be 2019-03-26 stsp usage_add();
4223 d00136be 2019-03-26 stsp /* NOTREACHED */
4227 d00136be 2019-03-26 stsp argc -= optind;
4228 d00136be 2019-03-26 stsp argv += optind;
4230 43012d58 2019-07-14 stsp #ifndef PROFILE
4231 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4232 43012d58 2019-07-14 stsp NULL) == -1)
4233 43012d58 2019-07-14 stsp err(1, "pledge");
4235 723c305c 2019-05-11 jcs if (argc < 1)
4236 d00136be 2019-03-26 stsp usage_add();
4238 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4239 d00136be 2019-03-26 stsp if (cwd == NULL) {
4240 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4241 d00136be 2019-03-26 stsp goto done;
4244 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4245 d00136be 2019-03-26 stsp if (error)
4246 d00136be 2019-03-26 stsp goto done;
4248 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4250 031a5338 2019-03-26 stsp if (error != NULL)
4251 031a5338 2019-03-26 stsp goto done;
4253 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4254 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4255 d00136be 2019-03-26 stsp if (error)
4256 d00136be 2019-03-26 stsp goto done;
4258 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4259 6d022e97 2019-08-04 stsp if (error)
4260 022fae89 2019-12-06 tracey goto done;
4262 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4263 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4264 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4265 6d022e97 2019-08-04 stsp goto done;
4269 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4270 4e68cba3 2019-11-23 stsp char *ondisk_path;
4271 4e68cba3 2019-11-23 stsp struct stat sb;
4272 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4273 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4274 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4275 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4276 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4277 4e68cba3 2019-11-23 stsp goto done;
4279 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4280 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4281 4e68cba3 2019-11-23 stsp free(ondisk_path);
4284 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4285 4e68cba3 2019-11-23 stsp ondisk_path);
4286 4e68cba3 2019-11-23 stsp free(ondisk_path);
4287 4e68cba3 2019-11-23 stsp goto done;
4289 4e68cba3 2019-11-23 stsp free(ondisk_path);
4290 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4291 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4292 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4293 4e68cba3 2019-11-23 stsp goto done;
4298 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4299 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4302 031a5338 2019-03-26 stsp got_repo_close(repo);
4303 d00136be 2019-03-26 stsp if (worktree)
4304 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4305 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4306 1dd54920 2019-05-11 stsp free((char *)pe->path);
4307 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4308 2ec1f75b 2019-03-26 stsp free(cwd);
4309 2ec1f75b 2019-03-26 stsp return error;
4312 2ec1f75b 2019-03-26 stsp __dead static void
4313 648e4ef7 2019-07-09 stsp usage_remove(void)
4315 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4316 f2a9dc41 2019-12-13 tracey getprogname());
4320 2a06fe5f 2019-08-24 stsp static const struct got_error *
4321 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4322 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4324 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4326 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4327 2a06fe5f 2019-08-24 stsp return NULL;
4328 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4329 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4330 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4331 2a06fe5f 2019-08-24 stsp return NULL;
4334 2ec1f75b 2019-03-26 stsp static const struct got_error *
4335 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4337 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4338 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4339 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4340 17ed4618 2019-06-02 stsp char *cwd = NULL;
4341 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4342 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4343 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4345 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4347 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4348 2ec1f75b 2019-03-26 stsp switch (ch) {
4350 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4352 70e3e7f5 2019-12-13 tracey case 'k':
4353 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4355 f2a9dc41 2019-12-13 tracey case 'R':
4356 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4359 f2a9dc41 2019-12-13 tracey usage_remove();
4360 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4364 2ec1f75b 2019-03-26 stsp argc -= optind;
4365 2ec1f75b 2019-03-26 stsp argv += optind;
4367 43012d58 2019-07-14 stsp #ifndef PROFILE
4368 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4369 43012d58 2019-07-14 stsp NULL) == -1)
4370 43012d58 2019-07-14 stsp err(1, "pledge");
4372 17ed4618 2019-06-02 stsp if (argc < 1)
4373 648e4ef7 2019-07-09 stsp usage_remove();
4375 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4376 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4377 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4378 2ec1f75b 2019-03-26 stsp goto done;
4380 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4381 2ec1f75b 2019-03-26 stsp if (error)
4382 2ec1f75b 2019-03-26 stsp goto done;
4384 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4387 2ec1f75b 2019-03-26 stsp goto done;
4389 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4390 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4391 2ec1f75b 2019-03-26 stsp if (error)
4392 2ec1f75b 2019-03-26 stsp goto done;
4394 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4395 6d022e97 2019-08-04 stsp if (error)
4396 6d022e97 2019-08-04 stsp goto done;
4398 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4399 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4400 f2a9dc41 2019-12-13 tracey struct stat sb;
4401 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4402 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4403 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4404 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4405 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4406 f2a9dc41 2019-12-13 tracey goto done;
4408 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4409 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4410 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4411 f2a9dc41 2019-12-13 tracey continue;
4413 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4414 f2a9dc41 2019-12-13 tracey ondisk_path);
4415 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4416 f2a9dc41 2019-12-13 tracey goto done;
4418 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4419 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4420 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4421 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4422 f2a9dc41 2019-12-13 tracey goto done;
4427 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4428 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4429 a129376b 2019-03-28 stsp if (error)
4430 a129376b 2019-03-28 stsp goto done;
4433 a129376b 2019-03-28 stsp got_repo_close(repo);
4434 a129376b 2019-03-28 stsp if (worktree)
4435 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4436 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4437 17ed4618 2019-06-02 stsp free((char *)pe->path);
4438 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4439 a129376b 2019-03-28 stsp free(cwd);
4440 a129376b 2019-03-28 stsp return error;
4443 a129376b 2019-03-28 stsp __dead static void
4444 a129376b 2019-03-28 stsp usage_revert(void)
4446 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4447 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4451 1ee397ad 2019-07-12 stsp static const struct got_error *
4452 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4454 a129376b 2019-03-28 stsp while (path[0] == '/')
4456 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4457 33aa809d 2019-08-08 stsp return NULL;
4460 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4461 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4462 33aa809d 2019-08-08 stsp const char *action;
4465 33aa809d 2019-08-08 stsp static const struct got_error *
4466 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4467 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4469 33aa809d 2019-08-08 stsp char *line = NULL;
4470 33aa809d 2019-08-08 stsp size_t linesize = 0;
4471 33aa809d 2019-08-08 stsp ssize_t linelen;
4473 33aa809d 2019-08-08 stsp switch (status) {
4474 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4475 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4477 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4478 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4480 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4481 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4482 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4483 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4484 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4485 33aa809d 2019-08-08 stsp printf("%s", line);
4486 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4487 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4488 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4489 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4490 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4493 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4496 33aa809d 2019-08-08 stsp return NULL;
4499 33aa809d 2019-08-08 stsp static const struct got_error *
4500 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4501 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4503 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4504 33aa809d 2019-08-08 stsp char *line = NULL;
4505 33aa809d 2019-08-08 stsp size_t linesize = 0;
4506 33aa809d 2019-08-08 stsp ssize_t linelen;
4507 33aa809d 2019-08-08 stsp int resp = ' ';
4508 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4510 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4512 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4514 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4515 33aa809d 2019-08-08 stsp a->action);
4517 33aa809d 2019-08-08 stsp return err;
4518 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4519 33aa809d 2019-08-08 stsp if (linelen == -1) {
4520 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4521 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4522 33aa809d 2019-08-08 stsp return NULL;
4524 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4526 33aa809d 2019-08-08 stsp *nl = '\0';
4527 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4528 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4529 33aa809d 2019-08-08 stsp printf("y\n");
4530 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4531 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4532 33aa809d 2019-08-08 stsp printf("n\n");
4533 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4534 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4535 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4536 33aa809d 2019-08-08 stsp printf("q\n");
4538 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4539 33aa809d 2019-08-08 stsp free(line);
4540 33aa809d 2019-08-08 stsp return NULL;
4543 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4544 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4545 33aa809d 2019-08-08 stsp a->action);
4547 33aa809d 2019-08-08 stsp return err;
4548 33aa809d 2019-08-08 stsp resp = getchar();
4549 33aa809d 2019-08-08 stsp if (resp == '\n')
4550 33aa809d 2019-08-08 stsp resp = getchar();
4551 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4552 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4553 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4554 33aa809d 2019-08-08 stsp resp = ' ';
4556 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4557 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4558 33aa809d 2019-08-08 stsp resp = ' ';
4562 33aa809d 2019-08-08 stsp if (resp == 'y')
4563 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4564 33aa809d 2019-08-08 stsp else if (resp == 'n')
4565 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4566 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4567 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4569 1ee397ad 2019-07-12 stsp return NULL;
4573 a129376b 2019-03-28 stsp static const struct got_error *
4574 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4576 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4577 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4578 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4579 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4580 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4581 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4582 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4583 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4584 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4585 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4587 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4589 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4590 a129376b 2019-03-28 stsp switch (ch) {
4592 33aa809d 2019-08-08 stsp pflag = 1;
4595 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4598 0f6d7415 2019-08-08 stsp can_recurse = 1;
4601 a129376b 2019-03-28 stsp usage_revert();
4602 a129376b 2019-03-28 stsp /* NOTREACHED */
4606 a129376b 2019-03-28 stsp argc -= optind;
4607 a129376b 2019-03-28 stsp argv += optind;
4609 43012d58 2019-07-14 stsp #ifndef PROFILE
4610 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4611 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4612 43012d58 2019-07-14 stsp err(1, "pledge");
4614 e20a8b6f 2019-06-04 stsp if (argc < 1)
4615 a129376b 2019-03-28 stsp usage_revert();
4616 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4617 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4619 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4620 a129376b 2019-03-28 stsp if (cwd == NULL) {
4621 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4622 a129376b 2019-03-28 stsp goto done;
4624 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4625 2ec1f75b 2019-03-26 stsp if (error)
4626 2ec1f75b 2019-03-26 stsp goto done;
4628 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4630 a129376b 2019-03-28 stsp if (error != NULL)
4631 a129376b 2019-03-28 stsp goto done;
4633 33aa809d 2019-08-08 stsp if (patch_script_path) {
4634 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4635 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4636 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4637 33aa809d 2019-08-08 stsp patch_script_path);
4638 33aa809d 2019-08-08 stsp goto done;
4641 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4642 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4643 a129376b 2019-03-28 stsp if (error)
4644 a129376b 2019-03-28 stsp goto done;
4646 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4647 6d022e97 2019-08-04 stsp if (error)
4648 6d022e97 2019-08-04 stsp goto done;
4650 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4651 0f6d7415 2019-08-08 stsp char *ondisk_path;
4652 0f6d7415 2019-08-08 stsp struct stat sb;
4653 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4654 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4655 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4656 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4657 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4658 0f6d7415 2019-08-08 stsp goto done;
4660 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4661 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4662 0f6d7415 2019-08-08 stsp free(ondisk_path);
4665 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4666 0f6d7415 2019-08-08 stsp ondisk_path);
4667 0f6d7415 2019-08-08 stsp free(ondisk_path);
4668 0f6d7415 2019-08-08 stsp goto done;
4670 0f6d7415 2019-08-08 stsp free(ondisk_path);
4671 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4672 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4673 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4674 0f6d7415 2019-08-08 stsp goto done;
4679 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4680 33aa809d 2019-08-08 stsp cpa.action = "revert";
4681 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4682 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4683 a129376b 2019-03-28 stsp if (error)
4684 a129376b 2019-03-28 stsp goto done;
4686 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4687 33aa809d 2019-08-08 stsp error == NULL)
4688 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4690 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4691 2ec1f75b 2019-03-26 stsp if (worktree)
4692 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4693 2ec1f75b 2019-03-26 stsp free(path);
4694 d00136be 2019-03-26 stsp free(cwd);
4695 6bad629b 2019-02-04 stsp return error;
4698 c4296144 2019-05-09 stsp __dead static void
4699 c4296144 2019-05-09 stsp usage_commit(void)
4701 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4702 5c1e53bc 2019-07-28 stsp getprogname());
4706 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4707 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4708 e2ba3d07 2019-05-13 stsp const char *editor;
4709 e0870e44 2019-05-13 stsp const char *worktree_path;
4710 76d98825 2019-06-03 stsp const char *branch_name;
4711 314a6357 2019-05-13 stsp const char *repo_path;
4712 e0870e44 2019-05-13 stsp char *logmsg_path;
4716 33ad4cbe 2019-05-12 jcs static const struct got_error *
4717 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4720 76d98825 2019-06-03 stsp char *initial_content = NULL;
4721 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4722 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4723 e0870e44 2019-05-13 stsp char *template = NULL;
4724 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4726 33ad4cbe 2019-05-12 jcs size_t len;
4728 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4729 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4730 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4731 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4732 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4733 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4734 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4735 33ad4cbe 2019-05-12 jcs return NULL;
4738 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4739 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4741 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4742 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4743 76d98825 2019-06-03 stsp a->branch_name) == -1)
4744 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4746 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4748 e0870e44 2019-05-13 stsp goto done;
4750 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4752 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4753 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4754 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4755 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4756 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4760 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4762 76d98825 2019-06-03 stsp free(initial_content);
4763 e0870e44 2019-05-13 stsp free(template);
4765 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4766 3ce1b845 2019-07-15 stsp if (err == NULL) {
4767 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4768 3ce1b845 2019-07-15 stsp if (err) {
4769 3ce1b845 2019-07-15 stsp free(*logmsg);
4770 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4773 33ad4cbe 2019-05-12 jcs return err;
4776 c4296144 2019-05-09 stsp static const struct got_error *
4777 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4779 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4780 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4781 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4782 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4783 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4784 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4785 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4786 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4787 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4788 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4790 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4791 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4793 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4794 c4296144 2019-05-09 stsp switch (ch) {
4796 c4296144 2019-05-09 stsp logmsg = optarg;
4799 c4296144 2019-05-09 stsp usage_commit();
4800 c4296144 2019-05-09 stsp /* NOTREACHED */
4804 c4296144 2019-05-09 stsp argc -= optind;
4805 c4296144 2019-05-09 stsp argv += optind;
4807 43012d58 2019-07-14 stsp #ifndef PROFILE
4808 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4809 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4810 43012d58 2019-07-14 stsp err(1, "pledge");
4812 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
4813 c4296144 2019-05-09 stsp if (cwd == NULL) {
4814 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4815 c4296144 2019-05-09 stsp goto done;
4817 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
4818 7d5807f4 2019-07-11 stsp if (error)
4819 7d5807f4 2019-07-11 stsp goto done;
4821 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4822 c4296144 2019-05-09 stsp if (error)
4823 a698f62e 2019-07-25 stsp goto done;
4824 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
4825 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
4826 c4296144 2019-05-09 stsp goto done;
4829 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
4830 916f288c 2019-07-30 stsp worktree);
4831 5c1e53bc 2019-07-28 stsp if (error)
4832 5c1e53bc 2019-07-28 stsp goto done;
4834 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4835 c9956ddf 2019-09-08 stsp if (error)
4836 c9956ddf 2019-09-08 stsp goto done;
4837 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4838 c9956ddf 2019-09-08 stsp gitconfig_path);
4839 c4296144 2019-05-09 stsp if (error != NULL)
4840 c4296144 2019-05-09 stsp goto done;
4842 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
4843 aba9c984 2019-09-08 stsp if (error)
4844 aba9c984 2019-09-08 stsp return error;
4847 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
4848 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
4850 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
4851 314a6357 2019-05-13 stsp error = get_editor(&editor);
4853 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4854 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4855 c4296144 2019-05-09 stsp if (error)
4856 c4296144 2019-05-09 stsp goto done;
4858 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4859 087fb88c 2019-08-04 stsp if (error)
4860 087fb88c 2019-08-04 stsp goto done;
4862 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
4863 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
4864 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4865 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4866 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
4867 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4868 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
4869 916f288c 2019-07-30 stsp goto done;
4871 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
4873 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
4874 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4875 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4876 e0870e44 2019-05-13 stsp if (error) {
4877 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4878 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
4879 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
4880 c4296144 2019-05-09 stsp goto done;
4883 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
4884 c4296144 2019-05-09 stsp if (error)
4885 c4296144 2019-05-09 stsp goto done;
4886 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
4888 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
4889 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
4890 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
4891 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4892 7266f21f 2019-10-21 stsp error == NULL)
4893 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4894 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
4896 c4296144 2019-05-09 stsp got_repo_close(repo);
4897 c4296144 2019-05-09 stsp if (worktree)
4898 c4296144 2019-05-09 stsp got_worktree_close(worktree);
4899 c4296144 2019-05-09 stsp free(cwd);
4900 c4296144 2019-05-09 stsp free(id_str);
4901 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4902 e2ba3d07 2019-05-13 stsp free(editor);
4903 aba9c984 2019-09-08 stsp free(author);
4904 234035bc 2019-06-01 stsp return error;
4907 234035bc 2019-06-01 stsp __dead static void
4908 234035bc 2019-06-01 stsp usage_cherrypick(void)
4910 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4914 234035bc 2019-06-01 stsp static const struct got_error *
4915 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
4917 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
4918 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
4919 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
4920 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
4921 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
4922 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
4923 234035bc 2019-06-01 stsp struct got_object_qid *pid;
4924 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
4925 234035bc 2019-06-01 stsp int ch, did_something = 0;
4927 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4928 234035bc 2019-06-01 stsp switch (ch) {
4930 234035bc 2019-06-01 stsp usage_cherrypick();
4931 234035bc 2019-06-01 stsp /* NOTREACHED */
4935 234035bc 2019-06-01 stsp argc -= optind;
4936 234035bc 2019-06-01 stsp argv += optind;
4938 43012d58 2019-07-14 stsp #ifndef PROFILE
4939 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4940 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4941 43012d58 2019-07-14 stsp err(1, "pledge");
4943 234035bc 2019-06-01 stsp if (argc != 1)
4944 234035bc 2019-06-01 stsp usage_cherrypick();
4946 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
4947 234035bc 2019-06-01 stsp if (cwd == NULL) {
4948 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
4949 234035bc 2019-06-01 stsp goto done;
4951 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
4952 234035bc 2019-06-01 stsp if (error)
4953 234035bc 2019-06-01 stsp goto done;
4955 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4957 234035bc 2019-06-01 stsp if (error != NULL)
4958 234035bc 2019-06-01 stsp goto done;
4960 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
4961 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4962 234035bc 2019-06-01 stsp if (error)
4963 234035bc 2019-06-01 stsp goto done;
4965 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4966 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
4967 234035bc 2019-06-01 stsp if (error != NULL) {
4968 234035bc 2019-06-01 stsp struct got_reference *ref;
4969 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4970 234035bc 2019-06-01 stsp goto done;
4971 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
4972 234035bc 2019-06-01 stsp if (error != NULL)
4973 234035bc 2019-06-01 stsp goto done;
4974 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
4975 234035bc 2019-06-01 stsp got_ref_close(ref);
4976 234035bc 2019-06-01 stsp if (error != NULL)
4977 234035bc 2019-06-01 stsp goto done;
4979 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
4980 234035bc 2019-06-01 stsp if (error)
4981 234035bc 2019-06-01 stsp goto done;
4983 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
4984 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
4985 234035bc 2019-06-01 stsp if (error != NULL)
4986 234035bc 2019-06-01 stsp goto done;
4988 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
4989 234035bc 2019-06-01 stsp if (error) {
4990 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
4991 234035bc 2019-06-01 stsp goto done;
4992 234035bc 2019-06-01 stsp error = NULL;
4994 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
4995 234035bc 2019-06-01 stsp goto done;
4998 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4999 234035bc 2019-06-01 stsp if (error)
5000 234035bc 2019-06-01 stsp goto done;
5001 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5002 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
5003 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
5005 234035bc 2019-06-01 stsp if (error != NULL)
5006 234035bc 2019-06-01 stsp goto done;
5008 234035bc 2019-06-01 stsp if (did_something)
5009 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
5011 234035bc 2019-06-01 stsp if (commit)
5012 234035bc 2019-06-01 stsp got_object_commit_close(commit);
5013 234035bc 2019-06-01 stsp free(commit_id_str);
5014 234035bc 2019-06-01 stsp if (head_ref)
5015 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5016 234035bc 2019-06-01 stsp if (worktree)
5017 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5019 234035bc 2019-06-01 stsp got_repo_close(repo);
5020 c4296144 2019-05-09 stsp return error;
5023 5ef14e63 2019-06-02 stsp __dead static void
5024 5ef14e63 2019-06-02 stsp usage_backout(void)
5026 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5030 5ef14e63 2019-06-02 stsp static const struct got_error *
5031 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5033 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5034 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5035 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5036 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5037 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5038 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5039 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5040 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5041 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5043 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5044 5ef14e63 2019-06-02 stsp switch (ch) {
5046 5ef14e63 2019-06-02 stsp usage_backout();
5047 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5051 5ef14e63 2019-06-02 stsp argc -= optind;
5052 5ef14e63 2019-06-02 stsp argv += optind;
5054 43012d58 2019-07-14 stsp #ifndef PROFILE
5055 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5056 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5057 43012d58 2019-07-14 stsp err(1, "pledge");
5059 5ef14e63 2019-06-02 stsp if (argc != 1)
5060 5ef14e63 2019-06-02 stsp usage_backout();
5062 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5063 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5064 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5065 5ef14e63 2019-06-02 stsp goto done;
5067 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5068 5ef14e63 2019-06-02 stsp if (error)
5069 5ef14e63 2019-06-02 stsp goto done;
5071 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5073 5ef14e63 2019-06-02 stsp if (error != NULL)
5074 5ef14e63 2019-06-02 stsp goto done;
5076 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5077 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5078 5ef14e63 2019-06-02 stsp if (error)
5079 5ef14e63 2019-06-02 stsp goto done;
5081 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5082 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5083 5ef14e63 2019-06-02 stsp if (error != NULL) {
5084 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5085 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5086 5ef14e63 2019-06-02 stsp goto done;
5087 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5088 5ef14e63 2019-06-02 stsp if (error != NULL)
5089 5ef14e63 2019-06-02 stsp goto done;
5090 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5091 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5092 5ef14e63 2019-06-02 stsp if (error != NULL)
5093 5ef14e63 2019-06-02 stsp goto done;
5095 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5096 5ef14e63 2019-06-02 stsp if (error)
5097 5ef14e63 2019-06-02 stsp goto done;
5099 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5100 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5101 5ef14e63 2019-06-02 stsp if (error != NULL)
5102 5ef14e63 2019-06-02 stsp goto done;
5104 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5105 5ef14e63 2019-06-02 stsp if (error)
5106 5ef14e63 2019-06-02 stsp goto done;
5108 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5109 5ef14e63 2019-06-02 stsp if (error)
5110 5ef14e63 2019-06-02 stsp goto done;
5111 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5112 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5113 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5114 5ef14e63 2019-06-02 stsp goto done;
5117 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5118 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5119 5ef14e63 2019-06-02 stsp if (error != NULL)
5120 5ef14e63 2019-06-02 stsp goto done;
5122 5ef14e63 2019-06-02 stsp if (did_something)
5123 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5125 5ef14e63 2019-06-02 stsp if (commit)
5126 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5127 5ef14e63 2019-06-02 stsp free(commit_id_str);
5128 5ef14e63 2019-06-02 stsp if (head_ref)
5129 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5130 818c7501 2019-07-11 stsp if (worktree)
5131 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5133 818c7501 2019-07-11 stsp got_repo_close(repo);
5134 818c7501 2019-07-11 stsp return error;
5137 818c7501 2019-07-11 stsp __dead static void
5138 818c7501 2019-07-11 stsp usage_rebase(void)
5140 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5141 af54c8f8 2019-07-11 stsp getprogname());
5146 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5149 0ebf8283 2019-07-24 stsp size_t len;
5151 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5152 0ebf8283 2019-07-24 stsp if (len > limit)
5153 0ebf8283 2019-07-24 stsp len = limit;
5154 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5155 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5157 0ebf8283 2019-07-24 stsp *nl = '\0';
5160 0ebf8283 2019-07-24 stsp static const struct got_error *
5161 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5163 5943eee2 2019-08-13 stsp const struct got_error *err;
5164 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5165 5943eee2 2019-08-13 stsp const char *s;
5167 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5169 5943eee2 2019-08-13 stsp return err;
5171 5943eee2 2019-08-13 stsp s = logmsg0;
5172 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5175 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5176 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5177 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5178 5943eee2 2019-08-13 stsp goto done;
5181 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5183 5943eee2 2019-08-13 stsp free(logmsg0);
5184 5943eee2 2019-08-13 stsp return err;
5187 818c7501 2019-07-11 stsp static const struct got_error *
5188 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5189 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5191 818c7501 2019-07-11 stsp const struct got_error *err;
5192 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5194 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5196 818c7501 2019-07-11 stsp goto done;
5198 ff0d2220 2019-07-11 stsp if (new_id) {
5199 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5201 ff0d2220 2019-07-11 stsp goto done;
5204 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5205 ff0d2220 2019-07-11 stsp if (new_id_str)
5206 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5208 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5210 0ebf8283 2019-07-24 stsp goto done;
5212 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5213 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5215 818c7501 2019-07-11 stsp free(old_id_str);
5216 818c7501 2019-07-11 stsp free(new_id_str);
5217 818c7501 2019-07-11 stsp return err;
5220 1ee397ad 2019-07-12 stsp static const struct got_error *
5221 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5223 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5225 818c7501 2019-07-11 stsp while (path[0] == '/')
5227 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5229 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5230 1ee397ad 2019-07-12 stsp return NULL;
5231 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5232 818c7501 2019-07-11 stsp *rebase_status = status;
5233 1ee397ad 2019-07-12 stsp return NULL;
5236 818c7501 2019-07-11 stsp static const struct got_error *
5237 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5238 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5239 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5241 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5242 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5243 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5246 818c7501 2019-07-11 stsp static const struct got_error *
5247 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5248 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5249 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5250 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5252 ff0d2220 2019-07-11 stsp const struct got_error *error;
5253 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5254 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5256 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5257 ff0d2220 2019-07-11 stsp if (error)
5258 ff0d2220 2019-07-11 stsp return error;
5260 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5261 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5262 ff0d2220 2019-07-11 stsp if (error) {
5263 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5264 ff0d2220 2019-07-11 stsp goto done;
5265 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5267 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5268 ff0d2220 2019-07-11 stsp free(new_commit_id);
5271 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5272 ff0d2220 2019-07-11 stsp return error;
5275 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5276 64c6d990 2019-07-11 stsp const char *path_prefix;
5277 64c6d990 2019-07-11 stsp size_t len;
5278 8ca9bd68 2019-07-25 stsp int errcode;
5281 64c6d990 2019-07-11 stsp static const struct got_error *
5282 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5283 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5284 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5285 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5287 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5289 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5290 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5291 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5293 64c6d990 2019-07-11 stsp return NULL;
5296 64c6d990 2019-07-11 stsp static const struct got_error *
5297 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5298 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5299 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5301 64c6d990 2019-07-11 stsp const struct got_error *err;
5302 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5303 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5304 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5306 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5307 64c6d990 2019-07-11 stsp return NULL;
5309 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5311 64c6d990 2019-07-11 stsp goto done;
5313 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5315 64c6d990 2019-07-11 stsp goto done;
5317 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5318 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5320 64c6d990 2019-07-11 stsp goto done;
5322 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5323 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5325 64c6d990 2019-07-11 stsp goto done;
5327 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5328 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5329 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5330 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5331 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5332 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5333 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5335 64c6d990 2019-07-11 stsp if (tree1)
5336 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5337 64c6d990 2019-07-11 stsp if (tree2)
5338 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5339 64c6d990 2019-07-11 stsp if (commit)
5340 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5341 64c6d990 2019-07-11 stsp if (parent_commit)
5342 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5343 64c6d990 2019-07-11 stsp return err;
5346 ff0d2220 2019-07-11 stsp static const struct got_error *
5347 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5348 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5349 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5350 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5351 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5353 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5354 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5355 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5356 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5357 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5359 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5361 af61c510 2019-07-19 stsp return err;
5363 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5364 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5366 af61c510 2019-07-19 stsp goto done;
5367 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5368 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5369 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5370 af61c510 2019-07-19 stsp if (err) {
5371 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5372 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5373 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5374 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5375 af61c510 2019-07-19 stsp "been reached?!?");
5377 ee780d5c 2020-01-04 stsp goto done;
5379 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5380 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5382 af61c510 2019-07-19 stsp goto done;
5384 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5386 af61c510 2019-07-19 stsp goto done;
5387 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5388 af61c510 2019-07-19 stsp commit_id = parent_id;
5392 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5393 af61c510 2019-07-19 stsp return err;
5396 af61c510 2019-07-19 stsp static const struct got_error *
5397 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5399 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5400 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5401 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5402 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5403 818c7501 2019-07-11 stsp char *cwd = NULL;
5404 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5405 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5406 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5407 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5408 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5409 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5410 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5411 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5412 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5413 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5414 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5415 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5417 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5418 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5420 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5421 818c7501 2019-07-11 stsp switch (ch) {
5423 818c7501 2019-07-11 stsp abort_rebase = 1;
5426 818c7501 2019-07-11 stsp continue_rebase = 1;
5429 818c7501 2019-07-11 stsp usage_rebase();
5430 818c7501 2019-07-11 stsp /* NOTREACHED */
5434 818c7501 2019-07-11 stsp argc -= optind;
5435 818c7501 2019-07-11 stsp argv += optind;
5437 43012d58 2019-07-14 stsp #ifndef PROFILE
5438 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5439 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5440 43012d58 2019-07-14 stsp err(1, "pledge");
5442 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5443 818c7501 2019-07-11 stsp usage_rebase();
5444 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5445 818c7501 2019-07-11 stsp if (argc != 0)
5446 818c7501 2019-07-11 stsp usage_rebase();
5447 818c7501 2019-07-11 stsp } else if (argc != 1)
5448 818c7501 2019-07-11 stsp usage_rebase();
5450 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5451 818c7501 2019-07-11 stsp if (cwd == NULL) {
5452 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5453 818c7501 2019-07-11 stsp goto done;
5455 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5456 818c7501 2019-07-11 stsp if (error)
5457 818c7501 2019-07-11 stsp goto done;
5459 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5461 818c7501 2019-07-11 stsp if (error != NULL)
5462 818c7501 2019-07-11 stsp goto done;
5464 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5465 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5466 818c7501 2019-07-11 stsp if (error)
5467 818c7501 2019-07-11 stsp goto done;
5469 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5470 818c7501 2019-07-11 stsp if (error)
5471 818c7501 2019-07-11 stsp goto done;
5473 f6794adc 2019-07-23 stsp if (abort_rebase) {
5474 818c7501 2019-07-11 stsp int did_something;
5475 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5476 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5477 f6794adc 2019-07-23 stsp goto done;
5479 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5480 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5481 3e3a69f1 2019-07-25 stsp worktree, repo);
5482 818c7501 2019-07-11 stsp if (error)
5483 818c7501 2019-07-11 stsp goto done;
5484 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5485 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5486 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5487 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5488 818c7501 2019-07-11 stsp if (error)
5489 818c7501 2019-07-11 stsp goto done;
5490 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5491 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5494 818c7501 2019-07-11 stsp if (continue_rebase) {
5495 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5496 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5497 f6794adc 2019-07-23 stsp goto done;
5499 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5500 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5501 3e3a69f1 2019-07-25 stsp worktree, repo);
5502 818c7501 2019-07-11 stsp if (error)
5503 818c7501 2019-07-11 stsp goto done;
5505 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5506 01757395 2019-07-12 stsp resume_commit_id, repo);
5507 818c7501 2019-07-11 stsp if (error)
5508 818c7501 2019-07-11 stsp goto done;
5510 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5511 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5512 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5513 818c7501 2019-07-11 stsp goto done;
5516 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5517 818c7501 2019-07-11 stsp if (error != NULL)
5518 818c7501 2019-07-11 stsp goto done;
5521 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5522 ff0d2220 2019-07-11 stsp if (error)
5523 ff0d2220 2019-07-11 stsp goto done;
5525 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5526 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5528 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5529 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5530 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5531 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5532 818c7501 2019-07-11 stsp if (error)
5533 818c7501 2019-07-11 stsp goto done;
5534 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5535 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5536 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5537 818c7501 2019-07-11 stsp "with work tree's branch");
5538 818c7501 2019-07-11 stsp goto done;
5541 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5542 a51a74b3 2019-07-27 stsp if (error) {
5543 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5544 a51a74b3 2019-07-27 stsp goto done;
5545 a51a74b3 2019-07-27 stsp error = NULL;
5547 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5548 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5549 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5550 a51a74b3 2019-07-27 stsp goto done;
5552 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5553 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5554 818c7501 2019-07-11 stsp if (error)
5555 818c7501 2019-07-11 stsp goto done;
5558 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5559 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5560 818c7501 2019-07-11 stsp if (error)
5561 818c7501 2019-07-11 stsp goto done;
5563 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5564 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5565 fc66b545 2019-08-12 stsp if (pid == NULL) {
5566 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5567 fc66b545 2019-08-12 stsp int did_something;
5568 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5569 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5570 fc66b545 2019-08-12 stsp &did_something);
5571 fc66b545 2019-08-12 stsp if (error)
5572 fc66b545 2019-08-12 stsp goto done;
5573 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5574 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5576 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5577 fc66b545 2019-08-12 stsp goto done;
5579 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5580 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5581 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5582 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5583 818c7501 2019-07-11 stsp commit = NULL;
5584 818c7501 2019-07-11 stsp if (error)
5585 818c7501 2019-07-11 stsp goto done;
5587 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5588 38b0338b 2019-11-29 stsp if (continue_rebase) {
5589 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5590 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5591 38b0338b 2019-11-29 stsp goto done;
5593 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5594 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5595 38b0338b 2019-11-29 stsp char *id_str;
5596 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5597 38b0338b 2019-11-29 stsp new_base_branch);
5598 38b0338b 2019-11-29 stsp if (error)
5599 38b0338b 2019-11-29 stsp goto done;
5600 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5601 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5602 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5603 38b0338b 2019-11-29 stsp free(id_str);
5604 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5605 38b0338b 2019-11-29 stsp new_head_commit_id);
5606 38b0338b 2019-11-29 stsp if (error)
5607 38b0338b 2019-11-29 stsp goto done;
5611 818c7501 2019-07-11 stsp pid = NULL;
5612 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5613 818c7501 2019-07-11 stsp commit_id = qid->id;
5614 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5615 818c7501 2019-07-11 stsp pid = qid;
5617 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5618 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5619 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5620 818c7501 2019-07-11 stsp if (error)
5621 818c7501 2019-07-11 stsp goto done;
5623 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5624 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5628 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5629 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5630 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5631 818c7501 2019-07-11 stsp if (error)
5632 818c7501 2019-07-11 stsp goto done;
5635 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5636 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5637 818c7501 2019-07-11 stsp if (error)
5638 818c7501 2019-07-11 stsp goto done;
5639 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5640 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5642 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5643 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5645 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5646 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5647 818c7501 2019-07-11 stsp free(resume_commit_id);
5648 818c7501 2019-07-11 stsp free(yca_id);
5649 818c7501 2019-07-11 stsp if (commit)
5650 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5651 818c7501 2019-07-11 stsp if (branch)
5652 818c7501 2019-07-11 stsp got_ref_close(branch);
5653 818c7501 2019-07-11 stsp if (new_base_branch)
5654 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5655 818c7501 2019-07-11 stsp if (tmp_branch)
5656 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5657 5ef14e63 2019-06-02 stsp if (worktree)
5658 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5660 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5661 5ef14e63 2019-06-02 stsp return error;
5664 0ebf8283 2019-07-24 stsp __dead static void
5665 0ebf8283 2019-07-24 stsp usage_histedit(void)
5667 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5668 0ebf8283 2019-07-24 stsp getprogname());
5672 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5673 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5674 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5675 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5676 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5678 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5679 0ebf8283 2019-07-24 stsp unsigned char code;
5680 0ebf8283 2019-07-24 stsp const char *name;
5681 0ebf8283 2019-07-24 stsp const char *desc;
5682 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5683 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5684 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5685 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5686 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5687 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5688 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5691 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5692 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5693 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5694 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5695 0ebf8283 2019-07-24 stsp char *logmsg;
5697 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5699 0ebf8283 2019-07-24 stsp static const struct got_error *
5700 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5701 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5703 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5704 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5705 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5708 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5710 0ebf8283 2019-07-24 stsp goto done;
5712 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5714 0ebf8283 2019-07-24 stsp goto done;
5716 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5718 0ebf8283 2019-07-24 stsp goto done;
5720 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5721 0ebf8283 2019-07-24 stsp if (n < 0)
5722 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5724 0ebf8283 2019-07-24 stsp if (commit)
5725 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5726 0ebf8283 2019-07-24 stsp free(id_str);
5727 0ebf8283 2019-07-24 stsp free(logmsg);
5728 0ebf8283 2019-07-24 stsp return err;
5731 0ebf8283 2019-07-24 stsp static const struct got_error *
5732 0ebf8283 2019-07-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5733 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5735 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5736 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5738 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5739 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5741 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5742 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5748 0ebf8283 2019-07-24 stsp return err;
5751 0ebf8283 2019-07-24 stsp static const struct got_error *
5752 0ebf8283 2019-07-24 stsp write_cmd_list(FILE *f)
5754 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5757 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
5758 0ebf8283 2019-07-24 stsp if (n < 0)
5759 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5761 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5762 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5763 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5764 0ebf8283 2019-07-24 stsp cmd->desc);
5765 0ebf8283 2019-07-24 stsp if (n < 0) {
5766 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5770 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Commits will be processed in order from top to "
5771 0ebf8283 2019-07-24 stsp "bottom of this file.\n");
5772 0ebf8283 2019-07-24 stsp if (n < 0)
5773 0ebf8283 2019-07-24 stsp return got_ferror(f, GOT_ERR_IO);
5774 0ebf8283 2019-07-24 stsp return err;
5777 0ebf8283 2019-07-24 stsp static const struct got_error *
5778 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
5780 0ebf8283 2019-07-24 stsp static char msg[42];
5783 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5785 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
5786 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5788 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5791 0ebf8283 2019-07-24 stsp static const struct got_error *
5792 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5793 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
5795 0ebf8283 2019-07-24 stsp const struct got_error *err;
5796 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
5797 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
5799 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5801 0ebf8283 2019-07-24 stsp return err;
5803 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5805 0ebf8283 2019-07-24 stsp goto done;
5807 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5809 5943eee2 2019-08-13 stsp goto done;
5810 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5811 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5812 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
5813 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5814 0ebf8283 2019-07-24 stsp goto done;
5817 0ebf8283 2019-07-24 stsp if (folded_commit)
5818 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
5819 0ebf8283 2019-07-24 stsp free(id_str);
5820 5943eee2 2019-08-13 stsp free(folded_logmsg);
5821 0ebf8283 2019-07-24 stsp return err;
5824 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
5825 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
5827 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
5829 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
5830 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5831 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
5832 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5833 3f9de99f 2019-07-24 stsp folded = prev;
5834 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
5837 0ebf8283 2019-07-24 stsp return folded;
5840 0ebf8283 2019-07-24 stsp static const struct got_error *
5841 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5842 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5844 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5845 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5846 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5847 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5849 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
5851 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5853 0ebf8283 2019-07-24 stsp return err;
5855 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
5856 0ebf8283 2019-07-24 stsp if (folded) {
5857 0ebf8283 2019-07-24 stsp while (folded != hle) {
5858 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5859 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5862 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
5863 0ebf8283 2019-07-24 stsp logmsg, repo);
5865 0ebf8283 2019-07-24 stsp goto done;
5866 0ebf8283 2019-07-24 stsp free(logmsg);
5867 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5868 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
5872 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5874 0ebf8283 2019-07-24 stsp goto done;
5875 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5877 5943eee2 2019-08-13 stsp goto done;
5878 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
5879 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
5880 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5881 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
5882 0ebf8283 2019-07-24 stsp goto done;
5884 0ebf8283 2019-07-24 stsp free(logmsg);
5885 0ebf8283 2019-07-24 stsp logmsg = new_msg;
5887 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
5889 0ebf8283 2019-07-24 stsp goto done;
5891 0ebf8283 2019-07-24 stsp err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5893 0ebf8283 2019-07-24 stsp goto done;
5895 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
5896 0ebf8283 2019-07-24 stsp close(fd);
5898 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
5900 0ebf8283 2019-07-24 stsp goto done;
5902 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5903 0ebf8283 2019-07-24 stsp if (err) {
5904 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5905 0ebf8283 2019-07-24 stsp goto done;
5906 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5909 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5910 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
5911 0ebf8283 2019-07-24 stsp free(logmsg_path);
5912 0ebf8283 2019-07-24 stsp free(logmsg);
5913 5943eee2 2019-08-13 stsp free(orig_logmsg);
5914 0ebf8283 2019-07-24 stsp free(editor);
5915 0ebf8283 2019-07-24 stsp if (commit)
5916 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5917 0ebf8283 2019-07-24 stsp return err;
5920 0ebf8283 2019-07-24 stsp static const struct got_error *
5921 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
5922 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5924 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5925 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
5926 0ebf8283 2019-07-24 stsp size_t size;
5927 0ebf8283 2019-07-24 stsp ssize_t len;
5928 0ebf8283 2019-07-24 stsp int lineno = 0, i;
5929 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5930 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5931 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
5933 0ebf8283 2019-07-24 stsp for (;;) {
5934 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
5935 0ebf8283 2019-07-24 stsp if (len == -1) {
5936 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
5937 0ebf8283 2019-07-24 stsp if (feof(f))
5939 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
5940 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
5945 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5947 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
5948 0ebf8283 2019-07-24 stsp free(line);
5949 0ebf8283 2019-07-24 stsp line = NULL;
5952 0ebf8283 2019-07-24 stsp cmd = NULL;
5953 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
5954 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
5955 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5956 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
5957 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
5960 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5965 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
5966 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
5969 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
5971 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
5972 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
5973 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
5976 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
5977 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
5981 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
5982 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
5983 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
5987 0ebf8283 2019-07-24 stsp free(line);
5988 0ebf8283 2019-07-24 stsp line = NULL;
5992 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
5994 0ebf8283 2019-07-24 stsp *end = '\0';
5996 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
5997 0ebf8283 2019-07-24 stsp if (err) {
5998 0ebf8283 2019-07-24 stsp /* override error code */
5999 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6003 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
6004 0ebf8283 2019-07-24 stsp if (hle == NULL) {
6005 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
6008 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
6009 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
6010 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
6011 0ebf8283 2019-07-24 stsp commit_id = NULL;
6012 0ebf8283 2019-07-24 stsp free(line);
6013 0ebf8283 2019-07-24 stsp line = NULL;
6014 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6017 0ebf8283 2019-07-24 stsp free(line);
6018 0ebf8283 2019-07-24 stsp free(commit_id);
6019 0ebf8283 2019-07-24 stsp return err;
6022 0ebf8283 2019-07-24 stsp static const struct got_error *
6023 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6024 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6026 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6027 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6028 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6029 bfce7f83 2019-07-27 stsp static char msg[80];
6030 bfce7f83 2019-07-27 stsp char *id_str;
6032 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6033 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6034 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6035 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6036 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6038 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6039 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6040 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6043 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6044 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6046 bfce7f83 2019-07-27 stsp return err;
6047 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6048 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6049 bfce7f83 2019-07-27 stsp free(id_str);
6050 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6054 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6055 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6056 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6057 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6059 bfce7f83 2019-07-27 stsp return NULL;
6062 bfce7f83 2019-07-27 stsp static const struct got_error *
6063 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6064 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6065 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6067 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6068 0ebf8283 2019-07-24 stsp char *editor;
6069 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6071 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6073 0ebf8283 2019-07-24 stsp return err;
6075 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6076 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6077 0ebf8283 2019-07-24 stsp goto done;
6080 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6081 0ebf8283 2019-07-24 stsp if (f == NULL) {
6082 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6083 0ebf8283 2019-07-24 stsp goto done;
6085 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6087 bfce7f83 2019-07-27 stsp goto done;
6089 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6091 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6092 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6093 0ebf8283 2019-07-24 stsp free(editor);
6094 0ebf8283 2019-07-24 stsp return err;
6097 0ebf8283 2019-07-24 stsp static const struct got_error *
6098 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6099 0ebf8283 2019-07-24 stsp struct got_object_id_queue *, const char *, struct got_repository *);
6101 0ebf8283 2019-07-24 stsp static const struct got_error *
6102 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6103 0ebf8283 2019-07-24 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6105 0ebf8283 2019-07-24 stsp const struct got_error *err;
6106 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6107 0ebf8283 2019-07-24 stsp char *path = NULL;
6109 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6111 0ebf8283 2019-07-24 stsp return err;
6113 0ebf8283 2019-07-24 stsp err = write_cmd_list(f);
6115 0ebf8283 2019-07-24 stsp goto done;
6117 0ebf8283 2019-07-24 stsp err = histedit_write_commit_list(commits, f, repo);
6119 0ebf8283 2019-07-24 stsp goto done;
6121 0ebf8283 2019-07-24 stsp if (fclose(f) != 0) {
6122 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6123 0ebf8283 2019-07-24 stsp goto done;
6127 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6128 0ebf8283 2019-07-24 stsp if (err) {
6129 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6130 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6131 0ebf8283 2019-07-24 stsp goto done;
6132 bfce7f83 2019-07-27 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6133 0ebf8283 2019-07-24 stsp commits, path, repo);
6136 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6137 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6138 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6139 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6140 0ebf8283 2019-07-24 stsp free(path);
6141 0ebf8283 2019-07-24 stsp return err;
6144 0ebf8283 2019-07-24 stsp static const struct got_error *
6145 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6146 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6148 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6149 0ebf8283 2019-07-24 stsp char *path = NULL;
6150 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6151 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6152 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6154 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6156 0ebf8283 2019-07-24 stsp return err;
6158 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6159 0ebf8283 2019-07-24 stsp if (f == NULL) {
6160 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6161 0ebf8283 2019-07-24 stsp goto done;
6163 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6164 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6169 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6170 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6171 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6172 0ebf8283 2019-07-24 stsp if (n < 0) {
6173 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6179 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6180 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6181 0ebf8283 2019-07-24 stsp free(path);
6182 0ebf8283 2019-07-24 stsp if (commit)
6183 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6184 0ebf8283 2019-07-24 stsp return err;
6188 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6190 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6192 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6193 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6194 bfce7f83 2019-07-27 stsp free(hle);
6198 0ebf8283 2019-07-24 stsp static const struct got_error *
6199 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6200 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6202 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6203 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6205 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6206 0ebf8283 2019-07-24 stsp if (f == NULL) {
6207 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6208 0ebf8283 2019-07-24 stsp goto done;
6211 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6213 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6214 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6215 0ebf8283 2019-07-24 stsp return err;
6218 0ebf8283 2019-07-24 stsp static const struct got_error *
6219 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6220 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6221 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6223 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6224 0ebf8283 2019-07-24 stsp int resp = ' ';
6226 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6227 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6228 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6229 0ebf8283 2019-07-24 stsp resp = getchar();
6230 a61a4414 2019-08-07 stsp if (resp == '\n')
6231 a61a4414 2019-08-07 stsp resp = getchar();
6232 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6233 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6234 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6236 426ebf2e 2019-07-25 stsp if (err) {
6237 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6238 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6240 bfce7f83 2019-07-27 stsp prev_err = err;
6241 426ebf2e 2019-07-25 stsp resp = ' ';
6245 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6246 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6247 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6248 0ebf8283 2019-07-24 stsp commits, repo);
6249 426ebf2e 2019-07-25 stsp if (err) {
6250 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6251 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6253 bfce7f83 2019-07-27 stsp prev_err = err;
6254 426ebf2e 2019-07-25 stsp resp = ' ';
6258 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6259 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6262 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6265 0ebf8283 2019-07-24 stsp return err;
6268 0ebf8283 2019-07-24 stsp static const struct got_error *
6269 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6270 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6271 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6273 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6274 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6275 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6276 3e3a69f1 2019-07-25 stsp branch, repo);
6279 0ebf8283 2019-07-24 stsp static const struct got_error *
6280 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6281 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6283 0ebf8283 2019-07-24 stsp const struct got_error *err;
6284 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6286 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6288 0ebf8283 2019-07-24 stsp goto done;
6290 0ebf8283 2019-07-24 stsp if (new_id) {
6291 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6293 0ebf8283 2019-07-24 stsp goto done;
6296 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6297 0ebf8283 2019-07-24 stsp if (new_id_str)
6298 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6300 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6301 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6302 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6303 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6304 0ebf8283 2019-07-24 stsp goto done;
6306 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6308 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6310 0ebf8283 2019-07-24 stsp goto done;
6313 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6314 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6315 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6316 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6317 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6319 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6320 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6321 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6329 0ebf8283 2019-07-24 stsp free(old_id_str);
6330 0ebf8283 2019-07-24 stsp free(new_id_str);
6331 0ebf8283 2019-07-24 stsp return err;
6334 0ebf8283 2019-07-24 stsp static const struct got_error *
6335 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6336 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6337 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6338 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6340 0ebf8283 2019-07-24 stsp const struct got_error *err;
6341 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6342 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6344 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6345 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6346 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6348 0ebf8283 2019-07-24 stsp return err;
6351 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6353 0ebf8283 2019-07-24 stsp return err;
6355 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6356 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6357 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6358 0ebf8283 2019-07-24 stsp if (err) {
6359 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6360 0ebf8283 2019-07-24 stsp goto done;
6361 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6363 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6364 0ebf8283 2019-07-24 stsp free(new_commit_id);
6367 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6368 0ebf8283 2019-07-24 stsp return err;
6371 0ebf8283 2019-07-24 stsp static const struct got_error *
6372 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6373 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6375 0ebf8283 2019-07-24 stsp const struct got_error *error;
6376 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6378 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6380 0ebf8283 2019-07-24 stsp if (error)
6381 0ebf8283 2019-07-24 stsp return error;
6383 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6384 0ebf8283 2019-07-24 stsp if (error)
6385 0ebf8283 2019-07-24 stsp return error;
6387 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6388 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6389 0ebf8283 2019-07-24 stsp return error;
6392 0ebf8283 2019-07-24 stsp static const struct got_error *
6393 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6395 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6396 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6397 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6398 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6399 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6400 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6401 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6402 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6403 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6404 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6405 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6406 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6407 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6408 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6409 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6410 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6411 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6412 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6413 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6414 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6415 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6417 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6418 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6419 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6421 0ebf8283 2019-07-24 stsp while ((ch = getopt(argc, argv, "acF:")) != -1) {
6422 0ebf8283 2019-07-24 stsp switch (ch) {
6424 0ebf8283 2019-07-24 stsp abort_edit = 1;
6427 0ebf8283 2019-07-24 stsp continue_edit = 1;
6430 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6433 0ebf8283 2019-07-24 stsp usage_histedit();
6434 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6438 0ebf8283 2019-07-24 stsp argc -= optind;
6439 0ebf8283 2019-07-24 stsp argv += optind;
6441 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6442 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6443 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6444 0ebf8283 2019-07-24 stsp err(1, "pledge");
6446 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6447 0ebf8283 2019-07-24 stsp usage_histedit();
6448 0ebf8283 2019-07-24 stsp if (argc != 0)
6449 0ebf8283 2019-07-24 stsp usage_histedit();
6452 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6453 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6454 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6455 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6456 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6457 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6460 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6461 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6462 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6463 0ebf8283 2019-07-24 stsp goto done;
6465 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6466 0ebf8283 2019-07-24 stsp if (error)
6467 0ebf8283 2019-07-24 stsp goto done;
6469 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6471 0ebf8283 2019-07-24 stsp if (error != NULL)
6472 0ebf8283 2019-07-24 stsp goto done;
6474 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6475 0ebf8283 2019-07-24 stsp if (error)
6476 0ebf8283 2019-07-24 stsp goto done;
6477 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6478 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6479 0ebf8283 2019-07-24 stsp goto done;
6482 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6483 0ebf8283 2019-07-24 stsp if (error)
6484 0ebf8283 2019-07-24 stsp goto done;
6486 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6487 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6488 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6489 3e3a69f1 2019-07-25 stsp worktree, repo);
6490 0ebf8283 2019-07-24 stsp if (error)
6491 0ebf8283 2019-07-24 stsp goto done;
6492 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6493 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6494 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6495 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6496 0ebf8283 2019-07-24 stsp if (error)
6497 0ebf8283 2019-07-24 stsp goto done;
6498 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6499 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6500 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6501 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6502 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6503 0ebf8283 2019-07-24 stsp goto done;
6506 0ebf8283 2019-07-24 stsp if (continue_edit) {
6507 0ebf8283 2019-07-24 stsp char *path;
6509 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6510 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6511 0ebf8283 2019-07-24 stsp goto done;
6514 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6515 0ebf8283 2019-07-24 stsp if (error)
6516 0ebf8283 2019-07-24 stsp goto done;
6518 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6519 0ebf8283 2019-07-24 stsp free(path);
6520 0ebf8283 2019-07-24 stsp if (error)
6521 0ebf8283 2019-07-24 stsp goto done;
6523 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6524 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6525 3e3a69f1 2019-07-25 stsp worktree, repo);
6526 0ebf8283 2019-07-24 stsp if (error)
6527 0ebf8283 2019-07-24 stsp goto done;
6529 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6530 0ebf8283 2019-07-24 stsp if (error)
6531 0ebf8283 2019-07-24 stsp goto done;
6533 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6534 0ebf8283 2019-07-24 stsp head_commit_id);
6535 0ebf8283 2019-07-24 stsp if (error)
6536 0ebf8283 2019-07-24 stsp goto done;
6537 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6538 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6539 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6540 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6541 3aac7cf7 2019-07-25 stsp goto done;
6543 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6544 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6545 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6546 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6547 0ebf8283 2019-07-24 stsp commit = NULL;
6548 0ebf8283 2019-07-24 stsp if (error)
6549 0ebf8283 2019-07-24 stsp goto done;
6551 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6552 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6553 0ebf8283 2019-07-24 stsp goto done;
6556 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6557 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6558 0ebf8283 2019-07-24 stsp if (error != NULL)
6559 0ebf8283 2019-07-24 stsp goto done;
6561 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6562 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6563 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6564 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6565 c7d20a3f 2019-07-30 stsp goto done;
6568 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6569 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6570 bfce7f83 2019-07-27 stsp branch = NULL;
6571 0ebf8283 2019-07-24 stsp if (error)
6572 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 head_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);
6580 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6581 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6582 3aac7cf7 2019-07-25 stsp goto done;
6584 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6585 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6586 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6587 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6588 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6589 0ebf8283 2019-07-24 stsp commit = NULL;
6590 0ebf8283 2019-07-24 stsp if (error)
6591 0ebf8283 2019-07-24 stsp goto done;
6593 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6594 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6595 bfce7f83 2019-07-27 stsp if (error)
6596 bfce7f83 2019-07-27 stsp goto done;
6598 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6599 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6600 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6601 6ba2bea2 2019-07-27 stsp if (error) {
6602 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6603 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6604 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6605 0ebf8283 2019-07-24 stsp goto done;
6608 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6610 6ba2bea2 2019-07-27 stsp if (error) {
6611 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6612 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6613 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6614 0ebf8283 2019-07-24 stsp goto done;
6619 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6621 6ba2bea2 2019-07-27 stsp if (error) {
6622 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6623 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6624 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6625 0ebf8283 2019-07-24 stsp goto done;
6630 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6631 4ec14e60 2019-08-28 hiltjo if (error)
6632 0ebf8283 2019-07-24 stsp goto done;
6634 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6635 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6636 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6637 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6640 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6641 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6642 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6643 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6646 0ebf8283 2019-07-24 stsp error = histedit_commit(NULL, worktree,
6647 3e3a69f1 2019-07-25 stsp fileindex, tmp_branch, hle, repo);
6649 0ebf8283 2019-07-24 stsp if (error)
6650 0ebf8283 2019-07-24 stsp goto done;
6654 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6655 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6656 0ebf8283 2019-07-24 stsp if (error)
6657 0ebf8283 2019-07-24 stsp goto done;
6661 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6662 0ebf8283 2019-07-24 stsp hle->commit_id);
6663 0ebf8283 2019-07-24 stsp if (error)
6664 0ebf8283 2019-07-24 stsp goto done;
6665 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6666 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6668 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
6669 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
6670 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
6671 0ebf8283 2019-07-24 stsp if (error)
6672 0ebf8283 2019-07-24 stsp goto done;
6673 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6674 0ebf8283 2019-07-24 stsp commit = NULL;
6676 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6677 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6681 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6682 0ebf8283 2019-07-24 stsp char *id_str;
6683 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
6684 0ebf8283 2019-07-24 stsp if (error)
6685 0ebf8283 2019-07-24 stsp goto done;
6686 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
6688 0ebf8283 2019-07-24 stsp free(id_str);
6689 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6690 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
6691 3e3a69f1 2019-07-25 stsp fileindex);
6692 0ebf8283 2019-07-24 stsp goto done;
6695 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6696 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
6697 0ebf8283 2019-07-24 stsp if (error)
6698 0ebf8283 2019-07-24 stsp goto done;
6702 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
6703 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
6704 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
6705 0ebf8283 2019-07-24 stsp if (error)
6706 0ebf8283 2019-07-24 stsp goto done;
6709 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
6710 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
6711 0ebf8283 2019-07-24 stsp if (error)
6712 0ebf8283 2019-07-24 stsp goto done;
6713 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
6714 0ebf8283 2019-07-24 stsp "conflicts must be resolved before rebasing can continue");
6716 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
6717 3e3a69f1 2019-07-25 stsp branch, repo);
6719 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
6720 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
6721 0ebf8283 2019-07-24 stsp free(head_commit_id);
6722 0ebf8283 2019-07-24 stsp free(base_commit_id);
6723 0ebf8283 2019-07-24 stsp free(resume_commit_id);
6724 0ebf8283 2019-07-24 stsp if (commit)
6725 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6726 0ebf8283 2019-07-24 stsp if (branch)
6727 0ebf8283 2019-07-24 stsp got_ref_close(branch);
6728 0ebf8283 2019-07-24 stsp if (tmp_branch)
6729 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
6730 0ebf8283 2019-07-24 stsp if (worktree)
6731 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
6733 2822a352 2019-10-15 stsp got_repo_close(repo);
6734 2822a352 2019-10-15 stsp return error;
6737 2822a352 2019-10-15 stsp __dead static void
6738 2822a352 2019-10-15 stsp usage_integrate(void)
6740 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6744 2822a352 2019-10-15 stsp static const struct got_error *
6745 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
6747 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
6748 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
6749 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
6750 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6751 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
6752 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6753 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
6754 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6755 2822a352 2019-10-15 stsp int ch, did_something = 0;
6757 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6758 2822a352 2019-10-15 stsp switch (ch) {
6760 2822a352 2019-10-15 stsp usage_integrate();
6761 2822a352 2019-10-15 stsp /* NOTREACHED */
6765 2822a352 2019-10-15 stsp argc -= optind;
6766 2822a352 2019-10-15 stsp argv += optind;
6768 2822a352 2019-10-15 stsp if (argc != 1)
6769 2822a352 2019-10-15 stsp usage_integrate();
6770 2822a352 2019-10-15 stsp branch_arg = argv[0];
6772 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6773 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
6774 2822a352 2019-10-15 stsp err(1, "pledge");
6776 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
6777 2822a352 2019-10-15 stsp if (cwd == NULL) {
6778 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
6779 2822a352 2019-10-15 stsp goto done;
6782 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
6783 2822a352 2019-10-15 stsp if (error)
6784 2822a352 2019-10-15 stsp goto done;
6786 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
6787 2822a352 2019-10-15 stsp if (error)
6788 2822a352 2019-10-15 stsp goto done;
6790 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6792 2822a352 2019-10-15 stsp if (error != NULL)
6793 2822a352 2019-10-15 stsp goto done;
6795 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6796 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
6797 2822a352 2019-10-15 stsp if (error)
6798 2822a352 2019-10-15 stsp goto done;
6800 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6801 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
6802 2822a352 2019-10-15 stsp goto done;
6805 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6806 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
6807 2822a352 2019-10-15 stsp if (error)
6808 2822a352 2019-10-15 stsp goto done;
6810 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
6811 2822a352 2019-10-15 stsp if (refname == NULL) {
6812 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6813 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6814 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6815 2822a352 2019-10-15 stsp goto done;
6817 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
6818 2822a352 2019-10-15 stsp if (base_refname == NULL) {
6819 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
6820 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6821 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6822 2822a352 2019-10-15 stsp goto done;
6825 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
6826 2822a352 2019-10-15 stsp if (error)
6827 2822a352 2019-10-15 stsp goto done;
6829 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6830 2822a352 2019-10-15 stsp if (error)
6831 2822a352 2019-10-15 stsp goto done;
6833 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6834 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
6835 2822a352 2019-10-15 stsp "specified branch has already been integrated");
6836 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6837 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6838 2822a352 2019-10-15 stsp goto done;
6841 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6842 2822a352 2019-10-15 stsp if (error) {
6843 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
6844 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
6845 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
6846 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
6847 2822a352 2019-10-15 stsp goto done;
6850 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
6851 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
6852 2822a352 2019-10-15 stsp check_cancelled, NULL);
6853 2822a352 2019-10-15 stsp if (error)
6854 2822a352 2019-10-15 stsp goto done;
6856 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
6859 715dc77e 2019-08-03 stsp got_repo_close(repo);
6860 2822a352 2019-10-15 stsp if (worktree)
6861 2822a352 2019-10-15 stsp got_worktree_close(worktree);
6862 2822a352 2019-10-15 stsp free(cwd);
6863 2822a352 2019-10-15 stsp free(base_commit_id);
6864 2822a352 2019-10-15 stsp free(commit_id);
6865 2822a352 2019-10-15 stsp free(refname);
6866 2822a352 2019-10-15 stsp free(base_refname);
6867 715dc77e 2019-08-03 stsp return error;
6870 715dc77e 2019-08-03 stsp __dead static void
6871 715dc77e 2019-08-03 stsp usage_stage(void)
6873 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6874 f3055044 2019-08-07 stsp "[file-path ...]\n",
6875 715dc77e 2019-08-03 stsp getprogname());
6879 715dc77e 2019-08-03 stsp static const struct got_error *
6880 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
6881 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6882 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6883 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6885 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
6886 408b4ebc 2019-08-03 stsp char *id_str = NULL;
6888 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
6889 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
6890 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
6891 408b4ebc 2019-08-03 stsp return NULL;
6893 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
6894 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
6895 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
6897 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
6899 408b4ebc 2019-08-03 stsp return err;
6901 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
6902 408b4ebc 2019-08-03 stsp free(id_str);
6903 dc424a06 2019-08-07 stsp return NULL;
6906 dc424a06 2019-08-07 stsp static const struct got_error *
6907 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
6909 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
6910 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
6911 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
6912 715dc77e 2019-08-03 stsp char *cwd = NULL;
6913 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
6914 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
6915 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
6916 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
6917 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
6918 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
6920 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
6922 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6923 715dc77e 2019-08-03 stsp switch (ch) {
6925 408b4ebc 2019-08-03 stsp list_stage = 1;
6928 dc424a06 2019-08-07 stsp pflag = 1;
6931 dc424a06 2019-08-07 stsp patch_script_path = optarg;
6934 715dc77e 2019-08-03 stsp usage_stage();
6935 715dc77e 2019-08-03 stsp /* NOTREACHED */
6939 715dc77e 2019-08-03 stsp argc -= optind;
6940 715dc77e 2019-08-03 stsp argv += optind;
6942 715dc77e 2019-08-03 stsp #ifndef PROFILE
6943 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6944 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
6945 715dc77e 2019-08-03 stsp err(1, "pledge");
6947 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
6948 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
6949 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
6950 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
6952 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
6953 715dc77e 2019-08-03 stsp if (cwd == NULL) {
6954 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
6955 715dc77e 2019-08-03 stsp goto done;
6958 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
6959 715dc77e 2019-08-03 stsp if (error)
6960 715dc77e 2019-08-03 stsp goto done;
6962 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6964 715dc77e 2019-08-03 stsp if (error != NULL)
6965 715dc77e 2019-08-03 stsp goto done;
6967 dc424a06 2019-08-07 stsp if (patch_script_path) {
6968 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
6969 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
6970 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
6971 dc424a06 2019-08-07 stsp patch_script_path);
6972 dc424a06 2019-08-07 stsp goto done;
6975 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6976 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
6977 715dc77e 2019-08-03 stsp if (error)
6978 715dc77e 2019-08-03 stsp goto done;
6980 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6981 6d022e97 2019-08-04 stsp if (error)
6982 6d022e97 2019-08-04 stsp goto done;
6984 6d022e97 2019-08-04 stsp if (list_stage)
6985 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
6986 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
6988 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6989 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
6990 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
6991 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
6992 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6995 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6996 2e1f37b0 2019-08-08 stsp error == NULL)
6997 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6999 ad493afc 2019-08-03 stsp got_repo_close(repo);
7000 ad493afc 2019-08-03 stsp if (worktree)
7001 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
7002 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7003 ad493afc 2019-08-03 stsp free((char *)pe->path);
7004 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
7005 ad493afc 2019-08-03 stsp free(cwd);
7006 ad493afc 2019-08-03 stsp return error;
7009 ad493afc 2019-08-03 stsp __dead static void
7010 ad493afc 2019-08-03 stsp usage_unstage(void)
7012 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7013 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7014 ad493afc 2019-08-03 stsp getprogname());
7019 ad493afc 2019-08-03 stsp static const struct got_error *
7020 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7022 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7023 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7024 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7025 ad493afc 2019-08-03 stsp char *cwd = NULL;
7026 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7027 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7028 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7029 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7030 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7031 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7033 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7035 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7036 ad493afc 2019-08-03 stsp switch (ch) {
7038 2e1f37b0 2019-08-08 stsp pflag = 1;
7041 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7044 ad493afc 2019-08-03 stsp usage_unstage();
7045 ad493afc 2019-08-03 stsp /* NOTREACHED */
7049 ad493afc 2019-08-03 stsp argc -= optind;
7050 ad493afc 2019-08-03 stsp argv += optind;
7052 ad493afc 2019-08-03 stsp #ifndef PROFILE
7053 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7054 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7055 ad493afc 2019-08-03 stsp err(1, "pledge");
7057 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7058 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7060 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7061 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7062 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7063 ad493afc 2019-08-03 stsp goto done;
7066 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7067 ad493afc 2019-08-03 stsp if (error)
7068 ad493afc 2019-08-03 stsp goto done;
7070 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7072 ad493afc 2019-08-03 stsp if (error != NULL)
7073 ad493afc 2019-08-03 stsp goto done;
7075 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7076 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7077 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7078 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7079 2e1f37b0 2019-08-08 stsp patch_script_path);
7080 2e1f37b0 2019-08-08 stsp goto done;
7084 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7085 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7086 ad493afc 2019-08-03 stsp if (error)
7087 ad493afc 2019-08-03 stsp goto done;
7089 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7090 ad493afc 2019-08-03 stsp if (error)
7091 ad493afc 2019-08-03 stsp goto done;
7093 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7094 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7095 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7096 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7098 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7099 2e1f37b0 2019-08-08 stsp error == NULL)
7100 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7102 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7103 715dc77e 2019-08-03 stsp if (worktree)
7104 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7105 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7106 715dc77e 2019-08-03 stsp free((char *)pe->path);
7107 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7108 715dc77e 2019-08-03 stsp free(cwd);
7109 01073a5d 2019-08-22 stsp return error;
7112 01073a5d 2019-08-22 stsp __dead static void
7113 01073a5d 2019-08-22 stsp usage_cat(void)
7115 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7116 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7120 01073a5d 2019-08-22 stsp static const struct got_error *
7121 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7123 01073a5d 2019-08-22 stsp const struct got_error *err;
7124 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7126 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7128 01073a5d 2019-08-22 stsp return err;
7130 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7131 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7132 01073a5d 2019-08-22 stsp return err;
7135 01073a5d 2019-08-22 stsp static const struct got_error *
7136 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7138 01073a5d 2019-08-22 stsp const struct got_error *err;
7139 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7140 56e0773d 2019-11-28 stsp int nentries, i;
7142 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7144 01073a5d 2019-08-22 stsp return err;
7146 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7147 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7148 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7149 01073a5d 2019-08-22 stsp char *id_str;
7150 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7152 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7153 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7156 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7157 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7158 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7159 01073a5d 2019-08-22 stsp free(id_str);
7162 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7163 01073a5d 2019-08-22 stsp return err;
7166 01073a5d 2019-08-22 stsp static const struct got_error *
7167 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7169 01073a5d 2019-08-22 stsp const struct got_error *err;
7170 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7171 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7172 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7173 01073a5d 2019-08-22 stsp char *id_str = NULL;
7174 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7176 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7178 01073a5d 2019-08-22 stsp return err;
7180 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7182 01073a5d 2019-08-22 stsp goto done;
7184 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7185 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7186 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7187 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7188 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7189 01073a5d 2019-08-22 stsp char *pid_str;
7190 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7192 01073a5d 2019-08-22 stsp goto done;
7193 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7194 01073a5d 2019-08-22 stsp free(pid_str);
7196 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7197 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7198 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7200 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7201 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7202 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7204 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7205 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7206 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7208 01073a5d 2019-08-22 stsp free(id_str);
7209 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7210 01073a5d 2019-08-22 stsp return err;
7213 01073a5d 2019-08-22 stsp static const struct got_error *
7214 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7216 01073a5d 2019-08-22 stsp const struct got_error *err;
7217 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7218 01073a5d 2019-08-22 stsp char *id_str = NULL;
7219 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7221 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7223 01073a5d 2019-08-22 stsp return err;
7225 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7227 01073a5d 2019-08-22 stsp goto done;
7229 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7231 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7232 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7233 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7234 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7236 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7237 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7238 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7240 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7241 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7242 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7244 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7245 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7246 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7252 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7253 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7255 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7256 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7257 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7259 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7260 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7261 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7263 01073a5d 2019-08-22 stsp free(id_str);
7264 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7265 01073a5d 2019-08-22 stsp return err;
7268 01073a5d 2019-08-22 stsp static const struct got_error *
7269 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7271 01073a5d 2019-08-22 stsp const struct got_error *error;
7272 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7273 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7274 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7275 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7276 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7277 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7279 01073a5d 2019-08-22 stsp #ifndef PROFILE
7280 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7281 01073a5d 2019-08-22 stsp NULL) == -1)
7282 01073a5d 2019-08-22 stsp err(1, "pledge");
7285 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7286 01073a5d 2019-08-22 stsp switch (ch) {
7288 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7291 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7292 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7293 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7295 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7298 896e9b6f 2019-08-26 stsp force_path = 1;
7301 01073a5d 2019-08-22 stsp usage_cat();
7302 01073a5d 2019-08-22 stsp /* NOTREACHED */
7306 01073a5d 2019-08-22 stsp argc -= optind;
7307 01073a5d 2019-08-22 stsp argv += optind;
7309 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7310 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7311 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7312 01073a5d 2019-08-22 stsp goto done;
7314 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7315 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7316 01073a5d 2019-08-22 stsp goto done;
7317 01073a5d 2019-08-22 stsp if (worktree) {
7318 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7319 01073a5d 2019-08-22 stsp repo_path = strdup(
7320 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7321 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7322 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7323 01073a5d 2019-08-22 stsp goto done;
7328 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7329 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7330 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7331 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7334 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7335 01073a5d 2019-08-22 stsp free(repo_path);
7336 01073a5d 2019-08-22 stsp if (error != NULL)
7337 01073a5d 2019-08-22 stsp goto done;
7339 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7340 896e9b6f 2019-08-26 stsp if (error)
7341 896e9b6f 2019-08-26 stsp goto done;
7343 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7344 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7345 896e9b6f 2019-08-26 stsp error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7346 01073a5d 2019-08-22 stsp if (error)
7347 01073a5d 2019-08-22 stsp goto done;
7349 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7350 896e9b6f 2019-08-26 stsp if (force_path) {
7351 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7353 896e9b6f 2019-08-26 stsp if (error)
7356 896e9b6f 2019-08-26 stsp error = match_object_id(&id, &label, argv[i],
7357 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7358 896e9b6f 2019-08-26 stsp if (error) {
7359 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7360 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7362 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7363 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7364 896e9b6f 2019-08-26 stsp if (error)
7369 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7370 01073a5d 2019-08-22 stsp if (error)
7373 01073a5d 2019-08-22 stsp switch (obj_type) {
7374 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7375 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7377 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7378 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7380 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7381 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7383 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7384 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7387 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7390 01073a5d 2019-08-22 stsp if (error)
7392 01073a5d 2019-08-22 stsp free(label);
7393 01073a5d 2019-08-22 stsp label = NULL;
7395 01073a5d 2019-08-22 stsp id = NULL;
7399 01073a5d 2019-08-22 stsp free(label);
7401 896e9b6f 2019-08-26 stsp free(commit_id);
7402 01073a5d 2019-08-22 stsp if (worktree)
7403 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7404 01073a5d 2019-08-22 stsp if (repo) {
7405 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7406 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7407 01073a5d 2019-08-22 stsp if (error == NULL)
7408 01073a5d 2019-08-22 stsp error = repo_error;
7410 0ebf8283 2019-07-24 stsp return error;
