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 93658fb9 2020-03-18 stsp __dead static void usage_clone(void);
89 7848a0e1 2020-03-19 stsp __dead static void usage_fetch(void);
90 2ab43947 2020-03-18 stsp __dead static void usage_checkout(void);
91 507dc3bb 2018-12-29 stsp __dead static void usage_update(void);
92 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
93 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
94 404c43c4 2018-06-21 stsp __dead static void usage_blame(void);
95 5de5890b 2018-10-18 stsp __dead static void usage_tree(void);
96 6bad629b 2019-02-04 stsp __dead static void usage_status(void);
97 d0eebce4 2019-03-11 stsp __dead static void usage_ref(void);
98 4e759de4 2019-06-26 stsp __dead static void usage_branch(void);
99 8e7bd50a 2019-08-22 stsp __dead static void usage_tag(void);
100 d00136be 2019-03-26 stsp __dead static void usage_add(void);
101 648e4ef7 2019-07-09 stsp __dead static void usage_remove(void);
102 a129376b 2019-03-28 stsp __dead static void usage_revert(void);
103 c4296144 2019-05-09 stsp __dead static void usage_commit(void);
104 234035bc 2019-06-01 stsp __dead static void usage_cherrypick(void);
105 5ef14e63 2019-06-02 stsp __dead static void usage_backout(void);
106 818c7501 2019-07-11 stsp __dead static void usage_rebase(void);
107 0ebf8283 2019-07-24 stsp __dead static void usage_histedit(void);
108 2822a352 2019-10-15 stsp __dead static void usage_integrate(void);
109 715dc77e 2019-08-03 stsp __dead static void usage_stage(void);
110 ad493afc 2019-08-03 stsp __dead static void usage_unstage(void);
111 01073a5d 2019-08-22 stsp __dead static void usage_cat(void);
113 2c7829a4 2019-06-17 stsp static const struct got_error* cmd_init(int, char *[]);
114 3ce1b845 2019-07-15 stsp static const struct got_error* cmd_import(int, char *[]);
115 93658fb9 2020-03-18 stsp static const struct got_error* cmd_clone(int, char *[]);
116 7848a0e1 2020-03-19 stsp static const struct got_error* cmd_fetch(int, char *[]);
117 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
118 507dc3bb 2018-12-29 stsp static const struct got_error* cmd_update(int, char *[]);
119 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
120 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
121 404c43c4 2018-06-21 stsp static const struct got_error* cmd_blame(int, char *[]);
122 5de5890b 2018-10-18 stsp static const struct got_error* cmd_tree(int, char *[]);
123 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
124 d0eebce4 2019-03-11 stsp static const struct got_error* cmd_ref(int, char *[]);
125 4e759de4 2019-06-26 stsp static const struct got_error* cmd_branch(int, char *[]);
126 8e7bd50a 2019-08-22 stsp static const struct got_error* cmd_tag(int, char *[]);
127 d00136be 2019-03-26 stsp static const struct got_error* cmd_add(int, char *[]);
128 648e4ef7 2019-07-09 stsp static const struct got_error* cmd_remove(int, char *[]);
129 a129376b 2019-03-28 stsp static const struct got_error* cmd_revert(int, char *[]);
130 c4296144 2019-05-09 stsp static const struct got_error* cmd_commit(int, char *[]);
131 234035bc 2019-06-01 stsp static const struct got_error* cmd_cherrypick(int, char *[]);
132 5ef14e63 2019-06-02 stsp static const struct got_error* cmd_backout(int, char *[]);
133 818c7501 2019-07-11 stsp static const struct got_error* cmd_rebase(int, char *[]);
134 0ebf8283 2019-07-24 stsp static const struct got_error* cmd_histedit(int, char *[]);
135 2822a352 2019-10-15 stsp static const struct got_error* cmd_integrate(int, char *[]);
136 715dc77e 2019-08-03 stsp static const struct got_error* cmd_stage(int, char *[]);
137 ad493afc 2019-08-03 stsp static const struct got_error* cmd_unstage(int, char *[]);
138 01073a5d 2019-08-22 stsp static const struct got_error* cmd_cat(int, char *[]);
140 8cfb4057 2019-07-09 stsp static struct got_cmd got_commands[] = {
141 bc26cce8 2019-08-04 stsp { "init", cmd_init, usage_init, "in" },
142 bc26cce8 2019-08-04 stsp { "import", cmd_import, usage_import, "im" },
143 93658fb9 2020-03-18 stsp { "clone", cmd_clone, usage_clone, "cl" },
144 7848a0e1 2020-03-19 stsp { "fetch", cmd_fetch, usage_fetch, "fe" },
145 2ab43947 2020-03-18 stsp { "checkout", cmd_checkout, usage_checkout, "co" },
146 97b3a7be 2019-07-09 stsp { "update", cmd_update, usage_update, "up" },
147 97b3a7be 2019-07-09 stsp { "log", cmd_log, usage_log, "" },
148 bc26cce8 2019-08-04 stsp { "diff", cmd_diff, usage_diff, "di" },
149 bc26cce8 2019-08-04 stsp { "blame", cmd_blame, usage_blame, "bl" },
150 bc26cce8 2019-08-04 stsp { "tree", cmd_tree, usage_tree, "tr" },
151 97b3a7be 2019-07-09 stsp { "status", cmd_status, usage_status, "st" },
152 97b3a7be 2019-07-09 stsp { "ref", cmd_ref, usage_ref, "" },
153 97b3a7be 2019-07-09 stsp { "branch", cmd_branch, usage_branch, "br" },
154 8e7bd50a 2019-08-22 stsp { "tag", cmd_tag, usage_tag, "" },
155 97b3a7be 2019-07-09 stsp { "add", cmd_add, usage_add, "" },
156 648e4ef7 2019-07-09 stsp { "remove", cmd_remove, usage_remove, "rm" },
157 97b3a7be 2019-07-09 stsp { "revert", cmd_revert, usage_revert, "rv" },
158 97b3a7be 2019-07-09 stsp { "commit", cmd_commit, usage_commit, "ci" },
159 016477fd 2019-07-09 stsp { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
160 97b3a7be 2019-07-09 stsp { "backout", cmd_backout, usage_backout, "bo" },
161 818c7501 2019-07-11 stsp { "rebase", cmd_rebase, usage_rebase, "rb" },
162 0ebf8283 2019-07-24 stsp { "histedit", cmd_histedit, usage_histedit, "he" },
163 2822a352 2019-10-15 stsp { "integrate", cmd_integrate, usage_integrate,"ig" },
164 715dc77e 2019-08-03 stsp { "stage", cmd_stage, usage_stage, "sg" },
165 ad493afc 2019-08-03 stsp { "unstage", cmd_unstage, usage_unstage, "ug" },
166 01073a5d 2019-08-22 stsp { "cat", cmd_cat, usage_cat, "" },
169 ce5b7c56 2019-07-09 stsp static void
170 ce5b7c56 2019-07-09 stsp list_commands(void)
174 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
175 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(got_commands); i++) {
176 ce5b7c56 2019-07-09 stsp struct got_cmd *cmd = &got_commands[i];
177 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->cmd_name);
179 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
183 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
185 8cfb4057 2019-07-09 stsp struct got_cmd *cmd;
186 5c860e29 2018-03-12 stsp unsigned int i;
188 53ccebc2 2019-07-30 stsp int hflag = 0, Vflag = 0;
189 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
190 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
191 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
194 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
196 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
197 5c860e29 2018-03-12 stsp switch (ch) {
205 ce5b7c56 2019-07-09 stsp usage(hflag);
206 5c860e29 2018-03-12 stsp /* NOTREACHED */
210 5c860e29 2018-03-12 stsp argc -= optind;
211 5c860e29 2018-03-12 stsp argv += optind;
212 1e70621d 2018-03-27 stsp optind = 0;
214 53ccebc2 2019-07-30 stsp if (Vflag) {
215 53ccebc2 2019-07-30 stsp got_version_print_str();
219 5c860e29 2018-03-12 stsp if (argc <= 0)
220 ce5b7c56 2019-07-09 stsp usage(hflag);
222 99437157 2018-11-11 stsp signal(SIGINT, catch_sigint);
223 99437157 2018-11-11 stsp signal(SIGPIPE, catch_sigpipe);
225 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
226 d7d4f210 2018-03-12 stsp const struct got_error *error;
228 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
230 97b3a7be 2019-07-09 stsp if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
231 97b3a7be 2019-07-09 stsp strcmp(cmd->cmd_alias, argv[0]) != 0)
235 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
237 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
238 f8afbdc8 2019-11-08 stsp if (error && error->code != GOT_ERR_CANCELLED &&
239 f8afbdc8 2019-11-08 stsp error->code != GOT_ERR_PRIVSEP_EXIT &&
240 f8afbdc8 2019-11-08 stsp !(sigpipe_received &&
241 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
242 70015d7a 2019-11-08 stsp !(sigint_received &&
243 70015d7a 2019-11-08 stsp error->code == GOT_ERR_ERRNO && errno == EINTR)) {
244 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
251 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
252 ce5b7c56 2019-07-09 stsp list_commands();
256 4ed7e80c 2018-05-20 stsp __dead static void
257 ce5b7c56 2019-07-09 stsp usage(int hflag)
259 e801a566 2020-01-13 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
260 53ccebc2 2019-07-30 stsp getprogname());
262 ce5b7c56 2019-07-09 stsp list_commands();
266 0266afb7 2019-01-04 stsp static const struct got_error *
267 0ee7065d 2019-05-13 stsp get_editor(char **abspath)
269 0ee7065d 2019-05-13 stsp const struct got_error *err = NULL;
270 e2ba3d07 2019-05-13 stsp const char *editor;
272 8920fa04 2019-08-18 stsp *abspath = NULL;
274 e2ba3d07 2019-05-13 stsp editor = getenv("VISUAL");
275 e2ba3d07 2019-05-13 stsp if (editor == NULL)
276 e2ba3d07 2019-05-13 stsp editor = getenv("EDITOR");
278 0ee7065d 2019-05-13 stsp if (editor) {
279 0ee7065d 2019-05-13 stsp err = got_path_find_prog(abspath, editor);
281 0ee7065d 2019-05-13 stsp return err;
284 0ee7065d 2019-05-13 stsp if (*abspath == NULL) {
285 0ee7065d 2019-05-13 stsp *abspath = strdup("/bin/ed");
286 0ee7065d 2019-05-13 stsp if (*abspath == NULL)
287 0ee7065d 2019-05-13 stsp return got_error_from_errno("strdup");
290 e2ba3d07 2019-05-13 stsp return NULL;
293 e2ba3d07 2019-05-13 stsp static const struct got_error *
294 d0eebce4 2019-03-11 stsp apply_unveil(const char *repo_path, int repo_read_only,
295 c530dc23 2019-07-23 stsp const char *worktree_path)
297 163ce85a 2019-05-13 stsp const struct got_error *err;
299 37c06ea4 2019-07-15 stsp #ifdef PROFILE
300 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
301 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
303 d0eebce4 2019-03-11 stsp if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
304 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
306 0266afb7 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
307 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
309 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
310 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
312 163ce85a 2019-05-13 stsp err = got_privsep_unveil_exec_helpers();
313 163ce85a 2019-05-13 stsp if (err != NULL)
314 163ce85a 2019-05-13 stsp return err;
316 0266afb7 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
317 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
319 0266afb7 2019-01-04 stsp return NULL;
322 2c7829a4 2019-06-17 stsp __dead static void
323 2c7829a4 2019-06-17 stsp usage_init(void)
325 09ea71ba 2019-07-27 stsp fprintf(stderr, "usage: %s init repository-path\n", getprogname());
329 2c7829a4 2019-06-17 stsp static const struct got_error *
330 2c7829a4 2019-06-17 stsp cmd_init(int argc, char *argv[])
332 2c7829a4 2019-06-17 stsp const struct got_error *error = NULL;
333 2c7829a4 2019-06-17 stsp char *repo_path = NULL;
336 2c7829a4 2019-06-17 stsp while ((ch = getopt(argc, argv, "")) != -1) {
337 2c7829a4 2019-06-17 stsp switch (ch) {
339 2c7829a4 2019-06-17 stsp usage_init();
340 2c7829a4 2019-06-17 stsp /* NOTREACHED */
344 2c7829a4 2019-06-17 stsp argc -= optind;
345 2c7829a4 2019-06-17 stsp argv += optind;
347 2c7829a4 2019-06-17 stsp #ifndef PROFILE
348 2c7829a4 2019-06-17 stsp if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
349 2c7829a4 2019-06-17 stsp err(1, "pledge");
351 2c7829a4 2019-06-17 stsp if (argc != 1)
352 bc20e173 2019-06-17 stsp usage_init();
354 2c7829a4 2019-06-17 stsp repo_path = strdup(argv[0]);
355 2c7829a4 2019-06-17 stsp if (repo_path == NULL)
356 2c7829a4 2019-06-17 stsp return got_error_from_errno("strdup");
358 2c7829a4 2019-06-17 stsp got_path_strip_trailing_slashes(repo_path);
360 2c7829a4 2019-06-17 stsp error = got_path_mkdir(repo_path);
361 2c7829a4 2019-06-17 stsp if (error &&
362 2c7829a4 2019-06-17 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
365 c530dc23 2019-07-23 stsp error = apply_unveil(repo_path, 0, NULL);
369 2c7829a4 2019-06-17 stsp error = got_repo_init(repo_path);
371 3ce1b845 2019-07-15 stsp free(repo_path);
372 3ce1b845 2019-07-15 stsp return error;
375 3ce1b845 2019-07-15 stsp __dead static void
376 3ce1b845 2019-07-15 stsp usage_import(void)
378 3ce1b845 2019-07-15 stsp fprintf(stderr, "usage: %s import [-b branch] [-m message] "
379 3ce1b845 2019-07-15 stsp "[-r repository-path] [-I pattern] path\n", getprogname());
384 3ce1b845 2019-07-15 stsp spawn_editor(const char *editor, const char *file)
387 3ce1b845 2019-07-15 stsp sig_t sighup, sigint, sigquit;
388 3ce1b845 2019-07-15 stsp int st = -1;
390 3ce1b845 2019-07-15 stsp sighup = signal(SIGHUP, SIG_IGN);
391 3ce1b845 2019-07-15 stsp sigint = signal(SIGINT, SIG_IGN);
392 3ce1b845 2019-07-15 stsp sigquit = signal(SIGQUIT, SIG_IGN);
394 3ce1b845 2019-07-15 stsp switch (pid = fork()) {
396 3ce1b845 2019-07-15 stsp goto doneediting;
398 3ce1b845 2019-07-15 stsp execl(editor, editor, file, (char *)NULL);
399 3ce1b845 2019-07-15 stsp _exit(127);
402 3ce1b845 2019-07-15 stsp while (waitpid(pid, &st, 0) == -1)
403 3ce1b845 2019-07-15 stsp if (errno != EINTR)
406 3ce1b845 2019-07-15 stsp doneediting:
407 3ce1b845 2019-07-15 stsp (void)signal(SIGHUP, sighup);
408 3ce1b845 2019-07-15 stsp (void)signal(SIGINT, sigint);
409 3ce1b845 2019-07-15 stsp (void)signal(SIGQUIT, sigquit);
411 3ce1b845 2019-07-15 stsp if (!WIFEXITED(st)) {
412 3ce1b845 2019-07-15 stsp errno = EINTR;
416 3ce1b845 2019-07-15 stsp return WEXITSTATUS(st);
419 3ce1b845 2019-07-15 stsp static const struct got_error *
420 3ce1b845 2019-07-15 stsp edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
421 3ce1b845 2019-07-15 stsp const char *initial_content)
423 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
424 3ce1b845 2019-07-15 stsp char buf[1024];
425 3ce1b845 2019-07-15 stsp struct stat st, st2;
427 3ce1b845 2019-07-15 stsp int content_changed = 0;
428 3ce1b845 2019-07-15 stsp size_t len;
430 3ce1b845 2019-07-15 stsp *logmsg = NULL;
432 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st) == -1)
433 3ce1b845 2019-07-15 stsp return got_error_from_errno2("stat", logmsg_path);
435 3ce1b845 2019-07-15 stsp if (spawn_editor(editor, logmsg_path) == -1)
436 3ce1b845 2019-07-15 stsp return got_error_from_errno("failed spawning editor");
438 3ce1b845 2019-07-15 stsp if (stat(logmsg_path, &st2) == -1)
439 3ce1b845 2019-07-15 stsp return got_error_from_errno("stat");
441 3ce1b845 2019-07-15 stsp if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
442 3ce1b845 2019-07-15 stsp return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
443 3ce1b845 2019-07-15 stsp "no changes made to commit message, aborting");
445 3ce1b845 2019-07-15 stsp *logmsg = malloc(st2.st_size + 1);
446 3ce1b845 2019-07-15 stsp if (*logmsg == NULL)
447 3ce1b845 2019-07-15 stsp return got_error_from_errno("malloc");
448 3ce1b845 2019-07-15 stsp (*logmsg)[0] = '\0';
451 3ce1b845 2019-07-15 stsp fp = fopen(logmsg_path, "r");
452 3ce1b845 2019-07-15 stsp if (fp == NULL) {
453 3ce1b845 2019-07-15 stsp err = got_error_from_errno("fopen");
456 3ce1b845 2019-07-15 stsp while (fgets(buf, sizeof(buf), fp) != NULL) {
457 3ce1b845 2019-07-15 stsp if (!content_changed && strcmp(buf, initial_content) != 0)
458 3ce1b845 2019-07-15 stsp content_changed = 1;
459 3ce1b845 2019-07-15 stsp if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
460 3ce1b845 2019-07-15 stsp continue; /* remove comments and leading empty lines */
461 3ce1b845 2019-07-15 stsp len = strlcat(*logmsg, buf, st2.st_size);
463 3ce1b845 2019-07-15 stsp fclose(fp);
465 3ce1b845 2019-07-15 stsp while (len > 0 && (*logmsg)[len - 1] == '\n') {
466 3ce1b845 2019-07-15 stsp (*logmsg)[len - 1] = '\0';
470 3ce1b845 2019-07-15 stsp if (len == 0 || !content_changed)
471 3ce1b845 2019-07-15 stsp err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 3ce1b845 2019-07-15 stsp "commit message cannot be empty, aborting");
475 3ce1b845 2019-07-15 stsp free(*logmsg);
476 3ce1b845 2019-07-15 stsp *logmsg = NULL;
478 3ce1b845 2019-07-15 stsp return err;
481 3ce1b845 2019-07-15 stsp static const struct got_error *
482 ef293bdd 2019-10-21 stsp collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
483 ef293bdd 2019-10-21 stsp const char *path_dir, const char *branch_name)
485 ef293bdd 2019-10-21 stsp char *initial_content = NULL;
486 3ce1b845 2019-07-15 stsp const struct got_error *err = NULL;
489 3ce1b845 2019-07-15 stsp if (asprintf(&initial_content,
490 3ce1b845 2019-07-15 stsp "\n# %s to be imported to branch %s\n", path_dir,
491 3ce1b845 2019-07-15 stsp branch_name) == -1)
492 3ce1b845 2019-07-15 stsp return got_error_from_errno("asprintf");
494 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(logmsg_path, &fd,
495 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-importmsg");
499 3ce1b845 2019-07-15 stsp dprintf(fd, initial_content);
502 ef293bdd 2019-10-21 stsp err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
504 3ce1b845 2019-07-15 stsp free(initial_content);
505 3ce1b845 2019-07-15 stsp return err;
508 3ce1b845 2019-07-15 stsp static const struct got_error *
509 3ce1b845 2019-07-15 stsp import_progress(void *arg, const char *path)
511 3ce1b845 2019-07-15 stsp printf("A %s\n", path);
512 3ce1b845 2019-07-15 stsp return NULL;
515 3ce1b845 2019-07-15 stsp static const struct got_error *
516 aba9c984 2019-09-08 stsp get_author(char **author, struct got_repository *repo)
518 aba9c984 2019-09-08 stsp const struct got_error *err = NULL;
519 c9956ddf 2019-09-08 stsp const char *got_author, *name, *email;
521 84792843 2019-08-09 stsp *author = NULL;
523 c9956ddf 2019-09-08 stsp name = got_repo_get_gitconfig_author_name(repo);
524 c9956ddf 2019-09-08 stsp email = got_repo_get_gitconfig_author_email(repo);
525 c9956ddf 2019-09-08 stsp if (name && email) {
526 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
527 aba9c984 2019-09-08 stsp return got_error_from_errno("asprintf");
528 aba9c984 2019-09-08 stsp return NULL;
531 84792843 2019-08-09 stsp got_author = getenv("GOT_AUTHOR");
532 84792843 2019-08-09 stsp if (got_author == NULL) {
533 c9956ddf 2019-09-08 stsp name = got_repo_get_global_gitconfig_author_name(repo);
534 c9956ddf 2019-09-08 stsp email = got_repo_get_global_gitconfig_author_email(repo);
535 c9956ddf 2019-09-08 stsp if (name && email) {
536 c9956ddf 2019-09-08 stsp if (asprintf(author, "%s <%s>", name, email) == -1)
537 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
538 c9956ddf 2019-09-08 stsp return NULL;
540 84792843 2019-08-09 stsp /* TODO: Look up user in password database? */
541 84792843 2019-08-09 stsp return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
544 aba9c984 2019-09-08 stsp *author = strdup(got_author);
545 aba9c984 2019-09-08 stsp if (*author == NULL)
546 aba9c984 2019-09-08 stsp return got_error_from_errno("strdup");
549 84792843 2019-08-09 stsp * Really dumb email address check; we're only doing this to
550 84792843 2019-08-09 stsp * avoid git's object parser breaking on commits we create.
552 84792843 2019-08-09 stsp while (*got_author && *got_author != '<')
553 84792843 2019-08-09 stsp got_author++;
554 aba9c984 2019-09-08 stsp if (*got_author != '<') {
555 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 84792843 2019-08-09 stsp while (*got_author && *got_author != '@')
559 84792843 2019-08-09 stsp got_author++;
560 aba9c984 2019-09-08 stsp if (*got_author != '@') {
561 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
564 84792843 2019-08-09 stsp while (*got_author && *got_author != '>')
565 84792843 2019-08-09 stsp got_author++;
566 84792843 2019-08-09 stsp if (*got_author != '>')
567 aba9c984 2019-09-08 stsp err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
570 aba9c984 2019-09-08 stsp free(*author);
571 aba9c984 2019-09-08 stsp *author = NULL;
573 aba9c984 2019-09-08 stsp return err;
576 c9956ddf 2019-09-08 stsp static const struct got_error *
577 c9956ddf 2019-09-08 stsp get_gitconfig_path(char **gitconfig_path)
579 c9956ddf 2019-09-08 stsp const char *homedir = getenv("HOME");
581 c9956ddf 2019-09-08 stsp *gitconfig_path = NULL;
582 c9956ddf 2019-09-08 stsp if (homedir) {
583 c9956ddf 2019-09-08 stsp if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
584 c9956ddf 2019-09-08 stsp return got_error_from_errno("asprintf");
587 c9956ddf 2019-09-08 stsp return NULL;
590 84792843 2019-08-09 stsp static const struct got_error *
591 3ce1b845 2019-07-15 stsp cmd_import(int argc, char *argv[])
593 3ce1b845 2019-07-15 stsp const struct got_error *error = NULL;
594 3ce1b845 2019-07-15 stsp char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
595 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
596 5d67f40d 2019-11-08 stsp const char *branch_name = "main";
597 ef293bdd 2019-10-21 stsp char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
598 3ce1b845 2019-07-15 stsp struct got_repository *repo = NULL;
599 3ce1b845 2019-07-15 stsp struct got_reference *branch_ref = NULL, *head_ref = NULL;
600 3ce1b845 2019-07-15 stsp struct got_object_id *new_commit_id = NULL;
602 3ce1b845 2019-07-15 stsp struct got_pathlist_head ignores;
603 3ce1b845 2019-07-15 stsp struct got_pathlist_entry *pe;
604 ef293bdd 2019-10-21 stsp int preserve_logmsg = 0;
606 3ce1b845 2019-07-15 stsp TAILQ_INIT(&ignores);
608 3ce1b845 2019-07-15 stsp while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
609 3ce1b845 2019-07-15 stsp switch (ch) {
611 3ce1b845 2019-07-15 stsp branch_name = optarg;
614 3ce1b845 2019-07-15 stsp logmsg = strdup(optarg);
615 3ce1b845 2019-07-15 stsp if (logmsg == NULL) {
616 3ce1b845 2019-07-15 stsp error = got_error_from_errno("strdup");
621 3ce1b845 2019-07-15 stsp repo_path = realpath(optarg, NULL);
622 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
623 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath",
629 3ce1b845 2019-07-15 stsp if (optarg[0] == '\0')
631 3ce1b845 2019-07-15 stsp error = got_pathlist_insert(&pe, &ignores, optarg,
637 b2b65d18 2019-08-22 stsp usage_import();
638 3ce1b845 2019-07-15 stsp /* NOTREACHED */
642 3ce1b845 2019-07-15 stsp argc -= optind;
643 3ce1b845 2019-07-15 stsp argv += optind;
645 3ce1b845 2019-07-15 stsp #ifndef PROFILE
646 aba9c984 2019-09-08 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
648 3ce1b845 2019-07-15 stsp NULL) == -1)
649 3ce1b845 2019-07-15 stsp err(1, "pledge");
651 3ce1b845 2019-07-15 stsp if (argc != 1)
652 3ce1b845 2019-07-15 stsp usage_import();
654 3ce1b845 2019-07-15 stsp if (repo_path == NULL) {
655 3ce1b845 2019-07-15 stsp repo_path = getcwd(NULL, 0);
656 3ce1b845 2019-07-15 stsp if (repo_path == NULL)
657 3ce1b845 2019-07-15 stsp return got_error_from_errno("getcwd");
659 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(repo_path);
660 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
663 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
667 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
669 aba9c984 2019-09-08 stsp return error;
672 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
673 e560b7e0 2019-11-28 stsp * While technically a valid reference name, this case is usually
674 e560b7e0 2019-11-28 stsp * an unintended typo.
676 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
677 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
679 3ce1b845 2019-07-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
680 3ce1b845 2019-07-15 stsp error = got_error_from_errno("asprintf");
684 3ce1b845 2019-07-15 stsp error = got_ref_open(&branch_ref, repo, refname, 0);
685 3ce1b845 2019-07-15 stsp if (error) {
686 3ce1b845 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
689 3ce1b845 2019-07-15 stsp error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
690 3ce1b845 2019-07-15 stsp "import target branch already exists");
694 3ce1b845 2019-07-15 stsp path_dir = realpath(argv[0], NULL);
695 3ce1b845 2019-07-15 stsp if (path_dir == NULL) {
696 9ba1d308 2019-10-21 stsp error = got_error_from_errno2("realpath", argv[0]);
699 3ce1b845 2019-07-15 stsp got_path_strip_trailing_slashes(path_dir);
702 3ce1b845 2019-07-15 stsp * unveil(2) traverses exec(2); if an editor is used we have
703 3ce1b845 2019-07-15 stsp * to apply unveil after the log message has been written.
705 3ce1b845 2019-07-15 stsp if (logmsg == NULL || strlen(logmsg) == 0) {
706 3ce1b845 2019-07-15 stsp error = get_editor(&editor);
709 8e158b01 2019-09-22 stsp free(logmsg);
710 ef293bdd 2019-10-21 stsp error = collect_import_msg(&logmsg, &logmsg_path, editor,
711 ef293bdd 2019-10-21 stsp path_dir, refname);
712 ef293bdd 2019-10-21 stsp if (error) {
713 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
714 ef293bdd 2019-10-21 stsp logmsg_path != NULL)
715 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
720 ef293bdd 2019-10-21 stsp if (unveil(path_dir, "r") != 0) {
721 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unveil", path_dir);
722 ef293bdd 2019-10-21 stsp if (logmsg_path)
723 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
727 ef293bdd 2019-10-21 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
728 ef293bdd 2019-10-21 stsp if (error) {
729 ef293bdd 2019-10-21 stsp if (logmsg_path)
730 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
734 3ce1b845 2019-07-15 stsp error = got_repo_import(&new_commit_id, path_dir, logmsg,
735 84792843 2019-08-09 stsp author, &ignores, repo, import_progress, NULL);
736 ef293bdd 2019-10-21 stsp if (error) {
737 ef293bdd 2019-10-21 stsp if (logmsg_path)
738 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
742 3ce1b845 2019-07-15 stsp error = got_ref_alloc(&branch_ref, refname, new_commit_id);
743 ef293bdd 2019-10-21 stsp if (error) {
744 ef293bdd 2019-10-21 stsp if (logmsg_path)
745 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
749 3ce1b845 2019-07-15 stsp error = got_ref_write(branch_ref, repo);
750 ef293bdd 2019-10-21 stsp if (error) {
751 ef293bdd 2019-10-21 stsp if (logmsg_path)
752 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
756 3ce1b845 2019-07-15 stsp error = got_object_id_str(&id_str, new_commit_id);
757 ef293bdd 2019-10-21 stsp if (error) {
758 ef293bdd 2019-10-21 stsp if (logmsg_path)
759 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
763 3ce1b845 2019-07-15 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
764 3ce1b845 2019-07-15 stsp if (error) {
765 ef293bdd 2019-10-21 stsp if (error->code != GOT_ERR_NOT_REF) {
766 ef293bdd 2019-10-21 stsp if (logmsg_path)
767 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
771 3ce1b845 2019-07-15 stsp error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
772 3ce1b845 2019-07-15 stsp branch_ref);
773 ef293bdd 2019-10-21 stsp if (error) {
774 ef293bdd 2019-10-21 stsp if (logmsg_path)
775 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
779 3ce1b845 2019-07-15 stsp error = got_ref_write(head_ref, repo);
780 ef293bdd 2019-10-21 stsp if (error) {
781 ef293bdd 2019-10-21 stsp if (logmsg_path)
782 ef293bdd 2019-10-21 stsp preserve_logmsg = 1;
787 3ce1b845 2019-07-15 stsp printf("Created branch %s with commit %s\n",
788 3ce1b845 2019-07-15 stsp got_ref_get_name(branch_ref), id_str);
790 ef293bdd 2019-10-21 stsp if (preserve_logmsg) {
791 ef293bdd 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
792 ef293bdd 2019-10-21 stsp getprogname(), logmsg_path);
793 ef293bdd 2019-10-21 stsp } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
794 ef293bdd 2019-10-21 stsp error = got_error_from_errno2("unlink", logmsg_path);
795 8e158b01 2019-09-22 stsp free(logmsg);
796 ef293bdd 2019-10-21 stsp free(logmsg_path);
797 2c7829a4 2019-06-17 stsp free(repo_path);
798 3ce1b845 2019-07-15 stsp free(editor);
799 3ce1b845 2019-07-15 stsp free(refname);
800 3ce1b845 2019-07-15 stsp free(new_commit_id);
801 3ce1b845 2019-07-15 stsp free(id_str);
802 aba9c984 2019-09-08 stsp free(author);
803 c9956ddf 2019-09-08 stsp free(gitconfig_path);
804 3ce1b845 2019-07-15 stsp if (branch_ref)
805 3ce1b845 2019-07-15 stsp got_ref_close(branch_ref);
806 3ce1b845 2019-07-15 stsp if (head_ref)
807 3ce1b845 2019-07-15 stsp got_ref_close(head_ref);
808 2c7829a4 2019-06-17 stsp return error;
811 93658fb9 2020-03-18 stsp __dead static void
812 93658fb9 2020-03-18 stsp usage_clone(void)
814 13f12b09 2020-03-21 stsp fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
815 0e4002ca 2020-03-21 stsp "[-R reference] repository-url [directory]\n", getprogname());
819 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg {
820 892ac3b6 2020-03-18 stsp char last_scaled_size[FMT_SCALED_STRSIZE];
821 892ac3b6 2020-03-18 stsp int last_p_indexed;
822 892ac3b6 2020-03-18 stsp int last_p_resolved;
823 68999b92 2020-03-18 stsp int verbosity;
826 93658fb9 2020-03-18 stsp static const struct got_error *
827 baa9fea0 2020-03-18 stsp fetch_progress(void *arg, const char *message, off_t packfile_size,
828 668a20f6 2020-03-18 stsp int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
830 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg *a = arg;
831 892ac3b6 2020-03-18 stsp char scaled_size[FMT_SCALED_STRSIZE];
832 892ac3b6 2020-03-18 stsp int p_indexed, p_resolved;
833 892ac3b6 2020-03-18 stsp int print_size = 0, print_indexed = 0, print_resolved = 0;
835 68999b92 2020-03-18 stsp if (a->verbosity < 0)
836 68999b92 2020-03-18 stsp return NULL;
838 fd843b58 2020-03-18 stsp if (message && message[0] != '\0') {
839 d2cdc636 2020-03-18 stsp printf("\rserver: %s", message);
840 892ac3b6 2020-03-18 stsp fflush(stdout);
841 12d1281e 2020-03-19 stsp return NULL;
844 b2409d58 2020-03-18 stsp if (packfile_size > 0 || nobj_indexed > 0) {
845 892ac3b6 2020-03-18 stsp if (fmt_scaled(packfile_size, scaled_size) == 0 &&
846 892ac3b6 2020-03-18 stsp (a->last_scaled_size[0] == '\0' ||
847 892ac3b6 2020-03-18 stsp strcmp(scaled_size, a->last_scaled_size)) != 0) {
848 892ac3b6 2020-03-18 stsp print_size = 1;
849 892ac3b6 2020-03-18 stsp if (strlcpy(a->last_scaled_size, scaled_size,
850 892ac3b6 2020-03-18 stsp FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
851 892ac3b6 2020-03-18 stsp return got_error(GOT_ERR_NO_SPACE);
853 61cc1a7a 2020-03-18 stsp if (nobj_indexed > 0) {
854 892ac3b6 2020-03-18 stsp p_indexed = (nobj_indexed * 100) / nobj_total;
855 892ac3b6 2020-03-18 stsp if (p_indexed != a->last_p_indexed) {
856 892ac3b6 2020-03-18 stsp a->last_p_indexed = p_indexed;
857 892ac3b6 2020-03-18 stsp print_indexed = 1;
858 892ac3b6 2020-03-18 stsp print_size = 1;
861 61cc1a7a 2020-03-18 stsp if (nobj_resolved > 0) {
862 892ac3b6 2020-03-18 stsp p_resolved = (nobj_resolved * 100) /
863 892ac3b6 2020-03-18 stsp (nobj_total - nobj_loose);
864 892ac3b6 2020-03-18 stsp if (p_resolved != a->last_p_resolved) {
865 892ac3b6 2020-03-18 stsp a->last_p_resolved = p_resolved;
866 892ac3b6 2020-03-18 stsp print_resolved = 1;
867 892ac3b6 2020-03-18 stsp print_indexed = 1;
868 892ac3b6 2020-03-18 stsp print_size = 1;
873 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
874 892ac3b6 2020-03-18 stsp printf("\r");
875 892ac3b6 2020-03-18 stsp if (print_size)
876 892ac3b6 2020-03-18 stsp printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
877 d715f13e 2020-03-19 stsp if (print_indexed)
878 892ac3b6 2020-03-18 stsp printf("; indexing %d%%", p_indexed);
879 d715f13e 2020-03-19 stsp if (print_resolved)
880 892ac3b6 2020-03-18 stsp printf("; resolving deltas %d%%", p_resolved);
881 892ac3b6 2020-03-18 stsp if (print_size || print_indexed || print_resolved)
882 892ac3b6 2020-03-18 stsp fflush(stdout);
884 531c3985 2020-03-18 stsp return NULL;
887 531c3985 2020-03-18 stsp static const struct got_error *
888 f298ae0f 2020-03-25 stsp create_symref(const char *refname, struct got_reference *target_ref,
889 f298ae0f 2020-03-25 stsp int verbosity, struct got_repository *repo)
891 4ba14133 2020-03-20 stsp const struct got_error *err;
892 4ba14133 2020-03-20 stsp struct got_reference *head_symref;
894 f298ae0f 2020-03-25 stsp err = got_ref_alloc_symref(&head_symref, refname, target_ref);
896 4ba14133 2020-03-20 stsp return err;
898 4ba14133 2020-03-20 stsp err = got_ref_write(head_symref, repo);
899 4ba14133 2020-03-20 stsp got_ref_close(head_symref);
900 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity > 0) {
901 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", GOT_REF_HEAD,
902 6338a6a1 2020-03-21 stsp got_ref_get_name(target_ref));
904 4ba14133 2020-03-20 stsp return err;
907 4ba14133 2020-03-20 stsp static const struct got_error *
908 41b0de12 2020-03-21 stsp list_remote_refs(struct got_pathlist_head *symrefs,
909 41b0de12 2020-03-21 stsp struct got_pathlist_head *refs)
911 41b0de12 2020-03-21 stsp const struct got_error *err;
912 41b0de12 2020-03-21 stsp struct got_pathlist_entry *pe;
914 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, symrefs, entry) {
915 41b0de12 2020-03-21 stsp const char *refname = pe->path;
916 41b0de12 2020-03-21 stsp const char *targetref = pe->data;
918 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, targetref);
921 41b0de12 2020-03-21 stsp TAILQ_FOREACH(pe, refs, entry) {
922 41b0de12 2020-03-21 stsp const char *refname = pe->path;
923 41b0de12 2020-03-21 stsp struct got_object_id *id = pe->data;
924 41b0de12 2020-03-21 stsp char *id_str;
926 41b0de12 2020-03-21 stsp err = got_object_id_str(&id_str, id);
928 41b0de12 2020-03-21 stsp return err;
929 41b0de12 2020-03-21 stsp printf("%s: %s\n", refname, id_str);
930 41b0de12 2020-03-21 stsp free(id_str);
933 41b0de12 2020-03-21 stsp return NULL;
936 6338a6a1 2020-03-21 stsp static const struct got_error *
937 6338a6a1 2020-03-21 stsp create_ref(const char *refname, struct got_object_id *id,
938 6338a6a1 2020-03-21 stsp int verbosity, struct got_repository *repo)
940 6338a6a1 2020-03-21 stsp const struct got_error *err = NULL;
941 6338a6a1 2020-03-21 stsp struct got_reference *ref;
942 6338a6a1 2020-03-21 stsp char *id_str;
944 6338a6a1 2020-03-21 stsp err = got_object_id_str(&id_str, id);
946 6338a6a1 2020-03-21 stsp return err;
948 6338a6a1 2020-03-21 stsp err = got_ref_alloc(&ref, refname, id);
952 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
953 6338a6a1 2020-03-21 stsp got_ref_close(ref);
955 6338a6a1 2020-03-21 stsp if (err == NULL && verbosity >= 0)
956 6338a6a1 2020-03-21 stsp printf("Created reference %s: %s\n", refname, id_str);
958 6338a6a1 2020-03-21 stsp free(id_str);
959 6338a6a1 2020-03-21 stsp return err;
963 0e4002ca 2020-03-21 stsp match_wanted_ref(const char *refname, const char *wanted_ref)
965 0e4002ca 2020-03-21 stsp if (strncmp(refname, "refs/", 5) != 0)
967 0e4002ca 2020-03-21 stsp refname += 5;
970 0e4002ca 2020-03-21 stsp * Prevent fetching of references that won't make any
971 0e4002ca 2020-03-21 stsp * sense outside of the remote repository's context.
973 0e4002ca 2020-03-21 stsp if (strncmp(refname, "got/", 4) == 0)
975 0e4002ca 2020-03-21 stsp if (strncmp(refname, "remotes/", 8) == 0)
978 0e4002ca 2020-03-21 stsp if (strncmp(wanted_ref, "refs/", 5) == 0)
979 0e4002ca 2020-03-21 stsp wanted_ref += 5;
981 0e4002ca 2020-03-21 stsp /* Allow prefix match. */
982 0e4002ca 2020-03-21 stsp if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
985 0e4002ca 2020-03-21 stsp /* Allow exact match. */
986 0e4002ca 2020-03-21 stsp return (strcmp(refname, wanted_ref) == 0);
990 0e4002ca 2020-03-21 stsp is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
992 0e4002ca 2020-03-21 stsp struct got_pathlist_entry *pe;
994 0e4002ca 2020-03-21 stsp TAILQ_FOREACH(pe, wanted_refs, entry) {
995 0e4002ca 2020-03-21 stsp if (match_wanted_ref(refname, pe->path))
1002 41b0de12 2020-03-21 stsp static const struct got_error *
1003 0e4002ca 2020-03-21 stsp create_wanted_ref(const char *refname, struct got_object_id *id,
1004 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1006 0e4002ca 2020-03-21 stsp const struct got_error *err;
1007 0e4002ca 2020-03-21 stsp char *remote_refname;
1009 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1010 0e4002ca 2020-03-21 stsp refname += 5;
1012 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1013 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1014 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1016 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1017 0e4002ca 2020-03-21 stsp free(remote_refname);
1018 0e4002ca 2020-03-21 stsp return err;
1021 0e4002ca 2020-03-21 stsp static const struct got_error *
1022 93658fb9 2020-03-18 stsp cmd_clone(int argc, char *argv[])
1024 39c64a6a 2020-03-18 stsp const struct got_error *error = NULL;
1025 9df6f38b 2020-03-18 stsp const char *uri, *dirname;
1026 09838ffc 2020-03-18 stsp char *proto, *host, *port, *repo_name, *server_path;
1027 d9b4d0c0 2020-03-18 stsp char *default_destdir = NULL, *id_str = NULL;
1028 bb64b798 2020-03-18 stsp const char *repo_path;
1029 bb64b798 2020-03-18 stsp struct got_repository *repo = NULL;
1030 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1031 d9b4d0c0 2020-03-18 stsp struct got_pathlist_entry *pe;
1032 d9b4d0c0 2020-03-18 stsp struct got_object_id *pack_hash = NULL;
1033 9c52365f 2020-03-21 stsp int ch, fetchfd = -1, fetchstatus;
1034 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1035 892ac3b6 2020-03-18 stsp struct got_fetch_progress_arg fpa;
1036 b46f3e71 2020-03-18 stsp char *git_url = NULL;
1037 b46f3e71 2020-03-18 stsp char *gitconfig_path = NULL;
1038 b46f3e71 2020-03-18 stsp char *gitconfig = NULL;
1039 b46f3e71 2020-03-18 stsp FILE *gitconfig_file = NULL;
1040 b46f3e71 2020-03-18 stsp ssize_t n;
1041 659e7fbd 2020-03-20 stsp int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1042 41b0de12 2020-03-21 stsp int list_refs_only = 0;
1043 659e7fbd 2020-03-20 stsp struct got_reference *head_symref = NULL;
1045 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&refs);
1046 d9b4d0c0 2020-03-18 stsp TAILQ_INIT(&symrefs);
1047 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1048 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1050 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1051 93658fb9 2020-03-18 stsp switch (ch) {
1053 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1056 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1057 4ba14133 2020-03-20 stsp optarg, NULL);
1058 4ba14133 2020-03-20 stsp if (error)
1059 4ba14133 2020-03-20 stsp return error;
1062 41b0de12 2020-03-21 stsp list_refs_only = 1;
1065 469dd726 2020-03-20 stsp mirror_references = 1;
1068 68999b92 2020-03-18 stsp if (verbosity < 0)
1069 68999b92 2020-03-18 stsp verbosity = 0;
1070 68999b92 2020-03-18 stsp else if (verbosity < 3)
1071 68999b92 2020-03-18 stsp verbosity++;
1074 68999b92 2020-03-18 stsp verbosity = -1;
1077 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1078 0e4002ca 2020-03-21 stsp optarg, NULL);
1079 0e4002ca 2020-03-21 stsp if (error)
1080 0e4002ca 2020-03-21 stsp return error;
1083 93658fb9 2020-03-18 stsp usage_clone();
1087 93658fb9 2020-03-18 stsp argc -= optind;
1088 93658fb9 2020-03-18 stsp argv += optind;
1090 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1091 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1092 41b0de12 2020-03-21 stsp if (list_refs_only) {
1093 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1094 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1095 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1096 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1097 41b0de12 2020-03-21 stsp if (mirror_references)
1098 41b0de12 2020-03-21 stsp errx(1, "-l and -m options are mutually exclusive");
1099 41b0de12 2020-03-21 stsp if (verbosity == -1)
1100 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1101 0e4002ca 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_refs))
1102 0e4002ca 2020-03-21 stsp errx(1, "-l and -R options are mutually exclusive");
1105 93658fb9 2020-03-18 stsp uri = argv[0];
1107 9df6f38b 2020-03-18 stsp if (argc == 1)
1108 93658fb9 2020-03-18 stsp dirname = NULL;
1109 9df6f38b 2020-03-18 stsp else if (argc == 2)
1110 93658fb9 2020-03-18 stsp dirname = argv[1];
1112 93658fb9 2020-03-18 stsp usage_clone();
1114 39c64a6a 2020-03-18 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1115 09838ffc 2020-03-18 stsp &repo_name, argv[0]);
1116 39c64a6a 2020-03-18 stsp if (error)
1117 09f63084 2020-03-20 stsp goto done;
1119 09f63084 2020-03-20 stsp if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1120 09f63084 2020-03-20 stsp host, port ? ":" : "", port ? port : "",
1121 09f63084 2020-03-20 stsp server_path[0] != '/' ? "/" : "", server_path) == -1) {
1122 09f63084 2020-03-20 stsp error = got_error_from_errno("asprintf");
1123 09838ffc 2020-03-18 stsp goto done;
1126 39c64a6a 2020-03-18 stsp if (strcmp(proto, "git") == 0) {
1127 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1128 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1129 39c64a6a 2020-03-18 stsp "sendfd dns inet unveil", NULL) == -1)
1130 39c64a6a 2020-03-18 stsp err(1, "pledge");
1132 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1133 39c64a6a 2020-03-18 stsp strcmp(proto, "ssh") == 0) {
1134 b46f3e71 2020-03-18 stsp #ifndef PROFILE
1135 39c64a6a 2020-03-18 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1136 39c64a6a 2020-03-18 stsp "sendfd unveil", NULL) == -1)
1137 39c64a6a 2020-03-18 stsp err(1, "pledge");
1139 39c64a6a 2020-03-18 stsp } else if (strcmp(proto, "http") == 0 ||
1140 39c64a6a 2020-03-18 stsp strcmp(proto, "git+http") == 0) {
1141 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1142 39c64a6a 2020-03-18 stsp goto done;
1144 39c64a6a 2020-03-18 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1145 39c64a6a 2020-03-18 stsp goto done;
1147 bb64b798 2020-03-18 stsp if (dirname == NULL) {
1148 bb64b798 2020-03-18 stsp if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1149 39c64a6a 2020-03-18 stsp error = got_error_from_errno("asprintf");
1150 bb64b798 2020-03-18 stsp goto done;
1152 bb64b798 2020-03-18 stsp repo_path = default_destdir;
1154 bb64b798 2020-03-18 stsp repo_path = dirname;
1156 41b0de12 2020-03-21 stsp if (!list_refs_only) {
1157 41b0de12 2020-03-21 stsp error = got_path_mkdir(repo_path);
1158 41b0de12 2020-03-21 stsp if (error)
1159 41b0de12 2020-03-21 stsp goto done;
1161 41b0de12 2020-03-21 stsp error = got_repo_init(repo_path);
1162 41b0de12 2020-03-21 stsp if (error)
1163 41b0de12 2020-03-21 stsp goto done;
1164 41b0de12 2020-03-21 stsp error = got_repo_open(&repo, repo_path, NULL);
1165 41b0de12 2020-03-21 stsp if (error)
1166 41b0de12 2020-03-21 stsp goto done;
1169 ee448f5f 2020-03-18 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1170 ee448f5f 2020-03-18 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1171 ee448f5f 2020-03-18 stsp error = got_error_from_errno2("unveil",
1172 ee448f5f 2020-03-18 stsp GOT_FETCH_PATH_SSH);
1173 ee448f5f 2020-03-18 stsp goto done;
1176 41b0de12 2020-03-21 stsp error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1177 ee448f5f 2020-03-18 stsp if (error)
1178 ee448f5f 2020-03-18 stsp goto done;
1180 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1181 f79e6490 2020-04-19 stsp printf("Connecting to %s%s%s\n", host,
1182 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1184 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1185 9c52365f 2020-03-21 stsp server_path, verbosity);
1186 39c64a6a 2020-03-18 stsp if (error)
1187 bb64b798 2020-03-18 stsp goto done;
1189 892ac3b6 2020-03-18 stsp fpa.last_scaled_size[0] = '\0';
1190 892ac3b6 2020-03-18 stsp fpa.last_p_indexed = -1;
1191 892ac3b6 2020-03-18 stsp fpa.last_p_resolved = -1;
1192 68999b92 2020-03-18 stsp fpa.verbosity = verbosity;
1193 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1194 469dd726 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1195 0e4002ca 2020-03-21 stsp fetch_all_branches, &wanted_branches, &wanted_refs,
1196 0e4002ca 2020-03-21 stsp list_refs_only, verbosity, fetchfd, repo,
1197 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1198 39c64a6a 2020-03-18 stsp if (error)
1199 d9b4d0c0 2020-03-18 stsp goto done;
1201 41b0de12 2020-03-21 stsp if (list_refs_only) {
1202 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1203 41b0de12 2020-03-21 stsp goto done;
1206 39c64a6a 2020-03-18 stsp error = got_object_id_str(&id_str, pack_hash);
1207 39c64a6a 2020-03-18 stsp if (error)
1208 d9b4d0c0 2020-03-18 stsp goto done;
1209 68999b92 2020-03-18 stsp if (verbosity >= 0)
1210 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1211 d9b4d0c0 2020-03-18 stsp free(id_str);
1213 d9b4d0c0 2020-03-18 stsp /* Set up references provided with the pack file. */
1214 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1215 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1216 d9b4d0c0 2020-03-18 stsp struct got_object_id *id = pe->data;
1217 7ebc0570 2020-03-18 stsp char *remote_refname;
1219 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1220 0e4002ca 2020-03-21 stsp !mirror_references) {
1221 0e4002ca 2020-03-21 stsp error = create_wanted_ref(refname, id,
1222 0e4002ca 2020-03-21 stsp GOT_FETCH_DEFAULT_REMOTE_NAME,
1223 0e4002ca 2020-03-21 stsp verbosity - 1, repo);
1224 0e4002ca 2020-03-21 stsp if (error)
1225 0e4002ca 2020-03-21 stsp goto done;
1229 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity - 1, repo);
1230 39c64a6a 2020-03-18 stsp if (error)
1231 d9b4d0c0 2020-03-18 stsp goto done;
1233 469dd726 2020-03-20 stsp if (mirror_references)
1236 7ebc0570 2020-03-18 stsp if (strncmp("refs/heads/", refname, 11) != 0)
1239 7ebc0570 2020-03-18 stsp if (asprintf(&remote_refname,
1240 7ebc0570 2020-03-18 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1241 7ebc0570 2020-03-18 stsp refname + 11) == -1) {
1242 7ebc0570 2020-03-18 stsp error = got_error_from_errno("asprintf");
1243 7ebc0570 2020-03-18 stsp goto done;
1245 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id, verbosity - 1, repo);
1246 f298ae0f 2020-03-25 stsp free(remote_refname);
1247 39c64a6a 2020-03-18 stsp if (error)
1248 d9b4d0c0 2020-03-18 stsp goto done;
1251 d9b4d0c0 2020-03-18 stsp /* Set the HEAD reference if the server provided one. */
1252 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1253 659e7fbd 2020-03-20 stsp struct got_reference *target_ref;
1254 d9b4d0c0 2020-03-18 stsp const char *refname = pe->path;
1255 d9b4d0c0 2020-03-18 stsp const char *target = pe->data;
1256 f298ae0f 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
1258 d9b4d0c0 2020-03-18 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
1261 39c64a6a 2020-03-18 stsp error = got_ref_open(&target_ref, repo, target, 0);
1262 39c64a6a 2020-03-18 stsp if (error) {
1263 55330abe 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1264 55330abe 2020-03-20 stsp error = NULL;
1267 d9b4d0c0 2020-03-18 stsp goto done;
1270 f298ae0f 2020-03-25 stsp error = create_symref(refname, target_ref, verbosity, repo);
1271 f298ae0f 2020-03-25 stsp got_ref_close(target_ref);
1272 f298ae0f 2020-03-25 stsp if (error)
1273 f298ae0f 2020-03-25 stsp goto done;
1275 f298ae0f 2020-03-25 stsp if (mirror_references)
1278 f298ae0f 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
1281 f298ae0f 2020-03-25 stsp if (asprintf(&remote_refname,
1282 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1283 f298ae0f 2020-03-25 stsp refname) == -1) {
1284 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1285 f298ae0f 2020-03-25 stsp goto done;
1287 f298ae0f 2020-03-25 stsp if (asprintf(&remote_target,
1288 f298ae0f 2020-03-25 stsp "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1289 f298ae0f 2020-03-25 stsp target + 11) == -1) {
1290 f298ae0f 2020-03-25 stsp error = got_error_from_errno("asprintf");
1291 f298ae0f 2020-03-25 stsp free(remote_refname);
1292 f298ae0f 2020-03-25 stsp goto done;
1294 f298ae0f 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target, 0);
1295 f298ae0f 2020-03-25 stsp if (error) {
1296 f298ae0f 2020-03-25 stsp free(remote_refname);
1297 f298ae0f 2020-03-25 stsp free(remote_target);
1298 f298ae0f 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
1299 f298ae0f 2020-03-25 stsp error = NULL;
1302 f298ae0f 2020-03-25 stsp goto done;
1304 f298ae0f 2020-03-25 stsp error = create_symref(remote_refname, target_ref,
1305 f298ae0f 2020-03-25 stsp verbosity - 1, repo);
1306 f298ae0f 2020-03-25 stsp free(remote_refname);
1307 f298ae0f 2020-03-25 stsp free(remote_target);
1308 d9b4d0c0 2020-03-18 stsp got_ref_close(target_ref);
1309 39c64a6a 2020-03-18 stsp if (error)
1310 d9b4d0c0 2020-03-18 stsp goto done;
1312 4ba14133 2020-03-20 stsp if (pe == NULL) {
1314 4ba14133 2020-03-20 stsp * We failed to set the HEAD reference. If we asked for
1315 4ba14133 2020-03-20 stsp * a set of wanted branches use the first of one of those
1316 4ba14133 2020-03-20 stsp * which could be fetched instead.
1318 4ba14133 2020-03-20 stsp TAILQ_FOREACH(pe, &wanted_branches, entry) {
1319 4ba14133 2020-03-20 stsp const char *target = pe->path;
1320 4ba14133 2020-03-20 stsp struct got_reference *target_ref;
1322 4ba14133 2020-03-20 stsp error = got_ref_open(&target_ref, repo, target, 0);
1323 4ba14133 2020-03-20 stsp if (error) {
1324 4ba14133 2020-03-20 stsp if (error->code == GOT_ERR_NOT_REF) {
1325 4ba14133 2020-03-20 stsp error = NULL;
1328 4ba14133 2020-03-20 stsp goto done;
1331 f298ae0f 2020-03-25 stsp error = create_symref(GOT_REF_HEAD, target_ref,
1332 f298ae0f 2020-03-25 stsp verbosity, repo);
1333 4ba14133 2020-03-20 stsp got_ref_close(target_ref);
1334 4ba14133 2020-03-20 stsp if (error)
1335 4ba14133 2020-03-20 stsp goto done;
1340 659e7fbd 2020-03-20 stsp /* Create a config file git-fetch(1) can understand. */
1341 659e7fbd 2020-03-20 stsp gitconfig_path = got_repo_get_path_gitconfig(repo);
1342 659e7fbd 2020-03-20 stsp if (gitconfig_path == NULL) {
1343 659e7fbd 2020-03-20 stsp error = got_error_from_errno("got_repo_get_path_gitconfig");
1344 659e7fbd 2020-03-20 stsp goto done;
1346 659e7fbd 2020-03-20 stsp gitconfig_file = fopen(gitconfig_path, "a");
1347 659e7fbd 2020-03-20 stsp if (gitconfig_file == NULL) {
1348 659e7fbd 2020-03-20 stsp error = got_error_from_errno2("fopen", gitconfig_path);
1349 659e7fbd 2020-03-20 stsp goto done;
1351 659e7fbd 2020-03-20 stsp if (mirror_references) {
1352 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1353 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1354 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1355 8ceee112 2020-03-20 stsp "\tfetch = +refs/*:refs/*\n"
1356 659e7fbd 2020-03-20 stsp "\tmirror = true\n",
1357 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1358 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1359 659e7fbd 2020-03-20 stsp goto done;
1361 659e7fbd 2020-03-20 stsp } else if (fetch_all_branches) {
1362 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1363 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1364 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1365 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1366 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1367 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1368 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1369 659e7fbd 2020-03-20 stsp goto done;
1372 659e7fbd 2020-03-20 stsp const char *branchname;
1375 659e7fbd 2020-03-20 stsp * If the server specified a default branch, use just that one.
1376 659e7fbd 2020-03-20 stsp * Otherwise fall back to fetching all branches on next fetch.
1378 659e7fbd 2020-03-20 stsp if (head_symref) {
1379 659e7fbd 2020-03-20 stsp branchname = got_ref_get_symref_target(head_symref);
1380 659e7fbd 2020-03-20 stsp if (strncmp(branchname, "refs/heads/", 11) == 0)
1381 659e7fbd 2020-03-20 stsp branchname += 11;
1383 659e7fbd 2020-03-20 stsp branchname = "*"; /* fall back to all branches */
1384 659e7fbd 2020-03-20 stsp if (asprintf(&gitconfig,
1385 659e7fbd 2020-03-20 stsp "[remote \"%s\"]\n"
1386 659e7fbd 2020-03-20 stsp "\turl = %s\n"
1387 659e7fbd 2020-03-20 stsp "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1388 659e7fbd 2020-03-20 stsp GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1389 659e7fbd 2020-03-20 stsp branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1390 659e7fbd 2020-03-20 stsp branchname) == -1) {
1391 659e7fbd 2020-03-20 stsp error = got_error_from_errno("asprintf");
1392 659e7fbd 2020-03-20 stsp goto done;
1395 659e7fbd 2020-03-20 stsp n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1396 659e7fbd 2020-03-20 stsp if (n != strlen(gitconfig)) {
1397 659e7fbd 2020-03-20 stsp error = got_ferror(gitconfig_file, GOT_ERR_IO);
1398 659e7fbd 2020-03-20 stsp goto done;
1401 d715f13e 2020-03-19 stsp if (verbosity >= 0)
1402 469dd726 2020-03-20 stsp printf("Created %s repository '%s'\n",
1403 469dd726 2020-03-20 stsp mirror_references ? "mirrored" : "cloned", repo_path);
1405 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
1406 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
1407 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
1408 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1409 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
1411 39c64a6a 2020-03-18 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1412 39c64a6a 2020-03-18 stsp error = got_error_from_errno("close");
1413 b46f3e71 2020-03-18 stsp if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1414 b46f3e71 2020-03-18 stsp error = got_error_from_errno("fclose");
1416 bb64b798 2020-03-18 stsp got_repo_close(repo);
1417 659e7fbd 2020-03-20 stsp if (head_symref)
1418 659e7fbd 2020-03-20 stsp got_ref_close(head_symref);
1419 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &refs, entry) {
1420 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1421 d9b4d0c0 2020-03-18 stsp free(pe->data);
1423 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&refs);
1424 d9b4d0c0 2020-03-18 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
1425 d9b4d0c0 2020-03-18 stsp free((void *)pe->path);
1426 d9b4d0c0 2020-03-18 stsp free(pe->data);
1428 d9b4d0c0 2020-03-18 stsp got_pathlist_free(&symrefs);
1429 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
1430 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
1431 d9b4d0c0 2020-03-18 stsp free(pack_hash);
1432 09838ffc 2020-03-18 stsp free(proto);
1433 09838ffc 2020-03-18 stsp free(host);
1434 09838ffc 2020-03-18 stsp free(port);
1435 09838ffc 2020-03-18 stsp free(server_path);
1436 09838ffc 2020-03-18 stsp free(repo_name);
1437 bb64b798 2020-03-18 stsp free(default_destdir);
1438 b46f3e71 2020-03-18 stsp free(gitconfig_path);
1439 b46f3e71 2020-03-18 stsp free(git_url);
1440 39c64a6a 2020-03-18 stsp return error;
1443 7848a0e1 2020-03-19 stsp static const struct got_error *
1444 7848a0e1 2020-03-19 stsp update_ref(struct got_reference *ref, struct got_object_id *new_id,
1445 db6d8ad8 2020-03-21 stsp int replace_tags, int verbosity, struct got_repository *repo)
1447 7848a0e1 2020-03-19 stsp const struct got_error *err = NULL;
1448 7848a0e1 2020-03-19 stsp char *new_id_str = NULL;
1449 7848a0e1 2020-03-19 stsp struct got_object_id *old_id = NULL;
1451 7848a0e1 2020-03-19 stsp err = got_object_id_str(&new_id_str, new_id);
1453 7848a0e1 2020-03-19 stsp goto done;
1455 db6d8ad8 2020-03-21 stsp if (!replace_tags &&
1456 db6d8ad8 2020-03-21 stsp strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1457 88609724 2020-03-21 stsp err = got_ref_resolve(&old_id, repo, ref);
1459 88609724 2020-03-21 stsp goto done;
1460 88609724 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1461 88609724 2020-03-21 stsp goto done;
1462 db6d8ad8 2020-03-21 stsp if (verbosity >= 0) {
1463 db6d8ad8 2020-03-21 stsp printf("Rejecting update of existing tag %s: %s\n",
1464 db6d8ad8 2020-03-21 stsp got_ref_get_name(ref), new_id_str);
1466 db6d8ad8 2020-03-21 stsp goto done;
1469 7848a0e1 2020-03-19 stsp if (got_ref_is_symbolic(ref)) {
1470 688f11b3 2020-03-21 stsp if (verbosity >= 0) {
1471 e8a967e0 2020-03-21 stsp printf("Replacing reference %s: %s\n",
1472 6338a6a1 2020-03-21 stsp got_ref_get_name(ref),
1473 6338a6a1 2020-03-21 stsp got_ref_get_symref_target(ref));
1475 e8a967e0 2020-03-21 stsp err = got_ref_change_symref_to_ref(ref, new_id);
1477 7848a0e1 2020-03-19 stsp goto done;
1478 e8a967e0 2020-03-21 stsp err = got_ref_write(ref, repo);
1480 e8a967e0 2020-03-21 stsp goto done;
1482 7848a0e1 2020-03-19 stsp err = got_ref_resolve(&old_id, repo, ref);
1484 7848a0e1 2020-03-19 stsp goto done;
1485 6338a6a1 2020-03-21 stsp if (got_object_id_cmp(old_id, new_id) == 0)
1486 6338a6a1 2020-03-21 stsp goto done;
1488 6338a6a1 2020-03-21 stsp err = got_ref_change_ref(ref, new_id);
1490 6338a6a1 2020-03-21 stsp goto done;
1491 6338a6a1 2020-03-21 stsp err = got_ref_write(ref, repo);
1493 6338a6a1 2020-03-21 stsp goto done;
1496 6338a6a1 2020-03-21 stsp if (verbosity >= 0)
1497 6338a6a1 2020-03-21 stsp printf("Updated reference %s: %s\n", got_ref_get_name(ref),
1498 6338a6a1 2020-03-21 stsp new_id_str);
1500 7848a0e1 2020-03-19 stsp free(old_id);
1501 7848a0e1 2020-03-19 stsp free(new_id_str);
1502 7848a0e1 2020-03-19 stsp return err;
1505 f1bcca34 2020-03-25 stsp static const struct got_error *
1506 f1bcca34 2020-03-25 stsp update_symref(const char *refname, struct got_reference *target_ref,
1507 f1bcca34 2020-03-25 stsp int verbosity, struct got_repository *repo)
1509 f1bcca34 2020-03-25 stsp const struct got_error *err = NULL, *unlock_err;
1510 f1bcca34 2020-03-25 stsp struct got_reference *symref;
1511 bcf34b0e 2020-03-26 stsp int symref_is_locked = 0;
1513 f1bcca34 2020-03-25 stsp err = got_ref_open(&symref, repo, refname, 1);
1514 bcf34b0e 2020-03-26 stsp if (err) {
1515 bcf34b0e 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1516 bcf34b0e 2020-03-26 stsp return err;
1517 bcf34b0e 2020-03-26 stsp err = got_ref_alloc_symref(&symref, refname, target_ref);
1519 bcf34b0e 2020-03-26 stsp goto done;
1521 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1523 bcf34b0e 2020-03-26 stsp goto done;
1525 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1526 bcf34b0e 2020-03-26 stsp printf("Created reference %s: %s\n",
1527 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1528 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1530 bcf34b0e 2020-03-26 stsp symref_is_locked = 1;
1532 bcf34b0e 2020-03-26 stsp if (strcmp(got_ref_get_symref_target(symref),
1533 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref)) == 0)
1534 bcf34b0e 2020-03-26 stsp goto done;
1536 bcf34b0e 2020-03-26 stsp err = got_ref_change_symref(symref,
1537 bcf34b0e 2020-03-26 stsp got_ref_get_name(target_ref));
1539 bcf34b0e 2020-03-26 stsp goto done;
1541 bcf34b0e 2020-03-26 stsp err = got_ref_write(symref, repo);
1543 bcf34b0e 2020-03-26 stsp goto done;
1545 bcf34b0e 2020-03-26 stsp if (verbosity >= 0)
1546 bcf34b0e 2020-03-26 stsp printf("Updated reference %s: %s\n",
1547 bcf34b0e 2020-03-26 stsp got_ref_get_name(symref),
1548 bcf34b0e 2020-03-26 stsp got_ref_get_symref_target(symref));
1552 bcf34b0e 2020-03-26 stsp if (symref_is_locked) {
1553 bcf34b0e 2020-03-26 stsp unlock_err = got_ref_unlock(symref);
1554 bcf34b0e 2020-03-26 stsp if (unlock_err && err == NULL)
1555 bcf34b0e 2020-03-26 stsp err = unlock_err;
1557 f1bcca34 2020-03-25 stsp got_ref_close(symref);
1558 f1bcca34 2020-03-25 stsp return err;
1561 2ab43947 2020-03-18 stsp __dead static void
1562 7848a0e1 2020-03-19 stsp usage_fetch(void)
1564 f21ec2f0 2020-03-21 stsp fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1565 0e4002ca 2020-03-21 stsp "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1566 0e4002ca 2020-03-21 stsp "[remote-repository-name]\n",
1567 13f12b09 2020-03-21 stsp getprogname());
1571 7848a0e1 2020-03-19 stsp static const struct got_error *
1572 3789fd73 2020-03-26 stsp delete_missing_ref(struct got_reference *ref,
1573 688f11b3 2020-03-21 stsp int verbosity, struct got_repository *repo)
1575 f21ec2f0 2020-03-21 stsp const struct got_error *err = NULL;
1576 3789fd73 2020-03-26 stsp struct got_object_id *id = NULL;
1577 3789fd73 2020-03-26 stsp char *id_str = NULL;
1579 3789fd73 2020-03-26 stsp if (got_ref_is_symbolic(ref)) {
1580 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1582 3789fd73 2020-03-26 stsp return err;
1583 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1584 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1585 3789fd73 2020-03-26 stsp got_ref_get_name(ref),
1586 3789fd73 2020-03-26 stsp got_ref_get_symref_target(ref));
1589 3789fd73 2020-03-26 stsp err = got_ref_resolve(&id, repo, ref);
1591 3789fd73 2020-03-26 stsp return err;
1592 3789fd73 2020-03-26 stsp err = got_object_id_str(&id_str, id);
1594 3789fd73 2020-03-26 stsp goto done;
1596 3789fd73 2020-03-26 stsp err = got_ref_delete(ref, repo);
1598 3789fd73 2020-03-26 stsp goto done;
1599 3789fd73 2020-03-26 stsp if (verbosity >= 0) {
1600 3789fd73 2020-03-26 stsp printf("Deleted reference %s: %s\n",
1601 3789fd73 2020-03-26 stsp got_ref_get_name(ref), id_str);
1606 3789fd73 2020-03-26 stsp free(id_str);
1607 3789fd73 2020-03-26 stsp return NULL;
1610 3789fd73 2020-03-26 stsp static const struct got_error *
1611 3789fd73 2020-03-26 stsp delete_missing_refs(struct got_pathlist_head *their_refs,
1612 3789fd73 2020-03-26 stsp struct got_pathlist_head *their_symrefs, struct got_remote_repo *remote,
1613 3789fd73 2020-03-26 stsp int verbosity, struct got_repository *repo)
1615 3789fd73 2020-03-26 stsp const struct got_error *err = NULL, *unlock_err;
1616 f21ec2f0 2020-03-21 stsp struct got_reflist_head my_refs;
1617 f21ec2f0 2020-03-21 stsp struct got_reflist_entry *re;
1618 f21ec2f0 2020-03-21 stsp struct got_pathlist_entry *pe;
1619 3789fd73 2020-03-26 stsp char *remote_namespace = NULL;
1620 3789fd73 2020-03-26 stsp char *local_refname = NULL;
1622 f21ec2f0 2020-03-21 stsp SIMPLEQ_INIT(&my_refs);
1624 3789fd73 2020-03-26 stsp if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1626 3789fd73 2020-03-26 stsp return got_error_from_errno("asprintf");
1628 f21ec2f0 2020-03-21 stsp err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1630 3789fd73 2020-03-26 stsp goto done;
1632 f21ec2f0 2020-03-21 stsp SIMPLEQ_FOREACH(re, &my_refs, entry) {
1633 f21ec2f0 2020-03-21 stsp const char *refname = got_ref_get_name(re->ref);
1635 3789fd73 2020-03-26 stsp if (!remote->mirror_references) {
1636 3789fd73 2020-03-26 stsp if (strncmp(refname, remote_namespace,
1637 3789fd73 2020-03-26 stsp strlen(remote_namespace)) == 0) {
1638 3789fd73 2020-03-26 stsp if (strcmp(refname + strlen(remote_namespace),
1639 3789fd73 2020-03-26 stsp GOT_REF_HEAD) == 0)
1641 3789fd73 2020-03-26 stsp if (asprintf(&local_refname, "refs/heads/%s",
1642 3789fd73 2020-03-26 stsp refname + strlen(remote_namespace)) == -1) {
1643 3789fd73 2020-03-26 stsp err = got_error_from_errno("asprintf");
1644 3789fd73 2020-03-26 stsp goto done;
1646 3789fd73 2020-03-26 stsp } else if (strncmp(refname, "refs/tags/", 10) != 0)
1650 f21ec2f0 2020-03-21 stsp TAILQ_FOREACH(pe, their_refs, entry) {
1651 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1654 f21ec2f0 2020-03-21 stsp if (pe != NULL)
1657 3789fd73 2020-03-26 stsp TAILQ_FOREACH(pe, their_symrefs, entry) {
1658 3789fd73 2020-03-26 stsp if (strcmp(local_refname, pe->path) == 0)
1661 3789fd73 2020-03-26 stsp if (pe != NULL)
1664 3789fd73 2020-03-26 stsp err = delete_missing_ref(re->ref, verbosity, repo);
1668 3789fd73 2020-03-26 stsp if (local_refname) {
1669 3789fd73 2020-03-26 stsp struct got_reference *ref;
1670 3789fd73 2020-03-26 stsp err = got_ref_open(&ref, repo, local_refname, 1);
1671 3789fd73 2020-03-26 stsp if (err) {
1672 3789fd73 2020-03-26 stsp if (err->code != GOT_ERR_NOT_REF)
1674 3789fd73 2020-03-26 stsp free(local_refname);
1675 3789fd73 2020-03-26 stsp local_refname = NULL;
1678 3789fd73 2020-03-26 stsp err = delete_missing_ref(ref, verbosity, repo);
1681 3789fd73 2020-03-26 stsp unlock_err = got_ref_unlock(ref);
1682 3789fd73 2020-03-26 stsp got_ref_close(ref);
1683 3789fd73 2020-03-26 stsp if (unlock_err && err == NULL) {
1684 3789fd73 2020-03-26 stsp err = unlock_err;
1688 3789fd73 2020-03-26 stsp free(local_refname);
1689 3789fd73 2020-03-26 stsp local_refname = NULL;
1693 3789fd73 2020-03-26 stsp free(remote_namespace);
1694 3789fd73 2020-03-26 stsp free(local_refname);
1695 0e4002ca 2020-03-21 stsp return err;
1698 0e4002ca 2020-03-21 stsp static const struct got_error *
1699 0e4002ca 2020-03-21 stsp update_wanted_ref(const char *refname, struct got_object_id *id,
1700 0e4002ca 2020-03-21 stsp const char *remote_repo_name, int verbosity, struct got_repository *repo)
1702 9f142382 2020-03-21 stsp const struct got_error *err, *unlock_err;
1703 0e4002ca 2020-03-21 stsp char *remote_refname;
1704 0e4002ca 2020-03-21 stsp struct got_reference *ref;
1706 0e4002ca 2020-03-21 stsp if (strncmp("refs/", refname, 5) == 0)
1707 0e4002ca 2020-03-21 stsp refname += 5;
1709 0e4002ca 2020-03-21 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1710 0e4002ca 2020-03-21 stsp remote_repo_name, refname) == -1)
1711 0e4002ca 2020-03-21 stsp return got_error_from_errno("asprintf");
1713 9f142382 2020-03-21 stsp err = got_ref_open(&ref, repo, remote_refname, 1);
1714 0e4002ca 2020-03-21 stsp if (err) {
1715 0e4002ca 2020-03-21 stsp if (err->code != GOT_ERR_NOT_REF)
1716 0e4002ca 2020-03-21 stsp goto done;
1717 0e4002ca 2020-03-21 stsp err = create_ref(remote_refname, id, verbosity, repo);
1719 0e4002ca 2020-03-21 stsp err = update_ref(ref, id, 0, verbosity, repo);
1720 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1721 9f142382 2020-03-21 stsp if (unlock_err && err == NULL)
1722 9f142382 2020-03-21 stsp err = unlock_err;
1723 0e4002ca 2020-03-21 stsp got_ref_close(ref);
1726 0e4002ca 2020-03-21 stsp free(remote_refname);
1727 f21ec2f0 2020-03-21 stsp return err;
1730 f21ec2f0 2020-03-21 stsp static const struct got_error *
1731 7848a0e1 2020-03-19 stsp cmd_fetch(int argc, char *argv[])
1733 9f142382 2020-03-21 stsp const struct got_error *error = NULL, *unlock_err;
1734 7848a0e1 2020-03-19 stsp char *cwd = NULL, *repo_path = NULL;
1735 7848a0e1 2020-03-19 stsp const char *remote_name;
1736 7848a0e1 2020-03-19 stsp char *proto = NULL, *host = NULL, *port = NULL;
1737 7848a0e1 2020-03-19 stsp char *repo_name = NULL, *server_path = NULL;
1738 7848a0e1 2020-03-19 stsp struct got_remote_repo *remotes, *remote = NULL;
1739 7848a0e1 2020-03-19 stsp int nremotes;
1740 7848a0e1 2020-03-19 stsp char *id_str = NULL;
1741 7848a0e1 2020-03-19 stsp struct got_repository *repo = NULL;
1742 7848a0e1 2020-03-19 stsp struct got_worktree *worktree = NULL;
1743 0e4002ca 2020-03-21 stsp struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1744 7848a0e1 2020-03-19 stsp struct got_pathlist_entry *pe;
1745 7848a0e1 2020-03-19 stsp struct got_object_id *pack_hash = NULL;
1746 9c52365f 2020-03-21 stsp int i, ch, fetchfd = -1, fetchstatus;
1747 9c52365f 2020-03-21 stsp pid_t fetchpid = -1;
1748 7848a0e1 2020-03-19 stsp struct got_fetch_progress_arg fpa;
1749 41b0de12 2020-03-21 stsp int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1750 db6d8ad8 2020-03-21 stsp int delete_refs = 0, replace_tags = 0;
1752 7848a0e1 2020-03-19 stsp TAILQ_INIT(&refs);
1753 7848a0e1 2020-03-19 stsp TAILQ_INIT(&symrefs);
1754 4ba14133 2020-03-20 stsp TAILQ_INIT(&wanted_branches);
1755 0e4002ca 2020-03-21 stsp TAILQ_INIT(&wanted_refs);
1757 0e4002ca 2020-03-21 stsp while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1758 7848a0e1 2020-03-19 stsp switch (ch) {
1760 659e7fbd 2020-03-20 stsp fetch_all_branches = 1;
1763 4ba14133 2020-03-20 stsp error = got_pathlist_append(&wanted_branches,
1764 4ba14133 2020-03-20 stsp optarg, NULL);
1765 4ba14133 2020-03-20 stsp if (error)
1766 4ba14133 2020-03-20 stsp return error;
1769 f21ec2f0 2020-03-21 stsp delete_refs = 1;
1772 41b0de12 2020-03-21 stsp list_refs_only = 1;
1775 7848a0e1 2020-03-19 stsp repo_path = realpath(optarg, NULL);
1776 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1777 7848a0e1 2020-03-19 stsp return got_error_from_errno2("realpath",
1779 7848a0e1 2020-03-19 stsp got_path_strip_trailing_slashes(repo_path);
1782 db6d8ad8 2020-03-21 stsp replace_tags = 1;
1785 7848a0e1 2020-03-19 stsp if (verbosity < 0)
1786 7848a0e1 2020-03-19 stsp verbosity = 0;
1787 7848a0e1 2020-03-19 stsp else if (verbosity < 3)
1788 7848a0e1 2020-03-19 stsp verbosity++;
1791 7848a0e1 2020-03-19 stsp verbosity = -1;
1794 0e4002ca 2020-03-21 stsp error = got_pathlist_append(&wanted_refs,
1795 0e4002ca 2020-03-21 stsp optarg, NULL);
1796 0e4002ca 2020-03-21 stsp if (error)
1797 0e4002ca 2020-03-21 stsp return error;
1800 7848a0e1 2020-03-19 stsp usage_fetch();
1804 7848a0e1 2020-03-19 stsp argc -= optind;
1805 7848a0e1 2020-03-19 stsp argv += optind;
1807 4ba14133 2020-03-20 stsp if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1808 41b0de12 2020-03-21 stsp errx(1, "-a and -b options are mutually exclusive");
1809 41b0de12 2020-03-21 stsp if (list_refs_only) {
1810 41b0de12 2020-03-21 stsp if (!TAILQ_EMPTY(&wanted_branches))
1811 41b0de12 2020-03-21 stsp errx(1, "-l and -b options are mutually exclusive");
1812 41b0de12 2020-03-21 stsp if (fetch_all_branches)
1813 41b0de12 2020-03-21 stsp errx(1, "-l and -a options are mutually exclusive");
1814 f21ec2f0 2020-03-21 stsp if (delete_refs)
1815 f21ec2f0 2020-03-21 stsp errx(1, "-l and -d options are mutually exclusive");
1816 41b0de12 2020-03-21 stsp if (verbosity == -1)
1817 41b0de12 2020-03-21 stsp errx(1, "-l and -q options are mutually exclusive");
1820 7848a0e1 2020-03-19 stsp if (argc == 0)
1821 7848a0e1 2020-03-19 stsp remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1822 7848a0e1 2020-03-19 stsp else if (argc == 1)
1823 7848a0e1 2020-03-19 stsp remote_name = argv[0];
1825 7848a0e1 2020-03-19 stsp usage_fetch();
1827 7848a0e1 2020-03-19 stsp cwd = getcwd(NULL, 0);
1828 7848a0e1 2020-03-19 stsp if (cwd == NULL) {
1829 7848a0e1 2020-03-19 stsp error = got_error_from_errno("getcwd");
1830 7848a0e1 2020-03-19 stsp goto done;
1833 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1834 7848a0e1 2020-03-19 stsp error = got_worktree_open(&worktree, cwd);
1835 7848a0e1 2020-03-19 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1836 7848a0e1 2020-03-19 stsp goto done;
1838 7848a0e1 2020-03-19 stsp error = NULL;
1839 7848a0e1 2020-03-19 stsp if (worktree) {
1840 7848a0e1 2020-03-19 stsp repo_path =
1841 7848a0e1 2020-03-19 stsp strdup(got_worktree_get_repo_path(worktree));
1842 7848a0e1 2020-03-19 stsp if (repo_path == NULL)
1843 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1844 7848a0e1 2020-03-19 stsp if (error)
1845 7848a0e1 2020-03-19 stsp goto done;
1847 7848a0e1 2020-03-19 stsp repo_path = strdup(cwd);
1848 7848a0e1 2020-03-19 stsp if (repo_path == NULL) {
1849 7848a0e1 2020-03-19 stsp error = got_error_from_errno("strdup");
1850 7848a0e1 2020-03-19 stsp goto done;
1855 7848a0e1 2020-03-19 stsp error = got_repo_open(&repo, repo_path, NULL);
1856 7848a0e1 2020-03-19 stsp if (error)
1857 7848a0e1 2020-03-19 stsp goto done;
1859 7848a0e1 2020-03-19 stsp got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1860 7848a0e1 2020-03-19 stsp for (i = 0; i < nremotes; i++) {
1861 7848a0e1 2020-03-19 stsp remote = &remotes[i];
1862 7848a0e1 2020-03-19 stsp if (strcmp(remote->name, remote_name) == 0)
1865 7848a0e1 2020-03-19 stsp if (i == nremotes) {
1866 7848a0e1 2020-03-19 stsp error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1867 7848a0e1 2020-03-19 stsp goto done;
1870 7848a0e1 2020-03-19 stsp error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1871 7848a0e1 2020-03-19 stsp &repo_name, remote->url);
1872 7848a0e1 2020-03-19 stsp if (error)
1873 7848a0e1 2020-03-19 stsp goto done;
1875 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git") == 0) {
1876 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1877 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1878 7848a0e1 2020-03-19 stsp "sendfd dns inet unveil", NULL) == -1)
1879 7848a0e1 2020-03-19 stsp err(1, "pledge");
1881 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "git+ssh") == 0 ||
1882 7848a0e1 2020-03-19 stsp strcmp(proto, "ssh") == 0) {
1883 7848a0e1 2020-03-19 stsp #ifndef PROFILE
1884 7848a0e1 2020-03-19 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1885 7848a0e1 2020-03-19 stsp "sendfd unveil", NULL) == -1)
1886 7848a0e1 2020-03-19 stsp err(1, "pledge");
1888 7848a0e1 2020-03-19 stsp } else if (strcmp(proto, "http") == 0 ||
1889 7848a0e1 2020-03-19 stsp strcmp(proto, "git+http") == 0) {
1890 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1891 7848a0e1 2020-03-19 stsp goto done;
1893 7848a0e1 2020-03-19 stsp error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1894 7848a0e1 2020-03-19 stsp goto done;
1897 7848a0e1 2020-03-19 stsp if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1898 7848a0e1 2020-03-19 stsp if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1899 7848a0e1 2020-03-19 stsp error = got_error_from_errno2("unveil",
1900 7848a0e1 2020-03-19 stsp GOT_FETCH_PATH_SSH);
1901 7848a0e1 2020-03-19 stsp goto done;
1904 7848a0e1 2020-03-19 stsp error = apply_unveil(got_repo_get_path(repo), 0, NULL);
1905 7848a0e1 2020-03-19 stsp if (error)
1906 7848a0e1 2020-03-19 stsp goto done;
1908 f79e6490 2020-04-19 stsp if (verbosity >= 0)
1909 f79e6490 2020-04-19 stsp printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
1910 f79e6490 2020-04-19 stsp port ? ":" : "", port ? port : "");
1912 9c52365f 2020-03-21 stsp error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1913 9c52365f 2020-03-21 stsp server_path, verbosity);
1914 7848a0e1 2020-03-19 stsp if (error)
1915 7848a0e1 2020-03-19 stsp goto done;
1917 7848a0e1 2020-03-19 stsp fpa.last_scaled_size[0] = '\0';
1918 7848a0e1 2020-03-19 stsp fpa.last_p_indexed = -1;
1919 7848a0e1 2020-03-19 stsp fpa.last_p_resolved = -1;
1920 7848a0e1 2020-03-19 stsp fpa.verbosity = verbosity;
1921 7848a0e1 2020-03-19 stsp error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
1922 4ba14133 2020-03-20 stsp remote->mirror_references, fetch_all_branches, &wanted_branches,
1923 0e4002ca 2020-03-21 stsp &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
1924 0e4002ca 2020-03-21 stsp fetch_progress, &fpa);
1925 7848a0e1 2020-03-19 stsp if (error)
1926 7848a0e1 2020-03-19 stsp goto done;
1928 41b0de12 2020-03-21 stsp if (list_refs_only) {
1929 41b0de12 2020-03-21 stsp error = list_remote_refs(&symrefs, &refs);
1930 41b0de12 2020-03-21 stsp goto done;
1933 7848a0e1 2020-03-19 stsp if (pack_hash == NULL) {
1934 7848a0e1 2020-03-19 stsp if (verbosity >= 0)
1935 7848a0e1 2020-03-19 stsp printf("Already up-to-date\n");
1936 bcf34b0e 2020-03-26 stsp } else if (verbosity >= 0) {
1937 984065c8 2020-03-19 stsp error = got_object_id_str(&id_str, pack_hash);
1938 984065c8 2020-03-19 stsp if (error)
1939 984065c8 2020-03-19 stsp goto done;
1940 e69674d8 2020-03-19 stsp printf("\nFetched %s.pack\n", id_str);
1941 984065c8 2020-03-19 stsp free(id_str);
1942 984065c8 2020-03-19 stsp id_str = NULL;
1945 7848a0e1 2020-03-19 stsp /* Update references provided with the pack file. */
1946 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
1947 7848a0e1 2020-03-19 stsp const char *refname = pe->path;
1948 7848a0e1 2020-03-19 stsp struct got_object_id *id = pe->data;
1949 7848a0e1 2020-03-19 stsp struct got_reference *ref;
1950 7848a0e1 2020-03-19 stsp char *remote_refname;
1952 0e4002ca 2020-03-21 stsp if (is_wanted_ref(&wanted_refs, refname) &&
1953 0e4002ca 2020-03-21 stsp !remote->mirror_references) {
1954 0e4002ca 2020-03-21 stsp error = update_wanted_ref(refname, id,
1955 0e4002ca 2020-03-21 stsp remote->name, verbosity, repo);
1956 0e4002ca 2020-03-21 stsp if (error)
1957 0e4002ca 2020-03-21 stsp goto done;
1961 1510c839 2020-03-20 stsp if (remote->mirror_references ||
1962 1510c839 2020-03-20 stsp strncmp("refs/tags/", refname, 10) == 0) {
1963 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
1964 7848a0e1 2020-03-19 stsp if (error) {
1965 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1966 7848a0e1 2020-03-19 stsp goto done;
1967 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
1969 7848a0e1 2020-03-19 stsp if (error)
1970 7848a0e1 2020-03-19 stsp goto done;
1972 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1973 db6d8ad8 2020-03-21 stsp verbosity, repo);
1974 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
1975 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
1976 9f142382 2020-03-21 stsp error = unlock_err;
1977 7848a0e1 2020-03-19 stsp got_ref_close(ref);
1978 7848a0e1 2020-03-19 stsp if (error)
1979 7848a0e1 2020-03-19 stsp goto done;
1981 7848a0e1 2020-03-19 stsp } else if (strncmp("refs/heads/", refname, 11) == 0) {
1982 7848a0e1 2020-03-19 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1983 7848a0e1 2020-03-19 stsp remote_name, refname + 11) == -1) {
1984 7848a0e1 2020-03-19 stsp error = got_error_from_errno("asprintf");
1985 7848a0e1 2020-03-19 stsp goto done;
1988 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, remote_refname, 1);
1989 7848a0e1 2020-03-19 stsp if (error) {
1990 7848a0e1 2020-03-19 stsp if (error->code != GOT_ERR_NOT_REF)
1991 7848a0e1 2020-03-19 stsp goto done;
1992 6338a6a1 2020-03-21 stsp error = create_ref(remote_refname, id,
1993 688f11b3 2020-03-21 stsp verbosity, repo);
1994 7848a0e1 2020-03-19 stsp if (error)
1995 7848a0e1 2020-03-19 stsp goto done;
1997 db6d8ad8 2020-03-21 stsp error = update_ref(ref, id, replace_tags,
1998 db6d8ad8 2020-03-21 stsp verbosity, repo);
1999 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2000 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2001 9f142382 2020-03-21 stsp error = unlock_err;
2002 7848a0e1 2020-03-19 stsp got_ref_close(ref);
2003 7848a0e1 2020-03-19 stsp if (error)
2004 7848a0e1 2020-03-19 stsp goto done;
2007 2ec30c80 2020-03-20 stsp /* Also create a local branch if none exists yet. */
2008 9f142382 2020-03-21 stsp error = got_ref_open(&ref, repo, refname, 1);
2009 2ec30c80 2020-03-20 stsp if (error) {
2010 2ec30c80 2020-03-20 stsp if (error->code != GOT_ERR_NOT_REF)
2011 2ec30c80 2020-03-20 stsp goto done;
2012 6338a6a1 2020-03-21 stsp error = create_ref(refname, id, verbosity,
2014 2ec30c80 2020-03-20 stsp if (error)
2015 2ec30c80 2020-03-20 stsp goto done;
2017 9f142382 2020-03-21 stsp unlock_err = got_ref_unlock(ref);
2018 9f142382 2020-03-21 stsp if (unlock_err && error == NULL)
2019 9f142382 2020-03-21 stsp error = unlock_err;
2020 2ec30c80 2020-03-20 stsp got_ref_close(ref);
2024 f1bcca34 2020-03-25 stsp if (delete_refs) {
2025 3789fd73 2020-03-26 stsp error = delete_missing_refs(&refs, &symrefs, remote,
2026 3789fd73 2020-03-26 stsp verbosity, repo);
2027 f1bcca34 2020-03-25 stsp if (error)
2028 f1bcca34 2020-03-25 stsp goto done;
2031 f1bcca34 2020-03-25 stsp if (!remote->mirror_references) {
2032 f1bcca34 2020-03-25 stsp /* Update remote HEAD reference if the server provided one. */
2033 f1bcca34 2020-03-25 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2034 f1bcca34 2020-03-25 stsp struct got_reference *target_ref;
2035 f1bcca34 2020-03-25 stsp const char *refname = pe->path;
2036 f1bcca34 2020-03-25 stsp const char *target = pe->data;
2037 f1bcca34 2020-03-25 stsp char *remote_refname = NULL, *remote_target = NULL;
2039 f1bcca34 2020-03-25 stsp if (strcmp(refname, GOT_REF_HEAD) != 0)
2042 f1bcca34 2020-03-25 stsp if (strncmp("refs/heads/", target, 11) != 0)
2045 f1bcca34 2020-03-25 stsp if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2046 f1bcca34 2020-03-25 stsp remote->name, refname) == -1) {
2047 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2048 f1bcca34 2020-03-25 stsp goto done;
2050 f1bcca34 2020-03-25 stsp if (asprintf(&remote_target, "refs/remotes/%s/%s",
2051 f1bcca34 2020-03-25 stsp remote->name, target + 11) == -1) {
2052 f1bcca34 2020-03-25 stsp error = got_error_from_errno("asprintf");
2053 f1bcca34 2020-03-25 stsp free(remote_refname);
2054 f1bcca34 2020-03-25 stsp goto done;
2057 f1bcca34 2020-03-25 stsp error = got_ref_open(&target_ref, repo, remote_target,
2059 f1bcca34 2020-03-25 stsp if (error) {
2060 f1bcca34 2020-03-25 stsp free(remote_refname);
2061 f1bcca34 2020-03-25 stsp free(remote_target);
2062 f1bcca34 2020-03-25 stsp if (error->code == GOT_ERR_NOT_REF) {
2063 f1bcca34 2020-03-25 stsp error = NULL;
2066 f1bcca34 2020-03-25 stsp goto done;
2068 f1bcca34 2020-03-25 stsp error = update_symref(remote_refname, target_ref,
2069 f1bcca34 2020-03-25 stsp verbosity, repo);
2070 f1bcca34 2020-03-25 stsp free(remote_refname);
2071 f1bcca34 2020-03-25 stsp free(remote_target);
2072 f1bcca34 2020-03-25 stsp got_ref_close(target_ref);
2073 f1bcca34 2020-03-25 stsp if (error)
2074 f1bcca34 2020-03-25 stsp goto done;
2078 9c52365f 2020-03-21 stsp if (fetchpid > 0) {
2079 9c52365f 2020-03-21 stsp if (kill(fetchpid, SIGTERM) == -1)
2080 9c52365f 2020-03-21 stsp error = got_error_from_errno("kill");
2081 9c52365f 2020-03-21 stsp if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2082 9c52365f 2020-03-21 stsp error = got_error_from_errno("waitpid");
2084 7848a0e1 2020-03-19 stsp if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2085 7848a0e1 2020-03-19 stsp error = got_error_from_errno("close");
2087 7848a0e1 2020-03-19 stsp got_repo_close(repo);
2088 7848a0e1 2020-03-19 stsp if (worktree)
2089 7848a0e1 2020-03-19 stsp got_worktree_close(worktree);
2090 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &refs, entry) {
2091 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2092 7848a0e1 2020-03-19 stsp free(pe->data);
2094 7848a0e1 2020-03-19 stsp got_pathlist_free(&refs);
2095 7848a0e1 2020-03-19 stsp TAILQ_FOREACH(pe, &symrefs, entry) {
2096 7848a0e1 2020-03-19 stsp free((void *)pe->path);
2097 7848a0e1 2020-03-19 stsp free(pe->data);
2099 7848a0e1 2020-03-19 stsp got_pathlist_free(&symrefs);
2100 4ba14133 2020-03-20 stsp got_pathlist_free(&wanted_branches);
2101 0e4002ca 2020-03-21 stsp got_pathlist_free(&wanted_refs);
2102 7848a0e1 2020-03-19 stsp free(id_str);
2103 7848a0e1 2020-03-19 stsp free(cwd);
2104 7848a0e1 2020-03-19 stsp free(repo_path);
2105 7848a0e1 2020-03-19 stsp free(pack_hash);
2106 7848a0e1 2020-03-19 stsp free(proto);
2107 7848a0e1 2020-03-19 stsp free(host);
2108 7848a0e1 2020-03-19 stsp free(port);
2109 7848a0e1 2020-03-19 stsp free(server_path);
2110 7848a0e1 2020-03-19 stsp free(repo_name);
2111 7848a0e1 2020-03-19 stsp return error;
2115 7848a0e1 2020-03-19 stsp __dead static void
2116 2ab43947 2020-03-18 stsp usage_checkout(void)
2118 2ab43947 2020-03-18 stsp fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2119 2ab43947 2020-03-18 stsp "[-p prefix] repository-path [worktree-path]\n", getprogname());
2123 2ab43947 2020-03-18 stsp static void
2124 2ab43947 2020-03-18 stsp show_worktree_base_ref_warning(void)
2126 2ab43947 2020-03-18 stsp fprintf(stderr, "%s: warning: could not create a reference "
2127 2ab43947 2020-03-18 stsp "to the work tree's base commit; the commit could be "
2128 2ab43947 2020-03-18 stsp "garbage-collected by Git; making the repository "
2129 2ab43947 2020-03-18 stsp "writable and running 'got update' will prevent this\n",
2130 2ab43947 2020-03-18 stsp getprogname());
2133 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg {
2134 2ab43947 2020-03-18 stsp const char *worktree_path;
2135 2ab43947 2020-03-18 stsp int had_base_commit_ref_error;
2138 2ab43947 2020-03-18 stsp static const struct got_error *
2139 2ab43947 2020-03-18 stsp checkout_progress(void *arg, unsigned char status, const char *path)
2141 2ab43947 2020-03-18 stsp struct got_checkout_progress_arg *a = arg;
2143 2ab43947 2020-03-18 stsp /* Base commit bump happens silently. */
2144 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BUMP_BASE)
2145 2ab43947 2020-03-18 stsp return NULL;
2147 2ab43947 2020-03-18 stsp if (status == GOT_STATUS_BASE_REF_ERR) {
2148 2ab43947 2020-03-18 stsp a->had_base_commit_ref_error = 1;
2149 2ab43947 2020-03-18 stsp return NULL;
2152 2ab43947 2020-03-18 stsp while (path[0] == '/')
2155 2ab43947 2020-03-18 stsp printf("%c %s/%s\n", status, a->worktree_path, path);
2156 2ab43947 2020-03-18 stsp return NULL;
2159 2ab43947 2020-03-18 stsp static const struct got_error *
2160 2ab43947 2020-03-18 stsp check_cancelled(void *arg)
2162 2ab43947 2020-03-18 stsp if (sigint_received || sigpipe_received)
2163 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_CANCELLED);
2164 2ab43947 2020-03-18 stsp return NULL;
2167 2ab43947 2020-03-18 stsp static const struct got_error *
2168 2ab43947 2020-03-18 stsp check_linear_ancestry(struct got_object_id *commit_id,
2169 2ab43947 2020-03-18 stsp struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2170 2ab43947 2020-03-18 stsp struct got_repository *repo)
2172 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2173 2ab43947 2020-03-18 stsp struct got_object_id *yca_id;
2175 2ab43947 2020-03-18 stsp err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2176 2ab43947 2020-03-18 stsp commit_id, base_commit_id, repo, check_cancelled, NULL);
2178 2ab43947 2020-03-18 stsp return err;
2180 2ab43947 2020-03-18 stsp if (yca_id == NULL)
2181 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2184 2ab43947 2020-03-18 stsp * Require a straight line of history between the target commit
2185 2ab43947 2020-03-18 stsp * and the work tree's base commit.
2187 2ab43947 2020-03-18 stsp * Non-linear situations such as this require a rebase:
2189 2ab43947 2020-03-18 stsp * (commit) D F (base_commit)
2197 2ab43947 2020-03-18 stsp * 'got update' only handles linear cases:
2198 2ab43947 2020-03-18 stsp * Update forwards in time: A (base/yca) - B - C - D (commit)
2199 2ab43947 2020-03-18 stsp * Update backwards in time: D (base) - C - B - A (commit/yca)
2201 2ab43947 2020-03-18 stsp if (allow_forwards_in_time_only) {
2202 2ab43947 2020-03-18 stsp if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2203 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2204 2ab43947 2020-03-18 stsp } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2205 2ab43947 2020-03-18 stsp got_object_id_cmp(base_commit_id, yca_id) != 0)
2206 2ab43947 2020-03-18 stsp return got_error(GOT_ERR_ANCESTRY);
2208 2ab43947 2020-03-18 stsp free(yca_id);
2209 2ab43947 2020-03-18 stsp return NULL;
2212 2ab43947 2020-03-18 stsp static const struct got_error *
2213 2ab43947 2020-03-18 stsp check_same_branch(struct got_object_id *commit_id,
2214 2ab43947 2020-03-18 stsp struct got_reference *head_ref, struct got_object_id *yca_id,
2215 2ab43947 2020-03-18 stsp struct got_repository *repo)
2217 2ab43947 2020-03-18 stsp const struct got_error *err = NULL;
2218 2ab43947 2020-03-18 stsp struct got_commit_graph *graph = NULL;
2219 2ab43947 2020-03-18 stsp struct got_object_id *head_commit_id = NULL;
2220 2ab43947 2020-03-18 stsp int is_same_branch = 0;
2222 2ab43947 2020-03-18 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2224 2ab43947 2020-03-18 stsp goto done;
2226 2ab43947 2020-03-18 stsp if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2227 2ab43947 2020-03-18 stsp is_same_branch = 1;
2228 2ab43947 2020-03-18 stsp goto done;
2230 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2231 2ab43947 2020-03-18 stsp is_same_branch = 1;
2232 2ab43947 2020-03-18 stsp goto done;
2235 2ab43947 2020-03-18 stsp err = got_commit_graph_open(&graph, "/", 1);
2237 2ab43947 2020-03-18 stsp goto done;
2239 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2240 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2242 2ab43947 2020-03-18 stsp goto done;
2244 2ab43947 2020-03-18 stsp for (;;) {
2245 2ab43947 2020-03-18 stsp struct got_object_id *id;
2246 2ab43947 2020-03-18 stsp err = got_commit_graph_iter_next(&id, graph, repo,
2247 2ab43947 2020-03-18 stsp check_cancelled, NULL);
2248 2ab43947 2020-03-18 stsp if (err) {
2249 2ab43947 2020-03-18 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
2250 2ab43947 2020-03-18 stsp err = NULL;
2255 2ab43947 2020-03-18 stsp if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2257 2ab43947 2020-03-18 stsp if (got_object_id_cmp(id, commit_id) == 0) {
2258 2ab43947 2020-03-18 stsp is_same_branch = 1;
2264 2ab43947 2020-03-18 stsp if (graph)
2265 2ab43947 2020-03-18 stsp got_commit_graph_close(graph);
2266 2ab43947 2020-03-18 stsp free(head_commit_id);
2267 2ab43947 2020-03-18 stsp if (!err && !is_same_branch)
2268 2ab43947 2020-03-18 stsp err = got_error(GOT_ERR_ANCESTRY);
2269 2ab43947 2020-03-18 stsp return err;
2272 4ed7e80c 2018-05-20 stsp static const struct got_error *
2273 4b6c9460 2020-03-05 stsp checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2275 4b6c9460 2020-03-05 stsp static char msg[512];
2276 4b6c9460 2020-03-05 stsp const char *branch_name;
2278 4b6c9460 2020-03-05 stsp if (got_ref_is_symbolic(ref))
2279 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_symref_target(ref);
2281 4b6c9460 2020-03-05 stsp branch_name = got_ref_get_name(ref);
2283 4b6c9460 2020-03-05 stsp if (strncmp("refs/heads/", branch_name, 11) == 0)
2284 4b6c9460 2020-03-05 stsp branch_name += 11;
2286 4b6c9460 2020-03-05 stsp snprintf(msg, sizeof(msg),
2287 4b6c9460 2020-03-05 stsp "target commit is not contained in branch '%s'; "
2288 4b6c9460 2020-03-05 stsp "the branch to use must be specified with -b; "
2289 4b6c9460 2020-03-05 stsp "if necessary a new branch can be created for "
2290 4b6c9460 2020-03-05 stsp "this commit with 'got branch -c %s BRANCH_NAME'",
2291 4b6c9460 2020-03-05 stsp branch_name, commit_id_str);
2293 4b6c9460 2020-03-05 stsp return got_error_msg(GOT_ERR_ANCESTRY, msg);
2296 4b6c9460 2020-03-05 stsp static const struct got_error *
2297 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
2299 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
2300 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
2301 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
2302 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
2303 c09a553d 2018-03-12 stsp char *repo_path = NULL;
2304 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
2305 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
2306 08573d5b 2019-05-14 stsp const char *branch_name = GOT_REF_HEAD;
2307 8069f636 2019-01-12 stsp char *commit_id_str = NULL;
2308 bb51a5b4 2020-01-13 stsp int ch, same_path_prefix, allow_nonempty = 0;
2309 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2310 7f47418f 2019-12-20 stsp struct got_checkout_progress_arg cpa;
2312 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2314 bb51a5b4 2020-01-13 stsp while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2315 0bb8a95e 2018-03-12 stsp switch (ch) {
2317 08573d5b 2019-05-14 stsp branch_name = optarg;
2320 8069f636 2019-01-12 stsp commit_id_str = strdup(optarg);
2321 8069f636 2019-01-12 stsp if (commit_id_str == NULL)
2322 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2325 bb51a5b4 2020-01-13 stsp allow_nonempty = 1;
2328 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
2331 2deda0b9 2019-03-07 stsp usage_checkout();
2332 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
2336 0bb8a95e 2018-03-12 stsp argc -= optind;
2337 0bb8a95e 2018-03-12 stsp argv += optind;
2339 6715a751 2018-03-16 stsp #ifndef PROFILE
2340 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2341 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2342 c09a553d 2018-03-12 stsp err(1, "pledge");
2344 0bb8a95e 2018-03-12 stsp if (argc == 1) {
2345 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
2346 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2347 76089277 2018-04-01 stsp if (repo_path == NULL)
2348 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2349 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
2350 76089277 2018-04-01 stsp if (cwd == NULL) {
2351 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2352 76089277 2018-04-01 stsp goto done;
2354 230a42bd 2019-05-11 jcs if (path_prefix[0]) {
2355 230a42bd 2019-05-11 jcs base = basename(path_prefix);
2356 230a42bd 2019-05-11 jcs if (base == NULL) {
2357 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2358 230a42bd 2019-05-11 jcs path_prefix);
2362 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
2363 230a42bd 2019-05-11 jcs if (base == NULL) {
2364 638f9024 2019-05-13 stsp error = got_error_from_errno2("basename",
2365 230a42bd 2019-05-11 jcs repo_path);
2369 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
2370 c09a553d 2018-03-12 stsp if (dotgit)
2371 c09a553d 2018-03-12 stsp *dotgit = '\0';
2372 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2373 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
2374 c09a553d 2018-03-12 stsp free(cwd);
2375 76089277 2018-04-01 stsp goto done;
2377 c09a553d 2018-03-12 stsp free(cwd);
2378 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
2379 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
2380 76089277 2018-04-01 stsp if (repo_path == NULL) {
2381 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath", argv[0]);
2382 76089277 2018-04-01 stsp goto done;
2384 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
2385 76089277 2018-04-01 stsp if (worktree_path == NULL) {
2386 b4b3a7dd 2019-07-22 stsp if (errno != ENOENT) {
2387 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno2("realpath",
2389 b4b3a7dd 2019-07-22 stsp goto done;
2391 b4b3a7dd 2019-07-22 stsp worktree_path = strdup(argv[1]);
2392 b4b3a7dd 2019-07-22 stsp if (worktree_path == NULL) {
2393 b4b3a7dd 2019-07-22 stsp error = got_error_from_errno("strdup");
2394 b4b3a7dd 2019-07-22 stsp goto done;
2398 c09a553d 2018-03-12 stsp usage_checkout();
2400 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
2401 72151b04 2019-05-11 stsp got_path_strip_trailing_slashes(worktree_path);
2403 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2404 c09a553d 2018-03-12 stsp if (error != NULL)
2405 c02c541e 2019-03-29 stsp goto done;
2407 c530dc23 2019-07-23 stsp /* Pre-create work tree path for unveil(2) */
2408 c530dc23 2019-07-23 stsp error = got_path_mkdir(worktree_path);
2409 c530dc23 2019-07-23 stsp if (error) {
2410 80c1b583 2019-08-07 stsp if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2411 80c1b583 2019-08-07 stsp !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2412 c530dc23 2019-07-23 stsp goto done;
2413 bb51a5b4 2020-01-13 stsp if (!allow_nonempty &&
2414 bb51a5b4 2020-01-13 stsp !got_path_dir_is_empty(worktree_path)) {
2415 c530dc23 2019-07-23 stsp error = got_error_path(worktree_path,
2416 c530dc23 2019-07-23 stsp GOT_ERR_DIR_NOT_EMPTY);
2417 c530dc23 2019-07-23 stsp goto done;
2421 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2422 c02c541e 2019-03-29 stsp if (error)
2423 c09a553d 2018-03-12 stsp goto done;
2425 08573d5b 2019-05-14 stsp error = got_ref_open(&head_ref, repo, branch_name, 0);
2426 c09a553d 2018-03-12 stsp if (error != NULL)
2427 c09a553d 2018-03-12 stsp goto done;
2429 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2430 d70b8e30 2018-12-27 stsp if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2431 c09a553d 2018-03-12 stsp goto done;
2433 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
2434 c09a553d 2018-03-12 stsp if (error != NULL)
2435 c09a553d 2018-03-12 stsp goto done;
2437 e5dc7198 2018-12-29 stsp error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2438 e5dc7198 2018-12-29 stsp path_prefix);
2439 e5dc7198 2018-12-29 stsp if (error != NULL)
2440 e5dc7198 2018-12-29 stsp goto done;
2441 e5dc7198 2018-12-29 stsp if (!same_path_prefix) {
2442 49520a32 2018-12-29 stsp error = got_error(GOT_ERR_PATH_PREFIX);
2443 49520a32 2018-12-29 stsp goto done;
2446 8069f636 2019-01-12 stsp if (commit_id_str) {
2447 04f57cb3 2019-07-25 stsp struct got_object_id *commit_id;
2448 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2449 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2450 30837e32 2019-07-25 stsp if (error)
2451 8069f636 2019-01-12 stsp goto done;
2452 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2453 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2454 8069f636 2019-01-12 stsp if (error != NULL) {
2455 8069f636 2019-01-12 stsp free(commit_id);
2456 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2457 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2458 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2460 8069f636 2019-01-12 stsp goto done;
2462 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2463 4b6c9460 2020-03-05 stsp if (error) {
2464 4b6c9460 2020-03-05 stsp if (error->code == GOT_ERR_ANCESTRY) {
2465 4b6c9460 2020-03-05 stsp error = checkout_ancestry_error(
2466 4b6c9460 2020-03-05 stsp head_ref, commit_id_str);
2468 45d344f6 2019-05-14 stsp goto done;
2470 8069f636 2019-01-12 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2471 8069f636 2019-01-12 stsp commit_id);
2472 8069f636 2019-01-12 stsp free(commit_id);
2473 8069f636 2019-01-12 stsp if (error)
2474 8069f636 2019-01-12 stsp goto done;
2477 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, "", NULL);
2478 f2ea84fa 2019-07-27 stsp if (error)
2479 f2ea84fa 2019-07-27 stsp goto done;
2480 7f47418f 2019-12-20 stsp cpa.worktree_path = worktree_path;
2481 7f47418f 2019-12-20 stsp cpa.had_base_commit_ref_error = 0;
2482 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2483 7f47418f 2019-12-20 stsp checkout_progress, &cpa, check_cancelled, NULL);
2484 c09a553d 2018-03-12 stsp if (error != NULL)
2485 c09a553d 2018-03-12 stsp goto done;
2487 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
2488 7f47418f 2019-12-20 stsp if (cpa.had_base_commit_ref_error)
2489 7f47418f 2019-12-20 stsp show_worktree_base_ref_warning();
2491 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2492 8069f636 2019-01-12 stsp free(commit_id_str);
2493 76089277 2018-04-01 stsp free(repo_path);
2494 507dc3bb 2018-12-29 stsp free(worktree_path);
2495 507dc3bb 2018-12-29 stsp return error;
2498 9627c110 2020-04-18 stsp struct got_update_progress_arg {
2499 9627c110 2020-04-18 stsp int did_something;
2500 9627c110 2020-04-18 stsp int conflicts;
2501 9627c110 2020-04-18 stsp int obstructed;
2502 9627c110 2020-04-18 stsp int not_updated;
2506 9627c110 2020-04-18 stsp print_update_progress_stats(struct got_update_progress_arg *upa)
2508 9627c110 2020-04-18 stsp if (!upa->did_something)
2511 9627c110 2020-04-18 stsp if (upa->conflicts > 0)
2512 9627c110 2020-04-18 stsp printf("Files with new merge conflicts: %d\n", upa->conflicts);
2513 9627c110 2020-04-18 stsp if (upa->obstructed > 0)
2514 9627c110 2020-04-18 stsp printf("File paths obstructed by a non-regular file: %d\n",
2515 9627c110 2020-04-18 stsp upa->obstructed);
2516 9627c110 2020-04-18 stsp if (upa->not_updated > 0)
2517 9627c110 2020-04-18 stsp printf("Files not updated because of existing merge "
2518 9627c110 2020-04-18 stsp "conflicts: %d\n", upa->not_updated);
2521 507dc3bb 2018-12-29 stsp __dead static void
2522 507dc3bb 2018-12-29 stsp usage_update(void)
2524 f2ea84fa 2019-07-27 stsp fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2525 507dc3bb 2018-12-29 stsp getprogname());
2529 1ee397ad 2019-07-12 stsp static const struct got_error *
2530 507dc3bb 2018-12-29 stsp update_progress(void *arg, unsigned char status, const char *path)
2532 9627c110 2020-04-18 stsp struct got_update_progress_arg *upa = arg;
2534 7f47418f 2019-12-20 stsp if (status == GOT_STATUS_EXISTS ||
2535 7f47418f 2019-12-20 stsp status == GOT_STATUS_BASE_REF_ERR)
2536 1ee397ad 2019-07-12 stsp return NULL;
2538 9627c110 2020-04-18 stsp upa->did_something = 1;
2540 a484d721 2019-06-10 stsp /* Base commit bump happens silently. */
2541 a484d721 2019-06-10 stsp if (status == GOT_STATUS_BUMP_BASE)
2542 1ee397ad 2019-07-12 stsp return NULL;
2544 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT)
2545 9627c110 2020-04-18 stsp upa->conflicts++;
2546 9627c110 2020-04-18 stsp if (status == GOT_STATUS_OBSTRUCTED)
2547 9627c110 2020-04-18 stsp upa->obstructed++;
2548 9627c110 2020-04-18 stsp if (status == GOT_STATUS_CANNOT_UPDATE)
2549 9627c110 2020-04-18 stsp upa->not_updated++;
2551 507dc3bb 2018-12-29 stsp while (path[0] == '/')
2553 507dc3bb 2018-12-29 stsp printf("%c %s\n", status, path);
2554 1ee397ad 2019-07-12 stsp return NULL;
2557 be7061eb 2018-12-30 stsp static const struct got_error *
2558 a1fb16d8 2019-05-24 stsp switch_head_ref(struct got_reference *head_ref,
2559 a1fb16d8 2019-05-24 stsp struct got_object_id *commit_id, struct got_worktree *worktree,
2560 a1fb16d8 2019-05-24 stsp struct got_repository *repo)
2562 a1fb16d8 2019-05-24 stsp const struct got_error *err = NULL;
2563 a1fb16d8 2019-05-24 stsp char *base_id_str;
2564 a1fb16d8 2019-05-24 stsp int ref_has_moved = 0;
2566 a1fb16d8 2019-05-24 stsp /* Trivial case: switching between two different references. */
2567 a1fb16d8 2019-05-24 stsp if (strcmp(got_ref_get_name(head_ref),
2568 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree)) != 0) {
2569 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n",
2570 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree),
2571 a1fb16d8 2019-05-24 stsp got_ref_get_name(head_ref));
2572 a1fb16d8 2019-05-24 stsp return got_worktree_set_head_ref(worktree, head_ref);
2575 a1fb16d8 2019-05-24 stsp err = check_linear_ancestry(commit_id,
2576 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2577 a1fb16d8 2019-05-24 stsp if (err) {
2578 a1fb16d8 2019-05-24 stsp if (err->code != GOT_ERR_ANCESTRY)
2579 a1fb16d8 2019-05-24 stsp return err;
2580 a1fb16d8 2019-05-24 stsp ref_has_moved = 1;
2582 a1fb16d8 2019-05-24 stsp if (!ref_has_moved)
2583 a1fb16d8 2019-05-24 stsp return NULL;
2585 a1fb16d8 2019-05-24 stsp /* Switching to a rebased branch with the same reference name. */
2586 a1fb16d8 2019-05-24 stsp err = got_object_id_str(&base_id_str,
2587 a1fb16d8 2019-05-24 stsp got_worktree_get_base_commit_id(worktree));
2589 a1fb16d8 2019-05-24 stsp return err;
2590 a1fb16d8 2019-05-24 stsp printf("Reference %s now points at a different branch\n",
2591 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2592 a1fb16d8 2019-05-24 stsp printf("Switching work tree from %s to %s\n", base_id_str,
2593 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree));
2594 0ebf8283 2019-07-24 stsp return NULL;
2597 0ebf8283 2019-07-24 stsp static const struct got_error *
2598 0ebf8283 2019-07-24 stsp check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2600 0ebf8283 2019-07-24 stsp const struct got_error *err;
2601 0ebf8283 2019-07-24 stsp int in_progress;
2603 0ebf8283 2019-07-24 stsp err = got_worktree_rebase_in_progress(&in_progress, worktree);
2605 0ebf8283 2019-07-24 stsp return err;
2606 0ebf8283 2019-07-24 stsp if (in_progress)
2607 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_REBASING);
2609 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_in_progress(&in_progress, worktree);
2611 0ebf8283 2019-07-24 stsp return err;
2612 0ebf8283 2019-07-24 stsp if (in_progress)
2613 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_BUSY);
2615 a1fb16d8 2019-05-24 stsp return NULL;
2618 a5edda0a 2019-07-27 stsp static const struct got_error *
2619 a5edda0a 2019-07-27 stsp get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2620 a5edda0a 2019-07-27 stsp char *argv[], struct got_worktree *worktree)
2622 a0de39f3 2019-08-09 stsp const struct got_error *err = NULL;
2623 a5edda0a 2019-07-27 stsp char *path;
2626 a5edda0a 2019-07-27 stsp if (argc == 0) {
2627 a5edda0a 2019-07-27 stsp path = strdup("");
2628 a5edda0a 2019-07-27 stsp if (path == NULL)
2629 a5edda0a 2019-07-27 stsp return got_error_from_errno("strdup");
2630 adc19d55 2019-07-28 stsp return got_pathlist_append(paths, path, NULL);
2633 a5edda0a 2019-07-27 stsp for (i = 0; i < argc; i++) {
2634 a5edda0a 2019-07-27 stsp err = got_worktree_resolve_path(&path, worktree, argv[i]);
2637 adc19d55 2019-07-28 stsp err = got_pathlist_append(paths, path, NULL);
2638 a5edda0a 2019-07-27 stsp if (err) {
2639 a5edda0a 2019-07-27 stsp free(path);
2644 a5edda0a 2019-07-27 stsp return err;
2647 a1fb16d8 2019-05-24 stsp static const struct got_error *
2648 fa51e947 2020-03-27 stsp wrap_not_worktree_error(const struct got_error *orig_err,
2649 fa51e947 2020-03-27 stsp const char *cmdname, const char *path)
2651 fa51e947 2020-03-27 stsp const struct got_error *err;
2652 fa51e947 2020-03-27 stsp struct got_repository *repo;
2653 fa51e947 2020-03-27 stsp static char msg[512];
2655 fa51e947 2020-03-27 stsp err = got_repo_open(&repo, path, NULL);
2657 fa51e947 2020-03-27 stsp return orig_err;
2659 fa51e947 2020-03-27 stsp snprintf(msg, sizeof(msg),
2660 fa51e947 2020-03-27 stsp "'got %s' needs a work tree in addition to a git repository\n"
2661 fa51e947 2020-03-27 stsp "Work trees can be checked out from this Git repository with "
2662 fa51e947 2020-03-27 stsp "'got checkout'.\n"
2663 fa51e947 2020-03-27 stsp "The got(1) manual page contains more information.", cmdname);
2664 fa51e947 2020-03-27 stsp err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2665 fa51e947 2020-03-27 stsp got_repo_close(repo);
2666 fa51e947 2020-03-27 stsp return err;
2669 fa51e947 2020-03-27 stsp static const struct got_error *
2670 507dc3bb 2018-12-29 stsp cmd_update(int argc, char *argv[])
2672 507dc3bb 2018-12-29 stsp const struct got_error *error = NULL;
2673 507dc3bb 2018-12-29 stsp struct got_repository *repo = NULL;
2674 507dc3bb 2018-12-29 stsp struct got_worktree *worktree = NULL;
2675 f2ea84fa 2019-07-27 stsp char *worktree_path = NULL;
2676 507dc3bb 2018-12-29 stsp struct got_object_id *commit_id = NULL;
2677 9c4b8182 2019-01-02 stsp char *commit_id_str = NULL;
2678 024e9686 2019-05-14 stsp const char *branch_name = NULL;
2679 024e9686 2019-05-14 stsp struct got_reference *head_ref = NULL;
2680 f2ea84fa 2019-07-27 stsp struct got_pathlist_head paths;
2681 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2683 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
2685 f2ea84fa 2019-07-27 stsp TAILQ_INIT(&paths);
2687 024e9686 2019-05-14 stsp while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2688 507dc3bb 2018-12-29 stsp switch (ch) {
2690 024e9686 2019-05-14 stsp branch_name = optarg;
2693 9c4b8182 2019-01-02 stsp commit_id_str = strdup(optarg);
2694 9c4b8182 2019-01-02 stsp if (commit_id_str == NULL)
2695 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2698 2deda0b9 2019-03-07 stsp usage_update();
2699 507dc3bb 2018-12-29 stsp /* NOTREACHED */
2703 507dc3bb 2018-12-29 stsp argc -= optind;
2704 507dc3bb 2018-12-29 stsp argv += optind;
2706 507dc3bb 2018-12-29 stsp #ifndef PROFILE
2707 68ed9ba5 2019-02-10 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2708 68ed9ba5 2019-02-10 stsp "unveil", NULL) == -1)
2709 507dc3bb 2018-12-29 stsp err(1, "pledge");
2711 c4cdcb68 2019-04-03 stsp worktree_path = getcwd(NULL, 0);
2712 c4cdcb68 2019-04-03 stsp if (worktree_path == NULL) {
2713 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2714 c4cdcb68 2019-04-03 stsp goto done;
2716 c4cdcb68 2019-04-03 stsp error = got_worktree_open(&worktree, worktree_path);
2717 fa51e947 2020-03-27 stsp if (error) {
2718 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
2719 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "update",
2720 fa51e947 2020-03-27 stsp worktree_path);
2721 7d5807f4 2019-07-11 stsp goto done;
2724 0ebf8283 2019-07-24 stsp error = check_rebase_or_histedit_in_progress(worktree);
2725 f2ea84fa 2019-07-27 stsp if (error)
2726 f2ea84fa 2019-07-27 stsp goto done;
2728 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2730 507dc3bb 2018-12-29 stsp if (error != NULL)
2731 507dc3bb 2018-12-29 stsp goto done;
2733 97430839 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
2734 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
2735 087fb88c 2019-08-04 stsp if (error)
2736 087fb88c 2019-08-04 stsp goto done;
2738 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2739 0266afb7 2019-01-04 stsp if (error)
2740 0266afb7 2019-01-04 stsp goto done;
2742 a1fb16d8 2019-05-24 stsp error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2743 a1fb16d8 2019-05-24 stsp got_worktree_get_head_ref_name(worktree), 0);
2744 024e9686 2019-05-14 stsp if (error != NULL)
2745 024e9686 2019-05-14 stsp goto done;
2746 507dc3bb 2018-12-29 stsp if (commit_id_str == NULL) {
2747 507dc3bb 2018-12-29 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2748 9c4b8182 2019-01-02 stsp if (error != NULL)
2749 9c4b8182 2019-01-02 stsp goto done;
2750 9c4b8182 2019-01-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
2751 507dc3bb 2018-12-29 stsp if (error != NULL)
2752 507dc3bb 2018-12-29 stsp goto done;
2754 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
2755 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2756 04f57cb3 2019-07-25 stsp free(commit_id_str);
2757 bb787f09 2019-07-25 stsp commit_id_str = NULL;
2758 30837e32 2019-07-25 stsp if (error)
2759 a297e751 2019-07-11 stsp goto done;
2760 a297e751 2019-07-11 stsp error = got_object_id_str(&commit_id_str, commit_id);
2761 a297e751 2019-07-11 stsp if (error)
2762 507dc3bb 2018-12-29 stsp goto done;
2765 a1fb16d8 2019-05-24 stsp if (branch_name) {
2766 024e9686 2019-05-14 stsp struct got_object_id *head_commit_id;
2767 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry) {
2768 f2b16ada 2019-08-02 stsp if (pe->path_len == 0)
2770 f2ea84fa 2019-07-27 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
2771 f2ea84fa 2019-07-27 stsp "switching between branches requires that "
2772 f2ea84fa 2019-07-27 stsp "the entire work tree gets updated");
2773 024e9686 2019-05-14 stsp goto done;
2775 024e9686 2019-05-14 stsp error = got_ref_resolve(&head_commit_id, repo, head_ref);
2776 024e9686 2019-05-14 stsp if (error)
2777 024e9686 2019-05-14 stsp goto done;
2778 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, head_commit_id, 0,
2780 a367ff0f 2019-05-14 stsp free(head_commit_id);
2781 024e9686 2019-05-14 stsp if (error != NULL)
2782 024e9686 2019-05-14 stsp goto done;
2783 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2784 a367ff0f 2019-05-14 stsp if (error)
2785 a367ff0f 2019-05-14 stsp goto done;
2786 a1fb16d8 2019-05-24 stsp error = switch_head_ref(head_ref, commit_id, worktree, repo);
2787 024e9686 2019-05-14 stsp if (error)
2788 024e9686 2019-05-14 stsp goto done;
2790 024e9686 2019-05-14 stsp error = check_linear_ancestry(commit_id,
2791 3aef623b 2019-10-15 stsp got_worktree_get_base_commit_id(worktree), 0, repo);
2792 a367ff0f 2019-05-14 stsp if (error != NULL) {
2793 a367ff0f 2019-05-14 stsp if (error->code == GOT_ERR_ANCESTRY)
2794 a367ff0f 2019-05-14 stsp error = got_error(GOT_ERR_BRANCH_MOVED);
2795 024e9686 2019-05-14 stsp goto done;
2797 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
2798 a367ff0f 2019-05-14 stsp if (error)
2799 a367ff0f 2019-05-14 stsp goto done;
2802 507dc3bb 2018-12-29 stsp if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2803 507dc3bb 2018-12-29 stsp commit_id) != 0) {
2804 507dc3bb 2018-12-29 stsp error = got_worktree_set_base_commit_id(worktree, repo,
2805 507dc3bb 2018-12-29 stsp commit_id);
2806 507dc3bb 2018-12-29 stsp if (error)
2807 507dc3bb 2018-12-29 stsp goto done;
2810 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
2811 f2ea84fa 2019-07-27 stsp error = got_worktree_checkout_files(worktree, &paths, repo,
2812 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
2813 507dc3bb 2018-12-29 stsp if (error != NULL)
2814 507dc3bb 2018-12-29 stsp goto done;
2816 9627c110 2020-04-18 stsp if (upa.did_something)
2817 784955db 2019-01-12 stsp printf("Updated to commit %s\n", commit_id_str);
2819 784955db 2019-01-12 stsp printf("Already up-to-date\n");
2820 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
2822 c09a553d 2018-03-12 stsp free(worktree_path);
2823 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
2824 f2ea84fa 2019-07-27 stsp free((char *)pe->path);
2825 f2ea84fa 2019-07-27 stsp got_pathlist_free(&paths);
2826 507dc3bb 2018-12-29 stsp free(commit_id);
2827 9c4b8182 2019-01-02 stsp free(commit_id_str);
2828 c09a553d 2018-03-12 stsp return error;
2831 f42b1b34 2018-03-12 stsp static const struct got_error *
2832 44392932 2019-08-25 stsp diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2833 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2834 63035f9f 2019-10-06 stsp struct got_repository *repo)
2836 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
2837 44392932 2019-08-25 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2839 44392932 2019-08-25 stsp if (blob_id1) {
2840 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2842 44392932 2019-08-25 stsp goto done;
2845 44392932 2019-08-25 stsp err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2847 44392932 2019-08-25 stsp goto done;
2849 44392932 2019-08-25 stsp while (path[0] == '/')
2851 44392932 2019-08-25 stsp err = got_diff_blob(blob1, blob2, path, path, diff_context,
2852 63035f9f 2019-10-06 stsp ignore_whitespace, stdout);
2854 44392932 2019-08-25 stsp if (blob1)
2855 44392932 2019-08-25 stsp got_object_blob_close(blob1);
2856 44392932 2019-08-25 stsp got_object_blob_close(blob2);
2857 44392932 2019-08-25 stsp return err;
2860 44392932 2019-08-25 stsp static const struct got_error *
2861 44392932 2019-08-25 stsp diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2862 63035f9f 2019-10-06 stsp const char *path, int diff_context, int ignore_whitespace,
2863 63035f9f 2019-10-06 stsp struct got_repository *repo)
2865 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2866 44392932 2019-08-25 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2867 44392932 2019-08-25 stsp struct got_diff_blob_output_unidiff_arg arg;
2869 44392932 2019-08-25 stsp if (tree_id1) {
2870 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2872 44392932 2019-08-25 stsp goto done;
2875 44392932 2019-08-25 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2877 0f2b3dca 2018-12-22 stsp goto done;
2879 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
2880 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
2881 aaa13589 2019-06-01 stsp arg.outfile = stdout;
2882 44392932 2019-08-25 stsp while (path[0] == '/')
2884 44392932 2019-08-25 stsp err = got_diff_tree(tree1, tree2, path, path, repo,
2885 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
2887 79109fed 2018-03-27 stsp if (tree1)
2888 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
2889 366e0a5f 2019-10-10 stsp if (tree2)
2890 366e0a5f 2019-10-10 stsp got_object_tree_close(tree2);
2891 44392932 2019-08-25 stsp return err;
2894 44392932 2019-08-25 stsp static const struct got_error *
2895 44392932 2019-08-25 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
2896 44392932 2019-08-25 stsp const char *path, int diff_context, struct got_repository *repo)
2898 44392932 2019-08-25 stsp const struct got_error *err = NULL;
2899 44392932 2019-08-25 stsp struct got_commit_object *pcommit = NULL;
2900 44392932 2019-08-25 stsp char *id_str1 = NULL, *id_str2 = NULL;
2901 44392932 2019-08-25 stsp struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2902 44392932 2019-08-25 stsp struct got_object_qid *qid;
2904 44392932 2019-08-25 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2905 44392932 2019-08-25 stsp if (qid != NULL) {
2906 44392932 2019-08-25 stsp err = got_object_open_as_commit(&pcommit, repo,
2909 44392932 2019-08-25 stsp return err;
2912 44392932 2019-08-25 stsp if (path && path[0] != '\0') {
2913 44392932 2019-08-25 stsp int obj_type;
2914 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id2, repo, id, path);
2916 44392932 2019-08-25 stsp goto done;
2917 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2918 44392932 2019-08-25 stsp if (err) {
2919 44392932 2019-08-25 stsp free(obj_id2);
2920 44392932 2019-08-25 stsp goto done;
2922 44392932 2019-08-25 stsp if (pcommit) {
2923 44392932 2019-08-25 stsp err = got_object_id_by_path(&obj_id1, repo,
2924 44392932 2019-08-25 stsp qid->id, path);
2925 44392932 2019-08-25 stsp if (err) {
2926 2e8c69d1 2020-05-04 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY) {
2927 2e8c69d1 2020-05-04 stsp free(obj_id2);
2928 2e8c69d1 2020-05-04 stsp goto done;
2931 2e8c69d1 2020-05-04 stsp err = got_object_id_str(&id_str1, obj_id1);
2932 2e8c69d1 2020-05-04 stsp if (err) {
2933 2e8c69d1 2020-05-04 stsp free(obj_id2);
2934 2e8c69d1 2020-05-04 stsp goto done;
2938 44392932 2019-08-25 stsp err = got_object_get_type(&obj_type, repo, obj_id2);
2939 44392932 2019-08-25 stsp if (err) {
2940 44392932 2019-08-25 stsp free(obj_id2);
2941 44392932 2019-08-25 stsp goto done;
2943 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2944 44392932 2019-08-25 stsp switch (obj_type) {
2945 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_BLOB:
2946 44392932 2019-08-25 stsp err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2949 44392932 2019-08-25 stsp case GOT_OBJ_TYPE_TREE:
2950 44392932 2019-08-25 stsp err = diff_trees(obj_id1, obj_id2, path, diff_context,
2954 44392932 2019-08-25 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2957 44392932 2019-08-25 stsp free(obj_id1);
2958 44392932 2019-08-25 stsp free(obj_id2);
2960 44392932 2019-08-25 stsp obj_id2 = got_object_commit_get_tree_id(commit);
2961 44392932 2019-08-25 stsp err = got_object_id_str(&id_str2, obj_id2);
2963 44392932 2019-08-25 stsp goto done;
2964 44392932 2019-08-25 stsp obj_id1 = got_object_commit_get_tree_id(pcommit);
2965 44392932 2019-08-25 stsp err = got_object_id_str(&id_str1, obj_id1);
2967 44392932 2019-08-25 stsp goto done;
2968 44392932 2019-08-25 stsp printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2969 63035f9f 2019-10-06 stsp err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
2972 0f2b3dca 2018-12-22 stsp free(id_str1);
2973 0f2b3dca 2018-12-22 stsp free(id_str2);
2974 44392932 2019-08-25 stsp if (pcommit)
2975 44392932 2019-08-25 stsp got_object_commit_close(pcommit);
2976 79109fed 2018-03-27 stsp return err;
2979 4bb494d5 2018-06-16 stsp static char *
2980 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
2982 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2983 09867e48 2019-08-13 stsp char *p, *s;
2985 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2986 09867e48 2019-08-13 stsp if (tm == NULL)
2987 09867e48 2019-08-13 stsp return NULL;
2988 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2989 09867e48 2019-08-13 stsp if (s == NULL)
2990 09867e48 2019-08-13 stsp return NULL;
2991 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
2993 6c281f94 2018-06-11 stsp *p = '\0';
2997 6841bf13 2019-11-29 kn static const struct got_error *
2998 6841bf13 2019-11-29 kn match_logmsg(int *have_match, struct got_object_id *id,
2999 6841bf13 2019-11-29 kn struct got_commit_object *commit, regex_t *regex)
3001 6841bf13 2019-11-29 kn const struct got_error *err = NULL;
3002 6841bf13 2019-11-29 kn regmatch_t regmatch;
3003 6841bf13 2019-11-29 kn char *id_str = NULL, *logmsg = NULL;
3005 6841bf13 2019-11-29 kn *have_match = 0;
3007 6841bf13 2019-11-29 kn err = got_object_id_str(&id_str, id);
3011 6841bf13 2019-11-29 kn err = got_object_commit_get_logmsg(&logmsg, commit);
3015 6841bf13 2019-11-29 kn if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3016 6841bf13 2019-11-29 kn *have_match = 1;
3018 6841bf13 2019-11-29 kn free(id_str);
3019 6841bf13 2019-11-29 kn free(logmsg);
3023 dc424a06 2019-08-07 stsp #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3025 79109fed 2018-03-27 stsp static const struct got_error *
3026 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
3027 44392932 2019-08-25 stsp struct got_repository *repo, const char *path, int show_patch,
3028 44392932 2019-08-25 stsp int diff_context, struct got_reflist_head *refs)
3030 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
3031 621015ac 2018-07-23 stsp char *id_str, *datestr, *logmsg0, *logmsg, *line;
3032 6c281f94 2018-06-11 stsp char datebuf[26];
3033 45d799e2 2018-12-23 stsp time_t committer_time;
3034 45d799e2 2018-12-23 stsp const char *author, *committer;
3035 199a4027 2019-02-02 stsp char *refs_str = NULL;
3036 199a4027 2019-02-02 stsp struct got_reflist_entry *re;
3038 199a4027 2019-02-02 stsp SIMPLEQ_FOREACH(re, refs, entry) {
3040 199a4027 2019-02-02 stsp const char *name;
3041 a436ad14 2019-08-13 stsp struct got_tag_object *tag = NULL;
3044 199a4027 2019-02-02 stsp name = got_ref_get_name(re->ref);
3045 d9498b20 2019-02-05 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
3047 199a4027 2019-02-02 stsp if (strncmp(name, "refs/", 5) == 0)
3048 199a4027 2019-02-02 stsp name += 5;
3049 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
3051 e34f9ed6 2019-02-02 stsp if (strncmp(name, "heads/", 6) == 0)
3052 e34f9ed6 2019-02-02 stsp name += 6;
3053 4343a07f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
3054 141c2bff 2019-02-04 stsp name += 8;
3055 4343a07f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
3056 4343a07f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
3059 a436ad14 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
3060 a436ad14 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
3061 5d844a1e 2019-08-13 stsp if (err) {
3062 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
3063 5d844a1e 2019-08-13 stsp return err;
3064 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
3065 5d844a1e 2019-08-13 stsp err = NULL;
3066 5d844a1e 2019-08-13 stsp tag = NULL;
3069 a436ad14 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
3070 a436ad14 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
3072 a436ad14 2019-08-13 stsp got_object_tag_close(tag);
3073 a436ad14 2019-08-13 stsp if (cmp != 0)
3075 199a4027 2019-02-02 stsp s = refs_str;
3076 199a4027 2019-02-02 stsp if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3077 199a4027 2019-02-02 stsp name) == -1) {
3078 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3080 34ca4898 2019-08-13 stsp return err;
3084 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
3086 8bf5b3c9 2018-03-17 stsp return err;
3088 dc424a06 2019-08-07 stsp printf(GOT_COMMIT_SEP_STR);
3089 199a4027 2019-02-02 stsp printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3090 199a4027 2019-02-02 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3091 832c249c 2018-06-10 stsp free(id_str);
3092 d3d493d7 2019-02-21 stsp id_str = NULL;
3093 d3d493d7 2019-02-21 stsp free(refs_str);
3094 d3d493d7 2019-02-21 stsp refs_str = NULL;
3095 45d799e2 2018-12-23 stsp printf("from: %s\n", got_object_commit_get_author(commit));
3096 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3097 45d799e2 2018-12-23 stsp datestr = get_datestr(&committer_time, datebuf);
3098 09867e48 2019-08-13 stsp if (datestr)
3099 09867e48 2019-08-13 stsp printf("date: %s UTC\n", datestr);
3100 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3101 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3102 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0)
3103 45d799e2 2018-12-23 stsp printf("via: %s\n", committer);
3104 45d799e2 2018-12-23 stsp if (got_object_commit_get_nparents(commit) > 1) {
3105 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3106 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
3107 3fe1abad 2018-06-10 stsp int n = 1;
3108 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3109 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3110 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
3112 a0603db2 2018-06-10 stsp return err;
3113 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
3114 a0603db2 2018-06-10 stsp free(id_str);
3118 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
3120 5943eee2 2019-08-13 stsp return err;
3122 621015ac 2018-07-23 stsp logmsg = logmsg0;
3124 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
3126 832c249c 2018-06-10 stsp printf(" %s\n", line);
3127 832c249c 2018-06-10 stsp } while (line);
3128 621015ac 2018-07-23 stsp free(logmsg0);
3130 971751ac 2018-03-27 stsp if (show_patch) {
3131 44392932 2019-08-25 stsp err = print_patch(commit, id, path, diff_context, repo);
3132 971751ac 2018-03-27 stsp if (err == 0)
3133 971751ac 2018-03-27 stsp printf("\n");
3136 cbe7f848 2019-02-11 stsp if (fflush(stdout) != 0 && err == NULL)
3137 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3138 07862c20 2018-09-15 stsp return err;
3141 f42b1b34 2018-03-12 stsp static const struct got_error *
3142 d1fe46f9 2020-04-18 stsp print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3143 d1fe46f9 2020-04-18 stsp struct got_repository *repo, const char *path, int show_patch,
3144 d1fe46f9 2020-04-18 stsp const char *search_pattern, int diff_context, int limit, int log_branches,
3145 dbec59df 2020-04-18 stsp int reverse_display_order, struct got_reflist_head *refs)
3147 f42b1b34 2018-03-12 stsp const struct got_error *err;
3148 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
3149 6841bf13 2019-11-29 kn regex_t regex;
3150 6841bf13 2019-11-29 kn int have_match;
3151 dbec59df 2020-04-18 stsp struct got_object_id_queue reversed_commits;
3152 dbec59df 2020-04-18 stsp struct got_object_qid *qid;
3153 dbec59df 2020-04-18 stsp struct got_commit_object *commit;
3155 dbec59df 2020-04-18 stsp SIMPLEQ_INIT(&reversed_commits);
3157 ccecc9fd 2020-04-18 stsp if (search_pattern && regcomp(®ex, search_pattern,
3158 ccecc9fd 2020-04-18 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3159 6841bf13 2019-11-29 kn return got_error_msg(GOT_ERR_REGEX, search_pattern);
3161 48c8c60d 2020-01-27 stsp err = got_commit_graph_open(&graph, path, !log_branches);
3163 f42b1b34 2018-03-12 stsp return err;
3164 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, root_id, repo,
3165 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
3167 fcc85cad 2018-07-22 stsp goto done;
3169 372ccdbb 2018-06-10 stsp struct got_object_id *id;
3171 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
3174 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo,
3175 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
3176 372ccdbb 2018-06-10 stsp if (err) {
3177 ee780d5c 2020-01-04 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
3178 9ba79e04 2018-06-11 stsp err = NULL;
3181 b43fbaa0 2018-06-11 stsp if (id == NULL)
3184 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
3188 6841bf13 2019-11-29 kn if (search_pattern) {
3189 6841bf13 2019-11-29 kn err = match_logmsg(&have_match, id, commit, ®ex);
3191 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3194 6841bf13 2019-11-29 kn if (have_match == 0) {
3195 6841bf13 2019-11-29 kn got_object_commit_close(commit);
3200 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3201 dbec59df 2020-04-18 stsp err = got_object_qid_alloc(&qid, id);
3204 dbec59df 2020-04-18 stsp SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3205 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3207 dbec59df 2020-04-18 stsp err = print_commit(commit, id, repo, path, show_patch,
3208 dbec59df 2020-04-18 stsp diff_context, refs);
3209 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3213 dbec59df 2020-04-18 stsp if ((limit && --limit == 0) ||
3214 dbec59df 2020-04-18 stsp (end_id && got_object_id_cmp(id, end_id) == 0))
3217 dbec59df 2020-04-18 stsp if (reverse_display_order) {
3218 dbec59df 2020-04-18 stsp SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3219 dbec59df 2020-04-18 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
3222 dbec59df 2020-04-18 stsp err = print_commit(commit, qid->id, repo, path,
3223 dbec59df 2020-04-18 stsp show_patch, diff_context, refs);
3224 dbec59df 2020-04-18 stsp got_object_commit_close(commit);
3230 dbec59df 2020-04-18 stsp while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3231 dbec59df 2020-04-18 stsp qid = SIMPLEQ_FIRST(&reversed_commits);
3232 dbec59df 2020-04-18 stsp SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3233 dbec59df 2020-04-18 stsp got_object_qid_free(qid);
3235 6841bf13 2019-11-29 kn if (search_pattern)
3236 6841bf13 2019-11-29 kn regfree(®ex);
3237 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
3238 f42b1b34 2018-03-12 stsp return err;
3241 4ed7e80c 2018-05-20 stsp __dead static void
3242 6f3d1eb0 2018-03-12 stsp usage_log(void)
3244 d1fe46f9 2020-04-18 stsp fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3245 dbec59df 2020-04-18 stsp "[-p] [-x commit] [-s search-pattern] [-r repository-path] [-R] "
3246 d1fe46f9 2020-04-18 stsp "[path]\n", getprogname());
3250 b1ebc001 2019-08-13 stsp static int
3251 b1ebc001 2019-08-13 stsp get_default_log_limit(void)
3253 b1ebc001 2019-08-13 stsp const char *got_default_log_limit;
3254 b1ebc001 2019-08-13 stsp long long n;
3255 b1ebc001 2019-08-13 stsp const char *errstr;
3257 b1ebc001 2019-08-13 stsp got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3258 b1ebc001 2019-08-13 stsp if (got_default_log_limit == NULL)
3260 b1ebc001 2019-08-13 stsp n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3261 b1ebc001 2019-08-13 stsp if (errstr != NULL)
3266 d1fe46f9 2020-04-18 stsp static const struct got_error *
3267 d1fe46f9 2020-04-18 stsp resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3268 d1fe46f9 2020-04-18 stsp struct got_repository *repo)
3270 d1fe46f9 2020-04-18 stsp const struct got_error *err = NULL;
3271 d1fe46f9 2020-04-18 stsp struct got_reference *ref;
3273 d1fe46f9 2020-04-18 stsp *id = NULL;
3275 d1fe46f9 2020-04-18 stsp err = got_ref_open(&ref, repo, commit_arg, 0);
3276 d1fe46f9 2020-04-18 stsp if (err == NULL) {
3277 d1fe46f9 2020-04-18 stsp int obj_type;
3278 d1fe46f9 2020-04-18 stsp err = got_ref_resolve(id, repo, ref);
3279 d1fe46f9 2020-04-18 stsp got_ref_close(ref);
3281 d1fe46f9 2020-04-18 stsp return err;
3282 d1fe46f9 2020-04-18 stsp err = got_object_get_type(&obj_type, repo, *id);
3284 d1fe46f9 2020-04-18 stsp return err;
3285 d1fe46f9 2020-04-18 stsp if (obj_type == GOT_OBJ_TYPE_TAG) {
3286 d1fe46f9 2020-04-18 stsp struct got_tag_object *tag;
3287 d1fe46f9 2020-04-18 stsp err = got_object_open_as_tag(&tag, repo, *id);
3289 d1fe46f9 2020-04-18 stsp return err;
3290 d1fe46f9 2020-04-18 stsp if (got_object_tag_get_object_type(tag) !=
3291 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT) {
3292 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3293 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3295 d1fe46f9 2020-04-18 stsp free(*id);
3296 d1fe46f9 2020-04-18 stsp *id = got_object_id_dup(
3297 d1fe46f9 2020-04-18 stsp got_object_tag_get_object_id(tag));
3298 d1fe46f9 2020-04-18 stsp if (*id == NULL)
3299 d1fe46f9 2020-04-18 stsp err = got_error_from_errno(
3300 d1fe46f9 2020-04-18 stsp "got_object_id_dup");
3301 d1fe46f9 2020-04-18 stsp got_object_tag_close(tag);
3303 d1fe46f9 2020-04-18 stsp return err;
3304 d1fe46f9 2020-04-18 stsp } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3305 d1fe46f9 2020-04-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3307 d1fe46f9 2020-04-18 stsp err = got_repo_match_object_id_prefix(id, commit_arg,
3308 d1fe46f9 2020-04-18 stsp GOT_OBJ_TYPE_COMMIT, repo);
3311 d1fe46f9 2020-04-18 stsp return err;
3314 4ed7e80c 2018-05-20 stsp static const struct got_error *
3315 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
3317 f42b1b34 2018-03-12 stsp const struct got_error *error;
3318 04ca23f4 2018-07-16 stsp struct got_repository *repo = NULL;
3319 cffc0aa4 2019-02-05 stsp struct got_worktree *worktree = NULL;
3320 d1fe46f9 2020-04-18 stsp struct got_object_id *start_id = NULL, *end_id = NULL;
3321 04ca23f4 2018-07-16 stsp char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3322 d1fe46f9 2020-04-18 stsp const char *start_commit = NULL, *end_commit = NULL;
3323 d1fe46f9 2020-04-18 stsp const char *search_pattern = NULL;
3324 dc1edbfa 2019-11-29 kn int diff_context = -1, ch;
3325 48c8c60d 2020-01-27 stsp int show_patch = 0, limit = 0, log_branches = 0;
3326 dbec59df 2020-04-18 stsp int reverse_display_order = 0;
3327 64a96a6d 2018-04-01 stsp const char *errstr;
3328 199a4027 2019-02-02 stsp struct got_reflist_head refs;
3330 1b3893a2 2019-03-18 stsp SIMPLEQ_INIT(&refs);
3332 6715a751 2018-03-16 stsp #ifndef PROFILE
3333 6098196c 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3336 f42b1b34 2018-03-12 stsp err(1, "pledge");
3339 b1ebc001 2019-08-13 stsp limit = get_default_log_limit();
3341 dbec59df 2020-04-18 stsp while ((ch = getopt(argc, argv, "bpc:C:l:r:Rs:x:")) != -1) {
3342 79109fed 2018-03-27 stsp switch (ch) {
3344 79109fed 2018-03-27 stsp show_patch = 1;
3347 d142fc45 2018-04-01 stsp start_commit = optarg;
3350 4a8520aa 2018-10-18 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3352 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3353 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3356 b1ebc001 2019-08-13 stsp limit = strtonum(optarg, 0, INT_MAX, &errstr);
3357 64a96a6d 2018-04-01 stsp if (errstr != NULL)
3358 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
3361 48c8c60d 2020-01-27 stsp log_branches = 1;
3364 04ca23f4 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3365 04ca23f4 2018-07-16 stsp if (repo_path == NULL)
3366 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3368 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3371 dbec59df 2020-04-18 stsp reverse_display_order = 1;
3374 6841bf13 2019-11-29 kn search_pattern = optarg;
3377 d1fe46f9 2020-04-18 stsp end_commit = optarg;
3380 2deda0b9 2019-03-07 stsp usage_log();
3381 79109fed 2018-03-27 stsp /* NOTREACHED */
3385 79109fed 2018-03-27 stsp argc -= optind;
3386 79109fed 2018-03-27 stsp argv += optind;
3388 dc1edbfa 2019-11-29 kn if (diff_context == -1)
3389 dc1edbfa 2019-11-29 kn diff_context = 3;
3390 dc1edbfa 2019-11-29 kn else if (!show_patch)
3391 dc1edbfa 2019-11-29 kn errx(1, "-C reguires -p");
3393 04ca23f4 2018-07-16 stsp cwd = getcwd(NULL, 0);
3394 04ca23f4 2018-07-16 stsp if (cwd == NULL) {
3395 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3396 04ca23f4 2018-07-16 stsp goto done;
3399 50f2fada 2020-04-24 stsp if (repo_path == NULL) {
3400 50f2fada 2020-04-24 stsp error = got_worktree_open(&worktree, cwd);
3401 50f2fada 2020-04-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3402 50f2fada 2020-04-24 stsp goto done;
3403 50f2fada 2020-04-24 stsp error = NULL;
3406 e7301579 2019-03-18 stsp if (argc == 0) {
3407 cbd1af7a 2019-03-18 stsp path = strdup("");
3408 e7301579 2019-03-18 stsp if (path == NULL) {
3409 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3410 cbd1af7a 2019-03-18 stsp goto done;
3412 e7301579 2019-03-18 stsp } else if (argc == 1) {
3413 e7301579 2019-03-18 stsp if (worktree) {
3414 e7301579 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3416 e7301579 2019-03-18 stsp if (error)
3417 e7301579 2019-03-18 stsp goto done;
3419 e7301579 2019-03-18 stsp path = strdup(argv[0]);
3420 e7301579 2019-03-18 stsp if (path == NULL) {
3421 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3422 e7301579 2019-03-18 stsp goto done;
3426 cbd1af7a 2019-03-18 stsp usage_log();
3428 5486daa2 2019-05-11 stsp if (repo_path == NULL) {
3429 5486daa2 2019-05-11 stsp repo_path = worktree ?
3430 5486daa2 2019-05-11 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3432 04ca23f4 2018-07-16 stsp if (repo_path == NULL) {
3433 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3434 cffc0aa4 2019-02-05 stsp goto done;
3437 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3438 d7d4f210 2018-03-12 stsp if (error != NULL)
3439 04ca23f4 2018-07-16 stsp goto done;
3441 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3442 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3443 c02c541e 2019-03-29 stsp if (error)
3444 c02c541e 2019-03-29 stsp goto done;
3446 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
3447 3235492e 2018-04-01 stsp struct got_reference *head_ref;
3448 d1fe46f9 2020-04-18 stsp struct got_commit_object *commit = NULL;
3449 1cc14b9f 2019-05-14 stsp error = got_ref_open(&head_ref, repo,
3450 1cc14b9f 2019-05-14 stsp worktree ? got_worktree_get_head_ref_name(worktree)
3451 1cc14b9f 2019-05-14 stsp : GOT_REF_HEAD, 0);
3452 3235492e 2018-04-01 stsp if (error != NULL)
3453 d1fe46f9 2020-04-18 stsp goto done;
3454 d1fe46f9 2020-04-18 stsp error = got_ref_resolve(&start_id, repo, head_ref);
3455 3235492e 2018-04-01 stsp got_ref_close(head_ref);
3456 3235492e 2018-04-01 stsp if (error != NULL)
3457 d1fe46f9 2020-04-18 stsp goto done;
3458 d1fe46f9 2020-04-18 stsp error = got_object_open_as_commit(&commit, repo,
3459 d1fe46f9 2020-04-18 stsp start_id);
3460 d1fe46f9 2020-04-18 stsp if (error != NULL)
3461 d1fe46f9 2020-04-18 stsp goto done;
3462 d1fe46f9 2020-04-18 stsp got_object_commit_close(commit);
3464 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&start_id, start_commit, repo);
3465 d1fe46f9 2020-04-18 stsp if (error != NULL)
3466 d1fe46f9 2020-04-18 stsp goto done;
3468 d1fe46f9 2020-04-18 stsp if (end_commit != NULL) {
3469 d1fe46f9 2020-04-18 stsp error = resolve_commit_arg(&end_id, end_commit, repo);
3470 d1fe46f9 2020-04-18 stsp if (error != NULL)
3471 d1fe46f9 2020-04-18 stsp goto done;
3474 deeabeae 2019-08-27 stsp if (worktree) {
3475 deeabeae 2019-08-27 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3477 deeabeae 2019-08-27 stsp if (asprintf(&p, "%s%s%s", prefix,
3478 deeabeae 2019-08-27 stsp (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3479 deeabeae 2019-08-27 stsp error = got_error_from_errno("asprintf");
3480 deeabeae 2019-08-27 stsp goto done;
3482 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3485 deeabeae 2019-08-27 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3486 04ca23f4 2018-07-16 stsp if (error != NULL)
3487 04ca23f4 2018-07-16 stsp goto done;
3488 04ca23f4 2018-07-16 stsp if (in_repo_path) {
3489 04ca23f4 2018-07-16 stsp free(path);
3490 04ca23f4 2018-07-16 stsp path = in_repo_path;
3493 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3494 199a4027 2019-02-02 stsp if (error)
3495 199a4027 2019-02-02 stsp goto done;
3497 d1fe46f9 2020-04-18 stsp error = print_commits(start_id, end_id, repo, path, show_patch,
3498 dbec59df 2020-04-18 stsp search_pattern, diff_context, limit, log_branches,
3499 dbec59df 2020-04-18 stsp reverse_display_order, &refs);
3501 04ca23f4 2018-07-16 stsp free(path);
3502 04ca23f4 2018-07-16 stsp free(repo_path);
3503 04ca23f4 2018-07-16 stsp free(cwd);
3504 cffc0aa4 2019-02-05 stsp if (worktree)
3505 cffc0aa4 2019-02-05 stsp got_worktree_close(worktree);
3506 ad242220 2018-09-08 stsp if (repo) {
3507 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3508 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3509 ad242220 2018-09-08 stsp if (error == NULL)
3510 ad242220 2018-09-08 stsp error = repo_error;
3512 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3513 8bf5b3c9 2018-03-17 stsp return error;
3516 4ed7e80c 2018-05-20 stsp __dead static void
3517 3f8b7d6a 2018-04-01 stsp usage_diff(void)
3519 98eaaa12 2019-08-03 stsp fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3520 63035f9f 2019-10-06 stsp "[-w] [object1 object2 | path]\n", getprogname());
3524 b72f483a 2019-02-05 stsp struct print_diff_arg {
3525 b72f483a 2019-02-05 stsp struct got_repository *repo;
3526 b72f483a 2019-02-05 stsp struct got_worktree *worktree;
3527 b72f483a 2019-02-05 stsp int diff_context;
3528 3fc0c068 2019-02-10 stsp const char *id_str;
3529 3fc0c068 2019-02-10 stsp int header_shown;
3530 98eaaa12 2019-08-03 stsp int diff_staged;
3531 63035f9f 2019-10-06 stsp int ignore_whitespace;
3534 4ed7e80c 2018-05-20 stsp static const struct got_error *
3535 88d0e355 2019-08-03 stsp print_diff(void *arg, unsigned char status, unsigned char staged_status,
3536 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3537 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3538 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3540 b72f483a 2019-02-05 stsp struct print_diff_arg *a = arg;
3541 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3542 b72f483a 2019-02-05 stsp struct got_blob_object *blob1 = NULL;
3543 12463d8b 2019-12-13 stsp int fd = -1;
3544 b72f483a 2019-02-05 stsp FILE *f2 = NULL;
3545 4ce46740 2019-08-08 stsp char *abspath = NULL, *label1 = NULL;
3546 b72f483a 2019-02-05 stsp struct stat sb;
3548 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3549 98eaaa12 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3550 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3551 98eaaa12 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3552 98eaaa12 2019-08-03 stsp return NULL;
3554 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3555 98eaaa12 2019-08-03 stsp return NULL;
3556 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
3557 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, path);
3558 98eaaa12 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3559 98eaaa12 2019-08-03 stsp status != GOT_STATUS_ADD &&
3560 98eaaa12 2019-08-03 stsp status != GOT_STATUS_DELETE &&
3561 98eaaa12 2019-08-03 stsp status != GOT_STATUS_CONFLICT)
3562 98eaaa12 2019-08-03 stsp return NULL;
3565 3fc0c068 2019-02-10 stsp if (!a->header_shown) {
3566 98eaaa12 2019-08-03 stsp printf("diff %s %s%s\n", a->id_str,
3567 98eaaa12 2019-08-03 stsp got_worktree_get_root_path(a->worktree),
3568 98eaaa12 2019-08-03 stsp a->diff_staged ? " (staged changes)" : "");
3569 3fc0c068 2019-02-10 stsp a->header_shown = 1;
3572 98eaaa12 2019-08-03 stsp if (a->diff_staged) {
3573 98eaaa12 2019-08-03 stsp const char *label1 = NULL, *label2 = NULL;
3574 98eaaa12 2019-08-03 stsp switch (staged_status) {
3575 98eaaa12 2019-08-03 stsp case GOT_STATUS_MODIFY:
3576 98eaaa12 2019-08-03 stsp label1 = path;
3577 98eaaa12 2019-08-03 stsp label2 = path;
3579 98eaaa12 2019-08-03 stsp case GOT_STATUS_ADD:
3580 98eaaa12 2019-08-03 stsp label2 = path;
3582 98eaaa12 2019-08-03 stsp case GOT_STATUS_DELETE:
3583 98eaaa12 2019-08-03 stsp label1 = path;
3586 98eaaa12 2019-08-03 stsp return got_error(GOT_ERR_FILE_STATUS);
3588 98eaaa12 2019-08-03 stsp return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3589 63035f9f 2019-10-06 stsp label1, label2, a->diff_context, a->ignore_whitespace,
3590 63035f9f 2019-10-06 stsp a->repo, stdout);
3593 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3594 4ce46740 2019-08-08 stsp staged_status == GOT_STATUS_MODIFY) {
3595 4ce46740 2019-08-08 stsp char *id_str;
3596 408b4ebc 2019-08-03 stsp err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3599 4ce46740 2019-08-08 stsp goto done;
3600 4ce46740 2019-08-08 stsp err = got_object_id_str(&id_str, staged_blob_id);
3602 4ce46740 2019-08-08 stsp goto done;
3603 4ce46740 2019-08-08 stsp if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3604 4ce46740 2019-08-08 stsp err = got_error_from_errno("asprintf");
3605 4ce46740 2019-08-08 stsp free(id_str);
3606 4ce46740 2019-08-08 stsp goto done;
3608 4ce46740 2019-08-08 stsp free(id_str);
3609 4ce46740 2019-08-08 stsp } else if (status != GOT_STATUS_ADD) {
3610 016a88dd 2019-05-13 stsp err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3612 4ce46740 2019-08-08 stsp goto done;
3615 7154f6ce 2019-03-27 stsp if (status != GOT_STATUS_DELETE) {
3616 2ec1f75b 2019-03-26 stsp if (asprintf(&abspath, "%s/%s",
3617 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(a->worktree), path) == -1) {
3618 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3619 2ec1f75b 2019-03-26 stsp goto done;
3622 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3623 12463d8b 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3624 12463d8b 2019-12-13 stsp if (fd == -1) {
3625 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
3626 12463d8b 2019-12-13 stsp goto done;
3629 12463d8b 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3630 12463d8b 2019-12-13 stsp if (fd == -1) {
3631 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", abspath);
3632 12463d8b 2019-12-13 stsp goto done;
3635 12463d8b 2019-12-13 stsp if (fstat(fd, &sb) == -1) {
3636 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
3637 2ec1f75b 2019-03-26 stsp goto done;
3639 12463d8b 2019-12-13 stsp f2 = fdopen(fd, "r");
3640 12463d8b 2019-12-13 stsp if (f2 == NULL) {
3641 12463d8b 2019-12-13 stsp err = got_error_from_errno2("fdopen", abspath);
3642 2ec1f75b 2019-03-26 stsp goto done;
3646 2ec1f75b 2019-03-26 stsp sb.st_size = 0;
3648 4ce46740 2019-08-08 stsp err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3649 63035f9f 2019-10-06 stsp a->diff_context, a->ignore_whitespace, stdout);
3651 b72f483a 2019-02-05 stsp if (blob1)
3652 b72f483a 2019-02-05 stsp got_object_blob_close(blob1);
3653 12463d8b 2019-12-13 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3654 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3655 12463d8b 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3656 12463d8b 2019-12-13 stsp err = got_error_from_errno("close");
3657 b72f483a 2019-02-05 stsp free(abspath);
3658 927df6b7 2019-02-10 stsp return err;
3661 927df6b7 2019-02-10 stsp static const struct got_error *
3662 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
3664 b00d56cd 2018-04-01 stsp const struct got_error *error;
3665 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
3666 b72f483a 2019-02-05 stsp struct got_worktree *worktree = NULL;
3667 b72f483a 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL;
3668 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3669 cd628e99 2019-05-28 stsp const char *id_str1 = NULL, *id_str2 = NULL;
3670 5e70831e 2019-05-28 stsp char *label1 = NULL, *label2 = NULL;
3671 15a94983 2018-12-23 stsp int type1, type2;
3672 63035f9f 2019-10-06 stsp int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3673 c0cc5c62 2018-10-18 stsp const char *errstr;
3674 927df6b7 2019-02-10 stsp char *path = NULL;
3676 b00d56cd 2018-04-01 stsp #ifndef PROFILE
3677 25eccc22 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3678 25eccc22 2019-01-04 stsp NULL) == -1)
3679 b00d56cd 2018-04-01 stsp err(1, "pledge");
3682 63035f9f 2019-10-06 stsp while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3683 b00d56cd 2018-04-01 stsp switch (ch) {
3685 dfcab68b 2019-11-29 kn diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3687 c0cc5c62 2018-10-18 stsp if (errstr != NULL)
3688 c0cc5c62 2018-10-18 stsp err(1, "-C option %s", errstr);
3691 b72f483a 2019-02-05 stsp repo_path = realpath(optarg, NULL);
3692 b72f483a 2019-02-05 stsp if (repo_path == NULL)
3693 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3695 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
3698 98eaaa12 2019-08-03 stsp diff_staged = 1;
3701 63035f9f 2019-10-06 stsp ignore_whitespace = 1;
3704 2deda0b9 2019-03-07 stsp usage_diff();
3705 b00d56cd 2018-04-01 stsp /* NOTREACHED */
3709 b00d56cd 2018-04-01 stsp argc -= optind;
3710 b00d56cd 2018-04-01 stsp argv += optind;
3712 b72f483a 2019-02-05 stsp cwd = getcwd(NULL, 0);
3713 b72f483a 2019-02-05 stsp if (cwd == NULL) {
3714 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3715 b72f483a 2019-02-05 stsp goto done;
3717 927df6b7 2019-02-10 stsp if (argc <= 1) {
3718 b72f483a 2019-02-05 stsp if (repo_path)
3720 b72f483a 2019-02-05 stsp "-r option can't be used when diffing a work tree");
3721 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3722 fa51e947 2020-03-27 stsp if (error) {
3723 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
3724 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "diff",
3726 1f03b8da 2020-03-20 stsp goto done;
3728 b72f483a 2019-02-05 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
3729 927df6b7 2019-02-10 stsp if (repo_path == NULL) {
3730 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3731 927df6b7 2019-02-10 stsp goto done;
3733 927df6b7 2019-02-10 stsp if (argc == 1) {
3734 6c7ab921 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
3736 927df6b7 2019-02-10 stsp if (error)
3737 927df6b7 2019-02-10 stsp goto done;
3739 927df6b7 2019-02-10 stsp path = strdup("");
3740 927df6b7 2019-02-10 stsp if (path == NULL) {
3741 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3742 927df6b7 2019-02-10 stsp goto done;
3745 b72f483a 2019-02-05 stsp } else if (argc == 2) {
3746 98eaaa12 2019-08-03 stsp if (diff_staged)
3747 98eaaa12 2019-08-03 stsp errx(1, "-s option can't be used when diffing "
3748 98eaaa12 2019-08-03 stsp "objects in repository");
3749 15a94983 2018-12-23 stsp id_str1 = argv[0];
3750 15a94983 2018-12-23 stsp id_str2 = argv[1];
3751 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3752 1f03b8da 2020-03-20 stsp error = got_worktree_open(&worktree, cwd);
3753 1f03b8da 2020-03-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3754 30db809c 2019-06-05 stsp goto done;
3755 1f03b8da 2020-03-20 stsp if (worktree) {
3756 1f03b8da 2020-03-20 stsp repo_path = strdup(
3757 1f03b8da 2020-03-20 stsp got_worktree_get_repo_path(worktree));
3758 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3759 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3760 1f03b8da 2020-03-20 stsp goto done;
3763 1f03b8da 2020-03-20 stsp repo_path = strdup(cwd);
3764 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
3765 1f03b8da 2020-03-20 stsp error = got_error_from_errno("strdup");
3766 1f03b8da 2020-03-20 stsp goto done;
3771 b00d56cd 2018-04-01 stsp usage_diff();
3773 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3774 76089277 2018-04-01 stsp free(repo_path);
3775 b00d56cd 2018-04-01 stsp if (error != NULL)
3776 b00d56cd 2018-04-01 stsp goto done;
3778 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), 1,
3779 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3780 c02c541e 2019-03-29 stsp if (error)
3781 c02c541e 2019-03-29 stsp goto done;
3783 30db809c 2019-06-05 stsp if (argc <= 1) {
3784 b72f483a 2019-02-05 stsp struct print_diff_arg arg;
3785 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
3786 b72f483a 2019-02-05 stsp char *id_str;
3788 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
3790 b72f483a 2019-02-05 stsp error = got_object_id_str(&id_str,
3791 b72f483a 2019-02-05 stsp got_worktree_get_base_commit_id(worktree));
3792 b72f483a 2019-02-05 stsp if (error)
3793 b72f483a 2019-02-05 stsp goto done;
3794 b72f483a 2019-02-05 stsp arg.repo = repo;
3795 b72f483a 2019-02-05 stsp arg.worktree = worktree;
3796 b72f483a 2019-02-05 stsp arg.diff_context = diff_context;
3797 3fc0c068 2019-02-10 stsp arg.id_str = id_str;
3798 3fc0c068 2019-02-10 stsp arg.header_shown = 0;
3799 98eaaa12 2019-08-03 stsp arg.diff_staged = diff_staged;
3800 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
3802 adc19d55 2019-07-28 stsp error = got_pathlist_append(&paths, path, NULL);
3803 72ea6654 2019-07-27 stsp if (error)
3804 72ea6654 2019-07-27 stsp goto done;
3806 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_diff,
3807 b72f483a 2019-02-05 stsp &arg, check_cancelled, NULL);
3808 b72f483a 2019-02-05 stsp free(id_str);
3809 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
3810 b72f483a 2019-02-05 stsp goto done;
3813 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3814 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3815 0adb7196 2019-08-11 stsp if (error)
3816 0adb7196 2019-08-11 stsp goto done;
3818 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3819 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3820 0adb7196 2019-08-11 stsp if (error)
3821 0adb7196 2019-08-11 stsp goto done;
3823 15a94983 2018-12-23 stsp error = got_object_get_type(&type1, repo, id1);
3824 15a94983 2018-12-23 stsp if (error)
3825 15a94983 2018-12-23 stsp goto done;
3827 15a94983 2018-12-23 stsp error = got_object_get_type(&type2, repo, id2);
3828 15a94983 2018-12-23 stsp if (error)
3829 15a94983 2018-12-23 stsp goto done;
3831 15a94983 2018-12-23 stsp if (type1 != type2) {
3832 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3833 b00d56cd 2018-04-01 stsp goto done;
3836 15a94983 2018-12-23 stsp switch (type1) {
3837 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
3838 15a94983 2018-12-23 stsp error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3839 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3841 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
3842 15a94983 2018-12-23 stsp error = got_diff_objects_as_trees(id1, id2, "", "",
3843 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, repo, stdout);
3845 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
3846 5e70831e 2019-05-28 stsp printf("diff %s %s\n", label1, label2);
3847 15a94983 2018-12-23 stsp error = got_diff_objects_as_commits(id1, id2, diff_context,
3848 63035f9f 2019-10-06 stsp ignore_whitespace, repo, stdout);
3851 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
3854 5e70831e 2019-05-28 stsp free(label1);
3855 5e70831e 2019-05-28 stsp free(label2);
3856 15a94983 2018-12-23 stsp free(id1);
3857 15a94983 2018-12-23 stsp free(id2);
3858 927df6b7 2019-02-10 stsp free(path);
3859 b72f483a 2019-02-05 stsp if (worktree)
3860 b72f483a 2019-02-05 stsp got_worktree_close(worktree);
3861 ad242220 2018-09-08 stsp if (repo) {
3862 ad242220 2018-09-08 stsp const struct got_error *repo_error;
3863 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
3864 ad242220 2018-09-08 stsp if (error == NULL)
3865 ad242220 2018-09-08 stsp error = repo_error;
3867 b00d56cd 2018-04-01 stsp return error;
3870 404c43c4 2018-06-21 stsp __dead static void
3871 404c43c4 2018-06-21 stsp usage_blame(void)
3873 9270e621 2019-02-05 stsp fprintf(stderr,
3874 9270e621 2019-02-05 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
3875 404c43c4 2018-06-21 stsp getprogname());
3879 28315671 2019-08-14 stsp struct blame_line {
3880 28315671 2019-08-14 stsp int annotated;
3881 28315671 2019-08-14 stsp char *id_str;
3882 82f6abb8 2019-08-14 stsp char *committer;
3883 11db6024 2019-10-21 stsp char datebuf[11]; /* YYYY-MM-DD + NUL */
3886 28315671 2019-08-14 stsp struct blame_cb_args {
3887 28315671 2019-08-14 stsp struct blame_line *lines;
3888 28315671 2019-08-14 stsp int nlines;
3889 7ef28ff8 2019-08-14 stsp int nlines_prec;
3890 28315671 2019-08-14 stsp int lineno_cur;
3891 28315671 2019-08-14 stsp off_t *line_offsets;
3893 82f6abb8 2019-08-14 stsp struct got_repository *repo;
3896 404c43c4 2018-06-21 stsp static const struct got_error *
3897 28315671 2019-08-14 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3899 28315671 2019-08-14 stsp const struct got_error *err = NULL;
3900 28315671 2019-08-14 stsp struct blame_cb_args *a = arg;
3901 28315671 2019-08-14 stsp struct blame_line *bline;
3902 82f6abb8 2019-08-14 stsp char *line = NULL;
3903 28315671 2019-08-14 stsp size_t linesize = 0;
3904 82f6abb8 2019-08-14 stsp struct got_commit_object *commit = NULL;
3905 28315671 2019-08-14 stsp off_t offset;
3906 bcb49d15 2019-08-14 stsp struct tm tm;
3907 bcb49d15 2019-08-14 stsp time_t committer_time;
3909 28315671 2019-08-14 stsp if (nlines != a->nlines ||
3910 28315671 2019-08-14 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3911 28315671 2019-08-14 stsp return got_error(GOT_ERR_RANGE);
3913 28315671 2019-08-14 stsp if (sigint_received)
3914 28315671 2019-08-14 stsp return got_error(GOT_ERR_ITER_COMPLETED);
3916 2839f8b9 2019-08-18 stsp if (lineno == -1)
3917 2839f8b9 2019-08-18 stsp return NULL; /* no change in this commit */
3919 28315671 2019-08-14 stsp /* Annotate this line. */
3920 28315671 2019-08-14 stsp bline = &a->lines[lineno - 1];
3921 28315671 2019-08-14 stsp if (bline->annotated)
3922 28315671 2019-08-14 stsp return NULL;
3923 28315671 2019-08-14 stsp err = got_object_id_str(&bline->id_str, id);
3925 28315671 2019-08-14 stsp return err;
3927 82f6abb8 2019-08-14 stsp err = got_object_open_as_commit(&commit, a->repo, id);
3929 82f6abb8 2019-08-14 stsp goto done;
3931 82f6abb8 2019-08-14 stsp bline->committer = strdup(got_object_commit_get_committer(commit));
3932 82f6abb8 2019-08-14 stsp if (bline->committer == NULL) {
3933 82f6abb8 2019-08-14 stsp err = got_error_from_errno("strdup");
3934 bcb49d15 2019-08-14 stsp goto done;
3937 bcb49d15 2019-08-14 stsp committer_time = got_object_commit_get_committer_time(commit);
3938 bcb49d15 2019-08-14 stsp if (localtime_r(&committer_time, &tm) == NULL)
3939 bcb49d15 2019-08-14 stsp return got_error_from_errno("localtime_r");
3940 6db9f7f6 2019-12-10 stsp if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
3941 bcb49d15 2019-08-14 stsp &tm) >= sizeof(bline->datebuf)) {
3942 bcb49d15 2019-08-14 stsp err = got_error(GOT_ERR_NO_SPACE);
3943 82f6abb8 2019-08-14 stsp goto done;
3945 28315671 2019-08-14 stsp bline->annotated = 1;
3947 28315671 2019-08-14 stsp /* Print lines annotated so far. */
3948 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3949 28315671 2019-08-14 stsp if (!bline->annotated)
3950 82f6abb8 2019-08-14 stsp goto done;
3952 28315671 2019-08-14 stsp offset = a->line_offsets[a->lineno_cur - 1];
3953 82f6abb8 2019-08-14 stsp if (fseeko(a->f, offset, SEEK_SET) == -1) {
3954 82f6abb8 2019-08-14 stsp err = got_error_from_errno("fseeko");
3955 82f6abb8 2019-08-14 stsp goto done;
3958 28315671 2019-08-14 stsp while (bline->annotated) {
3959 82f6abb8 2019-08-14 stsp char *smallerthan, *at, *nl, *committer;
3960 82f6abb8 2019-08-14 stsp size_t len;
3962 500467ff 2019-09-25 hiltjo if (getline(&line, &linesize, a->f) == -1) {
3963 28315671 2019-08-14 stsp if (ferror(a->f))
3964 28315671 2019-08-14 stsp err = got_error_from_errno("getline");
3968 82f6abb8 2019-08-14 stsp committer = bline->committer;
3969 82f6abb8 2019-08-14 stsp smallerthan = strchr(committer, '<');
3970 82f6abb8 2019-08-14 stsp if (smallerthan && smallerthan[1] != '\0')
3971 82f6abb8 2019-08-14 stsp committer = smallerthan + 1;
3972 82f6abb8 2019-08-14 stsp at = strchr(committer, '@');
3974 82f6abb8 2019-08-14 stsp *at = '\0';
3975 82f6abb8 2019-08-14 stsp len = strlen(committer);
3976 82f6abb8 2019-08-14 stsp if (len >= 9)
3977 82f6abb8 2019-08-14 stsp committer[8] = '\0';
3979 28315671 2019-08-14 stsp nl = strchr(line, '\n');
3981 28315671 2019-08-14 stsp *nl = '\0';
3982 bcb49d15 2019-08-14 stsp printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
3983 bcb49d15 2019-08-14 stsp bline->id_str, bline->datebuf, committer, line);
3985 28315671 2019-08-14 stsp a->lineno_cur++;
3986 28315671 2019-08-14 stsp bline = &a->lines[a->lineno_cur - 1];
3989 82f6abb8 2019-08-14 stsp if (commit)
3990 82f6abb8 2019-08-14 stsp got_object_commit_close(commit);
3991 28315671 2019-08-14 stsp free(line);
3992 28315671 2019-08-14 stsp return err;
3995 28315671 2019-08-14 stsp static const struct got_error *
3996 404c43c4 2018-06-21 stsp cmd_blame(int argc, char *argv[])
3998 404c43c4 2018-06-21 stsp const struct got_error *error;
3999 404c43c4 2018-06-21 stsp struct got_repository *repo = NULL;
4000 0c06baac 2019-02-05 stsp struct got_worktree *worktree = NULL;
4001 66bea077 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4002 28315671 2019-08-14 stsp struct got_object_id *obj_id = NULL;
4003 404c43c4 2018-06-21 stsp struct got_object_id *commit_id = NULL;
4004 28315671 2019-08-14 stsp struct got_blob_object *blob = NULL;
4005 404c43c4 2018-06-21 stsp char *commit_id_str = NULL;
4006 28315671 2019-08-14 stsp struct blame_cb_args bca;
4007 28315671 2019-08-14 stsp int ch, obj_type, i;
4008 b02560ec 2019-08-19 stsp size_t filesize;
4010 90f3c347 2019-08-19 stsp memset(&bca, 0, sizeof(bca));
4012 404c43c4 2018-06-21 stsp #ifndef PROFILE
4013 36e2fb66 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4014 36e2fb66 2019-01-04 stsp NULL) == -1)
4015 404c43c4 2018-06-21 stsp err(1, "pledge");
4018 66bea077 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4019 404c43c4 2018-06-21 stsp switch (ch) {
4021 404c43c4 2018-06-21 stsp commit_id_str = optarg;
4024 66bea077 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4025 66bea077 2018-08-02 stsp if (repo_path == NULL)
4026 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4028 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4031 2deda0b9 2019-03-07 stsp usage_blame();
4032 404c43c4 2018-06-21 stsp /* NOTREACHED */
4036 404c43c4 2018-06-21 stsp argc -= optind;
4037 404c43c4 2018-06-21 stsp argv += optind;
4039 a39318fd 2018-08-02 stsp if (argc == 1)
4040 404c43c4 2018-06-21 stsp path = argv[0];
4042 404c43c4 2018-06-21 stsp usage_blame();
4044 66bea077 2018-08-02 stsp cwd = getcwd(NULL, 0);
4045 66bea077 2018-08-02 stsp if (cwd == NULL) {
4046 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4047 66bea077 2018-08-02 stsp goto done;
4049 66bea077 2018-08-02 stsp if (repo_path == NULL) {
4050 0c06baac 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4051 0c06baac 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4052 66bea077 2018-08-02 stsp goto done;
4054 0c06baac 2019-02-05 stsp error = NULL;
4055 0c06baac 2019-02-05 stsp if (worktree) {
4056 0c06baac 2019-02-05 stsp repo_path =
4057 0c06baac 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4058 1f03b8da 2020-03-20 stsp if (repo_path == NULL) {
4059 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4060 1f03b8da 2020-03-20 stsp if (error)
4061 1f03b8da 2020-03-20 stsp goto done;
4064 0c06baac 2019-02-05 stsp repo_path = strdup(cwd);
4065 0c06baac 2019-02-05 stsp if (repo_path == NULL) {
4066 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4067 0c06baac 2019-02-05 stsp goto done;
4072 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4073 c02c541e 2019-03-29 stsp if (error != NULL)
4074 36e2fb66 2019-01-04 stsp goto done;
4076 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4077 c02c541e 2019-03-29 stsp if (error)
4078 404c43c4 2018-06-21 stsp goto done;
4080 0c06baac 2019-02-05 stsp if (worktree) {
4081 6efaaa2d 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
4082 0c06baac 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4083 0c06baac 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4084 6efaaa2d 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
4085 6efaaa2d 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4086 6efaaa2d 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
4087 6efaaa2d 2019-02-05 stsp path) == -1) {
4088 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4089 0c06baac 2019-02-05 stsp goto done;
4091 6efaaa2d 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4094 0c06baac 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4096 0c06baac 2019-02-05 stsp if (error)
4097 66bea077 2018-08-02 stsp goto done;
4099 404c43c4 2018-06-21 stsp if (commit_id_str == NULL) {
4100 404c43c4 2018-06-21 stsp struct got_reference *head_ref;
4101 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4102 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4103 404c43c4 2018-06-21 stsp if (error != NULL)
4104 66bea077 2018-08-02 stsp goto done;
4105 404c43c4 2018-06-21 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4106 404c43c4 2018-06-21 stsp got_ref_close(head_ref);
4107 404c43c4 2018-06-21 stsp if (error != NULL)
4108 66bea077 2018-08-02 stsp goto done;
4110 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4111 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4112 30837e32 2019-07-25 stsp if (error)
4113 66bea077 2018-08-02 stsp goto done;
4116 28315671 2019-08-14 stsp error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4117 28315671 2019-08-14 stsp if (error)
4118 28315671 2019-08-14 stsp goto done;
4120 28315671 2019-08-14 stsp error = got_object_get_type(&obj_type, repo, obj_id);
4121 28315671 2019-08-14 stsp if (error)
4122 28315671 2019-08-14 stsp goto done;
4124 28315671 2019-08-14 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4125 28315671 2019-08-14 stsp error = got_error(GOT_ERR_OBJ_TYPE);
4126 28315671 2019-08-14 stsp goto done;
4129 28315671 2019-08-14 stsp error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4130 28315671 2019-08-14 stsp if (error)
4131 28315671 2019-08-14 stsp goto done;
4132 28315671 2019-08-14 stsp bca.f = got_opentemp();
4133 28315671 2019-08-14 stsp if (bca.f == NULL) {
4134 28315671 2019-08-14 stsp error = got_error_from_errno("got_opentemp");
4135 28315671 2019-08-14 stsp goto done;
4137 b02560ec 2019-08-19 stsp error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4138 28315671 2019-08-14 stsp &bca.line_offsets, bca.f, blob);
4139 7ef28ff8 2019-08-14 stsp if (error || bca.nlines == 0)
4140 28315671 2019-08-14 stsp goto done;
4142 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4143 b02560ec 2019-08-19 stsp if (bca.line_offsets[bca.nlines - 1] == filesize)
4144 b02560ec 2019-08-19 stsp bca.nlines--;
4146 28315671 2019-08-14 stsp bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4147 28315671 2019-08-14 stsp if (bca.lines == NULL) {
4148 28315671 2019-08-14 stsp error = got_error_from_errno("calloc");
4149 28315671 2019-08-14 stsp goto done;
4151 28315671 2019-08-14 stsp bca.lineno_cur = 1;
4152 7ef28ff8 2019-08-14 stsp bca.nlines_prec = 0;
4153 7ef28ff8 2019-08-14 stsp i = bca.nlines;
4154 7ef28ff8 2019-08-14 stsp while (i > 0) {
4156 7ef28ff8 2019-08-14 stsp bca.nlines_prec++;
4158 82f6abb8 2019-08-14 stsp bca.repo = repo;
4160 6fb7cd11 2019-08-22 stsp error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4161 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
4163 66bea077 2018-08-02 stsp free(in_repo_path);
4164 66bea077 2018-08-02 stsp free(repo_path);
4165 66bea077 2018-08-02 stsp free(cwd);
4166 404c43c4 2018-06-21 stsp free(commit_id);
4167 28315671 2019-08-14 stsp free(obj_id);
4169 28315671 2019-08-14 stsp got_object_blob_close(blob);
4170 0c06baac 2019-02-05 stsp if (worktree)
4171 0c06baac 2019-02-05 stsp got_worktree_close(worktree);
4172 ad242220 2018-09-08 stsp if (repo) {
4173 ad242220 2018-09-08 stsp const struct got_error *repo_error;
4174 ad242220 2018-09-08 stsp repo_error = got_repo_close(repo);
4175 ad242220 2018-09-08 stsp if (error == NULL)
4176 ad242220 2018-09-08 stsp error = repo_error;
4178 3affba96 2019-09-22 stsp if (bca.lines) {
4179 3affba96 2019-09-22 stsp for (i = 0; i < bca.nlines; i++) {
4180 3affba96 2019-09-22 stsp struct blame_line *bline = &bca.lines[i];
4181 3affba96 2019-09-22 stsp free(bline->id_str);
4182 3affba96 2019-09-22 stsp free(bline->committer);
4184 3affba96 2019-09-22 stsp free(bca.lines);
4186 28315671 2019-08-14 stsp free(bca.line_offsets);
4187 28315671 2019-08-14 stsp if (bca.f && fclose(bca.f) == EOF && error == NULL)
4188 28315671 2019-08-14 stsp error = got_error_from_errno("fclose");
4189 404c43c4 2018-06-21 stsp return error;
4192 5de5890b 2018-10-18 stsp __dead static void
4193 5de5890b 2018-10-18 stsp usage_tree(void)
4195 c1669e2e 2019-01-09 stsp fprintf(stderr,
4196 c1669e2e 2019-01-09 stsp "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
4197 5de5890b 2018-10-18 stsp getprogname());
4201 c1669e2e 2019-01-09 stsp static void
4202 c1669e2e 2019-01-09 stsp print_entry(struct got_tree_entry *te, const char *id, const char *path,
4203 c1669e2e 2019-01-09 stsp const char *root_path)
4205 c1669e2e 2019-01-09 stsp int is_root_path = (strcmp(path, root_path) == 0);
4206 848d6979 2019-08-12 stsp const char *modestr = "";
4207 56e0773d 2019-11-28 stsp mode_t mode = got_tree_entry_get_mode(te);
4209 c1669e2e 2019-01-09 stsp path += strlen(root_path);
4210 c1669e2e 2019-01-09 stsp while (path[0] == '/')
4213 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4214 63c5ca5d 2019-08-24 stsp modestr = "$";
4215 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
4216 848d6979 2019-08-12 stsp modestr = "@";
4217 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4218 848d6979 2019-08-12 stsp modestr = "/";
4219 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4220 848d6979 2019-08-12 stsp modestr = "*";
4222 c1669e2e 2019-01-09 stsp printf("%s%s%s%s%s\n", id ? id : "", path,
4223 56e0773d 2019-11-28 stsp is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
4226 5de5890b 2018-10-18 stsp static const struct got_error *
4227 5de5890b 2018-10-18 stsp print_tree(const char *path, struct got_object_id *commit_id,
4228 c1669e2e 2019-01-09 stsp int show_ids, int recurse, const char *root_path,
4229 c1669e2e 2019-01-09 stsp struct got_repository *repo)
4231 5de5890b 2018-10-18 stsp const struct got_error *err = NULL;
4232 5de5890b 2018-10-18 stsp struct got_object_id *tree_id = NULL;
4233 5de5890b 2018-10-18 stsp struct got_tree_object *tree = NULL;
4234 56e0773d 2019-11-28 stsp int nentries, i;
4236 5de5890b 2018-10-18 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4238 5de5890b 2018-10-18 stsp goto done;
4240 5de5890b 2018-10-18 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
4242 5de5890b 2018-10-18 stsp goto done;
4243 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4244 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
4245 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4246 5de5890b 2018-10-18 stsp char *id = NULL;
4248 84453469 2018-11-11 stsp if (sigint_received || sigpipe_received)
4251 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4252 5de5890b 2018-10-18 stsp if (show_ids) {
4253 5de5890b 2018-10-18 stsp char *id_str;
4254 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4255 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4257 5de5890b 2018-10-18 stsp goto done;
4258 5de5890b 2018-10-18 stsp if (asprintf(&id, "%s ", id_str) == -1) {
4259 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4260 5de5890b 2018-10-18 stsp free(id_str);
4261 5de5890b 2018-10-18 stsp goto done;
4263 5de5890b 2018-10-18 stsp free(id_str);
4265 c1669e2e 2019-01-09 stsp print_entry(te, id, path, root_path);
4268 56e0773d 2019-11-28 stsp if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4269 c1669e2e 2019-01-09 stsp char *child_path;
4270 c1669e2e 2019-01-09 stsp if (asprintf(&child_path, "%s%s%s", path,
4271 c1669e2e 2019-01-09 stsp path[0] == '/' && path[1] == '\0' ? "" : "/",
4272 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te)) == -1) {
4273 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4274 c1669e2e 2019-01-09 stsp goto done;
4276 c1669e2e 2019-01-09 stsp err = print_tree(child_path, commit_id, show_ids, 1,
4277 c1669e2e 2019-01-09 stsp root_path, repo);
4278 c1669e2e 2019-01-09 stsp free(child_path);
4280 c1669e2e 2019-01-09 stsp goto done;
4285 5de5890b 2018-10-18 stsp got_object_tree_close(tree);
4286 5de5890b 2018-10-18 stsp free(tree_id);
4287 5de5890b 2018-10-18 stsp return err;
4290 5de5890b 2018-10-18 stsp static const struct got_error *
4291 5de5890b 2018-10-18 stsp cmd_tree(int argc, char *argv[])
4293 5de5890b 2018-10-18 stsp const struct got_error *error;
4294 5de5890b 2018-10-18 stsp struct got_repository *repo = NULL;
4295 7a2c19d6 2019-02-05 stsp struct got_worktree *worktree = NULL;
4296 4e0a20a4 2020-03-23 tracey const char *path, *refname = NULL;
4297 7a2c19d6 2019-02-05 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4298 5de5890b 2018-10-18 stsp struct got_object_id *commit_id = NULL;
4299 5de5890b 2018-10-18 stsp char *commit_id_str = NULL;
4300 c1669e2e 2019-01-09 stsp int show_ids = 0, recurse = 0;
4303 5de5890b 2018-10-18 stsp #ifndef PROFILE
4304 0f8d269b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4305 0f8d269b 2019-01-04 stsp NULL) == -1)
4306 5de5890b 2018-10-18 stsp err(1, "pledge");
4309 c1669e2e 2019-01-09 stsp while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4310 5de5890b 2018-10-18 stsp switch (ch) {
4312 5de5890b 2018-10-18 stsp commit_id_str = optarg;
4315 5de5890b 2018-10-18 stsp repo_path = realpath(optarg, NULL);
4316 5de5890b 2018-10-18 stsp if (repo_path == NULL)
4317 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4319 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4322 5de5890b 2018-10-18 stsp show_ids = 1;
4325 c1669e2e 2019-01-09 stsp recurse = 1;
4328 2deda0b9 2019-03-07 stsp usage_tree();
4329 5de5890b 2018-10-18 stsp /* NOTREACHED */
4333 5de5890b 2018-10-18 stsp argc -= optind;
4334 5de5890b 2018-10-18 stsp argv += optind;
4336 5de5890b 2018-10-18 stsp if (argc == 1)
4337 5de5890b 2018-10-18 stsp path = argv[0];
4338 5de5890b 2018-10-18 stsp else if (argc > 1)
4339 5de5890b 2018-10-18 stsp usage_tree();
4341 7a2c19d6 2019-02-05 stsp path = NULL;
4343 9bf7a39b 2019-02-05 stsp cwd = getcwd(NULL, 0);
4344 9bf7a39b 2019-02-05 stsp if (cwd == NULL) {
4345 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4346 9bf7a39b 2019-02-05 stsp goto done;
4348 5de5890b 2018-10-18 stsp if (repo_path == NULL) {
4349 7a2c19d6 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4350 8994de28 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4351 7a2c19d6 2019-02-05 stsp goto done;
4353 7a2c19d6 2019-02-05 stsp error = NULL;
4354 7a2c19d6 2019-02-05 stsp if (worktree) {
4355 7a2c19d6 2019-02-05 stsp repo_path =
4356 7a2c19d6 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4357 7a2c19d6 2019-02-05 stsp if (repo_path == NULL)
4358 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4359 7a2c19d6 2019-02-05 stsp if (error)
4360 7a2c19d6 2019-02-05 stsp goto done;
4362 7a2c19d6 2019-02-05 stsp repo_path = strdup(cwd);
4363 7a2c19d6 2019-02-05 stsp if (repo_path == NULL) {
4364 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4365 7a2c19d6 2019-02-05 stsp goto done;
4370 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4371 5de5890b 2018-10-18 stsp if (error != NULL)
4372 c02c541e 2019-03-29 stsp goto done;
4374 c530dc23 2019-07-23 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4375 c02c541e 2019-03-29 stsp if (error)
4376 5de5890b 2018-10-18 stsp goto done;
4378 9bf7a39b 2019-02-05 stsp if (path == NULL) {
4379 9bf7a39b 2019-02-05 stsp if (worktree) {
4380 9bf7a39b 2019-02-05 stsp char *p, *worktree_subdir = cwd +
4381 9bf7a39b 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
4382 9bf7a39b 2019-02-05 stsp if (asprintf(&p, "%s/%s",
4383 9bf7a39b 2019-02-05 stsp got_worktree_get_path_prefix(worktree),
4384 9bf7a39b 2019-02-05 stsp worktree_subdir) == -1) {
4385 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
4386 9bf7a39b 2019-02-05 stsp goto done;
4388 f43793a4 2020-01-27 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
4390 9bf7a39b 2019-02-05 stsp if (error)
4391 9bf7a39b 2019-02-05 stsp goto done;
4393 9bf7a39b 2019-02-05 stsp path = "/";
4395 9bf7a39b 2019-02-05 stsp if (in_repo_path == NULL) {
4396 9bf7a39b 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
4397 9bf7a39b 2019-02-05 stsp if (error != NULL)
4398 9bf7a39b 2019-02-05 stsp goto done;
4401 5de5890b 2018-10-18 stsp if (commit_id_str == NULL) {
4402 5de5890b 2018-10-18 stsp struct got_reference *head_ref;
4403 4e0a20a4 2020-03-23 tracey if (worktree)
4404 4e0a20a4 2020-03-23 tracey refname = got_worktree_get_head_ref_name(worktree);
4406 4e0a20a4 2020-03-23 tracey refname = GOT_REF_HEAD;
4407 4e0a20a4 2020-03-23 tracey error = got_ref_open(&head_ref, repo, refname, 0);
4408 5de5890b 2018-10-18 stsp if (error != NULL)
4409 5de5890b 2018-10-18 stsp goto done;
4410 5de5890b 2018-10-18 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4411 5de5890b 2018-10-18 stsp got_ref_close(head_ref);
4412 5de5890b 2018-10-18 stsp if (error != NULL)
4413 5de5890b 2018-10-18 stsp goto done;
4415 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4416 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4417 30837e32 2019-07-25 stsp if (error)
4418 5de5890b 2018-10-18 stsp goto done;
4421 c1669e2e 2019-01-09 stsp error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4422 c1669e2e 2019-01-09 stsp in_repo_path, repo);
4424 5de5890b 2018-10-18 stsp free(in_repo_path);
4425 5de5890b 2018-10-18 stsp free(repo_path);
4426 5de5890b 2018-10-18 stsp free(cwd);
4427 5de5890b 2018-10-18 stsp free(commit_id);
4428 7a2c19d6 2019-02-05 stsp if (worktree)
4429 7a2c19d6 2019-02-05 stsp got_worktree_close(worktree);
4430 5de5890b 2018-10-18 stsp if (repo) {
4431 5de5890b 2018-10-18 stsp const struct got_error *repo_error;
4432 5de5890b 2018-10-18 stsp repo_error = got_repo_close(repo);
4433 5de5890b 2018-10-18 stsp if (error == NULL)
4434 5de5890b 2018-10-18 stsp error = repo_error;
4436 5de5890b 2018-10-18 stsp return error;
4439 6bad629b 2019-02-04 stsp __dead static void
4440 6bad629b 2019-02-04 stsp usage_status(void)
4442 72ea6654 2019-07-27 stsp fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4446 b72f483a 2019-02-05 stsp static const struct got_error *
4447 88d0e355 2019-08-03 stsp print_status(void *arg, unsigned char status, unsigned char staged_status,
4448 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4449 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4450 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4452 244725f2 2019-08-03 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
4453 c363b2c1 2019-08-03 stsp status = GOT_STATUS_NO_CHANGE;
4454 88d0e355 2019-08-03 stsp printf("%c%c %s\n", status, staged_status, path);
4455 b72f483a 2019-02-05 stsp return NULL;
4458 6bad629b 2019-02-04 stsp static const struct got_error *
4459 6bad629b 2019-02-04 stsp cmd_status(int argc, char *argv[])
4461 6bad629b 2019-02-04 stsp const struct got_error *error = NULL;
4462 6bad629b 2019-02-04 stsp struct got_repository *repo = NULL;
4463 6bad629b 2019-02-04 stsp struct got_worktree *worktree = NULL;
4464 f86a1bf5 2019-07-27 stsp char *cwd = NULL;
4465 72ea6654 2019-07-27 stsp struct got_pathlist_head paths;
4466 a5edda0a 2019-07-27 stsp struct got_pathlist_entry *pe;
4469 72ea6654 2019-07-27 stsp TAILQ_INIT(&paths);
4471 6bad629b 2019-02-04 stsp while ((ch = getopt(argc, argv, "")) != -1) {
4472 6bad629b 2019-02-04 stsp switch (ch) {
4474 2deda0b9 2019-03-07 stsp usage_status();
4475 6bad629b 2019-02-04 stsp /* NOTREACHED */
4479 6bad629b 2019-02-04 stsp argc -= optind;
4480 6bad629b 2019-02-04 stsp argv += optind;
4482 6bad629b 2019-02-04 stsp #ifndef PROFILE
4483 6bad629b 2019-02-04 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4484 6bad629b 2019-02-04 stsp NULL) == -1)
4485 6bad629b 2019-02-04 stsp err(1, "pledge");
4487 927df6b7 2019-02-10 stsp cwd = getcwd(NULL, 0);
4488 927df6b7 2019-02-10 stsp if (cwd == NULL) {
4489 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4490 927df6b7 2019-02-10 stsp goto done;
4493 927df6b7 2019-02-10 stsp error = got_worktree_open(&worktree, cwd);
4494 fa51e947 2020-03-27 stsp if (error) {
4495 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
4496 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "status", cwd);
4497 a5edda0a 2019-07-27 stsp goto done;
4500 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4502 6bad629b 2019-02-04 stsp if (error != NULL)
4503 6bad629b 2019-02-04 stsp goto done;
4505 d0eebce4 2019-03-11 stsp error = apply_unveil(got_repo_get_path(repo), 1,
4506 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
4507 087fb88c 2019-08-04 stsp if (error)
4508 087fb88c 2019-08-04 stsp goto done;
4510 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4511 6bad629b 2019-02-04 stsp if (error)
4512 6bad629b 2019-02-04 stsp goto done;
4514 72ea6654 2019-07-27 stsp error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4515 6bad629b 2019-02-04 stsp check_cancelled, NULL);
4517 a5edda0a 2019-07-27 stsp TAILQ_FOREACH(pe, &paths, entry)
4518 a5edda0a 2019-07-27 stsp free((char *)pe->path);
4519 72ea6654 2019-07-27 stsp got_pathlist_free(&paths);
4520 927df6b7 2019-02-10 stsp free(cwd);
4521 d0eebce4 2019-03-11 stsp return error;
4524 d0eebce4 2019-03-11 stsp __dead static void
4525 d0eebce4 2019-03-11 stsp usage_ref(void)
4527 d0eebce4 2019-03-11 stsp fprintf(stderr,
4528 e31abbf2 2020-03-22 stsp "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4529 e31abbf2 2020-03-22 stsp "[-d] [name]\n",
4530 d0eebce4 2019-03-11 stsp getprogname());
4534 d0eebce4 2019-03-11 stsp static const struct got_error *
4535 b2070a3f 2020-03-22 stsp list_refs(struct got_repository *repo, const char *refname)
4537 d0eebce4 2019-03-11 stsp static const struct got_error *err = NULL;
4538 d0eebce4 2019-03-11 stsp struct got_reflist_head refs;
4539 d0eebce4 2019-03-11 stsp struct got_reflist_entry *re;
4541 d0eebce4 2019-03-11 stsp SIMPLEQ_INIT(&refs);
4542 b2070a3f 2020-03-22 stsp err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4544 d0eebce4 2019-03-11 stsp return err;
4546 d0eebce4 2019-03-11 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
4547 d0eebce4 2019-03-11 stsp char *refstr;
4548 d0eebce4 2019-03-11 stsp refstr = got_ref_to_str(re->ref);
4549 d0eebce4 2019-03-11 stsp if (refstr == NULL)
4550 638f9024 2019-05-13 stsp return got_error_from_errno("got_ref_to_str");
4551 d0eebce4 2019-03-11 stsp printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4552 d0eebce4 2019-03-11 stsp free(refstr);
4555 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4556 d0eebce4 2019-03-11 stsp return NULL;
4559 d0eebce4 2019-03-11 stsp static const struct got_error *
4560 d0eebce4 2019-03-11 stsp delete_ref(struct got_repository *repo, const char *refname)
4562 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4563 d0eebce4 2019-03-11 stsp struct got_reference *ref;
4565 2f17228e 2019-05-12 stsp err = got_ref_open(&ref, repo, refname, 0);
4567 d0eebce4 2019-03-11 stsp return err;
4569 d0eebce4 2019-03-11 stsp err = got_ref_delete(ref, repo);
4570 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4571 d0eebce4 2019-03-11 stsp return err;
4574 d0eebce4 2019-03-11 stsp static const struct got_error *
4575 d83d9d5c 2019-05-13 stsp add_ref(struct got_repository *repo, const char *refname, const char *target)
4577 d0eebce4 2019-03-11 stsp const struct got_error *err = NULL;
4578 d0eebce4 2019-03-11 stsp struct got_object_id *id;
4579 d0eebce4 2019-03-11 stsp struct got_reference *ref = NULL;
4582 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4583 d1644381 2019-07-14 stsp * While technically a valid reference name, this case is usually
4584 d1644381 2019-07-14 stsp * an unintended typo.
4586 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4587 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4589 dd88155e 2019-06-29 stsp err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4591 d83d9d5c 2019-05-13 stsp if (err) {
4592 d83d9d5c 2019-05-13 stsp struct got_reference *target_ref;
4594 d83d9d5c 2019-05-13 stsp if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4595 d83d9d5c 2019-05-13 stsp return err;
4596 d83d9d5c 2019-05-13 stsp err = got_ref_open(&target_ref, repo, target, 0);
4598 d83d9d5c 2019-05-13 stsp return err;
4599 d83d9d5c 2019-05-13 stsp err = got_ref_resolve(&id, repo, target_ref);
4600 d83d9d5c 2019-05-13 stsp got_ref_close(target_ref);
4602 d83d9d5c 2019-05-13 stsp return err;
4605 d0eebce4 2019-03-11 stsp err = got_ref_alloc(&ref, refname, id);
4607 d0eebce4 2019-03-11 stsp goto done;
4609 d0eebce4 2019-03-11 stsp err = got_ref_write(ref, repo);
4612 d0eebce4 2019-03-11 stsp got_ref_close(ref);
4614 d1c1ae5f 2019-08-12 stsp return err;
4617 d1c1ae5f 2019-08-12 stsp static const struct got_error *
4618 d1c1ae5f 2019-08-12 stsp add_symref(struct got_repository *repo, const char *refname, const char *target)
4620 d1c1ae5f 2019-08-12 stsp const struct got_error *err = NULL;
4621 d1c1ae5f 2019-08-12 stsp struct got_reference *ref = NULL;
4622 d1c1ae5f 2019-08-12 stsp struct got_reference *target_ref = NULL;
4625 bd5895f3 2019-11-28 stsp * Don't let the user create a reference name with a leading '-'.
4626 d1c1ae5f 2019-08-12 stsp * While technically a valid reference name, this case is usually
4627 d1c1ae5f 2019-08-12 stsp * an unintended typo.
4629 bd5895f3 2019-11-28 stsp if (refname[0] == '-')
4630 bd5895f3 2019-11-28 stsp return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4632 d1c1ae5f 2019-08-12 stsp err = got_ref_open(&target_ref, repo, target, 0);
4634 d1c1ae5f 2019-08-12 stsp return err;
4636 d1c1ae5f 2019-08-12 stsp err = got_ref_alloc_symref(&ref, refname, target_ref);
4638 d1c1ae5f 2019-08-12 stsp goto done;
4640 d1c1ae5f 2019-08-12 stsp err = got_ref_write(ref, repo);
4642 d1c1ae5f 2019-08-12 stsp if (target_ref)
4643 d1c1ae5f 2019-08-12 stsp got_ref_close(target_ref);
4645 d1c1ae5f 2019-08-12 stsp got_ref_close(ref);
4646 d0eebce4 2019-03-11 stsp return err;
4649 d0eebce4 2019-03-11 stsp static const struct got_error *
4650 d0eebce4 2019-03-11 stsp cmd_ref(int argc, char *argv[])
4652 d0eebce4 2019-03-11 stsp const struct got_error *error = NULL;
4653 d0eebce4 2019-03-11 stsp struct got_repository *repo = NULL;
4654 d0eebce4 2019-03-11 stsp struct got_worktree *worktree = NULL;
4655 d0eebce4 2019-03-11 stsp char *cwd = NULL, *repo_path = NULL;
4656 e31abbf2 2020-03-22 stsp int ch, do_list = 0, do_delete = 0;
4657 b2070a3f 2020-03-22 stsp const char *obj_arg = NULL, *symref_target= NULL;
4658 b2070a3f 2020-03-22 stsp char *refname = NULL;
4660 e31abbf2 2020-03-22 stsp while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4661 d0eebce4 2019-03-11 stsp switch (ch) {
4663 e31abbf2 2020-03-22 stsp obj_arg = optarg;
4666 e31abbf2 2020-03-22 stsp do_delete = 1;
4669 d0eebce4 2019-03-11 stsp repo_path = realpath(optarg, NULL);
4670 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4671 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4673 7fbaa4f3 2019-05-11 stsp got_path_strip_trailing_slashes(repo_path);
4676 d0eebce4 2019-03-11 stsp do_list = 1;
4679 e31abbf2 2020-03-22 stsp symref_target = optarg;
4682 d0eebce4 2019-03-11 stsp usage_ref();
4683 d0eebce4 2019-03-11 stsp /* NOTREACHED */
4687 e31abbf2 2020-03-22 stsp if (obj_arg && do_list)
4688 907f15e2 2020-03-22 stsp errx(1, "-c and -l options are mutually exclusive");
4689 e31abbf2 2020-03-22 stsp if (obj_arg && do_delete)
4690 907f15e2 2020-03-22 stsp errx(1, "-c and -d options are mutually exclusive");
4691 907f15e2 2020-03-22 stsp if (obj_arg && symref_target)
4692 907f15e2 2020-03-22 stsp errx(1, "-c and -s options are mutually exclusive");
4693 e31abbf2 2020-03-22 stsp if (symref_target && do_delete)
4694 907f15e2 2020-03-22 stsp errx(1, "-s and -d options are mutually exclusive");
4695 e31abbf2 2020-03-22 stsp if (symref_target && do_list)
4696 907f15e2 2020-03-22 stsp errx(1, "-s and -l options are mutually exclusive");
4697 e31abbf2 2020-03-22 stsp if (do_delete && do_list)
4698 907f15e2 2020-03-22 stsp errx(1, "-d and -l options are mutually exclusive");
4700 d0eebce4 2019-03-11 stsp argc -= optind;
4701 d0eebce4 2019-03-11 stsp argv += optind;
4703 e31abbf2 2020-03-22 stsp if (do_list) {
4704 b2070a3f 2020-03-22 stsp if (argc != 0 && argc != 1)
4705 d0eebce4 2019-03-11 stsp usage_ref();
4706 b2070a3f 2020-03-22 stsp if (argc == 1) {
4707 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4708 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4709 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4710 b2070a3f 2020-03-22 stsp goto done;
4714 e31abbf2 2020-03-22 stsp if (argc != 1)
4715 e31abbf2 2020-03-22 stsp usage_ref();
4716 b2070a3f 2020-03-22 stsp refname = strdup(argv[0]);
4717 b2070a3f 2020-03-22 stsp if (refname == NULL) {
4718 b2070a3f 2020-03-22 stsp error = got_error_from_errno("strdup");
4719 b2070a3f 2020-03-22 stsp goto done;
4723 b2070a3f 2020-03-22 stsp if (refname)
4724 b2070a3f 2020-03-22 stsp got_path_strip_trailing_slashes(refname);
4726 d0eebce4 2019-03-11 stsp #ifndef PROFILE
4727 e0b57350 2019-03-12 stsp if (do_list) {
4728 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4729 e0b57350 2019-03-12 stsp NULL) == -1)
4730 e0b57350 2019-03-12 stsp err(1, "pledge");
4732 e0b57350 2019-03-12 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4733 e0b57350 2019-03-12 stsp "sendfd unveil", NULL) == -1)
4734 e0b57350 2019-03-12 stsp err(1, "pledge");
4737 d0eebce4 2019-03-11 stsp cwd = getcwd(NULL, 0);
4738 d0eebce4 2019-03-11 stsp if (cwd == NULL) {
4739 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
4740 d0eebce4 2019-03-11 stsp goto done;
4743 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4744 d0eebce4 2019-03-11 stsp error = got_worktree_open(&worktree, cwd);
4745 d0eebce4 2019-03-11 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4746 d0eebce4 2019-03-11 stsp goto done;
4748 d0eebce4 2019-03-11 stsp error = NULL;
4749 d0eebce4 2019-03-11 stsp if (worktree) {
4750 d0eebce4 2019-03-11 stsp repo_path =
4751 d0eebce4 2019-03-11 stsp strdup(got_worktree_get_repo_path(worktree));
4752 d0eebce4 2019-03-11 stsp if (repo_path == NULL)
4753 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4754 d0eebce4 2019-03-11 stsp if (error)
4755 d0eebce4 2019-03-11 stsp goto done;
4757 d0eebce4 2019-03-11 stsp repo_path = strdup(cwd);
4758 d0eebce4 2019-03-11 stsp if (repo_path == NULL) {
4759 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4760 d0eebce4 2019-03-11 stsp goto done;
4765 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4766 d0eebce4 2019-03-11 stsp if (error != NULL)
4767 d0eebce4 2019-03-11 stsp goto done;
4769 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
4770 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
4771 c02c541e 2019-03-29 stsp if (error)
4772 c02c541e 2019-03-29 stsp goto done;
4774 d0eebce4 2019-03-11 stsp if (do_list)
4775 b2070a3f 2020-03-22 stsp error = list_refs(repo, refname);
4776 e31abbf2 2020-03-22 stsp else if (do_delete)
4777 e31abbf2 2020-03-22 stsp error = delete_ref(repo, refname);
4778 e31abbf2 2020-03-22 stsp else if (symref_target)
4779 e31abbf2 2020-03-22 stsp error = add_symref(repo, refname, symref_target);
4781 e31abbf2 2020-03-22 stsp if (obj_arg == NULL)
4782 e31abbf2 2020-03-22 stsp usage_ref();
4783 e31abbf2 2020-03-22 stsp error = add_ref(repo, refname, obj_arg);
4786 b2070a3f 2020-03-22 stsp free(refname);
4788 4e759de4 2019-06-26 stsp got_repo_close(repo);
4789 4e759de4 2019-06-26 stsp if (worktree)
4790 4e759de4 2019-06-26 stsp got_worktree_close(worktree);
4791 4e759de4 2019-06-26 stsp free(cwd);
4792 4e759de4 2019-06-26 stsp free(repo_path);
4793 4e759de4 2019-06-26 stsp return error;
4796 4e759de4 2019-06-26 stsp __dead static void
4797 4e759de4 2019-06-26 stsp usage_branch(void)
4799 4e759de4 2019-06-26 stsp fprintf(stderr,
4800 da76fce2 2020-02-24 stsp "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4801 da76fce2 2020-02-24 stsp "[name]\n", getprogname());
4805 4e759de4 2019-06-26 stsp static const struct got_error *
4806 4e99b47e 2019-10-04 stsp list_branch(struct got_repository *repo, struct got_worktree *worktree,
4807 4e99b47e 2019-10-04 stsp struct got_reference *ref)
4809 4e99b47e 2019-10-04 stsp const struct got_error *err = NULL;
4810 4e99b47e 2019-10-04 stsp const char *refname, *marker = " ";
4811 4e99b47e 2019-10-04 stsp char *refstr;
4813 4e99b47e 2019-10-04 stsp refname = got_ref_get_name(ref);
4814 4e99b47e 2019-10-04 stsp if (worktree && strcmp(refname,
4815 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree)) == 0) {
4816 4e99b47e 2019-10-04 stsp struct got_object_id *id = NULL;
4818 4e99b47e 2019-10-04 stsp err = got_ref_resolve(&id, repo, ref);
4820 4e99b47e 2019-10-04 stsp return err;
4821 4e99b47e 2019-10-04 stsp if (got_object_id_cmp(id,
4822 4e99b47e 2019-10-04 stsp got_worktree_get_base_commit_id(worktree)) == 0)
4823 4e99b47e 2019-10-04 stsp marker = "* ";
4825 4e99b47e 2019-10-04 stsp marker = "~ ";
4829 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4830 4e99b47e 2019-10-04 stsp refname += 11;
4831 4e99b47e 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4832 4e99b47e 2019-10-04 stsp refname += 18;
4834 4e99b47e 2019-10-04 stsp refstr = got_ref_to_str(ref);
4835 4e99b47e 2019-10-04 stsp if (refstr == NULL)
4836 4e99b47e 2019-10-04 stsp return got_error_from_errno("got_ref_to_str");
4838 4e99b47e 2019-10-04 stsp printf("%s%s: %s\n", marker, refname, refstr);
4839 4e99b47e 2019-10-04 stsp free(refstr);
4840 4e99b47e 2019-10-04 stsp return NULL;
4843 4e99b47e 2019-10-04 stsp static const struct got_error *
4844 ad89fa31 2019-10-04 stsp show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4846 ad89fa31 2019-10-04 stsp const char *refname;
4848 ad89fa31 2019-10-04 stsp if (worktree == NULL)
4849 ad89fa31 2019-10-04 stsp return got_error(GOT_ERR_NOT_WORKTREE);
4851 ad89fa31 2019-10-04 stsp refname = got_worktree_get_head_ref_name(worktree);
4853 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/heads/", 11) == 0)
4854 ad89fa31 2019-10-04 stsp refname += 11;
4855 ad89fa31 2019-10-04 stsp if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4856 ad89fa31 2019-10-04 stsp refname += 18;
4858 ad89fa31 2019-10-04 stsp printf("%s\n", refname);
4860 ad89fa31 2019-10-04 stsp return NULL;
4863 ad89fa31 2019-10-04 stsp static const struct got_error *
4864 ba882ee3 2019-07-11 stsp list_branches(struct got_repository *repo, struct got_worktree *worktree)
4866 4e759de4 2019-06-26 stsp static const struct got_error *err = NULL;
4867 4e759de4 2019-06-26 stsp struct got_reflist_head refs;
4868 4e759de4 2019-06-26 stsp struct got_reflist_entry *re;
4869 4e99b47e 2019-10-04 stsp struct got_reference *temp_ref = NULL;
4870 4e99b47e 2019-10-04 stsp int rebase_in_progress, histedit_in_progress;
4872 4e759de4 2019-06-26 stsp SIMPLEQ_INIT(&refs);
4874 4e99b47e 2019-10-04 stsp if (worktree) {
4875 4e99b47e 2019-10-04 stsp err = got_worktree_rebase_in_progress(&rebase_in_progress,
4876 4e99b47e 2019-10-04 stsp worktree);
4878 4e99b47e 2019-10-04 stsp return err;
4880 4e99b47e 2019-10-04 stsp err = got_worktree_histedit_in_progress(&histedit_in_progress,
4881 4e99b47e 2019-10-04 stsp worktree);
4883 4e99b47e 2019-10-04 stsp return err;
4885 4e99b47e 2019-10-04 stsp if (rebase_in_progress || histedit_in_progress) {
4886 4e99b47e 2019-10-04 stsp err = got_ref_open(&temp_ref, repo,
4887 4e99b47e 2019-10-04 stsp got_worktree_get_head_ref_name(worktree), 0);
4889 4e99b47e 2019-10-04 stsp return err;
4890 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, temp_ref);
4891 4e99b47e 2019-10-04 stsp got_ref_close(temp_ref);
4895 b8bad2ba 2019-08-23 stsp err = got_ref_list(&refs, repo, "refs/heads",
4896 b8bad2ba 2019-08-23 stsp got_ref_cmp_by_name, NULL);
4898 4e759de4 2019-06-26 stsp return err;
4900 4e99b47e 2019-10-04 stsp SIMPLEQ_FOREACH(re, &refs, entry)
4901 4e99b47e 2019-10-04 stsp list_branch(repo, worktree, re->ref);
4903 4e759de4 2019-06-26 stsp got_ref_list_free(&refs);
4904 4e759de4 2019-06-26 stsp return NULL;
4907 4e759de4 2019-06-26 stsp static const struct got_error *
4908 45cd4e47 2019-08-25 stsp delete_branch(struct got_repository *repo, struct got_worktree *worktree,
4909 45cd4e47 2019-08-25 stsp const char *branch_name)
4911 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4912 45cd4e47 2019-08-25 stsp struct got_reference *ref = NULL;
4913 4e759de4 2019-06-26 stsp char *refname;
4915 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
4916 4e759de4 2019-06-26 stsp return got_error_from_errno("asprintf");
4918 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4920 4e759de4 2019-06-26 stsp goto done;
4922 45cd4e47 2019-08-25 stsp if (worktree &&
4923 45cd4e47 2019-08-25 stsp strcmp(got_worktree_get_head_ref_name(worktree),
4924 45cd4e47 2019-08-25 stsp got_ref_get_name(ref)) == 0) {
4925 45cd4e47 2019-08-25 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
4926 45cd4e47 2019-08-25 stsp "will not delete this work tree's current branch");
4927 45cd4e47 2019-08-25 stsp goto done;
4930 45cd4e47 2019-08-25 stsp err = got_ref_delete(ref, repo);
4933 45cd4e47 2019-08-25 stsp got_ref_close(ref);
4934 4e759de4 2019-06-26 stsp free(refname);
4935 4e759de4 2019-06-26 stsp return err;
4938 4e759de4 2019-06-26 stsp static const struct got_error *
4939 4e759de4 2019-06-26 stsp add_branch(struct got_repository *repo, const char *branch_name,
4940 a74f7e83 2019-11-10 stsp struct got_object_id *base_commit_id)
4942 4e759de4 2019-06-26 stsp const struct got_error *err = NULL;
4943 4e759de4 2019-06-26 stsp struct got_reference *ref = NULL;
4944 4e759de4 2019-06-26 stsp char *base_refname = NULL, *refname = NULL;
4947 bd5895f3 2019-11-28 stsp * Don't let the user create a branch name with a leading '-'.
4948 d3f84d51 2019-07-11 stsp * While technically a valid reference name, this case is usually
4949 d3f84d51 2019-07-11 stsp * an unintended typo.
4951 bd5895f3 2019-11-28 stsp if (branch_name[0] == '-')
4952 bd5895f3 2019-11-28 stsp return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
4954 4e759de4 2019-06-26 stsp if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
4955 4e759de4 2019-06-26 stsp err = got_error_from_errno("asprintf");
4956 4e759de4 2019-06-26 stsp goto done;
4959 4e759de4 2019-06-26 stsp err = got_ref_open(&ref, repo, refname, 0);
4960 4e759de4 2019-06-26 stsp if (err == NULL) {
4961 4e759de4 2019-06-26 stsp err = got_error(GOT_ERR_BRANCH_EXISTS);
4962 4e759de4 2019-06-26 stsp goto done;
4963 4e759de4 2019-06-26 stsp } else if (err->code != GOT_ERR_NOT_REF)
4964 4e759de4 2019-06-26 stsp goto done;
4966 a74f7e83 2019-11-10 stsp err = got_ref_alloc(&ref, refname, base_commit_id);
4968 4e759de4 2019-06-26 stsp goto done;
4970 4e759de4 2019-06-26 stsp err = got_ref_write(ref, repo);
4973 4e759de4 2019-06-26 stsp got_ref_close(ref);
4974 4e759de4 2019-06-26 stsp free(base_refname);
4975 4e759de4 2019-06-26 stsp free(refname);
4976 4e759de4 2019-06-26 stsp return err;
4979 4e759de4 2019-06-26 stsp static const struct got_error *
4980 4e759de4 2019-06-26 stsp cmd_branch(int argc, char *argv[])
4982 4e759de4 2019-06-26 stsp const struct got_error *error = NULL;
4983 4e759de4 2019-06-26 stsp struct got_repository *repo = NULL;
4984 4e759de4 2019-06-26 stsp struct got_worktree *worktree = NULL;
4985 4e759de4 2019-06-26 stsp char *cwd = NULL, *repo_path = NULL;
4986 da76fce2 2020-02-24 stsp int ch, do_list = 0, do_show = 0, do_update = 1;
4987 a74f7e83 2019-11-10 stsp const char *delref = NULL, *commit_id_arg = NULL;
4988 da76fce2 2020-02-24 stsp struct got_reference *ref = NULL;
4989 da76fce2 2020-02-24 stsp struct got_pathlist_head paths;
4990 da76fce2 2020-02-24 stsp struct got_pathlist_entry *pe;
4991 da76fce2 2020-02-24 stsp struct got_object_id *commit_id = NULL;
4992 da76fce2 2020-02-24 stsp char *commit_id_str = NULL;
4994 da76fce2 2020-02-24 stsp TAILQ_INIT(&paths);
4996 da76fce2 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
4997 4e759de4 2019-06-26 stsp switch (ch) {
4999 a74f7e83 2019-11-10 stsp commit_id_arg = optarg;
5002 4e759de4 2019-06-26 stsp delref = optarg;
5005 4e759de4 2019-06-26 stsp repo_path = realpath(optarg, NULL);
5006 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5007 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5009 4e759de4 2019-06-26 stsp got_path_strip_trailing_slashes(repo_path);
5012 4e759de4 2019-06-26 stsp do_list = 1;
5015 da76fce2 2020-02-24 stsp do_update = 0;
5018 4e759de4 2019-06-26 stsp usage_branch();
5019 4e759de4 2019-06-26 stsp /* NOTREACHED */
5023 4e759de4 2019-06-26 stsp if (do_list && delref)
5024 907f15e2 2020-03-22 stsp errx(1, "-l and -d options are mutually exclusive");
5026 4e759de4 2019-06-26 stsp argc -= optind;
5027 4e759de4 2019-06-26 stsp argv += optind;
5029 ad89fa31 2019-10-04 stsp if (!do_list && !delref && argc == 0)
5030 ad89fa31 2019-10-04 stsp do_show = 1;
5032 a74f7e83 2019-11-10 stsp if ((do_list || delref || do_show) && commit_id_arg != NULL)
5033 a74f7e83 2019-11-10 stsp errx(1, "-c option can only be used when creating a branch");
5035 4e759de4 2019-06-26 stsp if (do_list || delref) {
5036 4e759de4 2019-06-26 stsp if (argc > 0)
5037 4e759de4 2019-06-26 stsp usage_branch();
5038 a74f7e83 2019-11-10 stsp } else if (!do_show && argc != 1)
5039 4e759de4 2019-06-26 stsp usage_branch();
5041 4e759de4 2019-06-26 stsp #ifndef PROFILE
5042 ad89fa31 2019-10-04 stsp if (do_list || do_show) {
5043 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5044 4e759de4 2019-06-26 stsp NULL) == -1)
5045 4e759de4 2019-06-26 stsp err(1, "pledge");
5047 4e759de4 2019-06-26 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5048 4e759de4 2019-06-26 stsp "sendfd unveil", NULL) == -1)
5049 4e759de4 2019-06-26 stsp err(1, "pledge");
5052 4e759de4 2019-06-26 stsp cwd = getcwd(NULL, 0);
5053 4e759de4 2019-06-26 stsp if (cwd == NULL) {
5054 4e759de4 2019-06-26 stsp error = got_error_from_errno("getcwd");
5055 4e759de4 2019-06-26 stsp goto done;
5058 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5059 4e759de4 2019-06-26 stsp error = got_worktree_open(&worktree, cwd);
5060 4e759de4 2019-06-26 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5061 4e759de4 2019-06-26 stsp goto done;
5063 4e759de4 2019-06-26 stsp error = NULL;
5064 4e759de4 2019-06-26 stsp if (worktree) {
5065 4e759de4 2019-06-26 stsp repo_path =
5066 4e759de4 2019-06-26 stsp strdup(got_worktree_get_repo_path(worktree));
5067 4e759de4 2019-06-26 stsp if (repo_path == NULL)
5068 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5069 4e759de4 2019-06-26 stsp if (error)
5070 4e759de4 2019-06-26 stsp goto done;
5072 4e759de4 2019-06-26 stsp repo_path = strdup(cwd);
5073 4e759de4 2019-06-26 stsp if (repo_path == NULL) {
5074 4e759de4 2019-06-26 stsp error = got_error_from_errno("strdup");
5075 4e759de4 2019-06-26 stsp goto done;
5080 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5081 4e759de4 2019-06-26 stsp if (error != NULL)
5082 4e759de4 2019-06-26 stsp goto done;
5084 4e759de4 2019-06-26 stsp error = apply_unveil(got_repo_get_path(repo), do_list,
5085 c530dc23 2019-07-23 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
5086 4e759de4 2019-06-26 stsp if (error)
5087 4e759de4 2019-06-26 stsp goto done;
5089 ad89fa31 2019-10-04 stsp if (do_show)
5090 ad89fa31 2019-10-04 stsp error = show_current_branch(repo, worktree);
5091 ad89fa31 2019-10-04 stsp else if (do_list)
5092 ba882ee3 2019-07-11 stsp error = list_branches(repo, worktree);
5093 4e759de4 2019-06-26 stsp else if (delref)
5094 45cd4e47 2019-08-25 stsp error = delete_branch(repo, worktree, delref);
5096 a74f7e83 2019-11-10 stsp if (commit_id_arg == NULL)
5097 a74f7e83 2019-11-10 stsp commit_id_arg = worktree ?
5098 4e759de4 2019-06-26 stsp got_worktree_get_head_ref_name(worktree) :
5099 4e759de4 2019-06-26 stsp GOT_REF_HEAD;
5100 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5101 71a27632 2020-01-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5102 a74f7e83 2019-11-10 stsp if (error)
5103 a74f7e83 2019-11-10 stsp goto done;
5104 a74f7e83 2019-11-10 stsp error = add_branch(repo, argv[0], commit_id);
5105 da76fce2 2020-02-24 stsp if (error)
5106 da76fce2 2020-02-24 stsp goto done;
5107 da76fce2 2020-02-24 stsp if (worktree && do_update) {
5108 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
5109 da76fce2 2020-02-24 stsp char *branch_refname = NULL;
5111 da76fce2 2020-02-24 stsp error = got_object_id_str(&commit_id_str, commit_id);
5112 da76fce2 2020-02-24 stsp if (error)
5113 da76fce2 2020-02-24 stsp goto done;
5114 da76fce2 2020-02-24 stsp error = get_worktree_paths_from_argv(&paths, 0, NULL,
5115 da76fce2 2020-02-24 stsp worktree);
5116 da76fce2 2020-02-24 stsp if (error)
5117 da76fce2 2020-02-24 stsp goto done;
5118 da76fce2 2020-02-24 stsp if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5120 da76fce2 2020-02-24 stsp error = got_error_from_errno("asprintf");
5121 da76fce2 2020-02-24 stsp goto done;
5123 da76fce2 2020-02-24 stsp error = got_ref_open(&ref, repo, branch_refname, 0);
5124 da76fce2 2020-02-24 stsp free(branch_refname);
5125 da76fce2 2020-02-24 stsp if (error)
5126 da76fce2 2020-02-24 stsp goto done;
5127 da76fce2 2020-02-24 stsp error = switch_head_ref(ref, commit_id, worktree,
5129 da76fce2 2020-02-24 stsp if (error)
5130 da76fce2 2020-02-24 stsp goto done;
5131 da76fce2 2020-02-24 stsp error = got_worktree_set_base_commit_id(worktree, repo,
5132 da76fce2 2020-02-24 stsp commit_id);
5133 da76fce2 2020-02-24 stsp if (error)
5134 da76fce2 2020-02-24 stsp goto done;
5135 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
5136 da76fce2 2020-02-24 stsp error = got_worktree_checkout_files(worktree, &paths,
5137 9627c110 2020-04-18 stsp repo, update_progress, &upa, check_cancelled,
5139 da76fce2 2020-02-24 stsp if (error)
5140 da76fce2 2020-02-24 stsp goto done;
5141 9627c110 2020-04-18 stsp if (upa.did_something)
5142 da76fce2 2020-02-24 stsp printf("Updated to commit %s\n", commit_id_str);
5143 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
5148 da76fce2 2020-02-24 stsp got_ref_close(ref);
5150 d0eebce4 2019-03-11 stsp got_repo_close(repo);
5151 d0eebce4 2019-03-11 stsp if (worktree)
5152 d0eebce4 2019-03-11 stsp got_worktree_close(worktree);
5153 d0eebce4 2019-03-11 stsp free(cwd);
5154 d0eebce4 2019-03-11 stsp free(repo_path);
5155 da76fce2 2020-02-24 stsp free(commit_id);
5156 da76fce2 2020-02-24 stsp free(commit_id_str);
5157 da76fce2 2020-02-24 stsp TAILQ_FOREACH(pe, &paths, entry)
5158 da76fce2 2020-02-24 stsp free((char *)pe->path);
5159 da76fce2 2020-02-24 stsp got_pathlist_free(&paths);
5160 d00136be 2019-03-26 stsp return error;
5164 d00136be 2019-03-26 stsp __dead static void
5165 8e7bd50a 2019-08-22 stsp usage_tag(void)
5167 8e7bd50a 2019-08-22 stsp fprintf(stderr,
5168 80106605 2020-02-24 stsp "usage: %s tag [-c commit] [-r repository] [-l] "
5169 80106605 2020-02-24 stsp "[-m message] name\n", getprogname());
5174 b8bad2ba 2019-08-23 stsp static const struct got_error *
5175 b8bad2ba 2019-08-23 stsp sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5177 b8bad2ba 2019-08-23 stsp const struct got_error *err = NULL;
5178 b8bad2ba 2019-08-23 stsp struct got_reflist_entry *re, *se, *new;
5179 b8bad2ba 2019-08-23 stsp struct got_object_id *re_id, *se_id;
5180 b8bad2ba 2019-08-23 stsp struct got_tag_object *re_tag, *se_tag;
5181 b8bad2ba 2019-08-23 stsp time_t re_time, se_time;
5183 b8bad2ba 2019-08-23 stsp SIMPLEQ_FOREACH(re, tags, entry) {
5184 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_FIRST(sorted);
5185 b8bad2ba 2019-08-23 stsp if (se == NULL) {
5186 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5188 b8bad2ba 2019-08-23 stsp return err;
5189 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5192 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&re_id, repo, re->ref);
5195 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&re_tag, repo, re_id);
5196 b8bad2ba 2019-08-23 stsp free(re_id);
5199 b8bad2ba 2019-08-23 stsp re_time = got_object_tag_get_tagger_time(re_tag);
5200 b8bad2ba 2019-08-23 stsp got_object_tag_close(re_tag);
5203 b8bad2ba 2019-08-23 stsp while (se) {
5204 b8bad2ba 2019-08-23 stsp err = got_ref_resolve(&se_id, repo, re->ref);
5207 b8bad2ba 2019-08-23 stsp err = got_object_open_as_tag(&se_tag, repo, se_id);
5208 b8bad2ba 2019-08-23 stsp free(se_id);
5211 b8bad2ba 2019-08-23 stsp se_time = got_object_tag_get_tagger_time(se_tag);
5212 b8bad2ba 2019-08-23 stsp got_object_tag_close(se_tag);
5214 b8bad2ba 2019-08-23 stsp if (se_time > re_time) {
5215 b8bad2ba 2019-08-23 stsp err = got_reflist_entry_dup(&new, re);
5217 b8bad2ba 2019-08-23 stsp return err;
5218 b8bad2ba 2019-08-23 stsp SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5221 b8bad2ba 2019-08-23 stsp se = SIMPLEQ_NEXT(se, entry);
5226 b8bad2ba 2019-08-23 stsp return err;
5230 b8bad2ba 2019-08-23 stsp static const struct got_error *
5231 8e7bd50a 2019-08-22 stsp list_tags(struct got_repository *repo, struct got_worktree *worktree)
5233 8e7bd50a 2019-08-22 stsp static const struct got_error *err = NULL;
5234 8e7bd50a 2019-08-22 stsp struct got_reflist_head refs;
5235 8e7bd50a 2019-08-22 stsp struct got_reflist_entry *re;
5237 8e7bd50a 2019-08-22 stsp SIMPLEQ_INIT(&refs);
5239 d1f16636 2020-01-15 stsp err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5241 8e7bd50a 2019-08-22 stsp return err;
5243 8e7bd50a 2019-08-22 stsp SIMPLEQ_FOREACH(re, &refs, entry) {
5244 8e7bd50a 2019-08-22 stsp const char *refname;
5245 8e7bd50a 2019-08-22 stsp char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5246 8e7bd50a 2019-08-22 stsp char datebuf[26];
5247 d4efa91b 2020-01-14 stsp const char *tagger;
5248 8e7bd50a 2019-08-22 stsp time_t tagger_time;
5249 8e7bd50a 2019-08-22 stsp struct got_object_id *id;
5250 8e7bd50a 2019-08-22 stsp struct got_tag_object *tag;
5251 d4efa91b 2020-01-14 stsp struct got_commit_object *commit = NULL;
5253 8e7bd50a 2019-08-22 stsp refname = got_ref_get_name(re->ref);
5254 8e7bd50a 2019-08-22 stsp if (strncmp(refname, "refs/tags/", 10) != 0)
5256 8e7bd50a 2019-08-22 stsp refname += 10;
5257 8e7bd50a 2019-08-22 stsp refstr = got_ref_to_str(re->ref);
5258 8e7bd50a 2019-08-22 stsp if (refstr == NULL) {
5259 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("got_ref_to_str");
5262 8e7bd50a 2019-08-22 stsp printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5263 8e7bd50a 2019-08-22 stsp free(refstr);
5265 8e7bd50a 2019-08-22 stsp err = got_ref_resolve(&id, repo, re->ref);
5268 8e7bd50a 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
5269 d4efa91b 2020-01-14 stsp if (err) {
5270 d4efa91b 2020-01-14 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
5274 d4efa91b 2020-01-14 stsp /* "lightweight" tag */
5275 d4efa91b 2020-01-14 stsp err = got_object_open_as_commit(&commit, repo, id);
5276 d4efa91b 2020-01-14 stsp if (err) {
5280 d4efa91b 2020-01-14 stsp tagger = got_object_commit_get_committer(commit);
5281 d4efa91b 2020-01-14 stsp tagger_time =
5282 d4efa91b 2020-01-14 stsp got_object_commit_get_committer_time(commit);
5283 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str, id);
5289 d4efa91b 2020-01-14 stsp tagger = got_object_tag_get_tagger(tag);
5290 d4efa91b 2020-01-14 stsp tagger_time = got_object_tag_get_tagger_time(tag);
5291 d4efa91b 2020-01-14 stsp err = got_object_id_str(&id_str,
5292 d4efa91b 2020-01-14 stsp got_object_tag_get_object_id(tag));
5296 d4efa91b 2020-01-14 stsp printf("from: %s\n", tagger);
5297 2417344c 2019-08-23 stsp datestr = get_datestr(&tagger_time, datebuf);
5298 2417344c 2019-08-23 stsp if (datestr)
5299 2417344c 2019-08-23 stsp printf("date: %s UTC\n", datestr);
5300 d4efa91b 2020-01-14 stsp if (commit)
5301 2417344c 2019-08-23 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5303 d4efa91b 2020-01-14 stsp switch (got_object_tag_get_object_type(tag)) {
5304 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_BLOB:
5305 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5308 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TREE:
5309 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5312 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_COMMIT:
5313 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5316 d4efa91b 2020-01-14 stsp case GOT_OBJ_TYPE_TAG:
5317 d4efa91b 2020-01-14 stsp printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5324 8e7bd50a 2019-08-22 stsp free(id_str);
5325 d4efa91b 2020-01-14 stsp if (commit) {
5326 d4efa91b 2020-01-14 stsp err = got_object_commit_get_logmsg(&tagmsg0, commit);
5329 d4efa91b 2020-01-14 stsp got_object_commit_close(commit);
5331 d4efa91b 2020-01-14 stsp tagmsg0 = strdup(got_object_tag_get_message(tag));
5332 d4efa91b 2020-01-14 stsp got_object_tag_close(tag);
5333 d4efa91b 2020-01-14 stsp if (tagmsg0 == NULL) {
5334 d4efa91b 2020-01-14 stsp err = got_error_from_errno("strdup");
5339 8e7bd50a 2019-08-22 stsp tagmsg = tagmsg0;
5341 8e7bd50a 2019-08-22 stsp line = strsep(&tagmsg, "\n");
5343 8e7bd50a 2019-08-22 stsp printf(" %s\n", line);
5344 8e7bd50a 2019-08-22 stsp } while (line);
5345 8e7bd50a 2019-08-22 stsp free(tagmsg0);
5348 8e7bd50a 2019-08-22 stsp got_ref_list_free(&refs);
5349 8e7bd50a 2019-08-22 stsp return NULL;
5352 8e7bd50a 2019-08-22 stsp static const struct got_error *
5353 f372d5cd 2019-10-21 stsp get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5354 62870f63 2019-08-22 stsp const char *tag_name, const char *repo_path)
5356 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5357 8e7bd50a 2019-08-22 stsp char *template = NULL, *initial_content = NULL;
5358 f372d5cd 2019-10-21 stsp char *editor = NULL;
5359 8e7bd50a 2019-08-22 stsp int fd = -1;
5361 bb63914a 2020-02-17 stsp if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5362 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5363 8e7bd50a 2019-08-22 stsp goto done;
5366 62870f63 2019-08-22 stsp if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5367 62870f63 2019-08-22 stsp commit_id_str, tag_name) == -1) {
5368 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5369 8e7bd50a 2019-08-22 stsp goto done;
5372 f372d5cd 2019-10-21 stsp err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5374 8e7bd50a 2019-08-22 stsp goto done;
5376 8e7bd50a 2019-08-22 stsp dprintf(fd, initial_content);
5377 8e7bd50a 2019-08-22 stsp close(fd);
5379 8e7bd50a 2019-08-22 stsp err = get_editor(&editor);
5381 8e7bd50a 2019-08-22 stsp goto done;
5382 f372d5cd 2019-10-21 stsp err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5384 8e7bd50a 2019-08-22 stsp free(initial_content);
5385 8e7bd50a 2019-08-22 stsp free(template);
5386 8e7bd50a 2019-08-22 stsp free(editor);
5388 8e7bd50a 2019-08-22 stsp /* Editor is done; we can now apply unveil(2) */
5389 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5390 8e7bd50a 2019-08-22 stsp err = apply_unveil(repo_path, 0, NULL);
5391 8e7bd50a 2019-08-22 stsp if (err) {
5392 8e7bd50a 2019-08-22 stsp free(*tagmsg);
5393 8e7bd50a 2019-08-22 stsp *tagmsg = NULL;
5396 8e7bd50a 2019-08-22 stsp return err;
5399 8e7bd50a 2019-08-22 stsp static const struct got_error *
5400 8e7bd50a 2019-08-22 stsp add_tag(struct got_repository *repo, const char *tag_name,
5401 8e7bd50a 2019-08-22 stsp const char *commit_arg, const char *tagmsg_arg)
5403 8e7bd50a 2019-08-22 stsp const struct got_error *err = NULL;
5404 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id = NULL, *tag_id = NULL;
5405 8e7bd50a 2019-08-22 stsp char *label = NULL, *commit_id_str = NULL;
5406 8e7bd50a 2019-08-22 stsp struct got_reference *ref = NULL;
5407 aba9c984 2019-09-08 stsp char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5408 f372d5cd 2019-10-21 stsp char *tagmsg_path = NULL, *tag_id_str = NULL;
5409 f372d5cd 2019-10-21 stsp int preserve_tagmsg = 0;
5412 bd5895f3 2019-11-28 stsp * Don't let the user create a tag name with a leading '-'.
5413 8e7bd50a 2019-08-22 stsp * While technically a valid reference name, this case is usually
5414 8e7bd50a 2019-08-22 stsp * an unintended typo.
5416 bd5895f3 2019-11-28 stsp if (tag_name[0] == '-')
5417 bd5895f3 2019-11-28 stsp return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5419 aba9c984 2019-09-08 stsp err = get_author(&tagger, repo);
5421 8e7bd50a 2019-08-22 stsp return err;
5423 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5424 8e7bd50a 2019-08-22 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5426 8e7bd50a 2019-08-22 stsp goto done;
5428 8e7bd50a 2019-08-22 stsp err = got_object_id_str(&commit_id_str, commit_id);
5430 8e7bd50a 2019-08-22 stsp goto done;
5432 8e7bd50a 2019-08-22 stsp if (strncmp("refs/tags/", tag_name, 10) == 0) {
5433 8e7bd50a 2019-08-22 stsp refname = strdup(tag_name);
5434 8e7bd50a 2019-08-22 stsp if (refname == NULL) {
5435 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("strdup");
5436 8e7bd50a 2019-08-22 stsp goto done;
5438 8e7bd50a 2019-08-22 stsp tag_name += 10;
5439 8e7bd50a 2019-08-22 stsp } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5440 8e7bd50a 2019-08-22 stsp err = got_error_from_errno("asprintf");
5441 8e7bd50a 2019-08-22 stsp goto done;
5444 8e7bd50a 2019-08-22 stsp err = got_ref_open(&ref, repo, refname, 0);
5445 8e7bd50a 2019-08-22 stsp if (err == NULL) {
5446 8e7bd50a 2019-08-22 stsp err = got_error(GOT_ERR_TAG_EXISTS);
5447 8e7bd50a 2019-08-22 stsp goto done;
5448 8e7bd50a 2019-08-22 stsp } else if (err->code != GOT_ERR_NOT_REF)
5449 8e7bd50a 2019-08-22 stsp goto done;
5451 8e7bd50a 2019-08-22 stsp if (tagmsg_arg == NULL) {
5452 f372d5cd 2019-10-21 stsp err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5453 62870f63 2019-08-22 stsp tag_name, got_repo_get_path(repo));
5454 f372d5cd 2019-10-21 stsp if (err) {
5455 f372d5cd 2019-10-21 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5456 f372d5cd 2019-10-21 stsp tagmsg_path != NULL)
5457 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5458 8e7bd50a 2019-08-22 stsp goto done;
5462 8e7bd50a 2019-08-22 stsp err = got_object_tag_create(&tag_id, tag_name, commit_id,
5463 8e7bd50a 2019-08-22 stsp tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5464 f372d5cd 2019-10-21 stsp if (err) {
5465 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5466 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5467 8e7bd50a 2019-08-22 stsp goto done;
5470 8e7bd50a 2019-08-22 stsp err = got_ref_alloc(&ref, refname, tag_id);
5471 f372d5cd 2019-10-21 stsp if (err) {
5472 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5473 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5474 8e7bd50a 2019-08-22 stsp goto done;
5477 8e7bd50a 2019-08-22 stsp err = got_ref_write(ref, repo);
5478 f372d5cd 2019-10-21 stsp if (err) {
5479 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5480 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5481 f372d5cd 2019-10-21 stsp goto done;
5484 f372d5cd 2019-10-21 stsp err = got_object_id_str(&tag_id_str, tag_id);
5485 f372d5cd 2019-10-21 stsp if (err) {
5486 f372d5cd 2019-10-21 stsp if (tagmsg_path)
5487 f372d5cd 2019-10-21 stsp preserve_tagmsg = 1;
5488 f372d5cd 2019-10-21 stsp goto done;
5490 f372d5cd 2019-10-21 stsp printf("Created tag %s\n", tag_id_str);
5492 f372d5cd 2019-10-21 stsp if (preserve_tagmsg) {
5493 f372d5cd 2019-10-21 stsp fprintf(stderr, "%s: tag message preserved in %s\n",
5494 f372d5cd 2019-10-21 stsp getprogname(), tagmsg_path);
5495 f372d5cd 2019-10-21 stsp } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5496 f372d5cd 2019-10-21 stsp err = got_error_from_errno2("unlink", tagmsg_path);
5497 f372d5cd 2019-10-21 stsp free(tag_id_str);
5499 8e7bd50a 2019-08-22 stsp got_ref_close(ref);
5500 8e7bd50a 2019-08-22 stsp free(commit_id);
5501 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5502 8e7bd50a 2019-08-22 stsp free(refname);
5503 8e7bd50a 2019-08-22 stsp free(tagmsg);
5504 f372d5cd 2019-10-21 stsp free(tagmsg_path);
5505 aba9c984 2019-09-08 stsp free(tagger);
5506 8e7bd50a 2019-08-22 stsp return err;
5509 8e7bd50a 2019-08-22 stsp static const struct got_error *
5510 8e7bd50a 2019-08-22 stsp cmd_tag(int argc, char *argv[])
5512 8e7bd50a 2019-08-22 stsp const struct got_error *error = NULL;
5513 8e7bd50a 2019-08-22 stsp struct got_repository *repo = NULL;
5514 8e7bd50a 2019-08-22 stsp struct got_worktree *worktree = NULL;
5515 8e7bd50a 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5516 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL;
5517 8e7bd50a 2019-08-22 stsp const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5518 8e7bd50a 2019-08-22 stsp int ch, do_list = 0;
5520 80106605 2020-02-24 stsp while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5521 8e7bd50a 2019-08-22 stsp switch (ch) {
5523 80106605 2020-02-24 stsp commit_id_arg = optarg;
5526 8e7bd50a 2019-08-22 stsp tagmsg = optarg;
5529 8e7bd50a 2019-08-22 stsp repo_path = realpath(optarg, NULL);
5530 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5531 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5533 8e7bd50a 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
5536 8e7bd50a 2019-08-22 stsp do_list = 1;
5539 8e7bd50a 2019-08-22 stsp usage_tag();
5540 8e7bd50a 2019-08-22 stsp /* NOTREACHED */
5544 8e7bd50a 2019-08-22 stsp argc -= optind;
5545 8e7bd50a 2019-08-22 stsp argv += optind;
5547 8e7bd50a 2019-08-22 stsp if (do_list) {
5548 80106605 2020-02-24 stsp if (commit_id_arg != NULL)
5550 775ce909 2020-03-22 stsp "-c option can only be used when creating a tag");
5551 8e7bd50a 2019-08-22 stsp if (tagmsg)
5552 80106605 2020-02-24 stsp errx(1, "-l and -m options are mutually exclusive");
5553 8e7bd50a 2019-08-22 stsp if (argc > 0)
5554 8e7bd50a 2019-08-22 stsp usage_tag();
5555 80106605 2020-02-24 stsp } else if (argc != 1)
5556 8e7bd50a 2019-08-22 stsp usage_tag();
5558 a2887370 2019-08-23 stsp tag_name = argv[0];
5560 8e7bd50a 2019-08-22 stsp #ifndef PROFILE
5561 8e7bd50a 2019-08-22 stsp if (do_list) {
5562 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5563 8e7bd50a 2019-08-22 stsp NULL) == -1)
5564 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5566 8e7bd50a 2019-08-22 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5567 8e7bd50a 2019-08-22 stsp "sendfd unveil", NULL) == -1)
5568 8e7bd50a 2019-08-22 stsp err(1, "pledge");
5571 8e7bd50a 2019-08-22 stsp cwd = getcwd(NULL, 0);
5572 8e7bd50a 2019-08-22 stsp if (cwd == NULL) {
5573 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("getcwd");
5574 8e7bd50a 2019-08-22 stsp goto done;
5577 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5578 8e7bd50a 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
5579 8e7bd50a 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5580 8e7bd50a 2019-08-22 stsp goto done;
5582 8e7bd50a 2019-08-22 stsp error = NULL;
5583 8e7bd50a 2019-08-22 stsp if (worktree) {
5584 8e7bd50a 2019-08-22 stsp repo_path =
5585 8e7bd50a 2019-08-22 stsp strdup(got_worktree_get_repo_path(worktree));
5586 8e7bd50a 2019-08-22 stsp if (repo_path == NULL)
5587 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5588 8e7bd50a 2019-08-22 stsp if (error)
5589 8e7bd50a 2019-08-22 stsp goto done;
5591 8e7bd50a 2019-08-22 stsp repo_path = strdup(cwd);
5592 8e7bd50a 2019-08-22 stsp if (repo_path == NULL) {
5593 8e7bd50a 2019-08-22 stsp error = got_error_from_errno("strdup");
5594 8e7bd50a 2019-08-22 stsp goto done;
5599 8e7bd50a 2019-08-22 stsp if (do_list) {
5600 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5601 c9956ddf 2019-09-08 stsp if (error != NULL)
5602 c9956ddf 2019-09-08 stsp goto done;
5603 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5604 8e7bd50a 2019-08-22 stsp if (error)
5605 8e7bd50a 2019-08-22 stsp goto done;
5606 8e7bd50a 2019-08-22 stsp error = list_tags(repo, worktree);
5608 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
5609 c9956ddf 2019-09-08 stsp if (error)
5610 c9956ddf 2019-09-08 stsp goto done;
5611 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, gitconfig_path);
5612 c9956ddf 2019-09-08 stsp if (error != NULL)
5613 c9956ddf 2019-09-08 stsp goto done;
5615 8e7bd50a 2019-08-22 stsp if (tagmsg) {
5616 8e7bd50a 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5617 8e7bd50a 2019-08-22 stsp if (error)
5618 8e7bd50a 2019-08-22 stsp goto done;
5621 8e7bd50a 2019-08-22 stsp if (commit_id_arg == NULL) {
5622 8e7bd50a 2019-08-22 stsp struct got_reference *head_ref;
5623 8e7bd50a 2019-08-22 stsp struct got_object_id *commit_id;
5624 8e7bd50a 2019-08-22 stsp error = got_ref_open(&head_ref, repo,
5625 8e7bd50a 2019-08-22 stsp worktree ? got_worktree_get_head_ref_name(worktree)
5626 8e7bd50a 2019-08-22 stsp : GOT_REF_HEAD, 0);
5627 8e7bd50a 2019-08-22 stsp if (error)
5628 8e7bd50a 2019-08-22 stsp goto done;
5629 8e7bd50a 2019-08-22 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5630 8e7bd50a 2019-08-22 stsp got_ref_close(head_ref);
5631 8e7bd50a 2019-08-22 stsp if (error)
5632 8e7bd50a 2019-08-22 stsp goto done;
5633 8e7bd50a 2019-08-22 stsp error = got_object_id_str(&commit_id_str, commit_id);
5634 8e7bd50a 2019-08-22 stsp free(commit_id);
5635 8e7bd50a 2019-08-22 stsp if (error)
5636 8e7bd50a 2019-08-22 stsp goto done;
5639 8e7bd50a 2019-08-22 stsp error = add_tag(repo, tag_name,
5640 8e7bd50a 2019-08-22 stsp commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5644 8e7bd50a 2019-08-22 stsp got_repo_close(repo);
5645 8e7bd50a 2019-08-22 stsp if (worktree)
5646 8e7bd50a 2019-08-22 stsp got_worktree_close(worktree);
5647 8e7bd50a 2019-08-22 stsp free(cwd);
5648 8e7bd50a 2019-08-22 stsp free(repo_path);
5649 c9956ddf 2019-09-08 stsp free(gitconfig_path);
5650 8e7bd50a 2019-08-22 stsp free(commit_id_str);
5651 8e7bd50a 2019-08-22 stsp return error;
5654 8e7bd50a 2019-08-22 stsp __dead static void
5655 d00136be 2019-03-26 stsp usage_add(void)
5657 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5658 022fae89 2019-12-06 tracey getprogname());
5662 d00136be 2019-03-26 stsp static const struct got_error *
5663 4e68cba3 2019-11-23 stsp add_progress(void *arg, unsigned char status, const char *path)
5665 4e68cba3 2019-11-23 stsp while (path[0] == '/')
5667 4e68cba3 2019-11-23 stsp printf("%c %s\n", status, path);
5668 4e68cba3 2019-11-23 stsp return NULL;
5671 4e68cba3 2019-11-23 stsp static const struct got_error *
5672 d00136be 2019-03-26 stsp cmd_add(int argc, char *argv[])
5674 d00136be 2019-03-26 stsp const struct got_error *error = NULL;
5675 031a5338 2019-03-26 stsp struct got_repository *repo = NULL;
5676 d00136be 2019-03-26 stsp struct got_worktree *worktree = NULL;
5677 1dd54920 2019-05-11 stsp char *cwd = NULL;
5678 1dd54920 2019-05-11 stsp struct got_pathlist_head paths;
5679 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
5680 022fae89 2019-12-06 tracey int ch, can_recurse = 0, no_ignores = 0;
5682 1dd54920 2019-05-11 stsp TAILQ_INIT(&paths);
5684 022fae89 2019-12-06 tracey while ((ch = getopt(argc, argv, "IR")) != -1) {
5685 d00136be 2019-03-26 stsp switch (ch) {
5686 022fae89 2019-12-06 tracey case 'I':
5687 022fae89 2019-12-06 tracey no_ignores = 1;
5690 4e68cba3 2019-11-23 stsp can_recurse = 1;
5693 d00136be 2019-03-26 stsp usage_add();
5694 d00136be 2019-03-26 stsp /* NOTREACHED */
5698 d00136be 2019-03-26 stsp argc -= optind;
5699 d00136be 2019-03-26 stsp argv += optind;
5701 43012d58 2019-07-14 stsp #ifndef PROFILE
5702 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5703 43012d58 2019-07-14 stsp NULL) == -1)
5704 43012d58 2019-07-14 stsp err(1, "pledge");
5706 723c305c 2019-05-11 jcs if (argc < 1)
5707 d00136be 2019-03-26 stsp usage_add();
5709 d00136be 2019-03-26 stsp cwd = getcwd(NULL, 0);
5710 d00136be 2019-03-26 stsp if (cwd == NULL) {
5711 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5712 d00136be 2019-03-26 stsp goto done;
5715 d00136be 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5716 fa51e947 2020-03-27 stsp if (error) {
5717 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5718 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "add", cwd);
5719 d00136be 2019-03-26 stsp goto done;
5722 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5724 031a5338 2019-03-26 stsp if (error != NULL)
5725 031a5338 2019-03-26 stsp goto done;
5727 031a5338 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5728 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5729 d00136be 2019-03-26 stsp if (error)
5730 d00136be 2019-03-26 stsp goto done;
5732 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5733 6d022e97 2019-08-04 stsp if (error)
5734 022fae89 2019-12-06 tracey goto done;
5736 022fae89 2019-12-06 tracey if (!can_recurse && no_ignores) {
5737 022fae89 2019-12-06 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5738 022fae89 2019-12-06 tracey "disregarding ignores requires -R option");
5739 6d022e97 2019-08-04 stsp goto done;
5743 4e68cba3 2019-11-23 stsp if (!can_recurse) {
5744 4e68cba3 2019-11-23 stsp char *ondisk_path;
5745 4e68cba3 2019-11-23 stsp struct stat sb;
5746 4e68cba3 2019-11-23 stsp TAILQ_FOREACH(pe, &paths, entry) {
5747 4e68cba3 2019-11-23 stsp if (asprintf(&ondisk_path, "%s/%s",
5748 4e68cba3 2019-11-23 stsp got_worktree_get_root_path(worktree),
5749 4e68cba3 2019-11-23 stsp pe->path) == -1) {
5750 4e68cba3 2019-11-23 stsp error = got_error_from_errno("asprintf");
5751 4e68cba3 2019-11-23 stsp goto done;
5753 4e68cba3 2019-11-23 stsp if (lstat(ondisk_path, &sb) == -1) {
5754 4e68cba3 2019-11-23 stsp if (errno == ENOENT) {
5755 4e68cba3 2019-11-23 stsp free(ondisk_path);
5758 4e68cba3 2019-11-23 stsp error = got_error_from_errno2("lstat",
5759 4e68cba3 2019-11-23 stsp ondisk_path);
5760 4e68cba3 2019-11-23 stsp free(ondisk_path);
5761 4e68cba3 2019-11-23 stsp goto done;
5763 4e68cba3 2019-11-23 stsp free(ondisk_path);
5764 4e68cba3 2019-11-23 stsp if (S_ISDIR(sb.st_mode)) {
5765 4e68cba3 2019-11-23 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
5766 4e68cba3 2019-11-23 stsp "adding directories requires -R option");
5767 4e68cba3 2019-11-23 stsp goto done;
5772 4e68cba3 2019-11-23 stsp error = got_worktree_schedule_add(worktree, &paths, add_progress,
5773 022fae89 2019-12-06 tracey NULL, repo, no_ignores);
5776 031a5338 2019-03-26 stsp got_repo_close(repo);
5777 d00136be 2019-03-26 stsp if (worktree)
5778 d00136be 2019-03-26 stsp got_worktree_close(worktree);
5779 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, &paths, entry)
5780 1dd54920 2019-05-11 stsp free((char *)pe->path);
5781 1dd54920 2019-05-11 stsp got_pathlist_free(&paths);
5782 2ec1f75b 2019-03-26 stsp free(cwd);
5783 2ec1f75b 2019-03-26 stsp return error;
5786 2ec1f75b 2019-03-26 stsp __dead static void
5787 648e4ef7 2019-07-09 stsp usage_remove(void)
5789 c29c428a 2019-12-16 stsp fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5790 f2a9dc41 2019-12-13 tracey getprogname());
5794 2a06fe5f 2019-08-24 stsp static const struct got_error *
5795 2a06fe5f 2019-08-24 stsp print_remove_status(void *arg, unsigned char status,
5796 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *path)
5798 f2a9dc41 2019-12-13 tracey while (path[0] == '/')
5800 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5801 2a06fe5f 2019-08-24 stsp return NULL;
5802 2a06fe5f 2019-08-24 stsp if (status == staged_status && (status == GOT_STATUS_DELETE))
5803 2a06fe5f 2019-08-24 stsp status = GOT_STATUS_NO_CHANGE;
5804 2a06fe5f 2019-08-24 stsp printf("%c%c %s\n", status, staged_status, path);
5805 2a06fe5f 2019-08-24 stsp return NULL;
5808 2ec1f75b 2019-03-26 stsp static const struct got_error *
5809 648e4ef7 2019-07-09 stsp cmd_remove(int argc, char *argv[])
5811 2ec1f75b 2019-03-26 stsp const struct got_error *error = NULL;
5812 2ec1f75b 2019-03-26 stsp struct got_worktree *worktree = NULL;
5813 2ec1f75b 2019-03-26 stsp struct got_repository *repo = NULL;
5814 17ed4618 2019-06-02 stsp char *cwd = NULL;
5815 17ed4618 2019-06-02 stsp struct got_pathlist_head paths;
5816 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
5817 70e3e7f5 2019-12-13 tracey int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5819 17ed4618 2019-06-02 stsp TAILQ_INIT(&paths);
5821 70e3e7f5 2019-12-13 tracey while ((ch = getopt(argc, argv, "fkR")) != -1) {
5822 2ec1f75b 2019-03-26 stsp switch (ch) {
5824 2ec1f75b 2019-03-26 stsp delete_local_mods = 1;
5826 70e3e7f5 2019-12-13 tracey case 'k':
5827 70e3e7f5 2019-12-13 tracey keep_on_disk = 1;
5829 f2a9dc41 2019-12-13 tracey case 'R':
5830 f2a9dc41 2019-12-13 tracey can_recurse = 1;
5833 f2a9dc41 2019-12-13 tracey usage_remove();
5834 2ec1f75b 2019-03-26 stsp /* NOTREACHED */
5838 2ec1f75b 2019-03-26 stsp argc -= optind;
5839 2ec1f75b 2019-03-26 stsp argv += optind;
5841 43012d58 2019-07-14 stsp #ifndef PROFILE
5842 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5843 43012d58 2019-07-14 stsp NULL) == -1)
5844 43012d58 2019-07-14 stsp err(1, "pledge");
5846 17ed4618 2019-06-02 stsp if (argc < 1)
5847 648e4ef7 2019-07-09 stsp usage_remove();
5849 2ec1f75b 2019-03-26 stsp cwd = getcwd(NULL, 0);
5850 2ec1f75b 2019-03-26 stsp if (cwd == NULL) {
5851 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
5852 2ec1f75b 2019-03-26 stsp goto done;
5854 2ec1f75b 2019-03-26 stsp error = got_worktree_open(&worktree, cwd);
5855 fa51e947 2020-03-27 stsp if (error) {
5856 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
5857 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "remove", cwd);
5858 2ec1f75b 2019-03-26 stsp goto done;
5861 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5864 2ec1f75b 2019-03-26 stsp goto done;
5866 c2253644 2019-03-26 stsp error = apply_unveil(got_repo_get_path(repo), 1,
5867 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
5868 2ec1f75b 2019-03-26 stsp if (error)
5869 2ec1f75b 2019-03-26 stsp goto done;
5871 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5872 6d022e97 2019-08-04 stsp if (error)
5873 6d022e97 2019-08-04 stsp goto done;
5875 f2a9dc41 2019-12-13 tracey if (!can_recurse) {
5876 f2a9dc41 2019-12-13 tracey char *ondisk_path;
5877 f2a9dc41 2019-12-13 tracey struct stat sb;
5878 f2a9dc41 2019-12-13 tracey TAILQ_FOREACH(pe, &paths, entry) {
5879 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s",
5880 f2a9dc41 2019-12-13 tracey got_worktree_get_root_path(worktree),
5881 f2a9dc41 2019-12-13 tracey pe->path) == -1) {
5882 f2a9dc41 2019-12-13 tracey error = got_error_from_errno("asprintf");
5883 f2a9dc41 2019-12-13 tracey goto done;
5885 f2a9dc41 2019-12-13 tracey if (lstat(ondisk_path, &sb) == -1) {
5886 f2a9dc41 2019-12-13 tracey if (errno == ENOENT) {
5887 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5888 f2a9dc41 2019-12-13 tracey continue;
5890 f2a9dc41 2019-12-13 tracey error = got_error_from_errno2("lstat",
5891 f2a9dc41 2019-12-13 tracey ondisk_path);
5892 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5893 f2a9dc41 2019-12-13 tracey goto done;
5895 f2a9dc41 2019-12-13 tracey free(ondisk_path);
5896 f2a9dc41 2019-12-13 tracey if (S_ISDIR(sb.st_mode)) {
5897 f2a9dc41 2019-12-13 tracey error = got_error_msg(GOT_ERR_BAD_PATH,
5898 f2a9dc41 2019-12-13 tracey "removing directories requires -R option");
5899 f2a9dc41 2019-12-13 tracey goto done;
5904 17ed4618 2019-06-02 stsp error = got_worktree_schedule_delete(worktree, &paths,
5905 70e3e7f5 2019-12-13 tracey delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
5908 a129376b 2019-03-28 stsp got_repo_close(repo);
5909 a129376b 2019-03-28 stsp if (worktree)
5910 a129376b 2019-03-28 stsp got_worktree_close(worktree);
5911 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, &paths, entry)
5912 17ed4618 2019-06-02 stsp free((char *)pe->path);
5913 17ed4618 2019-06-02 stsp got_pathlist_free(&paths);
5914 a129376b 2019-03-28 stsp free(cwd);
5915 a129376b 2019-03-28 stsp return error;
5918 a129376b 2019-03-28 stsp __dead static void
5919 a129376b 2019-03-28 stsp usage_revert(void)
5921 33aa809d 2019-08-08 stsp fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
5922 33aa809d 2019-08-08 stsp "path ...\n", getprogname());
5926 1ee397ad 2019-07-12 stsp static const struct got_error *
5927 a129376b 2019-03-28 stsp revert_progress(void *arg, unsigned char status, const char *path)
5929 fb9704af 2020-01-27 stsp if (status == GOT_STATUS_UNVERSIONED)
5930 fb9704af 2020-01-27 stsp return NULL;
5932 a129376b 2019-03-28 stsp while (path[0] == '/')
5934 a129376b 2019-03-28 stsp printf("%c %s\n", status, path);
5935 33aa809d 2019-08-08 stsp return NULL;
5938 33aa809d 2019-08-08 stsp struct choose_patch_arg {
5939 33aa809d 2019-08-08 stsp FILE *patch_script_file;
5940 33aa809d 2019-08-08 stsp const char *action;
5943 33aa809d 2019-08-08 stsp static const struct got_error *
5944 33aa809d 2019-08-08 stsp show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5945 33aa809d 2019-08-08 stsp int nchanges, const char *action)
5947 33aa809d 2019-08-08 stsp char *line = NULL;
5948 33aa809d 2019-08-08 stsp size_t linesize = 0;
5949 33aa809d 2019-08-08 stsp ssize_t linelen;
5951 33aa809d 2019-08-08 stsp switch (status) {
5952 33aa809d 2019-08-08 stsp case GOT_STATUS_ADD:
5953 33aa809d 2019-08-08 stsp printf("A %s\n%s this addition? [y/n] ", path, action);
5955 33aa809d 2019-08-08 stsp case GOT_STATUS_DELETE:
5956 33aa809d 2019-08-08 stsp printf("D %s\n%s this deletion? [y/n] ", path, action);
5958 33aa809d 2019-08-08 stsp case GOT_STATUS_MODIFY:
5959 33aa809d 2019-08-08 stsp if (fseek(patch_file, 0L, SEEK_SET) == -1)
5960 33aa809d 2019-08-08 stsp return got_error_from_errno("fseek");
5961 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5962 9516e7cb 2019-08-11 stsp while ((linelen = getline(&line, &linesize, patch_file)) != -1)
5963 33aa809d 2019-08-08 stsp printf("%s", line);
5964 33aa809d 2019-08-08 stsp if (ferror(patch_file))
5965 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
5966 33aa809d 2019-08-08 stsp printf(GOT_COMMIT_SEP_STR);
5967 33aa809d 2019-08-08 stsp printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5968 33aa809d 2019-08-08 stsp path, n, nchanges, action);
5971 33aa809d 2019-08-08 stsp return got_error_path(path, GOT_ERR_FILE_STATUS);
5974 33aa809d 2019-08-08 stsp return NULL;
5977 33aa809d 2019-08-08 stsp static const struct got_error *
5978 33aa809d 2019-08-08 stsp choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5979 33aa809d 2019-08-08 stsp FILE *patch_file, int n, int nchanges)
5981 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
5982 33aa809d 2019-08-08 stsp char *line = NULL;
5983 33aa809d 2019-08-08 stsp size_t linesize = 0;
5984 33aa809d 2019-08-08 stsp ssize_t linelen;
5985 33aa809d 2019-08-08 stsp int resp = ' ';
5986 33aa809d 2019-08-08 stsp struct choose_patch_arg *a = arg;
5988 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
5990 33aa809d 2019-08-08 stsp if (a->patch_script_file) {
5992 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
5993 33aa809d 2019-08-08 stsp a->action);
5995 33aa809d 2019-08-08 stsp return err;
5996 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, a->patch_script_file);
5997 33aa809d 2019-08-08 stsp if (linelen == -1) {
5998 33aa809d 2019-08-08 stsp if (ferror(a->patch_script_file))
5999 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
6000 33aa809d 2019-08-08 stsp return NULL;
6002 33aa809d 2019-08-08 stsp nl = strchr(line, '\n');
6004 33aa809d 2019-08-08 stsp *nl = '\0';
6005 33aa809d 2019-08-08 stsp if (strcmp(line, "y") == 0) {
6006 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6007 33aa809d 2019-08-08 stsp printf("y\n");
6008 33aa809d 2019-08-08 stsp } else if (strcmp(line, "n") == 0) {
6009 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6010 33aa809d 2019-08-08 stsp printf("n\n");
6011 33aa809d 2019-08-08 stsp } else if (strcmp(line, "q") == 0 &&
6012 33aa809d 2019-08-08 stsp status == GOT_STATUS_MODIFY) {
6013 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6014 33aa809d 2019-08-08 stsp printf("q\n");
6016 33aa809d 2019-08-08 stsp printf("invalid response '%s'\n", line);
6017 33aa809d 2019-08-08 stsp free(line);
6018 33aa809d 2019-08-08 stsp return NULL;
6021 33aa809d 2019-08-08 stsp while (resp != 'y' && resp != 'n' && resp != 'q') {
6022 33aa809d 2019-08-08 stsp err = show_change(status, path, patch_file, n, nchanges,
6023 33aa809d 2019-08-08 stsp a->action);
6025 33aa809d 2019-08-08 stsp return err;
6026 33aa809d 2019-08-08 stsp resp = getchar();
6027 33aa809d 2019-08-08 stsp if (resp == '\n')
6028 33aa809d 2019-08-08 stsp resp = getchar();
6029 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_MODIFY) {
6030 33aa809d 2019-08-08 stsp if (resp != 'y' && resp != 'n' && resp != 'q') {
6031 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6032 33aa809d 2019-08-08 stsp resp = ' ';
6034 33aa809d 2019-08-08 stsp } else if (resp != 'y' && resp != 'n') {
6035 33aa809d 2019-08-08 stsp printf("invalid response '%c'\n", resp);
6036 33aa809d 2019-08-08 stsp resp = ' ';
6040 33aa809d 2019-08-08 stsp if (resp == 'y')
6041 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_YES;
6042 33aa809d 2019-08-08 stsp else if (resp == 'n')
6043 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NO;
6044 33aa809d 2019-08-08 stsp else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6045 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_QUIT;
6047 1ee397ad 2019-07-12 stsp return NULL;
6051 a129376b 2019-03-28 stsp static const struct got_error *
6052 a129376b 2019-03-28 stsp cmd_revert(int argc, char *argv[])
6054 a129376b 2019-03-28 stsp const struct got_error *error = NULL;
6055 a129376b 2019-03-28 stsp struct got_worktree *worktree = NULL;
6056 a129376b 2019-03-28 stsp struct got_repository *repo = NULL;
6057 a129376b 2019-03-28 stsp char *cwd = NULL, *path = NULL;
6058 e20a8b6f 2019-06-04 stsp struct got_pathlist_head paths;
6059 0f6d7415 2019-08-08 stsp struct got_pathlist_entry *pe;
6060 33aa809d 2019-08-08 stsp int ch, can_recurse = 0, pflag = 0;
6061 33aa809d 2019-08-08 stsp FILE *patch_script_file = NULL;
6062 33aa809d 2019-08-08 stsp const char *patch_script_path = NULL;
6063 33aa809d 2019-08-08 stsp struct choose_patch_arg cpa;
6065 e20a8b6f 2019-06-04 stsp TAILQ_INIT(&paths);
6067 33aa809d 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6068 a129376b 2019-03-28 stsp switch (ch) {
6070 33aa809d 2019-08-08 stsp pflag = 1;
6073 33aa809d 2019-08-08 stsp patch_script_path = optarg;
6076 0f6d7415 2019-08-08 stsp can_recurse = 1;
6079 a129376b 2019-03-28 stsp usage_revert();
6080 a129376b 2019-03-28 stsp /* NOTREACHED */
6084 a129376b 2019-03-28 stsp argc -= optind;
6085 a129376b 2019-03-28 stsp argv += optind;
6087 43012d58 2019-07-14 stsp #ifndef PROFILE
6088 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6089 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6090 43012d58 2019-07-14 stsp err(1, "pledge");
6092 e20a8b6f 2019-06-04 stsp if (argc < 1)
6093 a129376b 2019-03-28 stsp usage_revert();
6094 33aa809d 2019-08-08 stsp if (patch_script_path && !pflag)
6095 33aa809d 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
6097 a129376b 2019-03-28 stsp cwd = getcwd(NULL, 0);
6098 a129376b 2019-03-28 stsp if (cwd == NULL) {
6099 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6100 a129376b 2019-03-28 stsp goto done;
6102 a129376b 2019-03-28 stsp error = got_worktree_open(&worktree, cwd);
6103 fa51e947 2020-03-27 stsp if (error) {
6104 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6105 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "revert", cwd);
6106 2ec1f75b 2019-03-26 stsp goto done;
6109 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6111 a129376b 2019-03-28 stsp if (error != NULL)
6112 a129376b 2019-03-28 stsp goto done;
6114 33aa809d 2019-08-08 stsp if (patch_script_path) {
6115 33aa809d 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
6116 33aa809d 2019-08-08 stsp if (patch_script_file == NULL) {
6117 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fopen",
6118 33aa809d 2019-08-08 stsp patch_script_path);
6119 33aa809d 2019-08-08 stsp goto done;
6122 a129376b 2019-03-28 stsp error = apply_unveil(got_repo_get_path(repo), 1,
6123 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6124 a129376b 2019-03-28 stsp if (error)
6125 a129376b 2019-03-28 stsp goto done;
6127 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6128 6d022e97 2019-08-04 stsp if (error)
6129 6d022e97 2019-08-04 stsp goto done;
6131 0f6d7415 2019-08-08 stsp if (!can_recurse) {
6132 0f6d7415 2019-08-08 stsp char *ondisk_path;
6133 0f6d7415 2019-08-08 stsp struct stat sb;
6134 0f6d7415 2019-08-08 stsp TAILQ_FOREACH(pe, &paths, entry) {
6135 0f6d7415 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
6136 0f6d7415 2019-08-08 stsp got_worktree_get_root_path(worktree),
6137 0f6d7415 2019-08-08 stsp pe->path) == -1) {
6138 0f6d7415 2019-08-08 stsp error = got_error_from_errno("asprintf");
6139 0f6d7415 2019-08-08 stsp goto done;
6141 0f6d7415 2019-08-08 stsp if (lstat(ondisk_path, &sb) == -1) {
6142 0f6d7415 2019-08-08 stsp if (errno == ENOENT) {
6143 0f6d7415 2019-08-08 stsp free(ondisk_path);
6146 0f6d7415 2019-08-08 stsp error = got_error_from_errno2("lstat",
6147 0f6d7415 2019-08-08 stsp ondisk_path);
6148 0f6d7415 2019-08-08 stsp free(ondisk_path);
6149 0f6d7415 2019-08-08 stsp goto done;
6151 0f6d7415 2019-08-08 stsp free(ondisk_path);
6152 0f6d7415 2019-08-08 stsp if (S_ISDIR(sb.st_mode)) {
6153 0f6d7415 2019-08-08 stsp error = got_error_msg(GOT_ERR_BAD_PATH,
6154 0f6d7415 2019-08-08 stsp "reverting directories requires -R option");
6155 0f6d7415 2019-08-08 stsp goto done;
6160 33aa809d 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
6161 33aa809d 2019-08-08 stsp cpa.action = "revert";
6162 33aa809d 2019-08-08 stsp error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6163 33aa809d 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
6165 33aa809d 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
6166 33aa809d 2019-08-08 stsp error == NULL)
6167 33aa809d 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
6169 2ec1f75b 2019-03-26 stsp got_repo_close(repo);
6170 2ec1f75b 2019-03-26 stsp if (worktree)
6171 2ec1f75b 2019-03-26 stsp got_worktree_close(worktree);
6172 2ec1f75b 2019-03-26 stsp free(path);
6173 d00136be 2019-03-26 stsp free(cwd);
6174 6bad629b 2019-02-04 stsp return error;
6177 c4296144 2019-05-09 stsp __dead static void
6178 c4296144 2019-05-09 stsp usage_commit(void)
6180 5c1e53bc 2019-07-28 stsp fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6181 5c1e53bc 2019-07-28 stsp getprogname());
6185 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg {
6186 e2ba3d07 2019-05-13 stsp const char *cmdline_log;
6187 e2ba3d07 2019-05-13 stsp const char *editor;
6188 e0870e44 2019-05-13 stsp const char *worktree_path;
6189 76d98825 2019-06-03 stsp const char *branch_name;
6190 314a6357 2019-05-13 stsp const char *repo_path;
6191 e0870e44 2019-05-13 stsp char *logmsg_path;
6195 33ad4cbe 2019-05-12 jcs static const struct got_error *
6196 33ad4cbe 2019-05-12 jcs collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6199 76d98825 2019-06-03 stsp char *initial_content = NULL;
6200 33ad4cbe 2019-05-12 jcs struct got_pathlist_entry *pe;
6201 33ad4cbe 2019-05-12 jcs const struct got_error *err = NULL;
6202 e0870e44 2019-05-13 stsp char *template = NULL;
6203 e2ba3d07 2019-05-13 stsp struct collect_commit_logmsg_arg *a = arg;
6205 33ad4cbe 2019-05-12 jcs size_t len;
6207 33ad4cbe 2019-05-12 jcs /* if a message was specified on the command line, just use it */
6208 e2ba3d07 2019-05-13 stsp if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6209 e2ba3d07 2019-05-13 stsp len = strlen(a->cmdline_log) + 1;
6210 33ad4cbe 2019-05-12 jcs *logmsg = malloc(len + 1);
6211 9f42ff69 2019-05-13 stsp if (*logmsg == NULL)
6212 638f9024 2019-05-13 stsp return got_error_from_errno("malloc");
6213 e2ba3d07 2019-05-13 stsp strlcpy(*logmsg, a->cmdline_log, len);
6214 33ad4cbe 2019-05-12 jcs return NULL;
6217 e0870e44 2019-05-13 stsp if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6218 76d98825 2019-06-03 stsp return got_error_from_errno("asprintf");
6220 76d98825 2019-06-03 stsp if (asprintf(&initial_content,
6221 76d98825 2019-06-03 stsp "\n# changes to be committed on branch %s:\n",
6222 76d98825 2019-06-03 stsp a->branch_name) == -1)
6223 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6225 e0870e44 2019-05-13 stsp err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6227 e0870e44 2019-05-13 stsp goto done;
6229 e0870e44 2019-05-13 stsp dprintf(fd, initial_content);
6231 33ad4cbe 2019-05-12 jcs TAILQ_FOREACH(pe, commitable_paths, entry) {
6232 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6233 8656d6c4 2019-05-20 stsp dprintf(fd, "# %c %s\n",
6234 8656d6c4 2019-05-20 stsp got_commitable_get_status(ct),
6235 8656d6c4 2019-05-20 stsp got_commitable_get_path(ct));
6239 3ce1b845 2019-07-15 stsp err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6241 76d98825 2019-06-03 stsp free(initial_content);
6242 e0870e44 2019-05-13 stsp free(template);
6244 314a6357 2019-05-13 stsp /* Editor is done; we can now apply unveil(2) */
6245 3ce1b845 2019-07-15 stsp if (err == NULL) {
6246 c530dc23 2019-07-23 stsp err = apply_unveil(a->repo_path, 0, a->worktree_path);
6247 3ce1b845 2019-07-15 stsp if (err) {
6248 3ce1b845 2019-07-15 stsp free(*logmsg);
6249 3ce1b845 2019-07-15 stsp *logmsg = NULL;
6252 33ad4cbe 2019-05-12 jcs return err;
6255 c4296144 2019-05-09 stsp static const struct got_error *
6256 c4296144 2019-05-09 stsp cmd_commit(int argc, char *argv[])
6258 c4296144 2019-05-09 stsp const struct got_error *error = NULL;
6259 c4296144 2019-05-09 stsp struct got_worktree *worktree = NULL;
6260 c4296144 2019-05-09 stsp struct got_repository *repo = NULL;
6261 5c1e53bc 2019-07-28 stsp char *cwd = NULL, *id_str = NULL;
6262 c4296144 2019-05-09 stsp struct got_object_id *id = NULL;
6263 33ad4cbe 2019-05-12 jcs const char *logmsg = NULL;
6264 aba9c984 2019-09-08 stsp struct collect_commit_logmsg_arg cl_arg;
6265 c9956ddf 2019-09-08 stsp char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6266 7266f21f 2019-10-21 stsp int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6267 5c1e53bc 2019-07-28 stsp struct got_pathlist_head paths;
6269 5c1e53bc 2019-07-28 stsp TAILQ_INIT(&paths);
6270 6ac5a73c 2019-08-08 stsp cl_arg.logmsg_path = NULL;
6272 c4296144 2019-05-09 stsp while ((ch = getopt(argc, argv, "m:")) != -1) {
6273 c4296144 2019-05-09 stsp switch (ch) {
6275 c4296144 2019-05-09 stsp logmsg = optarg;
6278 c4296144 2019-05-09 stsp usage_commit();
6279 c4296144 2019-05-09 stsp /* NOTREACHED */
6283 c4296144 2019-05-09 stsp argc -= optind;
6284 c4296144 2019-05-09 stsp argv += optind;
6286 43012d58 2019-07-14 stsp #ifndef PROFILE
6287 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6288 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6289 43012d58 2019-07-14 stsp err(1, "pledge");
6291 c4296144 2019-05-09 stsp cwd = getcwd(NULL, 0);
6292 c4296144 2019-05-09 stsp if (cwd == NULL) {
6293 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
6294 c4296144 2019-05-09 stsp goto done;
6296 c4296144 2019-05-09 stsp error = got_worktree_open(&worktree, cwd);
6297 fa51e947 2020-03-27 stsp if (error) {
6298 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6299 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "commit", cwd);
6300 7d5807f4 2019-07-11 stsp goto done;
6303 a698f62e 2019-07-25 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6304 c4296144 2019-05-09 stsp if (error)
6305 a698f62e 2019-07-25 stsp goto done;
6306 a698f62e 2019-07-25 stsp if (rebase_in_progress) {
6307 a698f62e 2019-07-25 stsp error = got_error(GOT_ERR_REBASING);
6308 c4296144 2019-05-09 stsp goto done;
6311 916f288c 2019-07-30 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6312 916f288c 2019-07-30 stsp worktree);
6313 5c1e53bc 2019-07-28 stsp if (error)
6314 5c1e53bc 2019-07-28 stsp goto done;
6316 c9956ddf 2019-09-08 stsp error = get_gitconfig_path(&gitconfig_path);
6317 c9956ddf 2019-09-08 stsp if (error)
6318 c9956ddf 2019-09-08 stsp goto done;
6319 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6320 c9956ddf 2019-09-08 stsp gitconfig_path);
6321 c4296144 2019-05-09 stsp if (error != NULL)
6322 c4296144 2019-05-09 stsp goto done;
6324 aba9c984 2019-09-08 stsp error = get_author(&author, repo);
6325 aba9c984 2019-09-08 stsp if (error)
6326 aba9c984 2019-09-08 stsp return error;
6329 314a6357 2019-05-13 stsp * unveil(2) traverses exec(2); if an editor is used we have
6330 314a6357 2019-05-13 stsp * to apply unveil after the log message has been written.
6332 314a6357 2019-05-13 stsp if (logmsg == NULL || strlen(logmsg) == 0)
6333 314a6357 2019-05-13 stsp error = get_editor(&editor);
6335 314a6357 2019-05-13 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6336 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6337 c4296144 2019-05-09 stsp if (error)
6338 c4296144 2019-05-09 stsp goto done;
6340 087fb88c 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6341 087fb88c 2019-08-04 stsp if (error)
6342 087fb88c 2019-08-04 stsp goto done;
6344 e2ba3d07 2019-05-13 stsp cl_arg.editor = editor;
6345 e2ba3d07 2019-05-13 stsp cl_arg.cmdline_log = logmsg;
6346 e0870e44 2019-05-13 stsp cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6347 76d98825 2019-06-03 stsp cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6348 916f288c 2019-07-30 stsp if (!histedit_in_progress) {
6349 916f288c 2019-07-30 stsp if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6350 916f288c 2019-07-30 stsp error = got_error(GOT_ERR_COMMIT_BRANCH);
6351 916f288c 2019-07-30 stsp goto done;
6353 916f288c 2019-07-30 stsp cl_arg.branch_name += 11;
6355 314a6357 2019-05-13 stsp cl_arg.repo_path = got_repo_get_path(repo);
6356 84792843 2019-08-09 stsp error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6357 e2ba3d07 2019-05-13 stsp collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6358 e0870e44 2019-05-13 stsp if (error) {
6359 7266f21f 2019-10-21 stsp if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6360 7266f21f 2019-10-21 stsp cl_arg.logmsg_path != NULL)
6361 7266f21f 2019-10-21 stsp preserve_logmsg = 1;
6362 c4296144 2019-05-09 stsp goto done;
6365 c4296144 2019-05-09 stsp error = got_object_id_str(&id_str, id);
6366 c4296144 2019-05-09 stsp if (error)
6367 c4296144 2019-05-09 stsp goto done;
6368 a7648d7a 2019-06-02 stsp printf("Created commit %s\n", id_str);
6370 7266f21f 2019-10-21 stsp if (preserve_logmsg) {
6371 7266f21f 2019-10-21 stsp fprintf(stderr, "%s: log message preserved in %s\n",
6372 7266f21f 2019-10-21 stsp getprogname(), cl_arg.logmsg_path);
6373 7266f21f 2019-10-21 stsp } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6374 7266f21f 2019-10-21 stsp error == NULL)
6375 7266f21f 2019-10-21 stsp error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6376 6ac5a73c 2019-08-08 stsp free(cl_arg.logmsg_path);
6378 c4296144 2019-05-09 stsp got_repo_close(repo);
6379 c4296144 2019-05-09 stsp if (worktree)
6380 c4296144 2019-05-09 stsp got_worktree_close(worktree);
6381 c4296144 2019-05-09 stsp free(cwd);
6382 c4296144 2019-05-09 stsp free(id_str);
6383 c9956ddf 2019-09-08 stsp free(gitconfig_path);
6384 e2ba3d07 2019-05-13 stsp free(editor);
6385 aba9c984 2019-09-08 stsp free(author);
6386 234035bc 2019-06-01 stsp return error;
6389 234035bc 2019-06-01 stsp __dead static void
6390 234035bc 2019-06-01 stsp usage_cherrypick(void)
6392 234035bc 2019-06-01 stsp fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6396 234035bc 2019-06-01 stsp static const struct got_error *
6397 234035bc 2019-06-01 stsp cmd_cherrypick(int argc, char *argv[])
6399 234035bc 2019-06-01 stsp const struct got_error *error = NULL;
6400 234035bc 2019-06-01 stsp struct got_worktree *worktree = NULL;
6401 234035bc 2019-06-01 stsp struct got_repository *repo = NULL;
6402 234035bc 2019-06-01 stsp char *cwd = NULL, *commit_id_str = NULL;
6403 234035bc 2019-06-01 stsp struct got_object_id *commit_id = NULL;
6404 234035bc 2019-06-01 stsp struct got_commit_object *commit = NULL;
6405 234035bc 2019-06-01 stsp struct got_object_qid *pid;
6406 234035bc 2019-06-01 stsp struct got_reference *head_ref = NULL;
6408 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6410 234035bc 2019-06-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6411 234035bc 2019-06-01 stsp switch (ch) {
6413 234035bc 2019-06-01 stsp usage_cherrypick();
6414 234035bc 2019-06-01 stsp /* NOTREACHED */
6418 234035bc 2019-06-01 stsp argc -= optind;
6419 234035bc 2019-06-01 stsp argv += optind;
6421 43012d58 2019-07-14 stsp #ifndef PROFILE
6422 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6423 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6424 43012d58 2019-07-14 stsp err(1, "pledge");
6426 234035bc 2019-06-01 stsp if (argc != 1)
6427 234035bc 2019-06-01 stsp usage_cherrypick();
6429 234035bc 2019-06-01 stsp cwd = getcwd(NULL, 0);
6430 234035bc 2019-06-01 stsp if (cwd == NULL) {
6431 234035bc 2019-06-01 stsp error = got_error_from_errno("getcwd");
6432 234035bc 2019-06-01 stsp goto done;
6434 234035bc 2019-06-01 stsp error = got_worktree_open(&worktree, cwd);
6435 fa51e947 2020-03-27 stsp if (error) {
6436 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6437 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "cherrypick",
6439 234035bc 2019-06-01 stsp goto done;
6442 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6444 234035bc 2019-06-01 stsp if (error != NULL)
6445 234035bc 2019-06-01 stsp goto done;
6447 234035bc 2019-06-01 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6448 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6449 234035bc 2019-06-01 stsp if (error)
6450 234035bc 2019-06-01 stsp goto done;
6452 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6453 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6454 234035bc 2019-06-01 stsp if (error != NULL) {
6455 234035bc 2019-06-01 stsp struct got_reference *ref;
6456 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6457 234035bc 2019-06-01 stsp goto done;
6458 234035bc 2019-06-01 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6459 234035bc 2019-06-01 stsp if (error != NULL)
6460 234035bc 2019-06-01 stsp goto done;
6461 234035bc 2019-06-01 stsp error = got_ref_resolve(&commit_id, repo, ref);
6462 234035bc 2019-06-01 stsp got_ref_close(ref);
6463 234035bc 2019-06-01 stsp if (error != NULL)
6464 234035bc 2019-06-01 stsp goto done;
6466 234035bc 2019-06-01 stsp error = got_object_id_str(&commit_id_str, commit_id);
6467 234035bc 2019-06-01 stsp if (error)
6468 234035bc 2019-06-01 stsp goto done;
6470 234035bc 2019-06-01 stsp error = got_ref_open(&head_ref, repo,
6471 234035bc 2019-06-01 stsp got_worktree_get_head_ref_name(worktree), 0);
6472 234035bc 2019-06-01 stsp if (error != NULL)
6473 234035bc 2019-06-01 stsp goto done;
6475 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6476 234035bc 2019-06-01 stsp if (error) {
6477 234035bc 2019-06-01 stsp if (error->code != GOT_ERR_ANCESTRY)
6478 234035bc 2019-06-01 stsp goto done;
6479 234035bc 2019-06-01 stsp error = NULL;
6481 234035bc 2019-06-01 stsp error = got_error(GOT_ERR_SAME_BRANCH);
6482 234035bc 2019-06-01 stsp goto done;
6485 234035bc 2019-06-01 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6486 234035bc 2019-06-01 stsp if (error)
6487 234035bc 2019-06-01 stsp goto done;
6488 234035bc 2019-06-01 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6489 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6490 03415a1a 2019-06-02 stsp error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6491 9627c110 2020-04-18 stsp commit_id, repo, update_progress, &upa, check_cancelled,
6493 234035bc 2019-06-01 stsp if (error != NULL)
6494 234035bc 2019-06-01 stsp goto done;
6496 9627c110 2020-04-18 stsp if (upa.did_something)
6497 a7648d7a 2019-06-02 stsp printf("Merged commit %s\n", commit_id_str);
6498 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6500 234035bc 2019-06-01 stsp if (commit)
6501 234035bc 2019-06-01 stsp got_object_commit_close(commit);
6502 234035bc 2019-06-01 stsp free(commit_id_str);
6503 234035bc 2019-06-01 stsp if (head_ref)
6504 234035bc 2019-06-01 stsp got_ref_close(head_ref);
6505 234035bc 2019-06-01 stsp if (worktree)
6506 234035bc 2019-06-01 stsp got_worktree_close(worktree);
6508 234035bc 2019-06-01 stsp got_repo_close(repo);
6509 c4296144 2019-05-09 stsp return error;
6512 5ef14e63 2019-06-02 stsp __dead static void
6513 5ef14e63 2019-06-02 stsp usage_backout(void)
6515 5ef14e63 2019-06-02 stsp fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6519 5ef14e63 2019-06-02 stsp static const struct got_error *
6520 5ef14e63 2019-06-02 stsp cmd_backout(int argc, char *argv[])
6522 5ef14e63 2019-06-02 stsp const struct got_error *error = NULL;
6523 5ef14e63 2019-06-02 stsp struct got_worktree *worktree = NULL;
6524 5ef14e63 2019-06-02 stsp struct got_repository *repo = NULL;
6525 5ef14e63 2019-06-02 stsp char *cwd = NULL, *commit_id_str = NULL;
6526 5ef14e63 2019-06-02 stsp struct got_object_id *commit_id = NULL;
6527 5ef14e63 2019-06-02 stsp struct got_commit_object *commit = NULL;
6528 5ef14e63 2019-06-02 stsp struct got_object_qid *pid;
6529 5ef14e63 2019-06-02 stsp struct got_reference *head_ref = NULL;
6531 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6533 5ef14e63 2019-06-02 stsp while ((ch = getopt(argc, argv, "")) != -1) {
6534 5ef14e63 2019-06-02 stsp switch (ch) {
6536 5ef14e63 2019-06-02 stsp usage_backout();
6537 5ef14e63 2019-06-02 stsp /* NOTREACHED */
6541 5ef14e63 2019-06-02 stsp argc -= optind;
6542 5ef14e63 2019-06-02 stsp argv += optind;
6544 43012d58 2019-07-14 stsp #ifndef PROFILE
6545 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6546 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6547 43012d58 2019-07-14 stsp err(1, "pledge");
6549 5ef14e63 2019-06-02 stsp if (argc != 1)
6550 5ef14e63 2019-06-02 stsp usage_backout();
6552 5ef14e63 2019-06-02 stsp cwd = getcwd(NULL, 0);
6553 5ef14e63 2019-06-02 stsp if (cwd == NULL) {
6554 5ef14e63 2019-06-02 stsp error = got_error_from_errno("getcwd");
6555 5ef14e63 2019-06-02 stsp goto done;
6557 5ef14e63 2019-06-02 stsp error = got_worktree_open(&worktree, cwd);
6558 fa51e947 2020-03-27 stsp if (error) {
6559 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6560 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "backout", cwd);
6561 5ef14e63 2019-06-02 stsp goto done;
6564 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6566 5ef14e63 2019-06-02 stsp if (error != NULL)
6567 5ef14e63 2019-06-02 stsp goto done;
6569 5ef14e63 2019-06-02 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6570 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6571 5ef14e63 2019-06-02 stsp if (error)
6572 5ef14e63 2019-06-02 stsp goto done;
6574 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6575 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_COMMIT, repo);
6576 5ef14e63 2019-06-02 stsp if (error != NULL) {
6577 5ef14e63 2019-06-02 stsp struct got_reference *ref;
6578 5ef14e63 2019-06-02 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6579 5ef14e63 2019-06-02 stsp goto done;
6580 5ef14e63 2019-06-02 stsp error = got_ref_open(&ref, repo, argv[0], 0);
6581 5ef14e63 2019-06-02 stsp if (error != NULL)
6582 5ef14e63 2019-06-02 stsp goto done;
6583 5ef14e63 2019-06-02 stsp error = got_ref_resolve(&commit_id, repo, ref);
6584 5ef14e63 2019-06-02 stsp got_ref_close(ref);
6585 5ef14e63 2019-06-02 stsp if (error != NULL)
6586 5ef14e63 2019-06-02 stsp goto done;
6588 5ef14e63 2019-06-02 stsp error = got_object_id_str(&commit_id_str, commit_id);
6589 5ef14e63 2019-06-02 stsp if (error)
6590 5ef14e63 2019-06-02 stsp goto done;
6592 5ef14e63 2019-06-02 stsp error = got_ref_open(&head_ref, repo,
6593 5ef14e63 2019-06-02 stsp got_worktree_get_head_ref_name(worktree), 0);
6594 5ef14e63 2019-06-02 stsp if (error != NULL)
6595 5ef14e63 2019-06-02 stsp goto done;
6597 a51a74b3 2019-07-27 stsp error = check_same_branch(commit_id, head_ref, NULL, repo);
6598 5ef14e63 2019-06-02 stsp if (error)
6599 5ef14e63 2019-06-02 stsp goto done;
6601 5ef14e63 2019-06-02 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6602 5ef14e63 2019-06-02 stsp if (error)
6603 5ef14e63 2019-06-02 stsp goto done;
6604 5ef14e63 2019-06-02 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6605 5ef14e63 2019-06-02 stsp if (pid == NULL) {
6606 5ef14e63 2019-06-02 stsp error = got_error(GOT_ERR_ROOT_COMMIT);
6607 5ef14e63 2019-06-02 stsp goto done;
6610 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
6611 5ef14e63 2019-06-02 stsp error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6612 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
6613 5ef14e63 2019-06-02 stsp if (error != NULL)
6614 5ef14e63 2019-06-02 stsp goto done;
6616 9627c110 2020-04-18 stsp if (upa.did_something)
6617 a7648d7a 2019-06-02 stsp printf("Backed out commit %s\n", commit_id_str);
6618 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
6620 5ef14e63 2019-06-02 stsp if (commit)
6621 5ef14e63 2019-06-02 stsp got_object_commit_close(commit);
6622 5ef14e63 2019-06-02 stsp free(commit_id_str);
6623 5ef14e63 2019-06-02 stsp if (head_ref)
6624 5ef14e63 2019-06-02 stsp got_ref_close(head_ref);
6625 818c7501 2019-07-11 stsp if (worktree)
6626 818c7501 2019-07-11 stsp got_worktree_close(worktree);
6628 818c7501 2019-07-11 stsp got_repo_close(repo);
6629 818c7501 2019-07-11 stsp return error;
6632 818c7501 2019-07-11 stsp __dead static void
6633 818c7501 2019-07-11 stsp usage_rebase(void)
6635 af54c8f8 2019-07-11 stsp fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6636 af54c8f8 2019-07-11 stsp getprogname());
6641 0ebf8283 2019-07-24 stsp trim_logmsg(char *logmsg, int limit)
6644 0ebf8283 2019-07-24 stsp size_t len;
6646 0ebf8283 2019-07-24 stsp len = strlen(logmsg);
6647 0ebf8283 2019-07-24 stsp if (len > limit)
6648 0ebf8283 2019-07-24 stsp len = limit;
6649 0ebf8283 2019-07-24 stsp logmsg[len] = '\0';
6650 0ebf8283 2019-07-24 stsp nl = strchr(logmsg, '\n');
6652 0ebf8283 2019-07-24 stsp *nl = '\0';
6655 0ebf8283 2019-07-24 stsp static const struct got_error *
6656 0ebf8283 2019-07-24 stsp get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6658 5943eee2 2019-08-13 stsp const struct got_error *err;
6659 5943eee2 2019-08-13 stsp char *logmsg0 = NULL;
6660 5943eee2 2019-08-13 stsp const char *s;
6662 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
6664 5943eee2 2019-08-13 stsp return err;
6666 5943eee2 2019-08-13 stsp s = logmsg0;
6667 5943eee2 2019-08-13 stsp while (isspace((unsigned char)s[0]))
6670 5943eee2 2019-08-13 stsp *logmsg = strdup(s);
6671 5943eee2 2019-08-13 stsp if (*logmsg == NULL) {
6672 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6673 5943eee2 2019-08-13 stsp goto done;
6676 0ebf8283 2019-07-24 stsp trim_logmsg(*logmsg, limit);
6678 5943eee2 2019-08-13 stsp free(logmsg0);
6679 a0ea4fc0 2020-02-28 stsp return err;
6682 a0ea4fc0 2020-02-28 stsp static const struct got_error *
6683 a0ea4fc0 2020-02-28 stsp show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6685 a0ea4fc0 2020-02-28 stsp const struct got_error *err;
6686 a0ea4fc0 2020-02-28 stsp struct got_commit_object *commit = NULL;
6687 a0ea4fc0 2020-02-28 stsp char *id_str = NULL, *logmsg = NULL;
6689 a0ea4fc0 2020-02-28 stsp err = got_object_open_as_commit(&commit, repo, id);
6691 a0ea4fc0 2020-02-28 stsp return err;
6693 a0ea4fc0 2020-02-28 stsp err = got_object_id_str(&id_str, id);
6695 a0ea4fc0 2020-02-28 stsp goto done;
6697 a0ea4fc0 2020-02-28 stsp id_str[12] = '\0';
6699 a0ea4fc0 2020-02-28 stsp err = get_short_logmsg(&logmsg, 42, commit);
6701 a0ea4fc0 2020-02-28 stsp goto done;
6703 a0ea4fc0 2020-02-28 stsp printf("%s -> merge conflict: %s\n", id_str, logmsg);
6705 a0ea4fc0 2020-02-28 stsp free(id_str);
6706 a0ea4fc0 2020-02-28 stsp got_object_commit_close(commit);
6707 a0ea4fc0 2020-02-28 stsp free(logmsg);
6708 5943eee2 2019-08-13 stsp return err;
6711 818c7501 2019-07-11 stsp static const struct got_error *
6712 818c7501 2019-07-11 stsp show_rebase_progress(struct got_commit_object *commit,
6713 818c7501 2019-07-11 stsp struct got_object_id *old_id, struct got_object_id *new_id)
6715 818c7501 2019-07-11 stsp const struct got_error *err;
6716 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6718 818c7501 2019-07-11 stsp err = got_object_id_str(&old_id_str, old_id);
6720 818c7501 2019-07-11 stsp goto done;
6722 ff0d2220 2019-07-11 stsp if (new_id) {
6723 ff0d2220 2019-07-11 stsp err = got_object_id_str(&new_id_str, new_id);
6725 ff0d2220 2019-07-11 stsp goto done;
6728 818c7501 2019-07-11 stsp old_id_str[12] = '\0';
6729 ff0d2220 2019-07-11 stsp if (new_id_str)
6730 ff0d2220 2019-07-11 stsp new_id_str[12] = '\0';
6732 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
6734 0ebf8283 2019-07-24 stsp goto done;
6736 ff0d2220 2019-07-11 stsp printf("%s -> %s: %s\n", old_id_str,
6737 ff0d2220 2019-07-11 stsp new_id_str ? new_id_str : "no-op change", logmsg);
6739 818c7501 2019-07-11 stsp free(old_id_str);
6740 818c7501 2019-07-11 stsp free(new_id_str);
6741 272a1371 2020-02-28 stsp free(logmsg);
6742 818c7501 2019-07-11 stsp return err;
6745 1ee397ad 2019-07-12 stsp static const struct got_error *
6746 3e3a69f1 2019-07-25 stsp rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6747 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_reference *new_base_branch,
6748 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_repository *repo)
6750 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n", got_ref_get_name(branch));
6751 3e3a69f1 2019-07-25 stsp return got_worktree_rebase_complete(worktree, fileindex,
6752 818c7501 2019-07-11 stsp new_base_branch, tmp_branch, branch, repo);
6755 818c7501 2019-07-11 stsp static const struct got_error *
6756 01757395 2019-07-12 stsp rebase_commit(struct got_pathlist_head *merged_paths,
6757 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6758 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch,
6759 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6761 ff0d2220 2019-07-11 stsp const struct got_error *error;
6762 ff0d2220 2019-07-11 stsp struct got_commit_object *commit;
6763 ff0d2220 2019-07-11 stsp struct got_object_id *new_commit_id;
6765 ff0d2220 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6766 ff0d2220 2019-07-11 stsp if (error)
6767 ff0d2220 2019-07-11 stsp return error;
6769 01757395 2019-07-12 stsp error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6770 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, commit_id, repo);
6771 ff0d2220 2019-07-11 stsp if (error) {
6772 ff0d2220 2019-07-11 stsp if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6773 ff0d2220 2019-07-11 stsp goto done;
6774 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, NULL);
6776 ff0d2220 2019-07-11 stsp error = show_rebase_progress(commit, commit_id, new_commit_id);
6777 ff0d2220 2019-07-11 stsp free(new_commit_id);
6780 ff0d2220 2019-07-11 stsp got_object_commit_close(commit);
6781 ff0d2220 2019-07-11 stsp return error;
6784 64c6d990 2019-07-11 stsp struct check_path_prefix_arg {
6785 64c6d990 2019-07-11 stsp const char *path_prefix;
6786 64c6d990 2019-07-11 stsp size_t len;
6787 8ca9bd68 2019-07-25 stsp int errcode;
6790 64c6d990 2019-07-11 stsp static const struct got_error *
6791 8ca9bd68 2019-07-25 stsp check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6792 64c6d990 2019-07-11 stsp struct got_blob_object *blob2, struct got_object_id *id1,
6793 64c6d990 2019-07-11 stsp struct got_object_id *id2, const char *path1, const char *path2,
6794 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
6796 64c6d990 2019-07-11 stsp struct check_path_prefix_arg *a = arg;
6798 64c6d990 2019-07-11 stsp if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6799 64c6d990 2019-07-11 stsp (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6800 8ca9bd68 2019-07-25 stsp return got_error(a->errcode);
6802 64c6d990 2019-07-11 stsp return NULL;
6805 64c6d990 2019-07-11 stsp static const struct got_error *
6806 8ca9bd68 2019-07-25 stsp check_path_prefix(struct got_object_id *parent_id,
6807 64c6d990 2019-07-11 stsp struct got_object_id *commit_id, const char *path_prefix,
6808 8ca9bd68 2019-07-25 stsp int errcode, struct got_repository *repo)
6810 64c6d990 2019-07-11 stsp const struct got_error *err;
6811 64c6d990 2019-07-11 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6812 64c6d990 2019-07-11 stsp struct got_commit_object *commit = NULL, *parent_commit = NULL;
6813 64c6d990 2019-07-11 stsp struct check_path_prefix_arg cpp_arg;
6815 64c6d990 2019-07-11 stsp if (got_path_is_root_dir(path_prefix))
6816 64c6d990 2019-07-11 stsp return NULL;
6818 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6820 64c6d990 2019-07-11 stsp goto done;
6822 64c6d990 2019-07-11 stsp err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6824 64c6d990 2019-07-11 stsp goto done;
6826 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree1, repo,
6827 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(parent_commit));
6829 64c6d990 2019-07-11 stsp goto done;
6831 64c6d990 2019-07-11 stsp err = got_object_open_as_tree(&tree2, repo,
6832 64c6d990 2019-07-11 stsp got_object_commit_get_tree_id(commit));
6834 64c6d990 2019-07-11 stsp goto done;
6836 64c6d990 2019-07-11 stsp cpp_arg.path_prefix = path_prefix;
6837 d23ace97 2019-07-25 stsp while (cpp_arg.path_prefix[0] == '/')
6838 d23ace97 2019-07-25 stsp cpp_arg.path_prefix++;
6839 d23ace97 2019-07-25 stsp cpp_arg.len = strlen(cpp_arg.path_prefix);
6840 8ca9bd68 2019-07-25 stsp cpp_arg.errcode = errcode;
6841 8ca9bd68 2019-07-25 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
6842 31b4484f 2019-07-27 stsp check_path_prefix_in_diff, &cpp_arg, 0);
6844 64c6d990 2019-07-11 stsp if (tree1)
6845 64c6d990 2019-07-11 stsp got_object_tree_close(tree1);
6846 64c6d990 2019-07-11 stsp if (tree2)
6847 64c6d990 2019-07-11 stsp got_object_tree_close(tree2);
6848 64c6d990 2019-07-11 stsp if (commit)
6849 64c6d990 2019-07-11 stsp got_object_commit_close(commit);
6850 64c6d990 2019-07-11 stsp if (parent_commit)
6851 64c6d990 2019-07-11 stsp got_object_commit_close(parent_commit);
6852 64c6d990 2019-07-11 stsp return err;
6855 ff0d2220 2019-07-11 stsp static const struct got_error *
6856 8ca9bd68 2019-07-25 stsp collect_commits(struct got_object_id_queue *commits,
6857 af61c510 2019-07-19 stsp struct got_object_id *initial_commit_id,
6858 af61c510 2019-07-19 stsp struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6859 8ca9bd68 2019-07-25 stsp const char *path_prefix, int path_prefix_errcode,
6860 8ca9bd68 2019-07-25 stsp struct got_repository *repo)
6862 af61c510 2019-07-19 stsp const struct got_error *err = NULL;
6863 af61c510 2019-07-19 stsp struct got_commit_graph *graph = NULL;
6864 af61c510 2019-07-19 stsp struct got_object_id *parent_id = NULL;
6865 af61c510 2019-07-19 stsp struct got_object_qid *qid;
6866 af61c510 2019-07-19 stsp struct got_object_id *commit_id = initial_commit_id;
6868 3d509237 2020-01-04 stsp err = got_commit_graph_open(&graph, "/", 1);
6870 af61c510 2019-07-19 stsp return err;
6872 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6873 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
6875 af61c510 2019-07-19 stsp goto done;
6876 af61c510 2019-07-19 stsp while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6877 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&parent_id, graph, repo,
6878 ee780d5c 2020-01-04 stsp check_cancelled, NULL);
6879 af61c510 2019-07-19 stsp if (err) {
6880 af61c510 2019-07-19 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
6881 af61c510 2019-07-19 stsp err = got_error_msg(GOT_ERR_ANCESTRY,
6882 af61c510 2019-07-19 stsp "ran out of commits to rebase before "
6883 af61c510 2019-07-19 stsp "youngest common ancestor commit has "
6884 af61c510 2019-07-19 stsp "been reached?!?");
6886 ee780d5c 2020-01-04 stsp goto done;
6888 8ca9bd68 2019-07-25 stsp err = check_path_prefix(parent_id, commit_id,
6889 8ca9bd68 2019-07-25 stsp path_prefix, path_prefix_errcode, repo);
6891 af61c510 2019-07-19 stsp goto done;
6893 af61c510 2019-07-19 stsp err = got_object_qid_alloc(&qid, commit_id);
6895 af61c510 2019-07-19 stsp goto done;
6896 af61c510 2019-07-19 stsp SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6897 af61c510 2019-07-19 stsp commit_id = parent_id;
6901 af61c510 2019-07-19 stsp got_commit_graph_close(graph);
6902 af61c510 2019-07-19 stsp return err;
6905 af61c510 2019-07-19 stsp static const struct got_error *
6906 818c7501 2019-07-11 stsp cmd_rebase(int argc, char *argv[])
6908 818c7501 2019-07-11 stsp const struct got_error *error = NULL;
6909 818c7501 2019-07-11 stsp struct got_worktree *worktree = NULL;
6910 818c7501 2019-07-11 stsp struct got_repository *repo = NULL;
6911 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
6912 818c7501 2019-07-11 stsp char *cwd = NULL;
6913 818c7501 2019-07-11 stsp struct got_reference *branch = NULL;
6914 818c7501 2019-07-11 stsp struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
6915 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL, *parent_id = NULL;
6916 818c7501 2019-07-11 stsp struct got_object_id *resume_commit_id = NULL;
6917 818c7501 2019-07-11 stsp struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
6918 818c7501 2019-07-11 stsp struct got_commit_object *commit = NULL;
6919 818c7501 2019-07-11 stsp int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
6920 7ef62c4e 2020-02-24 stsp int histedit_in_progress = 0;
6921 818c7501 2019-07-11 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6922 818c7501 2019-07-11 stsp struct got_object_id_queue commits;
6923 01757395 2019-07-12 stsp struct got_pathlist_head merged_paths;
6924 818c7501 2019-07-11 stsp const struct got_object_id_queue *parent_ids;
6925 818c7501 2019-07-11 stsp struct got_object_qid *qid, *pid;
6927 818c7501 2019-07-11 stsp SIMPLEQ_INIT(&commits);
6928 01757395 2019-07-12 stsp TAILQ_INIT(&merged_paths);
6930 818c7501 2019-07-11 stsp while ((ch = getopt(argc, argv, "ac")) != -1) {
6931 818c7501 2019-07-11 stsp switch (ch) {
6933 818c7501 2019-07-11 stsp abort_rebase = 1;
6936 818c7501 2019-07-11 stsp continue_rebase = 1;
6939 818c7501 2019-07-11 stsp usage_rebase();
6940 818c7501 2019-07-11 stsp /* NOTREACHED */
6944 818c7501 2019-07-11 stsp argc -= optind;
6945 818c7501 2019-07-11 stsp argv += optind;
6947 43012d58 2019-07-14 stsp #ifndef PROFILE
6948 43012d58 2019-07-14 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6949 43012d58 2019-07-14 stsp "unveil", NULL) == -1)
6950 43012d58 2019-07-14 stsp err(1, "pledge");
6952 818c7501 2019-07-11 stsp if (abort_rebase && continue_rebase)
6953 818c7501 2019-07-11 stsp usage_rebase();
6954 818c7501 2019-07-11 stsp else if (abort_rebase || continue_rebase) {
6955 818c7501 2019-07-11 stsp if (argc != 0)
6956 818c7501 2019-07-11 stsp usage_rebase();
6957 818c7501 2019-07-11 stsp } else if (argc != 1)
6958 818c7501 2019-07-11 stsp usage_rebase();
6960 818c7501 2019-07-11 stsp cwd = getcwd(NULL, 0);
6961 818c7501 2019-07-11 stsp if (cwd == NULL) {
6962 818c7501 2019-07-11 stsp error = got_error_from_errno("getcwd");
6963 818c7501 2019-07-11 stsp goto done;
6965 818c7501 2019-07-11 stsp error = got_worktree_open(&worktree, cwd);
6966 fa51e947 2020-03-27 stsp if (error) {
6967 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
6968 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "rebase", cwd);
6969 818c7501 2019-07-11 stsp goto done;
6972 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6974 818c7501 2019-07-11 stsp if (error != NULL)
6975 818c7501 2019-07-11 stsp goto done;
6977 818c7501 2019-07-11 stsp error = apply_unveil(got_repo_get_path(repo), 0,
6978 c530dc23 2019-07-23 stsp got_worktree_get_root_path(worktree));
6979 7ef62c4e 2020-02-24 stsp if (error)
6980 7ef62c4e 2020-02-24 stsp goto done;
6982 7ef62c4e 2020-02-24 stsp error = got_worktree_histedit_in_progress(&histedit_in_progress,
6983 7ef62c4e 2020-02-24 stsp worktree);
6984 818c7501 2019-07-11 stsp if (error)
6985 7ef62c4e 2020-02-24 stsp goto done;
6986 7ef62c4e 2020-02-24 stsp if (histedit_in_progress) {
6987 7ef62c4e 2020-02-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
6988 818c7501 2019-07-11 stsp goto done;
6991 818c7501 2019-07-11 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6992 818c7501 2019-07-11 stsp if (error)
6993 818c7501 2019-07-11 stsp goto done;
6995 f6794adc 2019-07-23 stsp if (abort_rebase) {
6996 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
6997 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
6998 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
6999 f6794adc 2019-07-23 stsp goto done;
7001 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7002 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7003 3e3a69f1 2019-07-25 stsp worktree, repo);
7004 818c7501 2019-07-11 stsp if (error)
7005 818c7501 2019-07-11 stsp goto done;
7006 818c7501 2019-07-11 stsp printf("Switching work tree to %s\n",
7007 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch));
7008 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7009 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_abort(worktree, fileindex, repo,
7010 9627c110 2020-04-18 stsp new_base_branch, update_progress, &upa);
7011 818c7501 2019-07-11 stsp if (error)
7012 818c7501 2019-07-11 stsp goto done;
7013 818c7501 2019-07-11 stsp printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7014 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7015 818c7501 2019-07-11 stsp goto done; /* nothing else to do */
7018 818c7501 2019-07-11 stsp if (continue_rebase) {
7019 f6794adc 2019-07-23 stsp if (!rebase_in_progress) {
7020 f6794adc 2019-07-23 stsp error = got_error(GOT_ERR_NOT_REBASING);
7021 f6794adc 2019-07-23 stsp goto done;
7023 818c7501 2019-07-11 stsp error = got_worktree_rebase_continue(&resume_commit_id,
7024 3e3a69f1 2019-07-25 stsp &new_base_branch, &tmp_branch, &branch, &fileindex,
7025 3e3a69f1 2019-07-25 stsp worktree, repo);
7026 818c7501 2019-07-11 stsp if (error)
7027 818c7501 2019-07-11 stsp goto done;
7029 3e3a69f1 2019-07-25 stsp error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7030 01757395 2019-07-12 stsp resume_commit_id, repo);
7031 818c7501 2019-07-11 stsp if (error)
7032 818c7501 2019-07-11 stsp goto done;
7034 ff0d2220 2019-07-11 stsp yca_id = got_object_id_dup(resume_commit_id);
7035 ff0d2220 2019-07-11 stsp if (yca_id == NULL) {
7036 818c7501 2019-07-11 stsp error = got_error_from_errno("got_object_id_dup");
7037 818c7501 2019-07-11 stsp goto done;
7040 818c7501 2019-07-11 stsp error = got_ref_open(&branch, repo, argv[0], 0);
7041 818c7501 2019-07-11 stsp if (error != NULL)
7042 818c7501 2019-07-11 stsp goto done;
7045 ff0d2220 2019-07-11 stsp error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7046 ff0d2220 2019-07-11 stsp if (error)
7047 ff0d2220 2019-07-11 stsp goto done;
7049 ff0d2220 2019-07-11 stsp if (!continue_rebase) {
7050 a51a74b3 2019-07-27 stsp struct got_object_id *base_commit_id;
7052 a51a74b3 2019-07-27 stsp base_commit_id = got_worktree_get_base_commit_id(worktree);
7053 818c7501 2019-07-11 stsp error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7054 6fb7cd11 2019-08-22 stsp base_commit_id, branch_head_commit_id, repo,
7055 6fb7cd11 2019-08-22 stsp check_cancelled, NULL);
7056 818c7501 2019-07-11 stsp if (error)
7057 818c7501 2019-07-11 stsp goto done;
7058 818c7501 2019-07-11 stsp if (yca_id == NULL) {
7059 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_ANCESTRY,
7060 818c7501 2019-07-11 stsp "specified branch shares no common ancestry "
7061 818c7501 2019-07-11 stsp "with work tree's branch");
7062 818c7501 2019-07-11 stsp goto done;
7065 a51a74b3 2019-07-27 stsp error = check_same_branch(base_commit_id, branch, yca_id, repo);
7066 a51a74b3 2019-07-27 stsp if (error) {
7067 a51a74b3 2019-07-27 stsp if (error->code != GOT_ERR_ANCESTRY)
7068 a51a74b3 2019-07-27 stsp goto done;
7069 a51a74b3 2019-07-27 stsp error = NULL;
7071 a51a74b3 2019-07-27 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
7072 a51a74b3 2019-07-27 stsp "specified branch resolves to a commit which "
7073 a51a74b3 2019-07-27 stsp "is already contained in work tree's branch");
7074 a51a74b3 2019-07-27 stsp goto done;
7076 818c7501 2019-07-11 stsp error = got_worktree_rebase_prepare(&new_base_branch,
7077 3e3a69f1 2019-07-25 stsp &tmp_branch, &fileindex, worktree, branch, repo);
7078 818c7501 2019-07-11 stsp if (error)
7079 818c7501 2019-07-11 stsp goto done;
7082 ff0d2220 2019-07-11 stsp commit_id = branch_head_commit_id;
7083 818c7501 2019-07-11 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7084 818c7501 2019-07-11 stsp if (error)
7085 818c7501 2019-07-11 stsp goto done;
7087 818c7501 2019-07-11 stsp parent_ids = got_object_commit_get_parent_ids(commit);
7088 818c7501 2019-07-11 stsp pid = SIMPLEQ_FIRST(parent_ids);
7089 fc66b545 2019-08-12 stsp if (pid == NULL) {
7090 fc66b545 2019-08-12 stsp if (!continue_rebase) {
7091 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7092 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7093 fc66b545 2019-08-12 stsp error = got_worktree_rebase_abort(worktree, fileindex,
7094 9627c110 2020-04-18 stsp repo, new_base_branch, update_progress, &upa);
7095 fc66b545 2019-08-12 stsp if (error)
7096 fc66b545 2019-08-12 stsp goto done;
7097 fc66b545 2019-08-12 stsp printf("Rebase of %s aborted\n",
7098 fc66b545 2019-08-12 stsp got_ref_get_name(branch));
7099 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7102 fc66b545 2019-08-12 stsp error = got_error(GOT_ERR_EMPTY_REBASE);
7103 fc66b545 2019-08-12 stsp goto done;
7105 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, commit_id, pid->id,
7106 8ca9bd68 2019-07-25 stsp yca_id, got_worktree_get_path_prefix(worktree),
7107 8ca9bd68 2019-07-25 stsp GOT_ERR_REBASE_PATH, repo);
7108 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7109 818c7501 2019-07-11 stsp commit = NULL;
7110 818c7501 2019-07-11 stsp if (error)
7111 818c7501 2019-07-11 stsp goto done;
7113 818c7501 2019-07-11 stsp if (SIMPLEQ_EMPTY(&commits)) {
7114 38b0338b 2019-11-29 stsp if (continue_rebase) {
7115 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex,
7116 3e3a69f1 2019-07-25 stsp branch, new_base_branch, tmp_branch, repo);
7117 38b0338b 2019-11-29 stsp goto done;
7119 38b0338b 2019-11-29 stsp /* Fast-forward the reference of the branch. */
7120 38b0338b 2019-11-29 stsp struct got_object_id *new_head_commit_id;
7121 38b0338b 2019-11-29 stsp char *id_str;
7122 38b0338b 2019-11-29 stsp error = got_ref_resolve(&new_head_commit_id, repo,
7123 38b0338b 2019-11-29 stsp new_base_branch);
7124 38b0338b 2019-11-29 stsp if (error)
7125 38b0338b 2019-11-29 stsp goto done;
7126 38b0338b 2019-11-29 stsp error = got_object_id_str(&id_str, new_head_commit_id);
7127 38b0338b 2019-11-29 stsp printf("Forwarding %s to commit %s\n",
7128 38b0338b 2019-11-29 stsp got_ref_get_name(branch), id_str);
7129 38b0338b 2019-11-29 stsp free(id_str);
7130 38b0338b 2019-11-29 stsp error = got_ref_change_ref(branch,
7131 38b0338b 2019-11-29 stsp new_head_commit_id);
7132 38b0338b 2019-11-29 stsp if (error)
7133 38b0338b 2019-11-29 stsp goto done;
7137 818c7501 2019-07-11 stsp pid = NULL;
7138 818c7501 2019-07-11 stsp SIMPLEQ_FOREACH(qid, &commits, entry) {
7139 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
7141 818c7501 2019-07-11 stsp commit_id = qid->id;
7142 818c7501 2019-07-11 stsp parent_id = pid ? pid->id : yca_id;
7143 818c7501 2019-07-11 stsp pid = qid;
7145 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
7146 01757395 2019-07-12 stsp error = got_worktree_rebase_merge_files(&merged_paths,
7147 3e3a69f1 2019-07-25 stsp worktree, fileindex, parent_id, commit_id, repo,
7148 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
7149 818c7501 2019-07-11 stsp if (error)
7150 818c7501 2019-07-11 stsp goto done;
7152 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
7153 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
7154 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
7156 01757395 2019-07-12 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7157 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(qid->id, repo);
7158 a0ea4fc0 2020-02-28 stsp if (error)
7159 a0ea4fc0 2020-02-28 stsp goto done;
7160 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7164 3e3a69f1 2019-07-25 stsp error = rebase_commit(&merged_paths, worktree, fileindex,
7165 3e3a69f1 2019-07-25 stsp tmp_branch, commit_id, repo);
7166 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(&merged_paths);
7167 818c7501 2019-07-11 stsp if (error)
7168 818c7501 2019-07-11 stsp goto done;
7171 818c7501 2019-07-11 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
7172 3e3a69f1 2019-07-25 stsp error = got_worktree_rebase_postpone(worktree, fileindex);
7173 818c7501 2019-07-11 stsp if (error)
7174 818c7501 2019-07-11 stsp goto done;
7175 818c7501 2019-07-11 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
7176 11495e04 2019-07-12 stsp "conflicts must be resolved before rebasing can continue");
7178 3e3a69f1 2019-07-25 stsp error = rebase_complete(worktree, fileindex, branch,
7179 3e3a69f1 2019-07-25 stsp new_base_branch, tmp_branch, repo);
7181 818c7501 2019-07-11 stsp got_object_id_queue_free(&commits);
7182 818c7501 2019-07-11 stsp free(branch_head_commit_id);
7183 818c7501 2019-07-11 stsp free(resume_commit_id);
7184 818c7501 2019-07-11 stsp free(yca_id);
7185 818c7501 2019-07-11 stsp if (commit)
7186 818c7501 2019-07-11 stsp got_object_commit_close(commit);
7187 818c7501 2019-07-11 stsp if (branch)
7188 818c7501 2019-07-11 stsp got_ref_close(branch);
7189 818c7501 2019-07-11 stsp if (new_base_branch)
7190 818c7501 2019-07-11 stsp got_ref_close(new_base_branch);
7191 818c7501 2019-07-11 stsp if (tmp_branch)
7192 818c7501 2019-07-11 stsp got_ref_close(tmp_branch);
7193 5ef14e63 2019-06-02 stsp if (worktree)
7194 5ef14e63 2019-06-02 stsp got_worktree_close(worktree);
7196 5ef14e63 2019-06-02 stsp got_repo_close(repo);
7197 5ef14e63 2019-06-02 stsp return error;
7200 0ebf8283 2019-07-24 stsp __dead static void
7201 0ebf8283 2019-07-24 stsp usage_histedit(void)
7203 083957f4 2020-02-24 stsp fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7204 0ebf8283 2019-07-24 stsp getprogname());
7208 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_PICK 'p'
7209 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_EDIT 'e'
7210 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_FOLD 'f'
7211 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_DROP 'd'
7212 0ebf8283 2019-07-24 stsp #define GOT_HISTEDIT_MESG 'm'
7214 0ebf8283 2019-07-24 stsp static struct got_histedit_cmd {
7215 0ebf8283 2019-07-24 stsp unsigned char code;
7216 0ebf8283 2019-07-24 stsp const char *name;
7217 0ebf8283 2019-07-24 stsp const char *desc;
7218 0ebf8283 2019-07-24 stsp } got_histedit_cmds[] = {
7219 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_PICK, "pick", "use commit" },
7220 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7221 82997472 2020-01-29 stsp { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7222 82997472 2020-01-29 stsp "be used" },
7223 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7224 0ebf8283 2019-07-24 stsp { GOT_HISTEDIT_MESG, "mesg",
7225 0ebf8283 2019-07-24 stsp "single-line log message for commit above (open editor if empty)" },
7228 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry {
7229 0ebf8283 2019-07-24 stsp TAILQ_ENTRY(got_histedit_list_entry) entry;
7230 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id;
7231 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7232 0ebf8283 2019-07-24 stsp char *logmsg;
7234 0ebf8283 2019-07-24 stsp TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7236 0ebf8283 2019-07-24 stsp static const struct got_error *
7237 0ebf8283 2019-07-24 stsp histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7238 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7240 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7241 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *id_str = NULL;
7242 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7245 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7247 0ebf8283 2019-07-24 stsp goto done;
7249 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 34, commit);
7251 0ebf8283 2019-07-24 stsp goto done;
7253 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, commit_id);
7255 0ebf8283 2019-07-24 stsp goto done;
7257 0ebf8283 2019-07-24 stsp n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7258 0ebf8283 2019-07-24 stsp if (n < 0)
7259 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7261 0ebf8283 2019-07-24 stsp if (commit)
7262 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7263 0ebf8283 2019-07-24 stsp free(id_str);
7264 0ebf8283 2019-07-24 stsp free(logmsg);
7265 0ebf8283 2019-07-24 stsp return err;
7268 0ebf8283 2019-07-24 stsp static const struct got_error *
7269 083957f4 2020-02-24 stsp histedit_write_commit_list(struct got_object_id_queue *commits,
7270 083957f4 2020-02-24 stsp FILE *f, int edit_logmsg_only, struct got_repository *repo)
7272 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7273 0ebf8283 2019-07-24 stsp struct got_object_qid *qid;
7275 0ebf8283 2019-07-24 stsp if (SIMPLEQ_EMPTY(commits))
7276 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7278 0ebf8283 2019-07-24 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7279 0ebf8283 2019-07-24 stsp err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7283 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7284 083957f4 2020-02-24 stsp int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7285 083957f4 2020-02-24 stsp if (n < 0) {
7286 083957f4 2020-02-24 stsp err = got_ferror(f, GOT_ERR_IO);
7292 0ebf8283 2019-07-24 stsp return err;
7295 0ebf8283 2019-07-24 stsp static const struct got_error *
7296 514f2ffe 2020-01-29 stsp write_cmd_list(FILE *f, const char *branch_name,
7297 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits)
7299 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7301 514f2ffe 2020-01-29 stsp char *id_str;
7302 514f2ffe 2020-01-29 stsp struct got_object_qid *qid;
7304 514f2ffe 2020-01-29 stsp qid = SIMPLEQ_FIRST(commits);
7305 514f2ffe 2020-01-29 stsp err = got_object_id_str(&id_str, qid->id);
7307 514f2ffe 2020-01-29 stsp return err;
7309 514f2ffe 2020-01-29 stsp n = fprintf(f,
7310 514f2ffe 2020-01-29 stsp "# Editing the history of branch '%s' starting at\n"
7311 514f2ffe 2020-01-29 stsp "# commit %s\n"
7312 514f2ffe 2020-01-29 stsp "# Commits will be processed in order from top to "
7313 514f2ffe 2020-01-29 stsp "bottom of this file.\n", branch_name, id_str);
7314 514f2ffe 2020-01-29 stsp if (n < 0) {
7315 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7316 514f2ffe 2020-01-29 stsp goto done;
7319 0ebf8283 2019-07-24 stsp n = fprintf(f, "# Available histedit commands:\n");
7320 514f2ffe 2020-01-29 stsp if (n < 0) {
7321 514f2ffe 2020-01-29 stsp err = got_ferror(f, GOT_ERR_IO);
7322 514f2ffe 2020-01-29 stsp goto done;
7325 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7326 0ebf8283 2019-07-24 stsp struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7327 0ebf8283 2019-07-24 stsp n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7328 0ebf8283 2019-07-24 stsp cmd->desc);
7329 0ebf8283 2019-07-24 stsp if (n < 0) {
7330 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7335 514f2ffe 2020-01-29 stsp free(id_str);
7336 0ebf8283 2019-07-24 stsp return err;
7339 0ebf8283 2019-07-24 stsp static const struct got_error *
7340 0ebf8283 2019-07-24 stsp histedit_syntax_error(int lineno)
7342 0ebf8283 2019-07-24 stsp static char msg[42];
7345 0ebf8283 2019-07-24 stsp ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7347 0ebf8283 2019-07-24 stsp if (ret == -1 || ret >= sizeof(msg))
7348 0ebf8283 2019-07-24 stsp return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7350 0ebf8283 2019-07-24 stsp return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7353 0ebf8283 2019-07-24 stsp static const struct got_error *
7354 0ebf8283 2019-07-24 stsp append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7355 0ebf8283 2019-07-24 stsp char *logmsg, struct got_repository *repo)
7357 0ebf8283 2019-07-24 stsp const struct got_error *err;
7358 0ebf8283 2019-07-24 stsp struct got_commit_object *folded_commit = NULL;
7359 5943eee2 2019-08-13 stsp char *id_str, *folded_logmsg = NULL;
7361 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7363 0ebf8283 2019-07-24 stsp return err;
7365 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7367 0ebf8283 2019-07-24 stsp goto done;
7369 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7371 5943eee2 2019-08-13 stsp goto done;
7372 0ebf8283 2019-07-24 stsp if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7373 0ebf8283 2019-07-24 stsp logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7374 5943eee2 2019-08-13 stsp folded_logmsg) == -1) {
7375 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7378 0ebf8283 2019-07-24 stsp if (folded_commit)
7379 0ebf8283 2019-07-24 stsp got_object_commit_close(folded_commit);
7380 0ebf8283 2019-07-24 stsp free(id_str);
7381 5943eee2 2019-08-13 stsp free(folded_logmsg);
7382 0ebf8283 2019-07-24 stsp return err;
7385 0ebf8283 2019-07-24 stsp static struct got_histedit_list_entry *
7386 0ebf8283 2019-07-24 stsp get_folded_commits(struct got_histedit_list_entry *hle)
7388 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *prev, *folded = NULL;
7390 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(hle, got_histedit_list, entry);
7391 3f9de99f 2019-07-24 stsp while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7392 3f9de99f 2019-07-24 stsp prev->cmd->code == GOT_HISTEDIT_DROP)) {
7393 3f9de99f 2019-07-24 stsp if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7394 3f9de99f 2019-07-24 stsp folded = prev;
7395 0ebf8283 2019-07-24 stsp prev = TAILQ_PREV(prev, got_histedit_list, entry);
7398 0ebf8283 2019-07-24 stsp return folded;
7401 0ebf8283 2019-07-24 stsp static const struct got_error *
7402 0ebf8283 2019-07-24 stsp histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7403 0ebf8283 2019-07-24 stsp struct got_repository *repo)
7405 5943eee2 2019-08-13 stsp char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7406 0ebf8283 2019-07-24 stsp char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7407 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7408 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7410 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *folded = NULL;
7412 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7414 0ebf8283 2019-07-24 stsp return err;
7416 0ebf8283 2019-07-24 stsp folded = get_folded_commits(hle);
7417 0ebf8283 2019-07-24 stsp if (folded) {
7418 0ebf8283 2019-07-24 stsp while (folded != hle) {
7419 3f9de99f 2019-07-24 stsp if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7420 3f9de99f 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7423 0ebf8283 2019-07-24 stsp err = append_folded_commit_msg(&new_msg, folded,
7424 0ebf8283 2019-07-24 stsp logmsg, repo);
7426 0ebf8283 2019-07-24 stsp goto done;
7427 0ebf8283 2019-07-24 stsp free(logmsg);
7428 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7429 0ebf8283 2019-07-24 stsp folded = TAILQ_NEXT(folded, entry);
7433 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7435 0ebf8283 2019-07-24 stsp goto done;
7436 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7438 5943eee2 2019-08-13 stsp goto done;
7439 0ebf8283 2019-07-24 stsp if (asprintf(&new_msg,
7440 0ebf8283 2019-07-24 stsp "%s\n# original log message of commit %s: %s",
7441 5943eee2 2019-08-13 stsp logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7442 0ebf8283 2019-07-24 stsp err = got_error_from_errno("asprintf");
7443 0ebf8283 2019-07-24 stsp goto done;
7445 0ebf8283 2019-07-24 stsp free(logmsg);
7446 0ebf8283 2019-07-24 stsp logmsg = new_msg;
7448 0ebf8283 2019-07-24 stsp err = got_object_id_str(&id_str, hle->commit_id);
7450 0ebf8283 2019-07-24 stsp goto done;
7452 bb63914a 2020-02-17 stsp err = got_opentemp_named_fd(&logmsg_path, &fd,
7453 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-logmsg");
7455 0ebf8283 2019-07-24 stsp goto done;
7457 0ebf8283 2019-07-24 stsp dprintf(fd, logmsg);
7458 0ebf8283 2019-07-24 stsp close(fd);
7460 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7462 0ebf8283 2019-07-24 stsp goto done;
7464 0ebf8283 2019-07-24 stsp err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7465 0ebf8283 2019-07-24 stsp if (err) {
7466 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7467 0ebf8283 2019-07-24 stsp goto done;
7468 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7471 0ebf8283 2019-07-24 stsp if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7472 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", logmsg_path);
7473 0ebf8283 2019-07-24 stsp free(logmsg_path);
7474 0ebf8283 2019-07-24 stsp free(logmsg);
7475 5943eee2 2019-08-13 stsp free(orig_logmsg);
7476 0ebf8283 2019-07-24 stsp free(editor);
7477 0ebf8283 2019-07-24 stsp if (commit)
7478 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7479 0ebf8283 2019-07-24 stsp return err;
7482 0ebf8283 2019-07-24 stsp static const struct got_error *
7483 0ebf8283 2019-07-24 stsp histedit_parse_list(struct got_histedit_list *histedit_cmds,
7484 0ebf8283 2019-07-24 stsp FILE *f, struct got_repository *repo)
7486 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7487 0ebf8283 2019-07-24 stsp char *line = NULL, *p, *end;
7488 0ebf8283 2019-07-24 stsp size_t size;
7489 0ebf8283 2019-07-24 stsp ssize_t len;
7490 0ebf8283 2019-07-24 stsp int lineno = 0, i;
7491 0ebf8283 2019-07-24 stsp const struct got_histedit_cmd *cmd;
7492 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
7493 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle = NULL;
7495 0ebf8283 2019-07-24 stsp for (;;) {
7496 0ebf8283 2019-07-24 stsp len = getline(&line, &size, f);
7497 0ebf8283 2019-07-24 stsp if (len == -1) {
7498 0ebf8283 2019-07-24 stsp const struct got_error *getline_err;
7499 0ebf8283 2019-07-24 stsp if (feof(f))
7501 0ebf8283 2019-07-24 stsp getline_err = got_error_from_errno("getline");
7502 0ebf8283 2019-07-24 stsp err = got_ferror(f, getline_err->code);
7507 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7509 0ebf8283 2019-07-24 stsp if (p[0] == '#' || p[0] == '\0') {
7510 0ebf8283 2019-07-24 stsp free(line);
7511 0ebf8283 2019-07-24 stsp line = NULL;
7514 0ebf8283 2019-07-24 stsp cmd = NULL;
7515 0ebf8283 2019-07-24 stsp for (i = 0; i < nitems(got_histedit_cmds); i++) {
7516 0ebf8283 2019-07-24 stsp cmd = &got_histedit_cmds[i];
7517 0ebf8283 2019-07-24 stsp if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7518 0ebf8283 2019-07-24 stsp isspace((unsigned char)p[strlen(cmd->name)])) {
7519 0ebf8283 2019-07-24 stsp p += strlen(cmd->name);
7522 0ebf8283 2019-07-24 stsp if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7527 6c1844f6 2019-07-25 stsp if (i == nitems(got_histedit_cmds)) {
7528 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7531 0ebf8283 2019-07-24 stsp while (isspace((unsigned char)p[0]))
7533 0ebf8283 2019-07-24 stsp if (cmd->code == GOT_HISTEDIT_MESG) {
7534 0ebf8283 2019-07-24 stsp if (hle == NULL || hle->logmsg != NULL) {
7535 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CMD);
7538 0ebf8283 2019-07-24 stsp if (p[0] == '\0') {
7539 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7543 0ebf8283 2019-07-24 stsp hle->logmsg = strdup(p);
7544 0ebf8283 2019-07-24 stsp if (hle->logmsg == NULL) {
7545 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7549 0ebf8283 2019-07-24 stsp free(line);
7550 0ebf8283 2019-07-24 stsp line = NULL;
7554 0ebf8283 2019-07-24 stsp while (end[0] && !isspace((unsigned char)end[0]))
7556 0ebf8283 2019-07-24 stsp *end = '\0';
7558 0ebf8283 2019-07-24 stsp err = got_object_resolve_id_str(&commit_id, repo, p);
7559 0ebf8283 2019-07-24 stsp if (err) {
7560 0ebf8283 2019-07-24 stsp /* override error code */
7561 0ebf8283 2019-07-24 stsp err = histedit_syntax_error(lineno);
7565 0ebf8283 2019-07-24 stsp hle = malloc(sizeof(*hle));
7566 0ebf8283 2019-07-24 stsp if (hle == NULL) {
7567 0ebf8283 2019-07-24 stsp err = got_error_from_errno("malloc");
7570 0ebf8283 2019-07-24 stsp hle->cmd = cmd;
7571 0ebf8283 2019-07-24 stsp hle->commit_id = commit_id;
7572 0ebf8283 2019-07-24 stsp hle->logmsg = NULL;
7573 0ebf8283 2019-07-24 stsp commit_id = NULL;
7574 0ebf8283 2019-07-24 stsp free(line);
7575 0ebf8283 2019-07-24 stsp line = NULL;
7576 0ebf8283 2019-07-24 stsp TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7579 0ebf8283 2019-07-24 stsp free(line);
7580 0ebf8283 2019-07-24 stsp free(commit_id);
7581 0ebf8283 2019-07-24 stsp return err;
7584 0ebf8283 2019-07-24 stsp static const struct got_error *
7585 bfce7f83 2019-07-27 stsp histedit_check_script(struct got_histedit_list *histedit_cmds,
7586 bfce7f83 2019-07-27 stsp struct got_object_id_queue *commits, struct got_repository *repo)
7588 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL;
7589 bfce7f83 2019-07-27 stsp struct got_object_qid *qid;
7590 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7591 5b87815e 2020-03-05 stsp static char msg[92];
7592 bfce7f83 2019-07-27 stsp char *id_str;
7594 bfce7f83 2019-07-27 stsp if (TAILQ_EMPTY(histedit_cmds))
7595 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7596 bfce7f83 2019-07-27 stsp "histedit script contains no commands");
7597 a0de39f3 2019-08-09 stsp if (SIMPLEQ_EMPTY(commits))
7598 a0de39f3 2019-08-09 stsp return got_error(GOT_ERR_EMPTY_HISTEDIT);
7600 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7601 5b87815e 2020-03-05 stsp struct got_histedit_list_entry *hle2;
7602 5b87815e 2020-03-05 stsp TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7603 5b87815e 2020-03-05 stsp if (hle == hle2)
7605 5b87815e 2020-03-05 stsp if (got_object_id_cmp(hle->commit_id,
7606 5b87815e 2020-03-05 stsp hle2->commit_id) != 0)
7608 5b87815e 2020-03-05 stsp err = got_object_id_str(&id_str, hle->commit_id);
7610 5b87815e 2020-03-05 stsp return err;
7611 5b87815e 2020-03-05 stsp snprintf(msg, sizeof(msg), "commit %s is listed "
7612 5b87815e 2020-03-05 stsp "more than once in histedit script", id_str);
7613 5b87815e 2020-03-05 stsp free(id_str);
7614 5b87815e 2020-03-05 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7618 bfce7f83 2019-07-27 stsp SIMPLEQ_FOREACH(qid, commits, entry) {
7619 bfce7f83 2019-07-27 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7620 bfce7f83 2019-07-27 stsp if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7623 bfce7f83 2019-07-27 stsp if (hle == NULL) {
7624 bfce7f83 2019-07-27 stsp err = got_object_id_str(&id_str, qid->id);
7626 bfce7f83 2019-07-27 stsp return err;
7627 bfce7f83 2019-07-27 stsp snprintf(msg, sizeof(msg),
7628 bfce7f83 2019-07-27 stsp "commit %s missing from histedit script", id_str);
7629 bfce7f83 2019-07-27 stsp free(id_str);
7630 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7634 0def28b1 2019-08-17 stsp hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7635 0def28b1 2019-08-17 stsp if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7636 bfce7f83 2019-07-27 stsp return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7637 bfce7f83 2019-07-27 stsp "last commit in histedit script cannot be folded");
7639 bfce7f83 2019-07-27 stsp return NULL;
7642 bfce7f83 2019-07-27 stsp static const struct got_error *
7643 0ebf8283 2019-07-24 stsp histedit_run_editor(struct got_histedit_list *histedit_cmds,
7644 bfce7f83 2019-07-27 stsp const char *path, struct got_object_id_queue *commits,
7645 bfce7f83 2019-07-27 stsp struct got_repository *repo)
7647 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7648 0ebf8283 2019-07-24 stsp char *editor;
7649 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7651 0ebf8283 2019-07-24 stsp err = get_editor(&editor);
7653 0ebf8283 2019-07-24 stsp return err;
7655 0ebf8283 2019-07-24 stsp if (spawn_editor(editor, path) == -1) {
7656 0ebf8283 2019-07-24 stsp err = got_error_from_errno("failed spawning editor");
7657 0ebf8283 2019-07-24 stsp goto done;
7660 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7661 0ebf8283 2019-07-24 stsp if (f == NULL) {
7662 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fopen");
7663 0ebf8283 2019-07-24 stsp goto done;
7665 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7667 bfce7f83 2019-07-27 stsp goto done;
7669 bfce7f83 2019-07-27 stsp err = histedit_check_script(histedit_cmds, commits, repo);
7671 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7672 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7673 0ebf8283 2019-07-24 stsp free(editor);
7674 0ebf8283 2019-07-24 stsp return err;
7677 0ebf8283 2019-07-24 stsp static const struct got_error *
7678 bfce7f83 2019-07-27 stsp histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7679 514f2ffe 2020-01-29 stsp struct got_object_id_queue *, const char *, const char *,
7680 514f2ffe 2020-01-29 stsp struct got_repository *);
7682 0ebf8283 2019-07-24 stsp static const struct got_error *
7683 0ebf8283 2019-07-24 stsp histedit_edit_script(struct got_histedit_list *histedit_cmds,
7684 514f2ffe 2020-01-29 stsp struct got_object_id_queue *commits, const char *branch_name,
7685 083957f4 2020-02-24 stsp int edit_logmsg_only, struct got_repository *repo)
7687 0ebf8283 2019-07-24 stsp const struct got_error *err;
7688 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7689 0ebf8283 2019-07-24 stsp char *path = NULL;
7691 0ebf8283 2019-07-24 stsp err = got_opentemp_named(&path, &f, "got-histedit");
7693 0ebf8283 2019-07-24 stsp return err;
7695 514f2ffe 2020-01-29 stsp err = write_cmd_list(f, branch_name, commits);
7697 0ebf8283 2019-07-24 stsp goto done;
7699 083957f4 2020-02-24 stsp err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7701 0ebf8283 2019-07-24 stsp goto done;
7703 083957f4 2020-02-24 stsp if (edit_logmsg_only) {
7704 083957f4 2020-02-24 stsp rewind(f);
7705 083957f4 2020-02-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7707 083957f4 2020-02-24 stsp if (fclose(f) != 0) {
7708 083957f4 2020-02-24 stsp err = got_error_from_errno("fclose");
7709 0ebf8283 2019-07-24 stsp goto done;
7712 083957f4 2020-02-24 stsp err = histedit_run_editor(histedit_cmds, path, commits, repo);
7713 083957f4 2020-02-24 stsp if (err) {
7714 083957f4 2020-02-24 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7715 083957f4 2020-02-24 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7716 083957f4 2020-02-24 stsp goto done;
7717 083957f4 2020-02-24 stsp err = histedit_edit_list_retry(histedit_cmds, err,
7718 083957f4 2020-02-24 stsp commits, path, branch_name, repo);
7722 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7723 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7724 0ebf8283 2019-07-24 stsp if (path && unlink(path) != 0 && err == NULL)
7725 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("unlink", path);
7726 0ebf8283 2019-07-24 stsp free(path);
7727 0ebf8283 2019-07-24 stsp return err;
7730 0ebf8283 2019-07-24 stsp static const struct got_error *
7731 0ebf8283 2019-07-24 stsp histedit_save_list(struct got_histedit_list *histedit_cmds,
7732 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7734 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7735 0ebf8283 2019-07-24 stsp char *path = NULL;
7736 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7737 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
7738 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
7740 c3022ba5 2019-07-27 stsp err = got_worktree_get_histedit_script_path(&path, worktree);
7742 0ebf8283 2019-07-24 stsp return err;
7744 0ebf8283 2019-07-24 stsp f = fopen(path, "w");
7745 0ebf8283 2019-07-24 stsp if (f == NULL) {
7746 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7747 0ebf8283 2019-07-24 stsp goto done;
7749 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, histedit_cmds, entry) {
7750 0ebf8283 2019-07-24 stsp err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7755 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7756 0ebf8283 2019-07-24 stsp int n = fprintf(f, "%c %s\n",
7757 0ebf8283 2019-07-24 stsp GOT_HISTEDIT_MESG, hle->logmsg);
7758 0ebf8283 2019-07-24 stsp if (n < 0) {
7759 0ebf8283 2019-07-24 stsp err = got_ferror(f, GOT_ERR_IO);
7765 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7766 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7767 0ebf8283 2019-07-24 stsp free(path);
7768 0ebf8283 2019-07-24 stsp if (commit)
7769 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7770 0ebf8283 2019-07-24 stsp return err;
7774 bfce7f83 2019-07-27 stsp histedit_free_list(struct got_histedit_list *histedit_cmds)
7776 bfce7f83 2019-07-27 stsp struct got_histedit_list_entry *hle;
7778 bfce7f83 2019-07-27 stsp while ((hle = TAILQ_FIRST(histedit_cmds))) {
7779 bfce7f83 2019-07-27 stsp TAILQ_REMOVE(histedit_cmds, hle, entry);
7780 bfce7f83 2019-07-27 stsp free(hle);
7784 0ebf8283 2019-07-24 stsp static const struct got_error *
7785 0ebf8283 2019-07-24 stsp histedit_load_list(struct got_histedit_list *histedit_cmds,
7786 0ebf8283 2019-07-24 stsp const char *path, struct got_repository *repo)
7788 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7789 0ebf8283 2019-07-24 stsp FILE *f = NULL;
7791 0ebf8283 2019-07-24 stsp f = fopen(path, "r");
7792 0ebf8283 2019-07-24 stsp if (f == NULL) {
7793 0ebf8283 2019-07-24 stsp err = got_error_from_errno2("fopen", path);
7794 0ebf8283 2019-07-24 stsp goto done;
7797 0ebf8283 2019-07-24 stsp err = histedit_parse_list(histedit_cmds, f, repo);
7799 0ebf8283 2019-07-24 stsp if (f && fclose(f) != 0 && err == NULL)
7800 0ebf8283 2019-07-24 stsp err = got_error_from_errno("fclose");
7801 0ebf8283 2019-07-24 stsp return err;
7804 0ebf8283 2019-07-24 stsp static const struct got_error *
7805 0ebf8283 2019-07-24 stsp histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7806 bfce7f83 2019-07-27 stsp const struct got_error *edit_err, struct got_object_id_queue *commits,
7807 514f2ffe 2020-01-29 stsp const char *path, const char *branch_name, struct got_repository *repo)
7809 bfce7f83 2019-07-27 stsp const struct got_error *err = NULL, *prev_err = edit_err;
7810 0ebf8283 2019-07-24 stsp int resp = ' ';
7812 b006047e 2019-07-25 stsp while (resp != 'c' && resp != 'r' && resp != 'a') {
7813 0ebf8283 2019-07-24 stsp printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7814 bfce7f83 2019-07-27 stsp "or (a)bort: ", getprogname(), prev_err->msg);
7815 0ebf8283 2019-07-24 stsp resp = getchar();
7816 a61a4414 2019-08-07 stsp if (resp == '\n')
7817 a61a4414 2019-08-07 stsp resp = getchar();
7818 426ebf2e 2019-07-25 stsp if (resp == 'c') {
7819 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7820 bfce7f83 2019-07-27 stsp err = histedit_run_editor(histedit_cmds, path, commits,
7822 426ebf2e 2019-07-25 stsp if (err) {
7823 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7824 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7826 bfce7f83 2019-07-27 stsp prev_err = err;
7827 426ebf2e 2019-07-25 stsp resp = ' ';
7831 426ebf2e 2019-07-25 stsp } else if (resp == 'r') {
7832 bfce7f83 2019-07-27 stsp histedit_free_list(histedit_cmds);
7833 0ebf8283 2019-07-24 stsp err = histedit_edit_script(histedit_cmds,
7834 083957f4 2020-02-24 stsp commits, branch_name, 0, repo);
7835 426ebf2e 2019-07-25 stsp if (err) {
7836 bfce7f83 2019-07-27 stsp if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7837 bfce7f83 2019-07-27 stsp err->code != GOT_ERR_HISTEDIT_CMD)
7839 bfce7f83 2019-07-27 stsp prev_err = err;
7840 426ebf2e 2019-07-25 stsp resp = ' ';
7844 426ebf2e 2019-07-25 stsp } else if (resp == 'a') {
7845 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7848 0ebf8283 2019-07-24 stsp printf("invalid response '%c'\n", resp);
7851 0ebf8283 2019-07-24 stsp return err;
7854 0ebf8283 2019-07-24 stsp static const struct got_error *
7855 0ebf8283 2019-07-24 stsp histedit_complete(struct got_worktree *worktree,
7856 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7857 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_repository *repo)
7859 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
7860 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
7861 3e3a69f1 2019-07-25 stsp return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7862 3e3a69f1 2019-07-25 stsp branch, repo);
7865 0ebf8283 2019-07-24 stsp static const struct got_error *
7866 0ebf8283 2019-07-24 stsp show_histedit_progress(struct got_commit_object *commit,
7867 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7869 0ebf8283 2019-07-24 stsp const struct got_error *err;
7870 0ebf8283 2019-07-24 stsp char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7872 0ebf8283 2019-07-24 stsp err = got_object_id_str(&old_id_str, hle->commit_id);
7874 0ebf8283 2019-07-24 stsp goto done;
7876 0ebf8283 2019-07-24 stsp if (new_id) {
7877 0ebf8283 2019-07-24 stsp err = got_object_id_str(&new_id_str, new_id);
7879 0ebf8283 2019-07-24 stsp goto done;
7882 0ebf8283 2019-07-24 stsp old_id_str[12] = '\0';
7883 0ebf8283 2019-07-24 stsp if (new_id_str)
7884 0ebf8283 2019-07-24 stsp new_id_str[12] = '\0';
7886 0ebf8283 2019-07-24 stsp if (hle->logmsg) {
7887 0ebf8283 2019-07-24 stsp logmsg = strdup(hle->logmsg);
7888 0ebf8283 2019-07-24 stsp if (logmsg == NULL) {
7889 0ebf8283 2019-07-24 stsp err = got_error_from_errno("strdup");
7890 0ebf8283 2019-07-24 stsp goto done;
7892 0ebf8283 2019-07-24 stsp trim_logmsg(logmsg, 42);
7894 0ebf8283 2019-07-24 stsp err = get_short_logmsg(&logmsg, 42, commit);
7896 0ebf8283 2019-07-24 stsp goto done;
7899 0ebf8283 2019-07-24 stsp switch (hle->cmd->code) {
7900 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_PICK:
7901 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_EDIT:
7902 0ebf8283 2019-07-24 stsp printf("%s -> %s: %s\n", old_id_str,
7903 0ebf8283 2019-07-24 stsp new_id_str ? new_id_str : "no-op change", logmsg);
7905 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_DROP:
7906 0ebf8283 2019-07-24 stsp case GOT_HISTEDIT_FOLD:
7907 0ebf8283 2019-07-24 stsp printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
7914 0ebf8283 2019-07-24 stsp free(old_id_str);
7915 0ebf8283 2019-07-24 stsp free(new_id_str);
7916 0ebf8283 2019-07-24 stsp return err;
7919 0ebf8283 2019-07-24 stsp static const struct got_error *
7920 0ebf8283 2019-07-24 stsp histedit_commit(struct got_pathlist_head *merged_paths,
7921 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7922 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
7923 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7925 0ebf8283 2019-07-24 stsp const struct got_error *err;
7926 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7927 0ebf8283 2019-07-24 stsp struct got_object_id *new_commit_id;
7929 0ebf8283 2019-07-24 stsp if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
7930 0ebf8283 2019-07-24 stsp && hle->logmsg == NULL) {
7931 0ebf8283 2019-07-24 stsp err = histedit_edit_logmsg(hle, repo);
7933 0ebf8283 2019-07-24 stsp return err;
7936 0ebf8283 2019-07-24 stsp err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7938 0ebf8283 2019-07-24 stsp return err;
7940 0ebf8283 2019-07-24 stsp err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
7941 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, commit, hle->commit_id,
7942 3e3a69f1 2019-07-25 stsp hle->logmsg, repo);
7943 0ebf8283 2019-07-24 stsp if (err) {
7944 0ebf8283 2019-07-24 stsp if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
7945 0ebf8283 2019-07-24 stsp goto done;
7946 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, NULL);
7948 0ebf8283 2019-07-24 stsp err = show_histedit_progress(commit, hle, new_commit_id);
7949 0ebf8283 2019-07-24 stsp free(new_commit_id);
7952 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7953 0ebf8283 2019-07-24 stsp return err;
7956 0ebf8283 2019-07-24 stsp static const struct got_error *
7957 0ebf8283 2019-07-24 stsp histedit_skip_commit(struct got_histedit_list_entry *hle,
7958 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7960 0ebf8283 2019-07-24 stsp const struct got_error *error;
7961 0ebf8283 2019-07-24 stsp struct got_commit_object *commit;
7963 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
7965 0ebf8283 2019-07-24 stsp if (error)
7966 0ebf8283 2019-07-24 stsp return error;
7968 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo, hle->commit_id);
7969 0ebf8283 2019-07-24 stsp if (error)
7970 0ebf8283 2019-07-24 stsp return error;
7972 0ebf8283 2019-07-24 stsp error = show_histedit_progress(commit, hle, NULL);
7973 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
7974 0ebf8283 2019-07-24 stsp return error;
7977 ab20a43a 2020-01-29 stsp static const struct got_error *
7978 ab20a43a 2020-01-29 stsp check_local_changes(void *arg, unsigned char status,
7979 ab20a43a 2020-01-29 stsp unsigned char staged_status, const char *path,
7980 ab20a43a 2020-01-29 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7981 ab20a43a 2020-01-29 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7983 ab20a43a 2020-01-29 stsp int *have_local_changes = arg;
7985 ab20a43a 2020-01-29 stsp switch (status) {
7986 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7987 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7988 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
7989 ab20a43a 2020-01-29 stsp case GOT_STATUS_CONFLICT:
7990 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
7991 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
7996 ab20a43a 2020-01-29 stsp switch (staged_status) {
7997 ab20a43a 2020-01-29 stsp case GOT_STATUS_ADD:
7998 ab20a43a 2020-01-29 stsp case GOT_STATUS_DELETE:
7999 ab20a43a 2020-01-29 stsp case GOT_STATUS_MODIFY:
8000 ab20a43a 2020-01-29 stsp *have_local_changes = 1;
8001 ab20a43a 2020-01-29 stsp return got_error(GOT_ERR_CANCELLED);
8006 ab20a43a 2020-01-29 stsp return NULL;
8009 0ebf8283 2019-07-24 stsp static const struct got_error *
8010 0ebf8283 2019-07-24 stsp cmd_histedit(int argc, char *argv[])
8012 0ebf8283 2019-07-24 stsp const struct got_error *error = NULL;
8013 0ebf8283 2019-07-24 stsp struct got_worktree *worktree = NULL;
8014 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex = NULL;
8015 0ebf8283 2019-07-24 stsp struct got_repository *repo = NULL;
8016 0ebf8283 2019-07-24 stsp char *cwd = NULL;
8017 0ebf8283 2019-07-24 stsp struct got_reference *branch = NULL;
8018 0ebf8283 2019-07-24 stsp struct got_reference *tmp_branch = NULL;
8019 0ebf8283 2019-07-24 stsp struct got_object_id *resume_commit_id = NULL;
8020 0ebf8283 2019-07-24 stsp struct got_object_id *base_commit_id = NULL;
8021 0ebf8283 2019-07-24 stsp struct got_object_id *head_commit_id = NULL;
8022 0ebf8283 2019-07-24 stsp struct got_commit_object *commit = NULL;
8023 9627c110 2020-04-18 stsp int ch, rebase_in_progress = 0;
8024 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8025 0ebf8283 2019-07-24 stsp int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8026 083957f4 2020-02-24 stsp int edit_logmsg_only = 0;
8027 0ebf8283 2019-07-24 stsp const char *edit_script_path = NULL;
8028 0ebf8283 2019-07-24 stsp unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8029 0ebf8283 2019-07-24 stsp struct got_object_id_queue commits;
8030 0ebf8283 2019-07-24 stsp struct got_pathlist_head merged_paths;
8031 0ebf8283 2019-07-24 stsp const struct got_object_id_queue *parent_ids;
8032 0ebf8283 2019-07-24 stsp struct got_object_qid *pid;
8033 0ebf8283 2019-07-24 stsp struct got_histedit_list histedit_cmds;
8034 0ebf8283 2019-07-24 stsp struct got_histedit_list_entry *hle;
8036 0ebf8283 2019-07-24 stsp SIMPLEQ_INIT(&commits);
8037 0ebf8283 2019-07-24 stsp TAILQ_INIT(&histedit_cmds);
8038 0ebf8283 2019-07-24 stsp TAILQ_INIT(&merged_paths);
8039 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8041 083957f4 2020-02-24 stsp while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8042 0ebf8283 2019-07-24 stsp switch (ch) {
8044 0ebf8283 2019-07-24 stsp abort_edit = 1;
8047 0ebf8283 2019-07-24 stsp continue_edit = 1;
8050 0ebf8283 2019-07-24 stsp edit_script_path = optarg;
8053 083957f4 2020-02-24 stsp edit_logmsg_only = 1;
8056 0ebf8283 2019-07-24 stsp usage_histedit();
8057 0ebf8283 2019-07-24 stsp /* NOTREACHED */
8061 0ebf8283 2019-07-24 stsp argc -= optind;
8062 0ebf8283 2019-07-24 stsp argv += optind;
8064 0ebf8283 2019-07-24 stsp #ifndef PROFILE
8065 0ebf8283 2019-07-24 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8066 0ebf8283 2019-07-24 stsp "unveil", NULL) == -1)
8067 0ebf8283 2019-07-24 stsp err(1, "pledge");
8069 0ebf8283 2019-07-24 stsp if (abort_edit && continue_edit)
8070 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -c options are mutually exclusive");
8071 083957f4 2020-02-24 stsp if (edit_script_path && edit_logmsg_only)
8072 083957f4 2020-02-24 stsp errx(1, "histedit's -F and -m options are mutually exclusive");
8073 083957f4 2020-02-24 stsp if (abort_edit && edit_logmsg_only)
8074 083957f4 2020-02-24 stsp errx(1, "histedit's -a and -m options are mutually exclusive");
8075 083957f4 2020-02-24 stsp if (continue_edit && edit_logmsg_only)
8076 083957f4 2020-02-24 stsp errx(1, "histedit's -c and -m options are mutually exclusive");
8077 0ebf8283 2019-07-24 stsp if (argc != 0)
8078 0ebf8283 2019-07-24 stsp usage_histedit();
8081 0ebf8283 2019-07-24 stsp * This command cannot apply unveil(2) in all cases because the
8082 0ebf8283 2019-07-24 stsp * user may choose to run an editor to edit the histedit script
8083 0ebf8283 2019-07-24 stsp * and to edit individual commit log messages.
8084 0ebf8283 2019-07-24 stsp * unveil(2) traverses exec(2); if an editor is used we have to
8085 0ebf8283 2019-07-24 stsp * apply unveil after edit script and log messages have been written.
8086 0ebf8283 2019-07-24 stsp * XXX TODO: Make use of unveil(2) where possible.
8089 0ebf8283 2019-07-24 stsp cwd = getcwd(NULL, 0);
8090 0ebf8283 2019-07-24 stsp if (cwd == NULL) {
8091 0ebf8283 2019-07-24 stsp error = got_error_from_errno("getcwd");
8092 0ebf8283 2019-07-24 stsp goto done;
8094 0ebf8283 2019-07-24 stsp error = got_worktree_open(&worktree, cwd);
8095 fa51e947 2020-03-27 stsp if (error) {
8096 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8097 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "histedit", cwd);
8098 0ebf8283 2019-07-24 stsp goto done;
8101 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8103 0ebf8283 2019-07-24 stsp if (error != NULL)
8104 0ebf8283 2019-07-24 stsp goto done;
8106 0ebf8283 2019-07-24 stsp error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8107 0ebf8283 2019-07-24 stsp if (error)
8108 0ebf8283 2019-07-24 stsp goto done;
8109 0ebf8283 2019-07-24 stsp if (rebase_in_progress) {
8110 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_REBASING);
8111 0ebf8283 2019-07-24 stsp goto done;
8114 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8115 0ebf8283 2019-07-24 stsp if (error)
8116 0ebf8283 2019-07-24 stsp goto done;
8118 083957f4 2020-02-24 stsp if (edit_in_progress && edit_logmsg_only) {
8119 083957f4 2020-02-24 stsp error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8120 083957f4 2020-02-24 stsp "histedit operation is in progress in this "
8121 083957f4 2020-02-24 stsp "work tree and must be continued or aborted "
8122 083957f4 2020-02-24 stsp "before the -m option can be used");
8123 083957f4 2020-02-24 stsp goto done;
8126 0ebf8283 2019-07-24 stsp if (edit_in_progress && abort_edit) {
8127 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8128 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8129 3e3a69f1 2019-07-25 stsp worktree, repo);
8130 0ebf8283 2019-07-24 stsp if (error)
8131 0ebf8283 2019-07-24 stsp goto done;
8132 0ebf8283 2019-07-24 stsp printf("Switching work tree to %s\n",
8133 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8134 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_abort(worktree, fileindex, repo,
8135 9627c110 2020-04-18 stsp branch, base_commit_id, update_progress, &upa);
8136 0ebf8283 2019-07-24 stsp if (error)
8137 0ebf8283 2019-07-24 stsp goto done;
8138 0ebf8283 2019-07-24 stsp printf("Histedit of %s aborted\n",
8139 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch));
8140 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8141 0ebf8283 2019-07-24 stsp goto done; /* nothing else to do */
8142 0ebf8283 2019-07-24 stsp } else if (abort_edit) {
8143 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8144 0ebf8283 2019-07-24 stsp goto done;
8147 0ebf8283 2019-07-24 stsp if (continue_edit) {
8148 0ebf8283 2019-07-24 stsp char *path;
8150 0ebf8283 2019-07-24 stsp if (!edit_in_progress) {
8151 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_NOT_HISTEDIT);
8152 0ebf8283 2019-07-24 stsp goto done;
8155 c3022ba5 2019-07-27 stsp error = got_worktree_get_histedit_script_path(&path, worktree);
8156 0ebf8283 2019-07-24 stsp if (error)
8157 0ebf8283 2019-07-24 stsp goto done;
8159 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds, path, repo);
8160 0ebf8283 2019-07-24 stsp free(path);
8161 0ebf8283 2019-07-24 stsp if (error)
8162 0ebf8283 2019-07-24 stsp goto done;
8164 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_continue(&resume_commit_id,
8165 3e3a69f1 2019-07-25 stsp &tmp_branch, &branch, &base_commit_id, &fileindex,
8166 3e3a69f1 2019-07-25 stsp worktree, repo);
8167 0ebf8283 2019-07-24 stsp if (error)
8168 0ebf8283 2019-07-24 stsp goto done;
8170 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8171 0ebf8283 2019-07-24 stsp if (error)
8172 0ebf8283 2019-07-24 stsp goto done;
8174 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8175 0ebf8283 2019-07-24 stsp head_commit_id);
8176 0ebf8283 2019-07-24 stsp if (error)
8177 0ebf8283 2019-07-24 stsp goto done;
8178 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8179 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8180 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8181 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8182 3aac7cf7 2019-07-25 stsp goto done;
8184 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8185 8ca9bd68 2019-07-25 stsp base_commit_id, got_worktree_get_path_prefix(worktree),
8186 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8187 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8188 0ebf8283 2019-07-24 stsp commit = NULL;
8189 0ebf8283 2019-07-24 stsp if (error)
8190 0ebf8283 2019-07-24 stsp goto done;
8192 0ebf8283 2019-07-24 stsp if (edit_in_progress) {
8193 0ebf8283 2019-07-24 stsp error = got_error(GOT_ERR_HISTEDIT_BUSY);
8194 0ebf8283 2019-07-24 stsp goto done;
8197 0ebf8283 2019-07-24 stsp error = got_ref_open(&branch, repo,
8198 0ebf8283 2019-07-24 stsp got_worktree_get_head_ref_name(worktree), 0);
8199 0ebf8283 2019-07-24 stsp if (error != NULL)
8200 0ebf8283 2019-07-24 stsp goto done;
8202 c7d20a3f 2019-07-30 stsp if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8203 c7d20a3f 2019-07-30 stsp error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8204 c7d20a3f 2019-07-30 stsp "will not edit commit history of a branch outside "
8205 c7d20a3f 2019-07-30 stsp "the \"refs/heads/\" reference namespace");
8206 c7d20a3f 2019-07-30 stsp goto done;
8209 0ebf8283 2019-07-24 stsp error = got_ref_resolve(&head_commit_id, repo, branch);
8210 bfce7f83 2019-07-27 stsp got_ref_close(branch);
8211 bfce7f83 2019-07-27 stsp branch = NULL;
8212 0ebf8283 2019-07-24 stsp if (error)
8213 0ebf8283 2019-07-24 stsp goto done;
8215 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8216 0ebf8283 2019-07-24 stsp head_commit_id);
8217 0ebf8283 2019-07-24 stsp if (error)
8218 0ebf8283 2019-07-24 stsp goto done;
8219 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8220 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8221 3aac7cf7 2019-07-25 stsp if (pid == NULL) {
8222 3aac7cf7 2019-07-25 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8223 3aac7cf7 2019-07-25 stsp goto done;
8225 8ca9bd68 2019-07-25 stsp error = collect_commits(&commits, head_commit_id, pid->id,
8226 8ca9bd68 2019-07-25 stsp got_worktree_get_base_commit_id(worktree),
8227 8ca9bd68 2019-07-25 stsp got_worktree_get_path_prefix(worktree),
8228 8ca9bd68 2019-07-25 stsp GOT_ERR_HISTEDIT_PATH, repo);
8229 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8230 0ebf8283 2019-07-24 stsp commit = NULL;
8231 0ebf8283 2019-07-24 stsp if (error)
8232 0ebf8283 2019-07-24 stsp goto done;
8234 c5996fff 2020-01-29 stsp if (SIMPLEQ_EMPTY(&commits)) {
8235 c5996fff 2020-01-29 stsp error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8236 c5996fff 2020-01-29 stsp goto done;
8239 bfce7f83 2019-07-27 stsp error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8240 bfce7f83 2019-07-27 stsp &base_commit_id, &fileindex, worktree, repo);
8241 bfce7f83 2019-07-27 stsp if (error)
8242 bfce7f83 2019-07-27 stsp goto done;
8244 0ebf8283 2019-07-24 stsp if (edit_script_path) {
8245 0ebf8283 2019-07-24 stsp error = histedit_load_list(&histedit_cmds,
8246 0ebf8283 2019-07-24 stsp edit_script_path, repo);
8247 6ba2bea2 2019-07-27 stsp if (error) {
8248 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8249 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8250 9627c110 2020-04-18 stsp update_progress, &upa);
8251 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8252 0ebf8283 2019-07-24 stsp goto done;
8255 514f2ffe 2020-01-29 stsp const char *branch_name;
8256 514f2ffe 2020-01-29 stsp branch_name = got_ref_get_symref_target(branch);
8257 514f2ffe 2020-01-29 stsp if (strncmp(branch_name, "refs/heads/", 11) == 0)
8258 514f2ffe 2020-01-29 stsp branch_name += 11;
8259 0ebf8283 2019-07-24 stsp error = histedit_edit_script(&histedit_cmds, &commits,
8260 083957f4 2020-02-24 stsp branch_name, edit_logmsg_only, repo);
8261 6ba2bea2 2019-07-27 stsp if (error) {
8262 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8263 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8264 9627c110 2020-04-18 stsp update_progress, &upa);
8265 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8266 0ebf8283 2019-07-24 stsp goto done;
8271 0ebf8283 2019-07-24 stsp error = histedit_save_list(&histedit_cmds, worktree,
8273 6ba2bea2 2019-07-27 stsp if (error) {
8274 6ba2bea2 2019-07-27 stsp got_worktree_histedit_abort(worktree, fileindex,
8275 6ba2bea2 2019-07-27 stsp repo, branch, base_commit_id,
8276 9627c110 2020-04-18 stsp update_progress, &upa);
8277 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8278 0ebf8283 2019-07-24 stsp goto done;
8283 4ec14e60 2019-08-28 hiltjo error = histedit_check_script(&histedit_cmds, &commits, repo);
8284 4ec14e60 2019-08-28 hiltjo if (error)
8285 0ebf8283 2019-07-24 stsp goto done;
8287 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8288 0ebf8283 2019-07-24 stsp if (resume_commit_id) {
8289 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(hle->commit_id,
8290 0ebf8283 2019-07-24 stsp resume_commit_id) != 0)
8293 0ebf8283 2019-07-24 stsp resume_commit_id = NULL;
8294 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8295 0ebf8283 2019-07-24 stsp hle->cmd->code == GOT_HISTEDIT_FOLD) {
8296 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree,
8298 ab20a43a 2020-01-29 stsp if (error)
8299 ab20a43a 2020-01-29 stsp goto done;
8301 ab20a43a 2020-01-29 stsp struct got_pathlist_head paths;
8302 ab20a43a 2020-01-29 stsp int have_changes = 0;
8304 ab20a43a 2020-01-29 stsp TAILQ_INIT(&paths);
8305 ab20a43a 2020-01-29 stsp error = got_pathlist_append(&paths, "", NULL);
8306 ab20a43a 2020-01-29 stsp if (error)
8307 ab20a43a 2020-01-29 stsp goto done;
8308 ab20a43a 2020-01-29 stsp error = got_worktree_status(worktree, &paths,
8309 ab20a43a 2020-01-29 stsp repo, check_local_changes, &have_changes,
8310 ab20a43a 2020-01-29 stsp check_cancelled, NULL);
8311 ab20a43a 2020-01-29 stsp got_pathlist_free(&paths);
8312 ab20a43a 2020-01-29 stsp if (error) {
8313 ab20a43a 2020-01-29 stsp if (error->code != GOT_ERR_CANCELLED)
8314 ab20a43a 2020-01-29 stsp goto done;
8315 ab20a43a 2020-01-29 stsp if (sigint_received || sigpipe_received)
8316 ab20a43a 2020-01-29 stsp goto done;
8318 ab20a43a 2020-01-29 stsp if (have_changes) {
8319 ab20a43a 2020-01-29 stsp error = histedit_commit(NULL, worktree,
8320 ab20a43a 2020-01-29 stsp fileindex, tmp_branch, hle, repo);
8321 ab20a43a 2020-01-29 stsp if (error)
8322 ab20a43a 2020-01-29 stsp goto done;
8324 ab20a43a 2020-01-29 stsp error = got_object_open_as_commit(
8325 ab20a43a 2020-01-29 stsp &commit, repo, hle->commit_id);
8326 ab20a43a 2020-01-29 stsp if (error)
8327 ab20a43a 2020-01-29 stsp goto done;
8328 ab20a43a 2020-01-29 stsp error = show_histedit_progress(commit,
8329 ab20a43a 2020-01-29 stsp hle, NULL);
8330 ab20a43a 2020-01-29 stsp got_object_commit_close(commit);
8331 ab20a43a 2020-01-29 stsp commit = NULL;
8332 ab20a43a 2020-01-29 stsp if (error)
8333 ab20a43a 2020-01-29 stsp goto done;
8339 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8340 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8341 0ebf8283 2019-07-24 stsp if (error)
8342 0ebf8283 2019-07-24 stsp goto done;
8346 0ebf8283 2019-07-24 stsp error = got_object_open_as_commit(&commit, repo,
8347 0ebf8283 2019-07-24 stsp hle->commit_id);
8348 0ebf8283 2019-07-24 stsp if (error)
8349 0ebf8283 2019-07-24 stsp goto done;
8350 0ebf8283 2019-07-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8351 0ebf8283 2019-07-24 stsp pid = SIMPLEQ_FIRST(parent_ids);
8353 0ebf8283 2019-07-24 stsp error = got_worktree_histedit_merge_files(&merged_paths,
8354 3e3a69f1 2019-07-25 stsp worktree, fileindex, pid->id, hle->commit_id, repo,
8355 9627c110 2020-04-18 stsp update_progress, &upa, check_cancelled, NULL);
8356 0ebf8283 2019-07-24 stsp if (error)
8357 0ebf8283 2019-07-24 stsp goto done;
8358 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8359 0ebf8283 2019-07-24 stsp commit = NULL;
8361 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8362 9627c110 2020-04-18 stsp if (upa.conflicts > 0)
8363 9627c110 2020-04-18 stsp rebase_status = GOT_STATUS_CONFLICT;
8365 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8366 a0ea4fc0 2020-02-28 stsp error = show_rebase_merge_conflict(hle->commit_id,
8368 a0ea4fc0 2020-02-28 stsp if (error)
8369 a0ea4fc0 2020-02-28 stsp goto done;
8370 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8374 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8375 0ebf8283 2019-07-24 stsp char *id_str;
8376 0ebf8283 2019-07-24 stsp error = got_object_id_str(&id_str, hle->commit_id);
8377 0ebf8283 2019-07-24 stsp if (error)
8378 0ebf8283 2019-07-24 stsp goto done;
8379 0ebf8283 2019-07-24 stsp printf("Stopping histedit for amending commit %s\n",
8381 0ebf8283 2019-07-24 stsp free(id_str);
8382 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8383 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree,
8384 3e3a69f1 2019-07-25 stsp fileindex);
8385 0ebf8283 2019-07-24 stsp goto done;
8388 0ebf8283 2019-07-24 stsp if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8389 0ebf8283 2019-07-24 stsp error = histedit_skip_commit(hle, worktree, repo);
8390 0ebf8283 2019-07-24 stsp if (error)
8391 0ebf8283 2019-07-24 stsp goto done;
8395 3e3a69f1 2019-07-25 stsp error = histedit_commit(&merged_paths, worktree, fileindex,
8396 3e3a69f1 2019-07-25 stsp tmp_branch, hle, repo);
8397 0ebf8283 2019-07-24 stsp got_worktree_rebase_pathlist_free(&merged_paths);
8398 0ebf8283 2019-07-24 stsp if (error)
8399 0ebf8283 2019-07-24 stsp goto done;
8402 0ebf8283 2019-07-24 stsp if (rebase_status == GOT_STATUS_CONFLICT) {
8403 3e3a69f1 2019-07-25 stsp error = got_worktree_histedit_postpone(worktree, fileindex);
8404 0ebf8283 2019-07-24 stsp if (error)
8405 0ebf8283 2019-07-24 stsp goto done;
8406 0ebf8283 2019-07-24 stsp error = got_error_msg(GOT_ERR_CONFLICTS,
8407 4cb8f8f3 2020-03-05 stsp "conflicts must be resolved before histedit can continue");
8409 3e3a69f1 2019-07-25 stsp error = histedit_complete(worktree, fileindex, tmp_branch,
8410 3e3a69f1 2019-07-25 stsp branch, repo);
8412 0ebf8283 2019-07-24 stsp got_object_id_queue_free(&commits);
8413 bfce7f83 2019-07-27 stsp histedit_free_list(&histedit_cmds);
8414 0ebf8283 2019-07-24 stsp free(head_commit_id);
8415 0ebf8283 2019-07-24 stsp free(base_commit_id);
8416 0ebf8283 2019-07-24 stsp free(resume_commit_id);
8417 0ebf8283 2019-07-24 stsp if (commit)
8418 0ebf8283 2019-07-24 stsp got_object_commit_close(commit);
8419 0ebf8283 2019-07-24 stsp if (branch)
8420 0ebf8283 2019-07-24 stsp got_ref_close(branch);
8421 0ebf8283 2019-07-24 stsp if (tmp_branch)
8422 0ebf8283 2019-07-24 stsp got_ref_close(tmp_branch);
8423 0ebf8283 2019-07-24 stsp if (worktree)
8424 0ebf8283 2019-07-24 stsp got_worktree_close(worktree);
8426 2822a352 2019-10-15 stsp got_repo_close(repo);
8427 2822a352 2019-10-15 stsp return error;
8430 2822a352 2019-10-15 stsp __dead static void
8431 2822a352 2019-10-15 stsp usage_integrate(void)
8433 2822a352 2019-10-15 stsp fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8437 2822a352 2019-10-15 stsp static const struct got_error *
8438 2822a352 2019-10-15 stsp cmd_integrate(int argc, char *argv[])
8440 2822a352 2019-10-15 stsp const struct got_error *error = NULL;
8441 2822a352 2019-10-15 stsp struct got_repository *repo = NULL;
8442 2822a352 2019-10-15 stsp struct got_worktree *worktree = NULL;
8443 2822a352 2019-10-15 stsp char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8444 2822a352 2019-10-15 stsp const char *branch_arg = NULL;
8445 2822a352 2019-10-15 stsp struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8446 2822a352 2019-10-15 stsp struct got_fileindex *fileindex = NULL;
8447 2822a352 2019-10-15 stsp struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8449 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8451 2822a352 2019-10-15 stsp while ((ch = getopt(argc, argv, "")) != -1) {
8452 2822a352 2019-10-15 stsp switch (ch) {
8454 2822a352 2019-10-15 stsp usage_integrate();
8455 2822a352 2019-10-15 stsp /* NOTREACHED */
8459 2822a352 2019-10-15 stsp argc -= optind;
8460 2822a352 2019-10-15 stsp argv += optind;
8462 2822a352 2019-10-15 stsp if (argc != 1)
8463 2822a352 2019-10-15 stsp usage_integrate();
8464 2822a352 2019-10-15 stsp branch_arg = argv[0];
8466 2822a352 2019-10-15 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8467 2822a352 2019-10-15 stsp "unveil", NULL) == -1)
8468 2822a352 2019-10-15 stsp err(1, "pledge");
8470 2822a352 2019-10-15 stsp cwd = getcwd(NULL, 0);
8471 2822a352 2019-10-15 stsp if (cwd == NULL) {
8472 2822a352 2019-10-15 stsp error = got_error_from_errno("getcwd");
8473 2822a352 2019-10-15 stsp goto done;
8476 2822a352 2019-10-15 stsp error = got_worktree_open(&worktree, cwd);
8477 fa51e947 2020-03-27 stsp if (error) {
8478 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8479 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "integrate",
8481 2822a352 2019-10-15 stsp goto done;
8484 2822a352 2019-10-15 stsp error = check_rebase_or_histedit_in_progress(worktree);
8485 2822a352 2019-10-15 stsp if (error)
8486 2822a352 2019-10-15 stsp goto done;
8488 2822a352 2019-10-15 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8490 2822a352 2019-10-15 stsp if (error != NULL)
8491 2822a352 2019-10-15 stsp goto done;
8493 2822a352 2019-10-15 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8494 2822a352 2019-10-15 stsp got_worktree_get_root_path(worktree));
8495 2822a352 2019-10-15 stsp if (error)
8496 2822a352 2019-10-15 stsp goto done;
8498 2822a352 2019-10-15 stsp if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8499 2822a352 2019-10-15 stsp error = got_error_from_errno("asprintf");
8500 2822a352 2019-10-15 stsp goto done;
8503 2822a352 2019-10-15 stsp error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8504 2822a352 2019-10-15 stsp &base_branch_ref, worktree, refname, repo);
8505 2822a352 2019-10-15 stsp if (error)
8506 2822a352 2019-10-15 stsp goto done;
8508 2822a352 2019-10-15 stsp refname = strdup(got_ref_get_name(branch_ref));
8509 2822a352 2019-10-15 stsp if (refname == NULL) {
8510 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8511 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8512 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8513 2822a352 2019-10-15 stsp goto done;
8515 2822a352 2019-10-15 stsp base_refname = strdup(got_ref_get_name(base_branch_ref));
8516 2822a352 2019-10-15 stsp if (base_refname == NULL) {
8517 2822a352 2019-10-15 stsp error = got_error_from_errno("strdup");
8518 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8519 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8520 2822a352 2019-10-15 stsp goto done;
8523 2822a352 2019-10-15 stsp error = got_ref_resolve(&commit_id, repo, branch_ref);
8524 2822a352 2019-10-15 stsp if (error)
8525 2822a352 2019-10-15 stsp goto done;
8527 2822a352 2019-10-15 stsp error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8528 2822a352 2019-10-15 stsp if (error)
8529 2822a352 2019-10-15 stsp goto done;
8531 2822a352 2019-10-15 stsp if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8532 2822a352 2019-10-15 stsp error = got_error_msg(GOT_ERR_SAME_BRANCH,
8533 2822a352 2019-10-15 stsp "specified branch has already been integrated");
8534 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8535 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8536 2822a352 2019-10-15 stsp goto done;
8539 3aef623b 2019-10-15 stsp error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8540 2822a352 2019-10-15 stsp if (error) {
8541 2822a352 2019-10-15 stsp if (error->code == GOT_ERR_ANCESTRY)
8542 2822a352 2019-10-15 stsp error = got_error(GOT_ERR_REBASE_REQUIRED);
8543 2822a352 2019-10-15 stsp got_worktree_integrate_abort(worktree, fileindex, repo,
8544 2822a352 2019-10-15 stsp branch_ref, base_branch_ref);
8545 2822a352 2019-10-15 stsp goto done;
8548 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8549 2822a352 2019-10-15 stsp error = got_worktree_integrate_continue(worktree, fileindex, repo,
8550 9627c110 2020-04-18 stsp branch_ref, base_branch_ref, update_progress, &upa,
8551 2822a352 2019-10-15 stsp check_cancelled, NULL);
8552 2822a352 2019-10-15 stsp if (error)
8553 2822a352 2019-10-15 stsp goto done;
8555 2822a352 2019-10-15 stsp printf("Integrated %s into %s\n", refname, base_refname);
8556 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8559 715dc77e 2019-08-03 stsp got_repo_close(repo);
8560 2822a352 2019-10-15 stsp if (worktree)
8561 2822a352 2019-10-15 stsp got_worktree_close(worktree);
8562 2822a352 2019-10-15 stsp free(cwd);
8563 2822a352 2019-10-15 stsp free(base_commit_id);
8564 2822a352 2019-10-15 stsp free(commit_id);
8565 2822a352 2019-10-15 stsp free(refname);
8566 2822a352 2019-10-15 stsp free(base_refname);
8567 715dc77e 2019-08-03 stsp return error;
8570 715dc77e 2019-08-03 stsp __dead static void
8571 715dc77e 2019-08-03 stsp usage_stage(void)
8573 f3055044 2019-08-07 stsp fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8574 f3055044 2019-08-07 stsp "[file-path ...]\n",
8575 715dc77e 2019-08-03 stsp getprogname());
8579 715dc77e 2019-08-03 stsp static const struct got_error *
8580 408b4ebc 2019-08-03 stsp print_stage(void *arg, unsigned char status, unsigned char staged_status,
8581 408b4ebc 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
8582 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8583 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
8585 408b4ebc 2019-08-03 stsp const struct got_error *err = NULL;
8586 408b4ebc 2019-08-03 stsp char *id_str = NULL;
8588 408b4ebc 2019-08-03 stsp if (staged_status != GOT_STATUS_ADD &&
8589 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_MODIFY &&
8590 408b4ebc 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
8591 408b4ebc 2019-08-03 stsp return NULL;
8593 408b4ebc 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
8594 408b4ebc 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY)
8595 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, staged_blob_id);
8597 408b4ebc 2019-08-03 stsp err = got_object_id_str(&id_str, blob_id);
8599 408b4ebc 2019-08-03 stsp return err;
8601 408b4ebc 2019-08-03 stsp printf("%s %c %s\n", id_str, staged_status, path);
8602 408b4ebc 2019-08-03 stsp free(id_str);
8603 dc424a06 2019-08-07 stsp return NULL;
8606 dc424a06 2019-08-07 stsp static const struct got_error *
8607 715dc77e 2019-08-03 stsp cmd_stage(int argc, char *argv[])
8609 715dc77e 2019-08-03 stsp const struct got_error *error = NULL;
8610 715dc77e 2019-08-03 stsp struct got_repository *repo = NULL;
8611 715dc77e 2019-08-03 stsp struct got_worktree *worktree = NULL;
8612 715dc77e 2019-08-03 stsp char *cwd = NULL;
8613 715dc77e 2019-08-03 stsp struct got_pathlist_head paths;
8614 715dc77e 2019-08-03 stsp struct got_pathlist_entry *pe;
8615 dc424a06 2019-08-07 stsp int ch, list_stage = 0, pflag = 0;
8616 dc424a06 2019-08-07 stsp FILE *patch_script_file = NULL;
8617 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8618 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8620 715dc77e 2019-08-03 stsp TAILQ_INIT(&paths);
8622 dc424a06 2019-08-07 stsp while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8623 715dc77e 2019-08-03 stsp switch (ch) {
8625 408b4ebc 2019-08-03 stsp list_stage = 1;
8628 dc424a06 2019-08-07 stsp pflag = 1;
8631 dc424a06 2019-08-07 stsp patch_script_path = optarg;
8634 715dc77e 2019-08-03 stsp usage_stage();
8635 715dc77e 2019-08-03 stsp /* NOTREACHED */
8639 715dc77e 2019-08-03 stsp argc -= optind;
8640 715dc77e 2019-08-03 stsp argv += optind;
8642 715dc77e 2019-08-03 stsp #ifndef PROFILE
8643 715dc77e 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8644 715dc77e 2019-08-03 stsp "unveil", NULL) == -1)
8645 715dc77e 2019-08-03 stsp err(1, "pledge");
8647 2db2652d 2019-08-07 stsp if (list_stage && (pflag || patch_script_path))
8648 2db2652d 2019-08-07 stsp errx(1, "-l option cannot be used with other options");
8649 dc424a06 2019-08-07 stsp if (patch_script_path && !pflag)
8650 dc424a06 2019-08-07 stsp errx(1, "-F option can only be used together with -p option");
8652 715dc77e 2019-08-03 stsp cwd = getcwd(NULL, 0);
8653 715dc77e 2019-08-03 stsp if (cwd == NULL) {
8654 715dc77e 2019-08-03 stsp error = got_error_from_errno("getcwd");
8655 715dc77e 2019-08-03 stsp goto done;
8658 715dc77e 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8659 fa51e947 2020-03-27 stsp if (error) {
8660 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8661 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "stage", cwd);
8662 715dc77e 2019-08-03 stsp goto done;
8665 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8667 715dc77e 2019-08-03 stsp if (error != NULL)
8668 715dc77e 2019-08-03 stsp goto done;
8670 dc424a06 2019-08-07 stsp if (patch_script_path) {
8671 dc424a06 2019-08-07 stsp patch_script_file = fopen(patch_script_path, "r");
8672 dc424a06 2019-08-07 stsp if (patch_script_file == NULL) {
8673 dc424a06 2019-08-07 stsp error = got_error_from_errno2("fopen",
8674 dc424a06 2019-08-07 stsp patch_script_path);
8675 dc424a06 2019-08-07 stsp goto done;
8678 9fd7cd22 2019-08-30 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8679 715dc77e 2019-08-03 stsp got_worktree_get_root_path(worktree));
8680 715dc77e 2019-08-03 stsp if (error)
8681 715dc77e 2019-08-03 stsp goto done;
8683 6d022e97 2019-08-04 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8684 6d022e97 2019-08-04 stsp if (error)
8685 6d022e97 2019-08-04 stsp goto done;
8687 6d022e97 2019-08-04 stsp if (list_stage)
8688 408b4ebc 2019-08-03 stsp error = got_worktree_status(worktree, &paths, repo,
8689 408b4ebc 2019-08-03 stsp print_stage, NULL, check_cancelled, NULL);
8691 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8692 2e1f37b0 2019-08-08 stsp cpa.action = "stage";
8693 dc424a06 2019-08-07 stsp error = got_worktree_stage(worktree, &paths,
8694 dc424a06 2019-08-07 stsp pflag ? NULL : print_status, NULL,
8695 2e1f37b0 2019-08-08 stsp pflag ? choose_patch : NULL, &cpa, repo);
8698 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8699 2e1f37b0 2019-08-08 stsp error == NULL)
8700 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8702 ad493afc 2019-08-03 stsp got_repo_close(repo);
8703 ad493afc 2019-08-03 stsp if (worktree)
8704 ad493afc 2019-08-03 stsp got_worktree_close(worktree);
8705 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8706 ad493afc 2019-08-03 stsp free((char *)pe->path);
8707 ad493afc 2019-08-03 stsp got_pathlist_free(&paths);
8708 ad493afc 2019-08-03 stsp free(cwd);
8709 ad493afc 2019-08-03 stsp return error;
8712 ad493afc 2019-08-03 stsp __dead static void
8713 ad493afc 2019-08-03 stsp usage_unstage(void)
8715 2e1f37b0 2019-08-08 stsp fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8716 2e1f37b0 2019-08-08 stsp "[file-path ...]\n",
8717 ad493afc 2019-08-03 stsp getprogname());
8722 ad493afc 2019-08-03 stsp static const struct got_error *
8723 ad493afc 2019-08-03 stsp cmd_unstage(int argc, char *argv[])
8725 ad493afc 2019-08-03 stsp const struct got_error *error = NULL;
8726 ad493afc 2019-08-03 stsp struct got_repository *repo = NULL;
8727 ad493afc 2019-08-03 stsp struct got_worktree *worktree = NULL;
8728 ad493afc 2019-08-03 stsp char *cwd = NULL;
8729 ad493afc 2019-08-03 stsp struct got_pathlist_head paths;
8730 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8731 9627c110 2020-04-18 stsp int ch, pflag = 0;
8732 9627c110 2020-04-18 stsp struct got_update_progress_arg upa;
8733 2e1f37b0 2019-08-08 stsp FILE *patch_script_file = NULL;
8734 2e1f37b0 2019-08-08 stsp const char *patch_script_path = NULL;
8735 2e1f37b0 2019-08-08 stsp struct choose_patch_arg cpa;
8737 ad493afc 2019-08-03 stsp TAILQ_INIT(&paths);
8739 2e1f37b0 2019-08-08 stsp while ((ch = getopt(argc, argv, "pF:")) != -1) {
8740 ad493afc 2019-08-03 stsp switch (ch) {
8742 2e1f37b0 2019-08-08 stsp pflag = 1;
8745 2e1f37b0 2019-08-08 stsp patch_script_path = optarg;
8748 ad493afc 2019-08-03 stsp usage_unstage();
8749 ad493afc 2019-08-03 stsp /* NOTREACHED */
8753 ad493afc 2019-08-03 stsp argc -= optind;
8754 ad493afc 2019-08-03 stsp argv += optind;
8756 ad493afc 2019-08-03 stsp #ifndef PROFILE
8757 ad493afc 2019-08-03 stsp if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8758 ad493afc 2019-08-03 stsp "unveil", NULL) == -1)
8759 ad493afc 2019-08-03 stsp err(1, "pledge");
8761 2e1f37b0 2019-08-08 stsp if (patch_script_path && !pflag)
8762 2e1f37b0 2019-08-08 stsp errx(1, "-F option can only be used together with -p option");
8764 ad493afc 2019-08-03 stsp cwd = getcwd(NULL, 0);
8765 ad493afc 2019-08-03 stsp if (cwd == NULL) {
8766 ad493afc 2019-08-03 stsp error = got_error_from_errno("getcwd");
8767 ad493afc 2019-08-03 stsp goto done;
8770 ad493afc 2019-08-03 stsp error = got_worktree_open(&worktree, cwd);
8771 fa51e947 2020-03-27 stsp if (error) {
8772 fa51e947 2020-03-27 stsp if (error->code == GOT_ERR_NOT_WORKTREE)
8773 fa51e947 2020-03-27 stsp error = wrap_not_worktree_error(error, "unstage", cwd);
8774 ad493afc 2019-08-03 stsp goto done;
8777 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8779 ad493afc 2019-08-03 stsp if (error != NULL)
8780 ad493afc 2019-08-03 stsp goto done;
8782 2e1f37b0 2019-08-08 stsp if (patch_script_path) {
8783 2e1f37b0 2019-08-08 stsp patch_script_file = fopen(patch_script_path, "r");
8784 2e1f37b0 2019-08-08 stsp if (patch_script_file == NULL) {
8785 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fopen",
8786 2e1f37b0 2019-08-08 stsp patch_script_path);
8787 2e1f37b0 2019-08-08 stsp goto done;
8791 00f36e47 2019-09-06 stsp error = apply_unveil(got_repo_get_path(repo), 0,
8792 ad493afc 2019-08-03 stsp got_worktree_get_root_path(worktree));
8793 ad493afc 2019-08-03 stsp if (error)
8794 ad493afc 2019-08-03 stsp goto done;
8796 ad493afc 2019-08-03 stsp error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8797 ad493afc 2019-08-03 stsp if (error)
8798 ad493afc 2019-08-03 stsp goto done;
8800 2e1f37b0 2019-08-08 stsp cpa.patch_script_file = patch_script_file;
8801 2e1f37b0 2019-08-08 stsp cpa.action = "unstage";
8802 9627c110 2020-04-18 stsp memset(&upa, 0, sizeof(upa));
8803 ad493afc 2019-08-03 stsp error = got_worktree_unstage(worktree, &paths, update_progress,
8804 9627c110 2020-04-18 stsp &upa, pflag ? choose_patch : NULL, &cpa, repo);
8805 9627c110 2020-04-18 stsp if (!error)
8806 9627c110 2020-04-18 stsp print_update_progress_stats(&upa);
8808 2e1f37b0 2019-08-08 stsp if (patch_script_file && fclose(patch_script_file) == EOF &&
8809 2e1f37b0 2019-08-08 stsp error == NULL)
8810 2e1f37b0 2019-08-08 stsp error = got_error_from_errno2("fclose", patch_script_path);
8812 0ebf8283 2019-07-24 stsp got_repo_close(repo);
8813 715dc77e 2019-08-03 stsp if (worktree)
8814 715dc77e 2019-08-03 stsp got_worktree_close(worktree);
8815 715dc77e 2019-08-03 stsp TAILQ_FOREACH(pe, &paths, entry)
8816 715dc77e 2019-08-03 stsp free((char *)pe->path);
8817 715dc77e 2019-08-03 stsp got_pathlist_free(&paths);
8818 715dc77e 2019-08-03 stsp free(cwd);
8819 01073a5d 2019-08-22 stsp return error;
8822 01073a5d 2019-08-22 stsp __dead static void
8823 01073a5d 2019-08-22 stsp usage_cat(void)
8825 896e9b6f 2019-08-26 stsp fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8826 896e9b6f 2019-08-26 stsp "arg1 [arg2 ...]\n", getprogname());
8830 01073a5d 2019-08-22 stsp static const struct got_error *
8831 01073a5d 2019-08-22 stsp cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8833 01073a5d 2019-08-22 stsp const struct got_error *err;
8834 01073a5d 2019-08-22 stsp struct got_blob_object *blob;
8836 01073a5d 2019-08-22 stsp err = got_object_open_as_blob(&blob, repo, id, 8192);
8838 01073a5d 2019-08-22 stsp return err;
8840 01073a5d 2019-08-22 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8841 01073a5d 2019-08-22 stsp got_object_blob_close(blob);
8842 01073a5d 2019-08-22 stsp return err;
8845 01073a5d 2019-08-22 stsp static const struct got_error *
8846 01073a5d 2019-08-22 stsp cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8848 01073a5d 2019-08-22 stsp const struct got_error *err;
8849 01073a5d 2019-08-22 stsp struct got_tree_object *tree;
8850 56e0773d 2019-11-28 stsp int nentries, i;
8852 01073a5d 2019-08-22 stsp err = got_object_open_as_tree(&tree, repo, id);
8854 01073a5d 2019-08-22 stsp return err;
8856 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
8857 56e0773d 2019-11-28 stsp for (i = 0; i < nentries; i++) {
8858 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
8859 01073a5d 2019-08-22 stsp char *id_str;
8860 01073a5d 2019-08-22 stsp if (sigint_received || sigpipe_received)
8862 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
8863 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8866 56e0773d 2019-11-28 stsp fprintf(outfile, "%s %.7o %s\n", id_str,
8867 56e0773d 2019-11-28 stsp got_tree_entry_get_mode(te),
8868 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te));
8869 01073a5d 2019-08-22 stsp free(id_str);
8872 01073a5d 2019-08-22 stsp got_object_tree_close(tree);
8873 01073a5d 2019-08-22 stsp return err;
8876 01073a5d 2019-08-22 stsp static const struct got_error *
8877 01073a5d 2019-08-22 stsp cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8879 01073a5d 2019-08-22 stsp const struct got_error *err;
8880 01073a5d 2019-08-22 stsp struct got_commit_object *commit;
8881 01073a5d 2019-08-22 stsp const struct got_object_id_queue *parent_ids;
8882 01073a5d 2019-08-22 stsp struct got_object_qid *pid;
8883 01073a5d 2019-08-22 stsp char *id_str = NULL;
8884 24ea5512 2019-08-22 stsp const char *logmsg = NULL;
8886 01073a5d 2019-08-22 stsp err = got_object_open_as_commit(&commit, repo, id);
8888 01073a5d 2019-08-22 stsp return err;
8890 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8892 01073a5d 2019-08-22 stsp goto done;
8894 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8895 01073a5d 2019-08-22 stsp parent_ids = got_object_commit_get_parent_ids(commit);
8896 8aa93786 2019-08-22 stsp fprintf(outfile, "numparents %d\n",
8897 01073a5d 2019-08-22 stsp got_object_commit_get_nparents(commit));
8898 01073a5d 2019-08-22 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
8899 01073a5d 2019-08-22 stsp char *pid_str;
8900 01073a5d 2019-08-22 stsp err = got_object_id_str(&pid_str, pid->id);
8902 01073a5d 2019-08-22 stsp goto done;
8903 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8904 01073a5d 2019-08-22 stsp free(pid_str);
8906 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
8907 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8908 01073a5d 2019-08-22 stsp got_object_commit_get_author_time(commit));
8910 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
8911 8aa93786 2019-08-22 stsp got_object_commit_get_author(commit),
8912 01073a5d 2019-08-22 stsp got_object_commit_get_committer_time(commit));
8914 24ea5512 2019-08-22 stsp logmsg = got_object_commit_get_logmsg_raw(commit);
8915 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8916 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", logmsg);
8918 01073a5d 2019-08-22 stsp free(id_str);
8919 01073a5d 2019-08-22 stsp got_object_commit_close(commit);
8920 01073a5d 2019-08-22 stsp return err;
8923 01073a5d 2019-08-22 stsp static const struct got_error *
8924 01073a5d 2019-08-22 stsp cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8926 01073a5d 2019-08-22 stsp const struct got_error *err;
8927 01073a5d 2019-08-22 stsp struct got_tag_object *tag;
8928 01073a5d 2019-08-22 stsp char *id_str = NULL;
8929 01073a5d 2019-08-22 stsp const char *tagmsg = NULL;
8931 01073a5d 2019-08-22 stsp err = got_object_open_as_tag(&tag, repo, id);
8933 01073a5d 2019-08-22 stsp return err;
8935 01073a5d 2019-08-22 stsp err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8937 01073a5d 2019-08-22 stsp goto done;
8939 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8941 01073a5d 2019-08-22 stsp switch (got_object_tag_get_object_type(tag)) {
8942 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
8943 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8944 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_BLOB);
8946 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
8947 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8948 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TREE);
8950 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
8951 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8952 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_COMMIT);
8954 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
8955 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8956 8aa93786 2019-08-22 stsp GOT_OBJ_LABEL_TAG);
8962 e15d5241 2019-08-22 stsp fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8963 e15d5241 2019-08-22 stsp got_object_tag_get_name(tag));
8965 8aa93786 2019-08-22 stsp fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
8966 8aa93786 2019-08-22 stsp got_object_tag_get_tagger(tag),
8967 8aa93786 2019-08-22 stsp got_object_tag_get_tagger_time(tag));
8969 01073a5d 2019-08-22 stsp tagmsg = got_object_tag_get_message(tag);
8970 8aa93786 2019-08-22 stsp fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8971 01073a5d 2019-08-22 stsp fprintf(outfile, "%s", tagmsg);
8973 01073a5d 2019-08-22 stsp free(id_str);
8974 01073a5d 2019-08-22 stsp got_object_tag_close(tag);
8975 01073a5d 2019-08-22 stsp return err;
8978 01073a5d 2019-08-22 stsp static const struct got_error *
8979 01073a5d 2019-08-22 stsp cmd_cat(int argc, char *argv[])
8981 01073a5d 2019-08-22 stsp const struct got_error *error;
8982 01073a5d 2019-08-22 stsp struct got_repository *repo = NULL;
8983 01073a5d 2019-08-22 stsp struct got_worktree *worktree = NULL;
8984 01073a5d 2019-08-22 stsp char *cwd = NULL, *repo_path = NULL, *label = NULL;
8985 896e9b6f 2019-08-26 stsp const char *commit_id_str = NULL;
8986 896e9b6f 2019-08-26 stsp struct got_object_id *id = NULL, *commit_id = NULL;
8987 896e9b6f 2019-08-26 stsp int ch, obj_type, i, force_path = 0;
8989 01073a5d 2019-08-22 stsp #ifndef PROFILE
8990 01073a5d 2019-08-22 stsp if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8991 01073a5d 2019-08-22 stsp NULL) == -1)
8992 01073a5d 2019-08-22 stsp err(1, "pledge");
8995 896e9b6f 2019-08-26 stsp while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
8996 01073a5d 2019-08-22 stsp switch (ch) {
8998 896e9b6f 2019-08-26 stsp commit_id_str = optarg;
9001 01073a5d 2019-08-22 stsp repo_path = realpath(optarg, NULL);
9002 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9003 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
9005 01073a5d 2019-08-22 stsp got_path_strip_trailing_slashes(repo_path);
9008 896e9b6f 2019-08-26 stsp force_path = 1;
9011 01073a5d 2019-08-22 stsp usage_cat();
9012 01073a5d 2019-08-22 stsp /* NOTREACHED */
9016 01073a5d 2019-08-22 stsp argc -= optind;
9017 01073a5d 2019-08-22 stsp argv += optind;
9019 01073a5d 2019-08-22 stsp cwd = getcwd(NULL, 0);
9020 01073a5d 2019-08-22 stsp if (cwd == NULL) {
9021 01073a5d 2019-08-22 stsp error = got_error_from_errno("getcwd");
9022 01073a5d 2019-08-22 stsp goto done;
9024 01073a5d 2019-08-22 stsp error = got_worktree_open(&worktree, cwd);
9025 01073a5d 2019-08-22 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
9026 01073a5d 2019-08-22 stsp goto done;
9027 01073a5d 2019-08-22 stsp if (worktree) {
9028 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9029 01073a5d 2019-08-22 stsp repo_path = strdup(
9030 01073a5d 2019-08-22 stsp got_worktree_get_repo_path(worktree));
9031 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9032 01073a5d 2019-08-22 stsp error = got_error_from_errno("strdup");
9033 01073a5d 2019-08-22 stsp goto done;
9038 01073a5d 2019-08-22 stsp if (repo_path == NULL) {
9039 01073a5d 2019-08-22 stsp repo_path = getcwd(NULL, 0);
9040 01073a5d 2019-08-22 stsp if (repo_path == NULL)
9041 01073a5d 2019-08-22 stsp return got_error_from_errno("getcwd");
9044 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
9045 01073a5d 2019-08-22 stsp free(repo_path);
9046 01073a5d 2019-08-22 stsp if (error != NULL)
9047 01073a5d 2019-08-22 stsp goto done;
9049 01073a5d 2019-08-22 stsp error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9050 896e9b6f 2019-08-26 stsp if (error)
9051 896e9b6f 2019-08-26 stsp goto done;
9053 896e9b6f 2019-08-26 stsp if (commit_id_str == NULL)
9054 896e9b6f 2019-08-26 stsp commit_id_str = GOT_REF_HEAD;
9055 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
9056 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9057 01073a5d 2019-08-22 stsp if (error)
9058 01073a5d 2019-08-22 stsp goto done;
9060 01073a5d 2019-08-22 stsp for (i = 0; i < argc; i++) {
9061 896e9b6f 2019-08-26 stsp if (force_path) {
9062 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo, commit_id,
9064 896e9b6f 2019-08-26 stsp if (error)
9067 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&id, &label, argv[i],
9068 896e9b6f 2019-08-26 stsp GOT_OBJ_TYPE_ANY, 0, repo);
9069 896e9b6f 2019-08-26 stsp if (error) {
9070 896e9b6f 2019-08-26 stsp if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9071 896e9b6f 2019-08-26 stsp error->code != GOT_ERR_NOT_REF)
9073 896e9b6f 2019-08-26 stsp error = got_object_id_by_path(&id, repo,
9074 896e9b6f 2019-08-26 stsp commit_id, argv[i]);
9075 896e9b6f 2019-08-26 stsp if (error)
9080 01073a5d 2019-08-22 stsp error = got_object_get_type(&obj_type, repo, id);
9081 01073a5d 2019-08-22 stsp if (error)
9084 01073a5d 2019-08-22 stsp switch (obj_type) {
9085 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_BLOB:
9086 01073a5d 2019-08-22 stsp error = cat_blob(id, repo, stdout);
9088 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TREE:
9089 01073a5d 2019-08-22 stsp error = cat_tree(id, repo, stdout);
9091 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_COMMIT:
9092 01073a5d 2019-08-22 stsp error = cat_commit(id, repo, stdout);
9094 01073a5d 2019-08-22 stsp case GOT_OBJ_TYPE_TAG:
9095 01073a5d 2019-08-22 stsp error = cat_tag(id, repo, stdout);
9098 01073a5d 2019-08-22 stsp error = got_error(GOT_ERR_OBJ_TYPE);
9101 01073a5d 2019-08-22 stsp if (error)
9103 01073a5d 2019-08-22 stsp free(label);
9104 01073a5d 2019-08-22 stsp label = NULL;
9106 01073a5d 2019-08-22 stsp id = NULL;
9109 01073a5d 2019-08-22 stsp free(label);
9111 896e9b6f 2019-08-26 stsp free(commit_id);
9112 01073a5d 2019-08-22 stsp if (worktree)
9113 01073a5d 2019-08-22 stsp got_worktree_close(worktree);
9114 01073a5d 2019-08-22 stsp if (repo) {
9115 01073a5d 2019-08-22 stsp const struct got_error *repo_error;
9116 01073a5d 2019-08-22 stsp repo_error = got_repo_close(repo);
9117 01073a5d 2019-08-22 stsp if (error == NULL)
9118 01073a5d 2019-08-22 stsp error = repo_error;
9120 0ebf8283 2019-07-24 stsp return error;
