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>
4 93658fb9 2020-03-18 stsp * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
7 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
8 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
10 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 12463d8b 2019-12-13 stsp #include <fcntl.h>
28 12ce7a6c 2019-08-12 stsp #include <limits.h>
29 5c860e29 2018-03-12 stsp #include <locale.h>
30 818c7501 2019-07-11 stsp #include <ctype.h>
31 99437157 2018-11-11 stsp #include <signal.h>
32 5c860e29 2018-03-12 stsp #include <stdio.h>
33 5c860e29 2018-03-12 stsp #include <stdlib.h>
34 5c860e29 2018-03-12 stsp #include <string.h>
35 5c860e29 2018-03-12 stsp #include <unistd.h>
36 c09a553d 2018-03-12 stsp #include <libgen.h>
37 c0768b0f 2018-06-10 stsp #include <time.h>
38 33ad4cbe 2019-05-12 jcs #include <paths.h>
39 6841bf13 2019-11-29 kn #include <regex.h>
40 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 d2cdc636 2020-03-18 stsp #include <util.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 f42b1b34 2018-03-12 stsp #include "got_error.h"
45 f42b1b34 2018-03-12 stsp #include "got_object.h"
46 5261c201 2018-04-01 stsp #include "got_reference.h"
47 f42b1b34 2018-03-12 stsp #include "got_repository.h"
48 1dd54920 2019-05-11 stsp #include "got_path.h"
49 e6209546 2019-08-22 stsp #include "got_cancel.h"
50 c09a553d 2018-03-12 stsp #include "got_worktree.h"
51 79109fed 2018-03-27 stsp #include "got_diff.h"
52 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
53 6f23baec 2020-03-18 stsp #include "got_fetch.h"
54 404c43c4 2018-06-21 stsp #include "got_blame.h"
55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
58 5c860e29 2018-03-12 stsp #ifndef nitems
59 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
62 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
66 99437157 2018-11-11 stsp catch_sigint(int signo)
68 99437157 2018-11-11 stsp sigint_received = 1;
72 99437157 2018-11-11 stsp catch_sigpipe(int signo)
74 99437157 2018-11-11 stsp sigpipe_received = 1;
78 8cfb4057 2019-07-09 stsp struct got_cmd {
79 5c860e29 2018-03-12 stsp const char *cmd_name;
80 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
81 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
82 97b3a7be 2019-07-09 stsp const char *cmd_alias;
85 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
86 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
87 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
88 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
89 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
90 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
91 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
92 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
93 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
94 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
95 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
96 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
97 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
98 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
99 d00136be 2019-03-26 stsp __dead static void usage_add(void);
100 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
101 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
102 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
103 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
104 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
105 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
106 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
107 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
108 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
109 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
110 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
112 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
113 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
114 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
115 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
116 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
117 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
118 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
119 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
120 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
121 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
122 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
123 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
124 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
125 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
126 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
127 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
128 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
129 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
130 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
131 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
132 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
133 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
134 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
135 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
136 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
138 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
139 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
140 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
141 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
142 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
143 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
144 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
145 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
146 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
147 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
148 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
149 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
150 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
151 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
152 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
153 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
154 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
155 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
156 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
157 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
158 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
159 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
160 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
161 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
162 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
163 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
166 ce5b7c56 2019-07-09 stsp static void
167 ce5b7c56 2019-07-09 stsp list_commands(void)
171 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
172 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
173 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
174 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
176 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
180 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
182 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
183 5c860e29 2018-03-12 stsp unsigned int i;
185 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
186 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
187 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
188 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
191 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
193 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
194 5c860e29 2018-03-12 stsp switch (ch) {
202 ce5b7c56 2019-07-09 stsp usage(hflag);
203 5c860e29 2018-03-12 stsp /* NOTREACHED */
207 5c860e29 2018-03-12 stsp argc -= optind;
208 5c860e29 2018-03-12 stsp argv += optind;
209 1e70621d 2018-03-27 stsp optind = 0;
211 53ccebc2 2019-07-30 stsp if (Vflag) {
212 53ccebc2 2019-07-30 stsp got_version_print_str();
216 5c860e29 2018-03-12 stsp if (argc <= 0)
217 ce5b7c56 2019-07-09 stsp usage(hflag);
219 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
220 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
222 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
223 d7d4f210 2018-03-12 stsp const struct got_error *error;
225 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
227 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
228 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
232 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
234 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
235 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
236 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
237 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
238 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
239 70015d7a 2019-11-08 stsp !(sigint_received &&
240 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
241 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
248 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
249 ce5b7c56 2019-07-09 stsp list_commands();
253 4ed7e80c 2018-05-20 stsp __dead static void
254 ce5b7c56 2019-07-09 stsp usage(int hflag)
256 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
257 53ccebc2 2019-07-30 stsp getprogname());
259 ce5b7c56 2019-07-09 stsp list_commands();
263 0266afb7 2019-01-04 stsp static const struct got_error *
264 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
266 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
267 e2ba3d07 2019-05-13 stsp const char *editor;
269 8920fa04 2019-08-18 stsp *abspath = NULL;
271 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
272 e2ba3d07 2019-05-13 stsp if (editor == NULL)
273 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
275 0ee7065d 2019-05-13 stsp if (editor) {
276 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
278 0ee7065d 2019-05-13 stsp return err;
281 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
282 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
283 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
284 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
287 e2ba3d07 2019-05-13 stsp return NULL;
290 e2ba3d07 2019-05-13 stsp static const struct got_error *
291 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
292 c530dc23 2019-07-23 stsp const char *worktree_path)
294 163ce85a 2019-05-13 stsp const struct got_error *err;
296 37c06ea4 2019-07-15 stsp #ifdef PROFILE
297 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
298 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
300 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
301 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
303 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
304 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
306 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
307 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
309 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
310 163ce85a 2019-05-13 stsp if (err != NULL)
311 163ce85a 2019-05-13 stsp return err;
313 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
314 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
316 0266afb7 2019-01-04 stsp return NULL;
319 2c7829a4 2019-06-17 stsp __dead static void
320 2c7829a4 2019-06-17 stsp usage_init(void)
322 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
326 2c7829a4 2019-06-17 stsp static const struct got_error *
327 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
329 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
330 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
333 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
334 2c7829a4 2019-06-17 stsp switch (ch) {
336 2c7829a4 2019-06-17 stsp usage_init();
337 2c7829a4 2019-06-17 stsp /* NOTREACHED */
341 2c7829a4 2019-06-17 stsp argc -= optind;
342 2c7829a4 2019-06-17 stsp argv += optind;
344 2c7829a4 2019-06-17 stsp #ifndef PROFILE
345 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
346 2c7829a4 2019-06-17 stsp err(1, "pledge");
348 2c7829a4 2019-06-17 stsp if (argc != 1)
349 bc20e173 2019-06-17 stsp usage_init();
351 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
352 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
353 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
355 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
357 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
358 2c7829a4 2019-06-17 stsp if (error &&
359 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
362 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
366 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
368 3ce1b845 2019-07-15 stsp free(repo_path);
369 3ce1b845 2019-07-15 stsp return error;
372 3ce1b845 2019-07-15 stsp __dead static void
373 3ce1b845 2019-07-15 stsp usage_import(void)
375 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
376 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
381 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
384 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
385 3ce1b845 2019-07-15 stsp int st = -1;
387 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
388 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
389 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
391 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
393 3ce1b845 2019-07-15 stsp goto doneediting;
395 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
396 3ce1b845 2019-07-15 stsp _exit(127);
399 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
400 3ce1b845 2019-07-15 stsp if (errno != EINTR)
403 3ce1b845 2019-07-15 stsp doneediting:
404 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
405 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
406 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
408 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
409 3ce1b845 2019-07-15 stsp errno = EINTR;
413 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
416 3ce1b845 2019-07-15 stsp static const struct got_error *
417 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
418 3ce1b845 2019-07-15 stsp const char *initial_content)
420 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
421 3ce1b845 2019-07-15 stsp char buf[1024];
422 3ce1b845 2019-07-15 stsp struct stat st, st2;
424 3ce1b845 2019-07-15 stsp int content_changed = 0;
425 3ce1b845 2019-07-15 stsp size_t len;
427 3ce1b845 2019-07-15 stsp *logmsg = NULL;
429 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
430 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
432 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
433 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
435 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
438 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
439 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
440 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
442 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
443 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
444 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
445 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
448 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
449 3ce1b845 2019-07-15 stsp if (fp == NULL) {
450 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
453 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
454 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
455 3ce1b845 2019-07-15 stsp content_changed = 1;
456 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
457 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
458 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
460 3ce1b845 2019-07-15 stsp fclose(fp);
462 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
463 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
467 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
468 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
469 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
472 3ce1b845 2019-07-15 stsp free(*logmsg);
473 3ce1b845 2019-07-15 stsp *logmsg = NULL;
475 3ce1b845 2019-07-15 stsp return err;
478 3ce1b845 2019-07-15 stsp static const struct got_error *
479 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
480 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
482 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
483 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
486 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
487 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
488 3ce1b845 2019-07-15 stsp branch_name) == -1)
489 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
491 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
492 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
496 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
499 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
501 3ce1b845 2019-07-15 stsp free(initial_content);
502 3ce1b845 2019-07-15 stsp return err;
505 3ce1b845 2019-07-15 stsp static const struct got_error *
506 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
508 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
509 3ce1b845 2019-07-15 stsp return NULL;
512 3ce1b845 2019-07-15 stsp static const struct got_error *
513 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
515 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
516 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
518 84792843 2019-08-09 stsp *author = NULL;
520 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
521 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
522 c9956ddf 2019-09-08 stsp if (name && email) {
523 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
524 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
525 aba9c984 2019-09-08 stsp return NULL;
528 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
529 84792843 2019-08-09 stsp if (got_author == NULL) {
530 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
531 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
532 c9956ddf 2019-09-08 stsp if (name && email) {
533 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
534 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
535 c9956ddf 2019-09-08 stsp return NULL;
537 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
538 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
541 aba9c984 2019-09-08 stsp *author = strdup(got_author);
542 aba9c984 2019-09-08 stsp if (*author == NULL)
543 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
546 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
547 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
549 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
550 84792843 2019-08-09 stsp got_author++;
551 aba9c984 2019-09-08 stsp if (*got_author != '<') {
552 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
555 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
556 84792843 2019-08-09 stsp got_author++;
557 aba9c984 2019-09-08 stsp if (*got_author != '@') {
558 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
561 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
562 84792843 2019-08-09 stsp got_author++;
563 84792843 2019-08-09 stsp if (*got_author != '>')
564 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
567 aba9c984 2019-09-08 stsp free(*author);
568 aba9c984 2019-09-08 stsp *author = NULL;
570 aba9c984 2019-09-08 stsp return err;
573 c9956ddf 2019-09-08 stsp static const struct got_error *
574 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
576 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
578 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
579 c9956ddf 2019-09-08 stsp if (homedir) {
580 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
581 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
584 c9956ddf 2019-09-08 stsp return NULL;
587 84792843 2019-08-09 stsp static const struct got_error *
588 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
590 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
591 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
592 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
593 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
594 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
595 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
596 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
597 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
599 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
600 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
601 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
603 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
605 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
606 3ce1b845 2019-07-15 stsp switch (ch) {
608 3ce1b845 2019-07-15 stsp branch_name = optarg;
611 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
612 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
613 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
618 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
619 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
620 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
626 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
628 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
634 b2b65d18 2019-08-22 stsp usage_import();
635 3ce1b845 2019-07-15 stsp /* NOTREACHED */
639 3ce1b845 2019-07-15 stsp argc -= optind;
640 3ce1b845 2019-07-15 stsp argv += optind;
642 3ce1b845 2019-07-15 stsp #ifndef PROFILE
643 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
645 3ce1b845 2019-07-15 stsp NULL) == -1)
646 3ce1b845 2019-07-15 stsp err(1, "pledge");
648 3ce1b845 2019-07-15 stsp if (argc != 1)
649 3ce1b845 2019-07-15 stsp usage_import();
651 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
652 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
653 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
654 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
656 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
657 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
660 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
664 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
666 aba9c984 2019-09-08 stsp return error;
669 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
670 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
671 e560b7e0 2019-11-28 stsp * an unintended typo.
673 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
674 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
676 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
677 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
681 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
682 3ce1b845 2019-07-15 stsp if (error) {
683 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
686 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
687 3ce1b845 2019-07-15 stsp "import target branch already exists");
691 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
692 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
693 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
696 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
699 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
700 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
702 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
703 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
706 8e158b01 2019-09-22 stsp free(logmsg);
707 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
708 ef293bdd 2019-10-21 stsp path_dir, refname);
709 ef293bdd 2019-10-21 stsp if (error) {
710 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
711 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
712 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
717 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
718 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
719 ef293bdd 2019-10-21 stsp if (logmsg_path)
720 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
724 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
725 ef293bdd 2019-10-21 stsp if (error) {
726 ef293bdd 2019-10-21 stsp if (logmsg_path)
727 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
731 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
732 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
733 ef293bdd 2019-10-21 stsp if (error) {
734 ef293bdd 2019-10-21 stsp if (logmsg_path)
735 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
739 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
740 ef293bdd 2019-10-21 stsp if (error) {
741 ef293bdd 2019-10-21 stsp if (logmsg_path)
742 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
746 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
747 ef293bdd 2019-10-21 stsp if (error) {
748 ef293bdd 2019-10-21 stsp if (logmsg_path)
749 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
753 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
754 ef293bdd 2019-10-21 stsp if (error) {
755 ef293bdd 2019-10-21 stsp if (logmsg_path)
756 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
760 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
761 3ce1b845 2019-07-15 stsp if (error) {
762 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
763 ef293bdd 2019-10-21 stsp if (logmsg_path)
764 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
768 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
769 3ce1b845 2019-07-15 stsp branch_ref);
770 ef293bdd 2019-10-21 stsp if (error) {
771 ef293bdd 2019-10-21 stsp if (logmsg_path)
772 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
776 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
777 ef293bdd 2019-10-21 stsp if (error) {
778 ef293bdd 2019-10-21 stsp if (logmsg_path)
779 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
784 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
785 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
787 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
788 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
789 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
790 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
791 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
792 8e158b01 2019-09-22 stsp free(logmsg);
793 ef293bdd 2019-10-21 stsp free(logmsg_path);
794 2c7829a4 2019-06-17 stsp free(repo_path);
795 3ce1b845 2019-07-15 stsp free(editor);
796 3ce1b845 2019-07-15 stsp free(refname);
797 3ce1b845 2019-07-15 stsp free(new_commit_id);
798 3ce1b845 2019-07-15 stsp free(id_str);
799 aba9c984 2019-09-08 stsp free(author);
800 c9956ddf 2019-09-08 stsp free(gitconfig_path);
801 3ce1b845 2019-07-15 stsp if (branch_ref)
802 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
803 3ce1b845 2019-07-15 stsp if (head_ref)
804 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
805 2c7829a4 2019-06-17 stsp return error;
808 93658fb9 2020-03-18 stsp __dead static void
809 93658fb9 2020-03-18 stsp usage_clone(void)
811 93658fb9 2020-03-18 stsp fprintf(stderr, "usage: %s clone repo-url\n", getprogname());
815 4ed7e80c 2018-05-20 stsp __dead static void
816 c09a553d 2018-03-12 stsp usage_checkout(void)
818 bb51a5b4 2020-01-13 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
819 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
823 7f47418f 2019-12-20 stsp static void
824 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning(void)
826 7f47418f 2019-12-20 stsp fprintf(stderr, "%s: warning: could not create a reference "
827 7f47418f 2019-12-20 stsp "to the work tree's base commit; the commit could be "
828 7f47418f 2019-12-20 stsp "garbage-collected by Git; making the repository "
829 7f47418f 2019-12-20 stsp "writable and running 'got update' will prevent this\n",
830 7f47418f 2019-12-20 stsp getprogname());
833 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg {
834 7f47418f 2019-12-20 stsp const char *worktree_path;
835 7f47418f 2019-12-20 stsp int had_base_commit_ref_error;
838 1ee397ad 2019-07-12 stsp static const struct got_error *
839 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
841 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg *a = arg;
843 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
844 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
845 7f47418f 2019-12-20 stsp return NULL;
847 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
848 7f47418f 2019-12-20 stsp a->had_base_commit_ref_error = 1;
849 1ee397ad 2019-07-12 stsp return NULL;
852 92a684f4 2018-03-12 stsp while (path[0] == '/')
855 7f47418f 2019-12-20 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
856 1ee397ad 2019-07-12 stsp return NULL;
859 99437157 2018-11-11 stsp static const struct got_error *
860 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
862 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
863 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
864 99437157 2018-11-11 stsp return NULL;
867 8069f636 2019-01-12 stsp static const struct got_error *
868 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
869 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
870 3aef623b 2019-10-15 stsp struct got_repository *repo)
872 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
873 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
875 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
876 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
878 36a38700 2019-05-10 stsp return err;
880 d5bea539 2019-05-13 stsp if (yca_id == NULL)
881 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
884 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
885 d5bea539 2019-05-13 stsp * and the work tree's base commit.
887 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
889 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
897 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
898 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
899 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
901 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
902 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
903 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
904 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
905 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
906 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
908 d5bea539 2019-05-13 stsp free(yca_id);
909 d5bea539 2019-05-13 stsp return NULL;
912 a367ff0f 2019-05-14 stsp static const struct got_error *
913 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
914 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
915 a51a74b3 2019-07-27 stsp struct got_repository *repo)
917 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
918 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
919 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
920 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
922 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
926 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
927 a51a74b3 2019-07-27 stsp is_same_branch = 1;
930 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
931 a51a74b3 2019-07-27 stsp is_same_branch = 1;
935 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
939 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
940 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
945 a367ff0f 2019-05-14 stsp struct got_object_id *id;
946 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
947 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
949 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
950 a367ff0f 2019-05-14 stsp err = NULL;
955 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
957 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
958 a367ff0f 2019-05-14 stsp is_same_branch = 1;
965 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
966 a367ff0f 2019-05-14 stsp free(head_commit_id);
967 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
968 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
969 a367ff0f 2019-05-14 stsp return err;
972 93658fb9 2020-03-18 stsp static const struct got_error *
973 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
974 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
976 61cc1a7a 2020-03-18 stsp int *did_something = arg, p;
977 d2cdc636 2020-03-18 stsp char scaled[FMT_SCALED_STRSIZE];
979 d2cdc636 2020-03-18 stsp if (message) {
980 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
981 d2cdc636 2020-03-18 stsp *did_something = 1;
982 668a20f6 2020-03-18 stsp } else if (packfile_size > 0 || nobj_indexed > 0) {
983 668a20f6 2020-03-18 stsp printf("\r");
984 baa9fea0 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled) == 0)
985 668a20f6 2020-03-18 stsp printf(" %*s fetched", FMT_SCALED_STRSIZE, scaled);
986 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
987 61cc1a7a 2020-03-18 stsp p = (nobj_indexed * 100) / nobj_total;
988 61cc1a7a 2020-03-18 stsp printf("; indexing %d%%", p);
990 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
991 61cc1a7a 2020-03-18 stsp p = (nobj_resolved * 100) / (nobj_total - nobj_loose);
992 61cc1a7a 2020-03-18 stsp printf("; resolving deltas %d%%", p);
994 d2cdc636 2020-03-18 stsp *did_something = 1;
996 531c3985 2020-03-18 stsp fflush(stdout);
997 531c3985 2020-03-18 stsp return NULL;
1000 531c3985 2020-03-18 stsp static const struct got_error *
1001 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1003 09838ffc 2020-03-18 stsp const struct got_error *err = NULL;
1004 09838ffc 2020-03-18 stsp const char *uri, *branch_filter, *dirname;
1005 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1006 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1007 bb64b798 2020-03-18 stsp const char *repo_path;
1008 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1009 d9b4d0c0 2020-03-18 stsp struct got_pathlist_head refs, symrefs;
1010 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1011 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1012 20eb36d0 2020-03-18 stsp int ch, fetchfd = -1;
1013 d2cdc636 2020-03-18 stsp int did_something = 0;
1015 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1016 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1018 93658fb9 2020-03-18 stsp while ((ch = getopt(argc, argv, "b:")) != -1) {
1019 93658fb9 2020-03-18 stsp switch (ch) {
1021 93658fb9 2020-03-18 stsp branch_filter = optarg;
1024 93658fb9 2020-03-18 stsp usage_clone();
1028 93658fb9 2020-03-18 stsp argc -= optind;
1029 93658fb9 2020-03-18 stsp argv += optind;
1030 93658fb9 2020-03-18 stsp uri = argv[0];
1031 93658fb9 2020-03-18 stsp if(argc == 1)
1032 93658fb9 2020-03-18 stsp dirname = NULL;
1033 93658fb9 2020-03-18 stsp else if(argc == 2)
1034 93658fb9 2020-03-18 stsp dirname = argv[1];
1036 93658fb9 2020-03-18 stsp usage_clone();
1038 09838ffc 2020-03-18 stsp err = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1039 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1041 09838ffc 2020-03-18 stsp goto done;
1043 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1044 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1045 bb64b798 2020-03-18 stsp err = got_error_from_errno("asprintf");
1046 bb64b798 2020-03-18 stsp goto done;
1048 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1050 bb64b798 2020-03-18 stsp repo_path = dirname;
1052 bb64b798 2020-03-18 stsp err = got_path_mkdir(repo_path);
1054 bb64b798 2020-03-18 stsp goto done;
1056 bb64b798 2020-03-18 stsp err = got_repo_init(repo_path);
1058 bb64b798 2020-03-18 stsp goto done;
1060 bb64b798 2020-03-18 stsp err = got_repo_open(&repo, repo_path, NULL);
1062 294dfefd 2020-03-18 stsp goto done;
1064 294dfefd 2020-03-18 stsp err = got_fetch_connect(&fetchfd, proto, host, port, server_path);
1066 bb64b798 2020-03-18 stsp goto done;
1068 294dfefd 2020-03-18 stsp printf("Connected to %s:%s\n", host, port);
1070 07e52fce 2020-03-18 stsp err = got_fetch_pack(&pack_hash, &refs, &symrefs, fetchfd,
1071 d2cdc636 2020-03-18 stsp repo, fetch_progress, &did_something);
1073 d9b4d0c0 2020-03-18 stsp goto done;
1074 d2cdc636 2020-03-18 stsp if (did_something)
1075 d2cdc636 2020-03-18 stsp printf("\n");
1077 d9b4d0c0 2020-03-18 stsp err = got_object_id_str(&id_str, pack_hash);
1079 d9b4d0c0 2020-03-18 stsp goto done;
1080 d9b4d0c0 2020-03-18 stsp printf("Fetched %s.pack\n", id_str);
1081 d9b4d0c0 2020-03-18 stsp free(id_str);
1083 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1084 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1085 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1086 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1087 d9b4d0c0 2020-03-18 stsp struct got_reference *ref;
1090 668a20f6 2020-03-18 stsp err = got_ref_alloc(&ref, refname, id);
1092 d9b4d0c0 2020-03-18 stsp goto done;
1095 668a20f6 2020-03-18 stsp err = got_object_id_str(&id_str, id);
1097 d9b4d0c0 2020-03-18 stsp goto done;
1098 d9b4d0c0 2020-03-18 stsp printf("%s: %s\n", got_ref_get_name(ref), id_str);
1099 d9b4d0c0 2020-03-18 stsp free(id_str);
1101 d9b4d0c0 2020-03-18 stsp err = got_ref_write(ref, repo);
1102 d9b4d0c0 2020-03-18 stsp got_ref_close(ref);
1104 d9b4d0c0 2020-03-18 stsp goto done;
1107 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1108 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1109 d9b4d0c0 2020-03-18 stsp struct got_reference *symref, *target_ref;
1110 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1111 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1113 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1116 d9b4d0c0 2020-03-18 stsp err = got_ref_open(&target_ref, repo, target, 0);
1117 d9b4d0c0 2020-03-18 stsp if (err) {
1118 d9b4d0c0 2020-03-18 stsp if (err->code == GOT_ERR_NOT_REF)
1120 d9b4d0c0 2020-03-18 stsp goto done;
1123 d9b4d0c0 2020-03-18 stsp err = got_ref_alloc_symref(&symref, GOT_REF_HEAD, target_ref);
1124 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1126 d9b4d0c0 2020-03-18 stsp goto done;
1128 d9b4d0c0 2020-03-18 stsp printf("Setting %s to %s\n", GOT_REF_HEAD,
1129 d9b4d0c0 2020-03-18 stsp got_ref_get_symref_target(symref));
1131 d9b4d0c0 2020-03-18 stsp err = got_ref_write(symref, repo);
1132 d9b4d0c0 2020-03-18 stsp got_ref_close(symref);
1137 20eb36d0 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && err == NULL)
1138 20eb36d0 2020-03-18 stsp err = got_error_from_errno("close");
1140 bb64b798 2020-03-18 stsp got_repo_close(repo);
1141 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1142 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1143 d9b4d0c0 2020-03-18 stsp free(pe->data);
1145 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1146 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1147 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1148 d9b4d0c0 2020-03-18 stsp free(pe->data);
1150 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1151 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1152 09838ffc 2020-03-18 stsp free(proto);
1153 09838ffc 2020-03-18 stsp free(host);
1154 09838ffc 2020-03-18 stsp free(port);
1155 09838ffc 2020-03-18 stsp free(server_path);
1156 09838ffc 2020-03-18 stsp free(repo_name);
1157 bb64b798 2020-03-18 stsp free(default_destdir);
1158 09838ffc 2020-03-18 stsp return err;
1161 4ed7e80c 2018-05-20 stsp static const struct got_error *
1162 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
1164 4b6c9460 2020-03-05 stsp static char msg[512];
1165 4b6c9460 2020-03-05 stsp const char *branch_name;
1167 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
1168 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
1170 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
1172 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
1173 4b6c9460 2020-03-05 stsp branch_name += 11;
1175 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
1176 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
1177 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
1178 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
1179 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
1180 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
1182 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
1185 4b6c9460 2020-03-05 stsp static const struct got_error *
1186 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
1188 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
1189 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
1190 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
1191 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
1192 c09a553d 2018-03-12 stsp char *repo_path = NULL;
1193 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
1194 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
1195 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
1196 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
1197 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
1198 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1199 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
1201 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1203 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1204 0bb8a95e 2018-03-12 stsp switch (ch) {
1206 08573d5b 2019-05-14 stsp branch_name = optarg;
1209 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
1210 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
1211 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1214 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
1217 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1220 2deda0b9 2019-03-07 stsp usage_checkout();
1221 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1225 0bb8a95e 2018-03-12 stsp argc -= optind;
1226 0bb8a95e 2018-03-12 stsp argv += optind;
1228 6715a751 2018-03-16 stsp #ifndef PROFILE
1229 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1230 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1231 c09a553d 2018-03-12 stsp err(1, "pledge");
1233 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1234 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1235 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1236 76089277 2018-04-01 stsp if (repo_path == NULL)
1237 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1238 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1239 76089277 2018-04-01 stsp if (cwd == NULL) {
1240 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1241 76089277 2018-04-01 stsp goto done;
1243 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1244 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1245 230a42bd 2019-05-11 jcs if (base == NULL) {
1246 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1247 230a42bd 2019-05-11 jcs path_prefix);
1251 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1252 230a42bd 2019-05-11 jcs if (base == NULL) {
1253 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1254 230a42bd 2019-05-11 jcs repo_path);
1258 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1259 c09a553d 2018-03-12 stsp if (dotgit)
1260 c09a553d 2018-03-12 stsp *dotgit = '\0';
1261 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1262 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1263 c09a553d 2018-03-12 stsp free(cwd);
1264 76089277 2018-04-01 stsp goto done;
1266 c09a553d 2018-03-12 stsp free(cwd);
1267 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1268 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1269 76089277 2018-04-01 stsp if (repo_path == NULL) {
1270 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1271 76089277 2018-04-01 stsp goto done;
1273 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1274 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1275 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1276 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1278 b4b3a7dd 2019-07-22 stsp goto done;
1280 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1281 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1282 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1283 b4b3a7dd 2019-07-22 stsp goto done;
1287 c09a553d 2018-03-12 stsp usage_checkout();
1289 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1290 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1292 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1293 c09a553d 2018-03-12 stsp if (error != NULL)
1294 c02c541e 2019-03-29 stsp goto done;
1296 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1297 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1298 c530dc23 2019-07-23 stsp if (error) {
1299 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1300 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1301 c530dc23 2019-07-23 stsp goto done;
1302 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1303 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
1304 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1305 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1306 c530dc23 2019-07-23 stsp goto done;
1310 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1311 c02c541e 2019-03-29 stsp if (error)
1312 c09a553d 2018-03-12 stsp goto done;
1314 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1315 c09a553d 2018-03-12 stsp if (error != NULL)
1316 c09a553d 2018-03-12 stsp goto done;
1318 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1319 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1320 c09a553d 2018-03-12 stsp goto done;
1322 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1323 c09a553d 2018-03-12 stsp if (error != NULL)
1324 c09a553d 2018-03-12 stsp goto done;
1326 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1327 e5dc7198 2018-12-29 stsp path_prefix);
1328 e5dc7198 2018-12-29 stsp if (error != NULL)
1329 e5dc7198 2018-12-29 stsp goto done;
1330 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1331 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1332 49520a32 2018-12-29 stsp goto done;
1335 8069f636 2019-01-12 stsp if (commit_id_str) {
1336 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1337 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1338 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1339 30837e32 2019-07-25 stsp if (error)
1340 8069f636 2019-01-12 stsp goto done;
1341 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1342 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1343 8069f636 2019-01-12 stsp if (error != NULL) {
1344 8069f636 2019-01-12 stsp free(commit_id);
1345 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
1346 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
1347 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
1349 8069f636 2019-01-12 stsp goto done;
1351 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1352 4b6c9460 2020-03-05 stsp if (error) {
1353 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
1354 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
1355 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
1357 45d344f6 2019-05-14 stsp goto done;
1359 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1360 8069f636 2019-01-12 stsp commit_id);
1361 8069f636 2019-01-12 stsp free(commit_id);
1362 8069f636 2019-01-12 stsp if (error)
1363 8069f636 2019-01-12 stsp goto done;
1366 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1367 f2ea84fa 2019-07-27 stsp if (error)
1368 f2ea84fa 2019-07-27 stsp goto done;
1369 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1370 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1371 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1372 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1373 c09a553d 2018-03-12 stsp if (error != NULL)
1374 c09a553d 2018-03-12 stsp goto done;
1376 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1377 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1378 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1380 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1381 8069f636 2019-01-12 stsp free(commit_id_str);
1382 76089277 2018-04-01 stsp free(repo_path);
1383 507dc3bb 2018-12-29 stsp free(worktree_path);
1384 507dc3bb 2018-12-29 stsp return error;
1387 507dc3bb 2018-12-29 stsp __dead static void
1388 507dc3bb 2018-12-29 stsp usage_update(void)
1390 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1391 507dc3bb 2018-12-29 stsp getprogname());
1395 1ee397ad 2019-07-12 stsp static const struct got_error *
1396 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1398 784955db 2019-01-12 stsp int *did_something = arg;
1400 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1401 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1402 1ee397ad 2019-07-12 stsp return NULL;
1404 1545c615 2019-02-10 stsp *did_something = 1;
1406 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1407 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1408 1ee397ad 2019-07-12 stsp return NULL;
1410 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1412 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1413 1ee397ad 2019-07-12 stsp return NULL;
1416 be7061eb 2018-12-30 stsp static const struct got_error *
1417 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1418 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1419 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1421 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1422 a1fb16d8 2019-05-24 stsp char *base_id_str;
1423 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1425 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1426 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1427 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1428 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1429 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1430 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1431 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1434 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1435 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1436 a1fb16d8 2019-05-24 stsp if (err) {
1437 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1438 a1fb16d8 2019-05-24 stsp return err;
1439 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1441 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1442 a1fb16d8 2019-05-24 stsp return NULL;
1444 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1445 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1446 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1448 a1fb16d8 2019-05-24 stsp return err;
1449 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1450 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1451 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1452 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1453 0ebf8283 2019-07-24 stsp return NULL;
1456 0ebf8283 2019-07-24 stsp static const struct got_error *
1457 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1459 0ebf8283 2019-07-24 stsp const struct got_error *err;
1460 0ebf8283 2019-07-24 stsp int in_progress;
1462 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1464 0ebf8283 2019-07-24 stsp return err;
1465 0ebf8283 2019-07-24 stsp if (in_progress)
1466 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1468 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1470 0ebf8283 2019-07-24 stsp return err;
1471 0ebf8283 2019-07-24 stsp if (in_progress)
1472 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1474 a1fb16d8 2019-05-24 stsp return NULL;
1477 a5edda0a 2019-07-27 stsp static const struct got_error *
1478 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1479 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1481 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1482 a5edda0a 2019-07-27 stsp char *path;
1485 a5edda0a 2019-07-27 stsp if (argc == 0) {
1486 a5edda0a 2019-07-27 stsp path = strdup("");
1487 a5edda0a 2019-07-27 stsp if (path == NULL)
1488 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1489 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1492 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1493 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1496 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1497 a5edda0a 2019-07-27 stsp if (err) {
1498 a5edda0a 2019-07-27 stsp free(path);
1503 a5edda0a 2019-07-27 stsp return err;
1506 a1fb16d8 2019-05-24 stsp static const struct got_error *
1507 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1509 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1510 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1511 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1512 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1513 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1514 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1515 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1516 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1517 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1518 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1519 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1521 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1523 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1524 507dc3bb 2018-12-29 stsp switch (ch) {
1526 024e9686 2019-05-14 stsp branch_name = optarg;
1529 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1530 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1531 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1534 2deda0b9 2019-03-07 stsp usage_update();
1535 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1539 507dc3bb 2018-12-29 stsp argc -= optind;
1540 507dc3bb 2018-12-29 stsp argv += optind;
1542 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1543 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1544 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1545 507dc3bb 2018-12-29 stsp err(1, "pledge");
1547 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1548 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1549 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1550 c4cdcb68 2019-04-03 stsp goto done;
1552 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1553 7d5807f4 2019-07-11 stsp if (error)
1554 7d5807f4 2019-07-11 stsp goto done;
1556 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1557 f2ea84fa 2019-07-27 stsp if (error)
1558 f2ea84fa 2019-07-27 stsp goto done;
1560 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1562 507dc3bb 2018-12-29 stsp if (error != NULL)
1563 507dc3bb 2018-12-29 stsp goto done;
1565 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1566 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1567 087fb88c 2019-08-04 stsp if (error)
1568 087fb88c 2019-08-04 stsp goto done;
1570 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1571 0266afb7 2019-01-04 stsp if (error)
1572 0266afb7 2019-01-04 stsp goto done;
1574 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1575 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1576 024e9686 2019-05-14 stsp if (error != NULL)
1577 024e9686 2019-05-14 stsp goto done;
1578 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1579 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1580 9c4b8182 2019-01-02 stsp if (error != NULL)
1581 9c4b8182 2019-01-02 stsp goto done;
1582 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1583 507dc3bb 2018-12-29 stsp if (error != NULL)
1584 507dc3bb 2018-12-29 stsp goto done;
1586 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1587 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1588 04f57cb3 2019-07-25 stsp free(commit_id_str);
1589 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1590 30837e32 2019-07-25 stsp if (error)
1591 a297e751 2019-07-11 stsp goto done;
1592 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1593 a297e751 2019-07-11 stsp if (error)
1594 507dc3bb 2018-12-29 stsp goto done;
1597 a1fb16d8 2019-05-24 stsp if (branch_name) {
1598 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1599 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1600 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1602 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1603 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1604 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1605 024e9686 2019-05-14 stsp goto done;
1607 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1608 024e9686 2019-05-14 stsp if (error)
1609 024e9686 2019-05-14 stsp goto done;
1610 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1612 a367ff0f 2019-05-14 stsp free(head_commit_id);
1613 024e9686 2019-05-14 stsp if (error != NULL)
1614 024e9686 2019-05-14 stsp goto done;
1615 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1616 a367ff0f 2019-05-14 stsp if (error)
1617 a367ff0f 2019-05-14 stsp goto done;
1618 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1619 024e9686 2019-05-14 stsp if (error)
1620 024e9686 2019-05-14 stsp goto done;
1622 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1623 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1624 a367ff0f 2019-05-14 stsp if (error != NULL) {
1625 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1626 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1627 024e9686 2019-05-14 stsp goto done;
1629 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1630 a367ff0f 2019-05-14 stsp if (error)
1631 a367ff0f 2019-05-14 stsp goto done;
1634 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1635 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1636 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1637 507dc3bb 2018-12-29 stsp commit_id);
1638 507dc3bb 2018-12-29 stsp if (error)
1639 507dc3bb 2018-12-29 stsp goto done;
1642 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1643 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1644 507dc3bb 2018-12-29 stsp if (error != NULL)
1645 507dc3bb 2018-12-29 stsp goto done;
1647 784955db 2019-01-12 stsp if (did_something)
1648 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1650 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1652 c09a553d 2018-03-12 stsp free(worktree_path);
1653 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1654 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1655 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1656 507dc3bb 2018-12-29 stsp free(commit_id);
1657 9c4b8182 2019-01-02 stsp free(commit_id_str);
1658 c09a553d 2018-03-12 stsp return error;
1661 f42b1b34 2018-03-12 stsp static const struct got_error *
1662 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1663 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1664 63035f9f 2019-10-06 stsp struct got_repository *repo)
1666 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1667 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1669 44392932 2019-08-25 stsp if (blob_id1) {
1670 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1672 44392932 2019-08-25 stsp goto done;
1675 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1677 44392932 2019-08-25 stsp goto done;
1679 44392932 2019-08-25 stsp while (path[0] == '/')
1681 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1682 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1684 44392932 2019-08-25 stsp if (blob1)
1685 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1686 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1687 44392932 2019-08-25 stsp return err;
1690 44392932 2019-08-25 stsp static const struct got_error *
1691 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1692 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1693 63035f9f 2019-10-06 stsp struct got_repository *repo)
1695 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1696 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1697 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1699 44392932 2019-08-25 stsp if (tree_id1) {
1700 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1702 44392932 2019-08-25 stsp goto done;
1705 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1707 0f2b3dca 2018-12-22 stsp goto done;
1709 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1710 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1711 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1712 44392932 2019-08-25 stsp while (path[0] == '/')
1714 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1715 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1717 79109fed 2018-03-27 stsp if (tree1)
1718 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1719 366e0a5f 2019-10-10 stsp if (tree2)
1720 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1721 44392932 2019-08-25 stsp return err;
1724 44392932 2019-08-25 stsp static const struct got_error *
1725 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1726 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1728 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1729 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1730 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1731 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1732 44392932 2019-08-25 stsp struct got_object_qid *qid;
1734 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1735 44392932 2019-08-25 stsp if (qid != NULL) {
1736 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1739 44392932 2019-08-25 stsp return err;
1742 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1743 44392932 2019-08-25 stsp int obj_type;
1744 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1746 44392932 2019-08-25 stsp goto done;
1747 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1748 44392932 2019-08-25 stsp if (err) {
1749 44392932 2019-08-25 stsp free(obj_id2);
1750 44392932 2019-08-25 stsp goto done;
1752 44392932 2019-08-25 stsp if (pcommit) {
1753 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1754 44392932 2019-08-25 stsp qid->id, path);
1755 44392932 2019-08-25 stsp if (err) {
1756 44392932 2019-08-25 stsp free(obj_id2);
1757 44392932 2019-08-25 stsp goto done;
1759 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1760 44392932 2019-08-25 stsp if (err) {
1761 44392932 2019-08-25 stsp free(obj_id2);
1762 44392932 2019-08-25 stsp goto done;
1765 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1766 44392932 2019-08-25 stsp if (err) {
1767 44392932 2019-08-25 stsp free(obj_id2);
1768 44392932 2019-08-25 stsp goto done;
1770 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1771 44392932 2019-08-25 stsp switch (obj_type) {
1772 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1773 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1776 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1777 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1781 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1784 44392932 2019-08-25 stsp free(obj_id1);
1785 44392932 2019-08-25 stsp free(obj_id2);
1787 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1788 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1790 44392932 2019-08-25 stsp goto done;
1791 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1792 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1794 44392932 2019-08-25 stsp goto done;
1795 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1796 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1799 0f2b3dca 2018-12-22 stsp free(id_str1);
1800 0f2b3dca 2018-12-22 stsp free(id_str2);
1801 44392932 2019-08-25 stsp if (pcommit)
1802 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1803 79109fed 2018-03-27 stsp return err;
1806 4bb494d5 2018-06-16 stsp static char *
1807 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1809 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1810 09867e48 2019-08-13 stsp char *p, *s;
1812 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1813 09867e48 2019-08-13 stsp if (tm == NULL)
1814 09867e48 2019-08-13 stsp return NULL;
1815 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1816 09867e48 2019-08-13 stsp if (s == NULL)
1817 09867e48 2019-08-13 stsp return NULL;
1818 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1820 6c281f94 2018-06-11 stsp *p = '\0';
1824 6841bf13 2019-11-29 kn static const struct got_error *
1825 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1826 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1828 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1829 6841bf13 2019-11-29 kn regmatch_t regmatch;
1830 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1832 6841bf13 2019-11-29 kn *have_match = 0;
1834 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1838 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1842 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1843 6841bf13 2019-11-29 kn *have_match = 1;
1845 6841bf13 2019-11-29 kn free(id_str);
1846 6841bf13 2019-11-29 kn free(logmsg);
1850 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1852 79109fed 2018-03-27 stsp static const struct got_error *
1853 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1854 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1855 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1857 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1858 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1859 6c281f94 2018-06-11 stsp char datebuf[26];
1860 45d799e2 2018-12-23 stsp time_t committer_time;
1861 45d799e2 2018-12-23 stsp const char *author, *committer;
1862 199a4027 2019-02-02 stsp char *refs_str = NULL;
1863 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1865 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1867 199a4027 2019-02-02 stsp const char *name;
1868 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1871 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1872 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1874 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1875 199a4027 2019-02-02 stsp name += 5;
1876 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1878 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1879 e34f9ed6 2019-02-02 stsp name += 6;
1880 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1881 141c2bff 2019-02-04 stsp name += 8;
1882 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1883 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1884 5d844a1e 2019-08-13 stsp if (err) {
1885 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1886 5d844a1e 2019-08-13 stsp return err;
1887 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1888 5d844a1e 2019-08-13 stsp err = NULL;
1889 5d844a1e 2019-08-13 stsp tag = NULL;
1892 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1893 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1895 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1896 a436ad14 2019-08-13 stsp if (cmp != 0)
1898 199a4027 2019-02-02 stsp s = refs_str;
1899 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1900 199a4027 2019-02-02 stsp name) == -1) {
1901 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1903 34ca4898 2019-08-13 stsp return err;
1907 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1909 8bf5b3c9 2018-03-17 stsp return err;
1911 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1912 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1913 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1914 832c249c 2018-06-10 stsp free(id_str);
1915 d3d493d7 2019-02-21 stsp id_str = NULL;
1916 d3d493d7 2019-02-21 stsp free(refs_str);
1917 d3d493d7 2019-02-21 stsp refs_str = NULL;
1918 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1919 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1920 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1921 09867e48 2019-08-13 stsp if (datestr)
1922 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1923 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1924 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1925 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1926 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1927 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1928 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1929 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1930 3fe1abad 2018-06-10 stsp int n = 1;
1931 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1932 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1933 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1935 a0603db2 2018-06-10 stsp return err;
1936 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1937 a0603db2 2018-06-10 stsp free(id_str);
1941 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1943 5943eee2 2019-08-13 stsp return err;
1945 621015ac 2018-07-23 stsp logmsg = logmsg0;
1947 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1949 832c249c 2018-06-10 stsp printf(" %s\n", line);
1950 832c249c 2018-06-10 stsp } while (line);
1951 621015ac 2018-07-23 stsp free(logmsg0);
1953 971751ac 2018-03-27 stsp if (show_patch) {
1954 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1955 971751ac 2018-03-27 stsp if (err == 0)
1956 971751ac 2018-03-27 stsp printf("\n");
1959 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1960 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1961 07862c20 2018-09-15 stsp return err;
1964 f42b1b34 2018-03-12 stsp static const struct got_error *
1965 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1966 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1967 48c8c60d 2020-01-27 stsp int diff_context, int limit, int log_branches,
1968 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1970 f42b1b34 2018-03-12 stsp const struct got_error *err;
1971 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1972 6841bf13 2019-11-29 kn regex_t regex;
1973 6841bf13 2019-11-29 kn int have_match;
1975 6841bf13 2019-11-29 kn if (search_pattern &&
1976 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1977 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1979 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
1981 f42b1b34 2018-03-12 stsp return err;
1982 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1983 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1985 fcc85cad 2018-07-22 stsp goto done;
1987 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1988 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1990 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1993 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
1994 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
1995 372ccdbb 2018-06-10 stsp if (err) {
1996 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
1997 9ba79e04 2018-06-11 stsp err = NULL;
2000 b43fbaa0 2018-06-11 stsp if (id == NULL)
2003 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
2007 6841bf13 2019-11-29 kn if (search_pattern) {
2008 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
2010 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2013 6841bf13 2019-11-29 kn if (have_match == 0) {
2014 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2019 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
2020 44392932 2019-08-25 stsp diff_context, refs);
2021 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
2022 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
2026 6841bf13 2019-11-29 kn if (search_pattern)
2027 6841bf13 2019-11-29 kn regfree(®ex);
2028 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
2029 f42b1b34 2018-03-12 stsp return err;
2032 4ed7e80c 2018-05-20 stsp __dead static void
2033 6f3d1eb0 2018-03-12 stsp usage_log(void)
2035 48c8c60d 2020-01-27 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
2036 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
2040 b1ebc001 2019-08-13 stsp static int
2041 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
2043 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
2044 b1ebc001 2019-08-13 stsp long long n;
2045 b1ebc001 2019-08-13 stsp const char *errstr;
2047 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
2048 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
2050 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
2051 b1ebc001 2019-08-13 stsp if (errstr != NULL)
2056 4ed7e80c 2018-05-20 stsp static const struct got_error *
2057 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
2059 f42b1b34 2018-03-12 stsp const struct got_error *error;
2060 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
2061 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
2062 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
2063 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
2064 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
2065 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
2066 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
2067 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
2068 64a96a6d 2018-04-01 stsp const char *errstr;
2069 199a4027 2019-02-02 stsp struct got_reflist_head refs;
2071 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
2073 6715a751 2018-03-16 stsp #ifndef PROFILE
2074 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2077 f42b1b34 2018-03-12 stsp err(1, "pledge");
2080 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
2082 48c8c60d 2020-01-27 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
2083 79109fed 2018-03-27 stsp switch (ch) {
2085 79109fed 2018-03-27 stsp show_patch = 1;
2088 d142fc45 2018-04-01 stsp start_commit = optarg;
2091 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2093 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2094 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2097 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
2098 64a96a6d 2018-04-01 stsp if (errstr != NULL)
2099 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
2102 48c8c60d 2020-01-27 stsp log_branches = 1;
2105 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2106 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
2107 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2109 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2112 6841bf13 2019-11-29 kn search_pattern = optarg;
2115 2deda0b9 2019-03-07 stsp usage_log();
2116 79109fed 2018-03-27 stsp /* NOTREACHED */
2120 79109fed 2018-03-27 stsp argc -= optind;
2121 79109fed 2018-03-27 stsp argv += optind;
2123 dc1edbfa 2019-11-29 kn if (diff_context == -1)
2124 dc1edbfa 2019-11-29 kn diff_context = 3;
2125 dc1edbfa 2019-11-29 kn else if (!show_patch)
2126 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
2128 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
2129 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
2130 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2131 04ca23f4 2018-07-16 stsp goto done;
2134 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2135 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2136 cffc0aa4 2019-02-05 stsp goto done;
2137 cffc0aa4 2019-02-05 stsp error = NULL;
2139 e7301579 2019-03-18 stsp if (argc == 0) {
2140 cbd1af7a 2019-03-18 stsp path = strdup("");
2141 e7301579 2019-03-18 stsp if (path == NULL) {
2142 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2143 cbd1af7a 2019-03-18 stsp goto done;
2145 e7301579 2019-03-18 stsp } else if (argc == 1) {
2146 e7301579 2019-03-18 stsp if (worktree) {
2147 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2149 e7301579 2019-03-18 stsp if (error)
2150 e7301579 2019-03-18 stsp goto done;
2152 e7301579 2019-03-18 stsp path = strdup(argv[0]);
2153 e7301579 2019-03-18 stsp if (path == NULL) {
2154 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2155 e7301579 2019-03-18 stsp goto done;
2159 cbd1af7a 2019-03-18 stsp usage_log();
2161 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
2162 5486daa2 2019-05-11 stsp repo_path = worktree ?
2163 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
2165 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
2166 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2167 cffc0aa4 2019-02-05 stsp goto done;
2170 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2171 d7d4f210 2018-03-12 stsp if (error != NULL)
2172 04ca23f4 2018-07-16 stsp goto done;
2174 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2175 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2176 c02c541e 2019-03-29 stsp if (error)
2177 c02c541e 2019-03-29 stsp goto done;
2179 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
2180 3235492e 2018-04-01 stsp struct got_reference *head_ref;
2181 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
2182 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
2183 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
2184 3235492e 2018-04-01 stsp if (error != NULL)
2185 3235492e 2018-04-01 stsp return error;
2186 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
2187 3235492e 2018-04-01 stsp got_ref_close(head_ref);
2188 3235492e 2018-04-01 stsp if (error != NULL)
2189 3235492e 2018-04-01 stsp return error;
2190 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2192 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
2193 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
2194 3235492e 2018-04-01 stsp if (error == NULL) {
2195 1caad61b 2019-02-01 stsp int obj_type;
2196 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
2197 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
2198 d1f2edc9 2018-06-13 stsp if (error != NULL)
2199 1caad61b 2019-02-01 stsp goto done;
2200 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
2201 1caad61b 2019-02-01 stsp if (error != NULL)
2202 1caad61b 2019-02-01 stsp goto done;
2203 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
2204 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
2205 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
2206 1caad61b 2019-02-01 stsp if (error != NULL)
2207 1caad61b 2019-02-01 stsp goto done;
2208 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
2209 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
2210 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2211 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2212 1caad61b 2019-02-01 stsp goto done;
2215 1caad61b 2019-02-01 stsp id = got_object_id_dup(
2216 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
2217 1caad61b 2019-02-01 stsp if (id == NULL)
2218 638f9024 2019-05-13 stsp error = got_error_from_errno(
2219 230a42bd 2019-05-11 jcs "got_object_id_dup");
2220 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2221 1caad61b 2019-02-01 stsp if (error)
2222 1caad61b 2019-02-01 stsp goto done;
2223 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2224 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2225 1caad61b 2019-02-01 stsp goto done;
2227 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2228 d1f2edc9 2018-06-13 stsp if (error != NULL)
2229 1caad61b 2019-02-01 stsp goto done;
2231 15a94983 2018-12-23 stsp if (commit == NULL) {
2232 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2233 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2234 d1f2edc9 2018-06-13 stsp if (error != NULL)
2235 d1f2edc9 2018-06-13 stsp return error;
2238 d7d4f210 2018-03-12 stsp if (error != NULL)
2239 04ca23f4 2018-07-16 stsp goto done;
2241 deeabeae 2019-08-27 stsp if (worktree) {
2242 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2244 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2245 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2246 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2247 deeabeae 2019-08-27 stsp goto done;
2249 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2252 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2253 04ca23f4 2018-07-16 stsp if (error != NULL)
2254 04ca23f4 2018-07-16 stsp goto done;
2255 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2256 04ca23f4 2018-07-16 stsp free(path);
2257 04ca23f4 2018-07-16 stsp path = in_repo_path;
2260 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2261 199a4027 2019-02-02 stsp if (error)
2262 199a4027 2019-02-02 stsp goto done;
2264 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2265 48c8c60d 2020-01-27 stsp diff_context, limit, log_branches, &refs);
2267 04ca23f4 2018-07-16 stsp free(path);
2268 04ca23f4 2018-07-16 stsp free(repo_path);
2269 04ca23f4 2018-07-16 stsp free(cwd);
2271 cffc0aa4 2019-02-05 stsp if (worktree)
2272 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2273 ad242220 2018-09-08 stsp if (repo) {
2274 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2275 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2276 ad242220 2018-09-08 stsp if (error == NULL)
2277 ad242220 2018-09-08 stsp error = repo_error;
2279 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2280 8bf5b3c9 2018-03-17 stsp return error;
2283 4ed7e80c 2018-05-20 stsp __dead static void
2284 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2286 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2287 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2291 b72f483a 2019-02-05 stsp struct print_diff_arg {
2292 b72f483a 2019-02-05 stsp struct got_repository *repo;
2293 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2294 b72f483a 2019-02-05 stsp int diff_context;
2295 3fc0c068 2019-02-10 stsp const char *id_str;
2296 3fc0c068 2019-02-10 stsp int header_shown;
2297 98eaaa12 2019-08-03 stsp int diff_staged;
2298 63035f9f 2019-10-06 stsp int ignore_whitespace;
2301 4ed7e80c 2018-05-20 stsp static const struct got_error *
2302 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2303 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2304 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2305 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2307 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2308 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2309 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2310 12463d8b 2019-12-13 stsp int fd = -1;
2311 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2312 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2313 b72f483a 2019-02-05 stsp struct stat sb;
2315 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2316 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2317 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2318 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2319 98eaaa12 2019-08-03 stsp return NULL;
2321 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2322 98eaaa12 2019-08-03 stsp return NULL;
2323 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2324 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2325 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2326 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2327 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2328 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2329 98eaaa12 2019-08-03 stsp return NULL;
2332 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2333 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2334 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2335 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2336 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2339 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2340 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2341 98eaaa12 2019-08-03 stsp switch (staged_status) {
2342 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2343 98eaaa12 2019-08-03 stsp label1 = path;
2344 98eaaa12 2019-08-03 stsp label2 = path;
2346 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2347 98eaaa12 2019-08-03 stsp label2 = path;
2349 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2350 98eaaa12 2019-08-03 stsp label1 = path;
2353 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2355 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2356 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2357 63035f9f 2019-10-06 stsp a->repo, stdout);
2360 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2361 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2362 4ce46740 2019-08-08 stsp char *id_str;
2363 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2366 4ce46740 2019-08-08 stsp goto done;
2367 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2369 4ce46740 2019-08-08 stsp goto done;
2370 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2371 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2372 4ce46740 2019-08-08 stsp free(id_str);
2373 4ce46740 2019-08-08 stsp goto done;
2375 4ce46740 2019-08-08 stsp free(id_str);
2376 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2377 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2379 4ce46740 2019-08-08 stsp goto done;
2382 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2383 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2384 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2385 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2386 2ec1f75b 2019-03-26 stsp goto done;
2389 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2390 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2391 12463d8b 2019-12-13 stsp if (fd == -1) {
2392 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2393 12463d8b 2019-12-13 stsp goto done;
2396 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2397 12463d8b 2019-12-13 stsp if (fd == -1) {
2398 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2399 12463d8b 2019-12-13 stsp goto done;
2402 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2403 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2404 2ec1f75b 2019-03-26 stsp goto done;
2406 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2407 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2408 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2409 2ec1f75b 2019-03-26 stsp goto done;
2413 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2415 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2416 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2418 b72f483a 2019-02-05 stsp if (blob1)
2419 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2420 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2421 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2422 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2423 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2424 b72f483a 2019-02-05 stsp free(abspath);
2425 927df6b7 2019-02-10 stsp return err;
2428 927df6b7 2019-02-10 stsp static const struct got_error *
2429 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2431 b00d56cd 2018-04-01 stsp const struct got_error *error;
2432 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2433 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2434 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2435 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2436 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2437 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2438 15a94983 2018-12-23 stsp int type1, type2;
2439 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2440 c0cc5c62 2018-10-18 stsp const char *errstr;
2441 927df6b7 2019-02-10 stsp char *path = NULL;
2443 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2444 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2445 25eccc22 2019-01-04 stsp NULL) == -1)
2446 b00d56cd 2018-04-01 stsp err(1, "pledge");
2449 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2450 b00d56cd 2018-04-01 stsp switch (ch) {
2452 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2454 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2455 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2458 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2459 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2460 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2462 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2465 98eaaa12 2019-08-03 stsp diff_staged = 1;
2468 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2471 2deda0b9 2019-03-07 stsp usage_diff();
2472 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2476 b00d56cd 2018-04-01 stsp argc -= optind;
2477 b00d56cd 2018-04-01 stsp argv += optind;
2479 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2480 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2481 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2482 b72f483a 2019-02-05 stsp goto done;
2484 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2485 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2486 927df6b7 2019-02-10 stsp goto done;
2487 927df6b7 2019-02-10 stsp if (argc <= 1) {
2488 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2489 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2490 927df6b7 2019-02-10 stsp goto done;
2492 b72f483a 2019-02-05 stsp if (repo_path)
2494 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2495 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2496 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2497 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2498 927df6b7 2019-02-10 stsp goto done;
2500 927df6b7 2019-02-10 stsp if (argc == 1) {
2501 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2503 927df6b7 2019-02-10 stsp if (error)
2504 927df6b7 2019-02-10 stsp goto done;
2506 927df6b7 2019-02-10 stsp path = strdup("");
2507 927df6b7 2019-02-10 stsp if (path == NULL) {
2508 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2509 927df6b7 2019-02-10 stsp goto done;
2512 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2513 98eaaa12 2019-08-03 stsp if (diff_staged)
2514 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2515 98eaaa12 2019-08-03 stsp "objects in repository");
2516 15a94983 2018-12-23 stsp id_str1 = argv[0];
2517 15a94983 2018-12-23 stsp id_str2 = argv[1];
2518 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2519 30db809c 2019-06-05 stsp repo_path =
2520 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2521 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2522 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2523 30db809c 2019-06-05 stsp goto done;
2527 b00d56cd 2018-04-01 stsp usage_diff();
2529 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2530 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2531 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2532 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2535 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2536 76089277 2018-04-01 stsp free(repo_path);
2537 b00d56cd 2018-04-01 stsp if (error != NULL)
2538 b00d56cd 2018-04-01 stsp goto done;
2540 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2541 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2542 c02c541e 2019-03-29 stsp if (error)
2543 c02c541e 2019-03-29 stsp goto done;
2545 30db809c 2019-06-05 stsp if (argc <= 1) {
2546 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2547 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2548 b72f483a 2019-02-05 stsp char *id_str;
2550 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2552 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2553 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2554 b72f483a 2019-02-05 stsp if (error)
2555 b72f483a 2019-02-05 stsp goto done;
2556 b72f483a 2019-02-05 stsp arg.repo = repo;
2557 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2558 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2559 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2560 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2561 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2562 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2564 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2565 72ea6654 2019-07-27 stsp if (error)
2566 72ea6654 2019-07-27 stsp goto done;
2568 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2569 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2570 b72f483a 2019-02-05 stsp free(id_str);
2571 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2572 b72f483a 2019-02-05 stsp goto done;
2575 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
2576 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2577 0adb7196 2019-08-11 stsp if (error)
2578 0adb7196 2019-08-11 stsp goto done;
2580 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
2581 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2582 0adb7196 2019-08-11 stsp if (error)
2583 0adb7196 2019-08-11 stsp goto done;
2585 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2586 15a94983 2018-12-23 stsp if (error)
2587 15a94983 2018-12-23 stsp goto done;
2589 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2590 15a94983 2018-12-23 stsp if (error)
2591 15a94983 2018-12-23 stsp goto done;
2593 15a94983 2018-12-23 stsp if (type1 != type2) {
2594 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2595 b00d56cd 2018-04-01 stsp goto done;
2598 15a94983 2018-12-23 stsp switch (type1) {
2599 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2600 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2601 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2603 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2604 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2605 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2607 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2608 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2609 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2610 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2613 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2616 5e70831e 2019-05-28 stsp free(label1);
2617 5e70831e 2019-05-28 stsp free(label2);
2618 15a94983 2018-12-23 stsp free(id1);
2619 15a94983 2018-12-23 stsp free(id2);
2620 927df6b7 2019-02-10 stsp free(path);
2621 b72f483a 2019-02-05 stsp if (worktree)
2622 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2623 ad242220 2018-09-08 stsp if (repo) {
2624 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2625 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2626 ad242220 2018-09-08 stsp if (error == NULL)
2627 ad242220 2018-09-08 stsp error = repo_error;
2629 b00d56cd 2018-04-01 stsp return error;
2632 404c43c4 2018-06-21 stsp __dead static void
2633 404c43c4 2018-06-21 stsp usage_blame(void)
2635 9270e621 2019-02-05 stsp fprintf(stderr,
2636 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2637 404c43c4 2018-06-21 stsp getprogname());
2641 28315671 2019-08-14 stsp struct blame_line {
2642 28315671 2019-08-14 stsp int annotated;
2643 28315671 2019-08-14 stsp char *id_str;
2644 82f6abb8 2019-08-14 stsp char *committer;
2645 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2648 28315671 2019-08-14 stsp struct blame_cb_args {
2649 28315671 2019-08-14 stsp struct blame_line *lines;
2650 28315671 2019-08-14 stsp int nlines;
2651 7ef28ff8 2019-08-14 stsp int nlines_prec;
2652 28315671 2019-08-14 stsp int lineno_cur;
2653 28315671 2019-08-14 stsp off_t *line_offsets;
2655 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2658 404c43c4 2018-06-21 stsp static const struct got_error *
2659 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2661 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2662 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2663 28315671 2019-08-14 stsp struct blame_line *bline;
2664 82f6abb8 2019-08-14 stsp char *line = NULL;
2665 28315671 2019-08-14 stsp size_t linesize = 0;
2666 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2667 28315671 2019-08-14 stsp off_t offset;
2668 bcb49d15 2019-08-14 stsp struct tm tm;
2669 bcb49d15 2019-08-14 stsp time_t committer_time;
2671 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2672 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2673 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2675 28315671 2019-08-14 stsp if (sigint_received)
2676 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2678 2839f8b9 2019-08-18 stsp if (lineno == -1)
2679 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2681 28315671 2019-08-14 stsp /* Annotate this line. */
2682 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2683 28315671 2019-08-14 stsp if (bline->annotated)
2684 28315671 2019-08-14 stsp return NULL;
2685 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2687 28315671 2019-08-14 stsp return err;
2689 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2691 82f6abb8 2019-08-14 stsp goto done;
2693 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2694 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2695 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2696 bcb49d15 2019-08-14 stsp goto done;
2699 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2700 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2701 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2702 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2703 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2704 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2705 82f6abb8 2019-08-14 stsp goto done;
2707 28315671 2019-08-14 stsp bline->annotated = 1;
2709 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2710 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2711 28315671 2019-08-14 stsp if (!bline->annotated)
2712 82f6abb8 2019-08-14 stsp goto done;
2714 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2715 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2716 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2717 82f6abb8 2019-08-14 stsp goto done;
2720 28315671 2019-08-14 stsp while (bline->annotated) {
2721 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2722 82f6abb8 2019-08-14 stsp size_t len;
2724 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2725 28315671 2019-08-14 stsp if (ferror(a->f))
2726 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2730 82f6abb8 2019-08-14 stsp committer = bline->committer;
2731 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2732 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2733 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2734 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2736 82f6abb8 2019-08-14 stsp *at = '\0';
2737 82f6abb8 2019-08-14 stsp len = strlen(committer);
2738 82f6abb8 2019-08-14 stsp if (len >= 9)
2739 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2741 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2743 28315671 2019-08-14 stsp *nl = '\0';
2744 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2745 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2747 28315671 2019-08-14 stsp a->lineno_cur++;
2748 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2751 82f6abb8 2019-08-14 stsp if (commit)
2752 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2753 28315671 2019-08-14 stsp free(line);
2754 28315671 2019-08-14 stsp return err;
2757 28315671 2019-08-14 stsp static const struct got_error *
2758 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2760 404c43c4 2018-06-21 stsp const struct got_error *error;
2761 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2762 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2763 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2764 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2765 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2766 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2767 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2768 28315671 2019-08-14 stsp struct blame_cb_args bca;
2769 28315671 2019-08-14 stsp int ch, obj_type, i;
2770 b02560ec 2019-08-19 stsp size_t filesize;
2772 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2774 404c43c4 2018-06-21 stsp #ifndef PROFILE
2775 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2776 36e2fb66 2019-01-04 stsp NULL) == -1)
2777 404c43c4 2018-06-21 stsp err(1, "pledge");
2780 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2781 404c43c4 2018-06-21 stsp switch (ch) {
2783 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2786 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2787 66bea077 2018-08-02 stsp if (repo_path == NULL)
2788 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2790 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2793 2deda0b9 2019-03-07 stsp usage_blame();
2794 404c43c4 2018-06-21 stsp /* NOTREACHED */
2798 404c43c4 2018-06-21 stsp argc -= optind;
2799 404c43c4 2018-06-21 stsp argv += optind;
2801 a39318fd 2018-08-02 stsp if (argc == 1)
2802 404c43c4 2018-06-21 stsp path = argv[0];
2804 404c43c4 2018-06-21 stsp usage_blame();
2806 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2807 66bea077 2018-08-02 stsp if (cwd == NULL) {
2808 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2809 66bea077 2018-08-02 stsp goto done;
2811 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2812 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2813 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2814 66bea077 2018-08-02 stsp goto done;
2816 0c06baac 2019-02-05 stsp error = NULL;
2817 0c06baac 2019-02-05 stsp if (worktree) {
2818 0c06baac 2019-02-05 stsp repo_path =
2819 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2820 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2821 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2822 0c06baac 2019-02-05 stsp if (error)
2823 0c06baac 2019-02-05 stsp goto done;
2825 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2826 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2827 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2828 0c06baac 2019-02-05 stsp goto done;
2833 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2834 c02c541e 2019-03-29 stsp if (error != NULL)
2835 36e2fb66 2019-01-04 stsp goto done;
2837 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2838 c02c541e 2019-03-29 stsp if (error)
2839 404c43c4 2018-06-21 stsp goto done;
2841 0c06baac 2019-02-05 stsp if (worktree) {
2842 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2843 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2844 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2845 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2846 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2847 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2848 6efaaa2d 2019-02-05 stsp path) == -1) {
2849 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2850 0c06baac 2019-02-05 stsp goto done;
2852 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2855 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2857 0c06baac 2019-02-05 stsp if (error)
2858 66bea077 2018-08-02 stsp goto done;
2860 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2861 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2862 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
2863 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
2864 404c43c4 2018-06-21 stsp if (error != NULL)
2865 66bea077 2018-08-02 stsp goto done;
2866 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2867 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2868 404c43c4 2018-06-21 stsp if (error != NULL)
2869 66bea077 2018-08-02 stsp goto done;
2871 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2872 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2873 30837e32 2019-07-25 stsp if (error)
2874 66bea077 2018-08-02 stsp goto done;
2877 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2878 28315671 2019-08-14 stsp if (error)
2879 28315671 2019-08-14 stsp goto done;
2881 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2882 28315671 2019-08-14 stsp if (error)
2883 28315671 2019-08-14 stsp goto done;
2885 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2886 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2887 28315671 2019-08-14 stsp goto done;
2890 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2891 28315671 2019-08-14 stsp if (error)
2892 28315671 2019-08-14 stsp goto done;
2893 28315671 2019-08-14 stsp bca.f = got_opentemp();
2894 28315671 2019-08-14 stsp if (bca.f == NULL) {
2895 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2896 28315671 2019-08-14 stsp goto done;
2898 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2899 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2900 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2901 28315671 2019-08-14 stsp goto done;
2903 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2904 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2905 b02560ec 2019-08-19 stsp bca.nlines--;
2907 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2908 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2909 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2910 28315671 2019-08-14 stsp goto done;
2912 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2913 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2914 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2915 7ef28ff8 2019-08-14 stsp while (i > 0) {
2917 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2919 82f6abb8 2019-08-14 stsp bca.repo = repo;
2921 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2922 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2924 66bea077 2018-08-02 stsp free(in_repo_path);
2925 66bea077 2018-08-02 stsp free(repo_path);
2926 66bea077 2018-08-02 stsp free(cwd);
2927 404c43c4 2018-06-21 stsp free(commit_id);
2928 28315671 2019-08-14 stsp free(obj_id);
2930 28315671 2019-08-14 stsp got_object_blob_close(blob);
2931 0c06baac 2019-02-05 stsp if (worktree)
2932 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2933 ad242220 2018-09-08 stsp if (repo) {
2934 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2935 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2936 ad242220 2018-09-08 stsp if (error == NULL)
2937 ad242220 2018-09-08 stsp error = repo_error;
2939 3affba96 2019-09-22 stsp if (bca.lines) {
2940 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2941 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2942 3affba96 2019-09-22 stsp free(bline->id_str);
2943 3affba96 2019-09-22 stsp free(bline->committer);
2945 3affba96 2019-09-22 stsp free(bca.lines);
2947 28315671 2019-08-14 stsp free(bca.line_offsets);
2948 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2949 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2950 404c43c4 2018-06-21 stsp return error;
2953 5de5890b 2018-10-18 stsp __dead static void
2954 5de5890b 2018-10-18 stsp usage_tree(void)
2956 c1669e2e 2019-01-09 stsp fprintf(stderr,
2957 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2958 5de5890b 2018-10-18 stsp getprogname());
2962 c1669e2e 2019-01-09 stsp static void
2963 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2964 c1669e2e 2019-01-09 stsp const char *root_path)
2966 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2967 848d6979 2019-08-12 stsp const char *modestr = "";
2968 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2970 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2971 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2974 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2975 63c5ca5d 2019-08-24 stsp modestr = "$";
2976 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2977 848d6979 2019-08-12 stsp modestr = "@";
2978 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2979 848d6979 2019-08-12 stsp modestr = "/";
2980 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2981 848d6979 2019-08-12 stsp modestr = "*";
2983 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2984 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2987 5de5890b 2018-10-18 stsp static const struct got_error *
2988 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2989 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2990 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2992 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2993 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2994 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2995 56e0773d 2019-11-28 stsp int nentries, i;
2997 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2999 5de5890b 2018-10-18 stsp goto done;
3001 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
3003 5de5890b 2018-10-18 stsp goto done;
3004 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
3005 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
3006 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
3007 5de5890b 2018-10-18 stsp char *id = NULL;
3009 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3012 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
3013 5de5890b 2018-10-18 stsp if (show_ids) {
3014 5de5890b 2018-10-18 stsp char *id_str;
3015 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
3016 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
3018 5de5890b 2018-10-18 stsp goto done;
3019 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
3020 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3021 5de5890b 2018-10-18 stsp free(id_str);
3022 5de5890b 2018-10-18 stsp goto done;
3024 5de5890b 2018-10-18 stsp free(id_str);
3026 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
3029 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
3030 c1669e2e 2019-01-09 stsp char *child_path;
3031 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
3032 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
3033 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
3034 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3035 c1669e2e 2019-01-09 stsp goto done;
3037 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
3038 c1669e2e 2019-01-09 stsp root_path, repo);
3039 c1669e2e 2019-01-09 stsp free(child_path);
3041 c1669e2e 2019-01-09 stsp goto done;
3046 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
3047 5de5890b 2018-10-18 stsp free(tree_id);
3048 5de5890b 2018-10-18 stsp return err;
3051 5de5890b 2018-10-18 stsp static const struct got_error *
3052 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
3054 5de5890b 2018-10-18 stsp const struct got_error *error;
3055 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
3056 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
3057 7a2c19d6 2019-02-05 stsp const char *path;
3058 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3059 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
3060 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
3061 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
3064 5de5890b 2018-10-18 stsp #ifndef PROFILE
3065 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3066 0f8d269b 2019-01-04 stsp NULL) == -1)
3067 5de5890b 2018-10-18 stsp err(1, "pledge");
3070 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
3071 5de5890b 2018-10-18 stsp switch (ch) {
3073 5de5890b 2018-10-18 stsp commit_id_str = optarg;
3076 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
3077 5de5890b 2018-10-18 stsp if (repo_path == NULL)
3078 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3080 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3083 5de5890b 2018-10-18 stsp show_ids = 1;
3086 c1669e2e 2019-01-09 stsp recurse = 1;
3089 2deda0b9 2019-03-07 stsp usage_tree();
3090 5de5890b 2018-10-18 stsp /* NOTREACHED */
3094 5de5890b 2018-10-18 stsp argc -= optind;
3095 5de5890b 2018-10-18 stsp argv += optind;
3097 5de5890b 2018-10-18 stsp if (argc == 1)
3098 5de5890b 2018-10-18 stsp path = argv[0];
3099 5de5890b 2018-10-18 stsp else if (argc > 1)
3100 5de5890b 2018-10-18 stsp usage_tree();
3102 7a2c19d6 2019-02-05 stsp path = NULL;
3104 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
3105 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
3106 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3107 9bf7a39b 2019-02-05 stsp goto done;
3109 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
3110 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3111 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3112 7a2c19d6 2019-02-05 stsp goto done;
3114 7a2c19d6 2019-02-05 stsp error = NULL;
3115 7a2c19d6 2019-02-05 stsp if (worktree) {
3116 7a2c19d6 2019-02-05 stsp repo_path =
3117 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3118 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
3119 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3120 7a2c19d6 2019-02-05 stsp if (error)
3121 7a2c19d6 2019-02-05 stsp goto done;
3123 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
3124 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
3125 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3126 7a2c19d6 2019-02-05 stsp goto done;
3131 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3132 5de5890b 2018-10-18 stsp if (error != NULL)
3133 c02c541e 2019-03-29 stsp goto done;
3135 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3136 c02c541e 2019-03-29 stsp if (error)
3137 5de5890b 2018-10-18 stsp goto done;
3139 9bf7a39b 2019-02-05 stsp if (path == NULL) {
3140 9bf7a39b 2019-02-05 stsp if (worktree) {
3141 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3142 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3143 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
3144 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
3145 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
3146 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3147 9bf7a39b 2019-02-05 stsp goto done;
3149 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3151 9bf7a39b 2019-02-05 stsp if (error)
3152 9bf7a39b 2019-02-05 stsp goto done;
3154 9bf7a39b 2019-02-05 stsp path = "/";
3156 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3157 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3158 9bf7a39b 2019-02-05 stsp if (error != NULL)
3159 9bf7a39b 2019-02-05 stsp goto done;
3162 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3163 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3164 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3165 5de5890b 2018-10-18 stsp if (error != NULL)
3166 5de5890b 2018-10-18 stsp goto done;
3167 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3168 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3169 5de5890b 2018-10-18 stsp if (error != NULL)
3170 5de5890b 2018-10-18 stsp goto done;
3172 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3173 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3174 30837e32 2019-07-25 stsp if (error)
3175 5de5890b 2018-10-18 stsp goto done;
3178 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3179 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3181 5de5890b 2018-10-18 stsp free(in_repo_path);
3182 5de5890b 2018-10-18 stsp free(repo_path);
3183 5de5890b 2018-10-18 stsp free(cwd);
3184 5de5890b 2018-10-18 stsp free(commit_id);
3185 7a2c19d6 2019-02-05 stsp if (worktree)
3186 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3187 5de5890b 2018-10-18 stsp if (repo) {
3188 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3189 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3190 5de5890b 2018-10-18 stsp if (error == NULL)
3191 5de5890b 2018-10-18 stsp error = repo_error;
3193 5de5890b 2018-10-18 stsp return error;
3196 6bad629b 2019-02-04 stsp __dead static void
3197 6bad629b 2019-02-04 stsp usage_status(void)
3199 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3203 b72f483a 2019-02-05 stsp static const struct got_error *
3204 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3205 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3206 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3207 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3209 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3210 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3211 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3212 b72f483a 2019-02-05 stsp return NULL;
3215 6bad629b 2019-02-04 stsp static const struct got_error *
3216 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3218 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3219 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3220 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3221 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3222 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3223 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3226 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3228 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3229 6bad629b 2019-02-04 stsp switch (ch) {
3231 2deda0b9 2019-03-07 stsp usage_status();
3232 6bad629b 2019-02-04 stsp /* NOTREACHED */
3236 6bad629b 2019-02-04 stsp argc -= optind;
3237 6bad629b 2019-02-04 stsp argv += optind;
3239 6bad629b 2019-02-04 stsp #ifndef PROFILE
3240 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3241 6bad629b 2019-02-04 stsp NULL) == -1)
3242 6bad629b 2019-02-04 stsp err(1, "pledge");
3244 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3245 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3246 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3247 927df6b7 2019-02-10 stsp goto done;
3250 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3251 927df6b7 2019-02-10 stsp if (error != NULL)
3252 a5edda0a 2019-07-27 stsp goto done;
3254 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3256 6bad629b 2019-02-04 stsp if (error != NULL)
3257 6bad629b 2019-02-04 stsp goto done;
3259 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3260 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3261 087fb88c 2019-08-04 stsp if (error)
3262 087fb88c 2019-08-04 stsp goto done;
3264 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3265 6bad629b 2019-02-04 stsp if (error)
3266 6bad629b 2019-02-04 stsp goto done;
3268 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3269 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3271 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3272 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3273 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3274 927df6b7 2019-02-10 stsp free(cwd);
3275 d0eebce4 2019-03-11 stsp return error;
3278 d0eebce4 2019-03-11 stsp __dead static void
3279 d0eebce4 2019-03-11 stsp usage_ref(void)
3281 d0eebce4 2019-03-11 stsp fprintf(stderr,
3282 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3283 d0eebce4 2019-03-11 stsp getprogname());
3287 d0eebce4 2019-03-11 stsp static const struct got_error *
3288 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3290 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3291 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3292 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3294 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3295 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3297 d0eebce4 2019-03-11 stsp return err;
3299 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3300 d0eebce4 2019-03-11 stsp char *refstr;
3301 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3302 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3303 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3304 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3305 d0eebce4 2019-03-11 stsp free(refstr);
3308 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3309 d0eebce4 2019-03-11 stsp return NULL;
3312 d0eebce4 2019-03-11 stsp static const struct got_error *
3313 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3315 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3316 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3318 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3320 d0eebce4 2019-03-11 stsp return err;
3322 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3323 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3324 d0eebce4 2019-03-11 stsp return err;
3327 d0eebce4 2019-03-11 stsp static const struct got_error *
3328 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3330 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3331 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3332 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3335 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3336 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3337 d1644381 2019-07-14 stsp * an unintended typo.
3339 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3340 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3342 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3344 d83d9d5c 2019-05-13 stsp if (err) {
3345 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3347 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3348 d83d9d5c 2019-05-13 stsp return err;
3349 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3351 d83d9d5c 2019-05-13 stsp return err;
3352 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3353 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3355 d83d9d5c 2019-05-13 stsp return err;
3358 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3360 d0eebce4 2019-03-11 stsp goto done;
3362 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3365 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3367 d1c1ae5f 2019-08-12 stsp return err;
3370 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3371 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3373 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3374 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3375 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3378 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3379 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3380 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3382 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3383 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3385 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3387 d1c1ae5f 2019-08-12 stsp return err;
3389 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3391 d1c1ae5f 2019-08-12 stsp goto done;
3393 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3395 d1c1ae5f 2019-08-12 stsp if (target_ref)
3396 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3398 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3399 d0eebce4 2019-03-11 stsp return err;
3402 d0eebce4 2019-03-11 stsp static const struct got_error *
3403 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3405 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3406 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3407 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3408 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3409 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3410 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3412 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3413 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3414 d0eebce4 2019-03-11 stsp switch (ch) {
3416 d0eebce4 2019-03-11 stsp delref = optarg;
3419 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3420 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3421 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3423 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3426 d0eebce4 2019-03-11 stsp do_list = 1;
3429 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3432 d0eebce4 2019-03-11 stsp usage_ref();
3433 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3437 d0eebce4 2019-03-11 stsp if (do_list && delref)
3438 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3440 d0eebce4 2019-03-11 stsp argc -= optind;
3441 d0eebce4 2019-03-11 stsp argv += optind;
3443 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3444 d1c1ae5f 2019-08-12 stsp if (create_symref)
3445 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3446 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3447 d0eebce4 2019-03-11 stsp if (argc > 0)
3448 d0eebce4 2019-03-11 stsp usage_ref();
3449 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3450 d0eebce4 2019-03-11 stsp usage_ref();
3452 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3453 e0b57350 2019-03-12 stsp if (do_list) {
3454 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3455 e0b57350 2019-03-12 stsp NULL) == -1)
3456 e0b57350 2019-03-12 stsp err(1, "pledge");
3458 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3459 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3460 e0b57350 2019-03-12 stsp err(1, "pledge");
3463 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3464 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3465 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3466 d0eebce4 2019-03-11 stsp goto done;
3469 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3470 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3471 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3472 d0eebce4 2019-03-11 stsp goto done;
3474 d0eebce4 2019-03-11 stsp error = NULL;
3475 d0eebce4 2019-03-11 stsp if (worktree) {
3476 d0eebce4 2019-03-11 stsp repo_path =
3477 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3478 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3479 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3480 d0eebce4 2019-03-11 stsp if (error)
3481 d0eebce4 2019-03-11 stsp goto done;
3483 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3484 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3485 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3486 d0eebce4 2019-03-11 stsp goto done;
3491 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3492 d0eebce4 2019-03-11 stsp if (error != NULL)
3493 d0eebce4 2019-03-11 stsp goto done;
3495 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3496 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3497 c02c541e 2019-03-29 stsp if (error)
3498 c02c541e 2019-03-29 stsp goto done;
3500 d0eebce4 2019-03-11 stsp if (do_list)
3501 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3502 d0eebce4 2019-03-11 stsp else if (delref)
3503 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3504 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3505 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3507 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3510 4e759de4 2019-06-26 stsp got_repo_close(repo);
3511 4e759de4 2019-06-26 stsp if (worktree)
3512 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3513 4e759de4 2019-06-26 stsp free(cwd);
3514 4e759de4 2019-06-26 stsp free(repo_path);
3515 4e759de4 2019-06-26 stsp return error;
3518 4e759de4 2019-06-26 stsp __dead static void
3519 4e759de4 2019-06-26 stsp usage_branch(void)
3521 4e759de4 2019-06-26 stsp fprintf(stderr,
3522 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
3523 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
3527 4e759de4 2019-06-26 stsp static const struct got_error *
3528 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3529 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3531 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3532 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3533 4e99b47e 2019-10-04 stsp char *refstr;
3535 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3536 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3537 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3538 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3540 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3542 4e99b47e 2019-10-04 stsp return err;
3543 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3544 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3545 4e99b47e 2019-10-04 stsp marker = "* ";
3547 4e99b47e 2019-10-04 stsp marker = "~ ";
3551 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3552 4e99b47e 2019-10-04 stsp refname += 11;
3553 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3554 4e99b47e 2019-10-04 stsp refname += 18;
3556 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3557 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3558 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3560 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3561 4e99b47e 2019-10-04 stsp free(refstr);
3562 4e99b47e 2019-10-04 stsp return NULL;
3565 4e99b47e 2019-10-04 stsp static const struct got_error *
3566 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3568 ad89fa31 2019-10-04 stsp const char *refname;
3570 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3571 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3573 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3575 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3576 ad89fa31 2019-10-04 stsp refname += 11;
3577 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3578 ad89fa31 2019-10-04 stsp refname += 18;
3580 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3582 ad89fa31 2019-10-04 stsp return NULL;
3585 ad89fa31 2019-10-04 stsp static const struct got_error *
3586 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3588 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3589 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3590 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3591 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3592 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3594 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3596 4e99b47e 2019-10-04 stsp if (worktree) {
3597 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3598 4e99b47e 2019-10-04 stsp worktree);
3600 4e99b47e 2019-10-04 stsp return err;
3602 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3603 4e99b47e 2019-10-04 stsp worktree);
3605 4e99b47e 2019-10-04 stsp return err;
3607 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3608 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3609 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3611 4e99b47e 2019-10-04 stsp return err;
3612 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3613 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3617 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3618 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3620 4e759de4 2019-06-26 stsp return err;
3622 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3623 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3625 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3626 4e759de4 2019-06-26 stsp return NULL;
3629 4e759de4 2019-06-26 stsp static const struct got_error *
3630 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3631 45cd4e47 2019-08-25 stsp const char *branch_name)
3633 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3634 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3635 4e759de4 2019-06-26 stsp char *refname;
3637 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3638 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3640 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3642 4e759de4 2019-06-26 stsp goto done;
3644 45cd4e47 2019-08-25 stsp if (worktree &&
3645 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3646 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3647 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3648 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3649 45cd4e47 2019-08-25 stsp goto done;
3652 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3655 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3656 4e759de4 2019-06-26 stsp free(refname);
3657 4e759de4 2019-06-26 stsp return err;
3660 4e759de4 2019-06-26 stsp static const struct got_error *
3661 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3662 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3664 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3665 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3666 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3669 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3670 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3671 d3f84d51 2019-07-11 stsp * an unintended typo.
3673 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3674 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3676 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3677 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3678 4e759de4 2019-06-26 stsp goto done;
3681 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3682 4e759de4 2019-06-26 stsp if (err == NULL) {
3683 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3684 4e759de4 2019-06-26 stsp goto done;
3685 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3686 4e759de4 2019-06-26 stsp goto done;
3688 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3690 4e759de4 2019-06-26 stsp goto done;
3692 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3695 4e759de4 2019-06-26 stsp got_ref_close(ref);
3696 4e759de4 2019-06-26 stsp free(base_refname);
3697 4e759de4 2019-06-26 stsp free(refname);
3698 4e759de4 2019-06-26 stsp return err;
3701 4e759de4 2019-06-26 stsp static const struct got_error *
3702 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3704 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3705 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3706 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3707 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3708 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
3709 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3710 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
3711 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
3712 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
3713 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
3714 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
3716 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
3718 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
3719 4e759de4 2019-06-26 stsp switch (ch) {
3721 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3724 4e759de4 2019-06-26 stsp delref = optarg;
3727 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3728 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3729 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3731 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3734 4e759de4 2019-06-26 stsp do_list = 1;
3737 da76fce2 2020-02-24 stsp do_update = 0;
3740 4e759de4 2019-06-26 stsp usage_branch();
3741 4e759de4 2019-06-26 stsp /* NOTREACHED */
3745 4e759de4 2019-06-26 stsp if (do_list && delref)
3746 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3748 4e759de4 2019-06-26 stsp argc -= optind;
3749 4e759de4 2019-06-26 stsp argv += optind;
3751 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3752 ad89fa31 2019-10-04 stsp do_show = 1;
3754 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3755 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3757 4e759de4 2019-06-26 stsp if (do_list || delref) {
3758 4e759de4 2019-06-26 stsp if (argc > 0)
3759 4e759de4 2019-06-26 stsp usage_branch();
3760 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3761 4e759de4 2019-06-26 stsp usage_branch();
3763 4e759de4 2019-06-26 stsp #ifndef PROFILE
3764 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3765 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3766 4e759de4 2019-06-26 stsp NULL) == -1)
3767 4e759de4 2019-06-26 stsp err(1, "pledge");
3769 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3770 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3771 4e759de4 2019-06-26 stsp err(1, "pledge");
3774 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3775 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3776 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3777 4e759de4 2019-06-26 stsp goto done;
3780 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3781 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3782 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3783 4e759de4 2019-06-26 stsp goto done;
3785 4e759de4 2019-06-26 stsp error = NULL;
3786 4e759de4 2019-06-26 stsp if (worktree) {
3787 4e759de4 2019-06-26 stsp repo_path =
3788 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3789 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3790 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3791 4e759de4 2019-06-26 stsp if (error)
3792 4e759de4 2019-06-26 stsp goto done;
3794 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3795 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3796 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3797 4e759de4 2019-06-26 stsp goto done;
3802 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3803 4e759de4 2019-06-26 stsp if (error != NULL)
3804 4e759de4 2019-06-26 stsp goto done;
3806 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3807 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3808 4e759de4 2019-06-26 stsp if (error)
3809 4e759de4 2019-06-26 stsp goto done;
3811 ad89fa31 2019-10-04 stsp if (do_show)
3812 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3813 ad89fa31 2019-10-04 stsp else if (do_list)
3814 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3815 4e759de4 2019-06-26 stsp else if (delref)
3816 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3818 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3819 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3820 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3821 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3822 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3823 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3824 a74f7e83 2019-11-10 stsp if (error)
3825 a74f7e83 2019-11-10 stsp goto done;
3826 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3827 da76fce2 2020-02-24 stsp if (error)
3828 da76fce2 2020-02-24 stsp goto done;
3829 da76fce2 2020-02-24 stsp if (worktree && do_update) {
3830 da76fce2 2020-02-24 stsp int did_something = 0;
3831 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
3833 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
3834 da76fce2 2020-02-24 stsp if (error)
3835 da76fce2 2020-02-24 stsp goto done;
3836 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
3837 da76fce2 2020-02-24 stsp worktree);
3838 da76fce2 2020-02-24 stsp if (error)
3839 da76fce2 2020-02-24 stsp goto done;
3840 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
3842 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
3843 da76fce2 2020-02-24 stsp goto done;
3845 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
3846 da76fce2 2020-02-24 stsp free(branch_refname);
3847 da76fce2 2020-02-24 stsp if (error)
3848 da76fce2 2020-02-24 stsp goto done;
3849 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
3851 da76fce2 2020-02-24 stsp if (error)
3852 da76fce2 2020-02-24 stsp goto done;
3853 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3854 da76fce2 2020-02-24 stsp commit_id);
3855 da76fce2 2020-02-24 stsp if (error)
3856 da76fce2 2020-02-24 stsp goto done;
3857 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
3858 da76fce2 2020-02-24 stsp repo, update_progress, &did_something,
3859 da76fce2 2020-02-24 stsp check_cancelled, NULL);
3860 da76fce2 2020-02-24 stsp if (error)
3861 da76fce2 2020-02-24 stsp goto done;
3862 da76fce2 2020-02-24 stsp if (did_something)
3863 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
3868 da76fce2 2020-02-24 stsp got_ref_close(ref);
3870 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3871 d0eebce4 2019-03-11 stsp if (worktree)
3872 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3873 d0eebce4 2019-03-11 stsp free(cwd);
3874 d0eebce4 2019-03-11 stsp free(repo_path);
3875 da76fce2 2020-02-24 stsp free(commit_id);
3876 da76fce2 2020-02-24 stsp free(commit_id_str);
3877 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
3878 da76fce2 2020-02-24 stsp free((char *)pe->path);
3879 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
3880 d00136be 2019-03-26 stsp return error;
3884 d00136be 2019-03-26 stsp __dead static void
3885 8e7bd50a 2019-08-22 stsp usage_tag(void)
3887 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3888 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
3889 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
3894 b8bad2ba 2019-08-23 stsp static const struct got_error *
3895 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3897 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3898 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3899 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3900 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3901 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3903 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3904 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3905 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3906 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3908 b8bad2ba 2019-08-23 stsp return err;
3909 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3912 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3915 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3916 b8bad2ba 2019-08-23 stsp free(re_id);
3919 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3920 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3923 b8bad2ba 2019-08-23 stsp while (se) {
3924 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3927 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3928 b8bad2ba 2019-08-23 stsp free(se_id);
3931 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3932 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3934 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3935 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3937 b8bad2ba 2019-08-23 stsp return err;
3938 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3941 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3946 b8bad2ba 2019-08-23 stsp return err;
3950 b8bad2ba 2019-08-23 stsp static const struct got_error *
3951 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3953 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3954 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3955 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3957 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3959 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
3961 8e7bd50a 2019-08-22 stsp return err;
3963 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3964 8e7bd50a 2019-08-22 stsp const char *refname;
3965 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3966 8e7bd50a 2019-08-22 stsp char datebuf[26];
3967 d4efa91b 2020-01-14 stsp const char *tagger;
3968 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3969 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3970 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3971 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
3973 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3974 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3976 8e7bd50a 2019-08-22 stsp refname += 10;
3977 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3978 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3979 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3982 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3983 8e7bd50a 2019-08-22 stsp free(refstr);
3985 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3988 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3989 d4efa91b 2020-01-14 stsp if (err) {
3990 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3994 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
3995 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
3996 d4efa91b 2020-01-14 stsp if (err) {
4000 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
4001 d4efa91b 2020-01-14 stsp tagger_time =
4002 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
4003 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
4009 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
4010 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
4011 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
4012 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
4016 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
4017 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
4018 2417344c 2019-08-23 stsp if (datestr)
4019 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
4020 d4efa91b 2020-01-14 stsp if (commit)
4021 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
4023 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
4024 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
4025 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
4028 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
4029 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
4032 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
4033 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
4036 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
4037 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
4044 8e7bd50a 2019-08-22 stsp free(id_str);
4045 d4efa91b 2020-01-14 stsp if (commit) {
4046 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
4049 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
4051 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
4052 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
4053 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
4054 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
4059 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
4061 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
4063 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
4064 8e7bd50a 2019-08-22 stsp } while (line);
4065 8e7bd50a 2019-08-22 stsp free(tagmsg0);
4068 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
4069 8e7bd50a 2019-08-22 stsp return NULL;
4072 8e7bd50a 2019-08-22 stsp static const struct got_error *
4073 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
4074 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
4076 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
4077 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
4078 f372d5cd 2019-10-21 stsp char *editor = NULL;
4079 8e7bd50a 2019-08-22 stsp int fd = -1;
4081 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
4082 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4083 8e7bd50a 2019-08-22 stsp goto done;
4086 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
4087 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
4088 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4089 8e7bd50a 2019-08-22 stsp goto done;
4092 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
4094 8e7bd50a 2019-08-22 stsp goto done;
4096 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
4097 8e7bd50a 2019-08-22 stsp close(fd);
4099 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
4101 8e7bd50a 2019-08-22 stsp goto done;
4102 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
4104 8e7bd50a 2019-08-22 stsp free(initial_content);
4105 8e7bd50a 2019-08-22 stsp free(template);
4106 8e7bd50a 2019-08-22 stsp free(editor);
4108 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
4109 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4110 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
4111 8e7bd50a 2019-08-22 stsp if (err) {
4112 8e7bd50a 2019-08-22 stsp free(*tagmsg);
4113 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
4116 8e7bd50a 2019-08-22 stsp return err;
4119 8e7bd50a 2019-08-22 stsp static const struct got_error *
4120 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
4121 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
4123 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
4124 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
4125 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
4126 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
4127 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
4128 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
4129 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
4132 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
4133 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
4134 8e7bd50a 2019-08-22 stsp * an unintended typo.
4136 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
4137 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
4139 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
4141 8e7bd50a 2019-08-22 stsp return err;
4143 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
4144 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
4146 8e7bd50a 2019-08-22 stsp goto done;
4148 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
4150 8e7bd50a 2019-08-22 stsp goto done;
4152 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
4153 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
4154 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
4155 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
4156 8e7bd50a 2019-08-22 stsp goto done;
4158 8e7bd50a 2019-08-22 stsp tag_name += 10;
4159 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
4160 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4161 8e7bd50a 2019-08-22 stsp goto done;
4164 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
4165 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4166 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
4167 8e7bd50a 2019-08-22 stsp goto done;
4168 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
4169 8e7bd50a 2019-08-22 stsp goto done;
4171 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
4172 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
4173 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
4174 f372d5cd 2019-10-21 stsp if (err) {
4175 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4176 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
4177 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4178 8e7bd50a 2019-08-22 stsp goto done;
4182 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
4183 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
4184 f372d5cd 2019-10-21 stsp if (err) {
4185 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4186 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4187 8e7bd50a 2019-08-22 stsp goto done;
4190 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
4191 f372d5cd 2019-10-21 stsp if (err) {
4192 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4193 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4194 8e7bd50a 2019-08-22 stsp goto done;
4197 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
4198 f372d5cd 2019-10-21 stsp if (err) {
4199 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4200 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4201 f372d5cd 2019-10-21 stsp goto done;
4204 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
4205 f372d5cd 2019-10-21 stsp if (err) {
4206 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4207 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4208 f372d5cd 2019-10-21 stsp goto done;
4210 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4212 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4213 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4214 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4215 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4216 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4217 f372d5cd 2019-10-21 stsp free(tag_id_str);
4219 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4220 8e7bd50a 2019-08-22 stsp free(commit_id);
4221 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4222 8e7bd50a 2019-08-22 stsp free(refname);
4223 8e7bd50a 2019-08-22 stsp free(tagmsg);
4224 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4225 aba9c984 2019-09-08 stsp free(tagger);
4226 8e7bd50a 2019-08-22 stsp return err;
4229 8e7bd50a 2019-08-22 stsp static const struct got_error *
4230 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4232 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4233 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4234 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4235 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4236 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4237 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4238 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4240 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
4241 8e7bd50a 2019-08-22 stsp switch (ch) {
4243 80106605 2020-02-24 stsp commit_id_arg = optarg;
4246 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4249 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4250 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4251 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4253 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4256 8e7bd50a 2019-08-22 stsp do_list = 1;
4259 8e7bd50a 2019-08-22 stsp usage_tag();
4260 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4264 8e7bd50a 2019-08-22 stsp argc -= optind;
4265 8e7bd50a 2019-08-22 stsp argv += optind;
4267 8e7bd50a 2019-08-22 stsp if (do_list) {
4268 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
4269 80106605 2020-02-24 stsp errx(1, "-c option can only be used when creating a tag");
4270 8e7bd50a 2019-08-22 stsp if (tagmsg)
4271 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
4272 8e7bd50a 2019-08-22 stsp if (argc > 0)
4273 8e7bd50a 2019-08-22 stsp usage_tag();
4274 80106605 2020-02-24 stsp } else if (argc != 1)
4275 8e7bd50a 2019-08-22 stsp usage_tag();
4277 a2887370 2019-08-23 stsp tag_name = argv[0];
4279 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4280 8e7bd50a 2019-08-22 stsp if (do_list) {
4281 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4282 8e7bd50a 2019-08-22 stsp NULL) == -1)
4283 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4285 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4286 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4287 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4290 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4291 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4292 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4293 8e7bd50a 2019-08-22 stsp goto done;
4296 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4297 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4298 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4299 8e7bd50a 2019-08-22 stsp goto done;
4301 8e7bd50a 2019-08-22 stsp error = NULL;
4302 8e7bd50a 2019-08-22 stsp if (worktree) {
4303 8e7bd50a 2019-08-22 stsp repo_path =
4304 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4305 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4306 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4307 8e7bd50a 2019-08-22 stsp if (error)
4308 8e7bd50a 2019-08-22 stsp goto done;
4310 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4311 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4312 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4313 8e7bd50a 2019-08-22 stsp goto done;
4318 8e7bd50a 2019-08-22 stsp if (do_list) {
4319 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4320 c9956ddf 2019-09-08 stsp if (error != NULL)
4321 c9956ddf 2019-09-08 stsp goto done;
4322 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4323 8e7bd50a 2019-08-22 stsp if (error)
4324 8e7bd50a 2019-08-22 stsp goto done;
4325 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4327 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4328 c9956ddf 2019-09-08 stsp if (error)
4329 c9956ddf 2019-09-08 stsp goto done;
4330 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4331 c9956ddf 2019-09-08 stsp if (error != NULL)
4332 c9956ddf 2019-09-08 stsp goto done;
4334 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4335 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4336 8e7bd50a 2019-08-22 stsp if (error)
4337 8e7bd50a 2019-08-22 stsp goto done;
4340 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4341 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4342 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4343 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4344 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4345 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4346 8e7bd50a 2019-08-22 stsp if (error)
4347 8e7bd50a 2019-08-22 stsp goto done;
4348 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4349 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4350 8e7bd50a 2019-08-22 stsp if (error)
4351 8e7bd50a 2019-08-22 stsp goto done;
4352 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4353 8e7bd50a 2019-08-22 stsp free(commit_id);
4354 8e7bd50a 2019-08-22 stsp if (error)
4355 8e7bd50a 2019-08-22 stsp goto done;
4358 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4359 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4363 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4364 8e7bd50a 2019-08-22 stsp if (worktree)
4365 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4366 8e7bd50a 2019-08-22 stsp free(cwd);
4367 8e7bd50a 2019-08-22 stsp free(repo_path);
4368 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4369 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4370 8e7bd50a 2019-08-22 stsp return error;
4373 8e7bd50a 2019-08-22 stsp __dead static void
4374 d00136be 2019-03-26 stsp usage_add(void)
4376 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4377 022fae89 2019-12-06 tracey getprogname());
4381 d00136be 2019-03-26 stsp static const struct got_error *
4382 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4384 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4386 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4387 4e68cba3 2019-11-23 stsp return NULL;
4390 4e68cba3 2019-11-23 stsp static const struct got_error *
4391 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4393 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4394 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4395 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4396 1dd54920 2019-05-11 stsp char *cwd = NULL;
4397 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4398 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4399 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4401 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4403 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4404 d00136be 2019-03-26 stsp switch (ch) {
4405 022fae89 2019-12-06 tracey case 'I':
4406 022fae89 2019-12-06 tracey no_ignores = 1;
4409 4e68cba3 2019-11-23 stsp can_recurse = 1;
4412 d00136be 2019-03-26 stsp usage_add();
4413 d00136be 2019-03-26 stsp /* NOTREACHED */
4417 d00136be 2019-03-26 stsp argc -= optind;
4418 d00136be 2019-03-26 stsp argv += optind;
4420 43012d58 2019-07-14 stsp #ifndef PROFILE
4421 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4422 43012d58 2019-07-14 stsp NULL) == -1)
4423 43012d58 2019-07-14 stsp err(1, "pledge");
4425 723c305c 2019-05-11 jcs if (argc < 1)
4426 d00136be 2019-03-26 stsp usage_add();
4428 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4429 d00136be 2019-03-26 stsp if (cwd == NULL) {
4430 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4431 d00136be 2019-03-26 stsp goto done;
4434 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4435 d00136be 2019-03-26 stsp if (error)
4436 d00136be 2019-03-26 stsp goto done;
4438 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4440 031a5338 2019-03-26 stsp if (error != NULL)
4441 031a5338 2019-03-26 stsp goto done;
4443 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4444 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4445 d00136be 2019-03-26 stsp if (error)
4446 d00136be 2019-03-26 stsp goto done;
4448 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4449 6d022e97 2019-08-04 stsp if (error)
4450 022fae89 2019-12-06 tracey goto done;
4452 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4453 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4454 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4455 6d022e97 2019-08-04 stsp goto done;
4459 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4460 4e68cba3 2019-11-23 stsp char *ondisk_path;
4461 4e68cba3 2019-11-23 stsp struct stat sb;
4462 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4463 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4464 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4465 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4466 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4467 4e68cba3 2019-11-23 stsp goto done;
4469 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4470 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4471 4e68cba3 2019-11-23 stsp free(ondisk_path);
4474 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4475 4e68cba3 2019-11-23 stsp ondisk_path);
4476 4e68cba3 2019-11-23 stsp free(ondisk_path);
4477 4e68cba3 2019-11-23 stsp goto done;
4479 4e68cba3 2019-11-23 stsp free(ondisk_path);
4480 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4481 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4482 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4483 4e68cba3 2019-11-23 stsp goto done;
4488 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4489 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4492 031a5338 2019-03-26 stsp got_repo_close(repo);
4493 d00136be 2019-03-26 stsp if (worktree)
4494 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4495 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4496 1dd54920 2019-05-11 stsp free((char *)pe->path);
4497 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4498 2ec1f75b 2019-03-26 stsp free(cwd);
4499 2ec1f75b 2019-03-26 stsp return error;
4502 2ec1f75b 2019-03-26 stsp __dead static void
4503 648e4ef7 2019-07-09 stsp usage_remove(void)
4505 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4506 f2a9dc41 2019-12-13 tracey getprogname());
4510 2a06fe5f 2019-08-24 stsp static const struct got_error *
4511 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4512 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4514 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4516 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4517 2a06fe5f 2019-08-24 stsp return NULL;
4518 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4519 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4520 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4521 2a06fe5f 2019-08-24 stsp return NULL;
4524 2ec1f75b 2019-03-26 stsp static const struct got_error *
4525 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4527 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4528 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4529 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4530 17ed4618 2019-06-02 stsp char *cwd = NULL;
4531 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4532 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4533 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4535 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4537 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4538 2ec1f75b 2019-03-26 stsp switch (ch) {
4540 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4542 70e3e7f5 2019-12-13 tracey case 'k':
4543 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4545 f2a9dc41 2019-12-13 tracey case 'R':
4546 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4549 f2a9dc41 2019-12-13 tracey usage_remove();
4550 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4554 2ec1f75b 2019-03-26 stsp argc -= optind;
4555 2ec1f75b 2019-03-26 stsp argv += optind;
4557 43012d58 2019-07-14 stsp #ifndef PROFILE
4558 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4559 43012d58 2019-07-14 stsp NULL) == -1)
4560 43012d58 2019-07-14 stsp err(1, "pledge");
4562 17ed4618 2019-06-02 stsp if (argc < 1)
4563 648e4ef7 2019-07-09 stsp usage_remove();
4565 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4566 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4567 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4568 2ec1f75b 2019-03-26 stsp goto done;
4570 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4571 2ec1f75b 2019-03-26 stsp if (error)
4572 2ec1f75b 2019-03-26 stsp goto done;
4574 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4577 2ec1f75b 2019-03-26 stsp goto done;
4579 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4580 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4581 2ec1f75b 2019-03-26 stsp if (error)
4582 2ec1f75b 2019-03-26 stsp goto done;
4584 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4585 6d022e97 2019-08-04 stsp if (error)
4586 6d022e97 2019-08-04 stsp goto done;
4588 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4589 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4590 f2a9dc41 2019-12-13 tracey struct stat sb;
4591 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4592 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4593 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4594 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4595 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4596 f2a9dc41 2019-12-13 tracey goto done;
4598 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4599 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4600 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4601 f2a9dc41 2019-12-13 tracey continue;
4603 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4604 f2a9dc41 2019-12-13 tracey ondisk_path);
4605 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4606 f2a9dc41 2019-12-13 tracey goto done;
4608 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4609 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4610 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4611 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4612 f2a9dc41 2019-12-13 tracey goto done;
4617 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4618 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4621 a129376b 2019-03-28 stsp got_repo_close(repo);
4622 a129376b 2019-03-28 stsp if (worktree)
4623 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4624 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4625 17ed4618 2019-06-02 stsp free((char *)pe->path);
4626 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4627 a129376b 2019-03-28 stsp free(cwd);
4628 a129376b 2019-03-28 stsp return error;
4631 a129376b 2019-03-28 stsp __dead static void
4632 a129376b 2019-03-28 stsp usage_revert(void)
4634 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4635 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4639 1ee397ad 2019-07-12 stsp static const struct got_error *
4640 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4642 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
4643 fb9704af 2020-01-27 stsp return NULL;
4645 a129376b 2019-03-28 stsp while (path[0] == '/')
4647 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4648 33aa809d 2019-08-08 stsp return NULL;
4651 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4652 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4653 33aa809d 2019-08-08 stsp const char *action;
4656 33aa809d 2019-08-08 stsp static const struct got_error *
4657 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4658 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4660 33aa809d 2019-08-08 stsp char *line = NULL;
4661 33aa809d 2019-08-08 stsp size_t linesize = 0;
4662 33aa809d 2019-08-08 stsp ssize_t linelen;
4664 33aa809d 2019-08-08 stsp switch (status) {
4665 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4666 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4668 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4669 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4671 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4672 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4673 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4674 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4675 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4676 33aa809d 2019-08-08 stsp printf("%s", line);
4677 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4678 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4679 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4680 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4681 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4684 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4687 33aa809d 2019-08-08 stsp return NULL;
4690 33aa809d 2019-08-08 stsp static const struct got_error *
4691 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4692 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4694 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4695 33aa809d 2019-08-08 stsp char *line = NULL;
4696 33aa809d 2019-08-08 stsp size_t linesize = 0;
4697 33aa809d 2019-08-08 stsp ssize_t linelen;
4698 33aa809d 2019-08-08 stsp int resp = ' ';
4699 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4701 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4703 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4705 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4706 33aa809d 2019-08-08 stsp a->action);
4708 33aa809d 2019-08-08 stsp return err;
4709 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4710 33aa809d 2019-08-08 stsp if (linelen == -1) {
4711 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4712 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4713 33aa809d 2019-08-08 stsp return NULL;
4715 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4717 33aa809d 2019-08-08 stsp *nl = '\0';
4718 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4719 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4720 33aa809d 2019-08-08 stsp printf("y\n");
4721 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4722 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4723 33aa809d 2019-08-08 stsp printf("n\n");
4724 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4725 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4726 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4727 33aa809d 2019-08-08 stsp printf("q\n");
4729 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4730 33aa809d 2019-08-08 stsp free(line);
4731 33aa809d 2019-08-08 stsp return NULL;
4734 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4735 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4736 33aa809d 2019-08-08 stsp a->action);
4738 33aa809d 2019-08-08 stsp return err;
4739 33aa809d 2019-08-08 stsp resp = getchar();
4740 33aa809d 2019-08-08 stsp if (resp == '\n')
4741 33aa809d 2019-08-08 stsp resp = getchar();
4742 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4743 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4744 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4745 33aa809d 2019-08-08 stsp resp = ' ';
4747 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4748 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4749 33aa809d 2019-08-08 stsp resp = ' ';
4753 33aa809d 2019-08-08 stsp if (resp == 'y')
4754 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4755 33aa809d 2019-08-08 stsp else if (resp == 'n')
4756 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4757 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4758 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4760 1ee397ad 2019-07-12 stsp return NULL;
4764 a129376b 2019-03-28 stsp static const struct got_error *
4765 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4767 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4768 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4769 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4770 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4771 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4772 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4773 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4774 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4775 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4776 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4778 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4780 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4781 a129376b 2019-03-28 stsp switch (ch) {
4783 33aa809d 2019-08-08 stsp pflag = 1;
4786 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4789 0f6d7415 2019-08-08 stsp can_recurse = 1;
4792 a129376b 2019-03-28 stsp usage_revert();
4793 a129376b 2019-03-28 stsp /* NOTREACHED */
4797 a129376b 2019-03-28 stsp argc -= optind;
4798 a129376b 2019-03-28 stsp argv += optind;
4800 43012d58 2019-07-14 stsp #ifndef PROFILE
4801 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4802 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4803 43012d58 2019-07-14 stsp err(1, "pledge");
4805 e20a8b6f 2019-06-04 stsp if (argc < 1)
4806 a129376b 2019-03-28 stsp usage_revert();
4807 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4808 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4810 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4811 a129376b 2019-03-28 stsp if (cwd == NULL) {
4812 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4813 a129376b 2019-03-28 stsp goto done;
4815 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4816 2ec1f75b 2019-03-26 stsp if (error)
4817 2ec1f75b 2019-03-26 stsp goto done;
4819 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4821 a129376b 2019-03-28 stsp if (error != NULL)
4822 a129376b 2019-03-28 stsp goto done;
4824 33aa809d 2019-08-08 stsp if (patch_script_path) {
4825 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4826 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4827 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4828 33aa809d 2019-08-08 stsp patch_script_path);
4829 33aa809d 2019-08-08 stsp goto done;
4832 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4833 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4834 a129376b 2019-03-28 stsp if (error)
4835 a129376b 2019-03-28 stsp goto done;
4837 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4838 6d022e97 2019-08-04 stsp if (error)
4839 6d022e97 2019-08-04 stsp goto done;
4841 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4842 0f6d7415 2019-08-08 stsp char *ondisk_path;
4843 0f6d7415 2019-08-08 stsp struct stat sb;
4844 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4845 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4846 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4847 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4848 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4849 0f6d7415 2019-08-08 stsp goto done;
4851 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4852 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4853 0f6d7415 2019-08-08 stsp free(ondisk_path);
4856 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4857 0f6d7415 2019-08-08 stsp ondisk_path);
4858 0f6d7415 2019-08-08 stsp free(ondisk_path);
4859 0f6d7415 2019-08-08 stsp goto done;
4861 0f6d7415 2019-08-08 stsp free(ondisk_path);
4862 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4863 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4864 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4865 0f6d7415 2019-08-08 stsp goto done;
4870 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4871 33aa809d 2019-08-08 stsp cpa.action = "revert";
4872 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4873 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4875 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4876 33aa809d 2019-08-08 stsp error == NULL)
4877 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4879 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4880 2ec1f75b 2019-03-26 stsp if (worktree)
4881 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4882 2ec1f75b 2019-03-26 stsp free(path);
4883 d00136be 2019-03-26 stsp free(cwd);
4884 6bad629b 2019-02-04 stsp return error;
4887 c4296144 2019-05-09 stsp __dead static void
4888 c4296144 2019-05-09 stsp usage_commit(void)
4890 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4891 5c1e53bc 2019-07-28 stsp getprogname());
4895 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4896 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4897 e2ba3d07 2019-05-13 stsp const char *editor;
4898 e0870e44 2019-05-13 stsp const char *worktree_path;
4899 76d98825 2019-06-03 stsp const char *branch_name;
4900 314a6357 2019-05-13 stsp const char *repo_path;
4901 e0870e44 2019-05-13 stsp char *logmsg_path;
4905 33ad4cbe 2019-05-12 jcs static const struct got_error *
4906 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4909 76d98825 2019-06-03 stsp char *initial_content = NULL;
4910 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4911 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4912 e0870e44 2019-05-13 stsp char *template = NULL;
4913 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4915 33ad4cbe 2019-05-12 jcs size_t len;
4917 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4918 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4919 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4920 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4921 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4922 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4923 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4924 33ad4cbe 2019-05-12 jcs return NULL;
4927 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4928 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4930 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4931 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4932 76d98825 2019-06-03 stsp a->branch_name) == -1)
4933 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4935 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4937 e0870e44 2019-05-13 stsp goto done;
4939 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4941 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4942 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4943 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4944 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4945 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4949 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4951 76d98825 2019-06-03 stsp free(initial_content);
4952 e0870e44 2019-05-13 stsp free(template);
4954 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4955 3ce1b845 2019-07-15 stsp if (err == NULL) {
4956 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4957 3ce1b845 2019-07-15 stsp if (err) {
4958 3ce1b845 2019-07-15 stsp free(*logmsg);
4959 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4962 33ad4cbe 2019-05-12 jcs return err;
4965 c4296144 2019-05-09 stsp static const struct got_error *
4966 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4968 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4969 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4970 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4971 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4972 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4973 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4974 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4975 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4976 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4977 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4979 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4980 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4982 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4983 c4296144 2019-05-09 stsp switch (ch) {
4985 c4296144 2019-05-09 stsp logmsg = optarg;
4988 c4296144 2019-05-09 stsp usage_commit();
4989 c4296144 2019-05-09 stsp /* NOTREACHED */
4993 c4296144 2019-05-09 stsp argc -= optind;
4994 c4296144 2019-05-09 stsp argv += optind;
4996 43012d58 2019-07-14 stsp #ifndef PROFILE
4997 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4998 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4999 43012d58 2019-07-14 stsp err(1, "pledge");
5001 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
5002 c4296144 2019-05-09 stsp if (cwd == NULL) {
5003 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5004 c4296144 2019-05-09 stsp goto done;
5006 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
5007 7d5807f4 2019-07-11 stsp if (error)
5008 7d5807f4 2019-07-11 stsp goto done;
5010 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5011 c4296144 2019-05-09 stsp if (error)
5012 a698f62e 2019-07-25 stsp goto done;
5013 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
5014 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
5015 c4296144 2019-05-09 stsp goto done;
5018 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5019 916f288c 2019-07-30 stsp worktree);
5020 5c1e53bc 2019-07-28 stsp if (error)
5021 5c1e53bc 2019-07-28 stsp goto done;
5023 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5024 c9956ddf 2019-09-08 stsp if (error)
5025 c9956ddf 2019-09-08 stsp goto done;
5026 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5027 c9956ddf 2019-09-08 stsp gitconfig_path);
5028 c4296144 2019-05-09 stsp if (error != NULL)
5029 c4296144 2019-05-09 stsp goto done;
5031 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
5032 aba9c984 2019-09-08 stsp if (error)
5033 aba9c984 2019-09-08 stsp return error;
5036 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
5037 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
5039 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
5040 314a6357 2019-05-13 stsp error = get_editor(&editor);
5042 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5043 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5044 c4296144 2019-05-09 stsp if (error)
5045 c4296144 2019-05-09 stsp goto done;
5047 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5048 087fb88c 2019-08-04 stsp if (error)
5049 087fb88c 2019-08-04 stsp goto done;
5051 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
5052 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
5053 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
5054 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
5055 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
5056 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
5057 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
5058 916f288c 2019-07-30 stsp goto done;
5060 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
5062 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
5063 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
5064 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
5065 e0870e44 2019-05-13 stsp if (error) {
5066 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5067 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
5068 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
5069 c4296144 2019-05-09 stsp goto done;
5072 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
5073 c4296144 2019-05-09 stsp if (error)
5074 c4296144 2019-05-09 stsp goto done;
5075 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
5077 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
5078 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
5079 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
5080 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
5081 7266f21f 2019-10-21 stsp error == NULL)
5082 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
5083 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
5085 c4296144 2019-05-09 stsp got_repo_close(repo);
5086 c4296144 2019-05-09 stsp if (worktree)
5087 c4296144 2019-05-09 stsp got_worktree_close(worktree);
5088 c4296144 2019-05-09 stsp free(cwd);
5089 c4296144 2019-05-09 stsp free(id_str);
5090 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5091 e2ba3d07 2019-05-13 stsp free(editor);
5092 aba9c984 2019-09-08 stsp free(author);
5093 234035bc 2019-06-01 stsp return error;
5096 234035bc 2019-06-01 stsp __dead static void
5097 234035bc 2019-06-01 stsp usage_cherrypick(void)
5099 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
5103 234035bc 2019-06-01 stsp static const struct got_error *
5104 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
5106 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
5107 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
5108 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
5109 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
5110 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
5111 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
5112 234035bc 2019-06-01 stsp struct got_object_qid *pid;
5113 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
5114 234035bc 2019-06-01 stsp int ch, did_something = 0;
5116 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5117 234035bc 2019-06-01 stsp switch (ch) {
5119 234035bc 2019-06-01 stsp usage_cherrypick();
5120 234035bc 2019-06-01 stsp /* NOTREACHED */
5124 234035bc 2019-06-01 stsp argc -= optind;
5125 234035bc 2019-06-01 stsp argv += optind;
5127 43012d58 2019-07-14 stsp #ifndef PROFILE
5128 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5129 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5130 43012d58 2019-07-14 stsp err(1, "pledge");
5132 234035bc 2019-06-01 stsp if (argc != 1)
5133 234035bc 2019-06-01 stsp usage_cherrypick();
5135 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
5136 234035bc 2019-06-01 stsp if (cwd == NULL) {
5137 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
5138 234035bc 2019-06-01 stsp goto done;
5140 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
5141 234035bc 2019-06-01 stsp if (error)
5142 234035bc 2019-06-01 stsp goto done;
5144 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5146 234035bc 2019-06-01 stsp if (error != NULL)
5147 234035bc 2019-06-01 stsp goto done;
5149 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5150 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5151 234035bc 2019-06-01 stsp if (error)
5152 234035bc 2019-06-01 stsp goto done;
5154 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5155 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5156 234035bc 2019-06-01 stsp if (error != NULL) {
5157 234035bc 2019-06-01 stsp struct got_reference *ref;
5158 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5159 234035bc 2019-06-01 stsp goto done;
5160 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5161 234035bc 2019-06-01 stsp if (error != NULL)
5162 234035bc 2019-06-01 stsp goto done;
5163 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
5164 234035bc 2019-06-01 stsp got_ref_close(ref);
5165 234035bc 2019-06-01 stsp if (error != NULL)
5166 234035bc 2019-06-01 stsp goto done;
5168 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
5169 234035bc 2019-06-01 stsp if (error)
5170 234035bc 2019-06-01 stsp goto done;
5172 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
5173 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
5174 234035bc 2019-06-01 stsp if (error != NULL)
5175 234035bc 2019-06-01 stsp goto done;
5177 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5178 234035bc 2019-06-01 stsp if (error) {
5179 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
5180 234035bc 2019-06-01 stsp goto done;
5181 234035bc 2019-06-01 stsp error = NULL;
5183 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
5184 234035bc 2019-06-01 stsp goto done;
5187 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5188 234035bc 2019-06-01 stsp if (error)
5189 234035bc 2019-06-01 stsp goto done;
5190 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5191 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
5192 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
5194 234035bc 2019-06-01 stsp if (error != NULL)
5195 234035bc 2019-06-01 stsp goto done;
5197 234035bc 2019-06-01 stsp if (did_something)
5198 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
5200 234035bc 2019-06-01 stsp if (commit)
5201 234035bc 2019-06-01 stsp got_object_commit_close(commit);
5202 234035bc 2019-06-01 stsp free(commit_id_str);
5203 234035bc 2019-06-01 stsp if (head_ref)
5204 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5205 234035bc 2019-06-01 stsp if (worktree)
5206 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5208 234035bc 2019-06-01 stsp got_repo_close(repo);
5209 c4296144 2019-05-09 stsp return error;
5212 5ef14e63 2019-06-02 stsp __dead static void
5213 5ef14e63 2019-06-02 stsp usage_backout(void)
5215 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5219 5ef14e63 2019-06-02 stsp static const struct got_error *
5220 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5222 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5223 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5224 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5225 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5226 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5227 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5228 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5229 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5230 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5232 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5233 5ef14e63 2019-06-02 stsp switch (ch) {
5235 5ef14e63 2019-06-02 stsp usage_backout();
5236 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5240 5ef14e63 2019-06-02 stsp argc -= optind;
5241 5ef14e63 2019-06-02 stsp argv += optind;
5243 43012d58 2019-07-14 stsp #ifndef PROFILE
5244 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5245 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5246 43012d58 2019-07-14 stsp err(1, "pledge");
5248 5ef14e63 2019-06-02 stsp if (argc != 1)
5249 5ef14e63 2019-06-02 stsp usage_backout();
5251 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5252 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5253 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5254 5ef14e63 2019-06-02 stsp goto done;
5256 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5257 5ef14e63 2019-06-02 stsp if (error)
5258 5ef14e63 2019-06-02 stsp goto done;
5260 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5262 5ef14e63 2019-06-02 stsp if (error != NULL)
5263 5ef14e63 2019-06-02 stsp goto done;
5265 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5266 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5267 5ef14e63 2019-06-02 stsp if (error)
5268 5ef14e63 2019-06-02 stsp goto done;
5270 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5271 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5272 5ef14e63 2019-06-02 stsp if (error != NULL) {
5273 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5274 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5275 5ef14e63 2019-06-02 stsp goto done;
5276 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5277 5ef14e63 2019-06-02 stsp if (error != NULL)
5278 5ef14e63 2019-06-02 stsp goto done;
5279 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5280 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5281 5ef14e63 2019-06-02 stsp if (error != NULL)
5282 5ef14e63 2019-06-02 stsp goto done;
5284 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5285 5ef14e63 2019-06-02 stsp if (error)
5286 5ef14e63 2019-06-02 stsp goto done;
5288 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5289 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5290 5ef14e63 2019-06-02 stsp if (error != NULL)
5291 5ef14e63 2019-06-02 stsp goto done;
5293 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5294 5ef14e63 2019-06-02 stsp if (error)
5295 5ef14e63 2019-06-02 stsp goto done;
5297 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5298 5ef14e63 2019-06-02 stsp if (error)
5299 5ef14e63 2019-06-02 stsp goto done;
5300 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5301 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5302 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5303 5ef14e63 2019-06-02 stsp goto done;
5306 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5307 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5308 5ef14e63 2019-06-02 stsp if (error != NULL)
5309 5ef14e63 2019-06-02 stsp goto done;
5311 5ef14e63 2019-06-02 stsp if (did_something)
5312 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5314 5ef14e63 2019-06-02 stsp if (commit)
5315 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5316 5ef14e63 2019-06-02 stsp free(commit_id_str);
5317 5ef14e63 2019-06-02 stsp if (head_ref)
5318 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5319 818c7501 2019-07-11 stsp if (worktree)
5320 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5322 818c7501 2019-07-11 stsp got_repo_close(repo);
5323 818c7501 2019-07-11 stsp return error;
5326 818c7501 2019-07-11 stsp __dead static void
5327 818c7501 2019-07-11 stsp usage_rebase(void)
5329 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5330 af54c8f8 2019-07-11 stsp getprogname());
5335 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5338 0ebf8283 2019-07-24 stsp size_t len;
5340 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5341 0ebf8283 2019-07-24 stsp if (len > limit)
5342 0ebf8283 2019-07-24 stsp len = limit;
5343 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5344 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5346 0ebf8283 2019-07-24 stsp *nl = '\0';
5349 0ebf8283 2019-07-24 stsp static const struct got_error *
5350 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5352 5943eee2 2019-08-13 stsp const struct got_error *err;
5353 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5354 5943eee2 2019-08-13 stsp const char *s;
5356 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5358 5943eee2 2019-08-13 stsp return err;
5360 5943eee2 2019-08-13 stsp s = logmsg0;
5361 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5364 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5365 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5366 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5367 5943eee2 2019-08-13 stsp goto done;
5370 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5372 5943eee2 2019-08-13 stsp free(logmsg0);
5373 a0ea4fc0 2020-02-28 stsp return err;
5376 a0ea4fc0 2020-02-28 stsp static const struct got_error *
5377 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
5379 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
5380 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
5381 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
5383 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
5385 a0ea4fc0 2020-02-28 stsp return err;
5387 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
5389 a0ea4fc0 2020-02-28 stsp goto done;
5391 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
5393 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
5395 a0ea4fc0 2020-02-28 stsp goto done;
5397 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
5399 a0ea4fc0 2020-02-28 stsp free(id_str);
5400 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
5401 a0ea4fc0 2020-02-28 stsp free(logmsg);
5402 5943eee2 2019-08-13 stsp return err;
5405 818c7501 2019-07-11 stsp static const struct got_error *
5406 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5407 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5409 818c7501 2019-07-11 stsp const struct got_error *err;
5410 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5412 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5414 818c7501 2019-07-11 stsp goto done;
5416 ff0d2220 2019-07-11 stsp if (new_id) {
5417 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5419 ff0d2220 2019-07-11 stsp goto done;
5422 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5423 ff0d2220 2019-07-11 stsp if (new_id_str)
5424 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5426 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5428 0ebf8283 2019-07-24 stsp goto done;
5430 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5431 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5433 818c7501 2019-07-11 stsp free(old_id_str);
5434 818c7501 2019-07-11 stsp free(new_id_str);
5435 272a1371 2020-02-28 stsp free(logmsg);
5436 818c7501 2019-07-11 stsp return err;
5439 1ee397ad 2019-07-12 stsp static const struct got_error *
5440 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5442 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5444 818c7501 2019-07-11 stsp while (path[0] == '/')
5446 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5448 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5449 1ee397ad 2019-07-12 stsp return NULL;
5450 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5451 818c7501 2019-07-11 stsp *rebase_status = status;
5452 1ee397ad 2019-07-12 stsp return NULL;
5455 818c7501 2019-07-11 stsp static const struct got_error *
5456 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5457 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5458 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5460 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5461 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5462 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5465 818c7501 2019-07-11 stsp static const struct got_error *
5466 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5467 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5468 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5469 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5471 ff0d2220 2019-07-11 stsp const struct got_error *error;
5472 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5473 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5475 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5476 ff0d2220 2019-07-11 stsp if (error)
5477 ff0d2220 2019-07-11 stsp return error;
5479 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5480 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5481 ff0d2220 2019-07-11 stsp if (error) {
5482 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5483 ff0d2220 2019-07-11 stsp goto done;
5484 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5486 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5487 ff0d2220 2019-07-11 stsp free(new_commit_id);
5490 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5491 ff0d2220 2019-07-11 stsp return error;
5494 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5495 64c6d990 2019-07-11 stsp const char *path_prefix;
5496 64c6d990 2019-07-11 stsp size_t len;
5497 8ca9bd68 2019-07-25 stsp int errcode;
5500 64c6d990 2019-07-11 stsp static const struct got_error *
5501 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5502 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5503 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5504 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5506 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5508 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5509 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5510 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5512 64c6d990 2019-07-11 stsp return NULL;
5515 64c6d990 2019-07-11 stsp static const struct got_error *
5516 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5517 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5518 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5520 64c6d990 2019-07-11 stsp const struct got_error *err;
5521 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5522 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5523 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5525 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5526 64c6d990 2019-07-11 stsp return NULL;
5528 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5530 64c6d990 2019-07-11 stsp goto done;
5532 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5534 64c6d990 2019-07-11 stsp goto done;
5536 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5537 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5539 64c6d990 2019-07-11 stsp goto done;
5541 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5542 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5544 64c6d990 2019-07-11 stsp goto done;
5546 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5547 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5548 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5549 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5550 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5551 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5552 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5554 64c6d990 2019-07-11 stsp if (tree1)
5555 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5556 64c6d990 2019-07-11 stsp if (tree2)
5557 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5558 64c6d990 2019-07-11 stsp if (commit)
5559 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5560 64c6d990 2019-07-11 stsp if (parent_commit)
5561 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5562 64c6d990 2019-07-11 stsp return err;
5565 ff0d2220 2019-07-11 stsp static const struct got_error *
5566 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5567 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5568 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5569 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5570 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5572 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5573 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5574 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5575 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5576 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5578 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5580 af61c510 2019-07-19 stsp return err;
5582 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5583 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5585 af61c510 2019-07-19 stsp goto done;
5586 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5587 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5588 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5589 af61c510 2019-07-19 stsp if (err) {
5590 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5591 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5592 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5593 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5594 af61c510 2019-07-19 stsp "been reached?!?");
5596 ee780d5c 2020-01-04 stsp goto done;
5598 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5599 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5601 af61c510 2019-07-19 stsp goto done;
5603 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5605 af61c510 2019-07-19 stsp goto done;
5606 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5607 af61c510 2019-07-19 stsp commit_id = parent_id;
5611 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5612 af61c510 2019-07-19 stsp return err;
5615 af61c510 2019-07-19 stsp static const struct got_error *
5616 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5618 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5619 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5620 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5621 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5622 818c7501 2019-07-11 stsp char *cwd = NULL;
5623 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5624 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5625 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5626 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5627 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5628 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5629 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5630 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
5631 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5632 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5633 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5634 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5635 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5637 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5638 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5640 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5641 818c7501 2019-07-11 stsp switch (ch) {
5643 818c7501 2019-07-11 stsp abort_rebase = 1;
5646 818c7501 2019-07-11 stsp continue_rebase = 1;
5649 818c7501 2019-07-11 stsp usage_rebase();
5650 818c7501 2019-07-11 stsp /* NOTREACHED */
5654 818c7501 2019-07-11 stsp argc -= optind;
5655 818c7501 2019-07-11 stsp argv += optind;
5657 43012d58 2019-07-14 stsp #ifndef PROFILE
5658 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5659 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5660 43012d58 2019-07-14 stsp err(1, "pledge");
5662 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5663 818c7501 2019-07-11 stsp usage_rebase();
5664 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5665 818c7501 2019-07-11 stsp if (argc != 0)
5666 818c7501 2019-07-11 stsp usage_rebase();
5667 818c7501 2019-07-11 stsp } else if (argc != 1)
5668 818c7501 2019-07-11 stsp usage_rebase();
5670 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5671 818c7501 2019-07-11 stsp if (cwd == NULL) {
5672 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5673 818c7501 2019-07-11 stsp goto done;
5675 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5676 818c7501 2019-07-11 stsp if (error)
5677 818c7501 2019-07-11 stsp goto done;
5679 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5681 818c7501 2019-07-11 stsp if (error != NULL)
5682 818c7501 2019-07-11 stsp goto done;
5684 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5685 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5686 7ef62c4e 2020-02-24 stsp if (error)
5687 7ef62c4e 2020-02-24 stsp goto done;
5689 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5690 7ef62c4e 2020-02-24 stsp worktree);
5691 818c7501 2019-07-11 stsp if (error)
5692 7ef62c4e 2020-02-24 stsp goto done;
5693 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
5694 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5695 818c7501 2019-07-11 stsp goto done;
5698 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5699 818c7501 2019-07-11 stsp if (error)
5700 818c7501 2019-07-11 stsp goto done;
5702 f6794adc 2019-07-23 stsp if (abort_rebase) {
5703 818c7501 2019-07-11 stsp int did_something;
5704 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5705 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5706 f6794adc 2019-07-23 stsp goto done;
5708 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5709 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5710 3e3a69f1 2019-07-25 stsp worktree, repo);
5711 818c7501 2019-07-11 stsp if (error)
5712 818c7501 2019-07-11 stsp goto done;
5713 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5714 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5715 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5716 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5717 818c7501 2019-07-11 stsp if (error)
5718 818c7501 2019-07-11 stsp goto done;
5719 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5720 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5723 818c7501 2019-07-11 stsp if (continue_rebase) {
5724 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5725 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5726 f6794adc 2019-07-23 stsp goto done;
5728 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5729 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5730 3e3a69f1 2019-07-25 stsp worktree, repo);
5731 818c7501 2019-07-11 stsp if (error)
5732 818c7501 2019-07-11 stsp goto done;
5734 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5735 01757395 2019-07-12 stsp resume_commit_id, repo);
5736 818c7501 2019-07-11 stsp if (error)
5737 818c7501 2019-07-11 stsp goto done;
5739 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5740 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5741 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5742 818c7501 2019-07-11 stsp goto done;
5745 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5746 818c7501 2019-07-11 stsp if (error != NULL)
5747 818c7501 2019-07-11 stsp goto done;
5750 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5751 ff0d2220 2019-07-11 stsp if (error)
5752 ff0d2220 2019-07-11 stsp goto done;
5754 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5755 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5757 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5758 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5759 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5760 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5761 818c7501 2019-07-11 stsp if (error)
5762 818c7501 2019-07-11 stsp goto done;
5763 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5764 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5765 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5766 818c7501 2019-07-11 stsp "with work tree's branch");
5767 818c7501 2019-07-11 stsp goto done;
5770 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5771 a51a74b3 2019-07-27 stsp if (error) {
5772 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5773 a51a74b3 2019-07-27 stsp goto done;
5774 a51a74b3 2019-07-27 stsp error = NULL;
5776 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5777 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5778 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5779 a51a74b3 2019-07-27 stsp goto done;
5781 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5782 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5783 818c7501 2019-07-11 stsp if (error)
5784 818c7501 2019-07-11 stsp goto done;
5787 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5788 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5789 818c7501 2019-07-11 stsp if (error)
5790 818c7501 2019-07-11 stsp goto done;
5792 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5793 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5794 fc66b545 2019-08-12 stsp if (pid == NULL) {
5795 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5796 fc66b545 2019-08-12 stsp int did_something;
5797 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5798 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5799 fc66b545 2019-08-12 stsp &did_something);
5800 fc66b545 2019-08-12 stsp if (error)
5801 fc66b545 2019-08-12 stsp goto done;
5802 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5803 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5805 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5806 fc66b545 2019-08-12 stsp goto done;
5808 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5809 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5810 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5811 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5812 818c7501 2019-07-11 stsp commit = NULL;
5813 818c7501 2019-07-11 stsp if (error)
5814 818c7501 2019-07-11 stsp goto done;
5816 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5817 38b0338b 2019-11-29 stsp if (continue_rebase) {
5818 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5819 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5820 38b0338b 2019-11-29 stsp goto done;
5822 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5823 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5824 38b0338b 2019-11-29 stsp char *id_str;
5825 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5826 38b0338b 2019-11-29 stsp new_base_branch);
5827 38b0338b 2019-11-29 stsp if (error)
5828 38b0338b 2019-11-29 stsp goto done;
5829 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5830 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5831 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5832 38b0338b 2019-11-29 stsp free(id_str);
5833 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5834 38b0338b 2019-11-29 stsp new_head_commit_id);
5835 38b0338b 2019-11-29 stsp if (error)
5836 38b0338b 2019-11-29 stsp goto done;
5840 818c7501 2019-07-11 stsp pid = NULL;
5841 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5842 818c7501 2019-07-11 stsp commit_id = qid->id;
5843 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5844 818c7501 2019-07-11 stsp pid = qid;
5846 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5847 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5848 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5849 818c7501 2019-07-11 stsp if (error)
5850 818c7501 2019-07-11 stsp goto done;
5852 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5853 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
5854 a0ea4fc0 2020-02-28 stsp if (error)
5855 a0ea4fc0 2020-02-28 stsp goto done;
5856 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5860 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5861 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5862 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5863 818c7501 2019-07-11 stsp if (error)
5864 818c7501 2019-07-11 stsp goto done;
5867 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5868 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5869 818c7501 2019-07-11 stsp if (error)
5870 818c7501 2019-07-11 stsp goto done;
5871 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5872 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5874 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5875 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5877 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5878 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5879 818c7501 2019-07-11 stsp free(resume_commit_id);
5880 818c7501 2019-07-11 stsp free(yca_id);
5881 818c7501 2019-07-11 stsp if (commit)
5882 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5883 818c7501 2019-07-11 stsp if (branch)
5884 818c7501 2019-07-11 stsp got_ref_close(branch);
5885 818c7501 2019-07-11 stsp if (new_base_branch)
5886 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5887 818c7501 2019-07-11 stsp if (tmp_branch)
5888 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5889 5ef14e63 2019-06-02 stsp if (worktree)
5890 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5892 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5893 5ef14e63 2019-06-02 stsp return error;
5896 0ebf8283 2019-07-24 stsp __dead static void
5897 0ebf8283 2019-07-24 stsp usage_histedit(void)
5899 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
5900 0ebf8283 2019-07-24 stsp getprogname());
5904 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5905 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5906 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5907 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5908 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5910 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5911 0ebf8283 2019-07-24 stsp unsigned char code;
5912 0ebf8283 2019-07-24 stsp const char *name;
5913 0ebf8283 2019-07-24 stsp const char *desc;
5914 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5915 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5916 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5917 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
5918 82997472 2020-01-29 stsp "be used" },
5919 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5920 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5921 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5924 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5925 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5926 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5927 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5928 0ebf8283 2019-07-24 stsp char *logmsg;
5930 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5932 0ebf8283 2019-07-24 stsp static const struct got_error *
5933 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5934 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5936 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5937 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5938 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5941 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5943 0ebf8283 2019-07-24 stsp goto done;
5945 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5947 0ebf8283 2019-07-24 stsp goto done;
5949 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5951 0ebf8283 2019-07-24 stsp goto done;
5953 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5954 0ebf8283 2019-07-24 stsp if (n < 0)
5955 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5957 0ebf8283 2019-07-24 stsp if (commit)
5958 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5959 0ebf8283 2019-07-24 stsp free(id_str);
5960 0ebf8283 2019-07-24 stsp free(logmsg);
5961 0ebf8283 2019-07-24 stsp return err;
5964 0ebf8283 2019-07-24 stsp static const struct got_error *
5965 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
5966 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
5968 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5969 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5971 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5972 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5974 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5975 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5979 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
5980 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
5981 083957f4 2020-02-24 stsp if (n < 0) {
5982 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
5988 0ebf8283 2019-07-24 stsp return err;
5991 0ebf8283 2019-07-24 stsp static const struct got_error *
5992 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
5993 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
5995 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5997 514f2ffe 2020-01-29 stsp char *id_str;
5998 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
6000 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
6001 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
6003 514f2ffe 2020-01-29 stsp return err;
6005 514f2ffe 2020-01-29 stsp n = fprintf(f,
6006 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
6007 514f2ffe 2020-01-29 stsp "# commit %s\n"
6008 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
6009 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
6010 514f2ffe 2020-01-29 stsp if (n < 0) {
6011 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6012 514f2ffe 2020-01-29 stsp goto done;
6015 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
6016 514f2ffe 2020-01-29 stsp if (n < 0) {
6017 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6018 514f2ffe 2020-01-29 stsp goto done;
6021 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6022 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
6023 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
6024 0ebf8283 2019-07-24 stsp cmd->desc);
6025 0ebf8283 2019-07-24 stsp if (n < 0) {
6026 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6031 514f2ffe 2020-01-29 stsp free(id_str);
6032 0ebf8283 2019-07-24 stsp return err;
6035 0ebf8283 2019-07-24 stsp static const struct got_error *
6036 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
6038 0ebf8283 2019-07-24 stsp static char msg[42];
6041 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
6043 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
6044 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
6046 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
6049 0ebf8283 2019-07-24 stsp static const struct got_error *
6050 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
6051 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
6053 0ebf8283 2019-07-24 stsp const struct got_error *err;
6054 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
6055 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
6057 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6059 0ebf8283 2019-07-24 stsp return err;
6061 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
6063 0ebf8283 2019-07-24 stsp goto done;
6065 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
6067 5943eee2 2019-08-13 stsp goto done;
6068 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
6069 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
6070 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
6071 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
6074 0ebf8283 2019-07-24 stsp if (folded_commit)
6075 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
6076 0ebf8283 2019-07-24 stsp free(id_str);
6077 5943eee2 2019-08-13 stsp free(folded_logmsg);
6078 0ebf8283 2019-07-24 stsp return err;
6081 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
6082 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
6084 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
6086 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
6087 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
6088 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
6089 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
6090 3f9de99f 2019-07-24 stsp folded = prev;
6091 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
6094 0ebf8283 2019-07-24 stsp return folded;
6097 0ebf8283 2019-07-24 stsp static const struct got_error *
6098 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
6099 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6101 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
6102 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
6103 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6104 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6106 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
6108 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6110 0ebf8283 2019-07-24 stsp return err;
6112 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
6113 0ebf8283 2019-07-24 stsp if (folded) {
6114 0ebf8283 2019-07-24 stsp while (folded != hle) {
6115 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
6116 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
6119 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
6120 0ebf8283 2019-07-24 stsp logmsg, repo);
6122 0ebf8283 2019-07-24 stsp goto done;
6123 0ebf8283 2019-07-24 stsp free(logmsg);
6124 0ebf8283 2019-07-24 stsp logmsg = new_msg;
6125 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
6129 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6131 0ebf8283 2019-07-24 stsp goto done;
6132 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
6134 5943eee2 2019-08-13 stsp goto done;
6135 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
6136 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
6137 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
6138 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
6139 0ebf8283 2019-07-24 stsp goto done;
6141 0ebf8283 2019-07-24 stsp free(logmsg);
6142 0ebf8283 2019-07-24 stsp logmsg = new_msg;
6144 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6146 0ebf8283 2019-07-24 stsp goto done;
6148 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
6149 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
6151 0ebf8283 2019-07-24 stsp goto done;
6153 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
6154 0ebf8283 2019-07-24 stsp close(fd);
6156 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6158 0ebf8283 2019-07-24 stsp goto done;
6160 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
6161 0ebf8283 2019-07-24 stsp if (err) {
6162 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
6163 0ebf8283 2019-07-24 stsp goto done;
6164 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
6167 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
6168 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
6169 0ebf8283 2019-07-24 stsp free(logmsg_path);
6170 0ebf8283 2019-07-24 stsp free(logmsg);
6171 5943eee2 2019-08-13 stsp free(orig_logmsg);
6172 0ebf8283 2019-07-24 stsp free(editor);
6173 0ebf8283 2019-07-24 stsp if (commit)
6174 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6175 0ebf8283 2019-07-24 stsp return err;
6178 0ebf8283 2019-07-24 stsp static const struct got_error *
6179 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
6180 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
6182 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6183 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
6184 0ebf8283 2019-07-24 stsp size_t size;
6185 0ebf8283 2019-07-24 stsp ssize_t len;
6186 0ebf8283 2019-07-24 stsp int lineno = 0, i;
6187 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
6188 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6189 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
6191 0ebf8283 2019-07-24 stsp for (;;) {
6192 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
6193 0ebf8283 2019-07-24 stsp if (len == -1) {
6194 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
6195 0ebf8283 2019-07-24 stsp if (feof(f))
6197 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
6198 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
6203 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6205 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
6206 0ebf8283 2019-07-24 stsp free(line);
6207 0ebf8283 2019-07-24 stsp line = NULL;
6210 0ebf8283 2019-07-24 stsp cmd = NULL;
6211 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6212 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
6213 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
6214 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
6215 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
6218 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
6223 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
6224 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6227 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6229 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
6230 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
6231 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
6234 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
6235 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6239 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
6240 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
6241 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6245 0ebf8283 2019-07-24 stsp free(line);
6246 0ebf8283 2019-07-24 stsp line = NULL;
6250 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
6252 0ebf8283 2019-07-24 stsp *end = '\0';
6254 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
6255 0ebf8283 2019-07-24 stsp if (err) {
6256 0ebf8283 2019-07-24 stsp /* override error code */
6257 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6261 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
6262 0ebf8283 2019-07-24 stsp if (hle == NULL) {
6263 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
6266 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
6267 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
6268 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
6269 0ebf8283 2019-07-24 stsp commit_id = NULL;
6270 0ebf8283 2019-07-24 stsp free(line);
6271 0ebf8283 2019-07-24 stsp line = NULL;
6272 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6275 0ebf8283 2019-07-24 stsp free(line);
6276 0ebf8283 2019-07-24 stsp free(commit_id);
6277 0ebf8283 2019-07-24 stsp return err;
6280 0ebf8283 2019-07-24 stsp static const struct got_error *
6281 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6282 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6284 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6285 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6286 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6287 5b87815e 2020-03-05 stsp static char msg[92];
6288 bfce7f83 2019-07-27 stsp char *id_str;
6290 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6291 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6292 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6293 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6294 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6296 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6297 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
6298 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
6299 5b87815e 2020-03-05 stsp if (hle == hle2)
6301 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
6302 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
6304 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
6306 5b87815e 2020-03-05 stsp return err;
6307 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
6308 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
6309 5b87815e 2020-03-05 stsp free(id_str);
6310 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6314 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6315 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6316 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6319 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6320 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6322 bfce7f83 2019-07-27 stsp return err;
6323 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6324 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6325 bfce7f83 2019-07-27 stsp free(id_str);
6326 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6330 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6331 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6332 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6333 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6335 bfce7f83 2019-07-27 stsp return NULL;
6338 bfce7f83 2019-07-27 stsp static const struct got_error *
6339 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6340 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6341 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6343 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6344 0ebf8283 2019-07-24 stsp char *editor;
6345 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6347 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6349 0ebf8283 2019-07-24 stsp return err;
6351 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6352 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6353 0ebf8283 2019-07-24 stsp goto done;
6356 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6357 0ebf8283 2019-07-24 stsp if (f == NULL) {
6358 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6359 0ebf8283 2019-07-24 stsp goto done;
6361 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6363 bfce7f83 2019-07-27 stsp goto done;
6365 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6367 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6368 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6369 0ebf8283 2019-07-24 stsp free(editor);
6370 0ebf8283 2019-07-24 stsp return err;
6373 0ebf8283 2019-07-24 stsp static const struct got_error *
6374 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6375 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
6376 514f2ffe 2020-01-29 stsp struct got_repository *);
6378 0ebf8283 2019-07-24 stsp static const struct got_error *
6379 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6380 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
6381 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
6383 0ebf8283 2019-07-24 stsp const struct got_error *err;
6384 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6385 0ebf8283 2019-07-24 stsp char *path = NULL;
6387 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6389 0ebf8283 2019-07-24 stsp return err;
6391 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
6393 0ebf8283 2019-07-24 stsp goto done;
6395 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
6397 0ebf8283 2019-07-24 stsp goto done;
6399 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
6400 083957f4 2020-02-24 stsp rewind(f);
6401 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6403 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
6404 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
6405 0ebf8283 2019-07-24 stsp goto done;
6408 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6409 083957f4 2020-02-24 stsp if (err) {
6410 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6411 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6412 083957f4 2020-02-24 stsp goto done;
6413 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6414 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
6418 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6419 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6420 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6421 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6422 0ebf8283 2019-07-24 stsp free(path);
6423 0ebf8283 2019-07-24 stsp return err;
6426 0ebf8283 2019-07-24 stsp static const struct got_error *
6427 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6428 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6430 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6431 0ebf8283 2019-07-24 stsp char *path = NULL;
6432 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6433 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6434 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6436 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6438 0ebf8283 2019-07-24 stsp return err;
6440 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6441 0ebf8283 2019-07-24 stsp if (f == NULL) {
6442 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6443 0ebf8283 2019-07-24 stsp goto done;
6445 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6446 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6451 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6452 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6453 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6454 0ebf8283 2019-07-24 stsp if (n < 0) {
6455 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6461 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6462 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6463 0ebf8283 2019-07-24 stsp free(path);
6464 0ebf8283 2019-07-24 stsp if (commit)
6465 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6466 0ebf8283 2019-07-24 stsp return err;
6470 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6472 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6474 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6475 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6476 bfce7f83 2019-07-27 stsp free(hle);
6480 0ebf8283 2019-07-24 stsp static const struct got_error *
6481 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6482 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6484 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6485 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6487 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6488 0ebf8283 2019-07-24 stsp if (f == NULL) {
6489 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6490 0ebf8283 2019-07-24 stsp goto done;
6493 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6495 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6496 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6497 0ebf8283 2019-07-24 stsp return err;
6500 0ebf8283 2019-07-24 stsp static const struct got_error *
6501 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6502 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6503 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
6505 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6506 0ebf8283 2019-07-24 stsp int resp = ' ';
6508 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6509 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6510 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6511 0ebf8283 2019-07-24 stsp resp = getchar();
6512 a61a4414 2019-08-07 stsp if (resp == '\n')
6513 a61a4414 2019-08-07 stsp resp = getchar();
6514 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6515 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6516 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6518 426ebf2e 2019-07-25 stsp if (err) {
6519 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6520 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6522 bfce7f83 2019-07-27 stsp prev_err = err;
6523 426ebf2e 2019-07-25 stsp resp = ' ';
6527 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6528 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6529 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6530 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
6531 426ebf2e 2019-07-25 stsp if (err) {
6532 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6533 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6535 bfce7f83 2019-07-27 stsp prev_err = err;
6536 426ebf2e 2019-07-25 stsp resp = ' ';
6540 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6541 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6544 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6547 0ebf8283 2019-07-24 stsp return err;
6550 0ebf8283 2019-07-24 stsp static const struct got_error *
6551 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6552 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6553 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6555 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6556 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6557 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6558 3e3a69f1 2019-07-25 stsp branch, repo);
6561 0ebf8283 2019-07-24 stsp static const struct got_error *
6562 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6563 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6565 0ebf8283 2019-07-24 stsp const struct got_error *err;
6566 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6568 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6570 0ebf8283 2019-07-24 stsp goto done;
6572 0ebf8283 2019-07-24 stsp if (new_id) {
6573 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6575 0ebf8283 2019-07-24 stsp goto done;
6578 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6579 0ebf8283 2019-07-24 stsp if (new_id_str)
6580 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6582 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6583 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6584 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6585 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6586 0ebf8283 2019-07-24 stsp goto done;
6588 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6590 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6592 0ebf8283 2019-07-24 stsp goto done;
6595 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6596 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6597 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6598 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6599 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6601 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6602 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6603 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6610 0ebf8283 2019-07-24 stsp free(old_id_str);
6611 0ebf8283 2019-07-24 stsp free(new_id_str);
6612 0ebf8283 2019-07-24 stsp return err;
6615 0ebf8283 2019-07-24 stsp static const struct got_error *
6616 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6617 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6618 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6619 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6621 0ebf8283 2019-07-24 stsp const struct got_error *err;
6622 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6623 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6625 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6626 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6627 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6629 0ebf8283 2019-07-24 stsp return err;
6632 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6634 0ebf8283 2019-07-24 stsp return err;
6636 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6637 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6638 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6639 0ebf8283 2019-07-24 stsp if (err) {
6640 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6641 0ebf8283 2019-07-24 stsp goto done;
6642 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6644 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6645 0ebf8283 2019-07-24 stsp free(new_commit_id);
6648 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6649 0ebf8283 2019-07-24 stsp return err;
6652 0ebf8283 2019-07-24 stsp static const struct got_error *
6653 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6654 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6656 0ebf8283 2019-07-24 stsp const struct got_error *error;
6657 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6659 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6661 0ebf8283 2019-07-24 stsp if (error)
6662 0ebf8283 2019-07-24 stsp return error;
6664 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6665 0ebf8283 2019-07-24 stsp if (error)
6666 0ebf8283 2019-07-24 stsp return error;
6668 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6669 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6670 0ebf8283 2019-07-24 stsp return error;
6673 ab20a43a 2020-01-29 stsp static const struct got_error *
6674 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
6675 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
6676 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6677 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6679 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
6681 ab20a43a 2020-01-29 stsp switch (status) {
6682 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6683 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6684 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6685 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
6686 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6687 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6692 ab20a43a 2020-01-29 stsp switch (staged_status) {
6693 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6694 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6695 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6696 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6697 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6702 ab20a43a 2020-01-29 stsp return NULL;
6705 0ebf8283 2019-07-24 stsp static const struct got_error *
6706 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6708 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6709 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6710 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6711 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6712 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6713 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6714 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6715 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6716 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6717 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6718 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6719 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6720 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6721 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
6722 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6723 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6724 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6725 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6726 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6727 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6728 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6729 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6731 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6732 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6733 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6735 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
6736 0ebf8283 2019-07-24 stsp switch (ch) {
6738 0ebf8283 2019-07-24 stsp abort_edit = 1;
6741 0ebf8283 2019-07-24 stsp continue_edit = 1;
6744 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6747 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
6750 0ebf8283 2019-07-24 stsp usage_histedit();
6751 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6755 0ebf8283 2019-07-24 stsp argc -= optind;
6756 0ebf8283 2019-07-24 stsp argv += optind;
6758 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6759 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6760 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6761 0ebf8283 2019-07-24 stsp err(1, "pledge");
6763 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6764 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
6765 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
6766 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
6767 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
6768 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
6769 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
6770 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
6771 0ebf8283 2019-07-24 stsp if (argc != 0)
6772 0ebf8283 2019-07-24 stsp usage_histedit();
6775 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6776 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6777 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6778 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6779 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6780 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6783 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6784 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6785 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6786 0ebf8283 2019-07-24 stsp goto done;
6788 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6789 0ebf8283 2019-07-24 stsp if (error)
6790 0ebf8283 2019-07-24 stsp goto done;
6792 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6794 0ebf8283 2019-07-24 stsp if (error != NULL)
6795 0ebf8283 2019-07-24 stsp goto done;
6797 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6798 0ebf8283 2019-07-24 stsp if (error)
6799 0ebf8283 2019-07-24 stsp goto done;
6800 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6801 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6802 0ebf8283 2019-07-24 stsp goto done;
6805 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6806 0ebf8283 2019-07-24 stsp if (error)
6807 0ebf8283 2019-07-24 stsp goto done;
6809 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
6810 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
6811 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
6812 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
6813 083957f4 2020-02-24 stsp "before the -m option can be used");
6814 083957f4 2020-02-24 stsp goto done;
6817 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6818 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6819 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6820 3e3a69f1 2019-07-25 stsp worktree, repo);
6821 0ebf8283 2019-07-24 stsp if (error)
6822 0ebf8283 2019-07-24 stsp goto done;
6823 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6824 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6825 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6826 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6827 0ebf8283 2019-07-24 stsp if (error)
6828 0ebf8283 2019-07-24 stsp goto done;
6829 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6830 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6831 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6832 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6833 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6834 0ebf8283 2019-07-24 stsp goto done;
6837 0ebf8283 2019-07-24 stsp if (continue_edit) {
6838 0ebf8283 2019-07-24 stsp char *path;
6840 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6841 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6842 0ebf8283 2019-07-24 stsp goto done;
6845 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6846 0ebf8283 2019-07-24 stsp if (error)
6847 0ebf8283 2019-07-24 stsp goto done;
6849 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6850 0ebf8283 2019-07-24 stsp free(path);
6851 0ebf8283 2019-07-24 stsp if (error)
6852 0ebf8283 2019-07-24 stsp goto done;
6854 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6855 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6856 3e3a69f1 2019-07-25 stsp worktree, repo);
6857 0ebf8283 2019-07-24 stsp if (error)
6858 0ebf8283 2019-07-24 stsp goto done;
6860 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6861 0ebf8283 2019-07-24 stsp if (error)
6862 0ebf8283 2019-07-24 stsp goto done;
6864 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6865 0ebf8283 2019-07-24 stsp head_commit_id);
6866 0ebf8283 2019-07-24 stsp if (error)
6867 0ebf8283 2019-07-24 stsp goto done;
6868 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6869 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6870 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6871 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6872 3aac7cf7 2019-07-25 stsp goto done;
6874 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6875 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6876 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6877 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6878 0ebf8283 2019-07-24 stsp commit = NULL;
6879 0ebf8283 2019-07-24 stsp if (error)
6880 0ebf8283 2019-07-24 stsp goto done;
6882 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6883 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6884 0ebf8283 2019-07-24 stsp goto done;
6887 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6888 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6889 0ebf8283 2019-07-24 stsp if (error != NULL)
6890 0ebf8283 2019-07-24 stsp goto done;
6892 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6893 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6894 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6895 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6896 c7d20a3f 2019-07-30 stsp goto done;
6899 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6900 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6901 bfce7f83 2019-07-27 stsp branch = NULL;
6902 0ebf8283 2019-07-24 stsp if (error)
6903 0ebf8283 2019-07-24 stsp goto done;
6905 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6906 0ebf8283 2019-07-24 stsp head_commit_id);
6907 0ebf8283 2019-07-24 stsp if (error)
6908 0ebf8283 2019-07-24 stsp goto done;
6909 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6910 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6911 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6912 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6913 3aac7cf7 2019-07-25 stsp goto done;
6915 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6916 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6917 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6918 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6919 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6920 0ebf8283 2019-07-24 stsp commit = NULL;
6921 0ebf8283 2019-07-24 stsp if (error)
6922 0ebf8283 2019-07-24 stsp goto done;
6924 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
6925 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6926 c5996fff 2020-01-29 stsp goto done;
6929 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6930 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6931 bfce7f83 2019-07-27 stsp if (error)
6932 bfce7f83 2019-07-27 stsp goto done;
6934 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6935 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6936 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6937 6ba2bea2 2019-07-27 stsp if (error) {
6938 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6939 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6940 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6941 0ebf8283 2019-07-24 stsp goto done;
6944 514f2ffe 2020-01-29 stsp const char *branch_name;
6945 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
6946 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
6947 514f2ffe 2020-01-29 stsp branch_name += 11;
6948 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6949 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
6950 6ba2bea2 2019-07-27 stsp if (error) {
6951 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6952 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6953 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6954 0ebf8283 2019-07-24 stsp goto done;
6959 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6961 6ba2bea2 2019-07-27 stsp if (error) {
6962 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6963 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6964 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6965 0ebf8283 2019-07-24 stsp goto done;
6970 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6971 4ec14e60 2019-08-28 hiltjo if (error)
6972 0ebf8283 2019-07-24 stsp goto done;
6974 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6975 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6976 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6977 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6980 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6981 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6982 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6983 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6985 ab20a43a 2020-01-29 stsp if (error)
6986 ab20a43a 2020-01-29 stsp goto done;
6988 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
6989 ab20a43a 2020-01-29 stsp int have_changes = 0;
6991 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
6992 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
6993 ab20a43a 2020-01-29 stsp if (error)
6994 ab20a43a 2020-01-29 stsp goto done;
6995 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
6996 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
6997 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
6998 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
6999 ab20a43a 2020-01-29 stsp if (error) {
7000 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
7001 ab20a43a 2020-01-29 stsp goto done;
7002 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
7003 ab20a43a 2020-01-29 stsp goto done;
7005 ab20a43a 2020-01-29 stsp if (have_changes) {
7006 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
7007 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
7008 ab20a43a 2020-01-29 stsp if (error)
7009 ab20a43a 2020-01-29 stsp goto done;
7011 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
7012 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
7013 ab20a43a 2020-01-29 stsp if (error)
7014 ab20a43a 2020-01-29 stsp goto done;
7015 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
7016 ab20a43a 2020-01-29 stsp hle, NULL);
7017 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
7018 ab20a43a 2020-01-29 stsp commit = NULL;
7019 ab20a43a 2020-01-29 stsp if (error)
7020 ab20a43a 2020-01-29 stsp goto done;
7026 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
7027 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7028 0ebf8283 2019-07-24 stsp if (error)
7029 0ebf8283 2019-07-24 stsp goto done;
7033 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
7034 0ebf8283 2019-07-24 stsp hle->commit_id);
7035 0ebf8283 2019-07-24 stsp if (error)
7036 0ebf8283 2019-07-24 stsp goto done;
7037 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7038 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
7040 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
7041 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
7042 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
7043 0ebf8283 2019-07-24 stsp if (error)
7044 0ebf8283 2019-07-24 stsp goto done;
7045 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7046 0ebf8283 2019-07-24 stsp commit = NULL;
7048 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7049 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
7051 a0ea4fc0 2020-02-28 stsp if (error)
7052 a0ea4fc0 2020-02-28 stsp goto done;
7053 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7057 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
7058 0ebf8283 2019-07-24 stsp char *id_str;
7059 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
7060 0ebf8283 2019-07-24 stsp if (error)
7061 0ebf8283 2019-07-24 stsp goto done;
7062 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
7064 0ebf8283 2019-07-24 stsp free(id_str);
7065 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7066 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
7067 3e3a69f1 2019-07-25 stsp fileindex);
7068 0ebf8283 2019-07-24 stsp goto done;
7071 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
7072 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7073 0ebf8283 2019-07-24 stsp if (error)
7074 0ebf8283 2019-07-24 stsp goto done;
7078 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
7079 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
7080 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7081 0ebf8283 2019-07-24 stsp if (error)
7082 0ebf8283 2019-07-24 stsp goto done;
7085 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7086 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
7087 0ebf8283 2019-07-24 stsp if (error)
7088 0ebf8283 2019-07-24 stsp goto done;
7089 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7090 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
7092 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
7093 3e3a69f1 2019-07-25 stsp branch, repo);
7095 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
7096 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
7097 0ebf8283 2019-07-24 stsp free(head_commit_id);
7098 0ebf8283 2019-07-24 stsp free(base_commit_id);
7099 0ebf8283 2019-07-24 stsp free(resume_commit_id);
7100 0ebf8283 2019-07-24 stsp if (commit)
7101 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7102 0ebf8283 2019-07-24 stsp if (branch)
7103 0ebf8283 2019-07-24 stsp got_ref_close(branch);
7104 0ebf8283 2019-07-24 stsp if (tmp_branch)
7105 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
7106 0ebf8283 2019-07-24 stsp if (worktree)
7107 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
7109 2822a352 2019-10-15 stsp got_repo_close(repo);
7110 2822a352 2019-10-15 stsp return error;
7113 2822a352 2019-10-15 stsp __dead static void
7114 2822a352 2019-10-15 stsp usage_integrate(void)
7116 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
7120 2822a352 2019-10-15 stsp static const struct got_error *
7121 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
7123 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
7124 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
7125 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
7126 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
7127 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
7128 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
7129 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
7130 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
7131 2822a352 2019-10-15 stsp int ch, did_something = 0;
7133 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7134 2822a352 2019-10-15 stsp switch (ch) {
7136 2822a352 2019-10-15 stsp usage_integrate();
7137 2822a352 2019-10-15 stsp /* NOTREACHED */
7141 2822a352 2019-10-15 stsp argc -= optind;
7142 2822a352 2019-10-15 stsp argv += optind;
7144 2822a352 2019-10-15 stsp if (argc != 1)
7145 2822a352 2019-10-15 stsp usage_integrate();
7146 2822a352 2019-10-15 stsp branch_arg = argv[0];
7148 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7149 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
7150 2822a352 2019-10-15 stsp err(1, "pledge");
7152 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
7153 2822a352 2019-10-15 stsp if (cwd == NULL) {
7154 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
7155 2822a352 2019-10-15 stsp goto done;
7158 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
7159 2822a352 2019-10-15 stsp if (error)
7160 2822a352 2019-10-15 stsp goto done;
7162 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
7163 2822a352 2019-10-15 stsp if (error)
7164 2822a352 2019-10-15 stsp goto done;
7166 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7168 2822a352 2019-10-15 stsp if (error != NULL)
7169 2822a352 2019-10-15 stsp goto done;
7171 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7172 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
7173 2822a352 2019-10-15 stsp if (error)
7174 2822a352 2019-10-15 stsp goto done;
7176 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
7177 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
7178 2822a352 2019-10-15 stsp goto done;
7181 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
7182 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
7183 2822a352 2019-10-15 stsp if (error)
7184 2822a352 2019-10-15 stsp goto done;
7186 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
7187 2822a352 2019-10-15 stsp if (refname == NULL) {
7188 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
7189 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7190 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7191 2822a352 2019-10-15 stsp goto done;
7193 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
7194 2822a352 2019-10-15 stsp if (base_refname == NULL) {
7195 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
7196 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7197 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7198 2822a352 2019-10-15 stsp goto done;
7201 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
7202 2822a352 2019-10-15 stsp if (error)
7203 2822a352 2019-10-15 stsp goto done;
7205 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
7206 2822a352 2019-10-15 stsp if (error)
7207 2822a352 2019-10-15 stsp goto done;
7209 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
7210 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7211 2822a352 2019-10-15 stsp "specified branch has already been integrated");
7212 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7213 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7214 2822a352 2019-10-15 stsp goto done;
7217 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
7218 2822a352 2019-10-15 stsp if (error) {
7219 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
7220 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
7221 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7222 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7223 2822a352 2019-10-15 stsp goto done;
7226 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
7227 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
7228 2822a352 2019-10-15 stsp check_cancelled, NULL);
7229 2822a352 2019-10-15 stsp if (error)
7230 2822a352 2019-10-15 stsp goto done;
7232 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
7235 715dc77e 2019-08-03 stsp got_repo_close(repo);
7236 2822a352 2019-10-15 stsp if (worktree)
7237 2822a352 2019-10-15 stsp got_worktree_close(worktree);
7238 2822a352 2019-10-15 stsp free(cwd);
7239 2822a352 2019-10-15 stsp free(base_commit_id);
7240 2822a352 2019-10-15 stsp free(commit_id);
7241 2822a352 2019-10-15 stsp free(refname);
7242 2822a352 2019-10-15 stsp free(base_refname);
7243 715dc77e 2019-08-03 stsp return error;
7246 715dc77e 2019-08-03 stsp __dead static void
7247 715dc77e 2019-08-03 stsp usage_stage(void)
7249 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
7250 f3055044 2019-08-07 stsp "[file-path ...]\n",
7251 715dc77e 2019-08-03 stsp getprogname());
7255 715dc77e 2019-08-03 stsp static const struct got_error *
7256 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
7257 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
7258 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
7259 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
7261 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
7262 408b4ebc 2019-08-03 stsp char *id_str = NULL;
7264 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
7265 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
7266 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
7267 408b4ebc 2019-08-03 stsp return NULL;
7269 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
7270 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
7271 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
7273 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
7275 408b4ebc 2019-08-03 stsp return err;
7277 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
7278 408b4ebc 2019-08-03 stsp free(id_str);
7279 dc424a06 2019-08-07 stsp return NULL;
7282 dc424a06 2019-08-07 stsp static const struct got_error *
7283 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
7285 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
7286 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
7287 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
7288 715dc77e 2019-08-03 stsp char *cwd = NULL;
7289 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
7290 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
7291 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
7292 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
7293 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7294 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7296 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
7298 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
7299 715dc77e 2019-08-03 stsp switch (ch) {
7301 408b4ebc 2019-08-03 stsp list_stage = 1;
7304 dc424a06 2019-08-07 stsp pflag = 1;
7307 dc424a06 2019-08-07 stsp patch_script_path = optarg;
7310 715dc77e 2019-08-03 stsp usage_stage();
7311 715dc77e 2019-08-03 stsp /* NOTREACHED */
7315 715dc77e 2019-08-03 stsp argc -= optind;
7316 715dc77e 2019-08-03 stsp argv += optind;
7318 715dc77e 2019-08-03 stsp #ifndef PROFILE
7319 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7320 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
7321 715dc77e 2019-08-03 stsp err(1, "pledge");
7323 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
7324 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
7325 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
7326 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
7328 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
7329 715dc77e 2019-08-03 stsp if (cwd == NULL) {
7330 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
7331 715dc77e 2019-08-03 stsp goto done;
7334 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7335 715dc77e 2019-08-03 stsp if (error)
7336 715dc77e 2019-08-03 stsp goto done;
7338 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7340 715dc77e 2019-08-03 stsp if (error != NULL)
7341 715dc77e 2019-08-03 stsp goto done;
7343 dc424a06 2019-08-07 stsp if (patch_script_path) {
7344 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
7345 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
7346 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
7347 dc424a06 2019-08-07 stsp patch_script_path);
7348 dc424a06 2019-08-07 stsp goto done;
7351 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7352 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
7353 715dc77e 2019-08-03 stsp if (error)
7354 715dc77e 2019-08-03 stsp goto done;
7356 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7357 6d022e97 2019-08-04 stsp if (error)
7358 6d022e97 2019-08-04 stsp goto done;
7360 6d022e97 2019-08-04 stsp if (list_stage)
7361 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
7362 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
7364 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7365 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
7366 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
7367 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
7368 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
7371 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7372 2e1f37b0 2019-08-08 stsp error == NULL)
7373 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7375 ad493afc 2019-08-03 stsp got_repo_close(repo);
7376 ad493afc 2019-08-03 stsp if (worktree)
7377 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
7378 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7379 ad493afc 2019-08-03 stsp free((char *)pe->path);
7380 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
7381 ad493afc 2019-08-03 stsp free(cwd);
7382 ad493afc 2019-08-03 stsp return error;
7385 ad493afc 2019-08-03 stsp __dead static void
7386 ad493afc 2019-08-03 stsp usage_unstage(void)
7388 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7389 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7390 ad493afc 2019-08-03 stsp getprogname());
7395 ad493afc 2019-08-03 stsp static const struct got_error *
7396 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7398 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7399 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7400 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7401 ad493afc 2019-08-03 stsp char *cwd = NULL;
7402 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7403 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7404 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7405 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7406 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7407 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7409 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7411 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7412 ad493afc 2019-08-03 stsp switch (ch) {
7414 2e1f37b0 2019-08-08 stsp pflag = 1;
7417 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7420 ad493afc 2019-08-03 stsp usage_unstage();
7421 ad493afc 2019-08-03 stsp /* NOTREACHED */
7425 ad493afc 2019-08-03 stsp argc -= optind;
7426 ad493afc 2019-08-03 stsp argv += optind;
7428 ad493afc 2019-08-03 stsp #ifndef PROFILE
7429 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7430 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7431 ad493afc 2019-08-03 stsp err(1, "pledge");
7433 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7434 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7436 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7437 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7438 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7439 ad493afc 2019-08-03 stsp goto done;
7442 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7443 ad493afc 2019-08-03 stsp if (error)
7444 ad493afc 2019-08-03 stsp goto done;
7446 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7448 ad493afc 2019-08-03 stsp if (error != NULL)
7449 ad493afc 2019-08-03 stsp goto done;
7451 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7452 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7453 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7454 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7455 2e1f37b0 2019-08-08 stsp patch_script_path);
7456 2e1f37b0 2019-08-08 stsp goto done;
7460 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7461 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7462 ad493afc 2019-08-03 stsp if (error)
7463 ad493afc 2019-08-03 stsp goto done;
7465 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7466 ad493afc 2019-08-03 stsp if (error)
7467 ad493afc 2019-08-03 stsp goto done;
7469 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7470 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7471 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7472 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7474 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7475 2e1f37b0 2019-08-08 stsp error == NULL)
7476 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7478 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7479 715dc77e 2019-08-03 stsp if (worktree)
7480 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7481 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7482 715dc77e 2019-08-03 stsp free((char *)pe->path);
7483 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7484 715dc77e 2019-08-03 stsp free(cwd);
7485 01073a5d 2019-08-22 stsp return error;
7488 01073a5d 2019-08-22 stsp __dead static void
7489 01073a5d 2019-08-22 stsp usage_cat(void)
7491 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7492 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7496 01073a5d 2019-08-22 stsp static const struct got_error *
7497 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7499 01073a5d 2019-08-22 stsp const struct got_error *err;
7500 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7502 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7504 01073a5d 2019-08-22 stsp return err;
7506 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7507 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7508 01073a5d 2019-08-22 stsp return err;
7511 01073a5d 2019-08-22 stsp static const struct got_error *
7512 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7514 01073a5d 2019-08-22 stsp const struct got_error *err;
7515 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7516 56e0773d 2019-11-28 stsp int nentries, i;
7518 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7520 01073a5d 2019-08-22 stsp return err;
7522 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7523 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7524 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7525 01073a5d 2019-08-22 stsp char *id_str;
7526 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7528 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7529 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7532 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7533 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7534 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7535 01073a5d 2019-08-22 stsp free(id_str);
7538 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7539 01073a5d 2019-08-22 stsp return err;
7542 01073a5d 2019-08-22 stsp static const struct got_error *
7543 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7545 01073a5d 2019-08-22 stsp const struct got_error *err;
7546 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7547 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7548 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7549 01073a5d 2019-08-22 stsp char *id_str = NULL;
7550 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7552 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7554 01073a5d 2019-08-22 stsp return err;
7556 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7558 01073a5d 2019-08-22 stsp goto done;
7560 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7561 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7562 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7563 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7564 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7565 01073a5d 2019-08-22 stsp char *pid_str;
7566 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7568 01073a5d 2019-08-22 stsp goto done;
7569 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7570 01073a5d 2019-08-22 stsp free(pid_str);
7572 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7573 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7574 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7576 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7577 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7578 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7580 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7581 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7582 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7584 01073a5d 2019-08-22 stsp free(id_str);
7585 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7586 01073a5d 2019-08-22 stsp return err;
7589 01073a5d 2019-08-22 stsp static const struct got_error *
7590 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7592 01073a5d 2019-08-22 stsp const struct got_error *err;
7593 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7594 01073a5d 2019-08-22 stsp char *id_str = NULL;
7595 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7597 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7599 01073a5d 2019-08-22 stsp return err;
7601 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7603 01073a5d 2019-08-22 stsp goto done;
7605 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7607 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7608 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7609 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7610 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7612 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7613 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7614 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7616 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7617 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7618 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7620 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7621 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7622 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7628 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7629 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7631 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7632 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7633 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7635 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7636 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7637 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7639 01073a5d 2019-08-22 stsp free(id_str);
7640 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7641 01073a5d 2019-08-22 stsp return err;
7644 01073a5d 2019-08-22 stsp static const struct got_error *
7645 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7647 01073a5d 2019-08-22 stsp const struct got_error *error;
7648 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7649 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7650 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7651 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7652 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7653 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7655 01073a5d 2019-08-22 stsp #ifndef PROFILE
7656 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7657 01073a5d 2019-08-22 stsp NULL) == -1)
7658 01073a5d 2019-08-22 stsp err(1, "pledge");
7661 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7662 01073a5d 2019-08-22 stsp switch (ch) {
7664 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7667 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7668 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7669 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7671 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7674 896e9b6f 2019-08-26 stsp force_path = 1;
7677 01073a5d 2019-08-22 stsp usage_cat();
7678 01073a5d 2019-08-22 stsp /* NOTREACHED */
7682 01073a5d 2019-08-22 stsp argc -= optind;
7683 01073a5d 2019-08-22 stsp argv += optind;
7685 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7686 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7687 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7688 01073a5d 2019-08-22 stsp goto done;
7690 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7691 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7692 01073a5d 2019-08-22 stsp goto done;
7693 01073a5d 2019-08-22 stsp if (worktree) {
7694 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7695 01073a5d 2019-08-22 stsp repo_path = strdup(
7696 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7697 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7698 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7699 01073a5d 2019-08-22 stsp goto done;
7704 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7705 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7706 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7707 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7710 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7711 01073a5d 2019-08-22 stsp free(repo_path);
7712 01073a5d 2019-08-22 stsp if (error != NULL)
7713 01073a5d 2019-08-22 stsp goto done;
7715 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7716 896e9b6f 2019-08-26 stsp if (error)
7717 896e9b6f 2019-08-26 stsp goto done;
7719 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7720 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7721 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
7722 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7723 01073a5d 2019-08-22 stsp if (error)
7724 01073a5d 2019-08-22 stsp goto done;
7726 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7727 896e9b6f 2019-08-26 stsp if (force_path) {
7728 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7730 896e9b6f 2019-08-26 stsp if (error)
7733 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
7734 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7735 896e9b6f 2019-08-26 stsp if (error) {
7736 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7737 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7739 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7740 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7741 896e9b6f 2019-08-26 stsp if (error)
7746 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7747 01073a5d 2019-08-22 stsp if (error)
7750 01073a5d 2019-08-22 stsp switch (obj_type) {
7751 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7752 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7754 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7755 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7757 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7758 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7760 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7761 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7764 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7767 01073a5d 2019-08-22 stsp if (error)
7769 01073a5d 2019-08-22 stsp free(label);
7770 01073a5d 2019-08-22 stsp label = NULL;
7772 01073a5d 2019-08-22 stsp id = NULL;
7775 01073a5d 2019-08-22 stsp free(label);
7777 896e9b6f 2019-08-26 stsp free(commit_id);
7778 01073a5d 2019-08-22 stsp if (worktree)
7779 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7780 01073a5d 2019-08-22 stsp if (repo) {
7781 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7782 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7783 01073a5d 2019-08-22 stsp if (error == NULL)
7784 01073a5d 2019-08-22 stsp error = repo_error;
7786 0ebf8283 2019-07-24 stsp return error;
