2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 93658fb9 2020-03-18 stsp * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
7 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
8 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
10 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
21 5de5890b 2018-10-18 stsp #include <sys/stat.h>
22 3c45a30a 2019-05-12 jcs #include <sys/param.h>
23 33ad4cbe 2019-05-12 jcs #include <sys/wait.h>
25 5c860e29 2018-03-12 stsp #include <err.h>
26 5c860e29 2018-03-12 stsp #include <errno.h>
27 12463d8b 2019-12-13 stsp #include <fcntl.h>
28 12ce7a6c 2019-08-12 stsp #include <limits.h>
29 5c860e29 2018-03-12 stsp #include <locale.h>
30 818c7501 2019-07-11 stsp #include <ctype.h>
31 99437157 2018-11-11 stsp #include <signal.h>
32 5c860e29 2018-03-12 stsp #include <stdio.h>
33 5c860e29 2018-03-12 stsp #include <stdlib.h>
34 5c860e29 2018-03-12 stsp #include <string.h>
35 5c860e29 2018-03-12 stsp #include <unistd.h>
36 c09a553d 2018-03-12 stsp #include <libgen.h>
37 c0768b0f 2018-06-10 stsp #include <time.h>
38 33ad4cbe 2019-05-12 jcs #include <paths.h>
39 6841bf13 2019-11-29 kn #include <regex.h>
40 83cd27f8 2020-01-13 stsp #include <getopt.h>
41 d2cdc636 2020-03-18 stsp #include <util.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 f42b1b34 2018-03-12 stsp #include "got_error.h"
45 f42b1b34 2018-03-12 stsp #include "got_object.h"
46 5261c201 2018-04-01 stsp #include "got_reference.h"
47 f42b1b34 2018-03-12 stsp #include "got_repository.h"
48 1dd54920 2019-05-11 stsp #include "got_path.h"
49 e6209546 2019-08-22 stsp #include "got_cancel.h"
50 c09a553d 2018-03-12 stsp #include "got_worktree.h"
51 79109fed 2018-03-27 stsp #include "got_diff.h"
52 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
53 6f23baec 2020-03-18 stsp #include "got_fetch.h"
54 404c43c4 2018-06-21 stsp #include "got_blame.h"
55 63219cd2 2019-01-04 stsp #include "got_privsep.h"
56 793c30b5 2019-05-13 stsp #include "got_opentemp.h"
58 5c860e29 2018-03-12 stsp #ifndef nitems
59 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
62 99437157 2018-11-11 stsp static volatile sig_atomic_t sigint_received;
63 99437157 2018-11-11 stsp static volatile sig_atomic_t sigpipe_received;
66 99437157 2018-11-11 stsp catch_sigint(int signo)
68 99437157 2018-11-11 stsp sigint_received = 1;
72 99437157 2018-11-11 stsp catch_sigpipe(int signo)
74 99437157 2018-11-11 stsp sigpipe_received = 1;
78 8cfb4057 2019-07-09 stsp struct got_cmd {
79 5c860e29 2018-03-12 stsp const char *cmd_name;
80 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
81 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
82 97b3a7be 2019-07-09 stsp const char *cmd_alias;
85 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
86 2c7829a4 2019-06-17 stsp __dead static void usage_init(void);
87 3ce1b845 2019-07-15 stsp __dead static void usage_import(void);
88 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
89 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
90 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
91 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
92 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
93 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
94 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
95 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
96 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
97 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
98 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
99 d00136be 2019-03-26 stsp __dead static void usage_add(void);
100 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
101 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
102 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
103 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
104 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
105 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
106 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
107 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
108 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
109 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
110 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
112 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
113 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
114 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
115 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
116 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
117 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
118 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
119 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
120 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
121 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
122 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
123 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
124 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
125 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
126 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
127 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
128 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
129 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
130 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
131 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
132 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
133 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
134 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
135 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
136 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
138 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
139 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
140 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
141 97b3a7be 2019-07-09 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
142 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
143 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
144 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
145 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
146 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
147 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
148 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
149 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
150 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
151 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
152 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
153 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
154 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
155 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
156 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
157 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
158 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
159 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
160 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
161 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
162 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
163 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
166 ce5b7c56 2019-07-09 stsp static void
167 ce5b7c56 2019-07-09 stsp list_commands(void)
171 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
172 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
173 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
174 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
176 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
180 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
182 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
183 5c860e29 2018-03-12 stsp unsigned int i;
185 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
186 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
187 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
188 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
191 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
193 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
194 5c860e29 2018-03-12 stsp switch (ch) {
202 ce5b7c56 2019-07-09 stsp usage(hflag);
203 5c860e29 2018-03-12 stsp /* NOTREACHED */
207 5c860e29 2018-03-12 stsp argc -= optind;
208 5c860e29 2018-03-12 stsp argv += optind;
209 1e70621d 2018-03-27 stsp optind = 0;
211 53ccebc2 2019-07-30 stsp if (Vflag) {
212 53ccebc2 2019-07-30 stsp got_version_print_str();
216 5c860e29 2018-03-12 stsp if (argc <= 0)
217 ce5b7c56 2019-07-09 stsp usage(hflag);
219 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
220 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
222 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
223 d7d4f210 2018-03-12 stsp const struct got_error *error;
225 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
227 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
228 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
232 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
234 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
235 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
236 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
237 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
238 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
239 70015d7a 2019-11-08 stsp !(sigint_received &&
240 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
241 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
248 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
249 ce5b7c56 2019-07-09 stsp list_commands();
253 4ed7e80c 2018-05-20 stsp __dead static void
254 ce5b7c56 2019-07-09 stsp usage(int hflag)
256 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
257 53ccebc2 2019-07-30 stsp getprogname());
259 ce5b7c56 2019-07-09 stsp list_commands();
263 0266afb7 2019-01-04 stsp static const struct got_error *
264 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
266 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
267 e2ba3d07 2019-05-13 stsp const char *editor;
269 8920fa04 2019-08-18 stsp *abspath = NULL;
271 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
272 e2ba3d07 2019-05-13 stsp if (editor == NULL)
273 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
275 0ee7065d 2019-05-13 stsp if (editor) {
276 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
278 0ee7065d 2019-05-13 stsp return err;
281 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
282 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
283 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
284 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
287 e2ba3d07 2019-05-13 stsp return NULL;
290 e2ba3d07 2019-05-13 stsp static const struct got_error *
291 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
292 c530dc23 2019-07-23 stsp const char *worktree_path)
294 163ce85a 2019-05-13 stsp const struct got_error *err;
296 37c06ea4 2019-07-15 stsp #ifdef PROFILE
297 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
298 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
300 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
301 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
303 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
304 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
306 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
307 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
309 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
310 163ce85a 2019-05-13 stsp if (err != NULL)
311 163ce85a 2019-05-13 stsp return err;
313 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
314 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
316 0266afb7 2019-01-04 stsp return NULL;
319 2c7829a4 2019-06-17 stsp __dead static void
320 2c7829a4 2019-06-17 stsp usage_init(void)
322 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
326 2c7829a4 2019-06-17 stsp static const struct got_error *
327 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
329 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
330 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
333 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
334 2c7829a4 2019-06-17 stsp switch (ch) {
336 2c7829a4 2019-06-17 stsp usage_init();
337 2c7829a4 2019-06-17 stsp /* NOTREACHED */
341 2c7829a4 2019-06-17 stsp argc -= optind;
342 2c7829a4 2019-06-17 stsp argv += optind;
344 2c7829a4 2019-06-17 stsp #ifndef PROFILE
345 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
346 2c7829a4 2019-06-17 stsp err(1, "pledge");
348 2c7829a4 2019-06-17 stsp if (argc != 1)
349 bc20e173 2019-06-17 stsp usage_init();
351 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
352 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
353 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
355 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
357 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
358 2c7829a4 2019-06-17 stsp if (error &&
359 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
362 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
366 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
368 3ce1b845 2019-07-15 stsp free(repo_path);
369 3ce1b845 2019-07-15 stsp return error;
372 3ce1b845 2019-07-15 stsp __dead static void
373 3ce1b845 2019-07-15 stsp usage_import(void)
375 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
376 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
381 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
384 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
385 3ce1b845 2019-07-15 stsp int st = -1;
387 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
388 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
389 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
391 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
393 3ce1b845 2019-07-15 stsp goto doneediting;
395 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
396 3ce1b845 2019-07-15 stsp _exit(127);
399 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
400 3ce1b845 2019-07-15 stsp if (errno != EINTR)
403 3ce1b845 2019-07-15 stsp doneediting:
404 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
405 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
406 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
408 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
409 3ce1b845 2019-07-15 stsp errno = EINTR;
413 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
416 3ce1b845 2019-07-15 stsp static const struct got_error *
417 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
418 3ce1b845 2019-07-15 stsp const char *initial_content)
420 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
421 3ce1b845 2019-07-15 stsp char buf[1024];
422 3ce1b845 2019-07-15 stsp struct stat st, st2;
424 3ce1b845 2019-07-15 stsp int content_changed = 0;
425 3ce1b845 2019-07-15 stsp size_t len;
427 3ce1b845 2019-07-15 stsp *logmsg = NULL;
429 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
430 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
432 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
433 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
435 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
438 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
439 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
440 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
442 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
443 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
444 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
445 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
448 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
449 3ce1b845 2019-07-15 stsp if (fp == NULL) {
450 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
453 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
454 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
455 3ce1b845 2019-07-15 stsp content_changed = 1;
456 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
457 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
458 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
460 3ce1b845 2019-07-15 stsp fclose(fp);
462 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
463 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
467 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
468 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
469 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
472 3ce1b845 2019-07-15 stsp free(*logmsg);
473 3ce1b845 2019-07-15 stsp *logmsg = NULL;
475 3ce1b845 2019-07-15 stsp return err;
478 3ce1b845 2019-07-15 stsp static const struct got_error *
479 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
480 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
482 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
483 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
486 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
487 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
488 3ce1b845 2019-07-15 stsp branch_name) == -1)
489 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
491 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
492 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
496 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
499 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
501 3ce1b845 2019-07-15 stsp free(initial_content);
502 3ce1b845 2019-07-15 stsp return err;
505 3ce1b845 2019-07-15 stsp static const struct got_error *
506 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
508 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
509 3ce1b845 2019-07-15 stsp return NULL;
512 3ce1b845 2019-07-15 stsp static const struct got_error *
513 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
515 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
516 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
518 84792843 2019-08-09 stsp *author = NULL;
520 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
521 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
522 c9956ddf 2019-09-08 stsp if (name && email) {
523 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
524 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
525 aba9c984 2019-09-08 stsp return NULL;
528 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
529 84792843 2019-08-09 stsp if (got_author == NULL) {
530 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
531 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
532 c9956ddf 2019-09-08 stsp if (name && email) {
533 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
534 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
535 c9956ddf 2019-09-08 stsp return NULL;
537 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
538 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
541 aba9c984 2019-09-08 stsp *author = strdup(got_author);
542 aba9c984 2019-09-08 stsp if (*author == NULL)
543 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
546 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
547 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
549 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
550 84792843 2019-08-09 stsp got_author++;
551 aba9c984 2019-09-08 stsp if (*got_author != '<') {
552 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
555 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
556 84792843 2019-08-09 stsp got_author++;
557 aba9c984 2019-09-08 stsp if (*got_author != '@') {
558 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
561 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
562 84792843 2019-08-09 stsp got_author++;
563 84792843 2019-08-09 stsp if (*got_author != '>')
564 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
567 aba9c984 2019-09-08 stsp free(*author);
568 aba9c984 2019-09-08 stsp *author = NULL;
570 aba9c984 2019-09-08 stsp return err;
573 c9956ddf 2019-09-08 stsp static const struct got_error *
574 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
576 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
578 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
579 c9956ddf 2019-09-08 stsp if (homedir) {
580 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
581 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
584 c9956ddf 2019-09-08 stsp return NULL;
587 84792843 2019-08-09 stsp static const struct got_error *
588 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
590 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
591 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
592 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
593 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
594 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
595 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
596 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
597 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
599 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
600 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
601 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
603 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
605 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
606 3ce1b845 2019-07-15 stsp switch (ch) {
608 3ce1b845 2019-07-15 stsp branch_name = optarg;
611 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
612 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
613 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
618 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
619 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
620 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
626 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
628 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
634 b2b65d18 2019-08-22 stsp usage_import();
635 3ce1b845 2019-07-15 stsp /* NOTREACHED */
639 3ce1b845 2019-07-15 stsp argc -= optind;
640 3ce1b845 2019-07-15 stsp argv += optind;
642 3ce1b845 2019-07-15 stsp #ifndef PROFILE
643 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
645 3ce1b845 2019-07-15 stsp NULL) == -1)
646 3ce1b845 2019-07-15 stsp err(1, "pledge");
648 3ce1b845 2019-07-15 stsp if (argc != 1)
649 3ce1b845 2019-07-15 stsp usage_import();
651 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
652 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
653 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
654 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
656 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
657 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
660 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
664 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
666 aba9c984 2019-09-08 stsp return error;
669 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
670 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
671 e560b7e0 2019-11-28 stsp * an unintended typo.
673 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
674 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
676 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
677 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
681 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
682 3ce1b845 2019-07-15 stsp if (error) {
683 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
686 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
687 3ce1b845 2019-07-15 stsp "import target branch already exists");
691 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
692 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
693 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
696 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
699 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
700 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
702 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
703 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
706 8e158b01 2019-09-22 stsp free(logmsg);
707 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
708 ef293bdd 2019-10-21 stsp path_dir, refname);
709 ef293bdd 2019-10-21 stsp if (error) {
710 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
711 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
712 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
717 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
718 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
719 ef293bdd 2019-10-21 stsp if (logmsg_path)
720 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
724 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
725 ef293bdd 2019-10-21 stsp if (error) {
726 ef293bdd 2019-10-21 stsp if (logmsg_path)
727 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
731 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
732 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
733 ef293bdd 2019-10-21 stsp if (error) {
734 ef293bdd 2019-10-21 stsp if (logmsg_path)
735 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
739 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
740 ef293bdd 2019-10-21 stsp if (error) {
741 ef293bdd 2019-10-21 stsp if (logmsg_path)
742 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
746 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
747 ef293bdd 2019-10-21 stsp if (error) {
748 ef293bdd 2019-10-21 stsp if (logmsg_path)
749 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
753 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
754 ef293bdd 2019-10-21 stsp if (error) {
755 ef293bdd 2019-10-21 stsp if (logmsg_path)
756 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
760 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
761 3ce1b845 2019-07-15 stsp if (error) {
762 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
763 ef293bdd 2019-10-21 stsp if (logmsg_path)
764 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
768 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
769 3ce1b845 2019-07-15 stsp branch_ref);
770 ef293bdd 2019-10-21 stsp if (error) {
771 ef293bdd 2019-10-21 stsp if (logmsg_path)
772 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
776 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
777 ef293bdd 2019-10-21 stsp if (error) {
778 ef293bdd 2019-10-21 stsp if (logmsg_path)
779 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
784 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
785 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
787 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
788 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
789 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
790 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
791 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
792 8e158b01 2019-09-22 stsp free(logmsg);
793 ef293bdd 2019-10-21 stsp free(logmsg_path);
794 2c7829a4 2019-06-17 stsp free(repo_path);
795 3ce1b845 2019-07-15 stsp free(editor);
796 3ce1b845 2019-07-15 stsp free(refname);
797 3ce1b845 2019-07-15 stsp free(new_commit_id);
798 3ce1b845 2019-07-15 stsp free(id_str);
799 aba9c984 2019-09-08 stsp free(author);
800 c9956ddf 2019-09-08 stsp free(gitconfig_path);
801 3ce1b845 2019-07-15 stsp if (branch_ref)
802 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
803 3ce1b845 2019-07-15 stsp if (head_ref)
804 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
805 2c7829a4 2019-06-17 stsp return error;
808 93658fb9 2020-03-18 stsp __dead static void
809 93658fb9 2020-03-18 stsp usage_clone(void)
811 93658fb9 2020-03-18 stsp fprintf(stderr, "usage: %s clone repo-url\n", getprogname());
815 4ed7e80c 2018-05-20 stsp __dead static void
816 c09a553d 2018-03-12 stsp usage_checkout(void)
818 bb51a5b4 2020-01-13 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
819 08573d5b 2019-05-14 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
823 7f47418f 2019-12-20 stsp static void
824 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning(void)
826 7f47418f 2019-12-20 stsp fprintf(stderr, "%s: warning: could not create a reference "
827 7f47418f 2019-12-20 stsp "to the work tree's base commit; the commit could be "
828 7f47418f 2019-12-20 stsp "garbage-collected by Git; making the repository "
829 7f47418f 2019-12-20 stsp "writable and running 'got update' will prevent this\n",
830 7f47418f 2019-12-20 stsp getprogname());
833 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg {
834 7f47418f 2019-12-20 stsp const char *worktree_path;
835 7f47418f 2019-12-20 stsp int had_base_commit_ref_error;
838 1ee397ad 2019-07-12 stsp static const struct got_error *
839 a0eb853d 2018-12-29 stsp checkout_progress(void *arg, unsigned char status, const char *path)
841 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg *a = arg;
843 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
844 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
845 7f47418f 2019-12-20 stsp return NULL;
847 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
848 7f47418f 2019-12-20 stsp a->had_base_commit_ref_error = 1;
849 1ee397ad 2019-07-12 stsp return NULL;
852 92a684f4 2018-03-12 stsp while (path[0] == '/')
855 7f47418f 2019-12-20 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
856 1ee397ad 2019-07-12 stsp return NULL;
859 99437157 2018-11-11 stsp static const struct got_error *
860 6bad629b 2019-02-04 stsp check_cancelled(void *arg)
862 99437157 2018-11-11 stsp if (sigint_received || sigpipe_received)
863 99437157 2018-11-11 stsp return got_error(GOT_ERR_CANCELLED);
864 99437157 2018-11-11 stsp return NULL;
867 8069f636 2019-01-12 stsp static const struct got_error *
868 024e9686 2019-05-14 stsp check_linear_ancestry(struct got_object_id *commit_id,
869 3aef623b 2019-10-15 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
870 3aef623b 2019-10-15 stsp struct got_repository *repo)
872 d5bea539 2019-05-13 stsp const struct got_error *err = NULL;
873 024e9686 2019-05-14 stsp struct got_object_id *yca_id;
875 d5bea539 2019-05-13 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
876 6fb7cd11 2019-08-22 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
878 36a38700 2019-05-10 stsp return err;
880 d5bea539 2019-05-13 stsp if (yca_id == NULL)
881 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
884 d5bea539 2019-05-13 stsp * Require a straight line of history between the target commit
885 d5bea539 2019-05-13 stsp * and the work tree's base commit.
887 d5751d49 2019-05-14 stsp * Non-linear situations such as this require a rebase:
889 d5bea539 2019-05-13 stsp * (commit) D F (base_commit)
897 d5bea539 2019-05-13 stsp * 'got update' only handles linear cases:
898 d5bea539 2019-05-13 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
899 efa2b6f7 2019-05-14 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
901 3aef623b 2019-10-15 stsp if (allow_forwards_in_time_only) {
902 3aef623b 2019-10-15 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
903 3aef623b 2019-10-15 stsp return got_error(GOT_ERR_ANCESTRY);
904 3aef623b 2019-10-15 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
905 d5bea539 2019-05-13 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
906 d5bea539 2019-05-13 stsp return got_error(GOT_ERR_ANCESTRY);
908 d5bea539 2019-05-13 stsp free(yca_id);
909 d5bea539 2019-05-13 stsp return NULL;
912 a367ff0f 2019-05-14 stsp static const struct got_error *
913 a367ff0f 2019-05-14 stsp check_same_branch(struct got_object_id *commit_id,
914 a51a74b3 2019-07-27 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
915 a51a74b3 2019-07-27 stsp struct got_repository *repo)
917 a367ff0f 2019-05-14 stsp const struct got_error *err = NULL;
918 a367ff0f 2019-05-14 stsp struct got_commit_graph *graph = NULL;
919 a367ff0f 2019-05-14 stsp struct got_object_id *head_commit_id = NULL;
920 a367ff0f 2019-05-14 stsp int is_same_branch = 0;
922 a367ff0f 2019-05-14 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
926 a51a74b3 2019-07-27 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
927 a51a74b3 2019-07-27 stsp is_same_branch = 1;
930 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
931 a51a74b3 2019-07-27 stsp is_same_branch = 1;
935 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
939 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
940 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
945 a367ff0f 2019-05-14 stsp struct got_object_id *id;
946 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
947 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
949 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
950 a367ff0f 2019-05-14 stsp err = NULL;
955 a51a74b3 2019-07-27 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
957 a367ff0f 2019-05-14 stsp if (got_object_id_cmp(id, commit_id) == 0) {
958 a367ff0f 2019-05-14 stsp is_same_branch = 1;
965 a367ff0f 2019-05-14 stsp got_commit_graph_close(graph);
966 a367ff0f 2019-05-14 stsp free(head_commit_id);
967 a367ff0f 2019-05-14 stsp if (!err && !is_same_branch)
968 a367ff0f 2019-05-14 stsp err = got_error(GOT_ERR_ANCESTRY);
969 a367ff0f 2019-05-14 stsp return err;
972 93658fb9 2020-03-18 stsp static const struct got_error *
973 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
974 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
976 61cc1a7a 2020-03-18 stsp int *did_something = arg, p;
977 d2cdc636 2020-03-18 stsp char scaled[FMT_SCALED_STRSIZE];
979 d2cdc636 2020-03-18 stsp if (message) {
980 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
981 d2cdc636 2020-03-18 stsp *did_something = 1;
982 668a20f6 2020-03-18 stsp } else if (packfile_size > 0 || nobj_indexed > 0) {
983 668a20f6 2020-03-18 stsp printf("\r");
984 baa9fea0 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled) == 0)
985 668a20f6 2020-03-18 stsp printf(" %*s fetched", FMT_SCALED_STRSIZE, scaled);
986 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
987 61cc1a7a 2020-03-18 stsp p = (nobj_indexed * 100) / nobj_total;
988 55f98ccb 2020-03-18 stsp printf("; indexing %d%% (%d)", p, nobj_indexed);
990 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
991 61cc1a7a 2020-03-18 stsp p = (nobj_resolved * 100) / (nobj_total - nobj_loose);
992 55f98ccb 2020-03-18 stsp printf("; resolving deltas %d%% (%d)",
993 55f98ccb 2020-03-18 stsp p, nobj_resolved);
995 d2cdc636 2020-03-18 stsp *did_something = 1;
997 531c3985 2020-03-18 stsp fflush(stdout);
998 531c3985 2020-03-18 stsp return NULL;
1001 531c3985 2020-03-18 stsp static const struct got_error *
1002 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1004 09838ffc 2020-03-18 stsp const struct got_error *err = NULL;
1005 09838ffc 2020-03-18 stsp const char *uri, *branch_filter, *dirname;
1006 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1007 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1008 bb64b798 2020-03-18 stsp const char *repo_path;
1009 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1010 d9b4d0c0 2020-03-18 stsp struct got_pathlist_head refs, symrefs;
1011 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1012 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1013 20eb36d0 2020-03-18 stsp int ch, fetchfd = -1;
1014 d2cdc636 2020-03-18 stsp int did_something = 0;
1016 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1017 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1019 93658fb9 2020-03-18 stsp while ((ch = getopt(argc, argv, "b:")) != -1) {
1020 93658fb9 2020-03-18 stsp switch (ch) {
1022 93658fb9 2020-03-18 stsp branch_filter = optarg;
1025 93658fb9 2020-03-18 stsp usage_clone();
1029 93658fb9 2020-03-18 stsp argc -= optind;
1030 93658fb9 2020-03-18 stsp argv += optind;
1031 93658fb9 2020-03-18 stsp uri = argv[0];
1032 93658fb9 2020-03-18 stsp if(argc == 1)
1033 93658fb9 2020-03-18 stsp dirname = NULL;
1034 93658fb9 2020-03-18 stsp else if(argc == 2)
1035 93658fb9 2020-03-18 stsp dirname = argv[1];
1037 93658fb9 2020-03-18 stsp usage_clone();
1039 09838ffc 2020-03-18 stsp err = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1040 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1042 09838ffc 2020-03-18 stsp goto done;
1044 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1045 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1046 bb64b798 2020-03-18 stsp err = got_error_from_errno("asprintf");
1047 bb64b798 2020-03-18 stsp goto done;
1049 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1051 bb64b798 2020-03-18 stsp repo_path = dirname;
1053 bb64b798 2020-03-18 stsp err = got_path_mkdir(repo_path);
1055 bb64b798 2020-03-18 stsp goto done;
1057 bb64b798 2020-03-18 stsp err = got_repo_init(repo_path);
1059 bb64b798 2020-03-18 stsp goto done;
1061 bb64b798 2020-03-18 stsp err = got_repo_open(&repo, repo_path, NULL);
1063 294dfefd 2020-03-18 stsp goto done;
1065 294dfefd 2020-03-18 stsp err = got_fetch_connect(&fetchfd, proto, host, port, server_path);
1067 bb64b798 2020-03-18 stsp goto done;
1069 294dfefd 2020-03-18 stsp printf("Connected to %s:%s\n", host, port);
1071 07e52fce 2020-03-18 stsp err = got_fetch_pack(&pack_hash, &refs, &symrefs, fetchfd,
1072 d2cdc636 2020-03-18 stsp repo, fetch_progress, &did_something);
1074 d9b4d0c0 2020-03-18 stsp goto done;
1075 d2cdc636 2020-03-18 stsp if (did_something)
1076 d2cdc636 2020-03-18 stsp printf("\n");
1078 d9b4d0c0 2020-03-18 stsp err = got_object_id_str(&id_str, pack_hash);
1080 d9b4d0c0 2020-03-18 stsp goto done;
1081 d9b4d0c0 2020-03-18 stsp printf("Fetched %s.pack\n", id_str);
1082 d9b4d0c0 2020-03-18 stsp free(id_str);
1084 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1085 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1086 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1087 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1088 d9b4d0c0 2020-03-18 stsp struct got_reference *ref;
1091 668a20f6 2020-03-18 stsp err = got_ref_alloc(&ref, refname, id);
1093 d9b4d0c0 2020-03-18 stsp goto done;
1096 668a20f6 2020-03-18 stsp err = got_object_id_str(&id_str, id);
1098 d9b4d0c0 2020-03-18 stsp goto done;
1099 d9b4d0c0 2020-03-18 stsp printf("%s: %s\n", got_ref_get_name(ref), id_str);
1100 d9b4d0c0 2020-03-18 stsp free(id_str);
1102 d9b4d0c0 2020-03-18 stsp err = got_ref_write(ref, repo);
1103 d9b4d0c0 2020-03-18 stsp got_ref_close(ref);
1105 d9b4d0c0 2020-03-18 stsp goto done;
1108 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1109 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1110 d9b4d0c0 2020-03-18 stsp struct got_reference *symref, *target_ref;
1111 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1112 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1114 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1117 d9b4d0c0 2020-03-18 stsp err = got_ref_open(&target_ref, repo, target, 0);
1118 d9b4d0c0 2020-03-18 stsp if (err) {
1119 d9b4d0c0 2020-03-18 stsp if (err->code == GOT_ERR_NOT_REF)
1121 d9b4d0c0 2020-03-18 stsp goto done;
1124 d9b4d0c0 2020-03-18 stsp err = got_ref_alloc_symref(&symref, GOT_REF_HEAD, target_ref);
1125 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1127 d9b4d0c0 2020-03-18 stsp goto done;
1129 d9b4d0c0 2020-03-18 stsp printf("Setting %s to %s\n", GOT_REF_HEAD,
1130 d9b4d0c0 2020-03-18 stsp got_ref_get_symref_target(symref));
1132 d9b4d0c0 2020-03-18 stsp err = got_ref_write(symref, repo);
1133 d9b4d0c0 2020-03-18 stsp got_ref_close(symref);
1138 20eb36d0 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && err == NULL)
1139 20eb36d0 2020-03-18 stsp err = got_error_from_errno("close");
1141 bb64b798 2020-03-18 stsp got_repo_close(repo);
1142 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1143 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1144 d9b4d0c0 2020-03-18 stsp free(pe->data);
1146 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1147 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1148 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1149 d9b4d0c0 2020-03-18 stsp free(pe->data);
1151 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1152 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1153 09838ffc 2020-03-18 stsp free(proto);
1154 09838ffc 2020-03-18 stsp free(host);
1155 09838ffc 2020-03-18 stsp free(port);
1156 09838ffc 2020-03-18 stsp free(server_path);
1157 09838ffc 2020-03-18 stsp free(repo_name);
1158 bb64b798 2020-03-18 stsp free(default_destdir);
1159 09838ffc 2020-03-18 stsp return err;
1162 4ed7e80c 2018-05-20 stsp static const struct got_error *
1163 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
1165 4b6c9460 2020-03-05 stsp static char msg[512];
1166 4b6c9460 2020-03-05 stsp const char *branch_name;
1168 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
1169 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
1171 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
1173 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
1174 4b6c9460 2020-03-05 stsp branch_name += 11;
1176 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
1177 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
1178 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
1179 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
1180 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
1181 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
1183 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
1186 4b6c9460 2020-03-05 stsp static const struct got_error *
1187 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
1189 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
1190 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
1191 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
1192 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
1193 c09a553d 2018-03-12 stsp char *repo_path = NULL;
1194 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
1195 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
1196 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
1197 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
1198 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
1199 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1200 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
1202 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1204 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1205 0bb8a95e 2018-03-12 stsp switch (ch) {
1207 08573d5b 2019-05-14 stsp branch_name = optarg;
1210 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
1211 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
1212 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1215 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
1218 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
1221 2deda0b9 2019-03-07 stsp usage_checkout();
1222 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
1226 0bb8a95e 2018-03-12 stsp argc -= optind;
1227 0bb8a95e 2018-03-12 stsp argv += optind;
1229 6715a751 2018-03-16 stsp #ifndef PROFILE
1230 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1231 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1232 c09a553d 2018-03-12 stsp err(1, "pledge");
1234 0bb8a95e 2018-03-12 stsp if (argc == 1) {
1235 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
1236 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1237 76089277 2018-04-01 stsp if (repo_path == NULL)
1238 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
1239 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
1240 76089277 2018-04-01 stsp if (cwd == NULL) {
1241 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1242 76089277 2018-04-01 stsp goto done;
1244 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
1245 230a42bd 2019-05-11 jcs base = basename(path_prefix);
1246 230a42bd 2019-05-11 jcs if (base == NULL) {
1247 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1248 230a42bd 2019-05-11 jcs path_prefix);
1252 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
1253 230a42bd 2019-05-11 jcs if (base == NULL) {
1254 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
1255 230a42bd 2019-05-11 jcs repo_path);
1259 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
1260 c09a553d 2018-03-12 stsp if (dotgit)
1261 c09a553d 2018-03-12 stsp *dotgit = '\0';
1262 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1263 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
1264 c09a553d 2018-03-12 stsp free(cwd);
1265 76089277 2018-04-01 stsp goto done;
1267 c09a553d 2018-03-12 stsp free(cwd);
1268 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
1269 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
1270 76089277 2018-04-01 stsp if (repo_path == NULL) {
1271 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
1272 76089277 2018-04-01 stsp goto done;
1274 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
1275 76089277 2018-04-01 stsp if (worktree_path == NULL) {
1276 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
1277 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
1279 b4b3a7dd 2019-07-22 stsp goto done;
1281 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
1282 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
1283 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
1284 b4b3a7dd 2019-07-22 stsp goto done;
1288 c09a553d 2018-03-12 stsp usage_checkout();
1290 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
1291 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
1293 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
1294 c09a553d 2018-03-12 stsp if (error != NULL)
1295 c02c541e 2019-03-29 stsp goto done;
1297 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
1298 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
1299 c530dc23 2019-07-23 stsp if (error) {
1300 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1301 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1302 c530dc23 2019-07-23 stsp goto done;
1303 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
1304 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
1305 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
1306 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
1307 c530dc23 2019-07-23 stsp goto done;
1311 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1312 c02c541e 2019-03-29 stsp if (error)
1313 c09a553d 2018-03-12 stsp goto done;
1315 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
1316 c09a553d 2018-03-12 stsp if (error != NULL)
1317 c09a553d 2018-03-12 stsp goto done;
1319 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1320 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1321 c09a553d 2018-03-12 stsp goto done;
1323 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
1324 c09a553d 2018-03-12 stsp if (error != NULL)
1325 c09a553d 2018-03-12 stsp goto done;
1327 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1328 e5dc7198 2018-12-29 stsp path_prefix);
1329 e5dc7198 2018-12-29 stsp if (error != NULL)
1330 e5dc7198 2018-12-29 stsp goto done;
1331 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
1332 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
1333 49520a32 2018-12-29 stsp goto done;
1336 8069f636 2019-01-12 stsp if (commit_id_str) {
1337 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
1338 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1339 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1340 30837e32 2019-07-25 stsp if (error)
1341 8069f636 2019-01-12 stsp goto done;
1342 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1343 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1344 8069f636 2019-01-12 stsp if (error != NULL) {
1345 8069f636 2019-01-12 stsp free(commit_id);
1346 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
1347 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
1348 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
1350 8069f636 2019-01-12 stsp goto done;
1352 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1353 4b6c9460 2020-03-05 stsp if (error) {
1354 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
1355 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
1356 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
1358 45d344f6 2019-05-14 stsp goto done;
1360 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1361 8069f636 2019-01-12 stsp commit_id);
1362 8069f636 2019-01-12 stsp free(commit_id);
1363 8069f636 2019-01-12 stsp if (error)
1364 8069f636 2019-01-12 stsp goto done;
1367 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
1368 f2ea84fa 2019-07-27 stsp if (error)
1369 f2ea84fa 2019-07-27 stsp goto done;
1370 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
1371 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
1372 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1373 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
1374 c09a553d 2018-03-12 stsp if (error != NULL)
1375 c09a553d 2018-03-12 stsp goto done;
1377 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
1378 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
1379 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
1381 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1382 8069f636 2019-01-12 stsp free(commit_id_str);
1383 76089277 2018-04-01 stsp free(repo_path);
1384 507dc3bb 2018-12-29 stsp free(worktree_path);
1385 507dc3bb 2018-12-29 stsp return error;
1388 507dc3bb 2018-12-29 stsp __dead static void
1389 507dc3bb 2018-12-29 stsp usage_update(void)
1391 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1392 507dc3bb 2018-12-29 stsp getprogname());
1396 1ee397ad 2019-07-12 stsp static const struct got_error *
1397 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
1399 784955db 2019-01-12 stsp int *did_something = arg;
1401 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
1402 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
1403 1ee397ad 2019-07-12 stsp return NULL;
1405 1545c615 2019-02-10 stsp *did_something = 1;
1407 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
1408 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
1409 1ee397ad 2019-07-12 stsp return NULL;
1411 507dc3bb 2018-12-29 stsp while (path[0] == '/')
1413 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
1414 1ee397ad 2019-07-12 stsp return NULL;
1417 be7061eb 2018-12-30 stsp static const struct got_error *
1418 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
1419 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
1420 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
1422 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
1423 a1fb16d8 2019-05-24 stsp char *base_id_str;
1424 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
1426 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
1427 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
1428 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
1429 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
1430 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
1431 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
1432 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
1435 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
1436 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1437 a1fb16d8 2019-05-24 stsp if (err) {
1438 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
1439 a1fb16d8 2019-05-24 stsp return err;
1440 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
1442 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
1443 a1fb16d8 2019-05-24 stsp return NULL;
1445 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
1446 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
1447 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
1449 a1fb16d8 2019-05-24 stsp return err;
1450 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
1451 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1452 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
1453 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
1454 0ebf8283 2019-07-24 stsp return NULL;
1457 0ebf8283 2019-07-24 stsp static const struct got_error *
1458 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1460 0ebf8283 2019-07-24 stsp const struct got_error *err;
1461 0ebf8283 2019-07-24 stsp int in_progress;
1463 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
1465 0ebf8283 2019-07-24 stsp return err;
1466 0ebf8283 2019-07-24 stsp if (in_progress)
1467 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
1469 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
1471 0ebf8283 2019-07-24 stsp return err;
1472 0ebf8283 2019-07-24 stsp if (in_progress)
1473 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
1475 a1fb16d8 2019-05-24 stsp return NULL;
1478 a5edda0a 2019-07-27 stsp static const struct got_error *
1479 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1480 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
1482 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
1483 a5edda0a 2019-07-27 stsp char *path;
1486 a5edda0a 2019-07-27 stsp if (argc == 0) {
1487 a5edda0a 2019-07-27 stsp path = strdup("");
1488 a5edda0a 2019-07-27 stsp if (path == NULL)
1489 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
1490 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
1493 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
1494 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
1497 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
1498 a5edda0a 2019-07-27 stsp if (err) {
1499 a5edda0a 2019-07-27 stsp free(path);
1504 a5edda0a 2019-07-27 stsp return err;
1507 a1fb16d8 2019-05-24 stsp static const struct got_error *
1508 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
1510 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
1511 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
1512 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
1513 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
1514 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
1515 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
1516 024e9686 2019-05-14 stsp const char *branch_name = NULL;
1517 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
1518 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
1519 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1520 0ebf8283 2019-07-24 stsp int ch, did_something = 0;
1522 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
1524 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1525 507dc3bb 2018-12-29 stsp switch (ch) {
1527 024e9686 2019-05-14 stsp branch_name = optarg;
1530 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
1531 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
1532 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
1535 2deda0b9 2019-03-07 stsp usage_update();
1536 507dc3bb 2018-12-29 stsp /* NOTREACHED */
1540 507dc3bb 2018-12-29 stsp argc -= optind;
1541 507dc3bb 2018-12-29 stsp argv += optind;
1543 507dc3bb 2018-12-29 stsp #ifndef PROFILE
1544 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1545 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
1546 507dc3bb 2018-12-29 stsp err(1, "pledge");
1548 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
1549 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
1550 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1551 c4cdcb68 2019-04-03 stsp goto done;
1553 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
1554 7d5807f4 2019-07-11 stsp if (error)
1555 7d5807f4 2019-07-11 stsp goto done;
1557 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
1558 f2ea84fa 2019-07-27 stsp if (error)
1559 f2ea84fa 2019-07-27 stsp goto done;
1561 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1563 507dc3bb 2018-12-29 stsp if (error != NULL)
1564 507dc3bb 2018-12-29 stsp goto done;
1566 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
1567 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
1568 087fb88c 2019-08-04 stsp if (error)
1569 087fb88c 2019-08-04 stsp goto done;
1571 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1572 0266afb7 2019-01-04 stsp if (error)
1573 0266afb7 2019-01-04 stsp goto done;
1575 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1576 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
1577 024e9686 2019-05-14 stsp if (error != NULL)
1578 024e9686 2019-05-14 stsp goto done;
1579 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
1580 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1581 9c4b8182 2019-01-02 stsp if (error != NULL)
1582 9c4b8182 2019-01-02 stsp goto done;
1583 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
1584 507dc3bb 2018-12-29 stsp if (error != NULL)
1585 507dc3bb 2018-12-29 stsp goto done;
1587 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
1588 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1589 04f57cb3 2019-07-25 stsp free(commit_id_str);
1590 bb787f09 2019-07-25 stsp commit_id_str = NULL;
1591 30837e32 2019-07-25 stsp if (error)
1592 a297e751 2019-07-11 stsp goto done;
1593 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
1594 a297e751 2019-07-11 stsp if (error)
1595 507dc3bb 2018-12-29 stsp goto done;
1598 a1fb16d8 2019-05-24 stsp if (branch_name) {
1599 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
1600 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
1601 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
1603 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
1604 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
1605 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
1606 024e9686 2019-05-14 stsp goto done;
1608 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
1609 024e9686 2019-05-14 stsp if (error)
1610 024e9686 2019-05-14 stsp goto done;
1611 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
1613 a367ff0f 2019-05-14 stsp free(head_commit_id);
1614 024e9686 2019-05-14 stsp if (error != NULL)
1615 024e9686 2019-05-14 stsp goto done;
1616 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1617 a367ff0f 2019-05-14 stsp if (error)
1618 a367ff0f 2019-05-14 stsp goto done;
1619 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
1620 024e9686 2019-05-14 stsp if (error)
1621 024e9686 2019-05-14 stsp goto done;
1623 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
1624 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
1625 a367ff0f 2019-05-14 stsp if (error != NULL) {
1626 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
1627 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
1628 024e9686 2019-05-14 stsp goto done;
1630 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
1631 a367ff0f 2019-05-14 stsp if (error)
1632 a367ff0f 2019-05-14 stsp goto done;
1635 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1636 507dc3bb 2018-12-29 stsp commit_id) != 0) {
1637 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
1638 507dc3bb 2018-12-29 stsp commit_id);
1639 507dc3bb 2018-12-29 stsp if (error)
1640 507dc3bb 2018-12-29 stsp goto done;
1643 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
1644 6bad629b 2019-02-04 stsp update_progress, &did_something, check_cancelled, NULL);
1645 507dc3bb 2018-12-29 stsp if (error != NULL)
1646 507dc3bb 2018-12-29 stsp goto done;
1648 784955db 2019-01-12 stsp if (did_something)
1649 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
1651 784955db 2019-01-12 stsp printf("Already up-to-date\n");
1653 c09a553d 2018-03-12 stsp free(worktree_path);
1654 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
1655 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
1656 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
1657 507dc3bb 2018-12-29 stsp free(commit_id);
1658 9c4b8182 2019-01-02 stsp free(commit_id_str);
1659 c09a553d 2018-03-12 stsp return error;
1662 f42b1b34 2018-03-12 stsp static const struct got_error *
1663 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1664 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1665 63035f9f 2019-10-06 stsp struct got_repository *repo)
1667 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
1668 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1670 44392932 2019-08-25 stsp if (blob_id1) {
1671 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1673 44392932 2019-08-25 stsp goto done;
1676 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1678 44392932 2019-08-25 stsp goto done;
1680 44392932 2019-08-25 stsp while (path[0] == '/')
1682 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
1683 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
1685 44392932 2019-08-25 stsp if (blob1)
1686 44392932 2019-08-25 stsp got_object_blob_close(blob1);
1687 44392932 2019-08-25 stsp got_object_blob_close(blob2);
1688 44392932 2019-08-25 stsp return err;
1691 44392932 2019-08-25 stsp static const struct got_error *
1692 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1693 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
1694 63035f9f 2019-10-06 stsp struct got_repository *repo)
1696 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1697 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1698 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
1700 44392932 2019-08-25 stsp if (tree_id1) {
1701 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1703 44392932 2019-08-25 stsp goto done;
1706 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1708 0f2b3dca 2018-12-22 stsp goto done;
1710 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1711 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1712 aaa13589 2019-06-01 stsp arg.outfile = stdout;
1713 44392932 2019-08-25 stsp while (path[0] == '/')
1715 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
1716 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
1718 79109fed 2018-03-27 stsp if (tree1)
1719 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
1720 366e0a5f 2019-10-10 stsp if (tree2)
1721 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
1722 44392932 2019-08-25 stsp return err;
1725 44392932 2019-08-25 stsp static const struct got_error *
1726 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
1727 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
1729 44392932 2019-08-25 stsp const struct got_error *err = NULL;
1730 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
1731 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
1732 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1733 44392932 2019-08-25 stsp struct got_object_qid *qid;
1735 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1736 44392932 2019-08-25 stsp if (qid != NULL) {
1737 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
1740 44392932 2019-08-25 stsp return err;
1743 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
1744 44392932 2019-08-25 stsp int obj_type;
1745 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
1747 44392932 2019-08-25 stsp goto done;
1748 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1749 44392932 2019-08-25 stsp if (err) {
1750 44392932 2019-08-25 stsp free(obj_id2);
1751 44392932 2019-08-25 stsp goto done;
1753 44392932 2019-08-25 stsp if (pcommit) {
1754 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
1755 44392932 2019-08-25 stsp qid->id, path);
1756 44392932 2019-08-25 stsp if (err) {
1757 44392932 2019-08-25 stsp free(obj_id2);
1758 44392932 2019-08-25 stsp goto done;
1760 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1761 44392932 2019-08-25 stsp if (err) {
1762 44392932 2019-08-25 stsp free(obj_id2);
1763 44392932 2019-08-25 stsp goto done;
1766 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
1767 44392932 2019-08-25 stsp if (err) {
1768 44392932 2019-08-25 stsp free(obj_id2);
1769 44392932 2019-08-25 stsp goto done;
1771 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1772 44392932 2019-08-25 stsp switch (obj_type) {
1773 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
1774 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1777 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
1778 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
1782 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1785 44392932 2019-08-25 stsp free(obj_id1);
1786 44392932 2019-08-25 stsp free(obj_id2);
1788 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
1789 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
1791 44392932 2019-08-25 stsp goto done;
1792 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
1793 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
1795 44392932 2019-08-25 stsp goto done;
1796 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1797 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1800 0f2b3dca 2018-12-22 stsp free(id_str1);
1801 0f2b3dca 2018-12-22 stsp free(id_str2);
1802 44392932 2019-08-25 stsp if (pcommit)
1803 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
1804 79109fed 2018-03-27 stsp return err;
1807 4bb494d5 2018-06-16 stsp static char *
1808 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
1810 09867e48 2019-08-13 stsp struct tm mytm, *tm;
1811 09867e48 2019-08-13 stsp char *p, *s;
1813 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
1814 09867e48 2019-08-13 stsp if (tm == NULL)
1815 09867e48 2019-08-13 stsp return NULL;
1816 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
1817 09867e48 2019-08-13 stsp if (s == NULL)
1818 09867e48 2019-08-13 stsp return NULL;
1819 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
1821 6c281f94 2018-06-11 stsp *p = '\0';
1825 6841bf13 2019-11-29 kn static const struct got_error *
1826 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
1827 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
1829 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
1830 6841bf13 2019-11-29 kn regmatch_t regmatch;
1831 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
1833 6841bf13 2019-11-29 kn *have_match = 0;
1835 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
1839 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
1843 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1844 6841bf13 2019-11-29 kn *have_match = 1;
1846 6841bf13 2019-11-29 kn free(id_str);
1847 6841bf13 2019-11-29 kn free(logmsg);
1851 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1853 79109fed 2018-03-27 stsp static const struct got_error *
1854 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
1855 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
1856 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
1858 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
1859 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
1860 6c281f94 2018-06-11 stsp char datebuf[26];
1861 45d799e2 2018-12-23 stsp time_t committer_time;
1862 45d799e2 2018-12-23 stsp const char *author, *committer;
1863 199a4027 2019-02-02 stsp char *refs_str = NULL;
1864 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
1866 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1868 199a4027 2019-02-02 stsp const char *name;
1869 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
1872 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
1873 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1875 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
1876 199a4027 2019-02-02 stsp name += 5;
1877 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1879 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
1880 e34f9ed6 2019-02-02 stsp name += 6;
1881 141c2bff 2019-02-04 stsp if (strncmp(name, "remotes/", 8) == 0)
1882 141c2bff 2019-02-04 stsp name += 8;
1883 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1884 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1885 5d844a1e 2019-08-13 stsp if (err) {
1886 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1887 5d844a1e 2019-08-13 stsp return err;
1888 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1889 5d844a1e 2019-08-13 stsp err = NULL;
1890 5d844a1e 2019-08-13 stsp tag = NULL;
1893 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1894 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1896 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
1897 a436ad14 2019-08-13 stsp if (cmp != 0)
1899 199a4027 2019-02-02 stsp s = refs_str;
1900 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1901 199a4027 2019-02-02 stsp name) == -1) {
1902 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1904 34ca4898 2019-08-13 stsp return err;
1908 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
1910 8bf5b3c9 2018-03-17 stsp return err;
1912 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
1913 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1914 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
1915 832c249c 2018-06-10 stsp free(id_str);
1916 d3d493d7 2019-02-21 stsp id_str = NULL;
1917 d3d493d7 2019-02-21 stsp free(refs_str);
1918 d3d493d7 2019-02-21 stsp refs_str = NULL;
1919 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
1920 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1921 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
1922 09867e48 2019-08-13 stsp if (datestr)
1923 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
1924 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1925 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1926 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
1927 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
1928 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
1929 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1930 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
1931 3fe1abad 2018-06-10 stsp int n = 1;
1932 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
1933 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1934 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
1936 a0603db2 2018-06-10 stsp return err;
1937 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
1938 a0603db2 2018-06-10 stsp free(id_str);
1942 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1944 5943eee2 2019-08-13 stsp return err;
1946 621015ac 2018-07-23 stsp logmsg = logmsg0;
1948 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
1950 832c249c 2018-06-10 stsp printf(" %s\n", line);
1951 832c249c 2018-06-10 stsp } while (line);
1952 621015ac 2018-07-23 stsp free(logmsg0);
1954 971751ac 2018-03-27 stsp if (show_patch) {
1955 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
1956 971751ac 2018-03-27 stsp if (err == 0)
1957 971751ac 2018-03-27 stsp printf("\n");
1960 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
1961 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
1962 07862c20 2018-09-15 stsp return err;
1965 f42b1b34 2018-03-12 stsp static const struct got_error *
1966 15a94983 2018-12-23 stsp print_commits(struct got_object_id *root_id, struct got_repository *repo,
1967 463a997a 2019-12-08 kn const char *path, int show_patch, const char *search_pattern,
1968 48c8c60d 2020-01-27 stsp int diff_context, int limit, int log_branches,
1969 463a997a 2019-12-08 kn struct got_reflist_head *refs)
1971 f42b1b34 2018-03-12 stsp const struct got_error *err;
1972 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
1973 6841bf13 2019-11-29 kn regex_t regex;
1974 6841bf13 2019-11-29 kn int have_match;
1976 6841bf13 2019-11-29 kn if (search_pattern &&
1977 6841bf13 2019-11-29 kn regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1978 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
1980 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
1982 f42b1b34 2018-03-12 stsp return err;
1983 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
1984 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
1986 fcc85cad 2018-07-22 stsp goto done;
1988 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
1989 372ccdbb 2018-06-10 stsp struct got_object_id *id;
1991 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
1994 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
1995 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
1996 372ccdbb 2018-06-10 stsp if (err) {
1997 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
1998 9ba79e04 2018-06-11 stsp err = NULL;
2001 b43fbaa0 2018-06-11 stsp if (id == NULL)
2004 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
2008 6841bf13 2019-11-29 kn if (search_pattern) {
2009 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
2011 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2014 6841bf13 2019-11-29 kn if (have_match == 0) {
2015 6841bf13 2019-11-29 kn got_object_commit_close(commit);
2020 44392932 2019-08-25 stsp err = print_commit(commit, id, repo, path, show_patch,
2021 44392932 2019-08-25 stsp diff_context, refs);
2022 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
2023 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
2027 6841bf13 2019-11-29 kn if (search_pattern)
2028 6841bf13 2019-11-29 kn regfree(®ex);
2029 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
2030 f42b1b34 2018-03-12 stsp return err;
2033 4ed7e80c 2018-05-20 stsp __dead static void
2034 6f3d1eb0 2018-03-12 stsp usage_log(void)
2036 48c8c60d 2020-01-27 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
2037 6841bf13 2019-11-29 kn "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
2041 b1ebc001 2019-08-13 stsp static int
2042 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
2044 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
2045 b1ebc001 2019-08-13 stsp long long n;
2046 b1ebc001 2019-08-13 stsp const char *errstr;
2048 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
2049 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
2051 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
2052 b1ebc001 2019-08-13 stsp if (errstr != NULL)
2057 4ed7e80c 2018-05-20 stsp static const struct got_error *
2058 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
2060 f42b1b34 2018-03-12 stsp const struct got_error *error;
2061 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
2062 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
2063 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
2064 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
2065 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
2066 463a997a 2019-12-08 kn const char *start_commit = NULL, *search_pattern = NULL;
2067 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
2068 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
2069 64a96a6d 2018-04-01 stsp const char *errstr;
2070 199a4027 2019-02-02 stsp struct got_reflist_head refs;
2072 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
2074 6715a751 2018-03-16 stsp #ifndef PROFILE
2075 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2078 f42b1b34 2018-03-12 stsp err(1, "pledge");
2081 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
2083 48c8c60d 2020-01-27 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
2084 79109fed 2018-03-27 stsp switch (ch) {
2086 79109fed 2018-03-27 stsp show_patch = 1;
2089 d142fc45 2018-04-01 stsp start_commit = optarg;
2092 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2094 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2095 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2098 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
2099 64a96a6d 2018-04-01 stsp if (errstr != NULL)
2100 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
2103 48c8c60d 2020-01-27 stsp log_branches = 1;
2106 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2107 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
2108 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2110 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2113 6841bf13 2019-11-29 kn search_pattern = optarg;
2116 2deda0b9 2019-03-07 stsp usage_log();
2117 79109fed 2018-03-27 stsp /* NOTREACHED */
2121 79109fed 2018-03-27 stsp argc -= optind;
2122 79109fed 2018-03-27 stsp argv += optind;
2124 dc1edbfa 2019-11-29 kn if (diff_context == -1)
2125 dc1edbfa 2019-11-29 kn diff_context = 3;
2126 dc1edbfa 2019-11-29 kn else if (!show_patch)
2127 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
2129 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
2130 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
2131 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2132 04ca23f4 2018-07-16 stsp goto done;
2135 cffc0aa4 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2136 cffc0aa4 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2137 cffc0aa4 2019-02-05 stsp goto done;
2138 cffc0aa4 2019-02-05 stsp error = NULL;
2140 e7301579 2019-03-18 stsp if (argc == 0) {
2141 cbd1af7a 2019-03-18 stsp path = strdup("");
2142 e7301579 2019-03-18 stsp if (path == NULL) {
2143 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2144 cbd1af7a 2019-03-18 stsp goto done;
2146 e7301579 2019-03-18 stsp } else if (argc == 1) {
2147 e7301579 2019-03-18 stsp if (worktree) {
2148 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2150 e7301579 2019-03-18 stsp if (error)
2151 e7301579 2019-03-18 stsp goto done;
2153 e7301579 2019-03-18 stsp path = strdup(argv[0]);
2154 e7301579 2019-03-18 stsp if (path == NULL) {
2155 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2156 e7301579 2019-03-18 stsp goto done;
2160 cbd1af7a 2019-03-18 stsp usage_log();
2162 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
2163 5486daa2 2019-05-11 stsp repo_path = worktree ?
2164 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
2166 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
2167 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2168 cffc0aa4 2019-02-05 stsp goto done;
2171 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2172 d7d4f210 2018-03-12 stsp if (error != NULL)
2173 04ca23f4 2018-07-16 stsp goto done;
2175 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2176 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2177 c02c541e 2019-03-29 stsp if (error)
2178 c02c541e 2019-03-29 stsp goto done;
2180 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
2181 3235492e 2018-04-01 stsp struct got_reference *head_ref;
2182 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
2183 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
2184 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
2185 3235492e 2018-04-01 stsp if (error != NULL)
2186 3235492e 2018-04-01 stsp return error;
2187 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
2188 3235492e 2018-04-01 stsp got_ref_close(head_ref);
2189 3235492e 2018-04-01 stsp if (error != NULL)
2190 3235492e 2018-04-01 stsp return error;
2191 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2193 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
2194 2f17228e 2019-05-12 stsp error = got_ref_open(&ref, repo, start_commit, 0);
2195 3235492e 2018-04-01 stsp if (error == NULL) {
2196 1caad61b 2019-02-01 stsp int obj_type;
2197 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
2198 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
2199 d1f2edc9 2018-06-13 stsp if (error != NULL)
2200 1caad61b 2019-02-01 stsp goto done;
2201 1caad61b 2019-02-01 stsp error = got_object_get_type(&obj_type, repo, id);
2202 1caad61b 2019-02-01 stsp if (error != NULL)
2203 1caad61b 2019-02-01 stsp goto done;
2204 1caad61b 2019-02-01 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
2205 1caad61b 2019-02-01 stsp struct got_tag_object *tag;
2206 1caad61b 2019-02-01 stsp error = got_object_open_as_tag(&tag, repo, id);
2207 1caad61b 2019-02-01 stsp if (error != NULL)
2208 1caad61b 2019-02-01 stsp goto done;
2209 1caad61b 2019-02-01 stsp if (got_object_tag_get_object_type(tag) !=
2210 1caad61b 2019-02-01 stsp GOT_OBJ_TYPE_COMMIT) {
2211 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2212 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2213 1caad61b 2019-02-01 stsp goto done;
2216 1caad61b 2019-02-01 stsp id = got_object_id_dup(
2217 1caad61b 2019-02-01 stsp got_object_tag_get_object_id(tag));
2218 1caad61b 2019-02-01 stsp if (id == NULL)
2219 638f9024 2019-05-13 stsp error = got_error_from_errno(
2220 230a42bd 2019-05-11 jcs "got_object_id_dup");
2221 1caad61b 2019-02-01 stsp got_object_tag_close(tag);
2222 1caad61b 2019-02-01 stsp if (error)
2223 1caad61b 2019-02-01 stsp goto done;
2224 1caad61b 2019-02-01 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2225 1caad61b 2019-02-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2226 1caad61b 2019-02-01 stsp goto done;
2228 15a94983 2018-12-23 stsp error = got_object_open_as_commit(&commit, repo, id);
2229 d1f2edc9 2018-06-13 stsp if (error != NULL)
2230 1caad61b 2019-02-01 stsp goto done;
2232 15a94983 2018-12-23 stsp if (commit == NULL) {
2233 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&id,
2234 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2235 d1f2edc9 2018-06-13 stsp if (error != NULL)
2236 d1f2edc9 2018-06-13 stsp return error;
2239 d7d4f210 2018-03-12 stsp if (error != NULL)
2240 04ca23f4 2018-07-16 stsp goto done;
2242 deeabeae 2019-08-27 stsp if (worktree) {
2243 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2245 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
2246 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2247 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
2248 deeabeae 2019-08-27 stsp goto done;
2250 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2253 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2254 04ca23f4 2018-07-16 stsp if (error != NULL)
2255 04ca23f4 2018-07-16 stsp goto done;
2256 04ca23f4 2018-07-16 stsp if (in_repo_path) {
2257 04ca23f4 2018-07-16 stsp free(path);
2258 04ca23f4 2018-07-16 stsp path = in_repo_path;
2261 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2262 199a4027 2019-02-02 stsp if (error)
2263 199a4027 2019-02-02 stsp goto done;
2265 6841bf13 2019-11-29 kn error = print_commits(id, repo, path, show_patch, search_pattern,
2266 48c8c60d 2020-01-27 stsp diff_context, limit, log_branches, &refs);
2268 04ca23f4 2018-07-16 stsp free(path);
2269 04ca23f4 2018-07-16 stsp free(repo_path);
2270 04ca23f4 2018-07-16 stsp free(cwd);
2272 cffc0aa4 2019-02-05 stsp if (worktree)
2273 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
2274 ad242220 2018-09-08 stsp if (repo) {
2275 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2276 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2277 ad242220 2018-09-08 stsp if (error == NULL)
2278 ad242220 2018-09-08 stsp error = repo_error;
2280 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2281 8bf5b3c9 2018-03-17 stsp return error;
2284 4ed7e80c 2018-05-20 stsp __dead static void
2285 3f8b7d6a 2018-04-01 stsp usage_diff(void)
2287 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2288 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
2292 b72f483a 2019-02-05 stsp struct print_diff_arg {
2293 b72f483a 2019-02-05 stsp struct got_repository *repo;
2294 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
2295 b72f483a 2019-02-05 stsp int diff_context;
2296 3fc0c068 2019-02-10 stsp const char *id_str;
2297 3fc0c068 2019-02-10 stsp int header_shown;
2298 98eaaa12 2019-08-03 stsp int diff_staged;
2299 63035f9f 2019-10-06 stsp int ignore_whitespace;
2302 4ed7e80c 2018-05-20 stsp static const struct got_error *
2303 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
2304 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
2305 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2306 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2308 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
2309 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2310 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
2311 12463d8b 2019-12-13 stsp int fd = -1;
2312 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
2313 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
2314 b72f483a 2019-02-05 stsp struct stat sb;
2316 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2317 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
2318 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
2319 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
2320 98eaaa12 2019-08-03 stsp return NULL;
2322 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2323 98eaaa12 2019-08-03 stsp return NULL;
2324 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
2325 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
2326 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
2327 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
2328 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
2329 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
2330 98eaaa12 2019-08-03 stsp return NULL;
2333 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
2334 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
2335 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
2336 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
2337 3fc0c068 2019-02-10 stsp a->header_shown = 1;
2340 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
2341 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
2342 98eaaa12 2019-08-03 stsp switch (staged_status) {
2343 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
2344 98eaaa12 2019-08-03 stsp label1 = path;
2345 98eaaa12 2019-08-03 stsp label2 = path;
2347 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
2348 98eaaa12 2019-08-03 stsp label2 = path;
2350 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
2351 98eaaa12 2019-08-03 stsp label1 = path;
2354 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
2356 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2357 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
2358 63035f9f 2019-10-06 stsp a->repo, stdout);
2361 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2362 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
2363 4ce46740 2019-08-08 stsp char *id_str;
2364 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2367 4ce46740 2019-08-08 stsp goto done;
2368 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
2370 4ce46740 2019-08-08 stsp goto done;
2371 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2372 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
2373 4ce46740 2019-08-08 stsp free(id_str);
2374 4ce46740 2019-08-08 stsp goto done;
2376 4ce46740 2019-08-08 stsp free(id_str);
2377 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
2378 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2380 4ce46740 2019-08-08 stsp goto done;
2383 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
2384 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
2385 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
2386 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2387 2ec1f75b 2019-03-26 stsp goto done;
2390 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2391 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2392 12463d8b 2019-12-13 stsp if (fd == -1) {
2393 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
2394 12463d8b 2019-12-13 stsp goto done;
2397 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2398 12463d8b 2019-12-13 stsp if (fd == -1) {
2399 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
2400 12463d8b 2019-12-13 stsp goto done;
2403 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
2404 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
2405 2ec1f75b 2019-03-26 stsp goto done;
2407 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
2408 12463d8b 2019-12-13 stsp if (f2 == NULL) {
2409 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
2410 2ec1f75b 2019-03-26 stsp goto done;
2414 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
2416 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2417 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
2419 b72f483a 2019-02-05 stsp if (blob1)
2420 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
2421 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
2422 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2423 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2424 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
2425 b72f483a 2019-02-05 stsp free(abspath);
2426 927df6b7 2019-02-10 stsp return err;
2429 927df6b7 2019-02-10 stsp static const struct got_error *
2430 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
2432 b00d56cd 2018-04-01 stsp const struct got_error *error;
2433 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
2434 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
2435 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
2436 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2437 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
2438 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
2439 15a94983 2018-12-23 stsp int type1, type2;
2440 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2441 c0cc5c62 2018-10-18 stsp const char *errstr;
2442 927df6b7 2019-02-10 stsp char *path = NULL;
2444 b00d56cd 2018-04-01 stsp #ifndef PROFILE
2445 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2446 25eccc22 2019-01-04 stsp NULL) == -1)
2447 b00d56cd 2018-04-01 stsp err(1, "pledge");
2450 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2451 b00d56cd 2018-04-01 stsp switch (ch) {
2453 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2455 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
2456 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
2459 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
2460 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2461 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2463 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2466 98eaaa12 2019-08-03 stsp diff_staged = 1;
2469 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
2472 2deda0b9 2019-03-07 stsp usage_diff();
2473 b00d56cd 2018-04-01 stsp /* NOTREACHED */
2477 b00d56cd 2018-04-01 stsp argc -= optind;
2478 b00d56cd 2018-04-01 stsp argv += optind;
2480 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
2481 b72f483a 2019-02-05 stsp if (cwd == NULL) {
2482 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2483 b72f483a 2019-02-05 stsp goto done;
2485 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
2486 927df6b7 2019-02-10 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2487 927df6b7 2019-02-10 stsp goto done;
2488 927df6b7 2019-02-10 stsp if (argc <= 1) {
2489 927df6b7 2019-02-10 stsp if (worktree == NULL) {
2490 927df6b7 2019-02-10 stsp error = got_error(GOT_ERR_NOT_WORKTREE);
2491 927df6b7 2019-02-10 stsp goto done;
2493 b72f483a 2019-02-05 stsp if (repo_path)
2495 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
2496 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
2497 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
2498 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2499 927df6b7 2019-02-10 stsp goto done;
2501 927df6b7 2019-02-10 stsp if (argc == 1) {
2502 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2504 927df6b7 2019-02-10 stsp if (error)
2505 927df6b7 2019-02-10 stsp goto done;
2507 927df6b7 2019-02-10 stsp path = strdup("");
2508 927df6b7 2019-02-10 stsp if (path == NULL) {
2509 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2510 927df6b7 2019-02-10 stsp goto done;
2513 b72f483a 2019-02-05 stsp } else if (argc == 2) {
2514 98eaaa12 2019-08-03 stsp if (diff_staged)
2515 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
2516 98eaaa12 2019-08-03 stsp "objects in repository");
2517 15a94983 2018-12-23 stsp id_str1 = argv[0];
2518 15a94983 2018-12-23 stsp id_str2 = argv[1];
2519 30db809c 2019-06-05 stsp if (worktree && repo_path == NULL) {
2520 30db809c 2019-06-05 stsp repo_path =
2521 30db809c 2019-06-05 stsp strdup(got_worktree_get_repo_path(worktree));
2522 30db809c 2019-06-05 stsp if (repo_path == NULL) {
2523 30db809c 2019-06-05 stsp error = got_error_from_errno("strdup");
2524 30db809c 2019-06-05 stsp goto done;
2528 b00d56cd 2018-04-01 stsp usage_diff();
2530 b72f483a 2019-02-05 stsp if (repo_path == NULL) {
2531 b72f483a 2019-02-05 stsp repo_path = getcwd(NULL, 0);
2532 b72f483a 2019-02-05 stsp if (repo_path == NULL)
2533 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2536 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2537 76089277 2018-04-01 stsp free(repo_path);
2538 b00d56cd 2018-04-01 stsp if (error != NULL)
2539 b00d56cd 2018-04-01 stsp goto done;
2541 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
2542 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2543 c02c541e 2019-03-29 stsp if (error)
2544 c02c541e 2019-03-29 stsp goto done;
2546 30db809c 2019-06-05 stsp if (argc <= 1) {
2547 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
2548 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
2549 b72f483a 2019-02-05 stsp char *id_str;
2551 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
2553 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
2554 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
2555 b72f483a 2019-02-05 stsp if (error)
2556 b72f483a 2019-02-05 stsp goto done;
2557 b72f483a 2019-02-05 stsp arg.repo = repo;
2558 b72f483a 2019-02-05 stsp arg.worktree = worktree;
2559 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
2560 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
2561 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
2562 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
2563 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2565 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
2566 72ea6654 2019-07-27 stsp if (error)
2567 72ea6654 2019-07-27 stsp goto done;
2569 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
2570 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
2571 b72f483a 2019-02-05 stsp free(id_str);
2572 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
2573 b72f483a 2019-02-05 stsp goto done;
2576 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
2577 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2578 0adb7196 2019-08-11 stsp if (error)
2579 0adb7196 2019-08-11 stsp goto done;
2581 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
2582 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
2583 0adb7196 2019-08-11 stsp if (error)
2584 0adb7196 2019-08-11 stsp goto done;
2586 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
2587 15a94983 2018-12-23 stsp if (error)
2588 15a94983 2018-12-23 stsp goto done;
2590 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
2591 15a94983 2018-12-23 stsp if (error)
2592 15a94983 2018-12-23 stsp goto done;
2594 15a94983 2018-12-23 stsp if (type1 != type2) {
2595 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2596 b00d56cd 2018-04-01 stsp goto done;
2599 15a94983 2018-12-23 stsp switch (type1) {
2600 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
2601 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2602 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2604 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
2605 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
2606 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
2608 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
2609 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
2610 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
2611 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
2614 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2617 5e70831e 2019-05-28 stsp free(label1);
2618 5e70831e 2019-05-28 stsp free(label2);
2619 15a94983 2018-12-23 stsp free(id1);
2620 15a94983 2018-12-23 stsp free(id2);
2621 927df6b7 2019-02-10 stsp free(path);
2622 b72f483a 2019-02-05 stsp if (worktree)
2623 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
2624 ad242220 2018-09-08 stsp if (repo) {
2625 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2626 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2627 ad242220 2018-09-08 stsp if (error == NULL)
2628 ad242220 2018-09-08 stsp error = repo_error;
2630 b00d56cd 2018-04-01 stsp return error;
2633 404c43c4 2018-06-21 stsp __dead static void
2634 404c43c4 2018-06-21 stsp usage_blame(void)
2636 9270e621 2019-02-05 stsp fprintf(stderr,
2637 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
2638 404c43c4 2018-06-21 stsp getprogname());
2642 28315671 2019-08-14 stsp struct blame_line {
2643 28315671 2019-08-14 stsp int annotated;
2644 28315671 2019-08-14 stsp char *id_str;
2645 82f6abb8 2019-08-14 stsp char *committer;
2646 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
2649 28315671 2019-08-14 stsp struct blame_cb_args {
2650 28315671 2019-08-14 stsp struct blame_line *lines;
2651 28315671 2019-08-14 stsp int nlines;
2652 7ef28ff8 2019-08-14 stsp int nlines_prec;
2653 28315671 2019-08-14 stsp int lineno_cur;
2654 28315671 2019-08-14 stsp off_t *line_offsets;
2656 82f6abb8 2019-08-14 stsp struct got_repository *repo;
2659 404c43c4 2018-06-21 stsp static const struct got_error *
2660 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2662 28315671 2019-08-14 stsp const struct got_error *err = NULL;
2663 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
2664 28315671 2019-08-14 stsp struct blame_line *bline;
2665 82f6abb8 2019-08-14 stsp char *line = NULL;
2666 28315671 2019-08-14 stsp size_t linesize = 0;
2667 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
2668 28315671 2019-08-14 stsp off_t offset;
2669 bcb49d15 2019-08-14 stsp struct tm tm;
2670 bcb49d15 2019-08-14 stsp time_t committer_time;
2672 28315671 2019-08-14 stsp if (nlines != a->nlines ||
2673 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2674 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
2676 28315671 2019-08-14 stsp if (sigint_received)
2677 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
2679 2839f8b9 2019-08-18 stsp if (lineno == -1)
2680 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
2682 28315671 2019-08-14 stsp /* Annotate this line. */
2683 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
2684 28315671 2019-08-14 stsp if (bline->annotated)
2685 28315671 2019-08-14 stsp return NULL;
2686 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
2688 28315671 2019-08-14 stsp return err;
2690 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
2692 82f6abb8 2019-08-14 stsp goto done;
2694 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
2695 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
2696 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
2697 bcb49d15 2019-08-14 stsp goto done;
2700 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
2701 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
2702 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
2703 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2704 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
2705 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
2706 82f6abb8 2019-08-14 stsp goto done;
2708 28315671 2019-08-14 stsp bline->annotated = 1;
2710 28315671 2019-08-14 stsp /* Print lines annotated so far. */
2711 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2712 28315671 2019-08-14 stsp if (!bline->annotated)
2713 82f6abb8 2019-08-14 stsp goto done;
2715 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
2716 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
2717 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
2718 82f6abb8 2019-08-14 stsp goto done;
2721 28315671 2019-08-14 stsp while (bline->annotated) {
2722 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
2723 82f6abb8 2019-08-14 stsp size_t len;
2725 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
2726 28315671 2019-08-14 stsp if (ferror(a->f))
2727 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
2731 82f6abb8 2019-08-14 stsp committer = bline->committer;
2732 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
2733 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
2734 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
2735 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
2737 82f6abb8 2019-08-14 stsp *at = '\0';
2738 82f6abb8 2019-08-14 stsp len = strlen(committer);
2739 82f6abb8 2019-08-14 stsp if (len >= 9)
2740 82f6abb8 2019-08-14 stsp committer[8] = '\0';
2742 28315671 2019-08-14 stsp nl = strchr(line, '\n');
2744 28315671 2019-08-14 stsp *nl = '\0';
2745 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2746 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
2748 28315671 2019-08-14 stsp a->lineno_cur++;
2749 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
2752 82f6abb8 2019-08-14 stsp if (commit)
2753 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
2754 28315671 2019-08-14 stsp free(line);
2755 28315671 2019-08-14 stsp return err;
2758 28315671 2019-08-14 stsp static const struct got_error *
2759 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
2761 404c43c4 2018-06-21 stsp const struct got_error *error;
2762 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
2763 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
2764 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2765 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
2766 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
2767 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
2768 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
2769 28315671 2019-08-14 stsp struct blame_cb_args bca;
2770 28315671 2019-08-14 stsp int ch, obj_type, i;
2771 b02560ec 2019-08-19 stsp size_t filesize;
2773 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
2775 404c43c4 2018-06-21 stsp #ifndef PROFILE
2776 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2777 36e2fb66 2019-01-04 stsp NULL) == -1)
2778 404c43c4 2018-06-21 stsp err(1, "pledge");
2781 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2782 404c43c4 2018-06-21 stsp switch (ch) {
2784 404c43c4 2018-06-21 stsp commit_id_str = optarg;
2787 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2788 66bea077 2018-08-02 stsp if (repo_path == NULL)
2789 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2791 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2794 2deda0b9 2019-03-07 stsp usage_blame();
2795 404c43c4 2018-06-21 stsp /* NOTREACHED */
2799 404c43c4 2018-06-21 stsp argc -= optind;
2800 404c43c4 2018-06-21 stsp argv += optind;
2802 a39318fd 2018-08-02 stsp if (argc == 1)
2803 404c43c4 2018-06-21 stsp path = argv[0];
2805 404c43c4 2018-06-21 stsp usage_blame();
2807 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
2808 66bea077 2018-08-02 stsp if (cwd == NULL) {
2809 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2810 66bea077 2018-08-02 stsp goto done;
2812 66bea077 2018-08-02 stsp if (repo_path == NULL) {
2813 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2814 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2815 66bea077 2018-08-02 stsp goto done;
2817 0c06baac 2019-02-05 stsp error = NULL;
2818 0c06baac 2019-02-05 stsp if (worktree) {
2819 0c06baac 2019-02-05 stsp repo_path =
2820 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2821 0c06baac 2019-02-05 stsp if (repo_path == NULL)
2822 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2823 0c06baac 2019-02-05 stsp if (error)
2824 0c06baac 2019-02-05 stsp goto done;
2826 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
2827 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
2828 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2829 0c06baac 2019-02-05 stsp goto done;
2834 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2835 c02c541e 2019-03-29 stsp if (error != NULL)
2836 36e2fb66 2019-01-04 stsp goto done;
2838 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2839 c02c541e 2019-03-29 stsp if (error)
2840 404c43c4 2018-06-21 stsp goto done;
2842 0c06baac 2019-02-05 stsp if (worktree) {
2843 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2844 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
2845 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
2846 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
2847 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2848 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
2849 6efaaa2d 2019-02-05 stsp path) == -1) {
2850 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2851 0c06baac 2019-02-05 stsp goto done;
2853 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
2856 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2858 0c06baac 2019-02-05 stsp if (error)
2859 66bea077 2018-08-02 stsp goto done;
2861 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
2862 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
2863 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
2864 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
2865 404c43c4 2018-06-21 stsp if (error != NULL)
2866 66bea077 2018-08-02 stsp goto done;
2867 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2868 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
2869 404c43c4 2018-06-21 stsp if (error != NULL)
2870 66bea077 2018-08-02 stsp goto done;
2872 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2873 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2874 30837e32 2019-07-25 stsp if (error)
2875 66bea077 2018-08-02 stsp goto done;
2878 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2879 28315671 2019-08-14 stsp if (error)
2880 28315671 2019-08-14 stsp goto done;
2882 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
2883 28315671 2019-08-14 stsp if (error)
2884 28315671 2019-08-14 stsp goto done;
2886 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2887 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
2888 28315671 2019-08-14 stsp goto done;
2891 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2892 28315671 2019-08-14 stsp if (error)
2893 28315671 2019-08-14 stsp goto done;
2894 28315671 2019-08-14 stsp bca.f = got_opentemp();
2895 28315671 2019-08-14 stsp if (bca.f == NULL) {
2896 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
2897 28315671 2019-08-14 stsp goto done;
2899 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2900 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
2901 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
2902 28315671 2019-08-14 stsp goto done;
2904 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
2905 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
2906 b02560ec 2019-08-19 stsp bca.nlines--;
2908 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2909 28315671 2019-08-14 stsp if (bca.lines == NULL) {
2910 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
2911 28315671 2019-08-14 stsp goto done;
2913 28315671 2019-08-14 stsp bca.lineno_cur = 1;
2914 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
2915 7ef28ff8 2019-08-14 stsp i = bca.nlines;
2916 7ef28ff8 2019-08-14 stsp while (i > 0) {
2918 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
2920 82f6abb8 2019-08-14 stsp bca.repo = repo;
2922 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2923 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
2925 66bea077 2018-08-02 stsp free(in_repo_path);
2926 66bea077 2018-08-02 stsp free(repo_path);
2927 66bea077 2018-08-02 stsp free(cwd);
2928 404c43c4 2018-06-21 stsp free(commit_id);
2929 28315671 2019-08-14 stsp free(obj_id);
2931 28315671 2019-08-14 stsp got_object_blob_close(blob);
2932 0c06baac 2019-02-05 stsp if (worktree)
2933 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
2934 ad242220 2018-09-08 stsp if (repo) {
2935 ad242220 2018-09-08 stsp const struct got_error *repo_error;
2936 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
2937 ad242220 2018-09-08 stsp if (error == NULL)
2938 ad242220 2018-09-08 stsp error = repo_error;
2940 3affba96 2019-09-22 stsp if (bca.lines) {
2941 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
2942 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
2943 3affba96 2019-09-22 stsp free(bline->id_str);
2944 3affba96 2019-09-22 stsp free(bline->committer);
2946 3affba96 2019-09-22 stsp free(bca.lines);
2948 28315671 2019-08-14 stsp free(bca.line_offsets);
2949 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
2950 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
2951 404c43c4 2018-06-21 stsp return error;
2954 5de5890b 2018-10-18 stsp __dead static void
2955 5de5890b 2018-10-18 stsp usage_tree(void)
2957 c1669e2e 2019-01-09 stsp fprintf(stderr,
2958 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2959 5de5890b 2018-10-18 stsp getprogname());
2963 c1669e2e 2019-01-09 stsp static void
2964 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
2965 c1669e2e 2019-01-09 stsp const char *root_path)
2967 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
2968 848d6979 2019-08-12 stsp const char *modestr = "";
2969 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
2971 c1669e2e 2019-01-09 stsp path += strlen(root_path);
2972 c1669e2e 2019-01-09 stsp while (path[0] == '/')
2975 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2976 63c5ca5d 2019-08-24 stsp modestr = "$";
2977 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
2978 848d6979 2019-08-12 stsp modestr = "@";
2979 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
2980 848d6979 2019-08-12 stsp modestr = "/";
2981 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
2982 848d6979 2019-08-12 stsp modestr = "*";
2984 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
2985 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2988 5de5890b 2018-10-18 stsp static const struct got_error *
2989 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
2990 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
2991 c1669e2e 2019-01-09 stsp struct got_repository *repo)
2993 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
2994 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
2995 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
2996 56e0773d 2019-11-28 stsp int nentries, i;
2998 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
3000 5de5890b 2018-10-18 stsp goto done;
3002 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
3004 5de5890b 2018-10-18 stsp goto done;
3005 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
3006 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
3007 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
3008 5de5890b 2018-10-18 stsp char *id = NULL;
3010 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3013 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
3014 5de5890b 2018-10-18 stsp if (show_ids) {
3015 5de5890b 2018-10-18 stsp char *id_str;
3016 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
3017 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
3019 5de5890b 2018-10-18 stsp goto done;
3020 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
3021 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3022 5de5890b 2018-10-18 stsp free(id_str);
3023 5de5890b 2018-10-18 stsp goto done;
3025 5de5890b 2018-10-18 stsp free(id_str);
3027 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
3030 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
3031 c1669e2e 2019-01-09 stsp char *child_path;
3032 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
3033 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
3034 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
3035 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3036 c1669e2e 2019-01-09 stsp goto done;
3038 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
3039 c1669e2e 2019-01-09 stsp root_path, repo);
3040 c1669e2e 2019-01-09 stsp free(child_path);
3042 c1669e2e 2019-01-09 stsp goto done;
3047 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
3048 5de5890b 2018-10-18 stsp free(tree_id);
3049 5de5890b 2018-10-18 stsp return err;
3052 5de5890b 2018-10-18 stsp static const struct got_error *
3053 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
3055 5de5890b 2018-10-18 stsp const struct got_error *error;
3056 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
3057 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
3058 7a2c19d6 2019-02-05 stsp const char *path;
3059 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3060 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
3061 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
3062 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
3065 5de5890b 2018-10-18 stsp #ifndef PROFILE
3066 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3067 0f8d269b 2019-01-04 stsp NULL) == -1)
3068 5de5890b 2018-10-18 stsp err(1, "pledge");
3071 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
3072 5de5890b 2018-10-18 stsp switch (ch) {
3074 5de5890b 2018-10-18 stsp commit_id_str = optarg;
3077 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
3078 5de5890b 2018-10-18 stsp if (repo_path == NULL)
3079 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3081 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3084 5de5890b 2018-10-18 stsp show_ids = 1;
3087 c1669e2e 2019-01-09 stsp recurse = 1;
3090 2deda0b9 2019-03-07 stsp usage_tree();
3091 5de5890b 2018-10-18 stsp /* NOTREACHED */
3095 5de5890b 2018-10-18 stsp argc -= optind;
3096 5de5890b 2018-10-18 stsp argv += optind;
3098 5de5890b 2018-10-18 stsp if (argc == 1)
3099 5de5890b 2018-10-18 stsp path = argv[0];
3100 5de5890b 2018-10-18 stsp else if (argc > 1)
3101 5de5890b 2018-10-18 stsp usage_tree();
3103 7a2c19d6 2019-02-05 stsp path = NULL;
3105 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
3106 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
3107 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3108 9bf7a39b 2019-02-05 stsp goto done;
3110 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
3111 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3112 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3113 7a2c19d6 2019-02-05 stsp goto done;
3115 7a2c19d6 2019-02-05 stsp error = NULL;
3116 7a2c19d6 2019-02-05 stsp if (worktree) {
3117 7a2c19d6 2019-02-05 stsp repo_path =
3118 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3119 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
3120 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3121 7a2c19d6 2019-02-05 stsp if (error)
3122 7a2c19d6 2019-02-05 stsp goto done;
3124 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
3125 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
3126 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3127 7a2c19d6 2019-02-05 stsp goto done;
3132 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3133 5de5890b 2018-10-18 stsp if (error != NULL)
3134 c02c541e 2019-03-29 stsp goto done;
3136 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3137 c02c541e 2019-03-29 stsp if (error)
3138 5de5890b 2018-10-18 stsp goto done;
3140 9bf7a39b 2019-02-05 stsp if (path == NULL) {
3141 9bf7a39b 2019-02-05 stsp if (worktree) {
3142 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3143 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3144 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
3145 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
3146 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
3147 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3148 9bf7a39b 2019-02-05 stsp goto done;
3150 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3152 9bf7a39b 2019-02-05 stsp if (error)
3153 9bf7a39b 2019-02-05 stsp goto done;
3155 9bf7a39b 2019-02-05 stsp path = "/";
3157 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
3158 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3159 9bf7a39b 2019-02-05 stsp if (error != NULL)
3160 9bf7a39b 2019-02-05 stsp goto done;
3163 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
3164 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
3165 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3166 5de5890b 2018-10-18 stsp if (error != NULL)
3167 5de5890b 2018-10-18 stsp goto done;
3168 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3169 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
3170 5de5890b 2018-10-18 stsp if (error != NULL)
3171 5de5890b 2018-10-18 stsp goto done;
3173 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3174 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3175 30837e32 2019-07-25 stsp if (error)
3176 5de5890b 2018-10-18 stsp goto done;
3179 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
3180 c1669e2e 2019-01-09 stsp in_repo_path, repo);
3182 5de5890b 2018-10-18 stsp free(in_repo_path);
3183 5de5890b 2018-10-18 stsp free(repo_path);
3184 5de5890b 2018-10-18 stsp free(cwd);
3185 5de5890b 2018-10-18 stsp free(commit_id);
3186 7a2c19d6 2019-02-05 stsp if (worktree)
3187 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
3188 5de5890b 2018-10-18 stsp if (repo) {
3189 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
3190 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
3191 5de5890b 2018-10-18 stsp if (error == NULL)
3192 5de5890b 2018-10-18 stsp error = repo_error;
3194 5de5890b 2018-10-18 stsp return error;
3197 6bad629b 2019-02-04 stsp __dead static void
3198 6bad629b 2019-02-04 stsp usage_status(void)
3200 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3204 b72f483a 2019-02-05 stsp static const struct got_error *
3205 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
3206 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3207 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3208 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3210 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
3211 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
3212 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
3213 b72f483a 2019-02-05 stsp return NULL;
3216 6bad629b 2019-02-04 stsp static const struct got_error *
3217 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
3219 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
3220 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
3221 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
3222 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
3223 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3224 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
3227 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3229 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
3230 6bad629b 2019-02-04 stsp switch (ch) {
3232 2deda0b9 2019-03-07 stsp usage_status();
3233 6bad629b 2019-02-04 stsp /* NOTREACHED */
3237 6bad629b 2019-02-04 stsp argc -= optind;
3238 6bad629b 2019-02-04 stsp argv += optind;
3240 6bad629b 2019-02-04 stsp #ifndef PROFILE
3241 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3242 6bad629b 2019-02-04 stsp NULL) == -1)
3243 6bad629b 2019-02-04 stsp err(1, "pledge");
3245 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
3246 927df6b7 2019-02-10 stsp if (cwd == NULL) {
3247 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3248 927df6b7 2019-02-10 stsp goto done;
3251 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
3252 927df6b7 2019-02-10 stsp if (error != NULL)
3253 a5edda0a 2019-07-27 stsp goto done;
3255 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3257 6bad629b 2019-02-04 stsp if (error != NULL)
3258 6bad629b 2019-02-04 stsp goto done;
3260 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3261 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
3262 087fb88c 2019-08-04 stsp if (error)
3263 087fb88c 2019-08-04 stsp goto done;
3265 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3266 6bad629b 2019-02-04 stsp if (error)
3267 6bad629b 2019-02-04 stsp goto done;
3269 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3270 6bad629b 2019-02-04 stsp check_cancelled, NULL);
3272 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
3273 a5edda0a 2019-07-27 stsp free((char *)pe->path);
3274 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3275 927df6b7 2019-02-10 stsp free(cwd);
3276 d0eebce4 2019-03-11 stsp return error;
3279 d0eebce4 2019-03-11 stsp __dead static void
3280 d0eebce4 2019-03-11 stsp usage_ref(void)
3282 d0eebce4 2019-03-11 stsp fprintf(stderr,
3283 d1c1ae5f 2019-08-12 stsp "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3284 d0eebce4 2019-03-11 stsp getprogname());
3288 d0eebce4 2019-03-11 stsp static const struct got_error *
3289 d0eebce4 2019-03-11 stsp list_refs(struct got_repository *repo)
3291 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
3292 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
3293 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
3295 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
3296 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3298 d0eebce4 2019-03-11 stsp return err;
3300 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3301 d0eebce4 2019-03-11 stsp char *refstr;
3302 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
3303 d0eebce4 2019-03-11 stsp if (refstr == NULL)
3304 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
3305 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3306 d0eebce4 2019-03-11 stsp free(refstr);
3309 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3310 d0eebce4 2019-03-11 stsp return NULL;
3313 d0eebce4 2019-03-11 stsp static const struct got_error *
3314 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
3316 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3317 d0eebce4 2019-03-11 stsp struct got_reference *ref;
3319 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
3321 d0eebce4 2019-03-11 stsp return err;
3323 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
3324 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3325 d0eebce4 2019-03-11 stsp return err;
3328 d0eebce4 2019-03-11 stsp static const struct got_error *
3329 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
3331 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
3332 d0eebce4 2019-03-11 stsp struct got_object_id *id;
3333 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
3336 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3337 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
3338 d1644381 2019-07-14 stsp * an unintended typo.
3340 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3341 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3343 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3345 d83d9d5c 2019-05-13 stsp if (err) {
3346 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
3348 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3349 d83d9d5c 2019-05-13 stsp return err;
3350 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
3352 d83d9d5c 2019-05-13 stsp return err;
3353 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
3354 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
3356 d83d9d5c 2019-05-13 stsp return err;
3359 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
3361 d0eebce4 2019-03-11 stsp goto done;
3363 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
3366 d0eebce4 2019-03-11 stsp got_ref_close(ref);
3368 d1c1ae5f 2019-08-12 stsp return err;
3371 d1c1ae5f 2019-08-12 stsp static const struct got_error *
3372 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
3374 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
3375 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
3376 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
3379 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
3380 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
3381 d1c1ae5f 2019-08-12 stsp * an unintended typo.
3383 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
3384 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3386 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
3388 d1c1ae5f 2019-08-12 stsp return err;
3390 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
3392 d1c1ae5f 2019-08-12 stsp goto done;
3394 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
3396 d1c1ae5f 2019-08-12 stsp if (target_ref)
3397 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
3399 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
3400 d0eebce4 2019-03-11 stsp return err;
3403 d0eebce4 2019-03-11 stsp static const struct got_error *
3404 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
3406 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
3407 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
3408 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
3409 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
3410 d1c1ae5f 2019-08-12 stsp int ch, do_list = 0, create_symref = 0;
3411 d0eebce4 2019-03-11 stsp const char *delref = NULL;
3413 d0eebce4 2019-03-11 stsp /* TODO: Add -s option for adding symbolic references. */
3414 d1c1ae5f 2019-08-12 stsp while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3415 d0eebce4 2019-03-11 stsp switch (ch) {
3417 d0eebce4 2019-03-11 stsp delref = optarg;
3420 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
3421 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3422 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3424 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3427 d0eebce4 2019-03-11 stsp do_list = 1;
3430 d1c1ae5f 2019-08-12 stsp create_symref = 1;
3433 d0eebce4 2019-03-11 stsp usage_ref();
3434 d0eebce4 2019-03-11 stsp /* NOTREACHED */
3438 d0eebce4 2019-03-11 stsp if (do_list && delref)
3439 d0eebce4 2019-03-11 stsp errx(1, "-l and -d options are mutually exclusive\n");
3441 d0eebce4 2019-03-11 stsp argc -= optind;
3442 d0eebce4 2019-03-11 stsp argv += optind;
3444 d0eebce4 2019-03-11 stsp if (do_list || delref) {
3445 d1c1ae5f 2019-08-12 stsp if (create_symref)
3446 d1c1ae5f 2019-08-12 stsp errx(1, "-s option cannot be used together with the "
3447 d1c1ae5f 2019-08-12 stsp "-l or -d options");
3448 d0eebce4 2019-03-11 stsp if (argc > 0)
3449 d0eebce4 2019-03-11 stsp usage_ref();
3450 d0eebce4 2019-03-11 stsp } else if (argc != 2)
3451 d0eebce4 2019-03-11 stsp usage_ref();
3453 d0eebce4 2019-03-11 stsp #ifndef PROFILE
3454 e0b57350 2019-03-12 stsp if (do_list) {
3455 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3456 e0b57350 2019-03-12 stsp NULL) == -1)
3457 e0b57350 2019-03-12 stsp err(1, "pledge");
3459 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3460 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
3461 e0b57350 2019-03-12 stsp err(1, "pledge");
3464 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
3465 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
3466 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3467 d0eebce4 2019-03-11 stsp goto done;
3470 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3471 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
3472 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3473 d0eebce4 2019-03-11 stsp goto done;
3475 d0eebce4 2019-03-11 stsp error = NULL;
3476 d0eebce4 2019-03-11 stsp if (worktree) {
3477 d0eebce4 2019-03-11 stsp repo_path =
3478 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
3479 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
3480 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3481 d0eebce4 2019-03-11 stsp if (error)
3482 d0eebce4 2019-03-11 stsp goto done;
3484 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
3485 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
3486 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3487 d0eebce4 2019-03-11 stsp goto done;
3492 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3493 d0eebce4 2019-03-11 stsp if (error != NULL)
3494 d0eebce4 2019-03-11 stsp goto done;
3496 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3497 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3498 c02c541e 2019-03-29 stsp if (error)
3499 c02c541e 2019-03-29 stsp goto done;
3501 d0eebce4 2019-03-11 stsp if (do_list)
3502 d0eebce4 2019-03-11 stsp error = list_refs(repo);
3503 d0eebce4 2019-03-11 stsp else if (delref)
3504 d0eebce4 2019-03-11 stsp error = delete_ref(repo, delref);
3505 d1c1ae5f 2019-08-12 stsp else if (create_symref)
3506 d1c1ae5f 2019-08-12 stsp error = add_symref(repo, argv[0], argv[1]);
3508 d0eebce4 2019-03-11 stsp error = add_ref(repo, argv[0], argv[1]);
3511 4e759de4 2019-06-26 stsp got_repo_close(repo);
3512 4e759de4 2019-06-26 stsp if (worktree)
3513 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
3514 4e759de4 2019-06-26 stsp free(cwd);
3515 4e759de4 2019-06-26 stsp free(repo_path);
3516 4e759de4 2019-06-26 stsp return error;
3519 4e759de4 2019-06-26 stsp __dead static void
3520 4e759de4 2019-06-26 stsp usage_branch(void)
3522 4e759de4 2019-06-26 stsp fprintf(stderr,
3523 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
3524 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
3528 4e759de4 2019-06-26 stsp static const struct got_error *
3529 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
3530 4e99b47e 2019-10-04 stsp struct got_reference *ref)
3532 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
3533 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
3534 4e99b47e 2019-10-04 stsp char *refstr;
3536 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
3537 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
3538 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
3539 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
3541 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
3543 4e99b47e 2019-10-04 stsp return err;
3544 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
3545 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
3546 4e99b47e 2019-10-04 stsp marker = "* ";
3548 4e99b47e 2019-10-04 stsp marker = "~ ";
3552 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3553 4e99b47e 2019-10-04 stsp refname += 11;
3554 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3555 4e99b47e 2019-10-04 stsp refname += 18;
3557 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
3558 4e99b47e 2019-10-04 stsp if (refstr == NULL)
3559 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
3561 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
3562 4e99b47e 2019-10-04 stsp free(refstr);
3563 4e99b47e 2019-10-04 stsp return NULL;
3566 4e99b47e 2019-10-04 stsp static const struct got_error *
3567 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3569 ad89fa31 2019-10-04 stsp const char *refname;
3571 ad89fa31 2019-10-04 stsp if (worktree == NULL)
3572 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
3574 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
3576 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
3577 ad89fa31 2019-10-04 stsp refname += 11;
3578 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3579 ad89fa31 2019-10-04 stsp refname += 18;
3581 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
3583 ad89fa31 2019-10-04 stsp return NULL;
3586 ad89fa31 2019-10-04 stsp static const struct got_error *
3587 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
3589 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
3590 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
3591 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
3592 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
3593 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
3595 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
3597 4e99b47e 2019-10-04 stsp if (worktree) {
3598 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
3599 4e99b47e 2019-10-04 stsp worktree);
3601 4e99b47e 2019-10-04 stsp return err;
3603 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
3604 4e99b47e 2019-10-04 stsp worktree);
3606 4e99b47e 2019-10-04 stsp return err;
3608 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
3609 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
3610 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
3612 4e99b47e 2019-10-04 stsp return err;
3613 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
3614 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
3618 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
3619 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
3621 4e759de4 2019-06-26 stsp return err;
3623 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
3624 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
3626 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
3627 4e759de4 2019-06-26 stsp return NULL;
3630 4e759de4 2019-06-26 stsp static const struct got_error *
3631 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3632 45cd4e47 2019-08-25 stsp const char *branch_name)
3634 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3635 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
3636 4e759de4 2019-06-26 stsp char *refname;
3638 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3639 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
3641 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3643 4e759de4 2019-06-26 stsp goto done;
3645 45cd4e47 2019-08-25 stsp if (worktree &&
3646 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
3647 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
3648 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
3649 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
3650 45cd4e47 2019-08-25 stsp goto done;
3653 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
3656 45cd4e47 2019-08-25 stsp got_ref_close(ref);
3657 4e759de4 2019-06-26 stsp free(refname);
3658 4e759de4 2019-06-26 stsp return err;
3661 4e759de4 2019-06-26 stsp static const struct got_error *
3662 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
3663 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
3665 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
3666 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
3667 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
3670 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
3671 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
3672 d3f84d51 2019-07-11 stsp * an unintended typo.
3674 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
3675 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3677 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3678 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
3679 4e759de4 2019-06-26 stsp goto done;
3682 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
3683 4e759de4 2019-06-26 stsp if (err == NULL) {
3684 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
3685 4e759de4 2019-06-26 stsp goto done;
3686 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
3687 4e759de4 2019-06-26 stsp goto done;
3689 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
3691 4e759de4 2019-06-26 stsp goto done;
3693 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
3696 4e759de4 2019-06-26 stsp got_ref_close(ref);
3697 4e759de4 2019-06-26 stsp free(base_refname);
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 cmd_branch(int argc, char *argv[])
3705 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
3706 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
3707 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
3708 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
3709 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
3710 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
3711 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
3712 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
3713 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
3714 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
3715 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
3717 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
3719 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
3720 4e759de4 2019-06-26 stsp switch (ch) {
3722 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
3725 4e759de4 2019-06-26 stsp delref = optarg;
3728 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
3729 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3730 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3732 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
3735 4e759de4 2019-06-26 stsp do_list = 1;
3738 da76fce2 2020-02-24 stsp do_update = 0;
3741 4e759de4 2019-06-26 stsp usage_branch();
3742 4e759de4 2019-06-26 stsp /* NOTREACHED */
3746 4e759de4 2019-06-26 stsp if (do_list && delref)
3747 4e759de4 2019-06-26 stsp errx(1, "-l and -d options are mutually exclusive\n");
3749 4e759de4 2019-06-26 stsp argc -= optind;
3750 4e759de4 2019-06-26 stsp argv += optind;
3752 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
3753 ad89fa31 2019-10-04 stsp do_show = 1;
3755 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
3756 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
3758 4e759de4 2019-06-26 stsp if (do_list || delref) {
3759 4e759de4 2019-06-26 stsp if (argc > 0)
3760 4e759de4 2019-06-26 stsp usage_branch();
3761 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
3762 4e759de4 2019-06-26 stsp usage_branch();
3764 4e759de4 2019-06-26 stsp #ifndef PROFILE
3765 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
3766 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3767 4e759de4 2019-06-26 stsp NULL) == -1)
3768 4e759de4 2019-06-26 stsp err(1, "pledge");
3770 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3771 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
3772 4e759de4 2019-06-26 stsp err(1, "pledge");
3775 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
3776 4e759de4 2019-06-26 stsp if (cwd == NULL) {
3777 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
3778 4e759de4 2019-06-26 stsp goto done;
3781 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3782 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
3783 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3784 4e759de4 2019-06-26 stsp goto done;
3786 4e759de4 2019-06-26 stsp error = NULL;
3787 4e759de4 2019-06-26 stsp if (worktree) {
3788 4e759de4 2019-06-26 stsp repo_path =
3789 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
3790 4e759de4 2019-06-26 stsp if (repo_path == NULL)
3791 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3792 4e759de4 2019-06-26 stsp if (error)
3793 4e759de4 2019-06-26 stsp goto done;
3795 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
3796 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
3797 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
3798 4e759de4 2019-06-26 stsp goto done;
3803 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3804 4e759de4 2019-06-26 stsp if (error != NULL)
3805 4e759de4 2019-06-26 stsp goto done;
3807 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
3808 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3809 4e759de4 2019-06-26 stsp if (error)
3810 4e759de4 2019-06-26 stsp goto done;
3812 ad89fa31 2019-10-04 stsp if (do_show)
3813 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
3814 ad89fa31 2019-10-04 stsp else if (do_list)
3815 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
3816 4e759de4 2019-06-26 stsp else if (delref)
3817 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
3819 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
3820 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
3821 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
3822 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
3823 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
3824 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3825 a74f7e83 2019-11-10 stsp if (error)
3826 a74f7e83 2019-11-10 stsp goto done;
3827 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
3828 da76fce2 2020-02-24 stsp if (error)
3829 da76fce2 2020-02-24 stsp goto done;
3830 da76fce2 2020-02-24 stsp if (worktree && do_update) {
3831 da76fce2 2020-02-24 stsp int did_something = 0;
3832 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
3834 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
3835 da76fce2 2020-02-24 stsp if (error)
3836 da76fce2 2020-02-24 stsp goto done;
3837 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
3838 da76fce2 2020-02-24 stsp worktree);
3839 da76fce2 2020-02-24 stsp if (error)
3840 da76fce2 2020-02-24 stsp goto done;
3841 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
3843 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
3844 da76fce2 2020-02-24 stsp goto done;
3846 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
3847 da76fce2 2020-02-24 stsp free(branch_refname);
3848 da76fce2 2020-02-24 stsp if (error)
3849 da76fce2 2020-02-24 stsp goto done;
3850 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
3852 da76fce2 2020-02-24 stsp if (error)
3853 da76fce2 2020-02-24 stsp goto done;
3854 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
3855 da76fce2 2020-02-24 stsp commit_id);
3856 da76fce2 2020-02-24 stsp if (error)
3857 da76fce2 2020-02-24 stsp goto done;
3858 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
3859 da76fce2 2020-02-24 stsp repo, update_progress, &did_something,
3860 da76fce2 2020-02-24 stsp check_cancelled, NULL);
3861 da76fce2 2020-02-24 stsp if (error)
3862 da76fce2 2020-02-24 stsp goto done;
3863 da76fce2 2020-02-24 stsp if (did_something)
3864 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
3869 da76fce2 2020-02-24 stsp got_ref_close(ref);
3871 d0eebce4 2019-03-11 stsp got_repo_close(repo);
3872 d0eebce4 2019-03-11 stsp if (worktree)
3873 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
3874 d0eebce4 2019-03-11 stsp free(cwd);
3875 d0eebce4 2019-03-11 stsp free(repo_path);
3876 da76fce2 2020-02-24 stsp free(commit_id);
3877 da76fce2 2020-02-24 stsp free(commit_id_str);
3878 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
3879 da76fce2 2020-02-24 stsp free((char *)pe->path);
3880 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
3881 d00136be 2019-03-26 stsp return error;
3885 d00136be 2019-03-26 stsp __dead static void
3886 8e7bd50a 2019-08-22 stsp usage_tag(void)
3888 8e7bd50a 2019-08-22 stsp fprintf(stderr,
3889 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
3890 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
3895 b8bad2ba 2019-08-23 stsp static const struct got_error *
3896 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3898 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
3899 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
3900 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
3901 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
3902 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
3904 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
3905 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
3906 b8bad2ba 2019-08-23 stsp if (se == NULL) {
3907 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3909 b8bad2ba 2019-08-23 stsp return err;
3910 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3913 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
3916 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
3917 b8bad2ba 2019-08-23 stsp free(re_id);
3920 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
3921 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
3924 b8bad2ba 2019-08-23 stsp while (se) {
3925 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
3928 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
3929 b8bad2ba 2019-08-23 stsp free(se_id);
3932 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
3933 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
3935 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
3936 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
3938 b8bad2ba 2019-08-23 stsp return err;
3939 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3942 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
3947 b8bad2ba 2019-08-23 stsp return err;
3951 b8bad2ba 2019-08-23 stsp static const struct got_error *
3952 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
3954 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
3955 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
3956 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
3958 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
3960 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
3962 8e7bd50a 2019-08-22 stsp return err;
3964 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
3965 8e7bd50a 2019-08-22 stsp const char *refname;
3966 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3967 8e7bd50a 2019-08-22 stsp char datebuf[26];
3968 d4efa91b 2020-01-14 stsp const char *tagger;
3969 8e7bd50a 2019-08-22 stsp time_t tagger_time;
3970 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
3971 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
3972 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
3974 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
3975 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
3977 8e7bd50a 2019-08-22 stsp refname += 10;
3978 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
3979 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
3980 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
3983 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3984 8e7bd50a 2019-08-22 stsp free(refstr);
3986 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
3989 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
3990 d4efa91b 2020-01-14 stsp if (err) {
3991 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
3995 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
3996 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
3997 d4efa91b 2020-01-14 stsp if (err) {
4001 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
4002 d4efa91b 2020-01-14 stsp tagger_time =
4003 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
4004 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
4010 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
4011 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
4012 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
4013 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
4017 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
4018 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
4019 2417344c 2019-08-23 stsp if (datestr)
4020 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
4021 d4efa91b 2020-01-14 stsp if (commit)
4022 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
4024 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
4025 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
4026 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
4029 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
4030 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
4033 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
4034 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
4037 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
4038 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
4045 8e7bd50a 2019-08-22 stsp free(id_str);
4046 d4efa91b 2020-01-14 stsp if (commit) {
4047 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
4050 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
4052 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
4053 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
4054 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
4055 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
4060 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
4062 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
4064 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
4065 8e7bd50a 2019-08-22 stsp } while (line);
4066 8e7bd50a 2019-08-22 stsp free(tagmsg0);
4069 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
4070 8e7bd50a 2019-08-22 stsp return NULL;
4073 8e7bd50a 2019-08-22 stsp static const struct got_error *
4074 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
4075 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
4077 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
4078 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
4079 f372d5cd 2019-10-21 stsp char *editor = NULL;
4080 8e7bd50a 2019-08-22 stsp int fd = -1;
4082 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
4083 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4084 8e7bd50a 2019-08-22 stsp goto done;
4087 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
4088 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
4089 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4090 8e7bd50a 2019-08-22 stsp goto done;
4093 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
4095 8e7bd50a 2019-08-22 stsp goto done;
4097 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
4098 8e7bd50a 2019-08-22 stsp close(fd);
4100 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
4102 8e7bd50a 2019-08-22 stsp goto done;
4103 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
4105 8e7bd50a 2019-08-22 stsp free(initial_content);
4106 8e7bd50a 2019-08-22 stsp free(template);
4107 8e7bd50a 2019-08-22 stsp free(editor);
4109 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
4110 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4111 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
4112 8e7bd50a 2019-08-22 stsp if (err) {
4113 8e7bd50a 2019-08-22 stsp free(*tagmsg);
4114 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
4117 8e7bd50a 2019-08-22 stsp return err;
4120 8e7bd50a 2019-08-22 stsp static const struct got_error *
4121 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
4122 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
4124 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
4125 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
4126 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
4127 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
4128 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
4129 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
4130 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
4133 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
4134 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
4135 8e7bd50a 2019-08-22 stsp * an unintended typo.
4137 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
4138 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
4140 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
4142 8e7bd50a 2019-08-22 stsp return err;
4144 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
4145 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
4147 8e7bd50a 2019-08-22 stsp goto done;
4149 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
4151 8e7bd50a 2019-08-22 stsp goto done;
4153 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
4154 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
4155 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
4156 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
4157 8e7bd50a 2019-08-22 stsp goto done;
4159 8e7bd50a 2019-08-22 stsp tag_name += 10;
4160 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
4161 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
4162 8e7bd50a 2019-08-22 stsp goto done;
4165 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
4166 8e7bd50a 2019-08-22 stsp if (err == NULL) {
4167 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
4168 8e7bd50a 2019-08-22 stsp goto done;
4169 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
4170 8e7bd50a 2019-08-22 stsp goto done;
4172 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
4173 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
4174 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
4175 f372d5cd 2019-10-21 stsp if (err) {
4176 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4177 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
4178 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4179 8e7bd50a 2019-08-22 stsp goto done;
4183 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
4184 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
4185 f372d5cd 2019-10-21 stsp if (err) {
4186 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4187 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4188 8e7bd50a 2019-08-22 stsp goto done;
4191 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
4192 f372d5cd 2019-10-21 stsp if (err) {
4193 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4194 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4195 8e7bd50a 2019-08-22 stsp goto done;
4198 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
4199 f372d5cd 2019-10-21 stsp if (err) {
4200 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4201 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4202 f372d5cd 2019-10-21 stsp goto done;
4205 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
4206 f372d5cd 2019-10-21 stsp if (err) {
4207 f372d5cd 2019-10-21 stsp if (tagmsg_path)
4208 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
4209 f372d5cd 2019-10-21 stsp goto done;
4211 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
4213 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
4214 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
4215 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
4216 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4217 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
4218 f372d5cd 2019-10-21 stsp free(tag_id_str);
4220 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
4221 8e7bd50a 2019-08-22 stsp free(commit_id);
4222 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4223 8e7bd50a 2019-08-22 stsp free(refname);
4224 8e7bd50a 2019-08-22 stsp free(tagmsg);
4225 f372d5cd 2019-10-21 stsp free(tagmsg_path);
4226 aba9c984 2019-09-08 stsp free(tagger);
4227 8e7bd50a 2019-08-22 stsp return err;
4230 8e7bd50a 2019-08-22 stsp static const struct got_error *
4231 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
4233 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
4234 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
4235 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
4236 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4237 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
4238 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4239 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
4241 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
4242 8e7bd50a 2019-08-22 stsp switch (ch) {
4244 80106605 2020-02-24 stsp commit_id_arg = optarg;
4247 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
4250 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
4251 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4252 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4254 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
4257 8e7bd50a 2019-08-22 stsp do_list = 1;
4260 8e7bd50a 2019-08-22 stsp usage_tag();
4261 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
4265 8e7bd50a 2019-08-22 stsp argc -= optind;
4266 8e7bd50a 2019-08-22 stsp argv += optind;
4268 8e7bd50a 2019-08-22 stsp if (do_list) {
4269 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
4270 80106605 2020-02-24 stsp errx(1, "-c option can only be used when creating a tag");
4271 8e7bd50a 2019-08-22 stsp if (tagmsg)
4272 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
4273 8e7bd50a 2019-08-22 stsp if (argc > 0)
4274 8e7bd50a 2019-08-22 stsp usage_tag();
4275 80106605 2020-02-24 stsp } else if (argc != 1)
4276 8e7bd50a 2019-08-22 stsp usage_tag();
4278 a2887370 2019-08-23 stsp tag_name = argv[0];
4280 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
4281 8e7bd50a 2019-08-22 stsp if (do_list) {
4282 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4283 8e7bd50a 2019-08-22 stsp NULL) == -1)
4284 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4286 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4287 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
4288 8e7bd50a 2019-08-22 stsp err(1, "pledge");
4291 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
4292 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
4293 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
4294 8e7bd50a 2019-08-22 stsp goto done;
4297 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4298 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
4299 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4300 8e7bd50a 2019-08-22 stsp goto done;
4302 8e7bd50a 2019-08-22 stsp error = NULL;
4303 8e7bd50a 2019-08-22 stsp if (worktree) {
4304 8e7bd50a 2019-08-22 stsp repo_path =
4305 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
4306 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
4307 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4308 8e7bd50a 2019-08-22 stsp if (error)
4309 8e7bd50a 2019-08-22 stsp goto done;
4311 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
4312 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
4313 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
4314 8e7bd50a 2019-08-22 stsp goto done;
4319 8e7bd50a 2019-08-22 stsp if (do_list) {
4320 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4321 c9956ddf 2019-09-08 stsp if (error != NULL)
4322 c9956ddf 2019-09-08 stsp goto done;
4323 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4324 8e7bd50a 2019-08-22 stsp if (error)
4325 8e7bd50a 2019-08-22 stsp goto done;
4326 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
4328 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
4329 c9956ddf 2019-09-08 stsp if (error)
4330 c9956ddf 2019-09-08 stsp goto done;
4331 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
4332 c9956ddf 2019-09-08 stsp if (error != NULL)
4333 c9956ddf 2019-09-08 stsp goto done;
4335 8e7bd50a 2019-08-22 stsp if (tagmsg) {
4336 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4337 8e7bd50a 2019-08-22 stsp if (error)
4338 8e7bd50a 2019-08-22 stsp goto done;
4341 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
4342 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
4343 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
4344 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
4345 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
4346 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
4347 8e7bd50a 2019-08-22 stsp if (error)
4348 8e7bd50a 2019-08-22 stsp goto done;
4349 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4350 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
4351 8e7bd50a 2019-08-22 stsp if (error)
4352 8e7bd50a 2019-08-22 stsp goto done;
4353 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
4354 8e7bd50a 2019-08-22 stsp free(commit_id);
4355 8e7bd50a 2019-08-22 stsp if (error)
4356 8e7bd50a 2019-08-22 stsp goto done;
4359 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
4360 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4364 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
4365 8e7bd50a 2019-08-22 stsp if (worktree)
4366 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
4367 8e7bd50a 2019-08-22 stsp free(cwd);
4368 8e7bd50a 2019-08-22 stsp free(repo_path);
4369 c9956ddf 2019-09-08 stsp free(gitconfig_path);
4370 8e7bd50a 2019-08-22 stsp free(commit_id_str);
4371 8e7bd50a 2019-08-22 stsp return error;
4374 8e7bd50a 2019-08-22 stsp __dead static void
4375 d00136be 2019-03-26 stsp usage_add(void)
4377 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4378 022fae89 2019-12-06 tracey getprogname());
4382 d00136be 2019-03-26 stsp static const struct got_error *
4383 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
4385 4e68cba3 2019-11-23 stsp while (path[0] == '/')
4387 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
4388 4e68cba3 2019-11-23 stsp return NULL;
4391 4e68cba3 2019-11-23 stsp static const struct got_error *
4392 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
4394 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
4395 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
4396 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
4397 1dd54920 2019-05-11 stsp char *cwd = NULL;
4398 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
4399 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4400 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
4402 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
4404 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
4405 d00136be 2019-03-26 stsp switch (ch) {
4406 022fae89 2019-12-06 tracey case 'I':
4407 022fae89 2019-12-06 tracey no_ignores = 1;
4410 4e68cba3 2019-11-23 stsp can_recurse = 1;
4413 d00136be 2019-03-26 stsp usage_add();
4414 d00136be 2019-03-26 stsp /* NOTREACHED */
4418 d00136be 2019-03-26 stsp argc -= optind;
4419 d00136be 2019-03-26 stsp argv += optind;
4421 43012d58 2019-07-14 stsp #ifndef PROFILE
4422 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4423 43012d58 2019-07-14 stsp NULL) == -1)
4424 43012d58 2019-07-14 stsp err(1, "pledge");
4426 723c305c 2019-05-11 jcs if (argc < 1)
4427 d00136be 2019-03-26 stsp usage_add();
4429 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
4430 d00136be 2019-03-26 stsp if (cwd == NULL) {
4431 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4432 d00136be 2019-03-26 stsp goto done;
4435 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4436 d00136be 2019-03-26 stsp if (error)
4437 d00136be 2019-03-26 stsp goto done;
4439 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4441 031a5338 2019-03-26 stsp if (error != NULL)
4442 031a5338 2019-03-26 stsp goto done;
4444 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4445 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4446 d00136be 2019-03-26 stsp if (error)
4447 d00136be 2019-03-26 stsp goto done;
4449 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4450 6d022e97 2019-08-04 stsp if (error)
4451 022fae89 2019-12-06 tracey goto done;
4453 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
4454 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4455 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
4456 6d022e97 2019-08-04 stsp goto done;
4460 4e68cba3 2019-11-23 stsp if (!can_recurse) {
4461 4e68cba3 2019-11-23 stsp char *ondisk_path;
4462 4e68cba3 2019-11-23 stsp struct stat sb;
4463 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
4464 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
4465 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
4466 4e68cba3 2019-11-23 stsp pe->path) == -1) {
4467 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
4468 4e68cba3 2019-11-23 stsp goto done;
4470 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
4471 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
4472 4e68cba3 2019-11-23 stsp free(ondisk_path);
4475 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
4476 4e68cba3 2019-11-23 stsp ondisk_path);
4477 4e68cba3 2019-11-23 stsp free(ondisk_path);
4478 4e68cba3 2019-11-23 stsp goto done;
4480 4e68cba3 2019-11-23 stsp free(ondisk_path);
4481 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
4482 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4483 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
4484 4e68cba3 2019-11-23 stsp goto done;
4489 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
4490 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
4493 031a5338 2019-03-26 stsp got_repo_close(repo);
4494 d00136be 2019-03-26 stsp if (worktree)
4495 d00136be 2019-03-26 stsp got_worktree_close(worktree);
4496 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
4497 1dd54920 2019-05-11 stsp free((char *)pe->path);
4498 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
4499 2ec1f75b 2019-03-26 stsp free(cwd);
4500 2ec1f75b 2019-03-26 stsp return error;
4503 2ec1f75b 2019-03-26 stsp __dead static void
4504 648e4ef7 2019-07-09 stsp usage_remove(void)
4506 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4507 f2a9dc41 2019-12-13 tracey getprogname());
4511 2a06fe5f 2019-08-24 stsp static const struct got_error *
4512 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
4513 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
4515 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
4517 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
4518 2a06fe5f 2019-08-24 stsp return NULL;
4519 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4520 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
4521 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
4522 2a06fe5f 2019-08-24 stsp return NULL;
4525 2ec1f75b 2019-03-26 stsp static const struct got_error *
4526 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
4528 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
4529 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
4530 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
4531 17ed4618 2019-06-02 stsp char *cwd = NULL;
4532 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
4533 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4534 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4536 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
4538 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
4539 2ec1f75b 2019-03-26 stsp switch (ch) {
4541 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
4543 70e3e7f5 2019-12-13 tracey case 'k':
4544 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
4546 f2a9dc41 2019-12-13 tracey case 'R':
4547 f2a9dc41 2019-12-13 tracey can_recurse = 1;
4550 f2a9dc41 2019-12-13 tracey usage_remove();
4551 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
4555 2ec1f75b 2019-03-26 stsp argc -= optind;
4556 2ec1f75b 2019-03-26 stsp argv += optind;
4558 43012d58 2019-07-14 stsp #ifndef PROFILE
4559 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4560 43012d58 2019-07-14 stsp NULL) == -1)
4561 43012d58 2019-07-14 stsp err(1, "pledge");
4563 17ed4618 2019-06-02 stsp if (argc < 1)
4564 648e4ef7 2019-07-09 stsp usage_remove();
4566 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
4567 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
4568 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4569 2ec1f75b 2019-03-26 stsp goto done;
4571 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
4572 2ec1f75b 2019-03-26 stsp if (error)
4573 2ec1f75b 2019-03-26 stsp goto done;
4575 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4578 2ec1f75b 2019-03-26 stsp goto done;
4580 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4581 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4582 2ec1f75b 2019-03-26 stsp if (error)
4583 2ec1f75b 2019-03-26 stsp goto done;
4585 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4586 6d022e97 2019-08-04 stsp if (error)
4587 6d022e97 2019-08-04 stsp goto done;
4589 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
4590 f2a9dc41 2019-12-13 tracey char *ondisk_path;
4591 f2a9dc41 2019-12-13 tracey struct stat sb;
4592 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
4593 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
4594 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
4595 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
4596 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
4597 f2a9dc41 2019-12-13 tracey goto done;
4599 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
4600 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
4601 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4602 f2a9dc41 2019-12-13 tracey continue;
4604 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
4605 f2a9dc41 2019-12-13 tracey ondisk_path);
4606 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4607 f2a9dc41 2019-12-13 tracey goto done;
4609 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4610 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
4611 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
4612 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
4613 f2a9dc41 2019-12-13 tracey goto done;
4618 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
4619 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4622 a129376b 2019-03-28 stsp got_repo_close(repo);
4623 a129376b 2019-03-28 stsp if (worktree)
4624 a129376b 2019-03-28 stsp got_worktree_close(worktree);
4625 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
4626 17ed4618 2019-06-02 stsp free((char *)pe->path);
4627 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
4628 a129376b 2019-03-28 stsp free(cwd);
4629 a129376b 2019-03-28 stsp return error;
4632 a129376b 2019-03-28 stsp __dead static void
4633 a129376b 2019-03-28 stsp usage_revert(void)
4635 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4636 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
4640 1ee397ad 2019-07-12 stsp static const struct got_error *
4641 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
4643 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
4644 fb9704af 2020-01-27 stsp return NULL;
4646 a129376b 2019-03-28 stsp while (path[0] == '/')
4648 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
4649 33aa809d 2019-08-08 stsp return NULL;
4652 33aa809d 2019-08-08 stsp struct choose_patch_arg {
4653 33aa809d 2019-08-08 stsp FILE *patch_script_file;
4654 33aa809d 2019-08-08 stsp const char *action;
4657 33aa809d 2019-08-08 stsp static const struct got_error *
4658 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4659 33aa809d 2019-08-08 stsp int nchanges, const char *action)
4661 33aa809d 2019-08-08 stsp char *line = NULL;
4662 33aa809d 2019-08-08 stsp size_t linesize = 0;
4663 33aa809d 2019-08-08 stsp ssize_t linelen;
4665 33aa809d 2019-08-08 stsp switch (status) {
4666 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
4667 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
4669 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
4670 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
4672 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
4673 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
4674 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
4675 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4676 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4677 33aa809d 2019-08-08 stsp printf("%s", line);
4678 33aa809d 2019-08-08 stsp if (ferror(patch_file))
4679 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4680 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
4681 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4682 33aa809d 2019-08-08 stsp path, n, nchanges, action);
4685 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
4688 33aa809d 2019-08-08 stsp return NULL;
4691 33aa809d 2019-08-08 stsp static const struct got_error *
4692 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4693 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
4695 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4696 33aa809d 2019-08-08 stsp char *line = NULL;
4697 33aa809d 2019-08-08 stsp size_t linesize = 0;
4698 33aa809d 2019-08-08 stsp ssize_t linelen;
4699 33aa809d 2019-08-08 stsp int resp = ' ';
4700 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
4702 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4704 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
4706 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4707 33aa809d 2019-08-08 stsp a->action);
4709 33aa809d 2019-08-08 stsp return err;
4710 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
4711 33aa809d 2019-08-08 stsp if (linelen == -1) {
4712 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
4713 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
4714 33aa809d 2019-08-08 stsp return NULL;
4716 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
4718 33aa809d 2019-08-08 stsp *nl = '\0';
4719 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
4720 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4721 33aa809d 2019-08-08 stsp printf("y\n");
4722 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
4723 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4724 33aa809d 2019-08-08 stsp printf("n\n");
4725 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
4726 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
4727 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4728 33aa809d 2019-08-08 stsp printf("q\n");
4730 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
4731 33aa809d 2019-08-08 stsp free(line);
4732 33aa809d 2019-08-08 stsp return NULL;
4735 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
4736 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
4737 33aa809d 2019-08-08 stsp a->action);
4739 33aa809d 2019-08-08 stsp return err;
4740 33aa809d 2019-08-08 stsp resp = getchar();
4741 33aa809d 2019-08-08 stsp if (resp == '\n')
4742 33aa809d 2019-08-08 stsp resp = getchar();
4743 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
4744 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
4745 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4746 33aa809d 2019-08-08 stsp resp = ' ';
4748 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
4749 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
4750 33aa809d 2019-08-08 stsp resp = ' ';
4754 33aa809d 2019-08-08 stsp if (resp == 'y')
4755 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
4756 33aa809d 2019-08-08 stsp else if (resp == 'n')
4757 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
4758 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4759 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
4761 1ee397ad 2019-07-12 stsp return NULL;
4765 a129376b 2019-03-28 stsp static const struct got_error *
4766 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
4768 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
4769 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
4770 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
4771 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
4772 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
4773 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
4774 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
4775 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
4776 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
4777 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
4779 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
4781 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4782 a129376b 2019-03-28 stsp switch (ch) {
4784 33aa809d 2019-08-08 stsp pflag = 1;
4787 33aa809d 2019-08-08 stsp patch_script_path = optarg;
4790 0f6d7415 2019-08-08 stsp can_recurse = 1;
4793 a129376b 2019-03-28 stsp usage_revert();
4794 a129376b 2019-03-28 stsp /* NOTREACHED */
4798 a129376b 2019-03-28 stsp argc -= optind;
4799 a129376b 2019-03-28 stsp argv += optind;
4801 43012d58 2019-07-14 stsp #ifndef PROFILE
4802 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4803 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
4804 43012d58 2019-07-14 stsp err(1, "pledge");
4806 e20a8b6f 2019-06-04 stsp if (argc < 1)
4807 a129376b 2019-03-28 stsp usage_revert();
4808 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
4809 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
4811 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
4812 a129376b 2019-03-28 stsp if (cwd == NULL) {
4813 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4814 a129376b 2019-03-28 stsp goto done;
4816 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
4817 2ec1f75b 2019-03-26 stsp if (error)
4818 2ec1f75b 2019-03-26 stsp goto done;
4820 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4822 a129376b 2019-03-28 stsp if (error != NULL)
4823 a129376b 2019-03-28 stsp goto done;
4825 33aa809d 2019-08-08 stsp if (patch_script_path) {
4826 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
4827 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
4828 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
4829 33aa809d 2019-08-08 stsp patch_script_path);
4830 33aa809d 2019-08-08 stsp goto done;
4833 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4834 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4835 a129376b 2019-03-28 stsp if (error)
4836 a129376b 2019-03-28 stsp goto done;
4838 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4839 6d022e97 2019-08-04 stsp if (error)
4840 6d022e97 2019-08-04 stsp goto done;
4842 0f6d7415 2019-08-08 stsp if (!can_recurse) {
4843 0f6d7415 2019-08-08 stsp char *ondisk_path;
4844 0f6d7415 2019-08-08 stsp struct stat sb;
4845 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
4846 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4847 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
4848 0f6d7415 2019-08-08 stsp pe->path) == -1) {
4849 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
4850 0f6d7415 2019-08-08 stsp goto done;
4852 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
4853 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
4854 0f6d7415 2019-08-08 stsp free(ondisk_path);
4857 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
4858 0f6d7415 2019-08-08 stsp ondisk_path);
4859 0f6d7415 2019-08-08 stsp free(ondisk_path);
4860 0f6d7415 2019-08-08 stsp goto done;
4862 0f6d7415 2019-08-08 stsp free(ondisk_path);
4863 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
4864 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
4865 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
4866 0f6d7415 2019-08-08 stsp goto done;
4871 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
4872 33aa809d 2019-08-08 stsp cpa.action = "revert";
4873 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4874 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
4876 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
4877 33aa809d 2019-08-08 stsp error == NULL)
4878 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
4880 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
4881 2ec1f75b 2019-03-26 stsp if (worktree)
4882 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
4883 2ec1f75b 2019-03-26 stsp free(path);
4884 d00136be 2019-03-26 stsp free(cwd);
4885 6bad629b 2019-02-04 stsp return error;
4888 c4296144 2019-05-09 stsp __dead static void
4889 c4296144 2019-05-09 stsp usage_commit(void)
4891 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4892 5c1e53bc 2019-07-28 stsp getprogname());
4896 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
4897 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
4898 e2ba3d07 2019-05-13 stsp const char *editor;
4899 e0870e44 2019-05-13 stsp const char *worktree_path;
4900 76d98825 2019-06-03 stsp const char *branch_name;
4901 314a6357 2019-05-13 stsp const char *repo_path;
4902 e0870e44 2019-05-13 stsp char *logmsg_path;
4906 33ad4cbe 2019-05-12 jcs static const struct got_error *
4907 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4910 76d98825 2019-06-03 stsp char *initial_content = NULL;
4911 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
4912 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
4913 e0870e44 2019-05-13 stsp char *template = NULL;
4914 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
4916 33ad4cbe 2019-05-12 jcs size_t len;
4918 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
4919 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4920 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
4921 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
4922 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
4923 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
4924 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
4925 33ad4cbe 2019-05-12 jcs return NULL;
4928 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4929 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
4931 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
4932 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
4933 76d98825 2019-06-03 stsp a->branch_name) == -1)
4934 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4936 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4938 e0870e44 2019-05-13 stsp goto done;
4940 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
4942 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
4943 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4944 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
4945 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
4946 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
4950 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4952 76d98825 2019-06-03 stsp free(initial_content);
4953 e0870e44 2019-05-13 stsp free(template);
4955 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
4956 3ce1b845 2019-07-15 stsp if (err == NULL) {
4957 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
4958 3ce1b845 2019-07-15 stsp if (err) {
4959 3ce1b845 2019-07-15 stsp free(*logmsg);
4960 3ce1b845 2019-07-15 stsp *logmsg = NULL;
4963 33ad4cbe 2019-05-12 jcs return err;
4966 c4296144 2019-05-09 stsp static const struct got_error *
4967 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
4969 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
4970 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
4971 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
4972 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
4973 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
4974 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
4975 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
4976 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4977 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4978 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
4980 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
4981 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
4983 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
4984 c4296144 2019-05-09 stsp switch (ch) {
4986 c4296144 2019-05-09 stsp logmsg = optarg;
4989 c4296144 2019-05-09 stsp usage_commit();
4990 c4296144 2019-05-09 stsp /* NOTREACHED */
4994 c4296144 2019-05-09 stsp argc -= optind;
4995 c4296144 2019-05-09 stsp argv += optind;
4997 43012d58 2019-07-14 stsp #ifndef PROFILE
4998 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4999 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5000 43012d58 2019-07-14 stsp err(1, "pledge");
5002 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
5003 c4296144 2019-05-09 stsp if (cwd == NULL) {
5004 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5005 c4296144 2019-05-09 stsp goto done;
5007 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
5008 7d5807f4 2019-07-11 stsp if (error)
5009 7d5807f4 2019-07-11 stsp goto done;
5011 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5012 c4296144 2019-05-09 stsp if (error)
5013 a698f62e 2019-07-25 stsp goto done;
5014 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
5015 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
5016 c4296144 2019-05-09 stsp goto done;
5019 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5020 916f288c 2019-07-30 stsp worktree);
5021 5c1e53bc 2019-07-28 stsp if (error)
5022 5c1e53bc 2019-07-28 stsp goto done;
5024 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5025 c9956ddf 2019-09-08 stsp if (error)
5026 c9956ddf 2019-09-08 stsp goto done;
5027 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5028 c9956ddf 2019-09-08 stsp gitconfig_path);
5029 c4296144 2019-05-09 stsp if (error != NULL)
5030 c4296144 2019-05-09 stsp goto done;
5032 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
5033 aba9c984 2019-09-08 stsp if (error)
5034 aba9c984 2019-09-08 stsp return error;
5037 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
5038 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
5040 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
5041 314a6357 2019-05-13 stsp error = get_editor(&editor);
5043 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5044 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5045 c4296144 2019-05-09 stsp if (error)
5046 c4296144 2019-05-09 stsp goto done;
5048 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5049 087fb88c 2019-08-04 stsp if (error)
5050 087fb88c 2019-08-04 stsp goto done;
5052 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
5053 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
5054 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
5055 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
5056 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
5057 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
5058 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
5059 916f288c 2019-07-30 stsp goto done;
5061 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
5063 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
5064 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
5065 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
5066 e0870e44 2019-05-13 stsp if (error) {
5067 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5068 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
5069 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
5070 c4296144 2019-05-09 stsp goto done;
5073 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
5074 c4296144 2019-05-09 stsp if (error)
5075 c4296144 2019-05-09 stsp goto done;
5076 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
5078 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
5079 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
5080 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
5081 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
5082 7266f21f 2019-10-21 stsp error == NULL)
5083 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
5084 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
5086 c4296144 2019-05-09 stsp got_repo_close(repo);
5087 c4296144 2019-05-09 stsp if (worktree)
5088 c4296144 2019-05-09 stsp got_worktree_close(worktree);
5089 c4296144 2019-05-09 stsp free(cwd);
5090 c4296144 2019-05-09 stsp free(id_str);
5091 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5092 e2ba3d07 2019-05-13 stsp free(editor);
5093 aba9c984 2019-09-08 stsp free(author);
5094 234035bc 2019-06-01 stsp return error;
5097 234035bc 2019-06-01 stsp __dead static void
5098 234035bc 2019-06-01 stsp usage_cherrypick(void)
5100 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
5104 234035bc 2019-06-01 stsp static const struct got_error *
5105 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
5107 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
5108 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
5109 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
5110 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
5111 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
5112 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
5113 234035bc 2019-06-01 stsp struct got_object_qid *pid;
5114 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
5115 234035bc 2019-06-01 stsp int ch, did_something = 0;
5117 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5118 234035bc 2019-06-01 stsp switch (ch) {
5120 234035bc 2019-06-01 stsp usage_cherrypick();
5121 234035bc 2019-06-01 stsp /* NOTREACHED */
5125 234035bc 2019-06-01 stsp argc -= optind;
5126 234035bc 2019-06-01 stsp argv += optind;
5128 43012d58 2019-07-14 stsp #ifndef PROFILE
5129 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5130 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5131 43012d58 2019-07-14 stsp err(1, "pledge");
5133 234035bc 2019-06-01 stsp if (argc != 1)
5134 234035bc 2019-06-01 stsp usage_cherrypick();
5136 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
5137 234035bc 2019-06-01 stsp if (cwd == NULL) {
5138 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
5139 234035bc 2019-06-01 stsp goto done;
5141 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
5142 234035bc 2019-06-01 stsp if (error)
5143 234035bc 2019-06-01 stsp goto done;
5145 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5147 234035bc 2019-06-01 stsp if (error != NULL)
5148 234035bc 2019-06-01 stsp goto done;
5150 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5151 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5152 234035bc 2019-06-01 stsp if (error)
5153 234035bc 2019-06-01 stsp goto done;
5155 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5156 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5157 234035bc 2019-06-01 stsp if (error != NULL) {
5158 234035bc 2019-06-01 stsp struct got_reference *ref;
5159 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5160 234035bc 2019-06-01 stsp goto done;
5161 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5162 234035bc 2019-06-01 stsp if (error != NULL)
5163 234035bc 2019-06-01 stsp goto done;
5164 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
5165 234035bc 2019-06-01 stsp got_ref_close(ref);
5166 234035bc 2019-06-01 stsp if (error != NULL)
5167 234035bc 2019-06-01 stsp goto done;
5169 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
5170 234035bc 2019-06-01 stsp if (error)
5171 234035bc 2019-06-01 stsp goto done;
5173 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
5174 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
5175 234035bc 2019-06-01 stsp if (error != NULL)
5176 234035bc 2019-06-01 stsp goto done;
5178 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5179 234035bc 2019-06-01 stsp if (error) {
5180 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
5181 234035bc 2019-06-01 stsp goto done;
5182 234035bc 2019-06-01 stsp error = NULL;
5184 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
5185 234035bc 2019-06-01 stsp goto done;
5188 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5189 234035bc 2019-06-01 stsp if (error)
5190 234035bc 2019-06-01 stsp goto done;
5191 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5192 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
5193 03415a1a 2019-06-02 stsp commit_id, repo, update_progress, &did_something, check_cancelled,
5195 234035bc 2019-06-01 stsp if (error != NULL)
5196 234035bc 2019-06-01 stsp goto done;
5198 234035bc 2019-06-01 stsp if (did_something)
5199 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
5201 234035bc 2019-06-01 stsp if (commit)
5202 234035bc 2019-06-01 stsp got_object_commit_close(commit);
5203 234035bc 2019-06-01 stsp free(commit_id_str);
5204 234035bc 2019-06-01 stsp if (head_ref)
5205 234035bc 2019-06-01 stsp got_ref_close(head_ref);
5206 234035bc 2019-06-01 stsp if (worktree)
5207 234035bc 2019-06-01 stsp got_worktree_close(worktree);
5209 234035bc 2019-06-01 stsp got_repo_close(repo);
5210 c4296144 2019-05-09 stsp return error;
5213 5ef14e63 2019-06-02 stsp __dead static void
5214 5ef14e63 2019-06-02 stsp usage_backout(void)
5216 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5220 5ef14e63 2019-06-02 stsp static const struct got_error *
5221 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
5223 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
5224 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
5225 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
5226 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
5227 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
5228 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
5229 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
5230 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
5231 5ef14e63 2019-06-02 stsp int ch, did_something = 0;
5233 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
5234 5ef14e63 2019-06-02 stsp switch (ch) {
5236 5ef14e63 2019-06-02 stsp usage_backout();
5237 5ef14e63 2019-06-02 stsp /* NOTREACHED */
5241 5ef14e63 2019-06-02 stsp argc -= optind;
5242 5ef14e63 2019-06-02 stsp argv += optind;
5244 43012d58 2019-07-14 stsp #ifndef PROFILE
5245 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5246 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5247 43012d58 2019-07-14 stsp err(1, "pledge");
5249 5ef14e63 2019-06-02 stsp if (argc != 1)
5250 5ef14e63 2019-06-02 stsp usage_backout();
5252 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
5253 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
5254 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
5255 5ef14e63 2019-06-02 stsp goto done;
5257 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
5258 5ef14e63 2019-06-02 stsp if (error)
5259 5ef14e63 2019-06-02 stsp goto done;
5261 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5263 5ef14e63 2019-06-02 stsp if (error != NULL)
5264 5ef14e63 2019-06-02 stsp goto done;
5266 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5267 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5268 5ef14e63 2019-06-02 stsp if (error)
5269 5ef14e63 2019-06-02 stsp goto done;
5271 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5272 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
5273 5ef14e63 2019-06-02 stsp if (error != NULL) {
5274 5ef14e63 2019-06-02 stsp struct got_reference *ref;
5275 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5276 5ef14e63 2019-06-02 stsp goto done;
5277 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
5278 5ef14e63 2019-06-02 stsp if (error != NULL)
5279 5ef14e63 2019-06-02 stsp goto done;
5280 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
5281 5ef14e63 2019-06-02 stsp got_ref_close(ref);
5282 5ef14e63 2019-06-02 stsp if (error != NULL)
5283 5ef14e63 2019-06-02 stsp goto done;
5285 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
5286 5ef14e63 2019-06-02 stsp if (error)
5287 5ef14e63 2019-06-02 stsp goto done;
5289 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
5290 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
5291 5ef14e63 2019-06-02 stsp if (error != NULL)
5292 5ef14e63 2019-06-02 stsp goto done;
5294 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
5295 5ef14e63 2019-06-02 stsp if (error)
5296 5ef14e63 2019-06-02 stsp goto done;
5298 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5299 5ef14e63 2019-06-02 stsp if (error)
5300 5ef14e63 2019-06-02 stsp goto done;
5301 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5302 5ef14e63 2019-06-02 stsp if (pid == NULL) {
5303 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
5304 5ef14e63 2019-06-02 stsp goto done;
5307 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5308 5ef14e63 2019-06-02 stsp update_progress, &did_something, check_cancelled, NULL);
5309 5ef14e63 2019-06-02 stsp if (error != NULL)
5310 5ef14e63 2019-06-02 stsp goto done;
5312 5ef14e63 2019-06-02 stsp if (did_something)
5313 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
5315 5ef14e63 2019-06-02 stsp if (commit)
5316 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
5317 5ef14e63 2019-06-02 stsp free(commit_id_str);
5318 5ef14e63 2019-06-02 stsp if (head_ref)
5319 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
5320 818c7501 2019-07-11 stsp if (worktree)
5321 818c7501 2019-07-11 stsp got_worktree_close(worktree);
5323 818c7501 2019-07-11 stsp got_repo_close(repo);
5324 818c7501 2019-07-11 stsp return error;
5327 818c7501 2019-07-11 stsp __dead static void
5328 818c7501 2019-07-11 stsp usage_rebase(void)
5330 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5331 af54c8f8 2019-07-11 stsp getprogname());
5336 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
5339 0ebf8283 2019-07-24 stsp size_t len;
5341 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
5342 0ebf8283 2019-07-24 stsp if (len > limit)
5343 0ebf8283 2019-07-24 stsp len = limit;
5344 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
5345 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
5347 0ebf8283 2019-07-24 stsp *nl = '\0';
5350 0ebf8283 2019-07-24 stsp static const struct got_error *
5351 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5353 5943eee2 2019-08-13 stsp const struct got_error *err;
5354 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
5355 5943eee2 2019-08-13 stsp const char *s;
5357 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
5359 5943eee2 2019-08-13 stsp return err;
5361 5943eee2 2019-08-13 stsp s = logmsg0;
5362 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
5365 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
5366 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
5367 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5368 5943eee2 2019-08-13 stsp goto done;
5371 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
5373 5943eee2 2019-08-13 stsp free(logmsg0);
5374 a0ea4fc0 2020-02-28 stsp return err;
5377 a0ea4fc0 2020-02-28 stsp static const struct got_error *
5378 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
5380 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
5381 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
5382 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
5384 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
5386 a0ea4fc0 2020-02-28 stsp return err;
5388 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
5390 a0ea4fc0 2020-02-28 stsp goto done;
5392 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
5394 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
5396 a0ea4fc0 2020-02-28 stsp goto done;
5398 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
5400 a0ea4fc0 2020-02-28 stsp free(id_str);
5401 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
5402 a0ea4fc0 2020-02-28 stsp free(logmsg);
5403 5943eee2 2019-08-13 stsp return err;
5406 818c7501 2019-07-11 stsp static const struct got_error *
5407 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
5408 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
5410 818c7501 2019-07-11 stsp const struct got_error *err;
5411 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5413 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
5415 818c7501 2019-07-11 stsp goto done;
5417 ff0d2220 2019-07-11 stsp if (new_id) {
5418 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
5420 ff0d2220 2019-07-11 stsp goto done;
5423 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
5424 ff0d2220 2019-07-11 stsp if (new_id_str)
5425 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
5427 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
5429 0ebf8283 2019-07-24 stsp goto done;
5431 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
5432 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
5434 818c7501 2019-07-11 stsp free(old_id_str);
5435 818c7501 2019-07-11 stsp free(new_id_str);
5436 272a1371 2020-02-28 stsp free(logmsg);
5437 818c7501 2019-07-11 stsp return err;
5440 1ee397ad 2019-07-12 stsp static const struct got_error *
5441 818c7501 2019-07-11 stsp rebase_progress(void *arg, unsigned char status, const char *path)
5443 818c7501 2019-07-11 stsp unsigned char *rebase_status = arg;
5445 818c7501 2019-07-11 stsp while (path[0] == '/')
5447 818c7501 2019-07-11 stsp printf("%c %s\n", status, path);
5449 818c7501 2019-07-11 stsp if (*rebase_status == GOT_STATUS_CONFLICT)
5450 1ee397ad 2019-07-12 stsp return NULL;
5451 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5452 818c7501 2019-07-11 stsp *rebase_status = status;
5453 1ee397ad 2019-07-12 stsp return NULL;
5456 818c7501 2019-07-11 stsp static const struct got_error *
5457 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5458 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
5459 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
5461 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
5462 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
5463 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
5466 818c7501 2019-07-11 stsp static const struct got_error *
5467 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
5468 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5469 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
5470 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5472 ff0d2220 2019-07-11 stsp const struct got_error *error;
5473 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
5474 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
5476 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5477 ff0d2220 2019-07-11 stsp if (error)
5478 ff0d2220 2019-07-11 stsp return error;
5480 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5481 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
5482 ff0d2220 2019-07-11 stsp if (error) {
5483 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5484 ff0d2220 2019-07-11 stsp goto done;
5485 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
5487 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
5488 ff0d2220 2019-07-11 stsp free(new_commit_id);
5491 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
5492 ff0d2220 2019-07-11 stsp return error;
5495 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
5496 64c6d990 2019-07-11 stsp const char *path_prefix;
5497 64c6d990 2019-07-11 stsp size_t len;
5498 8ca9bd68 2019-07-25 stsp int errcode;
5501 64c6d990 2019-07-11 stsp static const struct got_error *
5502 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5503 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
5504 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
5505 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
5507 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
5509 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5510 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5511 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
5513 64c6d990 2019-07-11 stsp return NULL;
5516 64c6d990 2019-07-11 stsp static const struct got_error *
5517 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
5518 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
5519 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
5521 64c6d990 2019-07-11 stsp const struct got_error *err;
5522 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5523 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
5524 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
5526 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
5527 64c6d990 2019-07-11 stsp return NULL;
5529 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5531 64c6d990 2019-07-11 stsp goto done;
5533 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5535 64c6d990 2019-07-11 stsp goto done;
5537 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
5538 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
5540 64c6d990 2019-07-11 stsp goto done;
5542 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
5543 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
5545 64c6d990 2019-07-11 stsp goto done;
5547 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
5548 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
5549 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
5550 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
5551 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
5552 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
5553 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
5555 64c6d990 2019-07-11 stsp if (tree1)
5556 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
5557 64c6d990 2019-07-11 stsp if (tree2)
5558 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
5559 64c6d990 2019-07-11 stsp if (commit)
5560 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
5561 64c6d990 2019-07-11 stsp if (parent_commit)
5562 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
5563 64c6d990 2019-07-11 stsp return err;
5566 ff0d2220 2019-07-11 stsp static const struct got_error *
5567 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
5568 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
5569 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5570 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
5571 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
5573 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
5574 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
5575 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
5576 af61c510 2019-07-19 stsp struct got_object_qid *qid;
5577 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
5579 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
5581 af61c510 2019-07-19 stsp return err;
5583 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5584 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5586 af61c510 2019-07-19 stsp goto done;
5587 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5588 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
5589 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
5590 af61c510 2019-07-19 stsp if (err) {
5591 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
5592 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
5593 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
5594 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
5595 af61c510 2019-07-19 stsp "been reached?!?");
5597 ee780d5c 2020-01-04 stsp goto done;
5599 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
5600 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
5602 af61c510 2019-07-19 stsp goto done;
5604 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
5606 af61c510 2019-07-19 stsp goto done;
5607 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5608 af61c510 2019-07-19 stsp commit_id = parent_id;
5612 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
5613 af61c510 2019-07-19 stsp return err;
5616 af61c510 2019-07-19 stsp static const struct got_error *
5617 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
5619 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
5620 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
5621 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
5622 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
5623 818c7501 2019-07-11 stsp char *cwd = NULL;
5624 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
5625 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5626 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
5627 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
5628 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5629 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
5630 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5631 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
5632 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5633 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
5634 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
5635 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
5636 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
5638 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
5639 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
5641 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
5642 818c7501 2019-07-11 stsp switch (ch) {
5644 818c7501 2019-07-11 stsp abort_rebase = 1;
5647 818c7501 2019-07-11 stsp continue_rebase = 1;
5650 818c7501 2019-07-11 stsp usage_rebase();
5651 818c7501 2019-07-11 stsp /* NOTREACHED */
5655 818c7501 2019-07-11 stsp argc -= optind;
5656 818c7501 2019-07-11 stsp argv += optind;
5658 43012d58 2019-07-14 stsp #ifndef PROFILE
5659 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5660 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
5661 43012d58 2019-07-14 stsp err(1, "pledge");
5663 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
5664 818c7501 2019-07-11 stsp usage_rebase();
5665 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
5666 818c7501 2019-07-11 stsp if (argc != 0)
5667 818c7501 2019-07-11 stsp usage_rebase();
5668 818c7501 2019-07-11 stsp } else if (argc != 1)
5669 818c7501 2019-07-11 stsp usage_rebase();
5671 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
5672 818c7501 2019-07-11 stsp if (cwd == NULL) {
5673 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
5674 818c7501 2019-07-11 stsp goto done;
5676 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
5677 818c7501 2019-07-11 stsp if (error)
5678 818c7501 2019-07-11 stsp goto done;
5680 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5682 818c7501 2019-07-11 stsp if (error != NULL)
5683 818c7501 2019-07-11 stsp goto done;
5685 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
5686 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5687 7ef62c4e 2020-02-24 stsp if (error)
5688 7ef62c4e 2020-02-24 stsp goto done;
5690 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
5691 7ef62c4e 2020-02-24 stsp worktree);
5692 818c7501 2019-07-11 stsp if (error)
5693 7ef62c4e 2020-02-24 stsp goto done;
5694 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
5695 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
5696 818c7501 2019-07-11 stsp goto done;
5699 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5700 818c7501 2019-07-11 stsp if (error)
5701 818c7501 2019-07-11 stsp goto done;
5703 f6794adc 2019-07-23 stsp if (abort_rebase) {
5704 818c7501 2019-07-11 stsp int did_something;
5705 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5706 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5707 f6794adc 2019-07-23 stsp goto done;
5709 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5710 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5711 3e3a69f1 2019-07-25 stsp worktree, repo);
5712 818c7501 2019-07-11 stsp if (error)
5713 818c7501 2019-07-11 stsp goto done;
5714 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
5715 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
5716 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
5717 818c7501 2019-07-11 stsp new_base_branch, update_progress, &did_something);
5718 818c7501 2019-07-11 stsp if (error)
5719 818c7501 2019-07-11 stsp goto done;
5720 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5721 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
5724 818c7501 2019-07-11 stsp if (continue_rebase) {
5725 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
5726 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
5727 f6794adc 2019-07-23 stsp goto done;
5729 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
5730 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
5731 3e3a69f1 2019-07-25 stsp worktree, repo);
5732 818c7501 2019-07-11 stsp if (error)
5733 818c7501 2019-07-11 stsp goto done;
5735 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5736 01757395 2019-07-12 stsp resume_commit_id, repo);
5737 818c7501 2019-07-11 stsp if (error)
5738 818c7501 2019-07-11 stsp goto done;
5740 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
5741 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
5742 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
5743 818c7501 2019-07-11 stsp goto done;
5746 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
5747 818c7501 2019-07-11 stsp if (error != NULL)
5748 818c7501 2019-07-11 stsp goto done;
5751 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5752 ff0d2220 2019-07-11 stsp if (error)
5753 ff0d2220 2019-07-11 stsp goto done;
5755 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
5756 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
5758 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
5759 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5760 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
5761 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
5762 818c7501 2019-07-11 stsp if (error)
5763 818c7501 2019-07-11 stsp goto done;
5764 818c7501 2019-07-11 stsp if (yca_id == NULL) {
5765 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
5766 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
5767 818c7501 2019-07-11 stsp "with work tree's branch");
5768 818c7501 2019-07-11 stsp goto done;
5771 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
5772 a51a74b3 2019-07-27 stsp if (error) {
5773 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
5774 a51a74b3 2019-07-27 stsp goto done;
5775 a51a74b3 2019-07-27 stsp error = NULL;
5777 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
5778 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
5779 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
5780 a51a74b3 2019-07-27 stsp goto done;
5782 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
5783 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
5784 818c7501 2019-07-11 stsp if (error)
5785 818c7501 2019-07-11 stsp goto done;
5788 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
5789 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5790 818c7501 2019-07-11 stsp if (error)
5791 818c7501 2019-07-11 stsp goto done;
5793 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
5794 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
5795 fc66b545 2019-08-12 stsp if (pid == NULL) {
5796 fc66b545 2019-08-12 stsp if (!continue_rebase) {
5797 fc66b545 2019-08-12 stsp int did_something;
5798 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
5799 fc66b545 2019-08-12 stsp repo, new_base_branch, update_progress,
5800 fc66b545 2019-08-12 stsp &did_something);
5801 fc66b545 2019-08-12 stsp if (error)
5802 fc66b545 2019-08-12 stsp goto done;
5803 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
5804 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
5806 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
5807 fc66b545 2019-08-12 stsp goto done;
5809 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
5810 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
5811 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
5812 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5813 818c7501 2019-07-11 stsp commit = NULL;
5814 818c7501 2019-07-11 stsp if (error)
5815 818c7501 2019-07-11 stsp goto done;
5817 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
5818 38b0338b 2019-11-29 stsp if (continue_rebase) {
5819 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
5820 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
5821 38b0338b 2019-11-29 stsp goto done;
5823 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
5824 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
5825 38b0338b 2019-11-29 stsp char *id_str;
5826 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
5827 38b0338b 2019-11-29 stsp new_base_branch);
5828 38b0338b 2019-11-29 stsp if (error)
5829 38b0338b 2019-11-29 stsp goto done;
5830 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
5831 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
5832 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
5833 38b0338b 2019-11-29 stsp free(id_str);
5834 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
5835 38b0338b 2019-11-29 stsp new_head_commit_id);
5836 38b0338b 2019-11-29 stsp if (error)
5837 38b0338b 2019-11-29 stsp goto done;
5841 818c7501 2019-07-11 stsp pid = NULL;
5842 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
5843 818c7501 2019-07-11 stsp commit_id = qid->id;
5844 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
5845 818c7501 2019-07-11 stsp pid = qid;
5847 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
5848 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
5849 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
5850 818c7501 2019-07-11 stsp if (error)
5851 818c7501 2019-07-11 stsp goto done;
5853 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5854 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
5855 a0ea4fc0 2020-02-28 stsp if (error)
5856 a0ea4fc0 2020-02-28 stsp goto done;
5857 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5861 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
5862 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
5863 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
5864 818c7501 2019-07-11 stsp if (error)
5865 818c7501 2019-07-11 stsp goto done;
5868 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
5869 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
5870 818c7501 2019-07-11 stsp if (error)
5871 818c7501 2019-07-11 stsp goto done;
5872 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
5873 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
5875 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
5876 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
5878 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
5879 818c7501 2019-07-11 stsp free(branch_head_commit_id);
5880 818c7501 2019-07-11 stsp free(resume_commit_id);
5881 818c7501 2019-07-11 stsp free(yca_id);
5882 818c7501 2019-07-11 stsp if (commit)
5883 818c7501 2019-07-11 stsp got_object_commit_close(commit);
5884 818c7501 2019-07-11 stsp if (branch)
5885 818c7501 2019-07-11 stsp got_ref_close(branch);
5886 818c7501 2019-07-11 stsp if (new_base_branch)
5887 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
5888 818c7501 2019-07-11 stsp if (tmp_branch)
5889 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
5890 5ef14e63 2019-06-02 stsp if (worktree)
5891 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
5893 5ef14e63 2019-06-02 stsp got_repo_close(repo);
5894 5ef14e63 2019-06-02 stsp return error;
5897 0ebf8283 2019-07-24 stsp __dead static void
5898 0ebf8283 2019-07-24 stsp usage_histedit(void)
5900 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
5901 0ebf8283 2019-07-24 stsp getprogname());
5905 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
5906 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
5907 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
5908 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
5909 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
5911 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
5912 0ebf8283 2019-07-24 stsp unsigned char code;
5913 0ebf8283 2019-07-24 stsp const char *name;
5914 0ebf8283 2019-07-24 stsp const char *desc;
5915 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
5916 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
5917 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5918 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
5919 82997472 2020-01-29 stsp "be used" },
5920 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5921 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
5922 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
5925 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
5926 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
5927 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
5928 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
5929 0ebf8283 2019-07-24 stsp char *logmsg;
5931 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5933 0ebf8283 2019-07-24 stsp static const struct got_error *
5934 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5935 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
5937 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5938 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
5939 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
5942 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5944 0ebf8283 2019-07-24 stsp goto done;
5946 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
5948 0ebf8283 2019-07-24 stsp goto done;
5950 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
5952 0ebf8283 2019-07-24 stsp goto done;
5954 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5955 0ebf8283 2019-07-24 stsp if (n < 0)
5956 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
5958 0ebf8283 2019-07-24 stsp if (commit)
5959 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
5960 0ebf8283 2019-07-24 stsp free(id_str);
5961 0ebf8283 2019-07-24 stsp free(logmsg);
5962 0ebf8283 2019-07-24 stsp return err;
5965 0ebf8283 2019-07-24 stsp static const struct got_error *
5966 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
5967 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
5969 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5970 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
5972 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
5973 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
5975 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
5976 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5980 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
5981 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
5982 083957f4 2020-02-24 stsp if (n < 0) {
5983 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
5989 0ebf8283 2019-07-24 stsp return err;
5992 0ebf8283 2019-07-24 stsp static const struct got_error *
5993 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
5994 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
5996 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5998 514f2ffe 2020-01-29 stsp char *id_str;
5999 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
6001 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
6002 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
6004 514f2ffe 2020-01-29 stsp return err;
6006 514f2ffe 2020-01-29 stsp n = fprintf(f,
6007 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
6008 514f2ffe 2020-01-29 stsp "# commit %s\n"
6009 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
6010 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
6011 514f2ffe 2020-01-29 stsp if (n < 0) {
6012 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6013 514f2ffe 2020-01-29 stsp goto done;
6016 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
6017 514f2ffe 2020-01-29 stsp if (n < 0) {
6018 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
6019 514f2ffe 2020-01-29 stsp goto done;
6022 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6023 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
6024 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
6025 0ebf8283 2019-07-24 stsp cmd->desc);
6026 0ebf8283 2019-07-24 stsp if (n < 0) {
6027 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6032 514f2ffe 2020-01-29 stsp free(id_str);
6033 0ebf8283 2019-07-24 stsp return err;
6036 0ebf8283 2019-07-24 stsp static const struct got_error *
6037 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
6039 0ebf8283 2019-07-24 stsp static char msg[42];
6042 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
6044 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
6045 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
6047 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
6050 0ebf8283 2019-07-24 stsp static const struct got_error *
6051 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
6052 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
6054 0ebf8283 2019-07-24 stsp const struct got_error *err;
6055 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
6056 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
6058 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6060 0ebf8283 2019-07-24 stsp return err;
6062 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
6064 0ebf8283 2019-07-24 stsp goto done;
6066 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
6068 5943eee2 2019-08-13 stsp goto done;
6069 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
6070 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
6071 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
6072 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
6075 0ebf8283 2019-07-24 stsp if (folded_commit)
6076 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
6077 0ebf8283 2019-07-24 stsp free(id_str);
6078 5943eee2 2019-08-13 stsp free(folded_logmsg);
6079 0ebf8283 2019-07-24 stsp return err;
6082 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
6083 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
6085 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
6087 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
6088 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
6089 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
6090 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
6091 3f9de99f 2019-07-24 stsp folded = prev;
6092 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
6095 0ebf8283 2019-07-24 stsp return folded;
6098 0ebf8283 2019-07-24 stsp static const struct got_error *
6099 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
6100 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6102 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
6103 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
6104 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6105 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6107 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
6109 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6111 0ebf8283 2019-07-24 stsp return err;
6113 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
6114 0ebf8283 2019-07-24 stsp if (folded) {
6115 0ebf8283 2019-07-24 stsp while (folded != hle) {
6116 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
6117 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
6120 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
6121 0ebf8283 2019-07-24 stsp logmsg, repo);
6123 0ebf8283 2019-07-24 stsp goto done;
6124 0ebf8283 2019-07-24 stsp free(logmsg);
6125 0ebf8283 2019-07-24 stsp logmsg = new_msg;
6126 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
6130 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6132 0ebf8283 2019-07-24 stsp goto done;
6133 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
6135 5943eee2 2019-08-13 stsp goto done;
6136 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
6137 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
6138 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
6139 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
6140 0ebf8283 2019-07-24 stsp goto done;
6142 0ebf8283 2019-07-24 stsp free(logmsg);
6143 0ebf8283 2019-07-24 stsp logmsg = new_msg;
6145 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
6147 0ebf8283 2019-07-24 stsp goto done;
6149 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
6150 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
6152 0ebf8283 2019-07-24 stsp goto done;
6154 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
6155 0ebf8283 2019-07-24 stsp close(fd);
6157 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6159 0ebf8283 2019-07-24 stsp goto done;
6161 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
6162 0ebf8283 2019-07-24 stsp if (err) {
6163 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
6164 0ebf8283 2019-07-24 stsp goto done;
6165 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
6168 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
6169 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
6170 0ebf8283 2019-07-24 stsp free(logmsg_path);
6171 0ebf8283 2019-07-24 stsp free(logmsg);
6172 5943eee2 2019-08-13 stsp free(orig_logmsg);
6173 0ebf8283 2019-07-24 stsp free(editor);
6174 0ebf8283 2019-07-24 stsp if (commit)
6175 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6176 0ebf8283 2019-07-24 stsp return err;
6179 0ebf8283 2019-07-24 stsp static const struct got_error *
6180 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
6181 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
6183 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6184 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
6185 0ebf8283 2019-07-24 stsp size_t size;
6186 0ebf8283 2019-07-24 stsp ssize_t len;
6187 0ebf8283 2019-07-24 stsp int lineno = 0, i;
6188 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
6189 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6190 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
6192 0ebf8283 2019-07-24 stsp for (;;) {
6193 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
6194 0ebf8283 2019-07-24 stsp if (len == -1) {
6195 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
6196 0ebf8283 2019-07-24 stsp if (feof(f))
6198 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
6199 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
6204 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6206 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
6207 0ebf8283 2019-07-24 stsp free(line);
6208 0ebf8283 2019-07-24 stsp line = NULL;
6211 0ebf8283 2019-07-24 stsp cmd = NULL;
6212 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
6213 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
6214 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
6215 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
6216 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
6219 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
6224 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
6225 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6228 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
6230 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
6231 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
6232 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
6235 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
6236 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6240 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
6241 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
6242 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6246 0ebf8283 2019-07-24 stsp free(line);
6247 0ebf8283 2019-07-24 stsp line = NULL;
6251 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
6253 0ebf8283 2019-07-24 stsp *end = '\0';
6255 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
6256 0ebf8283 2019-07-24 stsp if (err) {
6257 0ebf8283 2019-07-24 stsp /* override error code */
6258 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
6262 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
6263 0ebf8283 2019-07-24 stsp if (hle == NULL) {
6264 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
6267 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
6268 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
6269 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
6270 0ebf8283 2019-07-24 stsp commit_id = NULL;
6271 0ebf8283 2019-07-24 stsp free(line);
6272 0ebf8283 2019-07-24 stsp line = NULL;
6273 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6276 0ebf8283 2019-07-24 stsp free(line);
6277 0ebf8283 2019-07-24 stsp free(commit_id);
6278 0ebf8283 2019-07-24 stsp return err;
6281 0ebf8283 2019-07-24 stsp static const struct got_error *
6282 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
6283 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
6285 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
6286 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
6287 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6288 5b87815e 2020-03-05 stsp static char msg[92];
6289 bfce7f83 2019-07-27 stsp char *id_str;
6291 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
6292 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6293 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
6294 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
6295 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
6297 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6298 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
6299 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
6300 5b87815e 2020-03-05 stsp if (hle == hle2)
6302 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
6303 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
6305 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
6307 5b87815e 2020-03-05 stsp return err;
6308 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
6309 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
6310 5b87815e 2020-03-05 stsp free(id_str);
6311 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6315 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
6316 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6317 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6320 bfce7f83 2019-07-27 stsp if (hle == NULL) {
6321 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
6323 bfce7f83 2019-07-27 stsp return err;
6324 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
6325 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
6326 bfce7f83 2019-07-27 stsp free(id_str);
6327 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6331 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6332 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6333 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6334 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
6336 bfce7f83 2019-07-27 stsp return NULL;
6339 bfce7f83 2019-07-27 stsp static const struct got_error *
6340 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
6341 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
6342 bfce7f83 2019-07-27 stsp struct got_repository *repo)
6344 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6345 0ebf8283 2019-07-24 stsp char *editor;
6346 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6348 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
6350 0ebf8283 2019-07-24 stsp return err;
6352 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
6353 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
6354 0ebf8283 2019-07-24 stsp goto done;
6357 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6358 0ebf8283 2019-07-24 stsp if (f == NULL) {
6359 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
6360 0ebf8283 2019-07-24 stsp goto done;
6362 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6364 bfce7f83 2019-07-27 stsp goto done;
6366 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
6368 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6369 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6370 0ebf8283 2019-07-24 stsp free(editor);
6371 0ebf8283 2019-07-24 stsp return err;
6374 0ebf8283 2019-07-24 stsp static const struct got_error *
6375 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6376 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
6377 514f2ffe 2020-01-29 stsp struct got_repository *);
6379 0ebf8283 2019-07-24 stsp static const struct got_error *
6380 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
6381 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
6382 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
6384 0ebf8283 2019-07-24 stsp const struct got_error *err;
6385 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6386 0ebf8283 2019-07-24 stsp char *path = NULL;
6388 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
6390 0ebf8283 2019-07-24 stsp return err;
6392 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
6394 0ebf8283 2019-07-24 stsp goto done;
6396 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
6398 0ebf8283 2019-07-24 stsp goto done;
6400 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
6401 083957f4 2020-02-24 stsp rewind(f);
6402 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6404 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
6405 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
6406 0ebf8283 2019-07-24 stsp goto done;
6409 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
6410 083957f4 2020-02-24 stsp if (err) {
6411 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6412 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6413 083957f4 2020-02-24 stsp goto done;
6414 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
6415 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
6419 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6420 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6421 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
6422 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
6423 0ebf8283 2019-07-24 stsp free(path);
6424 0ebf8283 2019-07-24 stsp return err;
6427 0ebf8283 2019-07-24 stsp static const struct got_error *
6428 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
6429 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6431 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6432 0ebf8283 2019-07-24 stsp char *path = NULL;
6433 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6434 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6435 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6437 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
6439 0ebf8283 2019-07-24 stsp return err;
6441 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
6442 0ebf8283 2019-07-24 stsp if (f == NULL) {
6443 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6444 0ebf8283 2019-07-24 stsp goto done;
6446 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
6447 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6452 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6453 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
6454 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
6455 0ebf8283 2019-07-24 stsp if (n < 0) {
6456 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
6462 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6463 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6464 0ebf8283 2019-07-24 stsp free(path);
6465 0ebf8283 2019-07-24 stsp if (commit)
6466 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6467 0ebf8283 2019-07-24 stsp return err;
6471 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
6473 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
6475 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
6476 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
6477 bfce7f83 2019-07-27 stsp free(hle);
6481 0ebf8283 2019-07-24 stsp static const struct got_error *
6482 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
6483 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
6485 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6486 0ebf8283 2019-07-24 stsp FILE *f = NULL;
6488 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
6489 0ebf8283 2019-07-24 stsp if (f == NULL) {
6490 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
6491 0ebf8283 2019-07-24 stsp goto done;
6494 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
6496 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
6497 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
6498 0ebf8283 2019-07-24 stsp return err;
6501 0ebf8283 2019-07-24 stsp static const struct got_error *
6502 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6503 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
6504 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
6506 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
6507 0ebf8283 2019-07-24 stsp int resp = ' ';
6509 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
6510 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6511 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
6512 0ebf8283 2019-07-24 stsp resp = getchar();
6513 a61a4414 2019-08-07 stsp if (resp == '\n')
6514 a61a4414 2019-08-07 stsp resp = getchar();
6515 426ebf2e 2019-07-25 stsp if (resp == 'c') {
6516 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6517 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
6519 426ebf2e 2019-07-25 stsp if (err) {
6520 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6521 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6523 bfce7f83 2019-07-27 stsp prev_err = err;
6524 426ebf2e 2019-07-25 stsp resp = ' ';
6528 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
6529 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
6530 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
6531 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
6532 426ebf2e 2019-07-25 stsp if (err) {
6533 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6534 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
6536 bfce7f83 2019-07-27 stsp prev_err = err;
6537 426ebf2e 2019-07-25 stsp resp = ' ';
6541 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
6542 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6545 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
6548 0ebf8283 2019-07-24 stsp return err;
6551 0ebf8283 2019-07-24 stsp static const struct got_error *
6552 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
6553 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6554 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
6556 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6557 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6558 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6559 3e3a69f1 2019-07-25 stsp branch, repo);
6562 0ebf8283 2019-07-24 stsp static const struct got_error *
6563 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
6564 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6566 0ebf8283 2019-07-24 stsp const struct got_error *err;
6567 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6569 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
6571 0ebf8283 2019-07-24 stsp goto done;
6573 0ebf8283 2019-07-24 stsp if (new_id) {
6574 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
6576 0ebf8283 2019-07-24 stsp goto done;
6579 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
6580 0ebf8283 2019-07-24 stsp if (new_id_str)
6581 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
6583 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
6584 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
6585 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
6586 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
6587 0ebf8283 2019-07-24 stsp goto done;
6589 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
6591 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6593 0ebf8283 2019-07-24 stsp goto done;
6596 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
6597 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
6598 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
6599 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
6600 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6602 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
6603 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
6604 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6611 0ebf8283 2019-07-24 stsp free(old_id_str);
6612 0ebf8283 2019-07-24 stsp free(new_id_str);
6613 0ebf8283 2019-07-24 stsp return err;
6616 0ebf8283 2019-07-24 stsp static const struct got_error *
6617 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
6618 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6619 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6620 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6622 0ebf8283 2019-07-24 stsp const struct got_error *err;
6623 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6624 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
6626 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6627 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
6628 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
6630 0ebf8283 2019-07-24 stsp return err;
6633 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6635 0ebf8283 2019-07-24 stsp return err;
6637 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6638 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
6639 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
6640 0ebf8283 2019-07-24 stsp if (err) {
6641 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6642 0ebf8283 2019-07-24 stsp goto done;
6643 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
6645 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
6646 0ebf8283 2019-07-24 stsp free(new_commit_id);
6649 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6650 0ebf8283 2019-07-24 stsp return err;
6653 0ebf8283 2019-07-24 stsp static const struct got_error *
6654 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
6655 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6657 0ebf8283 2019-07-24 stsp const struct got_error *error;
6658 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
6660 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6662 0ebf8283 2019-07-24 stsp if (error)
6663 0ebf8283 2019-07-24 stsp return error;
6665 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6666 0ebf8283 2019-07-24 stsp if (error)
6667 0ebf8283 2019-07-24 stsp return error;
6669 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
6670 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6671 0ebf8283 2019-07-24 stsp return error;
6674 ab20a43a 2020-01-29 stsp static const struct got_error *
6675 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
6676 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
6677 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6678 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6680 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
6682 ab20a43a 2020-01-29 stsp switch (status) {
6683 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6684 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6685 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6686 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
6687 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6688 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6693 ab20a43a 2020-01-29 stsp switch (staged_status) {
6694 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
6695 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
6696 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
6697 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
6698 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
6703 ab20a43a 2020-01-29 stsp return NULL;
6706 0ebf8283 2019-07-24 stsp static const struct got_error *
6707 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
6709 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
6710 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
6711 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6712 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
6713 0ebf8283 2019-07-24 stsp char *cwd = NULL;
6714 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
6715 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
6716 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
6717 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
6718 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
6719 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
6720 6ba2bea2 2019-07-27 stsp int ch, rebase_in_progress = 0, did_something;
6721 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6722 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
6723 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
6724 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6725 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
6726 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
6727 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
6728 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
6729 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
6730 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
6732 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
6733 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
6734 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
6736 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
6737 0ebf8283 2019-07-24 stsp switch (ch) {
6739 0ebf8283 2019-07-24 stsp abort_edit = 1;
6742 0ebf8283 2019-07-24 stsp continue_edit = 1;
6745 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
6748 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
6751 0ebf8283 2019-07-24 stsp usage_histedit();
6752 0ebf8283 2019-07-24 stsp /* NOTREACHED */
6756 0ebf8283 2019-07-24 stsp argc -= optind;
6757 0ebf8283 2019-07-24 stsp argv += optind;
6759 0ebf8283 2019-07-24 stsp #ifndef PROFILE
6760 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6761 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
6762 0ebf8283 2019-07-24 stsp err(1, "pledge");
6764 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
6765 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
6766 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
6767 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
6768 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
6769 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
6770 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
6771 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
6772 0ebf8283 2019-07-24 stsp if (argc != 0)
6773 0ebf8283 2019-07-24 stsp usage_histedit();
6776 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
6777 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
6778 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
6779 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
6780 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
6781 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
6784 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
6785 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
6786 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
6787 0ebf8283 2019-07-24 stsp goto done;
6789 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
6790 0ebf8283 2019-07-24 stsp if (error)
6791 0ebf8283 2019-07-24 stsp goto done;
6793 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6795 0ebf8283 2019-07-24 stsp if (error != NULL)
6796 0ebf8283 2019-07-24 stsp goto done;
6798 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6799 0ebf8283 2019-07-24 stsp if (error)
6800 0ebf8283 2019-07-24 stsp goto done;
6801 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
6802 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
6803 0ebf8283 2019-07-24 stsp goto done;
6806 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6807 0ebf8283 2019-07-24 stsp if (error)
6808 0ebf8283 2019-07-24 stsp goto done;
6810 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
6811 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
6812 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
6813 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
6814 083957f4 2020-02-24 stsp "before the -m option can be used");
6815 083957f4 2020-02-24 stsp goto done;
6818 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
6819 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6820 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6821 3e3a69f1 2019-07-25 stsp worktree, repo);
6822 0ebf8283 2019-07-24 stsp if (error)
6823 0ebf8283 2019-07-24 stsp goto done;
6824 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
6825 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6826 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
6827 0ebf8283 2019-07-24 stsp branch, base_commit_id, update_progress, &did_something);
6828 0ebf8283 2019-07-24 stsp if (error)
6829 0ebf8283 2019-07-24 stsp goto done;
6830 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
6831 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
6832 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
6833 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
6834 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6835 0ebf8283 2019-07-24 stsp goto done;
6838 0ebf8283 2019-07-24 stsp if (continue_edit) {
6839 0ebf8283 2019-07-24 stsp char *path;
6841 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
6842 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
6843 0ebf8283 2019-07-24 stsp goto done;
6846 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
6847 0ebf8283 2019-07-24 stsp if (error)
6848 0ebf8283 2019-07-24 stsp goto done;
6850 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
6851 0ebf8283 2019-07-24 stsp free(path);
6852 0ebf8283 2019-07-24 stsp if (error)
6853 0ebf8283 2019-07-24 stsp goto done;
6855 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
6856 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
6857 3e3a69f1 2019-07-25 stsp worktree, repo);
6858 0ebf8283 2019-07-24 stsp if (error)
6859 0ebf8283 2019-07-24 stsp goto done;
6861 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6862 0ebf8283 2019-07-24 stsp if (error)
6863 0ebf8283 2019-07-24 stsp goto done;
6865 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
6866 0ebf8283 2019-07-24 stsp head_commit_id);
6867 0ebf8283 2019-07-24 stsp if (error)
6868 0ebf8283 2019-07-24 stsp goto done;
6869 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
6870 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
6871 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
6872 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6873 3aac7cf7 2019-07-25 stsp goto done;
6875 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
6876 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
6877 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6878 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6879 0ebf8283 2019-07-24 stsp commit = NULL;
6880 0ebf8283 2019-07-24 stsp if (error)
6881 0ebf8283 2019-07-24 stsp goto done;
6883 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
6884 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6885 0ebf8283 2019-07-24 stsp goto done;
6888 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
6889 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
6890 0ebf8283 2019-07-24 stsp if (error != NULL)
6891 0ebf8283 2019-07-24 stsp goto done;
6893 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6894 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6895 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
6896 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
6897 c7d20a3f 2019-07-30 stsp goto done;
6900 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
6901 bfce7f83 2019-07-27 stsp got_ref_close(branch);
6902 bfce7f83 2019-07-27 stsp branch = NULL;
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 got_worktree_get_base_commit_id(worktree),
6918 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
6919 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
6920 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
6921 0ebf8283 2019-07-24 stsp commit = NULL;
6922 0ebf8283 2019-07-24 stsp if (error)
6923 0ebf8283 2019-07-24 stsp goto done;
6925 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
6926 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6927 c5996fff 2020-01-29 stsp goto done;
6930 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6931 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
6932 bfce7f83 2019-07-27 stsp if (error)
6933 bfce7f83 2019-07-27 stsp goto done;
6935 0ebf8283 2019-07-24 stsp if (edit_script_path) {
6936 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
6937 0ebf8283 2019-07-24 stsp edit_script_path, repo);
6938 6ba2bea2 2019-07-27 stsp if (error) {
6939 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6940 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6941 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6942 0ebf8283 2019-07-24 stsp goto done;
6945 514f2ffe 2020-01-29 stsp const char *branch_name;
6946 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
6947 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
6948 514f2ffe 2020-01-29 stsp branch_name += 11;
6949 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
6950 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
6951 6ba2bea2 2019-07-27 stsp if (error) {
6952 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6953 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6954 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6955 0ebf8283 2019-07-24 stsp goto done;
6960 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
6962 6ba2bea2 2019-07-27 stsp if (error) {
6963 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
6964 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
6965 6ba2bea2 2019-07-27 stsp update_progress, &did_something);
6966 0ebf8283 2019-07-24 stsp goto done;
6971 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
6972 4ec14e60 2019-08-28 hiltjo if (error)
6973 0ebf8283 2019-07-24 stsp goto done;
6975 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6976 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
6977 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
6978 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
6981 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
6982 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6983 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
6984 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
6986 ab20a43a 2020-01-29 stsp if (error)
6987 ab20a43a 2020-01-29 stsp goto done;
6989 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
6990 ab20a43a 2020-01-29 stsp int have_changes = 0;
6992 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
6993 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
6994 ab20a43a 2020-01-29 stsp if (error)
6995 ab20a43a 2020-01-29 stsp goto done;
6996 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
6997 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
6998 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
6999 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
7000 ab20a43a 2020-01-29 stsp if (error) {
7001 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
7002 ab20a43a 2020-01-29 stsp goto done;
7003 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
7004 ab20a43a 2020-01-29 stsp goto done;
7006 ab20a43a 2020-01-29 stsp if (have_changes) {
7007 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
7008 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
7009 ab20a43a 2020-01-29 stsp if (error)
7010 ab20a43a 2020-01-29 stsp goto done;
7012 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
7013 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
7014 ab20a43a 2020-01-29 stsp if (error)
7015 ab20a43a 2020-01-29 stsp goto done;
7016 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
7017 ab20a43a 2020-01-29 stsp hle, NULL);
7018 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
7019 ab20a43a 2020-01-29 stsp commit = NULL;
7020 ab20a43a 2020-01-29 stsp if (error)
7021 ab20a43a 2020-01-29 stsp goto done;
7027 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
7028 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7029 0ebf8283 2019-07-24 stsp if (error)
7030 0ebf8283 2019-07-24 stsp goto done;
7034 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
7035 0ebf8283 2019-07-24 stsp hle->commit_id);
7036 0ebf8283 2019-07-24 stsp if (error)
7037 0ebf8283 2019-07-24 stsp goto done;
7038 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7039 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
7041 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
7042 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
7043 3e3a69f1 2019-07-25 stsp rebase_progress, &rebase_status, check_cancelled, NULL);
7044 0ebf8283 2019-07-24 stsp if (error)
7045 0ebf8283 2019-07-24 stsp goto done;
7046 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7047 0ebf8283 2019-07-24 stsp commit = NULL;
7049 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7050 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
7052 a0ea4fc0 2020-02-28 stsp if (error)
7053 a0ea4fc0 2020-02-28 stsp goto done;
7054 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7058 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
7059 0ebf8283 2019-07-24 stsp char *id_str;
7060 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
7061 0ebf8283 2019-07-24 stsp if (error)
7062 0ebf8283 2019-07-24 stsp goto done;
7063 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
7065 0ebf8283 2019-07-24 stsp free(id_str);
7066 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7067 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
7068 3e3a69f1 2019-07-25 stsp fileindex);
7069 0ebf8283 2019-07-24 stsp goto done;
7072 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
7073 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
7074 0ebf8283 2019-07-24 stsp if (error)
7075 0ebf8283 2019-07-24 stsp goto done;
7079 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
7080 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
7081 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7082 0ebf8283 2019-07-24 stsp if (error)
7083 0ebf8283 2019-07-24 stsp goto done;
7086 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7087 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
7088 0ebf8283 2019-07-24 stsp if (error)
7089 0ebf8283 2019-07-24 stsp goto done;
7090 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7091 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
7093 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
7094 3e3a69f1 2019-07-25 stsp branch, repo);
7096 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
7097 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
7098 0ebf8283 2019-07-24 stsp free(head_commit_id);
7099 0ebf8283 2019-07-24 stsp free(base_commit_id);
7100 0ebf8283 2019-07-24 stsp free(resume_commit_id);
7101 0ebf8283 2019-07-24 stsp if (commit)
7102 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7103 0ebf8283 2019-07-24 stsp if (branch)
7104 0ebf8283 2019-07-24 stsp got_ref_close(branch);
7105 0ebf8283 2019-07-24 stsp if (tmp_branch)
7106 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
7107 0ebf8283 2019-07-24 stsp if (worktree)
7108 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
7110 2822a352 2019-10-15 stsp got_repo_close(repo);
7111 2822a352 2019-10-15 stsp return error;
7114 2822a352 2019-10-15 stsp __dead static void
7115 2822a352 2019-10-15 stsp usage_integrate(void)
7117 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
7121 2822a352 2019-10-15 stsp static const struct got_error *
7122 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
7124 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
7125 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
7126 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
7127 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
7128 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
7129 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
7130 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
7131 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
7132 2822a352 2019-10-15 stsp int ch, did_something = 0;
7134 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
7135 2822a352 2019-10-15 stsp switch (ch) {
7137 2822a352 2019-10-15 stsp usage_integrate();
7138 2822a352 2019-10-15 stsp /* NOTREACHED */
7142 2822a352 2019-10-15 stsp argc -= optind;
7143 2822a352 2019-10-15 stsp argv += optind;
7145 2822a352 2019-10-15 stsp if (argc != 1)
7146 2822a352 2019-10-15 stsp usage_integrate();
7147 2822a352 2019-10-15 stsp branch_arg = argv[0];
7149 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7150 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
7151 2822a352 2019-10-15 stsp err(1, "pledge");
7153 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
7154 2822a352 2019-10-15 stsp if (cwd == NULL) {
7155 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
7156 2822a352 2019-10-15 stsp goto done;
7159 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
7160 2822a352 2019-10-15 stsp if (error)
7161 2822a352 2019-10-15 stsp goto done;
7163 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
7164 2822a352 2019-10-15 stsp if (error)
7165 2822a352 2019-10-15 stsp goto done;
7167 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7169 2822a352 2019-10-15 stsp if (error != NULL)
7170 2822a352 2019-10-15 stsp goto done;
7172 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7173 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
7174 2822a352 2019-10-15 stsp if (error)
7175 2822a352 2019-10-15 stsp goto done;
7177 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
7178 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
7179 2822a352 2019-10-15 stsp goto done;
7182 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
7183 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
7184 2822a352 2019-10-15 stsp if (error)
7185 2822a352 2019-10-15 stsp goto done;
7187 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
7188 2822a352 2019-10-15 stsp if (refname == NULL) {
7189 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
7190 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7191 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7192 2822a352 2019-10-15 stsp goto done;
7194 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
7195 2822a352 2019-10-15 stsp if (base_refname == NULL) {
7196 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
7197 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7198 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7199 2822a352 2019-10-15 stsp goto done;
7202 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
7203 2822a352 2019-10-15 stsp if (error)
7204 2822a352 2019-10-15 stsp goto done;
7206 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
7207 2822a352 2019-10-15 stsp if (error)
7208 2822a352 2019-10-15 stsp goto done;
7210 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
7211 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7212 2822a352 2019-10-15 stsp "specified branch has already been integrated");
7213 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7214 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7215 2822a352 2019-10-15 stsp goto done;
7218 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
7219 2822a352 2019-10-15 stsp if (error) {
7220 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
7221 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
7222 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
7223 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
7224 2822a352 2019-10-15 stsp goto done;
7227 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
7228 2822a352 2019-10-15 stsp branch_ref, base_branch_ref, update_progress, &did_something,
7229 2822a352 2019-10-15 stsp check_cancelled, NULL);
7230 2822a352 2019-10-15 stsp if (error)
7231 2822a352 2019-10-15 stsp goto done;
7233 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
7236 715dc77e 2019-08-03 stsp got_repo_close(repo);
7237 2822a352 2019-10-15 stsp if (worktree)
7238 2822a352 2019-10-15 stsp got_worktree_close(worktree);
7239 2822a352 2019-10-15 stsp free(cwd);
7240 2822a352 2019-10-15 stsp free(base_commit_id);
7241 2822a352 2019-10-15 stsp free(commit_id);
7242 2822a352 2019-10-15 stsp free(refname);
7243 2822a352 2019-10-15 stsp free(base_refname);
7244 715dc77e 2019-08-03 stsp return error;
7247 715dc77e 2019-08-03 stsp __dead static void
7248 715dc77e 2019-08-03 stsp usage_stage(void)
7250 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
7251 f3055044 2019-08-07 stsp "[file-path ...]\n",
7252 715dc77e 2019-08-03 stsp getprogname());
7256 715dc77e 2019-08-03 stsp static const struct got_error *
7257 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
7258 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
7259 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
7260 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
7262 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
7263 408b4ebc 2019-08-03 stsp char *id_str = NULL;
7265 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
7266 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
7267 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
7268 408b4ebc 2019-08-03 stsp return NULL;
7270 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
7271 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
7272 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
7274 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
7276 408b4ebc 2019-08-03 stsp return err;
7278 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
7279 408b4ebc 2019-08-03 stsp free(id_str);
7280 dc424a06 2019-08-07 stsp return NULL;
7283 dc424a06 2019-08-07 stsp static const struct got_error *
7284 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
7286 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
7287 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
7288 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
7289 715dc77e 2019-08-03 stsp char *cwd = NULL;
7290 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
7291 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
7292 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
7293 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
7294 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7295 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7297 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
7299 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
7300 715dc77e 2019-08-03 stsp switch (ch) {
7302 408b4ebc 2019-08-03 stsp list_stage = 1;
7305 dc424a06 2019-08-07 stsp pflag = 1;
7308 dc424a06 2019-08-07 stsp patch_script_path = optarg;
7311 715dc77e 2019-08-03 stsp usage_stage();
7312 715dc77e 2019-08-03 stsp /* NOTREACHED */
7316 715dc77e 2019-08-03 stsp argc -= optind;
7317 715dc77e 2019-08-03 stsp argv += optind;
7319 715dc77e 2019-08-03 stsp #ifndef PROFILE
7320 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7321 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
7322 715dc77e 2019-08-03 stsp err(1, "pledge");
7324 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
7325 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
7326 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
7327 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
7329 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
7330 715dc77e 2019-08-03 stsp if (cwd == NULL) {
7331 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
7332 715dc77e 2019-08-03 stsp goto done;
7335 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7336 715dc77e 2019-08-03 stsp if (error)
7337 715dc77e 2019-08-03 stsp goto done;
7339 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7341 715dc77e 2019-08-03 stsp if (error != NULL)
7342 715dc77e 2019-08-03 stsp goto done;
7344 dc424a06 2019-08-07 stsp if (patch_script_path) {
7345 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
7346 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
7347 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
7348 dc424a06 2019-08-07 stsp patch_script_path);
7349 dc424a06 2019-08-07 stsp goto done;
7352 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7353 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
7354 715dc77e 2019-08-03 stsp if (error)
7355 715dc77e 2019-08-03 stsp goto done;
7357 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7358 6d022e97 2019-08-04 stsp if (error)
7359 6d022e97 2019-08-04 stsp goto done;
7361 6d022e97 2019-08-04 stsp if (list_stage)
7362 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
7363 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
7365 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7366 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
7367 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
7368 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
7369 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
7372 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7373 2e1f37b0 2019-08-08 stsp error == NULL)
7374 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7376 ad493afc 2019-08-03 stsp got_repo_close(repo);
7377 ad493afc 2019-08-03 stsp if (worktree)
7378 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
7379 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7380 ad493afc 2019-08-03 stsp free((char *)pe->path);
7381 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
7382 ad493afc 2019-08-03 stsp free(cwd);
7383 ad493afc 2019-08-03 stsp return error;
7386 ad493afc 2019-08-03 stsp __dead static void
7387 ad493afc 2019-08-03 stsp usage_unstage(void)
7389 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7390 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
7391 ad493afc 2019-08-03 stsp getprogname());
7396 ad493afc 2019-08-03 stsp static const struct got_error *
7397 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
7399 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
7400 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
7401 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
7402 ad493afc 2019-08-03 stsp char *cwd = NULL;
7403 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
7404 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7405 2e1f37b0 2019-08-08 stsp int ch, did_something = 0, pflag = 0;
7406 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
7407 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
7408 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
7410 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
7412 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
7413 ad493afc 2019-08-03 stsp switch (ch) {
7415 2e1f37b0 2019-08-08 stsp pflag = 1;
7418 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
7421 ad493afc 2019-08-03 stsp usage_unstage();
7422 ad493afc 2019-08-03 stsp /* NOTREACHED */
7426 ad493afc 2019-08-03 stsp argc -= optind;
7427 ad493afc 2019-08-03 stsp argv += optind;
7429 ad493afc 2019-08-03 stsp #ifndef PROFILE
7430 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7431 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
7432 ad493afc 2019-08-03 stsp err(1, "pledge");
7434 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
7435 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
7437 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
7438 ad493afc 2019-08-03 stsp if (cwd == NULL) {
7439 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
7440 ad493afc 2019-08-03 stsp goto done;
7443 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
7444 ad493afc 2019-08-03 stsp if (error)
7445 ad493afc 2019-08-03 stsp goto done;
7447 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7449 ad493afc 2019-08-03 stsp if (error != NULL)
7450 ad493afc 2019-08-03 stsp goto done;
7452 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
7453 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
7454 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
7455 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
7456 2e1f37b0 2019-08-08 stsp patch_script_path);
7457 2e1f37b0 2019-08-08 stsp goto done;
7461 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
7462 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
7463 ad493afc 2019-08-03 stsp if (error)
7464 ad493afc 2019-08-03 stsp goto done;
7466 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7467 ad493afc 2019-08-03 stsp if (error)
7468 ad493afc 2019-08-03 stsp goto done;
7470 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
7471 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
7472 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
7473 2e1f37b0 2019-08-08 stsp &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7475 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
7476 2e1f37b0 2019-08-08 stsp error == NULL)
7477 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
7479 0ebf8283 2019-07-24 stsp got_repo_close(repo);
7480 715dc77e 2019-08-03 stsp if (worktree)
7481 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
7482 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
7483 715dc77e 2019-08-03 stsp free((char *)pe->path);
7484 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
7485 715dc77e 2019-08-03 stsp free(cwd);
7486 01073a5d 2019-08-22 stsp return error;
7489 01073a5d 2019-08-22 stsp __dead static void
7490 01073a5d 2019-08-22 stsp usage_cat(void)
7492 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7493 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
7497 01073a5d 2019-08-22 stsp static const struct got_error *
7498 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7500 01073a5d 2019-08-22 stsp const struct got_error *err;
7501 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
7503 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
7505 01073a5d 2019-08-22 stsp return err;
7507 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7508 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
7509 01073a5d 2019-08-22 stsp return err;
7512 01073a5d 2019-08-22 stsp static const struct got_error *
7513 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7515 01073a5d 2019-08-22 stsp const struct got_error *err;
7516 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
7517 56e0773d 2019-11-28 stsp int nentries, i;
7519 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
7521 01073a5d 2019-08-22 stsp return err;
7523 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
7524 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
7525 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
7526 01073a5d 2019-08-22 stsp char *id_str;
7527 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
7529 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
7530 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7533 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
7534 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
7535 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
7536 01073a5d 2019-08-22 stsp free(id_str);
7539 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
7540 01073a5d 2019-08-22 stsp return err;
7543 01073a5d 2019-08-22 stsp static const struct got_error *
7544 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7546 01073a5d 2019-08-22 stsp const struct got_error *err;
7547 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
7548 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
7549 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
7550 01073a5d 2019-08-22 stsp char *id_str = NULL;
7551 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
7553 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
7555 01073a5d 2019-08-22 stsp return err;
7557 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7559 01073a5d 2019-08-22 stsp goto done;
7561 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7562 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7563 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
7564 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
7565 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7566 01073a5d 2019-08-22 stsp char *pid_str;
7567 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
7569 01073a5d 2019-08-22 stsp goto done;
7570 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7571 01073a5d 2019-08-22 stsp free(pid_str);
7573 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7574 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7575 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
7577 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7578 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
7579 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
7581 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
7582 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7583 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
7585 01073a5d 2019-08-22 stsp free(id_str);
7586 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
7587 01073a5d 2019-08-22 stsp return err;
7590 01073a5d 2019-08-22 stsp static const struct got_error *
7591 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7593 01073a5d 2019-08-22 stsp const struct got_error *err;
7594 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
7595 01073a5d 2019-08-22 stsp char *id_str = NULL;
7596 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
7598 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
7600 01073a5d 2019-08-22 stsp return err;
7602 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7604 01073a5d 2019-08-22 stsp goto done;
7606 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7608 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
7609 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7610 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7611 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
7613 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7614 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7615 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
7617 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7618 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7619 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
7621 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7622 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7623 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
7629 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7630 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
7632 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7633 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
7634 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
7636 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
7637 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7638 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
7640 01073a5d 2019-08-22 stsp free(id_str);
7641 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
7642 01073a5d 2019-08-22 stsp return err;
7645 01073a5d 2019-08-22 stsp static const struct got_error *
7646 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
7648 01073a5d 2019-08-22 stsp const struct got_error *error;
7649 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
7650 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
7651 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
7652 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
7653 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
7654 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
7656 01073a5d 2019-08-22 stsp #ifndef PROFILE
7657 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7658 01073a5d 2019-08-22 stsp NULL) == -1)
7659 01073a5d 2019-08-22 stsp err(1, "pledge");
7662 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7663 01073a5d 2019-08-22 stsp switch (ch) {
7665 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
7668 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
7669 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7670 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
7672 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
7675 896e9b6f 2019-08-26 stsp force_path = 1;
7678 01073a5d 2019-08-22 stsp usage_cat();
7679 01073a5d 2019-08-22 stsp /* NOTREACHED */
7683 01073a5d 2019-08-22 stsp argc -= optind;
7684 01073a5d 2019-08-22 stsp argv += optind;
7686 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
7687 01073a5d 2019-08-22 stsp if (cwd == NULL) {
7688 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
7689 01073a5d 2019-08-22 stsp goto done;
7691 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
7692 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7693 01073a5d 2019-08-22 stsp goto done;
7694 01073a5d 2019-08-22 stsp if (worktree) {
7695 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7696 01073a5d 2019-08-22 stsp repo_path = strdup(
7697 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
7698 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7699 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
7700 01073a5d 2019-08-22 stsp goto done;
7705 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
7706 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
7707 01073a5d 2019-08-22 stsp if (repo_path == NULL)
7708 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
7711 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
7712 01073a5d 2019-08-22 stsp free(repo_path);
7713 01073a5d 2019-08-22 stsp if (error != NULL)
7714 01073a5d 2019-08-22 stsp goto done;
7716 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7717 896e9b6f 2019-08-26 stsp if (error)
7718 896e9b6f 2019-08-26 stsp goto done;
7720 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
7721 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
7722 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
7723 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7724 01073a5d 2019-08-22 stsp if (error)
7725 01073a5d 2019-08-22 stsp goto done;
7727 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
7728 896e9b6f 2019-08-26 stsp if (force_path) {
7729 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
7731 896e9b6f 2019-08-26 stsp if (error)
7734 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
7735 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
7736 896e9b6f 2019-08-26 stsp if (error) {
7737 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7738 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
7740 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
7741 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
7742 896e9b6f 2019-08-26 stsp if (error)
7747 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
7748 01073a5d 2019-08-22 stsp if (error)
7751 01073a5d 2019-08-22 stsp switch (obj_type) {
7752 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
7753 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
7755 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
7756 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
7758 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
7759 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
7761 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
7762 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
7765 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
7768 01073a5d 2019-08-22 stsp if (error)
7770 01073a5d 2019-08-22 stsp free(label);
7771 01073a5d 2019-08-22 stsp label = NULL;
7773 01073a5d 2019-08-22 stsp id = NULL;
7776 01073a5d 2019-08-22 stsp free(label);
7778 896e9b6f 2019-08-26 stsp free(commit_id);
7779 01073a5d 2019-08-22 stsp if (worktree)
7780 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
7781 01073a5d 2019-08-22 stsp if (repo) {
7782 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
7783 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
7784 01073a5d 2019-08-22 stsp if (error == NULL)
7785 01073a5d 2019-08-22 stsp error = repo_error;
7787 0ebf8283 2019-07-24 stsp return error;
