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 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
973 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
974 892ac3b6 2020-03-18 stsp int last_p_indexed;
975 892ac3b6 2020-03-18 stsp int last_p_resolved;
978 93658fb9 2020-03-18 stsp static const struct got_error *
979 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
980 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
982 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
983 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
984 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
985 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
987 b2409d58 2020-03-18 stsp if (message && message[0] != '\0' && message[0] != '\n') {
988 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
989 b2409d58 2020-03-18 stsp if (strchr(message, '\n') == 0)
990 b2409d58 2020-03-18 stsp printf("\n");
991 892ac3b6 2020-03-18 stsp fflush(stdout);
994 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
995 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
996 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
997 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
998 892ac3b6 2020-03-18 stsp print_size = 1;
999 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
1000 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1001 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
1003 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
1004 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
1005 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
1006 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
1007 892ac3b6 2020-03-18 stsp print_indexed = 1;
1008 892ac3b6 2020-03-18 stsp print_size = 1;
1011 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
1012 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
1013 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
1014 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
1015 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
1016 892ac3b6 2020-03-18 stsp print_resolved = 1;
1017 892ac3b6 2020-03-18 stsp print_indexed = 1;
1018 892ac3b6 2020-03-18 stsp print_size = 1;
1023 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1024 892ac3b6 2020-03-18 stsp printf("\r");
1025 892ac3b6 2020-03-18 stsp if (print_size)
1026 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1027 892ac3b6 2020-03-18 stsp if (print_indexed)
1028 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
1029 892ac3b6 2020-03-18 stsp if (print_resolved)
1030 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
1031 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
1032 892ac3b6 2020-03-18 stsp fflush(stdout);
1034 892ac3b6 2020-03-18 stsp if (nobj_indexed > 0 && nobj_indexed == nobj_total &&
1035 892ac3b6 2020-03-18 stsp nobj_resolved == nobj_total - nobj_loose)
1036 892ac3b6 2020-03-18 stsp printf("\nWriting pack index...\n");
1038 531c3985 2020-03-18 stsp return NULL;
1041 531c3985 2020-03-18 stsp static const struct got_error *
1042 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1044 09838ffc 2020-03-18 stsp const struct got_error *err = NULL;
1045 09838ffc 2020-03-18 stsp const char *uri, *branch_filter, *dirname;
1046 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1047 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1048 bb64b798 2020-03-18 stsp const char *repo_path;
1049 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1050 d9b4d0c0 2020-03-18 stsp struct got_pathlist_head refs, symrefs;
1051 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1052 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1053 20eb36d0 2020-03-18 stsp int ch, fetchfd = -1;
1054 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1056 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1057 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1059 93658fb9 2020-03-18 stsp while ((ch = getopt(argc, argv, "b:")) != -1) {
1060 93658fb9 2020-03-18 stsp switch (ch) {
1062 93658fb9 2020-03-18 stsp branch_filter = optarg;
1065 93658fb9 2020-03-18 stsp usage_clone();
1069 93658fb9 2020-03-18 stsp argc -= optind;
1070 93658fb9 2020-03-18 stsp argv += optind;
1071 93658fb9 2020-03-18 stsp uri = argv[0];
1072 93658fb9 2020-03-18 stsp if(argc == 1)
1073 93658fb9 2020-03-18 stsp dirname = NULL;
1074 93658fb9 2020-03-18 stsp else if(argc == 2)
1075 93658fb9 2020-03-18 stsp dirname = argv[1];
1077 93658fb9 2020-03-18 stsp usage_clone();
1079 09838ffc 2020-03-18 stsp err = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1080 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1082 09838ffc 2020-03-18 stsp goto done;
1084 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1085 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1086 bb64b798 2020-03-18 stsp err = got_error_from_errno("asprintf");
1087 bb64b798 2020-03-18 stsp goto done;
1089 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1091 bb64b798 2020-03-18 stsp repo_path = dirname;
1093 bb64b798 2020-03-18 stsp err = got_path_mkdir(repo_path);
1095 bb64b798 2020-03-18 stsp goto done;
1097 bb64b798 2020-03-18 stsp err = got_repo_init(repo_path);
1099 bb64b798 2020-03-18 stsp goto done;
1101 bb64b798 2020-03-18 stsp err = got_repo_open(&repo, repo_path, NULL);
1103 294dfefd 2020-03-18 stsp goto done;
1105 294dfefd 2020-03-18 stsp err = got_fetch_connect(&fetchfd, proto, host, port, server_path);
1107 bb64b798 2020-03-18 stsp goto done;
1109 294dfefd 2020-03-18 stsp printf("Connected to %s:%s\n", host, port);
1111 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1112 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1113 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1114 07e52fce 2020-03-18 stsp err = got_fetch_pack(&pack_hash, &refs, &symrefs, fetchfd,
1115 892ac3b6 2020-03-18 stsp repo, fetch_progress, &fpa);
1117 d9b4d0c0 2020-03-18 stsp goto done;
1119 d9b4d0c0 2020-03-18 stsp err = got_object_id_str(&id_str, pack_hash);
1121 d9b4d0c0 2020-03-18 stsp goto done;
1122 d9b4d0c0 2020-03-18 stsp printf("Fetched %s.pack\n", id_str);
1123 d9b4d0c0 2020-03-18 stsp free(id_str);
1125 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1126 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1127 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1128 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1129 d9b4d0c0 2020-03-18 stsp struct got_reference *ref;
1132 668a20f6 2020-03-18 stsp err = got_ref_alloc(&ref, refname, id);
1134 d9b4d0c0 2020-03-18 stsp goto done;
1137 668a20f6 2020-03-18 stsp err = got_object_id_str(&id_str, id);
1139 d9b4d0c0 2020-03-18 stsp goto done;
1140 d9b4d0c0 2020-03-18 stsp printf("%s: %s\n", got_ref_get_name(ref), id_str);
1141 d9b4d0c0 2020-03-18 stsp free(id_str);
1143 d9b4d0c0 2020-03-18 stsp err = got_ref_write(ref, repo);
1144 d9b4d0c0 2020-03-18 stsp got_ref_close(ref);
1146 d9b4d0c0 2020-03-18 stsp goto done;
1149 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1150 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1151 d9b4d0c0 2020-03-18 stsp struct got_reference *symref, *target_ref;
1152 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1153 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1155 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1158 d9b4d0c0 2020-03-18 stsp err = got_ref_open(&target_ref, repo, target, 0);
1159 d9b4d0c0 2020-03-18 stsp if (err) {
1160 d9b4d0c0 2020-03-18 stsp if (err->code == GOT_ERR_NOT_REF)
1162 d9b4d0c0 2020-03-18 stsp goto done;
1165 d9b4d0c0 2020-03-18 stsp err = got_ref_alloc_symref(&symref, GOT_REF_HEAD, target_ref);
1166 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1168 d9b4d0c0 2020-03-18 stsp goto done;
1170 d9b4d0c0 2020-03-18 stsp printf("Setting %s to %s\n", GOT_REF_HEAD,
1171 d9b4d0c0 2020-03-18 stsp got_ref_get_symref_target(symref));
1173 d9b4d0c0 2020-03-18 stsp err = got_ref_write(symref, repo);
1174 d9b4d0c0 2020-03-18 stsp got_ref_close(symref);
1179 20eb36d0 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && err == NULL)
1180 20eb36d0 2020-03-18 stsp err = got_error_from_errno("close");
1182 bb64b798 2020-03-18 stsp got_repo_close(repo);
1183 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1184 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1185 d9b4d0c0 2020-03-18 stsp free(pe->data);
1187 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1188 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1189 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1190 d9b4d0c0 2020-03-18 stsp free(pe->data);
1192 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1193 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1194 09838ffc 2020-03-18 stsp free(proto);
1195 09838ffc 2020-03-18 stsp free(host);
1196 09838ffc 2020-03-18 stsp free(port);
1197 09838ffc 2020-03-18 stsp free(server_path);
1198 09838ffc 2020-03-18 stsp free(repo_name);
1199 bb64b798 2020-03-18 stsp free(default_destdir);
1200 09838ffc 2020-03-18 stsp return err;
1203 4ed7e80c 2018-05-20 stsp static const struct got_error *
1204 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
1206 4b6c9460 2020-03-05 stsp static char msg[512];
1207 4b6c9460 2020-03-05 stsp const char *branch_name;
1209 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
1210 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
1212 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
1214 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
1215 4b6c9460 2020-03-05 stsp branch_name += 11;
1217 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
1218 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
1219 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
1220 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
1221 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
1222 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
1224 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
1227 4b6c9460 2020-03-05 stsp static const struct got_error *
1228 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
1230 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
1231 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
1232 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
1233 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
1234 c09a553d 2018-03-12 stsp char *repo_path = NULL;
1235 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
1236 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
1237 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
1238 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
1239 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
1240 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1241 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
1243 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1245 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1246 0bb8a95e 2018-03-12 stsp switch (ch) {
1248 08573d5b 2019-05-14 stsp branch_name = optarg;
1251 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
1252 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
1253 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1256 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
1259 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1262 2deda0b9 2019-03-07 stsp usage_checkout();
1263 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1267 0bb8a95e 2018-03-12 stsp argc -= optind;
1268 0bb8a95e 2018-03-12 stsp argv += optind;
1270 6715a751 2018-03-16 stsp #ifndef PROFILE
1271 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1272 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1273 c09a553d 2018-03-12 stsp err(1, "pledge");
1275 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1276 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1277 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1278 76089277 2018-04-01 stsp if (repo_path == NULL)
1279 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1280 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1281 76089277 2018-04-01 stsp if (cwd == NULL) {
1282 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1283 76089277 2018-04-01 stsp goto done;
1285 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1286 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1287 230a42bd 2019-05-11 jcs if (base == NULL) {
1288 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1289 230a42bd 2019-05-11 jcs path_prefix);
1293 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1294 230a42bd 2019-05-11 jcs if (base == NULL) {
1295 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1296 230a42bd 2019-05-11 jcs repo_path);
1300 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1301 c09a553d 2018-03-12 stsp if (dotgit)
1302 c09a553d 2018-03-12 stsp *dotgit = '\0';
1303 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1304 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1305 c09a553d 2018-03-12 stsp free(cwd);
1306 76089277 2018-04-01 stsp goto done;
1308 c09a553d 2018-03-12 stsp free(cwd);
1309 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1310 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1311 76089277 2018-04-01 stsp if (repo_path == NULL) {
1312 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1313 76089277 2018-04-01 stsp goto done;
1315 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1316 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1317 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1318 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1320 b4b3a7dd 2019-07-22 stsp goto done;
1322 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1323 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1324 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1325 b4b3a7dd 2019-07-22 stsp goto done;
1329 c09a553d 2018-03-12 stsp usage_checkout();
1331 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1332 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1334 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1335 c09a553d 2018-03-12 stsp if (error != NULL)
1336 c02c541e 2019-03-29 stsp goto done;
1338 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1339 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1340 c530dc23 2019-07-23 stsp if (error) {
1341 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1342 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1343 c530dc23 2019-07-23 stsp goto done;
1344 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1345 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
1346 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1347 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1348 c530dc23 2019-07-23 stsp goto done;
1352 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1353 c02c541e 2019-03-29 stsp if (error)
1354 c09a553d 2018-03-12 stsp goto done;
1356 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1357 c09a553d 2018-03-12 stsp if (error != NULL)
1358 c09a553d 2018-03-12 stsp goto done;
1360 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1361 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1362 c09a553d 2018-03-12 stsp goto done;
1364 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1365 c09a553d 2018-03-12 stsp if (error != NULL)
1366 c09a553d 2018-03-12 stsp goto done;
1368 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1369 e5dc7198 2018-12-29 stsp path_prefix);
1370 e5dc7198 2018-12-29 stsp if (error != NULL)
1371 e5dc7198 2018-12-29 stsp goto done;
1372 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1373 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1374 49520a32 2018-12-29 stsp goto done;
1377 8069f636 2019-01-12 stsp if (commit_id_str) {
1378 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1379 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1380 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1381 30837e32 2019-07-25 stsp if (error)
1382 8069f636 2019-01-12 stsp goto done;
1383 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1384 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1385 8069f636 2019-01-12 stsp if (error != NULL) {
1386 8069f636 2019-01-12 stsp free(commit_id);
1387 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
1388 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
1389 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
1391 8069f636 2019-01-12 stsp goto done;
1393 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1394 4b6c9460 2020-03-05 stsp if (error) {
1395 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
1396 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
1397 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
1399 45d344f6 2019-05-14 stsp goto done;
1401 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1402 8069f636 2019-01-12 stsp commit_id);
1403 8069f636 2019-01-12 stsp free(commit_id);
1404 8069f636 2019-01-12 stsp if (error)
1405 8069f636 2019-01-12 stsp goto done;
1408 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1409 f2ea84fa 2019-07-27 stsp if (error)
1410 f2ea84fa 2019-07-27 stsp goto done;
1411 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1412 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1413 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1414 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1415 c09a553d 2018-03-12 stsp if (error != NULL)
1416 c09a553d 2018-03-12 stsp goto done;
1418 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1419 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1420 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1422 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1423 8069f636 2019-01-12 stsp free(commit_id_str);
1424 76089277 2018-04-01 stsp free(repo_path);
1425 507dc3bb 2018-12-29 stsp free(worktree_path);
1426 507dc3bb 2018-12-29 stsp return error;
1429 507dc3bb 2018-12-29 stsp __dead static void
1430 507dc3bb 2018-12-29 stsp usage_update(void)
1432 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1433 507dc3bb 2018-12-29 stsp getprogname());
1437 1ee397ad 2019-07-12 stsp static const struct got_error *
1438 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1440 784955db 2019-01-12 stsp int *did_something = arg;
1442 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1443 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1444 1ee397ad 2019-07-12 stsp return NULL;
1446 1545c615 2019-02-10 stsp *did_something = 1;
1448 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1449 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1450 1ee397ad 2019-07-12 stsp return NULL;
1452 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1454 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1455 1ee397ad 2019-07-12 stsp return NULL;
1458 be7061eb 2018-12-30 stsp static const struct got_error *
1459 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1460 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1461 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1463 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1464 a1fb16d8 2019-05-24 stsp char *base_id_str;
1465 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1467 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1468 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1469 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1470 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1471 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1472 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1473 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1476 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1477 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1478 a1fb16d8 2019-05-24 stsp if (err) {
1479 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1480 a1fb16d8 2019-05-24 stsp return err;
1481 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1483 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1484 a1fb16d8 2019-05-24 stsp return NULL;
1486 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1487 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1488 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1490 a1fb16d8 2019-05-24 stsp return err;
1491 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1492 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1493 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1494 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1495 0ebf8283 2019-07-24 stsp return NULL;
1498 0ebf8283 2019-07-24 stsp static const struct got_error *
1499 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1501 0ebf8283 2019-07-24 stsp const struct got_error *err;
1502 0ebf8283 2019-07-24 stsp int in_progress;
1504 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1506 0ebf8283 2019-07-24 stsp return err;
1507 0ebf8283 2019-07-24 stsp if (in_progress)
1508 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1510 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1512 0ebf8283 2019-07-24 stsp return err;
1513 0ebf8283 2019-07-24 stsp if (in_progress)
1514 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1516 a1fb16d8 2019-05-24 stsp return NULL;
1519 a5edda0a 2019-07-27 stsp static const struct got_error *
1520 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1521 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1523 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1524 a5edda0a 2019-07-27 stsp char *path;
1527 a5edda0a 2019-07-27 stsp if (argc == 0) {
1528 a5edda0a 2019-07-27 stsp path = strdup("");
1529 a5edda0a 2019-07-27 stsp if (path == NULL)
1530 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1531 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1534 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1535 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1538 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1539 a5edda0a 2019-07-27 stsp if (err) {
1540 a5edda0a 2019-07-27 stsp free(path);
1545 a5edda0a 2019-07-27 stsp return err;
1548 a1fb16d8 2019-05-24 stsp static const struct got_error *
1549 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1551 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1552 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1553 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1554 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1555 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1556 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1557 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1558 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1559 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1560 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1561 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1563 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1565 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1566 507dc3bb 2018-12-29 stsp switch (ch) {
1568 024e9686 2019-05-14 stsp branch_name = optarg;
1571 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1572 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1573 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1576 2deda0b9 2019-03-07 stsp usage_update();
1577 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1581 507dc3bb 2018-12-29 stsp argc -= optind;
1582 507dc3bb 2018-12-29 stsp argv += optind;
1584 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1585 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1586 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1587 507dc3bb 2018-12-29 stsp err(1, "pledge");
1589 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1590 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1591 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1592 c4cdcb68 2019-04-03 stsp goto done;
1594 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1595 7d5807f4 2019-07-11 stsp if (error)
1596 7d5807f4 2019-07-11 stsp goto done;
1598 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1599 f2ea84fa 2019-07-27 stsp if (error)
1600 f2ea84fa 2019-07-27 stsp goto done;
1602 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1604 507dc3bb 2018-12-29 stsp if (error != NULL)
1605 507dc3bb 2018-12-29 stsp goto done;
1607 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1608 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1609 087fb88c 2019-08-04 stsp if (error)
1610 087fb88c 2019-08-04 stsp goto done;
1612 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1613 0266afb7 2019-01-04 stsp if (error)
1614 0266afb7 2019-01-04 stsp goto done;
1616 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1617 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1618 024e9686 2019-05-14 stsp if (error != NULL)
1619 024e9686 2019-05-14 stsp goto done;
1620 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1621 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1622 9c4b8182 2019-01-02 stsp if (error != NULL)
1623 9c4b8182 2019-01-02 stsp goto done;
1624 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1625 507dc3bb 2018-12-29 stsp if (error != NULL)
1626 507dc3bb 2018-12-29 stsp goto done;
1628 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1629 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1630 04f57cb3 2019-07-25 stsp free(commit_id_str);
1631 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1632 30837e32 2019-07-25 stsp if (error)
1633 a297e751 2019-07-11 stsp goto done;
1634 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1635 a297e751 2019-07-11 stsp if (error)
1636 507dc3bb 2018-12-29 stsp goto done;
1639 a1fb16d8 2019-05-24 stsp if (branch_name) {
1640 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1641 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1642 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1644 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1645 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1646 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1647 024e9686 2019-05-14 stsp goto done;
1649 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1650 024e9686 2019-05-14 stsp if (error)
1651 024e9686 2019-05-14 stsp goto done;
1652 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1654 a367ff0f 2019-05-14 stsp free(head_commit_id);
1655 024e9686 2019-05-14 stsp if (error != NULL)
1656 024e9686 2019-05-14 stsp goto done;
1657 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1658 a367ff0f 2019-05-14 stsp if (error)
1659 a367ff0f 2019-05-14 stsp goto done;
1660 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1661 024e9686 2019-05-14 stsp if (error)
1662 024e9686 2019-05-14 stsp goto done;
1664 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1665 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1666 a367ff0f 2019-05-14 stsp if (error != NULL) {
1667 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1668 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1669 024e9686 2019-05-14 stsp goto done;
1671 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1672 a367ff0f 2019-05-14 stsp if (error)
1673 a367ff0f 2019-05-14 stsp goto done;
1676 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1677 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1678 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1679 507dc3bb 2018-12-29 stsp commit_id);
1680 507dc3bb 2018-12-29 stsp if (error)
1681 507dc3bb 2018-12-29 stsp goto done;
1684 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1685 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1686 507dc3bb 2018-12-29 stsp if (error != NULL)
1687 507dc3bb 2018-12-29 stsp goto done;
1689 784955db 2019-01-12 stsp if (did_something)
1690 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1692 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1694 c09a553d 2018-03-12 stsp free(worktree_path);
1695 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1696 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1697 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1698 507dc3bb 2018-12-29 stsp free(commit_id);
1699 9c4b8182 2019-01-02 stsp free(commit_id_str);
1700 c09a553d 2018-03-12 stsp return error;
1703 f42b1b34 2018-03-12 stsp static const struct got_error *
1704 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1705 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1706 63035f9f 2019-10-06 stsp struct got_repository *repo)
1708 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1709 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1711 44392932 2019-08-25 stsp if (blob_id1) {
1712 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1714 44392932 2019-08-25 stsp goto done;
1717 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1719 44392932 2019-08-25 stsp goto done;
1721 44392932 2019-08-25 stsp while (path[0] == '/')
1723 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1724 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1726 44392932 2019-08-25 stsp if (blob1)
1727 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1728 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1729 44392932 2019-08-25 stsp return err;
1732 44392932 2019-08-25 stsp static const struct got_error *
1733 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1734 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1735 63035f9f 2019-10-06 stsp struct got_repository *repo)
1737 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1738 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1739 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1741 44392932 2019-08-25 stsp if (tree_id1) {
1742 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1744 44392932 2019-08-25 stsp goto done;
1747 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1749 0f2b3dca 2018-12-22 stsp goto done;
1751 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1752 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1753 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1754 44392932 2019-08-25 stsp while (path[0] == '/')
1756 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1757 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1759 79109fed 2018-03-27 stsp if (tree1)
1760 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1761 366e0a5f 2019-10-10 stsp if (tree2)
1762 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1763 44392932 2019-08-25 stsp return err;
1766 44392932 2019-08-25 stsp static const struct got_error *
1767 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1768 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1770 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1771 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1772 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1773 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1774 44392932 2019-08-25 stsp struct got_object_qid *qid;
1776 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1777 44392932 2019-08-25 stsp if (qid != NULL) {
1778 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1781 44392932 2019-08-25 stsp return err;
1784 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1785 44392932 2019-08-25 stsp int obj_type;
1786 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1788 44392932 2019-08-25 stsp goto done;
1789 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1790 44392932 2019-08-25 stsp if (err) {
1791 44392932 2019-08-25 stsp free(obj_id2);
1792 44392932 2019-08-25 stsp goto done;
1794 44392932 2019-08-25 stsp if (pcommit) {
1795 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1796 44392932 2019-08-25 stsp qid->id, path);
1797 44392932 2019-08-25 stsp if (err) {
1798 44392932 2019-08-25 stsp free(obj_id2);
1799 44392932 2019-08-25 stsp goto done;
1801 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1802 44392932 2019-08-25 stsp if (err) {
1803 44392932 2019-08-25 stsp free(obj_id2);
1804 44392932 2019-08-25 stsp goto done;
1807 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1808 44392932 2019-08-25 stsp if (err) {
1809 44392932 2019-08-25 stsp free(obj_id2);
1810 44392932 2019-08-25 stsp goto done;
1812 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1813 44392932 2019-08-25 stsp switch (obj_type) {
1814 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1815 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1818 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1819 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1823 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1826 44392932 2019-08-25 stsp free(obj_id1);
1827 44392932 2019-08-25 stsp free(obj_id2);
1829 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1830 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1832 44392932 2019-08-25 stsp goto done;
1833 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1834 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1836 44392932 2019-08-25 stsp goto done;
1837 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1838 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1841 0f2b3dca 2018-12-22 stsp free(id_str1);
1842 0f2b3dca 2018-12-22 stsp free(id_str2);
1843 44392932 2019-08-25 stsp if (pcommit)
1844 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1845 79109fed 2018-03-27 stsp return err;
1848 4bb494d5 2018-06-16 stsp static char *
1849 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1851 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1852 09867e48 2019-08-13 stsp char *p, *s;
1854 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1855 09867e48 2019-08-13 stsp if (tm == NULL)
1856 09867e48 2019-08-13 stsp return NULL;
1857 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1858 09867e48 2019-08-13 stsp if (s == NULL)
1859 09867e48 2019-08-13 stsp return NULL;
1860 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1862 6c281f94 2018-06-11 stsp *p = '\0';
1866 6841bf13 2019-11-29 kn static const struct got_error *
1867 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1868 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1870 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1871 6841bf13 2019-11-29 kn regmatch_t regmatch;
1872 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1874 6841bf13 2019-11-29 kn *have_match = 0;
1876 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1880 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1884 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1885 6841bf13 2019-11-29 kn *have_match = 1;
1887 6841bf13 2019-11-29 kn free(id_str);
1888 6841bf13 2019-11-29 kn free(logmsg);
1892 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1894 79109fed 2018-03-27 stsp static const struct got_error *
1895 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1896 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1897 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1899 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1900 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1901 6c281f94 2018-06-11 stsp char datebuf[26];
1902 45d799e2 2018-12-23 stsp time_t committer_time;
1903 45d799e2 2018-12-23 stsp const char *author, *committer;
1904 199a4027 2019-02-02 stsp char *refs_str = NULL;
1905 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1907 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1909 199a4027 2019-02-02 stsp const char *name;
1910 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1913 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1914 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1916 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1917 199a4027 2019-02-02 stsp name += 5;
1918 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1920 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1921 e34f9ed6 2019-02-02 stsp name += 6;
1922 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1923 141c2bff 2019-02-04 stsp name += 8;
1924 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1925 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1926 5d844a1e 2019-08-13 stsp if (err) {
1927 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1928 5d844a1e 2019-08-13 stsp return err;
1929 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1930 5d844a1e 2019-08-13 stsp err = NULL;
1931 5d844a1e 2019-08-13 stsp tag = NULL;
1934 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1935 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1937 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1938 a436ad14 2019-08-13 stsp if (cmp != 0)
1940 199a4027 2019-02-02 stsp s = refs_str;
1941 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1942 199a4027 2019-02-02 stsp name) == -1) {
1943 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1945 34ca4898 2019-08-13 stsp return err;
1949 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1951 8bf5b3c9 2018-03-17 stsp return err;
1953 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1954 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1955 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1956 832c249c 2018-06-10 stsp free(id_str);
1957 d3d493d7 2019-02-21 stsp id_str = NULL;
1958 d3d493d7 2019-02-21 stsp free(refs_str);
1959 d3d493d7 2019-02-21 stsp refs_str = NULL;
1960 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1961 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1962 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1963 09867e48 2019-08-13 stsp if (datestr)
1964 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1965 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1966 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1967 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1968 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1969 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1970 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1971 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1972 3fe1abad 2018-06-10 stsp int n = 1;
1973 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1974 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1975 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1977 a0603db2 2018-06-10 stsp return err;
1978 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1979 a0603db2 2018-06-10 stsp free(id_str);
1983 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1985 5943eee2 2019-08-13 stsp return err;
1987 621015ac 2018-07-23 stsp logmsg = logmsg0;
1989 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1991 832c249c 2018-06-10 stsp printf(" %s\n", line);
1992 832c249c 2018-06-10 stsp } while (line);
1993 621015ac 2018-07-23 stsp free(logmsg0);
1995 971751ac 2018-03-27 stsp if (show_patch) {
1996 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1997 971751ac 2018-03-27 stsp if (err == 0)
1998 971751ac 2018-03-27 stsp printf("\n");
2001 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
2002 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
2003 07862c20 2018-09-15 stsp return err;
2006 f42b1b34 2018-03-12 stsp static const struct got_error *
2007 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
2008 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
2009 48c8c60d 2020-01-27 stsp int diff_context, int limit, int log_branches,
2010 463a997a 2019-12-08 kn struct got_reflist_head *refs)
2012 f42b1b34 2018-03-12 stsp const struct got_error *err;
2013 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
2014 6841bf13 2019-11-29 kn regex_t regex;
2015 6841bf13 2019-11-29 kn int have_match;
2017 6841bf13 2019-11-29 kn if (search_pattern &&
2018 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
2019 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
2021 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
2023 f42b1b34 2018-03-12 stsp return err;
2024 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
2025 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2027 fcc85cad 2018-07-22 stsp goto done;
2029 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
2030 372ccdbb 2018-06-10 stsp struct got_object_id *id;
2032 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
2035 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2036 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
2037 372ccdbb 2018-06-10 stsp if (err) {
2038 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2039 9ba79e04 2018-06-11 stsp err = NULL;
2042 b43fbaa0 2018-06-11 stsp if (id == NULL)
2045 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
2049 6841bf13 2019-11-29 kn if (search_pattern) {
2050 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
2052 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2055 6841bf13 2019-11-29 kn if (have_match == 0) {
2056 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2061 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
2062 44392932 2019-08-25 stsp diff_context, refs);
2063 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
2064 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
2068 6841bf13 2019-11-29 kn if (search_pattern)
2069 6841bf13 2019-11-29 kn regfree(®ex);
2070 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
2071 f42b1b34 2018-03-12 stsp return err;
2074 4ed7e80c 2018-05-20 stsp __dead static void
2075 6f3d1eb0 2018-03-12 stsp usage_log(void)
2077 48c8c60d 2020-01-27 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
2078 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
2082 b1ebc001 2019-08-13 stsp static int
2083 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
2085 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
2086 b1ebc001 2019-08-13 stsp long long n;
2087 b1ebc001 2019-08-13 stsp const char *errstr;
2089 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
2090 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
2092 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
2093 b1ebc001 2019-08-13 stsp if (errstr != NULL)
2098 4ed7e80c 2018-05-20 stsp static const struct got_error *
2099 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
2101 f42b1b34 2018-03-12 stsp const struct got_error *error;
2102 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
2103 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
2104 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
2105 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
2106 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
2107 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
2108 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
2109 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
2110 64a96a6d 2018-04-01 stsp const char *errstr;
2111 199a4027 2019-02-02 stsp struct got_reflist_head refs;
2113 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
2115 6715a751 2018-03-16 stsp #ifndef PROFILE
2116 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2119 f42b1b34 2018-03-12 stsp err(1, "pledge");
2122 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
2124 48c8c60d 2020-01-27 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
2125 79109fed 2018-03-27 stsp switch (ch) {
2127 79109fed 2018-03-27 stsp show_patch = 1;
2130 d142fc45 2018-04-01 stsp start_commit = optarg;
2133 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2135 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2136 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2139 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
2140 64a96a6d 2018-04-01 stsp if (errstr != NULL)
2141 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
2144 48c8c60d 2020-01-27 stsp log_branches = 1;
2147 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2148 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
2149 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2151 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2154 6841bf13 2019-11-29 kn search_pattern = optarg;
2157 2deda0b9 2019-03-07 stsp usage_log();
2158 79109fed 2018-03-27 stsp /* NOTREACHED */
2162 79109fed 2018-03-27 stsp argc -= optind;
2163 79109fed 2018-03-27 stsp argv += optind;
2165 dc1edbfa 2019-11-29 kn if (diff_context == -1)
2166 dc1edbfa 2019-11-29 kn diff_context = 3;
2167 dc1edbfa 2019-11-29 kn else if (!show_patch)
2168 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
2170 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
2171 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
2172 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2173 04ca23f4 2018-07-16 stsp goto done;
2176 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2177 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2178 cffc0aa4 2019-02-05 stsp goto done;
2179 cffc0aa4 2019-02-05 stsp error = NULL;
2181 e7301579 2019-03-18 stsp if (argc == 0) {
2182 cbd1af7a 2019-03-18 stsp path = strdup("");
2183 e7301579 2019-03-18 stsp if (path == NULL) {
2184 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2185 cbd1af7a 2019-03-18 stsp goto done;
2187 e7301579 2019-03-18 stsp } else if (argc == 1) {
2188 e7301579 2019-03-18 stsp if (worktree) {
2189 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2191 e7301579 2019-03-18 stsp if (error)
2192 e7301579 2019-03-18 stsp goto done;
2194 e7301579 2019-03-18 stsp path = strdup(argv[0]);
2195 e7301579 2019-03-18 stsp if (path == NULL) {
2196 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2197 e7301579 2019-03-18 stsp goto done;
2201 cbd1af7a 2019-03-18 stsp usage_log();
2203 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
2204 5486daa2 2019-05-11 stsp repo_path = worktree ?
2205 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
2207 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
2208 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2209 cffc0aa4 2019-02-05 stsp goto done;
2212 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2213 d7d4f210 2018-03-12 stsp if (error != NULL)
2214 04ca23f4 2018-07-16 stsp goto done;
2216 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2217 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2218 c02c541e 2019-03-29 stsp if (error)
2219 c02c541e 2019-03-29 stsp goto done;
2221 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
2222 3235492e 2018-04-01 stsp struct got_reference *head_ref;
2223 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
2224 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
2225 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
2226 3235492e 2018-04-01 stsp if (error != NULL)
2227 3235492e 2018-04-01 stsp return error;
2228 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
2229 3235492e 2018-04-01 stsp got_ref_close(head_ref);
2230 3235492e 2018-04-01 stsp if (error != NULL)
2231 3235492e 2018-04-01 stsp return error;
2232 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2234 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
2235 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
2236 3235492e 2018-04-01 stsp if (error == NULL) {
2237 1caad61b 2019-02-01 stsp int obj_type;
2238 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
2239 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
2240 d1f2edc9 2018-06-13 stsp if (error != NULL)
2241 1caad61b 2019-02-01 stsp goto done;
2242 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
2243 1caad61b 2019-02-01 stsp if (error != NULL)
2244 1caad61b 2019-02-01 stsp goto done;
2245 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
2246 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
2247 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
2248 1caad61b 2019-02-01 stsp if (error != NULL)
2249 1caad61b 2019-02-01 stsp goto done;
2250 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
2251 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
2252 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2253 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2254 1caad61b 2019-02-01 stsp goto done;
2257 1caad61b 2019-02-01 stsp id = got_object_id_dup(
2258 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
2259 1caad61b 2019-02-01 stsp if (id == NULL)
2260 638f9024 2019-05-13 stsp error = got_error_from_errno(
2261 230a42bd 2019-05-11 jcs "got_object_id_dup");
2262 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2263 1caad61b 2019-02-01 stsp if (error)
2264 1caad61b 2019-02-01 stsp goto done;
2265 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2266 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2267 1caad61b 2019-02-01 stsp goto done;
2269 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2270 d1f2edc9 2018-06-13 stsp if (error != NULL)
2271 1caad61b 2019-02-01 stsp goto done;
2273 15a94983 2018-12-23 stsp if (commit == NULL) {
2274 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2275 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2276 d1f2edc9 2018-06-13 stsp if (error != NULL)
2277 d1f2edc9 2018-06-13 stsp return error;
2280 d7d4f210 2018-03-12 stsp if (error != NULL)
2281 04ca23f4 2018-07-16 stsp goto done;
2283 deeabeae 2019-08-27 stsp if (worktree) {
2284 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2286 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2287 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2288 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2289 deeabeae 2019-08-27 stsp goto done;
2291 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2294 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2295 04ca23f4 2018-07-16 stsp if (error != NULL)
2296 04ca23f4 2018-07-16 stsp goto done;
2297 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2298 04ca23f4 2018-07-16 stsp free(path);
2299 04ca23f4 2018-07-16 stsp path = in_repo_path;
2302 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2303 199a4027 2019-02-02 stsp if (error)
2304 199a4027 2019-02-02 stsp goto done;
2306 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2307 48c8c60d 2020-01-27 stsp diff_context, limit, log_branches, &refs);
2309 04ca23f4 2018-07-16 stsp free(path);
2310 04ca23f4 2018-07-16 stsp free(repo_path);
2311 04ca23f4 2018-07-16 stsp free(cwd);
2313 cffc0aa4 2019-02-05 stsp if (worktree)
2314 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2315 ad242220 2018-09-08 stsp if (repo) {
2316 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2317 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2318 ad242220 2018-09-08 stsp if (error == NULL)
2319 ad242220 2018-09-08 stsp error = repo_error;
2321 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2322 8bf5b3c9 2018-03-17 stsp return error;
2325 4ed7e80c 2018-05-20 stsp __dead static void
2326 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2328 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2329 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2333 b72f483a 2019-02-05 stsp struct print_diff_arg {
2334 b72f483a 2019-02-05 stsp struct got_repository *repo;
2335 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2336 b72f483a 2019-02-05 stsp int diff_context;
2337 3fc0c068 2019-02-10 stsp const char *id_str;
2338 3fc0c068 2019-02-10 stsp int header_shown;
2339 98eaaa12 2019-08-03 stsp int diff_staged;
2340 63035f9f 2019-10-06 stsp int ignore_whitespace;
2343 4ed7e80c 2018-05-20 stsp static const struct got_error *
2344 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2345 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2346 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2347 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2349 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2350 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2351 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2352 12463d8b 2019-12-13 stsp int fd = -1;
2353 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2354 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2355 b72f483a 2019-02-05 stsp struct stat sb;
2357 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2358 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2359 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2360 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2361 98eaaa12 2019-08-03 stsp return NULL;
2363 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2364 98eaaa12 2019-08-03 stsp return NULL;
2365 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2366 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2367 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2368 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2369 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2370 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2371 98eaaa12 2019-08-03 stsp return NULL;
2374 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2375 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2376 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2377 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2378 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2381 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2382 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2383 98eaaa12 2019-08-03 stsp switch (staged_status) {
2384 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2385 98eaaa12 2019-08-03 stsp label1 = path;
2386 98eaaa12 2019-08-03 stsp label2 = path;
2388 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2389 98eaaa12 2019-08-03 stsp label2 = path;
2391 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2392 98eaaa12 2019-08-03 stsp label1 = path;
2395 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2397 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2398 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2399 63035f9f 2019-10-06 stsp a->repo, stdout);
2402 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2403 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2404 4ce46740 2019-08-08 stsp char *id_str;
2405 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2408 4ce46740 2019-08-08 stsp goto done;
2409 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2411 4ce46740 2019-08-08 stsp goto done;
2412 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2413 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2414 4ce46740 2019-08-08 stsp free(id_str);
2415 4ce46740 2019-08-08 stsp goto done;
2417 4ce46740 2019-08-08 stsp free(id_str);
2418 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2419 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2421 4ce46740 2019-08-08 stsp goto done;
2424 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2425 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2426 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2427 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2428 2ec1f75b 2019-03-26 stsp goto done;
2431 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2432 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2433 12463d8b 2019-12-13 stsp if (fd == -1) {
2434 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2435 12463d8b 2019-12-13 stsp goto done;
2438 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2439 12463d8b 2019-12-13 stsp if (fd == -1) {
2440 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2441 12463d8b 2019-12-13 stsp goto done;
2444 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2445 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2446 2ec1f75b 2019-03-26 stsp goto done;
2448 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2449 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2450 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2451 2ec1f75b 2019-03-26 stsp goto done;
2455 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2457 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2458 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2460 b72f483a 2019-02-05 stsp if (blob1)
2461 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2462 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2463 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2464 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2465 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2466 b72f483a 2019-02-05 stsp free(abspath);
2467 927df6b7 2019-02-10 stsp return err;
2470 927df6b7 2019-02-10 stsp static const struct got_error *
2471 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2473 b00d56cd 2018-04-01 stsp const struct got_error *error;
2474 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2475 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2476 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2477 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2478 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2479 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2480 15a94983 2018-12-23 stsp int type1, type2;
2481 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2482 c0cc5c62 2018-10-18 stsp const char *errstr;
2483 927df6b7 2019-02-10 stsp char *path = NULL;
2485 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2486 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2487 25eccc22 2019-01-04 stsp NULL) == -1)
2488 b00d56cd 2018-04-01 stsp err(1, "pledge");
2491 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2492 b00d56cd 2018-04-01 stsp switch (ch) {
2494 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2496 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2497 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2500 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2501 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2502 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2504 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2507 98eaaa12 2019-08-03 stsp diff_staged = 1;
2510 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2513 2deda0b9 2019-03-07 stsp usage_diff();
2514 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2518 b00d56cd 2018-04-01 stsp argc -= optind;
2519 b00d56cd 2018-04-01 stsp argv += optind;
2521 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2522 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2523 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2524 b72f483a 2019-02-05 stsp goto done;
2526 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2527 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2528 927df6b7 2019-02-10 stsp goto done;
2529 927df6b7 2019-02-10 stsp if (argc <= 1) {
2530 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2531 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2532 927df6b7 2019-02-10 stsp goto done;
2534 b72f483a 2019-02-05 stsp if (repo_path)
2536 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2537 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2538 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2539 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2540 927df6b7 2019-02-10 stsp goto done;
2542 927df6b7 2019-02-10 stsp if (argc == 1) {
2543 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2545 927df6b7 2019-02-10 stsp if (error)
2546 927df6b7 2019-02-10 stsp goto done;
2548 927df6b7 2019-02-10 stsp path = strdup("");
2549 927df6b7 2019-02-10 stsp if (path == NULL) {
2550 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2551 927df6b7 2019-02-10 stsp goto done;
2554 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2555 98eaaa12 2019-08-03 stsp if (diff_staged)
2556 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2557 98eaaa12 2019-08-03 stsp "objects in repository");
2558 15a94983 2018-12-23 stsp id_str1 = argv[0];
2559 15a94983 2018-12-23 stsp id_str2 = argv[1];
2560 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2561 30db809c 2019-06-05 stsp repo_path =
2562 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2563 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2564 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2565 30db809c 2019-06-05 stsp goto done;
2569 b00d56cd 2018-04-01 stsp usage_diff();
2571 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2572 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2573 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2574 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2577 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2578 76089277 2018-04-01 stsp free(repo_path);
2579 b00d56cd 2018-04-01 stsp if (error != NULL)
2580 b00d56cd 2018-04-01 stsp goto done;
2582 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2583 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2584 c02c541e 2019-03-29 stsp if (error)
2585 c02c541e 2019-03-29 stsp goto done;
2587 30db809c 2019-06-05 stsp if (argc <= 1) {
2588 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2589 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2590 b72f483a 2019-02-05 stsp char *id_str;
2592 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2594 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2595 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2596 b72f483a 2019-02-05 stsp if (error)
2597 b72f483a 2019-02-05 stsp goto done;
2598 b72f483a 2019-02-05 stsp arg.repo = repo;
2599 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2600 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2601 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2602 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2603 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2604 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2606 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2607 72ea6654 2019-07-27 stsp if (error)
2608 72ea6654 2019-07-27 stsp goto done;
2610 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2611 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2612 b72f483a 2019-02-05 stsp free(id_str);
2613 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2614 b72f483a 2019-02-05 stsp goto done;
2617 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
2618 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2619 0adb7196 2019-08-11 stsp if (error)
2620 0adb7196 2019-08-11 stsp goto done;
2622 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
2623 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2624 0adb7196 2019-08-11 stsp if (error)
2625 0adb7196 2019-08-11 stsp goto done;
2627 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2628 15a94983 2018-12-23 stsp if (error)
2629 15a94983 2018-12-23 stsp goto done;
2631 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2632 15a94983 2018-12-23 stsp if (error)
2633 15a94983 2018-12-23 stsp goto done;
2635 15a94983 2018-12-23 stsp if (type1 != type2) {
2636 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2637 b00d56cd 2018-04-01 stsp goto done;
2640 15a94983 2018-12-23 stsp switch (type1) {
2641 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2642 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2643 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2645 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2646 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2647 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2649 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2650 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2651 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2652 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2655 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2658 5e70831e 2019-05-28 stsp free(label1);
2659 5e70831e 2019-05-28 stsp free(label2);
2660 15a94983 2018-12-23 stsp free(id1);
2661 15a94983 2018-12-23 stsp free(id2);
2662 927df6b7 2019-02-10 stsp free(path);
2663 b72f483a 2019-02-05 stsp if (worktree)
2664 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2665 ad242220 2018-09-08 stsp if (repo) {
2666 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2667 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2668 ad242220 2018-09-08 stsp if (error == NULL)
2669 ad242220 2018-09-08 stsp error = repo_error;
2671 b00d56cd 2018-04-01 stsp return error;
2674 404c43c4 2018-06-21 stsp __dead static void
2675 404c43c4 2018-06-21 stsp usage_blame(void)
2677 9270e621 2019-02-05 stsp fprintf(stderr,
2678 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2679 404c43c4 2018-06-21 stsp getprogname());
2683 28315671 2019-08-14 stsp struct blame_line {
2684 28315671 2019-08-14 stsp int annotated;
2685 28315671 2019-08-14 stsp char *id_str;
2686 82f6abb8 2019-08-14 stsp char *committer;
2687 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2690 28315671 2019-08-14 stsp struct blame_cb_args {
2691 28315671 2019-08-14 stsp struct blame_line *lines;
2692 28315671 2019-08-14 stsp int nlines;
2693 7ef28ff8 2019-08-14 stsp int nlines_prec;
2694 28315671 2019-08-14 stsp int lineno_cur;
2695 28315671 2019-08-14 stsp off_t *line_offsets;
2697 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2700 404c43c4 2018-06-21 stsp static const struct got_error *
2701 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2703 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2704 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2705 28315671 2019-08-14 stsp struct blame_line *bline;
2706 82f6abb8 2019-08-14 stsp char *line = NULL;
2707 28315671 2019-08-14 stsp size_t linesize = 0;
2708 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2709 28315671 2019-08-14 stsp off_t offset;
2710 bcb49d15 2019-08-14 stsp struct tm tm;
2711 bcb49d15 2019-08-14 stsp time_t committer_time;
2713 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2714 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2715 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2717 28315671 2019-08-14 stsp if (sigint_received)
2718 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2720 2839f8b9 2019-08-18 stsp if (lineno == -1)
2721 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2723 28315671 2019-08-14 stsp /* Annotate this line. */
2724 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2725 28315671 2019-08-14 stsp if (bline->annotated)
2726 28315671 2019-08-14 stsp return NULL;
2727 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2729 28315671 2019-08-14 stsp return err;
2731 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2733 82f6abb8 2019-08-14 stsp goto done;
2735 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2736 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2737 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2738 bcb49d15 2019-08-14 stsp goto done;
2741 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2742 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2743 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2744 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2745 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2746 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2747 82f6abb8 2019-08-14 stsp goto done;
2749 28315671 2019-08-14 stsp bline->annotated = 1;
2751 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2752 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2753 28315671 2019-08-14 stsp if (!bline->annotated)
2754 82f6abb8 2019-08-14 stsp goto done;
2756 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2757 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2758 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2759 82f6abb8 2019-08-14 stsp goto done;
2762 28315671 2019-08-14 stsp while (bline->annotated) {
2763 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2764 82f6abb8 2019-08-14 stsp size_t len;
2766 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2767 28315671 2019-08-14 stsp if (ferror(a->f))
2768 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2772 82f6abb8 2019-08-14 stsp committer = bline->committer;
2773 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2774 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2775 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2776 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2778 82f6abb8 2019-08-14 stsp *at = '\0';
2779 82f6abb8 2019-08-14 stsp len = strlen(committer);
2780 82f6abb8 2019-08-14 stsp if (len >= 9)
2781 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2783 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2785 28315671 2019-08-14 stsp *nl = '\0';
2786 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2787 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2789 28315671 2019-08-14 stsp a->lineno_cur++;
2790 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2793 82f6abb8 2019-08-14 stsp if (commit)
2794 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2795 28315671 2019-08-14 stsp free(line);
2796 28315671 2019-08-14 stsp return err;
2799 28315671 2019-08-14 stsp static const struct got_error *
2800 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2802 404c43c4 2018-06-21 stsp const struct got_error *error;
2803 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2804 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2805 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2806 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2807 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2808 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2809 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2810 28315671 2019-08-14 stsp struct blame_cb_args bca;
2811 28315671 2019-08-14 stsp int ch, obj_type, i;
2812 b02560ec 2019-08-19 stsp size_t filesize;
2814 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2816 404c43c4 2018-06-21 stsp #ifndef PROFILE
2817 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2818 36e2fb66 2019-01-04 stsp NULL) == -1)
2819 404c43c4 2018-06-21 stsp err(1, "pledge");
2822 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2823 404c43c4 2018-06-21 stsp switch (ch) {
2825 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2828 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2829 66bea077 2018-08-02 stsp if (repo_path == NULL)
2830 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2832 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2835 2deda0b9 2019-03-07 stsp usage_blame();
2836 404c43c4 2018-06-21 stsp /* NOTREACHED */
2840 404c43c4 2018-06-21 stsp argc -= optind;
2841 404c43c4 2018-06-21 stsp argv += optind;
2843 a39318fd 2018-08-02 stsp if (argc == 1)
2844 404c43c4 2018-06-21 stsp path = argv[0];
2846 404c43c4 2018-06-21 stsp usage_blame();
2848 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2849 66bea077 2018-08-02 stsp if (cwd == NULL) {
2850 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2851 66bea077 2018-08-02 stsp goto done;
2853 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2854 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2855 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2856 66bea077 2018-08-02 stsp goto done;
2858 0c06baac 2019-02-05 stsp error = NULL;
2859 0c06baac 2019-02-05 stsp if (worktree) {
2860 0c06baac 2019-02-05 stsp repo_path =
2861 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2862 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2863 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2864 0c06baac 2019-02-05 stsp if (error)
2865 0c06baac 2019-02-05 stsp goto done;
2867 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2868 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2869 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2870 0c06baac 2019-02-05 stsp goto done;
2875 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2876 c02c541e 2019-03-29 stsp if (error != NULL)
2877 36e2fb66 2019-01-04 stsp goto done;
2879 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2880 c02c541e 2019-03-29 stsp if (error)
2881 404c43c4 2018-06-21 stsp goto done;
2883 0c06baac 2019-02-05 stsp if (worktree) {
2884 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2885 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2886 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2887 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2888 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2889 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2890 6efaaa2d 2019-02-05 stsp path) == -1) {
2891 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2892 0c06baac 2019-02-05 stsp goto done;
2894 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2897 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2899 0c06baac 2019-02-05 stsp if (error)
2900 66bea077 2018-08-02 stsp goto done;
2902 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2903 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2904 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
2905 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
2906 404c43c4 2018-06-21 stsp if (error != NULL)
2907 66bea077 2018-08-02 stsp goto done;
2908 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2909 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2910 404c43c4 2018-06-21 stsp if (error != NULL)
2911 66bea077 2018-08-02 stsp goto done;
2913 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2914 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2915 30837e32 2019-07-25 stsp if (error)
2916 66bea077 2018-08-02 stsp goto done;
2919 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2920 28315671 2019-08-14 stsp if (error)
2921 28315671 2019-08-14 stsp goto done;
2923 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2924 28315671 2019-08-14 stsp if (error)
2925 28315671 2019-08-14 stsp goto done;
2927 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2928 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2929 28315671 2019-08-14 stsp goto done;
2932 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2933 28315671 2019-08-14 stsp if (error)
2934 28315671 2019-08-14 stsp goto done;
2935 28315671 2019-08-14 stsp bca.f = got_opentemp();
2936 28315671 2019-08-14 stsp if (bca.f == NULL) {
2937 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2938 28315671 2019-08-14 stsp goto done;
2940 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2941 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2942 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2943 28315671 2019-08-14 stsp goto done;
2945 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2946 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2947 b02560ec 2019-08-19 stsp bca.nlines--;
2949 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2950 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2951 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2952 28315671 2019-08-14 stsp goto done;
2954 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2955 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2956 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2957 7ef28ff8 2019-08-14 stsp while (i > 0) {
2959 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2961 82f6abb8 2019-08-14 stsp bca.repo = repo;
2963 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2964 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2966 66bea077 2018-08-02 stsp free(in_repo_path);
2967 66bea077 2018-08-02 stsp free(repo_path);
2968 66bea077 2018-08-02 stsp free(cwd);
2969 404c43c4 2018-06-21 stsp free(commit_id);
2970 28315671 2019-08-14 stsp free(obj_id);
2972 28315671 2019-08-14 stsp got_object_blob_close(blob);
2973 0c06baac 2019-02-05 stsp if (worktree)
2974 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2975 ad242220 2018-09-08 stsp if (repo) {
2976 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2977 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2978 ad242220 2018-09-08 stsp if (error == NULL)
2979 ad242220 2018-09-08 stsp error = repo_error;
2981 3affba96 2019-09-22 stsp if (bca.lines) {
2982 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2983 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2984 3affba96 2019-09-22 stsp free(bline->id_str);
2985 3affba96 2019-09-22 stsp free(bline->committer);
2987 3affba96 2019-09-22 stsp free(bca.lines);
2989 28315671 2019-08-14 stsp free(bca.line_offsets);
2990 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2991 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2992 404c43c4 2018-06-21 stsp return error;
2995 5de5890b 2018-10-18 stsp __dead static void
2996 5de5890b 2018-10-18 stsp usage_tree(void)
2998 c1669e2e 2019-01-09 stsp fprintf(stderr,
2999 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
3000 5de5890b 2018-10-18 stsp getprogname());
3004 c1669e2e 2019-01-09 stsp static void
3005 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
3006 c1669e2e 2019-01-09 stsp const char *root_path)
3008 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
3009 848d6979 2019-08-12 stsp const char *modestr = "";
3010 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
3012 c1669e2e 2019-01-09 stsp path += strlen(root_path);
3013 c1669e2e 2019-01-09 stsp while (path[0] == '/')
3016 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
3017 63c5ca5d 2019-08-24 stsp modestr = "$";
3018 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
3019 848d6979 2019-08-12 stsp modestr = "@";
3020 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
3021 848d6979 2019-08-12 stsp modestr = "/";
3022 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
3023 848d6979 2019-08-12 stsp modestr = "*";
3025 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
3026 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
3029 5de5890b 2018-10-18 stsp static const struct got_error *
3030 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
3031 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
3032 c1669e2e 2019-01-09 stsp struct got_repository *repo)
3034 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
3035 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
3036 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
3037 56e0773d 2019-11-28 stsp int nentries, i;
3039 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
3041 5de5890b 2018-10-18 stsp goto done;
3043 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
3045 5de5890b 2018-10-18 stsp goto done;
3046 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
3047 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
3048 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
3049 5de5890b 2018-10-18 stsp char *id = NULL;
3051 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3054 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
3055 5de5890b 2018-10-18 stsp if (show_ids) {
3056 5de5890b 2018-10-18 stsp char *id_str;
3057 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
3058 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
3060 5de5890b 2018-10-18 stsp goto done;
3061 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
3062 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3063 5de5890b 2018-10-18 stsp free(id_str);
3064 5de5890b 2018-10-18 stsp goto done;
3066 5de5890b 2018-10-18 stsp free(id_str);
3068 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
3071 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
3072 c1669e2e 2019-01-09 stsp char *child_path;
3073 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
3074 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
3075 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
3076 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3077 c1669e2e 2019-01-09 stsp goto done;
3079 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
3080 c1669e2e 2019-01-09 stsp root_path, repo);
3081 c1669e2e 2019-01-09 stsp free(child_path);
3083 c1669e2e 2019-01-09 stsp goto done;
3088 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
3089 5de5890b 2018-10-18 stsp free(tree_id);
3090 5de5890b 2018-10-18 stsp return err;
3093 5de5890b 2018-10-18 stsp static const struct got_error *
3094 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
3096 5de5890b 2018-10-18 stsp const struct got_error *error;
3097 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
3098 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
3099 7a2c19d6 2019-02-05 stsp const char *path;
3100 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3101 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
3102 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
3103 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
3106 5de5890b 2018-10-18 stsp #ifndef PROFILE
3107 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3108 0f8d269b 2019-01-04 stsp NULL) == -1)
3109 5de5890b 2018-10-18 stsp err(1, "pledge");
3112 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
3113 5de5890b 2018-10-18 stsp switch (ch) {
3115 5de5890b 2018-10-18 stsp commit_id_str = optarg;
3118 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
3119 5de5890b 2018-10-18 stsp if (repo_path == NULL)
3120 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3122 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3125 5de5890b 2018-10-18 stsp show_ids = 1;
3128 c1669e2e 2019-01-09 stsp recurse = 1;
3131 2deda0b9 2019-03-07 stsp usage_tree();
3132 5de5890b 2018-10-18 stsp /* NOTREACHED */
3136 5de5890b 2018-10-18 stsp argc -= optind;
3137 5de5890b 2018-10-18 stsp argv += optind;
3139 5de5890b 2018-10-18 stsp if (argc == 1)
3140 5de5890b 2018-10-18 stsp path = argv[0];
3141 5de5890b 2018-10-18 stsp else if (argc > 1)
3142 5de5890b 2018-10-18 stsp usage_tree();
3144 7a2c19d6 2019-02-05 stsp path = NULL;
3146 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
3147 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
3148 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3149 9bf7a39b 2019-02-05 stsp goto done;
3151 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
3152 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3153 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3154 7a2c19d6 2019-02-05 stsp goto done;
3156 7a2c19d6 2019-02-05 stsp error = NULL;
3157 7a2c19d6 2019-02-05 stsp if (worktree) {
3158 7a2c19d6 2019-02-05 stsp repo_path =
3159 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3160 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
3161 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3162 7a2c19d6 2019-02-05 stsp if (error)
3163 7a2c19d6 2019-02-05 stsp goto done;
3165 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
3166 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
3167 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3168 7a2c19d6 2019-02-05 stsp goto done;
3173 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3174 5de5890b 2018-10-18 stsp if (error != NULL)
3175 c02c541e 2019-03-29 stsp goto done;
3177 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3178 c02c541e 2019-03-29 stsp if (error)
3179 5de5890b 2018-10-18 stsp goto done;
3181 9bf7a39b 2019-02-05 stsp if (path == NULL) {
3182 9bf7a39b 2019-02-05 stsp if (worktree) {
3183 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3184 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3185 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
3186 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
3187 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
3188 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3189 9bf7a39b 2019-02-05 stsp goto done;
3191 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3193 9bf7a39b 2019-02-05 stsp if (error)
3194 9bf7a39b 2019-02-05 stsp goto done;
3196 9bf7a39b 2019-02-05 stsp path = "/";
3198 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3199 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3200 9bf7a39b 2019-02-05 stsp if (error != NULL)
3201 9bf7a39b 2019-02-05 stsp goto done;
3204 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3205 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3206 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3207 5de5890b 2018-10-18 stsp if (error != NULL)
3208 5de5890b 2018-10-18 stsp goto done;
3209 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3210 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3211 5de5890b 2018-10-18 stsp if (error != NULL)
3212 5de5890b 2018-10-18 stsp goto done;
3214 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3215 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3216 30837e32 2019-07-25 stsp if (error)
3217 5de5890b 2018-10-18 stsp goto done;
3220 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3221 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3223 5de5890b 2018-10-18 stsp free(in_repo_path);
3224 5de5890b 2018-10-18 stsp free(repo_path);
3225 5de5890b 2018-10-18 stsp free(cwd);
3226 5de5890b 2018-10-18 stsp free(commit_id);
3227 7a2c19d6 2019-02-05 stsp if (worktree)
3228 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3229 5de5890b 2018-10-18 stsp if (repo) {
3230 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3231 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3232 5de5890b 2018-10-18 stsp if (error == NULL)
3233 5de5890b 2018-10-18 stsp error = repo_error;
3235 5de5890b 2018-10-18 stsp return error;
3238 6bad629b 2019-02-04 stsp __dead static void
3239 6bad629b 2019-02-04 stsp usage_status(void)
3241 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3245 b72f483a 2019-02-05 stsp static const struct got_error *
3246 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3247 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3248 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3249 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3251 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3252 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3253 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3254 b72f483a 2019-02-05 stsp return NULL;
3257 6bad629b 2019-02-04 stsp static const struct got_error *
3258 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3260 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3261 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3262 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3263 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3264 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3265 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3268 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3270 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3271 6bad629b 2019-02-04 stsp switch (ch) {
3273 2deda0b9 2019-03-07 stsp usage_status();
3274 6bad629b 2019-02-04 stsp /* NOTREACHED */
3278 6bad629b 2019-02-04 stsp argc -= optind;
3279 6bad629b 2019-02-04 stsp argv += optind;
3281 6bad629b 2019-02-04 stsp #ifndef PROFILE
3282 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3283 6bad629b 2019-02-04 stsp NULL) == -1)
3284 6bad629b 2019-02-04 stsp err(1, "pledge");
3286 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3287 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3288 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3289 927df6b7 2019-02-10 stsp goto done;
3292 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3293 927df6b7 2019-02-10 stsp if (error != NULL)
3294 a5edda0a 2019-07-27 stsp goto done;
3296 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3298 6bad629b 2019-02-04 stsp if (error != NULL)
3299 6bad629b 2019-02-04 stsp goto done;
3301 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3302 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3303 087fb88c 2019-08-04 stsp if (error)
3304 087fb88c 2019-08-04 stsp goto done;
3306 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3307 6bad629b 2019-02-04 stsp if (error)
3308 6bad629b 2019-02-04 stsp goto done;
3310 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3311 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3313 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3314 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3315 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3316 927df6b7 2019-02-10 stsp free(cwd);
3317 d0eebce4 2019-03-11 stsp return error;
3320 d0eebce4 2019-03-11 stsp __dead static void
3321 d0eebce4 2019-03-11 stsp usage_ref(void)
3323 d0eebce4 2019-03-11 stsp fprintf(stderr,
3324 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3325 d0eebce4 2019-03-11 stsp getprogname());
3329 d0eebce4 2019-03-11 stsp static const struct got_error *
3330 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3332 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3333 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3334 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3336 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3337 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3339 d0eebce4 2019-03-11 stsp return err;
3341 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3342 d0eebce4 2019-03-11 stsp char *refstr;
3343 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3344 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3345 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3346 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3347 d0eebce4 2019-03-11 stsp free(refstr);
3350 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3351 d0eebce4 2019-03-11 stsp return NULL;
3354 d0eebce4 2019-03-11 stsp static const struct got_error *
3355 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3357 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3358 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3360 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3362 d0eebce4 2019-03-11 stsp return err;
3364 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3365 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3366 d0eebce4 2019-03-11 stsp return err;
3369 d0eebce4 2019-03-11 stsp static const struct got_error *
3370 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3372 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3373 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3374 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3377 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3378 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3379 d1644381 2019-07-14 stsp * an unintended typo.
3381 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3382 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3384 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3386 d83d9d5c 2019-05-13 stsp if (err) {
3387 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3389 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3390 d83d9d5c 2019-05-13 stsp return err;
3391 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3393 d83d9d5c 2019-05-13 stsp return err;
3394 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3395 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3397 d83d9d5c 2019-05-13 stsp return err;
3400 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3402 d0eebce4 2019-03-11 stsp goto done;
3404 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3407 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3409 d1c1ae5f 2019-08-12 stsp return err;
3412 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3413 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3415 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3416 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3417 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3420 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3421 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3422 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3424 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3425 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3427 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3429 d1c1ae5f 2019-08-12 stsp return err;
3431 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3433 d1c1ae5f 2019-08-12 stsp goto done;
3435 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3437 d1c1ae5f 2019-08-12 stsp if (target_ref)
3438 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3440 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3441 d0eebce4 2019-03-11 stsp return err;
3444 d0eebce4 2019-03-11 stsp static const struct got_error *
3445 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3447 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3448 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3449 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3450 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3451 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3452 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3454 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3455 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3456 d0eebce4 2019-03-11 stsp switch (ch) {
3458 d0eebce4 2019-03-11 stsp delref = optarg;
3461 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3462 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3463 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3465 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3468 d0eebce4 2019-03-11 stsp do_list = 1;
3471 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3474 d0eebce4 2019-03-11 stsp usage_ref();
3475 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3479 d0eebce4 2019-03-11 stsp if (do_list && delref)
3480 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3482 d0eebce4 2019-03-11 stsp argc -= optind;
3483 d0eebce4 2019-03-11 stsp argv += optind;
3485 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3486 d1c1ae5f 2019-08-12 stsp if (create_symref)
3487 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3488 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3489 d0eebce4 2019-03-11 stsp if (argc > 0)
3490 d0eebce4 2019-03-11 stsp usage_ref();
3491 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3492 d0eebce4 2019-03-11 stsp usage_ref();
3494 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3495 e0b57350 2019-03-12 stsp if (do_list) {
3496 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3497 e0b57350 2019-03-12 stsp NULL) == -1)
3498 e0b57350 2019-03-12 stsp err(1, "pledge");
3500 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3501 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3502 e0b57350 2019-03-12 stsp err(1, "pledge");
3505 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3506 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3507 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3508 d0eebce4 2019-03-11 stsp goto done;
3511 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3512 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3513 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3514 d0eebce4 2019-03-11 stsp goto done;
3516 d0eebce4 2019-03-11 stsp error = NULL;
3517 d0eebce4 2019-03-11 stsp if (worktree) {
3518 d0eebce4 2019-03-11 stsp repo_path =
3519 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3520 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3521 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3522 d0eebce4 2019-03-11 stsp if (error)
3523 d0eebce4 2019-03-11 stsp goto done;
3525 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3526 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3527 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3528 d0eebce4 2019-03-11 stsp goto done;
3533 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3534 d0eebce4 2019-03-11 stsp if (error != NULL)
3535 d0eebce4 2019-03-11 stsp goto done;
3537 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3538 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3539 c02c541e 2019-03-29 stsp if (error)
3540 c02c541e 2019-03-29 stsp goto done;
3542 d0eebce4 2019-03-11 stsp if (do_list)
3543 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3544 d0eebce4 2019-03-11 stsp else if (delref)
3545 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3546 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3547 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3549 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3552 4e759de4 2019-06-26 stsp got_repo_close(repo);
3553 4e759de4 2019-06-26 stsp if (worktree)
3554 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3555 4e759de4 2019-06-26 stsp free(cwd);
3556 4e759de4 2019-06-26 stsp free(repo_path);
3557 4e759de4 2019-06-26 stsp return error;
3560 4e759de4 2019-06-26 stsp __dead static void
3561 4e759de4 2019-06-26 stsp usage_branch(void)
3563 4e759de4 2019-06-26 stsp fprintf(stderr,
3564 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
3565 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
3569 4e759de4 2019-06-26 stsp static const struct got_error *
3570 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3571 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3573 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3574 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3575 4e99b47e 2019-10-04 stsp char *refstr;
3577 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3578 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3579 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3580 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3582 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3584 4e99b47e 2019-10-04 stsp return err;
3585 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3586 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3587 4e99b47e 2019-10-04 stsp marker = "* ";
3589 4e99b47e 2019-10-04 stsp marker = "~ ";
3593 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3594 4e99b47e 2019-10-04 stsp refname += 11;
3595 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3596 4e99b47e 2019-10-04 stsp refname += 18;
3598 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3599 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3600 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3602 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3603 4e99b47e 2019-10-04 stsp free(refstr);
3604 4e99b47e 2019-10-04 stsp return NULL;
3607 4e99b47e 2019-10-04 stsp static const struct got_error *
3608 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3610 ad89fa31 2019-10-04 stsp const char *refname;
3612 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3613 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3615 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3617 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3618 ad89fa31 2019-10-04 stsp refname += 11;
3619 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3620 ad89fa31 2019-10-04 stsp refname += 18;
3622 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3624 ad89fa31 2019-10-04 stsp return NULL;
3627 ad89fa31 2019-10-04 stsp static const struct got_error *
3628 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3630 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3631 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3632 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3633 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3634 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3636 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3638 4e99b47e 2019-10-04 stsp if (worktree) {
3639 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3640 4e99b47e 2019-10-04 stsp worktree);
3642 4e99b47e 2019-10-04 stsp return err;
3644 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3645 4e99b47e 2019-10-04 stsp worktree);
3647 4e99b47e 2019-10-04 stsp return err;
3649 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3650 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3651 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3653 4e99b47e 2019-10-04 stsp return err;
3654 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3655 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3659 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3660 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3662 4e759de4 2019-06-26 stsp return err;
3664 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3665 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3667 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3668 4e759de4 2019-06-26 stsp return NULL;
3671 4e759de4 2019-06-26 stsp static const struct got_error *
3672 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3673 45cd4e47 2019-08-25 stsp const char *branch_name)
3675 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3676 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3677 4e759de4 2019-06-26 stsp char *refname;
3679 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3680 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3682 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3684 4e759de4 2019-06-26 stsp goto done;
3686 45cd4e47 2019-08-25 stsp if (worktree &&
3687 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3688 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3689 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3690 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3691 45cd4e47 2019-08-25 stsp goto done;
3694 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3697 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3698 4e759de4 2019-06-26 stsp free(refname);
3699 4e759de4 2019-06-26 stsp return err;
3702 4e759de4 2019-06-26 stsp static const struct got_error *
3703 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3704 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3706 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3707 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3708 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3711 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3712 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3713 d3f84d51 2019-07-11 stsp * an unintended typo.
3715 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3716 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3718 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3719 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3720 4e759de4 2019-06-26 stsp goto done;
3723 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3724 4e759de4 2019-06-26 stsp if (err == NULL) {
3725 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3726 4e759de4 2019-06-26 stsp goto done;
3727 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3728 4e759de4 2019-06-26 stsp goto done;
3730 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3732 4e759de4 2019-06-26 stsp goto done;
3734 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3737 4e759de4 2019-06-26 stsp got_ref_close(ref);
3738 4e759de4 2019-06-26 stsp free(base_refname);
3739 4e759de4 2019-06-26 stsp free(refname);
3740 4e759de4 2019-06-26 stsp return err;
3743 4e759de4 2019-06-26 stsp static const struct got_error *
3744 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
3746 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3747 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3748 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3749 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3750 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
3751 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3752 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
3753 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
3754 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
3755 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
3756 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
3758 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
3760 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
3761 4e759de4 2019-06-26 stsp switch (ch) {
3763 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3766 4e759de4 2019-06-26 stsp delref = optarg;
3769 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3770 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3771 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3773 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3776 4e759de4 2019-06-26 stsp do_list = 1;
3779 da76fce2 2020-02-24 stsp do_update = 0;
3782 4e759de4 2019-06-26 stsp usage_branch();
3783 4e759de4 2019-06-26 stsp /* NOTREACHED */
3787 4e759de4 2019-06-26 stsp if (do_list && delref)
3788 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3790 4e759de4 2019-06-26 stsp argc -= optind;
3791 4e759de4 2019-06-26 stsp argv += optind;
3793 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3794 ad89fa31 2019-10-04 stsp do_show = 1;
3796 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3797 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3799 4e759de4 2019-06-26 stsp if (do_list || delref) {
3800 4e759de4 2019-06-26 stsp if (argc > 0)
3801 4e759de4 2019-06-26 stsp usage_branch();
3802 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3803 4e759de4 2019-06-26 stsp usage_branch();
3805 4e759de4 2019-06-26 stsp #ifndef PROFILE
3806 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3807 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3808 4e759de4 2019-06-26 stsp NULL) == -1)
3809 4e759de4 2019-06-26 stsp err(1, "pledge");
3811 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3812 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3813 4e759de4 2019-06-26 stsp err(1, "pledge");
3816 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3817 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3818 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3819 4e759de4 2019-06-26 stsp goto done;
3822 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3823 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3824 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3825 4e759de4 2019-06-26 stsp goto done;
3827 4e759de4 2019-06-26 stsp error = NULL;
3828 4e759de4 2019-06-26 stsp if (worktree) {
3829 4e759de4 2019-06-26 stsp repo_path =
3830 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3831 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3832 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3833 4e759de4 2019-06-26 stsp if (error)
3834 4e759de4 2019-06-26 stsp goto done;
3836 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3837 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3838 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3839 4e759de4 2019-06-26 stsp goto done;
3844 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3845 4e759de4 2019-06-26 stsp if (error != NULL)
3846 4e759de4 2019-06-26 stsp goto done;
3848 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3849 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3850 4e759de4 2019-06-26 stsp if (error)
3851 4e759de4 2019-06-26 stsp goto done;
3853 ad89fa31 2019-10-04 stsp if (do_show)
3854 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3855 ad89fa31 2019-10-04 stsp else if (do_list)
3856 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3857 4e759de4 2019-06-26 stsp else if (delref)
3858 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3860 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3861 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3862 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3863 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3864 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3865 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3866 a74f7e83 2019-11-10 stsp if (error)
3867 a74f7e83 2019-11-10 stsp goto done;
3868 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3869 da76fce2 2020-02-24 stsp if (error)
3870 da76fce2 2020-02-24 stsp goto done;
3871 da76fce2 2020-02-24 stsp if (worktree && do_update) {
3872 da76fce2 2020-02-24 stsp int did_something = 0;
3873 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
3875 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
3876 da76fce2 2020-02-24 stsp if (error)
3877 da76fce2 2020-02-24 stsp goto done;
3878 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
3879 da76fce2 2020-02-24 stsp worktree);
3880 da76fce2 2020-02-24 stsp if (error)
3881 da76fce2 2020-02-24 stsp goto done;
3882 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
3884 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
3885 da76fce2 2020-02-24 stsp goto done;
3887 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
3888 da76fce2 2020-02-24 stsp free(branch_refname);
3889 da76fce2 2020-02-24 stsp if (error)
3890 da76fce2 2020-02-24 stsp goto done;
3891 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
3893 da76fce2 2020-02-24 stsp if (error)
3894 da76fce2 2020-02-24 stsp goto done;
3895 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3896 da76fce2 2020-02-24 stsp commit_id);
3897 da76fce2 2020-02-24 stsp if (error)
3898 da76fce2 2020-02-24 stsp goto done;
3899 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
3900 da76fce2 2020-02-24 stsp repo, update_progress, &did_something,
3901 da76fce2 2020-02-24 stsp check_cancelled, NULL);
3902 da76fce2 2020-02-24 stsp if (error)
3903 da76fce2 2020-02-24 stsp goto done;
3904 da76fce2 2020-02-24 stsp if (did_something)
3905 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
3910 da76fce2 2020-02-24 stsp got_ref_close(ref);
3912 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3913 d0eebce4 2019-03-11 stsp if (worktree)
3914 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3915 d0eebce4 2019-03-11 stsp free(cwd);
3916 d0eebce4 2019-03-11 stsp free(repo_path);
3917 da76fce2 2020-02-24 stsp free(commit_id);
3918 da76fce2 2020-02-24 stsp free(commit_id_str);
3919 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
3920 da76fce2 2020-02-24 stsp free((char *)pe->path);
3921 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
3922 d00136be 2019-03-26 stsp return error;
3926 d00136be 2019-03-26 stsp __dead static void
3927 8e7bd50a 2019-08-22 stsp usage_tag(void)
3929 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3930 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
3931 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
3936 b8bad2ba 2019-08-23 stsp static const struct got_error *
3937 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3939 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3940 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3941 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3942 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3943 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3945 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3946 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3947 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3948 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3950 b8bad2ba 2019-08-23 stsp return err;
3951 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3954 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3957 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3958 b8bad2ba 2019-08-23 stsp free(re_id);
3961 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3962 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3965 b8bad2ba 2019-08-23 stsp while (se) {
3966 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3969 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3970 b8bad2ba 2019-08-23 stsp free(se_id);
3973 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3974 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3976 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3977 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3979 b8bad2ba 2019-08-23 stsp return err;
3980 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3983 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3988 b8bad2ba 2019-08-23 stsp return err;
3992 b8bad2ba 2019-08-23 stsp static const struct got_error *
3993 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3995 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3996 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3997 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3999 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
4001 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
4003 8e7bd50a 2019-08-22 stsp return err;
4005 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4006 8e7bd50a 2019-08-22 stsp const char *refname;
4007 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
4008 8e7bd50a 2019-08-22 stsp char datebuf[26];
4009 d4efa91b 2020-01-14 stsp const char *tagger;
4010 8e7bd50a 2019-08-22 stsp time_t tagger_time;
4011 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
4012 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
4013 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
4015 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
4016 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
4018 8e7bd50a 2019-08-22 stsp refname += 10;
4019 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
4020 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
4021 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
4024 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
4025 8e7bd50a 2019-08-22 stsp free(refstr);
4027 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
4030 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
4031 d4efa91b 2020-01-14 stsp if (err) {
4032 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
4036 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
4037 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
4038 d4efa91b 2020-01-14 stsp if (err) {
4042 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
4043 d4efa91b 2020-01-14 stsp tagger_time =
4044 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
4045 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
4051 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
4052 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
4053 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
4054 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
4058 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
4059 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
4060 2417344c 2019-08-23 stsp if (datestr)
4061 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
4062 d4efa91b 2020-01-14 stsp if (commit)
4063 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
4065 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
4066 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
4067 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
4070 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
4071 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
4074 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
4075 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
4078 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
4079 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
4086 8e7bd50a 2019-08-22 stsp free(id_str);
4087 d4efa91b 2020-01-14 stsp if (commit) {
4088 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
4091 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
4093 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
4094 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
4095 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
4096 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
4101 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
4103 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
4105 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
4106 8e7bd50a 2019-08-22 stsp } while (line);
4107 8e7bd50a 2019-08-22 stsp free(tagmsg0);
4110 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
4111 8e7bd50a 2019-08-22 stsp return NULL;
4114 8e7bd50a 2019-08-22 stsp static const struct got_error *
4115 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
4116 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
4118 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
4119 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
4120 f372d5cd 2019-10-21 stsp char *editor = NULL;
4121 8e7bd50a 2019-08-22 stsp int fd = -1;
4123 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
4124 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4125 8e7bd50a 2019-08-22 stsp goto done;
4128 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
4129 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
4130 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4131 8e7bd50a 2019-08-22 stsp goto done;
4134 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
4136 8e7bd50a 2019-08-22 stsp goto done;
4138 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
4139 8e7bd50a 2019-08-22 stsp close(fd);
4141 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
4143 8e7bd50a 2019-08-22 stsp goto done;
4144 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
4146 8e7bd50a 2019-08-22 stsp free(initial_content);
4147 8e7bd50a 2019-08-22 stsp free(template);
4148 8e7bd50a 2019-08-22 stsp free(editor);
4150 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
4151 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4152 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
4153 8e7bd50a 2019-08-22 stsp if (err) {
4154 8e7bd50a 2019-08-22 stsp free(*tagmsg);
4155 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
4158 8e7bd50a 2019-08-22 stsp return err;
4161 8e7bd50a 2019-08-22 stsp static const struct got_error *
4162 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
4163 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
4165 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
4166 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
4167 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
4168 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
4169 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
4170 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
4171 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
4174 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
4175 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
4176 8e7bd50a 2019-08-22 stsp * an unintended typo.
4178 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
4179 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
4181 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
4183 8e7bd50a 2019-08-22 stsp return err;
4185 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
4186 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
4188 8e7bd50a 2019-08-22 stsp goto done;
4190 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
4192 8e7bd50a 2019-08-22 stsp goto done;
4194 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
4195 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
4196 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
4197 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
4198 8e7bd50a 2019-08-22 stsp goto done;
4200 8e7bd50a 2019-08-22 stsp tag_name += 10;
4201 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
4202 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4203 8e7bd50a 2019-08-22 stsp goto done;
4206 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
4207 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4208 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
4209 8e7bd50a 2019-08-22 stsp goto done;
4210 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
4211 8e7bd50a 2019-08-22 stsp goto done;
4213 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
4214 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
4215 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
4216 f372d5cd 2019-10-21 stsp if (err) {
4217 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4218 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
4219 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4220 8e7bd50a 2019-08-22 stsp goto done;
4224 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
4225 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
4226 f372d5cd 2019-10-21 stsp if (err) {
4227 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4228 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4229 8e7bd50a 2019-08-22 stsp goto done;
4232 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
4233 f372d5cd 2019-10-21 stsp if (err) {
4234 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4235 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4236 8e7bd50a 2019-08-22 stsp goto done;
4239 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
4240 f372d5cd 2019-10-21 stsp if (err) {
4241 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4242 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4243 f372d5cd 2019-10-21 stsp goto done;
4246 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
4247 f372d5cd 2019-10-21 stsp if (err) {
4248 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4249 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4250 f372d5cd 2019-10-21 stsp goto done;
4252 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4254 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4255 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4256 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4257 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4258 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4259 f372d5cd 2019-10-21 stsp free(tag_id_str);
4261 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4262 8e7bd50a 2019-08-22 stsp free(commit_id);
4263 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4264 8e7bd50a 2019-08-22 stsp free(refname);
4265 8e7bd50a 2019-08-22 stsp free(tagmsg);
4266 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4267 aba9c984 2019-09-08 stsp free(tagger);
4268 8e7bd50a 2019-08-22 stsp return err;
4271 8e7bd50a 2019-08-22 stsp static const struct got_error *
4272 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4274 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4275 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4276 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4277 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4278 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4279 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4280 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4282 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
4283 8e7bd50a 2019-08-22 stsp switch (ch) {
4285 80106605 2020-02-24 stsp commit_id_arg = optarg;
4288 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4291 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4292 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4293 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4295 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4298 8e7bd50a 2019-08-22 stsp do_list = 1;
4301 8e7bd50a 2019-08-22 stsp usage_tag();
4302 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4306 8e7bd50a 2019-08-22 stsp argc -= optind;
4307 8e7bd50a 2019-08-22 stsp argv += optind;
4309 8e7bd50a 2019-08-22 stsp if (do_list) {
4310 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
4311 80106605 2020-02-24 stsp errx(1, "-c option can only be used when creating a tag");
4312 8e7bd50a 2019-08-22 stsp if (tagmsg)
4313 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
4314 8e7bd50a 2019-08-22 stsp if (argc > 0)
4315 8e7bd50a 2019-08-22 stsp usage_tag();
4316 80106605 2020-02-24 stsp } else if (argc != 1)
4317 8e7bd50a 2019-08-22 stsp usage_tag();
4319 a2887370 2019-08-23 stsp tag_name = argv[0];
4321 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4322 8e7bd50a 2019-08-22 stsp if (do_list) {
4323 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4324 8e7bd50a 2019-08-22 stsp NULL) == -1)
4325 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4327 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4328 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4329 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4332 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4333 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4334 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4335 8e7bd50a 2019-08-22 stsp goto done;
4338 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4339 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4340 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4341 8e7bd50a 2019-08-22 stsp goto done;
4343 8e7bd50a 2019-08-22 stsp error = NULL;
4344 8e7bd50a 2019-08-22 stsp if (worktree) {
4345 8e7bd50a 2019-08-22 stsp repo_path =
4346 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4347 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4348 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4349 8e7bd50a 2019-08-22 stsp if (error)
4350 8e7bd50a 2019-08-22 stsp goto done;
4352 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4353 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4354 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4355 8e7bd50a 2019-08-22 stsp goto done;
4360 8e7bd50a 2019-08-22 stsp if (do_list) {
4361 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4362 c9956ddf 2019-09-08 stsp if (error != NULL)
4363 c9956ddf 2019-09-08 stsp goto done;
4364 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4365 8e7bd50a 2019-08-22 stsp if (error)
4366 8e7bd50a 2019-08-22 stsp goto done;
4367 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4369 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4370 c9956ddf 2019-09-08 stsp if (error)
4371 c9956ddf 2019-09-08 stsp goto done;
4372 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4373 c9956ddf 2019-09-08 stsp if (error != NULL)
4374 c9956ddf 2019-09-08 stsp goto done;
4376 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4377 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4378 8e7bd50a 2019-08-22 stsp if (error)
4379 8e7bd50a 2019-08-22 stsp goto done;
4382 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4383 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4384 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4385 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4386 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4387 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4388 8e7bd50a 2019-08-22 stsp if (error)
4389 8e7bd50a 2019-08-22 stsp goto done;
4390 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4391 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4392 8e7bd50a 2019-08-22 stsp if (error)
4393 8e7bd50a 2019-08-22 stsp goto done;
4394 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4395 8e7bd50a 2019-08-22 stsp free(commit_id);
4396 8e7bd50a 2019-08-22 stsp if (error)
4397 8e7bd50a 2019-08-22 stsp goto done;
4400 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4401 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4405 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4406 8e7bd50a 2019-08-22 stsp if (worktree)
4407 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4408 8e7bd50a 2019-08-22 stsp free(cwd);
4409 8e7bd50a 2019-08-22 stsp free(repo_path);
4410 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4411 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4412 8e7bd50a 2019-08-22 stsp return error;
4415 8e7bd50a 2019-08-22 stsp __dead static void
4416 d00136be 2019-03-26 stsp usage_add(void)
4418 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4419 022fae89 2019-12-06 tracey getprogname());
4423 d00136be 2019-03-26 stsp static const struct got_error *
4424 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4426 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4428 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4429 4e68cba3 2019-11-23 stsp return NULL;
4432 4e68cba3 2019-11-23 stsp static const struct got_error *
4433 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4435 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4436 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4437 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4438 1dd54920 2019-05-11 stsp char *cwd = NULL;
4439 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4440 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4441 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4443 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4445 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4446 d00136be 2019-03-26 stsp switch (ch) {
4447 022fae89 2019-12-06 tracey case 'I':
4448 022fae89 2019-12-06 tracey no_ignores = 1;
4451 4e68cba3 2019-11-23 stsp can_recurse = 1;
4454 d00136be 2019-03-26 stsp usage_add();
4455 d00136be 2019-03-26 stsp /* NOTREACHED */
4459 d00136be 2019-03-26 stsp argc -= optind;
4460 d00136be 2019-03-26 stsp argv += optind;
4462 43012d58 2019-07-14 stsp #ifndef PROFILE
4463 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4464 43012d58 2019-07-14 stsp NULL) == -1)
4465 43012d58 2019-07-14 stsp err(1, "pledge");
4467 723c305c 2019-05-11 jcs if (argc < 1)
4468 d00136be 2019-03-26 stsp usage_add();
4470 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4471 d00136be 2019-03-26 stsp if (cwd == NULL) {
4472 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4473 d00136be 2019-03-26 stsp goto done;
4476 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4477 d00136be 2019-03-26 stsp if (error)
4478 d00136be 2019-03-26 stsp goto done;
4480 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4482 031a5338 2019-03-26 stsp if (error != NULL)
4483 031a5338 2019-03-26 stsp goto done;
4485 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4486 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4487 d00136be 2019-03-26 stsp if (error)
4488 d00136be 2019-03-26 stsp goto done;
4490 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4491 6d022e97 2019-08-04 stsp if (error)
4492 022fae89 2019-12-06 tracey goto done;
4494 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4495 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4496 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4497 6d022e97 2019-08-04 stsp goto done;
4501 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4502 4e68cba3 2019-11-23 stsp char *ondisk_path;
4503 4e68cba3 2019-11-23 stsp struct stat sb;
4504 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4505 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4506 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4507 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4508 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4509 4e68cba3 2019-11-23 stsp goto done;
4511 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4512 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4513 4e68cba3 2019-11-23 stsp free(ondisk_path);
4516 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4517 4e68cba3 2019-11-23 stsp ondisk_path);
4518 4e68cba3 2019-11-23 stsp free(ondisk_path);
4519 4e68cba3 2019-11-23 stsp goto done;
4521 4e68cba3 2019-11-23 stsp free(ondisk_path);
4522 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4523 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4524 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4525 4e68cba3 2019-11-23 stsp goto done;
4530 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4531 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4534 031a5338 2019-03-26 stsp got_repo_close(repo);
4535 d00136be 2019-03-26 stsp if (worktree)
4536 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4537 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4538 1dd54920 2019-05-11 stsp free((char *)pe->path);
4539 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4540 2ec1f75b 2019-03-26 stsp free(cwd);
4541 2ec1f75b 2019-03-26 stsp return error;
4544 2ec1f75b 2019-03-26 stsp __dead static void
4545 648e4ef7 2019-07-09 stsp usage_remove(void)
4547 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4548 f2a9dc41 2019-12-13 tracey getprogname());
4552 2a06fe5f 2019-08-24 stsp static const struct got_error *
4553 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4554 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4556 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4558 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4559 2a06fe5f 2019-08-24 stsp return NULL;
4560 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4561 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4562 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4563 2a06fe5f 2019-08-24 stsp return NULL;
4566 2ec1f75b 2019-03-26 stsp static const struct got_error *
4567 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4569 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4570 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4571 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4572 17ed4618 2019-06-02 stsp char *cwd = NULL;
4573 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4574 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4575 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4577 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4579 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4580 2ec1f75b 2019-03-26 stsp switch (ch) {
4582 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4584 70e3e7f5 2019-12-13 tracey case 'k':
4585 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4587 f2a9dc41 2019-12-13 tracey case 'R':
4588 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4591 f2a9dc41 2019-12-13 tracey usage_remove();
4592 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4596 2ec1f75b 2019-03-26 stsp argc -= optind;
4597 2ec1f75b 2019-03-26 stsp argv += optind;
4599 43012d58 2019-07-14 stsp #ifndef PROFILE
4600 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4601 43012d58 2019-07-14 stsp NULL) == -1)
4602 43012d58 2019-07-14 stsp err(1, "pledge");
4604 17ed4618 2019-06-02 stsp if (argc < 1)
4605 648e4ef7 2019-07-09 stsp usage_remove();
4607 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4608 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4609 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4610 2ec1f75b 2019-03-26 stsp goto done;
4612 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4613 2ec1f75b 2019-03-26 stsp if (error)
4614 2ec1f75b 2019-03-26 stsp goto done;
4616 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4619 2ec1f75b 2019-03-26 stsp goto done;
4621 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4622 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4623 2ec1f75b 2019-03-26 stsp if (error)
4624 2ec1f75b 2019-03-26 stsp goto done;
4626 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4627 6d022e97 2019-08-04 stsp if (error)
4628 6d022e97 2019-08-04 stsp goto done;
4630 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4631 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4632 f2a9dc41 2019-12-13 tracey struct stat sb;
4633 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4634 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4635 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4636 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4637 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4638 f2a9dc41 2019-12-13 tracey goto done;
4640 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4641 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4642 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4643 f2a9dc41 2019-12-13 tracey continue;
4645 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4646 f2a9dc41 2019-12-13 tracey ondisk_path);
4647 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4648 f2a9dc41 2019-12-13 tracey goto done;
4650 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4651 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4652 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4653 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4654 f2a9dc41 2019-12-13 tracey goto done;
4659 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4660 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4663 a129376b 2019-03-28 stsp got_repo_close(repo);
4664 a129376b 2019-03-28 stsp if (worktree)
4665 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4666 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4667 17ed4618 2019-06-02 stsp free((char *)pe->path);
4668 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4669 a129376b 2019-03-28 stsp free(cwd);
4670 a129376b 2019-03-28 stsp return error;
4673 a129376b 2019-03-28 stsp __dead static void
4674 a129376b 2019-03-28 stsp usage_revert(void)
4676 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4677 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4681 1ee397ad 2019-07-12 stsp static const struct got_error *
4682 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4684 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
4685 fb9704af 2020-01-27 stsp return NULL;
4687 a129376b 2019-03-28 stsp while (path[0] == '/')
4689 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4690 33aa809d 2019-08-08 stsp return NULL;
4693 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4694 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4695 33aa809d 2019-08-08 stsp const char *action;
4698 33aa809d 2019-08-08 stsp static const struct got_error *
4699 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4700 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4702 33aa809d 2019-08-08 stsp char *line = NULL;
4703 33aa809d 2019-08-08 stsp size_t linesize = 0;
4704 33aa809d 2019-08-08 stsp ssize_t linelen;
4706 33aa809d 2019-08-08 stsp switch (status) {
4707 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4708 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4710 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4711 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4713 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4714 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4715 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4716 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4717 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4718 33aa809d 2019-08-08 stsp printf("%s", line);
4719 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4720 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4721 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4722 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4723 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4726 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4729 33aa809d 2019-08-08 stsp return NULL;
4732 33aa809d 2019-08-08 stsp static const struct got_error *
4733 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4734 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4736 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4737 33aa809d 2019-08-08 stsp char *line = NULL;
4738 33aa809d 2019-08-08 stsp size_t linesize = 0;
4739 33aa809d 2019-08-08 stsp ssize_t linelen;
4740 33aa809d 2019-08-08 stsp int resp = ' ';
4741 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4743 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4745 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4747 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4748 33aa809d 2019-08-08 stsp a->action);
4750 33aa809d 2019-08-08 stsp return err;
4751 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4752 33aa809d 2019-08-08 stsp if (linelen == -1) {
4753 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4754 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4755 33aa809d 2019-08-08 stsp return NULL;
4757 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4759 33aa809d 2019-08-08 stsp *nl = '\0';
4760 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4761 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4762 33aa809d 2019-08-08 stsp printf("y\n");
4763 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4764 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4765 33aa809d 2019-08-08 stsp printf("n\n");
4766 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4767 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4768 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4769 33aa809d 2019-08-08 stsp printf("q\n");
4771 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4772 33aa809d 2019-08-08 stsp free(line);
4773 33aa809d 2019-08-08 stsp return NULL;
4776 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4777 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4778 33aa809d 2019-08-08 stsp a->action);
4780 33aa809d 2019-08-08 stsp return err;
4781 33aa809d 2019-08-08 stsp resp = getchar();
4782 33aa809d 2019-08-08 stsp if (resp == '\n')
4783 33aa809d 2019-08-08 stsp resp = getchar();
4784 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4785 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4786 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4787 33aa809d 2019-08-08 stsp resp = ' ';
4789 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4790 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4791 33aa809d 2019-08-08 stsp resp = ' ';
4795 33aa809d 2019-08-08 stsp if (resp == 'y')
4796 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4797 33aa809d 2019-08-08 stsp else if (resp == 'n')
4798 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4799 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4800 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4802 1ee397ad 2019-07-12 stsp return NULL;
4806 a129376b 2019-03-28 stsp static const struct got_error *
4807 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4809 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4810 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4811 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4812 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4813 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4814 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4815 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4816 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4817 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4818 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4820 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4822 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4823 a129376b 2019-03-28 stsp switch (ch) {
4825 33aa809d 2019-08-08 stsp pflag = 1;
4828 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4831 0f6d7415 2019-08-08 stsp can_recurse = 1;
4834 a129376b 2019-03-28 stsp usage_revert();
4835 a129376b 2019-03-28 stsp /* NOTREACHED */
4839 a129376b 2019-03-28 stsp argc -= optind;
4840 a129376b 2019-03-28 stsp argv += optind;
4842 43012d58 2019-07-14 stsp #ifndef PROFILE
4843 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4844 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4845 43012d58 2019-07-14 stsp err(1, "pledge");
4847 e20a8b6f 2019-06-04 stsp if (argc < 1)
4848 a129376b 2019-03-28 stsp usage_revert();
4849 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4850 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4852 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4853 a129376b 2019-03-28 stsp if (cwd == NULL) {
4854 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4855 a129376b 2019-03-28 stsp goto done;
4857 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4858 2ec1f75b 2019-03-26 stsp if (error)
4859 2ec1f75b 2019-03-26 stsp goto done;
4861 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4863 a129376b 2019-03-28 stsp if (error != NULL)
4864 a129376b 2019-03-28 stsp goto done;
4866 33aa809d 2019-08-08 stsp if (patch_script_path) {
4867 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4868 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4869 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4870 33aa809d 2019-08-08 stsp patch_script_path);
4871 33aa809d 2019-08-08 stsp goto done;
4874 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4875 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4876 a129376b 2019-03-28 stsp if (error)
4877 a129376b 2019-03-28 stsp goto done;
4879 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4880 6d022e97 2019-08-04 stsp if (error)
4881 6d022e97 2019-08-04 stsp goto done;
4883 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4884 0f6d7415 2019-08-08 stsp char *ondisk_path;
4885 0f6d7415 2019-08-08 stsp struct stat sb;
4886 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4887 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4888 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4889 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4890 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4891 0f6d7415 2019-08-08 stsp goto done;
4893 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4894 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4895 0f6d7415 2019-08-08 stsp free(ondisk_path);
4898 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4899 0f6d7415 2019-08-08 stsp ondisk_path);
4900 0f6d7415 2019-08-08 stsp free(ondisk_path);
4901 0f6d7415 2019-08-08 stsp goto done;
4903 0f6d7415 2019-08-08 stsp free(ondisk_path);
4904 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4905 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4906 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4907 0f6d7415 2019-08-08 stsp goto done;
4912 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4913 33aa809d 2019-08-08 stsp cpa.action = "revert";
4914 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4915 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4917 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4918 33aa809d 2019-08-08 stsp error == NULL)
4919 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4921 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4922 2ec1f75b 2019-03-26 stsp if (worktree)
4923 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4924 2ec1f75b 2019-03-26 stsp free(path);
4925 d00136be 2019-03-26 stsp free(cwd);
4926 6bad629b 2019-02-04 stsp return error;
4929 c4296144 2019-05-09 stsp __dead static void
4930 c4296144 2019-05-09 stsp usage_commit(void)
4932 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4933 5c1e53bc 2019-07-28 stsp getprogname());
4937 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4938 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4939 e2ba3d07 2019-05-13 stsp const char *editor;
4940 e0870e44 2019-05-13 stsp const char *worktree_path;
4941 76d98825 2019-06-03 stsp const char *branch_name;
4942 314a6357 2019-05-13 stsp const char *repo_path;
4943 e0870e44 2019-05-13 stsp char *logmsg_path;
4947 33ad4cbe 2019-05-12 jcs static const struct got_error *
4948 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4951 76d98825 2019-06-03 stsp char *initial_content = NULL;
4952 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4953 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4954 e0870e44 2019-05-13 stsp char *template = NULL;
4955 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4957 33ad4cbe 2019-05-12 jcs size_t len;
4959 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4960 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4961 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4962 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4963 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4964 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4965 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4966 33ad4cbe 2019-05-12 jcs return NULL;
4969 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4970 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4972 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4973 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4974 76d98825 2019-06-03 stsp a->branch_name) == -1)
4975 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4977 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4979 e0870e44 2019-05-13 stsp goto done;
4981 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4983 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4984 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4985 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4986 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4987 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4991 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4993 76d98825 2019-06-03 stsp free(initial_content);
4994 e0870e44 2019-05-13 stsp free(template);
4996 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4997 3ce1b845 2019-07-15 stsp if (err == NULL) {
4998 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4999 3ce1b845 2019-07-15 stsp if (err) {
5000 3ce1b845 2019-07-15 stsp free(*logmsg);
5001 3ce1b845 2019-07-15 stsp *logmsg = NULL;
5004 33ad4cbe 2019-05-12 jcs return err;
5007 c4296144 2019-05-09 stsp static const struct got_error *
5008 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
5010 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
5011 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
5012 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
5013 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
5014 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
5015 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
5016 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
5017 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
5018 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
5019 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
5021 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
5022 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
5024 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
5025 c4296144 2019-05-09 stsp switch (ch) {
5027 c4296144 2019-05-09 stsp logmsg = optarg;
5030 c4296144 2019-05-09 stsp usage_commit();
5031 c4296144 2019-05-09 stsp /* NOTREACHED */
5035 c4296144 2019-05-09 stsp argc -= optind;
5036 c4296144 2019-05-09 stsp argv += optind;
5038 43012d58 2019-07-14 stsp #ifndef PROFILE
5039 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5040 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5041 43012d58 2019-07-14 stsp err(1, "pledge");
5043 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
5044 c4296144 2019-05-09 stsp if (cwd == NULL) {
5045 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5046 c4296144 2019-05-09 stsp goto done;
5048 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
5049 7d5807f4 2019-07-11 stsp if (error)
5050 7d5807f4 2019-07-11 stsp goto done;
5052 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5053 c4296144 2019-05-09 stsp if (error)
5054 a698f62e 2019-07-25 stsp goto done;
5055 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
5056 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
5057 c4296144 2019-05-09 stsp goto done;
5060 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5061 916f288c 2019-07-30 stsp worktree);
5062 5c1e53bc 2019-07-28 stsp if (error)
5063 5c1e53bc 2019-07-28 stsp goto done;
5065 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5066 c9956ddf 2019-09-08 stsp if (error)
5067 c9956ddf 2019-09-08 stsp goto done;
5068 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5069 c9956ddf 2019-09-08 stsp gitconfig_path);
5070 c4296144 2019-05-09 stsp if (error != NULL)
5071 c4296144 2019-05-09 stsp goto done;
5073 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
5074 aba9c984 2019-09-08 stsp if (error)
5075 aba9c984 2019-09-08 stsp return error;
5078 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
5079 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
5081 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
5082 314a6357 2019-05-13 stsp error = get_editor(&editor);
5084 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5085 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5086 c4296144 2019-05-09 stsp if (error)
5087 c4296144 2019-05-09 stsp goto done;
5089 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5090 087fb88c 2019-08-04 stsp if (error)
5091 087fb88c 2019-08-04 stsp goto done;
5093 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
5094 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
5095 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
5096 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
5097 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
5098 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
5099 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
5100 916f288c 2019-07-30 stsp goto done;
5102 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
5104 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
5105 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
5106 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
5107 e0870e44 2019-05-13 stsp if (error) {
5108 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5109 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
5110 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
5111 c4296144 2019-05-09 stsp goto done;
5114 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
5115 c4296144 2019-05-09 stsp if (error)
5116 c4296144 2019-05-09 stsp goto done;
5117 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
5119 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
5120 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
5121 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
5122 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
5123 7266f21f 2019-10-21 stsp error == NULL)
5124 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
5125 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
5127 c4296144 2019-05-09 stsp got_repo_close(repo);
5128 c4296144 2019-05-09 stsp if (worktree)
5129 c4296144 2019-05-09 stsp got_worktree_close(worktree);
5130 c4296144 2019-05-09 stsp free(cwd);
5131 c4296144 2019-05-09 stsp free(id_str);
5132 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5133 e2ba3d07 2019-05-13 stsp free(editor);
5134 aba9c984 2019-09-08 stsp free(author);
5135 234035bc 2019-06-01 stsp return error;
5138 234035bc 2019-06-01 stsp __dead static void
5139 234035bc 2019-06-01 stsp usage_cherrypick(void)
5141 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
5145 234035bc 2019-06-01 stsp static const struct got_error *
5146 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
5148 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
5149 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
5150 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
5151 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
5152 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
5153 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
5154 234035bc 2019-06-01 stsp struct got_object_qid *pid;
5155 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
5156 234035bc 2019-06-01 stsp int ch, did_something = 0;
5158 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5159 234035bc 2019-06-01 stsp switch (ch) {
5161 234035bc 2019-06-01 stsp usage_cherrypick();
5162 234035bc 2019-06-01 stsp /* NOTREACHED */
5166 234035bc 2019-06-01 stsp argc -= optind;
5167 234035bc 2019-06-01 stsp argv += optind;
5169 43012d58 2019-07-14 stsp #ifndef PROFILE
5170 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5171 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5172 43012d58 2019-07-14 stsp err(1, "pledge");
5174 234035bc 2019-06-01 stsp if (argc != 1)
5175 234035bc 2019-06-01 stsp usage_cherrypick();
5177 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
5178 234035bc 2019-06-01 stsp if (cwd == NULL) {
5179 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
5180 234035bc 2019-06-01 stsp goto done;
5182 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
5183 234035bc 2019-06-01 stsp if (error)
5184 234035bc 2019-06-01 stsp goto done;
5186 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5188 234035bc 2019-06-01 stsp if (error != NULL)
5189 234035bc 2019-06-01 stsp goto done;
5191 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5192 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5193 234035bc 2019-06-01 stsp if (error)
5194 234035bc 2019-06-01 stsp goto done;
5196 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5197 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5198 234035bc 2019-06-01 stsp if (error != NULL) {
5199 234035bc 2019-06-01 stsp struct got_reference *ref;
5200 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5201 234035bc 2019-06-01 stsp goto done;
5202 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5203 234035bc 2019-06-01 stsp if (error != NULL)
5204 234035bc 2019-06-01 stsp goto done;
5205 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
5206 234035bc 2019-06-01 stsp got_ref_close(ref);
5207 234035bc 2019-06-01 stsp if (error != NULL)
5208 234035bc 2019-06-01 stsp goto done;
5210 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
5211 234035bc 2019-06-01 stsp if (error)
5212 234035bc 2019-06-01 stsp goto done;
5214 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
5215 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
5216 234035bc 2019-06-01 stsp if (error != NULL)
5217 234035bc 2019-06-01 stsp goto done;
5219 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5220 234035bc 2019-06-01 stsp if (error) {
5221 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
5222 234035bc 2019-06-01 stsp goto done;
5223 234035bc 2019-06-01 stsp error = NULL;
5225 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
5226 234035bc 2019-06-01 stsp goto done;
5229 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5230 234035bc 2019-06-01 stsp if (error)
5231 234035bc 2019-06-01 stsp goto done;
5232 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5233 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
5234 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
5236 234035bc 2019-06-01 stsp if (error != NULL)
5237 234035bc 2019-06-01 stsp goto done;
5239 234035bc 2019-06-01 stsp if (did_something)
5240 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
5242 234035bc 2019-06-01 stsp if (commit)
5243 234035bc 2019-06-01 stsp got_object_commit_close(commit);
5244 234035bc 2019-06-01 stsp free(commit_id_str);
5245 234035bc 2019-06-01 stsp if (head_ref)
5246 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5247 234035bc 2019-06-01 stsp if (worktree)
5248 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5250 234035bc 2019-06-01 stsp got_repo_close(repo);
5251 c4296144 2019-05-09 stsp return error;
5254 5ef14e63 2019-06-02 stsp __dead static void
5255 5ef14e63 2019-06-02 stsp usage_backout(void)
5257 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5261 5ef14e63 2019-06-02 stsp static const struct got_error *
5262 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5264 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5265 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5266 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5267 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5268 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5269 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5270 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5271 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5272 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5274 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5275 5ef14e63 2019-06-02 stsp switch (ch) {
5277 5ef14e63 2019-06-02 stsp usage_backout();
5278 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5282 5ef14e63 2019-06-02 stsp argc -= optind;
5283 5ef14e63 2019-06-02 stsp argv += optind;
5285 43012d58 2019-07-14 stsp #ifndef PROFILE
5286 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5287 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5288 43012d58 2019-07-14 stsp err(1, "pledge");
5290 5ef14e63 2019-06-02 stsp if (argc != 1)
5291 5ef14e63 2019-06-02 stsp usage_backout();
5293 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5294 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5295 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5296 5ef14e63 2019-06-02 stsp goto done;
5298 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5299 5ef14e63 2019-06-02 stsp if (error)
5300 5ef14e63 2019-06-02 stsp goto done;
5302 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5304 5ef14e63 2019-06-02 stsp if (error != NULL)
5305 5ef14e63 2019-06-02 stsp goto done;
5307 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5308 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5309 5ef14e63 2019-06-02 stsp if (error)
5310 5ef14e63 2019-06-02 stsp goto done;
5312 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5313 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5314 5ef14e63 2019-06-02 stsp if (error != NULL) {
5315 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5316 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5317 5ef14e63 2019-06-02 stsp goto done;
5318 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5319 5ef14e63 2019-06-02 stsp if (error != NULL)
5320 5ef14e63 2019-06-02 stsp goto done;
5321 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5322 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5323 5ef14e63 2019-06-02 stsp if (error != NULL)
5324 5ef14e63 2019-06-02 stsp goto done;
5326 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5327 5ef14e63 2019-06-02 stsp if (error)
5328 5ef14e63 2019-06-02 stsp goto done;
5330 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5331 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5332 5ef14e63 2019-06-02 stsp if (error != NULL)
5333 5ef14e63 2019-06-02 stsp goto done;
5335 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5336 5ef14e63 2019-06-02 stsp if (error)
5337 5ef14e63 2019-06-02 stsp goto done;
5339 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5340 5ef14e63 2019-06-02 stsp if (error)
5341 5ef14e63 2019-06-02 stsp goto done;
5342 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5343 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5344 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5345 5ef14e63 2019-06-02 stsp goto done;
5348 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5349 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5350 5ef14e63 2019-06-02 stsp if (error != NULL)
5351 5ef14e63 2019-06-02 stsp goto done;
5353 5ef14e63 2019-06-02 stsp if (did_something)
5354 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5356 5ef14e63 2019-06-02 stsp if (commit)
5357 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5358 5ef14e63 2019-06-02 stsp free(commit_id_str);
5359 5ef14e63 2019-06-02 stsp if (head_ref)
5360 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5361 818c7501 2019-07-11 stsp if (worktree)
5362 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5364 818c7501 2019-07-11 stsp got_repo_close(repo);
5365 818c7501 2019-07-11 stsp return error;
5368 818c7501 2019-07-11 stsp __dead static void
5369 818c7501 2019-07-11 stsp usage_rebase(void)
5371 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5372 af54c8f8 2019-07-11 stsp getprogname());
5377 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5380 0ebf8283 2019-07-24 stsp size_t len;
5382 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5383 0ebf8283 2019-07-24 stsp if (len > limit)
5384 0ebf8283 2019-07-24 stsp len = limit;
5385 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5386 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5388 0ebf8283 2019-07-24 stsp *nl = '\0';
5391 0ebf8283 2019-07-24 stsp static const struct got_error *
5392 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5394 5943eee2 2019-08-13 stsp const struct got_error *err;
5395 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5396 5943eee2 2019-08-13 stsp const char *s;
5398 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5400 5943eee2 2019-08-13 stsp return err;
5402 5943eee2 2019-08-13 stsp s = logmsg0;
5403 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5406 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5407 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5408 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5409 5943eee2 2019-08-13 stsp goto done;
5412 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5414 5943eee2 2019-08-13 stsp free(logmsg0);
5415 a0ea4fc0 2020-02-28 stsp return err;
5418 a0ea4fc0 2020-02-28 stsp static const struct got_error *
5419 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
5421 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
5422 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
5423 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
5425 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
5427 a0ea4fc0 2020-02-28 stsp return err;
5429 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
5431 a0ea4fc0 2020-02-28 stsp goto done;
5433 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
5435 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
5437 a0ea4fc0 2020-02-28 stsp goto done;
5439 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
5441 a0ea4fc0 2020-02-28 stsp free(id_str);
5442 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
5443 a0ea4fc0 2020-02-28 stsp free(logmsg);
5444 5943eee2 2019-08-13 stsp return err;
5447 818c7501 2019-07-11 stsp static const struct got_error *
5448 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5449 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5451 818c7501 2019-07-11 stsp const struct got_error *err;
5452 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5454 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5456 818c7501 2019-07-11 stsp goto done;
5458 ff0d2220 2019-07-11 stsp if (new_id) {
5459 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5461 ff0d2220 2019-07-11 stsp goto done;
5464 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5465 ff0d2220 2019-07-11 stsp if (new_id_str)
5466 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5468 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5470 0ebf8283 2019-07-24 stsp goto done;
5472 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5473 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5475 818c7501 2019-07-11 stsp free(old_id_str);
5476 818c7501 2019-07-11 stsp free(new_id_str);
5477 272a1371 2020-02-28 stsp free(logmsg);
5478 818c7501 2019-07-11 stsp return err;
5481 1ee397ad 2019-07-12 stsp static const struct got_error *
5482 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5484 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5486 818c7501 2019-07-11 stsp while (path[0] == '/')
5488 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5490 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5491 1ee397ad 2019-07-12 stsp return NULL;
5492 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5493 818c7501 2019-07-11 stsp *rebase_status = status;
5494 1ee397ad 2019-07-12 stsp return NULL;
5497 818c7501 2019-07-11 stsp static const struct got_error *
5498 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5499 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5500 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5502 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5503 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5504 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5507 818c7501 2019-07-11 stsp static const struct got_error *
5508 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5509 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5510 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5511 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5513 ff0d2220 2019-07-11 stsp const struct got_error *error;
5514 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5515 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5517 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5518 ff0d2220 2019-07-11 stsp if (error)
5519 ff0d2220 2019-07-11 stsp return error;
5521 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5522 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5523 ff0d2220 2019-07-11 stsp if (error) {
5524 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5525 ff0d2220 2019-07-11 stsp goto done;
5526 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5528 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5529 ff0d2220 2019-07-11 stsp free(new_commit_id);
5532 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5533 ff0d2220 2019-07-11 stsp return error;
5536 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5537 64c6d990 2019-07-11 stsp const char *path_prefix;
5538 64c6d990 2019-07-11 stsp size_t len;
5539 8ca9bd68 2019-07-25 stsp int errcode;
5542 64c6d990 2019-07-11 stsp static const struct got_error *
5543 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5544 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5545 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5546 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5548 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5550 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5551 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5552 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5554 64c6d990 2019-07-11 stsp return NULL;
5557 64c6d990 2019-07-11 stsp static const struct got_error *
5558 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5559 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5560 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5562 64c6d990 2019-07-11 stsp const struct got_error *err;
5563 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5564 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5565 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5567 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5568 64c6d990 2019-07-11 stsp return NULL;
5570 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5572 64c6d990 2019-07-11 stsp goto done;
5574 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5576 64c6d990 2019-07-11 stsp goto done;
5578 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5579 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5581 64c6d990 2019-07-11 stsp goto done;
5583 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5584 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5586 64c6d990 2019-07-11 stsp goto done;
5588 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5589 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5590 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5591 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5592 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5593 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5594 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5596 64c6d990 2019-07-11 stsp if (tree1)
5597 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5598 64c6d990 2019-07-11 stsp if (tree2)
5599 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5600 64c6d990 2019-07-11 stsp if (commit)
5601 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5602 64c6d990 2019-07-11 stsp if (parent_commit)
5603 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5604 64c6d990 2019-07-11 stsp return err;
5607 ff0d2220 2019-07-11 stsp static const struct got_error *
5608 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5609 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5610 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5611 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5612 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5614 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5615 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5616 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5617 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5618 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5620 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5622 af61c510 2019-07-19 stsp return err;
5624 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5625 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5627 af61c510 2019-07-19 stsp goto done;
5628 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5629 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5630 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5631 af61c510 2019-07-19 stsp if (err) {
5632 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5633 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5634 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5635 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5636 af61c510 2019-07-19 stsp "been reached?!?");
5638 ee780d5c 2020-01-04 stsp goto done;
5640 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5641 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5643 af61c510 2019-07-19 stsp goto done;
5645 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5647 af61c510 2019-07-19 stsp goto done;
5648 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5649 af61c510 2019-07-19 stsp commit_id = parent_id;
5653 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5654 af61c510 2019-07-19 stsp return err;
5657 af61c510 2019-07-19 stsp static const struct got_error *
5658 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5660 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5661 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5662 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5663 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5664 818c7501 2019-07-11 stsp char *cwd = NULL;
5665 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5666 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5667 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5668 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5669 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5670 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5671 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5672 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
5673 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5674 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5675 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5676 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5677 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5679 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5680 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5682 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5683 818c7501 2019-07-11 stsp switch (ch) {
5685 818c7501 2019-07-11 stsp abort_rebase = 1;
5688 818c7501 2019-07-11 stsp continue_rebase = 1;
5691 818c7501 2019-07-11 stsp usage_rebase();
5692 818c7501 2019-07-11 stsp /* NOTREACHED */
5696 818c7501 2019-07-11 stsp argc -= optind;
5697 818c7501 2019-07-11 stsp argv += optind;
5699 43012d58 2019-07-14 stsp #ifndef PROFILE
5700 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5701 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5702 43012d58 2019-07-14 stsp err(1, "pledge");
5704 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5705 818c7501 2019-07-11 stsp usage_rebase();
5706 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5707 818c7501 2019-07-11 stsp if (argc != 0)
5708 818c7501 2019-07-11 stsp usage_rebase();
5709 818c7501 2019-07-11 stsp } else if (argc != 1)
5710 818c7501 2019-07-11 stsp usage_rebase();
5712 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5713 818c7501 2019-07-11 stsp if (cwd == NULL) {
5714 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5715 818c7501 2019-07-11 stsp goto done;
5717 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5718 818c7501 2019-07-11 stsp if (error)
5719 818c7501 2019-07-11 stsp goto done;
5721 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5723 818c7501 2019-07-11 stsp if (error != NULL)
5724 818c7501 2019-07-11 stsp goto done;
5726 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5727 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5728 7ef62c4e 2020-02-24 stsp if (error)
5729 7ef62c4e 2020-02-24 stsp goto done;
5731 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5732 7ef62c4e 2020-02-24 stsp worktree);
5733 818c7501 2019-07-11 stsp if (error)
5734 7ef62c4e 2020-02-24 stsp goto done;
5735 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
5736 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5737 818c7501 2019-07-11 stsp goto done;
5740 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5741 818c7501 2019-07-11 stsp if (error)
5742 818c7501 2019-07-11 stsp goto done;
5744 f6794adc 2019-07-23 stsp if (abort_rebase) {
5745 818c7501 2019-07-11 stsp int did_something;
5746 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5747 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5748 f6794adc 2019-07-23 stsp goto done;
5750 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5751 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5752 3e3a69f1 2019-07-25 stsp worktree, repo);
5753 818c7501 2019-07-11 stsp if (error)
5754 818c7501 2019-07-11 stsp goto done;
5755 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5756 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5757 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5758 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5759 818c7501 2019-07-11 stsp if (error)
5760 818c7501 2019-07-11 stsp goto done;
5761 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5762 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5765 818c7501 2019-07-11 stsp if (continue_rebase) {
5766 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5767 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5768 f6794adc 2019-07-23 stsp goto done;
5770 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5771 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5772 3e3a69f1 2019-07-25 stsp worktree, repo);
5773 818c7501 2019-07-11 stsp if (error)
5774 818c7501 2019-07-11 stsp goto done;
5776 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5777 01757395 2019-07-12 stsp resume_commit_id, repo);
5778 818c7501 2019-07-11 stsp if (error)
5779 818c7501 2019-07-11 stsp goto done;
5781 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5782 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5783 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5784 818c7501 2019-07-11 stsp goto done;
5787 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5788 818c7501 2019-07-11 stsp if (error != NULL)
5789 818c7501 2019-07-11 stsp goto done;
5792 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5793 ff0d2220 2019-07-11 stsp if (error)
5794 ff0d2220 2019-07-11 stsp goto done;
5796 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5797 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5799 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5800 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5801 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5802 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5803 818c7501 2019-07-11 stsp if (error)
5804 818c7501 2019-07-11 stsp goto done;
5805 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5806 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5807 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5808 818c7501 2019-07-11 stsp "with work tree's branch");
5809 818c7501 2019-07-11 stsp goto done;
5812 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5813 a51a74b3 2019-07-27 stsp if (error) {
5814 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5815 a51a74b3 2019-07-27 stsp goto done;
5816 a51a74b3 2019-07-27 stsp error = NULL;
5818 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5819 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5820 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5821 a51a74b3 2019-07-27 stsp goto done;
5823 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5824 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5825 818c7501 2019-07-11 stsp if (error)
5826 818c7501 2019-07-11 stsp goto done;
5829 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5830 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5831 818c7501 2019-07-11 stsp if (error)
5832 818c7501 2019-07-11 stsp goto done;
5834 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5835 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5836 fc66b545 2019-08-12 stsp if (pid == NULL) {
5837 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5838 fc66b545 2019-08-12 stsp int did_something;
5839 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5840 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5841 fc66b545 2019-08-12 stsp &did_something);
5842 fc66b545 2019-08-12 stsp if (error)
5843 fc66b545 2019-08-12 stsp goto done;
5844 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5845 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5847 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5848 fc66b545 2019-08-12 stsp goto done;
5850 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5851 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5852 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5853 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5854 818c7501 2019-07-11 stsp commit = NULL;
5855 818c7501 2019-07-11 stsp if (error)
5856 818c7501 2019-07-11 stsp goto done;
5858 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5859 38b0338b 2019-11-29 stsp if (continue_rebase) {
5860 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5861 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5862 38b0338b 2019-11-29 stsp goto done;
5864 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5865 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5866 38b0338b 2019-11-29 stsp char *id_str;
5867 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5868 38b0338b 2019-11-29 stsp new_base_branch);
5869 38b0338b 2019-11-29 stsp if (error)
5870 38b0338b 2019-11-29 stsp goto done;
5871 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5872 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5873 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5874 38b0338b 2019-11-29 stsp free(id_str);
5875 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5876 38b0338b 2019-11-29 stsp new_head_commit_id);
5877 38b0338b 2019-11-29 stsp if (error)
5878 38b0338b 2019-11-29 stsp goto done;
5882 818c7501 2019-07-11 stsp pid = NULL;
5883 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5884 818c7501 2019-07-11 stsp commit_id = qid->id;
5885 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5886 818c7501 2019-07-11 stsp pid = qid;
5888 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5889 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5890 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5891 818c7501 2019-07-11 stsp if (error)
5892 818c7501 2019-07-11 stsp goto done;
5894 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5895 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
5896 a0ea4fc0 2020-02-28 stsp if (error)
5897 a0ea4fc0 2020-02-28 stsp goto done;
5898 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5902 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5903 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5904 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5905 818c7501 2019-07-11 stsp if (error)
5906 818c7501 2019-07-11 stsp goto done;
5909 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5910 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5911 818c7501 2019-07-11 stsp if (error)
5912 818c7501 2019-07-11 stsp goto done;
5913 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5914 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5916 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5917 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5919 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5920 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5921 818c7501 2019-07-11 stsp free(resume_commit_id);
5922 818c7501 2019-07-11 stsp free(yca_id);
5923 818c7501 2019-07-11 stsp if (commit)
5924 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5925 818c7501 2019-07-11 stsp if (branch)
5926 818c7501 2019-07-11 stsp got_ref_close(branch);
5927 818c7501 2019-07-11 stsp if (new_base_branch)
5928 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5929 818c7501 2019-07-11 stsp if (tmp_branch)
5930 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5931 5ef14e63 2019-06-02 stsp if (worktree)
5932 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5934 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5935 5ef14e63 2019-06-02 stsp return error;
5938 0ebf8283 2019-07-24 stsp __dead static void
5939 0ebf8283 2019-07-24 stsp usage_histedit(void)
5941 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
5942 0ebf8283 2019-07-24 stsp getprogname());
5946 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5947 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5948 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5949 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5950 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5952 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5953 0ebf8283 2019-07-24 stsp unsigned char code;
5954 0ebf8283 2019-07-24 stsp const char *name;
5955 0ebf8283 2019-07-24 stsp const char *desc;
5956 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5957 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5958 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5959 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
5960 82997472 2020-01-29 stsp "be used" },
5961 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5962 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5963 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5966 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5967 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5968 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5969 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5970 0ebf8283 2019-07-24 stsp char *logmsg;
5972 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5974 0ebf8283 2019-07-24 stsp static const struct got_error *
5975 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5976 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5978 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5979 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5980 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5983 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5985 0ebf8283 2019-07-24 stsp goto done;
5987 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5989 0ebf8283 2019-07-24 stsp goto done;
5991 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5993 0ebf8283 2019-07-24 stsp goto done;
5995 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5996 0ebf8283 2019-07-24 stsp if (n < 0)
5997 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5999 0ebf8283 2019-07-24 stsp if (commit)
6000 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6001 0ebf8283 2019-07-24 stsp free(id_str);
6002 0ebf8283 2019-07-24 stsp free(logmsg);
6003 0ebf8283 2019-07-24 stsp return err;
6006 0ebf8283 2019-07-24 stsp static const struct got_error *
6007 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
6008 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
6010 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6011 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
6013 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
6014 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6016 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6017 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
6021 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
6022 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
6023 083957f4 2020-02-24 stsp if (n < 0) {
6024 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
6030 0ebf8283 2019-07-24 stsp return err;
6033 0ebf8283 2019-07-24 stsp static const struct got_error *
6034 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
6035 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
6037 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6039 514f2ffe 2020-01-29 stsp char *id_str;
6040 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
6042 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
6043 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
6045 514f2ffe 2020-01-29 stsp return err;
6047 514f2ffe 2020-01-29 stsp n = fprintf(f,
6048 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
6049 514f2ffe 2020-01-29 stsp "# commit %s\n"
6050 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
6051 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
6052 514f2ffe 2020-01-29 stsp if (n < 0) {
6053 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6054 514f2ffe 2020-01-29 stsp goto done;
6057 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
6058 514f2ffe 2020-01-29 stsp if (n < 0) {
6059 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6060 514f2ffe 2020-01-29 stsp goto done;
6063 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6064 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
6065 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
6066 0ebf8283 2019-07-24 stsp cmd->desc);
6067 0ebf8283 2019-07-24 stsp if (n < 0) {
6068 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6073 514f2ffe 2020-01-29 stsp free(id_str);
6074 0ebf8283 2019-07-24 stsp return err;
6077 0ebf8283 2019-07-24 stsp static const struct got_error *
6078 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
6080 0ebf8283 2019-07-24 stsp static char msg[42];
6083 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
6085 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
6086 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
6088 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
6091 0ebf8283 2019-07-24 stsp static const struct got_error *
6092 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
6093 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
6095 0ebf8283 2019-07-24 stsp const struct got_error *err;
6096 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
6097 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
6099 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6101 0ebf8283 2019-07-24 stsp return err;
6103 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
6105 0ebf8283 2019-07-24 stsp goto done;
6107 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
6109 5943eee2 2019-08-13 stsp goto done;
6110 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
6111 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
6112 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
6113 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
6116 0ebf8283 2019-07-24 stsp if (folded_commit)
6117 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
6118 0ebf8283 2019-07-24 stsp free(id_str);
6119 5943eee2 2019-08-13 stsp free(folded_logmsg);
6120 0ebf8283 2019-07-24 stsp return err;
6123 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
6124 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
6126 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
6128 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
6129 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
6130 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
6131 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
6132 3f9de99f 2019-07-24 stsp folded = prev;
6133 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
6136 0ebf8283 2019-07-24 stsp return folded;
6139 0ebf8283 2019-07-24 stsp static const struct got_error *
6140 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
6141 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6143 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
6144 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
6145 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6146 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6148 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
6150 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6152 0ebf8283 2019-07-24 stsp return err;
6154 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
6155 0ebf8283 2019-07-24 stsp if (folded) {
6156 0ebf8283 2019-07-24 stsp while (folded != hle) {
6157 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
6158 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
6161 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
6162 0ebf8283 2019-07-24 stsp logmsg, repo);
6164 0ebf8283 2019-07-24 stsp goto done;
6165 0ebf8283 2019-07-24 stsp free(logmsg);
6166 0ebf8283 2019-07-24 stsp logmsg = new_msg;
6167 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
6171 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6173 0ebf8283 2019-07-24 stsp goto done;
6174 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
6176 5943eee2 2019-08-13 stsp goto done;
6177 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
6178 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
6179 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
6180 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
6181 0ebf8283 2019-07-24 stsp goto done;
6183 0ebf8283 2019-07-24 stsp free(logmsg);
6184 0ebf8283 2019-07-24 stsp logmsg = new_msg;
6186 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6188 0ebf8283 2019-07-24 stsp goto done;
6190 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
6191 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
6193 0ebf8283 2019-07-24 stsp goto done;
6195 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
6196 0ebf8283 2019-07-24 stsp close(fd);
6198 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6200 0ebf8283 2019-07-24 stsp goto done;
6202 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
6203 0ebf8283 2019-07-24 stsp if (err) {
6204 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
6205 0ebf8283 2019-07-24 stsp goto done;
6206 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
6209 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
6210 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
6211 0ebf8283 2019-07-24 stsp free(logmsg_path);
6212 0ebf8283 2019-07-24 stsp free(logmsg);
6213 5943eee2 2019-08-13 stsp free(orig_logmsg);
6214 0ebf8283 2019-07-24 stsp free(editor);
6215 0ebf8283 2019-07-24 stsp if (commit)
6216 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6217 0ebf8283 2019-07-24 stsp return err;
6220 0ebf8283 2019-07-24 stsp static const struct got_error *
6221 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
6222 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
6224 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6225 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
6226 0ebf8283 2019-07-24 stsp size_t size;
6227 0ebf8283 2019-07-24 stsp ssize_t len;
6228 0ebf8283 2019-07-24 stsp int lineno = 0, i;
6229 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
6230 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6231 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
6233 0ebf8283 2019-07-24 stsp for (;;) {
6234 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
6235 0ebf8283 2019-07-24 stsp if (len == -1) {
6236 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
6237 0ebf8283 2019-07-24 stsp if (feof(f))
6239 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
6240 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
6245 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6247 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
6248 0ebf8283 2019-07-24 stsp free(line);
6249 0ebf8283 2019-07-24 stsp line = NULL;
6252 0ebf8283 2019-07-24 stsp cmd = NULL;
6253 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6254 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
6255 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
6256 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
6257 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
6260 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
6265 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
6266 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6269 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6271 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
6272 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
6273 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
6276 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
6277 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6281 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
6282 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
6283 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6287 0ebf8283 2019-07-24 stsp free(line);
6288 0ebf8283 2019-07-24 stsp line = NULL;
6292 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
6294 0ebf8283 2019-07-24 stsp *end = '\0';
6296 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
6297 0ebf8283 2019-07-24 stsp if (err) {
6298 0ebf8283 2019-07-24 stsp /* override error code */
6299 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6303 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
6304 0ebf8283 2019-07-24 stsp if (hle == NULL) {
6305 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
6308 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
6309 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
6310 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
6311 0ebf8283 2019-07-24 stsp commit_id = NULL;
6312 0ebf8283 2019-07-24 stsp free(line);
6313 0ebf8283 2019-07-24 stsp line = NULL;
6314 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6317 0ebf8283 2019-07-24 stsp free(line);
6318 0ebf8283 2019-07-24 stsp free(commit_id);
6319 0ebf8283 2019-07-24 stsp return err;
6322 0ebf8283 2019-07-24 stsp static const struct got_error *
6323 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6324 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6326 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6327 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6328 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6329 5b87815e 2020-03-05 stsp static char msg[92];
6330 bfce7f83 2019-07-27 stsp char *id_str;
6332 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6333 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6334 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6335 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6336 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6338 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6339 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
6340 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
6341 5b87815e 2020-03-05 stsp if (hle == hle2)
6343 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
6344 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
6346 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
6348 5b87815e 2020-03-05 stsp return err;
6349 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
6350 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
6351 5b87815e 2020-03-05 stsp free(id_str);
6352 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6356 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6357 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6358 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6361 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6362 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6364 bfce7f83 2019-07-27 stsp return err;
6365 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6366 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6367 bfce7f83 2019-07-27 stsp free(id_str);
6368 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6372 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6373 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6374 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6375 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6377 bfce7f83 2019-07-27 stsp return NULL;
6380 bfce7f83 2019-07-27 stsp static const struct got_error *
6381 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6382 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6383 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6385 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6386 0ebf8283 2019-07-24 stsp char *editor;
6387 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6389 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6391 0ebf8283 2019-07-24 stsp return err;
6393 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6394 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6395 0ebf8283 2019-07-24 stsp goto done;
6398 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6399 0ebf8283 2019-07-24 stsp if (f == NULL) {
6400 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6401 0ebf8283 2019-07-24 stsp goto done;
6403 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6405 bfce7f83 2019-07-27 stsp goto done;
6407 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6409 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6410 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6411 0ebf8283 2019-07-24 stsp free(editor);
6412 0ebf8283 2019-07-24 stsp return err;
6415 0ebf8283 2019-07-24 stsp static const struct got_error *
6416 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6417 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
6418 514f2ffe 2020-01-29 stsp struct got_repository *);
6420 0ebf8283 2019-07-24 stsp static const struct got_error *
6421 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6422 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
6423 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
6425 0ebf8283 2019-07-24 stsp const struct got_error *err;
6426 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6427 0ebf8283 2019-07-24 stsp char *path = NULL;
6429 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6431 0ebf8283 2019-07-24 stsp return err;
6433 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
6435 0ebf8283 2019-07-24 stsp goto done;
6437 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
6439 0ebf8283 2019-07-24 stsp goto done;
6441 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
6442 083957f4 2020-02-24 stsp rewind(f);
6443 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6445 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
6446 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
6447 0ebf8283 2019-07-24 stsp goto done;
6450 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6451 083957f4 2020-02-24 stsp if (err) {
6452 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6453 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6454 083957f4 2020-02-24 stsp goto done;
6455 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6456 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
6460 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6461 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6462 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6463 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6464 0ebf8283 2019-07-24 stsp free(path);
6465 0ebf8283 2019-07-24 stsp return err;
6468 0ebf8283 2019-07-24 stsp static const struct got_error *
6469 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6470 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6472 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6473 0ebf8283 2019-07-24 stsp char *path = NULL;
6474 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6475 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6476 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6478 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6480 0ebf8283 2019-07-24 stsp return err;
6482 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6483 0ebf8283 2019-07-24 stsp if (f == NULL) {
6484 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6485 0ebf8283 2019-07-24 stsp goto done;
6487 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6488 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6493 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6494 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6495 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6496 0ebf8283 2019-07-24 stsp if (n < 0) {
6497 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6503 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6504 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6505 0ebf8283 2019-07-24 stsp free(path);
6506 0ebf8283 2019-07-24 stsp if (commit)
6507 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6508 0ebf8283 2019-07-24 stsp return err;
6512 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6514 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6516 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6517 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6518 bfce7f83 2019-07-27 stsp free(hle);
6522 0ebf8283 2019-07-24 stsp static const struct got_error *
6523 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6524 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6526 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6527 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6529 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6530 0ebf8283 2019-07-24 stsp if (f == NULL) {
6531 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6532 0ebf8283 2019-07-24 stsp goto done;
6535 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6537 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6538 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6539 0ebf8283 2019-07-24 stsp return err;
6542 0ebf8283 2019-07-24 stsp static const struct got_error *
6543 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6544 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6545 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
6547 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6548 0ebf8283 2019-07-24 stsp int resp = ' ';
6550 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6551 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6552 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6553 0ebf8283 2019-07-24 stsp resp = getchar();
6554 a61a4414 2019-08-07 stsp if (resp == '\n')
6555 a61a4414 2019-08-07 stsp resp = getchar();
6556 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6557 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6558 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6560 426ebf2e 2019-07-25 stsp if (err) {
6561 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6562 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6564 bfce7f83 2019-07-27 stsp prev_err = err;
6565 426ebf2e 2019-07-25 stsp resp = ' ';
6569 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6570 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6571 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6572 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
6573 426ebf2e 2019-07-25 stsp if (err) {
6574 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6575 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6577 bfce7f83 2019-07-27 stsp prev_err = err;
6578 426ebf2e 2019-07-25 stsp resp = ' ';
6582 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6583 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6586 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6589 0ebf8283 2019-07-24 stsp return err;
6592 0ebf8283 2019-07-24 stsp static const struct got_error *
6593 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6594 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6595 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6597 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6598 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6599 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6600 3e3a69f1 2019-07-25 stsp branch, repo);
6603 0ebf8283 2019-07-24 stsp static const struct got_error *
6604 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6605 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6607 0ebf8283 2019-07-24 stsp const struct got_error *err;
6608 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6610 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6612 0ebf8283 2019-07-24 stsp goto done;
6614 0ebf8283 2019-07-24 stsp if (new_id) {
6615 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6617 0ebf8283 2019-07-24 stsp goto done;
6620 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6621 0ebf8283 2019-07-24 stsp if (new_id_str)
6622 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6624 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6625 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6626 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6627 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6628 0ebf8283 2019-07-24 stsp goto done;
6630 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6632 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6634 0ebf8283 2019-07-24 stsp goto done;
6637 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6638 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6639 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6640 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6641 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6643 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6644 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6645 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6652 0ebf8283 2019-07-24 stsp free(old_id_str);
6653 0ebf8283 2019-07-24 stsp free(new_id_str);
6654 0ebf8283 2019-07-24 stsp return err;
6657 0ebf8283 2019-07-24 stsp static const struct got_error *
6658 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6659 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6660 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6661 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6663 0ebf8283 2019-07-24 stsp const struct got_error *err;
6664 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6665 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6667 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6668 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6669 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6671 0ebf8283 2019-07-24 stsp return err;
6674 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6676 0ebf8283 2019-07-24 stsp return err;
6678 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6679 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6680 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6681 0ebf8283 2019-07-24 stsp if (err) {
6682 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6683 0ebf8283 2019-07-24 stsp goto done;
6684 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6686 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6687 0ebf8283 2019-07-24 stsp free(new_commit_id);
6690 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6691 0ebf8283 2019-07-24 stsp return err;
6694 0ebf8283 2019-07-24 stsp static const struct got_error *
6695 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6696 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6698 0ebf8283 2019-07-24 stsp const struct got_error *error;
6699 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6701 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6703 0ebf8283 2019-07-24 stsp if (error)
6704 0ebf8283 2019-07-24 stsp return error;
6706 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6707 0ebf8283 2019-07-24 stsp if (error)
6708 0ebf8283 2019-07-24 stsp return error;
6710 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6711 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6712 0ebf8283 2019-07-24 stsp return error;
6715 ab20a43a 2020-01-29 stsp static const struct got_error *
6716 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
6717 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
6718 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6719 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6721 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
6723 ab20a43a 2020-01-29 stsp switch (status) {
6724 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6725 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6726 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6727 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
6728 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6729 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6734 ab20a43a 2020-01-29 stsp switch (staged_status) {
6735 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6736 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6737 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6738 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6739 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6744 ab20a43a 2020-01-29 stsp return NULL;
6747 0ebf8283 2019-07-24 stsp static const struct got_error *
6748 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6750 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6751 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6752 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6753 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6754 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6755 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6756 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6757 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6758 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6759 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6760 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6761 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6762 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6763 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
6764 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6765 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6766 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6767 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6768 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6769 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6770 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6771 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6773 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6774 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6775 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6777 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
6778 0ebf8283 2019-07-24 stsp switch (ch) {
6780 0ebf8283 2019-07-24 stsp abort_edit = 1;
6783 0ebf8283 2019-07-24 stsp continue_edit = 1;
6786 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6789 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
6792 0ebf8283 2019-07-24 stsp usage_histedit();
6793 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6797 0ebf8283 2019-07-24 stsp argc -= optind;
6798 0ebf8283 2019-07-24 stsp argv += optind;
6800 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6801 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6802 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6803 0ebf8283 2019-07-24 stsp err(1, "pledge");
6805 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6806 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
6807 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
6808 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
6809 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
6810 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
6811 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
6812 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
6813 0ebf8283 2019-07-24 stsp if (argc != 0)
6814 0ebf8283 2019-07-24 stsp usage_histedit();
6817 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6818 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6819 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6820 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6821 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6822 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6825 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6826 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6827 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6828 0ebf8283 2019-07-24 stsp goto done;
6830 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6831 0ebf8283 2019-07-24 stsp if (error)
6832 0ebf8283 2019-07-24 stsp goto done;
6834 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6836 0ebf8283 2019-07-24 stsp if (error != NULL)
6837 0ebf8283 2019-07-24 stsp goto done;
6839 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6840 0ebf8283 2019-07-24 stsp if (error)
6841 0ebf8283 2019-07-24 stsp goto done;
6842 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6843 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6844 0ebf8283 2019-07-24 stsp goto done;
6847 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6848 0ebf8283 2019-07-24 stsp if (error)
6849 0ebf8283 2019-07-24 stsp goto done;
6851 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
6852 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
6853 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
6854 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
6855 083957f4 2020-02-24 stsp "before the -m option can be used");
6856 083957f4 2020-02-24 stsp goto done;
6859 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6860 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6861 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6862 3e3a69f1 2019-07-25 stsp worktree, repo);
6863 0ebf8283 2019-07-24 stsp if (error)
6864 0ebf8283 2019-07-24 stsp goto done;
6865 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6866 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6867 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6868 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6869 0ebf8283 2019-07-24 stsp if (error)
6870 0ebf8283 2019-07-24 stsp goto done;
6871 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6872 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6873 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6874 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6875 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6876 0ebf8283 2019-07-24 stsp goto done;
6879 0ebf8283 2019-07-24 stsp if (continue_edit) {
6880 0ebf8283 2019-07-24 stsp char *path;
6882 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6883 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6884 0ebf8283 2019-07-24 stsp goto done;
6887 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6888 0ebf8283 2019-07-24 stsp if (error)
6889 0ebf8283 2019-07-24 stsp goto done;
6891 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6892 0ebf8283 2019-07-24 stsp free(path);
6893 0ebf8283 2019-07-24 stsp if (error)
6894 0ebf8283 2019-07-24 stsp goto done;
6896 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6897 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6898 3e3a69f1 2019-07-25 stsp worktree, repo);
6899 0ebf8283 2019-07-24 stsp if (error)
6900 0ebf8283 2019-07-24 stsp goto done;
6902 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6903 0ebf8283 2019-07-24 stsp if (error)
6904 0ebf8283 2019-07-24 stsp goto done;
6906 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6907 0ebf8283 2019-07-24 stsp head_commit_id);
6908 0ebf8283 2019-07-24 stsp if (error)
6909 0ebf8283 2019-07-24 stsp goto done;
6910 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6911 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6912 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6913 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6914 3aac7cf7 2019-07-25 stsp goto done;
6916 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6917 8ca9bd68 2019-07-25 stsp base_commit_id, 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 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6925 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6926 0ebf8283 2019-07-24 stsp goto done;
6929 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6930 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6931 0ebf8283 2019-07-24 stsp if (error != NULL)
6932 0ebf8283 2019-07-24 stsp goto done;
6934 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6935 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6936 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6937 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6938 c7d20a3f 2019-07-30 stsp goto done;
6941 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6942 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6943 bfce7f83 2019-07-27 stsp branch = NULL;
6944 0ebf8283 2019-07-24 stsp if (error)
6945 0ebf8283 2019-07-24 stsp goto done;
6947 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6948 0ebf8283 2019-07-24 stsp head_commit_id);
6949 0ebf8283 2019-07-24 stsp if (error)
6950 0ebf8283 2019-07-24 stsp goto done;
6951 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6952 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6953 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6954 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6955 3aac7cf7 2019-07-25 stsp goto done;
6957 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6958 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
6959 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6960 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6961 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6962 0ebf8283 2019-07-24 stsp commit = NULL;
6963 0ebf8283 2019-07-24 stsp if (error)
6964 0ebf8283 2019-07-24 stsp goto done;
6966 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
6967 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6968 c5996fff 2020-01-29 stsp goto done;
6971 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6972 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6973 bfce7f83 2019-07-27 stsp if (error)
6974 bfce7f83 2019-07-27 stsp goto done;
6976 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6977 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6978 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6979 6ba2bea2 2019-07-27 stsp if (error) {
6980 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6981 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6982 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6983 0ebf8283 2019-07-24 stsp goto done;
6986 514f2ffe 2020-01-29 stsp const char *branch_name;
6987 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
6988 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
6989 514f2ffe 2020-01-29 stsp branch_name += 11;
6990 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6991 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
6992 6ba2bea2 2019-07-27 stsp if (error) {
6993 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6994 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6995 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6996 0ebf8283 2019-07-24 stsp goto done;
7001 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
7003 6ba2bea2 2019-07-27 stsp if (error) {
7004 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
7005 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
7006 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
7007 0ebf8283 2019-07-24 stsp goto done;
7012 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
7013 4ec14e60 2019-08-28 hiltjo if (error)
7014 0ebf8283 2019-07-24 stsp goto done;
7016 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
7017 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
7018 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
7019 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
7022 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
7023 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
7024 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
7025 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
7027 ab20a43a 2020-01-29 stsp if (error)
7028 ab20a43a 2020-01-29 stsp goto done;
7030 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
7031 ab20a43a 2020-01-29 stsp int have_changes = 0;
7033 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
7034 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
7035 ab20a43a 2020-01-29 stsp if (error)
7036 ab20a43a 2020-01-29 stsp goto done;
7037 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
7038 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
7039 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
7040 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
7041 ab20a43a 2020-01-29 stsp if (error) {
7042 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
7043 ab20a43a 2020-01-29 stsp goto done;
7044 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
7045 ab20a43a 2020-01-29 stsp goto done;
7047 ab20a43a 2020-01-29 stsp if (have_changes) {
7048 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
7049 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
7050 ab20a43a 2020-01-29 stsp if (error)
7051 ab20a43a 2020-01-29 stsp goto done;
7053 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
7054 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
7055 ab20a43a 2020-01-29 stsp if (error)
7056 ab20a43a 2020-01-29 stsp goto done;
7057 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
7058 ab20a43a 2020-01-29 stsp hle, NULL);
7059 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
7060 ab20a43a 2020-01-29 stsp commit = NULL;
7061 ab20a43a 2020-01-29 stsp if (error)
7062 ab20a43a 2020-01-29 stsp goto done;
7068 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
7069 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7070 0ebf8283 2019-07-24 stsp if (error)
7071 0ebf8283 2019-07-24 stsp goto done;
7075 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
7076 0ebf8283 2019-07-24 stsp hle->commit_id);
7077 0ebf8283 2019-07-24 stsp if (error)
7078 0ebf8283 2019-07-24 stsp goto done;
7079 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7080 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
7082 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
7083 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
7084 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
7085 0ebf8283 2019-07-24 stsp if (error)
7086 0ebf8283 2019-07-24 stsp goto done;
7087 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7088 0ebf8283 2019-07-24 stsp commit = NULL;
7090 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7091 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
7093 a0ea4fc0 2020-02-28 stsp if (error)
7094 a0ea4fc0 2020-02-28 stsp goto done;
7095 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7099 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
7100 0ebf8283 2019-07-24 stsp char *id_str;
7101 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
7102 0ebf8283 2019-07-24 stsp if (error)
7103 0ebf8283 2019-07-24 stsp goto done;
7104 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
7106 0ebf8283 2019-07-24 stsp free(id_str);
7107 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7108 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
7109 3e3a69f1 2019-07-25 stsp fileindex);
7110 0ebf8283 2019-07-24 stsp goto done;
7113 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
7114 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7115 0ebf8283 2019-07-24 stsp if (error)
7116 0ebf8283 2019-07-24 stsp goto done;
7120 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
7121 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
7122 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7123 0ebf8283 2019-07-24 stsp if (error)
7124 0ebf8283 2019-07-24 stsp goto done;
7127 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7128 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
7129 0ebf8283 2019-07-24 stsp if (error)
7130 0ebf8283 2019-07-24 stsp goto done;
7131 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7132 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
7134 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
7135 3e3a69f1 2019-07-25 stsp branch, repo);
7137 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
7138 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
7139 0ebf8283 2019-07-24 stsp free(head_commit_id);
7140 0ebf8283 2019-07-24 stsp free(base_commit_id);
7141 0ebf8283 2019-07-24 stsp free(resume_commit_id);
7142 0ebf8283 2019-07-24 stsp if (commit)
7143 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7144 0ebf8283 2019-07-24 stsp if (branch)
7145 0ebf8283 2019-07-24 stsp got_ref_close(branch);
7146 0ebf8283 2019-07-24 stsp if (tmp_branch)
7147 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
7148 0ebf8283 2019-07-24 stsp if (worktree)
7149 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
7151 2822a352 2019-10-15 stsp got_repo_close(repo);
7152 2822a352 2019-10-15 stsp return error;
7155 2822a352 2019-10-15 stsp __dead static void
7156 2822a352 2019-10-15 stsp usage_integrate(void)
7158 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
7162 2822a352 2019-10-15 stsp static const struct got_error *
7163 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
7165 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
7166 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
7167 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
7168 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
7169 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
7170 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
7171 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
7172 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
7173 2822a352 2019-10-15 stsp int ch, did_something = 0;
7175 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7176 2822a352 2019-10-15 stsp switch (ch) {
7178 2822a352 2019-10-15 stsp usage_integrate();
7179 2822a352 2019-10-15 stsp /* NOTREACHED */
7183 2822a352 2019-10-15 stsp argc -= optind;
7184 2822a352 2019-10-15 stsp argv += optind;
7186 2822a352 2019-10-15 stsp if (argc != 1)
7187 2822a352 2019-10-15 stsp usage_integrate();
7188 2822a352 2019-10-15 stsp branch_arg = argv[0];
7190 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7191 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
7192 2822a352 2019-10-15 stsp err(1, "pledge");
7194 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
7195 2822a352 2019-10-15 stsp if (cwd == NULL) {
7196 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
7197 2822a352 2019-10-15 stsp goto done;
7200 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
7201 2822a352 2019-10-15 stsp if (error)
7202 2822a352 2019-10-15 stsp goto done;
7204 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
7205 2822a352 2019-10-15 stsp if (error)
7206 2822a352 2019-10-15 stsp goto done;
7208 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7210 2822a352 2019-10-15 stsp if (error != NULL)
7211 2822a352 2019-10-15 stsp goto done;
7213 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7214 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
7215 2822a352 2019-10-15 stsp if (error)
7216 2822a352 2019-10-15 stsp goto done;
7218 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
7219 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
7220 2822a352 2019-10-15 stsp goto done;
7223 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
7224 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
7225 2822a352 2019-10-15 stsp if (error)
7226 2822a352 2019-10-15 stsp goto done;
7228 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
7229 2822a352 2019-10-15 stsp if (refname == NULL) {
7230 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
7231 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7232 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7233 2822a352 2019-10-15 stsp goto done;
7235 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
7236 2822a352 2019-10-15 stsp if (base_refname == NULL) {
7237 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
7238 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7239 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7240 2822a352 2019-10-15 stsp goto done;
7243 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
7244 2822a352 2019-10-15 stsp if (error)
7245 2822a352 2019-10-15 stsp goto done;
7247 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
7248 2822a352 2019-10-15 stsp if (error)
7249 2822a352 2019-10-15 stsp goto done;
7251 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
7252 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7253 2822a352 2019-10-15 stsp "specified branch has already been integrated");
7254 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7255 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7256 2822a352 2019-10-15 stsp goto done;
7259 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
7260 2822a352 2019-10-15 stsp if (error) {
7261 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
7262 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
7263 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7264 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7265 2822a352 2019-10-15 stsp goto done;
7268 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
7269 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
7270 2822a352 2019-10-15 stsp check_cancelled, NULL);
7271 2822a352 2019-10-15 stsp if (error)
7272 2822a352 2019-10-15 stsp goto done;
7274 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
7277 715dc77e 2019-08-03 stsp got_repo_close(repo);
7278 2822a352 2019-10-15 stsp if (worktree)
7279 2822a352 2019-10-15 stsp got_worktree_close(worktree);
7280 2822a352 2019-10-15 stsp free(cwd);
7281 2822a352 2019-10-15 stsp free(base_commit_id);
7282 2822a352 2019-10-15 stsp free(commit_id);
7283 2822a352 2019-10-15 stsp free(refname);
7284 2822a352 2019-10-15 stsp free(base_refname);
7285 715dc77e 2019-08-03 stsp return error;
7288 715dc77e 2019-08-03 stsp __dead static void
7289 715dc77e 2019-08-03 stsp usage_stage(void)
7291 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
7292 f3055044 2019-08-07 stsp "[file-path ...]\n",
7293 715dc77e 2019-08-03 stsp getprogname());
7297 715dc77e 2019-08-03 stsp static const struct got_error *
7298 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
7299 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
7300 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
7301 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
7303 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
7304 408b4ebc 2019-08-03 stsp char *id_str = NULL;
7306 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
7307 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
7308 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
7309 408b4ebc 2019-08-03 stsp return NULL;
7311 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
7312 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
7313 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
7315 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
7317 408b4ebc 2019-08-03 stsp return err;
7319 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
7320 408b4ebc 2019-08-03 stsp free(id_str);
7321 dc424a06 2019-08-07 stsp return NULL;
7324 dc424a06 2019-08-07 stsp static const struct got_error *
7325 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
7327 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
7328 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
7329 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
7330 715dc77e 2019-08-03 stsp char *cwd = NULL;
7331 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
7332 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
7333 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
7334 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
7335 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7336 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7338 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
7340 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
7341 715dc77e 2019-08-03 stsp switch (ch) {
7343 408b4ebc 2019-08-03 stsp list_stage = 1;
7346 dc424a06 2019-08-07 stsp pflag = 1;
7349 dc424a06 2019-08-07 stsp patch_script_path = optarg;
7352 715dc77e 2019-08-03 stsp usage_stage();
7353 715dc77e 2019-08-03 stsp /* NOTREACHED */
7357 715dc77e 2019-08-03 stsp argc -= optind;
7358 715dc77e 2019-08-03 stsp argv += optind;
7360 715dc77e 2019-08-03 stsp #ifndef PROFILE
7361 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7362 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
7363 715dc77e 2019-08-03 stsp err(1, "pledge");
7365 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
7366 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
7367 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
7368 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
7370 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
7371 715dc77e 2019-08-03 stsp if (cwd == NULL) {
7372 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
7373 715dc77e 2019-08-03 stsp goto done;
7376 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7377 715dc77e 2019-08-03 stsp if (error)
7378 715dc77e 2019-08-03 stsp goto done;
7380 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7382 715dc77e 2019-08-03 stsp if (error != NULL)
7383 715dc77e 2019-08-03 stsp goto done;
7385 dc424a06 2019-08-07 stsp if (patch_script_path) {
7386 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
7387 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
7388 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
7389 dc424a06 2019-08-07 stsp patch_script_path);
7390 dc424a06 2019-08-07 stsp goto done;
7393 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7394 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
7395 715dc77e 2019-08-03 stsp if (error)
7396 715dc77e 2019-08-03 stsp goto done;
7398 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7399 6d022e97 2019-08-04 stsp if (error)
7400 6d022e97 2019-08-04 stsp goto done;
7402 6d022e97 2019-08-04 stsp if (list_stage)
7403 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
7404 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
7406 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7407 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
7408 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
7409 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
7410 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
7413 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7414 2e1f37b0 2019-08-08 stsp error == NULL)
7415 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7417 ad493afc 2019-08-03 stsp got_repo_close(repo);
7418 ad493afc 2019-08-03 stsp if (worktree)
7419 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
7420 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7421 ad493afc 2019-08-03 stsp free((char *)pe->path);
7422 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
7423 ad493afc 2019-08-03 stsp free(cwd);
7424 ad493afc 2019-08-03 stsp return error;
7427 ad493afc 2019-08-03 stsp __dead static void
7428 ad493afc 2019-08-03 stsp usage_unstage(void)
7430 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7431 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7432 ad493afc 2019-08-03 stsp getprogname());
7437 ad493afc 2019-08-03 stsp static const struct got_error *
7438 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7440 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7441 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7442 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7443 ad493afc 2019-08-03 stsp char *cwd = NULL;
7444 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7445 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7446 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7447 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7448 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7449 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7451 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7453 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7454 ad493afc 2019-08-03 stsp switch (ch) {
7456 2e1f37b0 2019-08-08 stsp pflag = 1;
7459 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7462 ad493afc 2019-08-03 stsp usage_unstage();
7463 ad493afc 2019-08-03 stsp /* NOTREACHED */
7467 ad493afc 2019-08-03 stsp argc -= optind;
7468 ad493afc 2019-08-03 stsp argv += optind;
7470 ad493afc 2019-08-03 stsp #ifndef PROFILE
7471 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7472 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7473 ad493afc 2019-08-03 stsp err(1, "pledge");
7475 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7476 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7478 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7479 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7480 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7481 ad493afc 2019-08-03 stsp goto done;
7484 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7485 ad493afc 2019-08-03 stsp if (error)
7486 ad493afc 2019-08-03 stsp goto done;
7488 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7490 ad493afc 2019-08-03 stsp if (error != NULL)
7491 ad493afc 2019-08-03 stsp goto done;
7493 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7494 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7495 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7496 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7497 2e1f37b0 2019-08-08 stsp patch_script_path);
7498 2e1f37b0 2019-08-08 stsp goto done;
7502 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7503 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7504 ad493afc 2019-08-03 stsp if (error)
7505 ad493afc 2019-08-03 stsp goto done;
7507 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7508 ad493afc 2019-08-03 stsp if (error)
7509 ad493afc 2019-08-03 stsp goto done;
7511 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7512 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7513 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7514 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7516 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7517 2e1f37b0 2019-08-08 stsp error == NULL)
7518 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7520 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7521 715dc77e 2019-08-03 stsp if (worktree)
7522 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7523 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7524 715dc77e 2019-08-03 stsp free((char *)pe->path);
7525 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7526 715dc77e 2019-08-03 stsp free(cwd);
7527 01073a5d 2019-08-22 stsp return error;
7530 01073a5d 2019-08-22 stsp __dead static void
7531 01073a5d 2019-08-22 stsp usage_cat(void)
7533 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7534 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7538 01073a5d 2019-08-22 stsp static const struct got_error *
7539 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7541 01073a5d 2019-08-22 stsp const struct got_error *err;
7542 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7544 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7546 01073a5d 2019-08-22 stsp return err;
7548 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7549 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7550 01073a5d 2019-08-22 stsp return err;
7553 01073a5d 2019-08-22 stsp static const struct got_error *
7554 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7556 01073a5d 2019-08-22 stsp const struct got_error *err;
7557 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7558 56e0773d 2019-11-28 stsp int nentries, i;
7560 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7562 01073a5d 2019-08-22 stsp return err;
7564 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7565 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7566 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7567 01073a5d 2019-08-22 stsp char *id_str;
7568 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7570 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7571 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7574 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7575 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7576 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7577 01073a5d 2019-08-22 stsp free(id_str);
7580 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7581 01073a5d 2019-08-22 stsp return err;
7584 01073a5d 2019-08-22 stsp static const struct got_error *
7585 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7587 01073a5d 2019-08-22 stsp const struct got_error *err;
7588 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7589 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7590 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7591 01073a5d 2019-08-22 stsp char *id_str = NULL;
7592 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7594 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7596 01073a5d 2019-08-22 stsp return err;
7598 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7600 01073a5d 2019-08-22 stsp goto done;
7602 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7603 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7604 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7605 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7606 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7607 01073a5d 2019-08-22 stsp char *pid_str;
7608 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7610 01073a5d 2019-08-22 stsp goto done;
7611 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7612 01073a5d 2019-08-22 stsp free(pid_str);
7614 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7615 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7616 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7618 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7619 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7620 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7622 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7623 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7624 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7626 01073a5d 2019-08-22 stsp free(id_str);
7627 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7628 01073a5d 2019-08-22 stsp return err;
7631 01073a5d 2019-08-22 stsp static const struct got_error *
7632 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7634 01073a5d 2019-08-22 stsp const struct got_error *err;
7635 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7636 01073a5d 2019-08-22 stsp char *id_str = NULL;
7637 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7639 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7641 01073a5d 2019-08-22 stsp return err;
7643 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7645 01073a5d 2019-08-22 stsp goto done;
7647 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7649 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7650 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7651 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7652 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7654 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7655 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7656 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7658 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7659 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7660 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7662 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7663 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7664 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7670 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7671 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7673 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7674 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7675 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7677 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7678 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7679 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7681 01073a5d 2019-08-22 stsp free(id_str);
7682 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7683 01073a5d 2019-08-22 stsp return err;
7686 01073a5d 2019-08-22 stsp static const struct got_error *
7687 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7689 01073a5d 2019-08-22 stsp const struct got_error *error;
7690 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7691 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7692 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7693 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7694 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7695 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7697 01073a5d 2019-08-22 stsp #ifndef PROFILE
7698 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7699 01073a5d 2019-08-22 stsp NULL) == -1)
7700 01073a5d 2019-08-22 stsp err(1, "pledge");
7703 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7704 01073a5d 2019-08-22 stsp switch (ch) {
7706 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7709 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7710 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7711 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7713 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7716 896e9b6f 2019-08-26 stsp force_path = 1;
7719 01073a5d 2019-08-22 stsp usage_cat();
7720 01073a5d 2019-08-22 stsp /* NOTREACHED */
7724 01073a5d 2019-08-22 stsp argc -= optind;
7725 01073a5d 2019-08-22 stsp argv += optind;
7727 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7728 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7729 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7730 01073a5d 2019-08-22 stsp goto done;
7732 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7733 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7734 01073a5d 2019-08-22 stsp goto done;
7735 01073a5d 2019-08-22 stsp if (worktree) {
7736 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7737 01073a5d 2019-08-22 stsp repo_path = strdup(
7738 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7739 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7740 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7741 01073a5d 2019-08-22 stsp goto done;
7746 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7747 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7748 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7749 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7752 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7753 01073a5d 2019-08-22 stsp free(repo_path);
7754 01073a5d 2019-08-22 stsp if (error != NULL)
7755 01073a5d 2019-08-22 stsp goto done;
7757 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7758 896e9b6f 2019-08-26 stsp if (error)
7759 896e9b6f 2019-08-26 stsp goto done;
7761 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7762 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7763 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
7764 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7765 01073a5d 2019-08-22 stsp if (error)
7766 01073a5d 2019-08-22 stsp goto done;
7768 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7769 896e9b6f 2019-08-26 stsp if (force_path) {
7770 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7772 896e9b6f 2019-08-26 stsp if (error)
7775 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
7776 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7777 896e9b6f 2019-08-26 stsp if (error) {
7778 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7779 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7781 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7782 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7783 896e9b6f 2019-08-26 stsp if (error)
7788 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7789 01073a5d 2019-08-22 stsp if (error)
7792 01073a5d 2019-08-22 stsp switch (obj_type) {
7793 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7794 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7796 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7797 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7799 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7800 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7802 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7803 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7806 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7809 01073a5d 2019-08-22 stsp if (error)
7811 01073a5d 2019-08-22 stsp free(label);
7812 01073a5d 2019-08-22 stsp label = NULL;
7814 01073a5d 2019-08-22 stsp id = NULL;
7817 01073a5d 2019-08-22 stsp free(label);
7819 896e9b6f 2019-08-26 stsp free(commit_id);
7820 01073a5d 2019-08-22 stsp if (worktree)
7821 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7822 01073a5d 2019-08-22 stsp if (repo) {
7823 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7824 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7825 01073a5d 2019-08-22 stsp if (error == NULL)
7826 01073a5d 2019-08-22 stsp error = repo_error;
7828 0ebf8283 2019-07-24 stsp return error;
